diff --git a/.editorconfig b/.editorconfig
index 9027fa7d6d..6759ec7130 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,3 +1,6 @@
+########################################################
+# Xenko editor config
+
 root = true
 
 [*]
@@ -9,13 +12,159 @@ charset = utf-8
 [*.ttinclude]
 insert_final_newline = false
 
-# C# files
-[*.cs]
-indent_style = space
-indent_size = 4
+##################################
+# XAML Code Style Rules          #
+##################################
 
-# XAML files
 [*.xaml]
 # enable this once we have merged most of our branches into master
 indent_style = space
 indent_size = 2
+
+########################################################
+# Following config is taken from
+# https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference?view=vs-2019#example-editorconfig-file
+# (to force default expected VS2019 settings)
+
+# Code files
+[*.{cs,csx,vb,vbx}]
+indent_style = space
+indent_size = 4
+
+###############################
+# .NET Coding Conventions     #
+###############################
+
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = true
+dotnet_separate_import_directive_groups = false
+
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+
+###############################
+# Naming Conventions          #
+###############################
+
+# Style Definitions
+dotnet_naming_style.pascal_case_style.capitalization             = pascal_case
+
+# Use PascalCase for constant fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols  = constant_fields
+dotnet_naming_rule.constant_fields_should_be_pascal_case.style    = pascal_case_style
+dotnet_naming_symbols.constant_fields.applicable_kinds            = field
+dotnet_naming_symbols.constant_fields.applicable_accessibilities  = *
+dotnet_naming_symbols.constant_fields.required_modifiers          = const
+
+###############################
+# C# Code Style Rules         #
+###############################
+
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+
+# Pattern-matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+###############################
+# C# Formatting Rules         #
+###############################
+
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+
+##################################
+# Visual Basic Code Style Rules  #
+##################################
+
+[*.vb]
+# Modifier preferences
+visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
diff --git a/.gitignore b/.gitignore
index 32eaa513ce..fe72df4084 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,8 @@ fastlane/report.xml
 fastlane/screenshots
 *.user
 project.lock.json
+*.lock
+*.bak
+routerlog.txt
+hooks
+lfs
diff --git a/README.md b/README.md
index 4ed70b38e7..9187b5459a 100644
--- a/README.md
+++ b/README.md
@@ -1,76 +1,125 @@
-![Xenko](https://xenko.com/images/external/xenko-logo-side.png)
+![Focus Engine](https://i.imgur.com/OjANvN9.png)
 =======
 
-Welcome to the Xenko source code repository!
+Welcome to the Focus Engine source code repository!
 
-Xenko is an open-source C# game engine for realistic rendering and VR. 
+Focus is an open-source C# game engine for realistic rendering and VR based off of Xenko/Stride. You'll still see "Xenko" in many places.
 The engine is highly modular and aims at giving game makers more flexibility in their development.
-Xenko comes with an editor that allows you create and manage the content of your games or applications in a visual and intuitive way.
+Focus comes with an editor that allows you create and manage the content of your games or applications in a visual and intuitive way.
 
-![Xenko Editor](https://xenko.com/images/external/script-editor.png)
+![Focus Game Studio](https://doc.stride3d.net/latest/en/manual/get-started/media/game-editor-scene.jpg)
 
-To learn more about Xenko, visit [xenko.com](https://xenko.com/).
+To learn more about Stride3D, visit [stride3d.net](https://stride3d.net/).
+
+## Why this fork?
+
+My games require the engine to be developed at a faster pace than Stride. I'm in need of fixes, new features and better performance. These changes will not be supported by the core team, and the absolute most recent changes may not be fully stable. However, you may find them very helpful, and in some cases, essential to projects.
+
+## Any games made with this engine?
+
+Yes, and it is free for you to try! Works on all operating systems and supports VR in Windows: https://store.steampowered.com/app/1256380/FPS_Infinite/
+
+Other paid games:
+
+8089: https://store.steampowered.com/app/1593280/8089_The_Next_Action_RPG/
+
+Spermination: https://store.steampowered.com/app/2001910/Spermination_Cream_of_the_Crop/
+
+PerformVR: https://store.steampowered.com/app/1868400/PerformVR/
+
+## What is different?
+
+Most of Focus is similar to Stride and there shouldn't be any loss of functionality over the original. Changes are focused on fixes, performance improvements and new features. However, I do not maintain different languages, Android support or the Launcher. The following is a rough list of "major" changes, but might not accurately reflect the current state of differences (since both githubs are moving targets which are hopefully improving):
+
+* Virtual Reality & OpenXR: frame rate management, resolution detection, Vulkan support, and automatic UI interaction are some of the VR improvements you'll get "out of the box". Pretty much just need to enable OpenXR in your Graphics Compositor's Forward Renderer and you'll be good to go. Tracking hands is much easier, as you can simply select which hand to track right from GameStudio. Support for multiple forward renderers in VR, with post processing. See https://github.com/phr00t/FOVTester2 for a super simple example of how easy a VR project is.
+* Vulkan: Focus primarily uses Vulkan, which has been significantly overhauled to provide more performance you'd expect from the newer API. Vulkan works on Linux too. Vulkan tries to work on Mac OSX via MoltenVK, but compatibility issues have arisen that are hard to troublesoot. Stride/Xenko doesn't work either on Mac OSX as of this writing. DirectX is deprecated and unsupported on this fork.
+* BepuPhysics2 for faster Physics: Focus has an additional physics library integrated, which is much faster, has an easier API, multithreaded and pure C#. It isn't integrated with GameStudio though, like Bullet physics is. See https://github.com/phr00t/FocusEngine/tree/master/sources/engine/Xenko.Physics/Bepu. If you decide to still use Bullet, this fork can handle Bullet running in another thread with interpolation.
+* API Ease: TransformComponents have nice shortcuts like WorldPosition and WorldRotation. There are also other very useful shortcuts, like Material.Clone to easily clone materials.
+* Lots of bugfixes: Lots of issues, and even GameStudio crashes and project corruption, have been fixed/improved in this fork. Some specific examples is crashes with particle colors or rendering 3D text from multiple cameras.
+* GlobalSoundManager: easily play all sound effects for your whole project from a single static class, which handles loading and pooling sound instances automatically (even asynchronously). If you use positional sounds, make sure you call UpdatePlayingSoundPositions every frame! See https://github.com/phr00t/FocusEngine/blob/master/sources/engine/Xenko.Engine/Engine/GlobalSoundManager.cs
+* SimpleSaver: Simple system for storing organized data in a dictionary, then saving and loading that data from a file. It handles compression and has a static function for finding a good directory to save stuff to for your application. See https://github.com/phr00t/FocusEngine/blob/master/sources/core/Xenko.Core.Mathematics/SimpleSaver.cs
+* CinematicAction: Simple system for performing cinematic actions on objects and calling functions at certain times. Can build a simple timeline for things to move, rotate and execute. See https://github.com/phr00t/FocusEngine/blob/master/sources/engine/Xenko.Engine/Cinematics/CinematicAnimation.cs
+* EntityPool: Makes it really easy to reuse entities and prefabs. This can save lots of memory and processing, instead of recreating things that come and go (like enemies or projectiles). See https://github.com/phr00t/FocusEngine/blob/master/sources/engine/Xenko.Engine/Engine/EntityPool.cs
+* UI improvements: View frustum is implemented in this fork, so UI elements outside of view won't be drawn for performance reasons. ScrollViewers can work with mouse wheels out of the box. Easily get UI elements to access in code from a Page using GatherUIDictionary. Easily make Lists and Pulldown selection boxes using GridList and PulldownList (not integrated with GameStudio yet, though). Overall UI performance is greatly improved, too!
+* Particle System improvements: Colored particles work, which is pretty important! Also added EmitSpecificParticle to a ParticleEmitter, so you can emit individual particles at certain position, speeds and colors (like using EmitParams in Unity).
+* Better UI Editor: Selecting things in the editor works more intuitively, like hidden things are skipped and smaller things are easier to click. Hold Shift to disable snapping etc.
+* UI Text features: vertically align text or use \<color> tags to dynamically change text colors. Use \<br> tags to have multiline text set straight from GameStudio. Need text shadows, outlines or bevels? Precompile a font (right click it in the asset view) that has a Glyph Margin > 0, which will generate a PNG with room to edit in effects right into the glyphs.
+* ModelBatcher: Easily make batched models using lots of individual models (think grass and rocks for your whole terrain batched into one draw call and entity). See https://github.com/phr00t/FocusEngine/blob/master/sources/engine/Xenko.Engine/Engine/ModelBatcher.cs -- if you have moving things that want to be batched, look into BatchedMeshDraw
+* Level of detail system: in GameSettings -> Rendering, you can set a value for things to cull when they are really small on the screen. Separate value can be used for culling shadows, too. Individual models can have "Small Factor Adjustment" values that make them more important (or less important) to make them cull easier/harder.
+* Able to set Entities (via the TransformComponent) as "static" so complex matrix calculations can be skipped for them every frame. If you have lots of objects that don't move in a scene, this can provide a significant CPU boost.
+* Much more control over the depth buffer: objects, even transparent ones and UI components, provide options for how they interacts with the depth buffer.
+* More Post Processing Effects: Virtual Reality Field-of-View reducing filter for motion sickness out of the box.
+* Non-post processing based fog: GlobalFog which is drawn at the material-level to avoid problems with transparency, see https://github.com/phr00t/FocusEngine/blob/master/sources/engine/Xenko.Rendering/Rendering/Materials/GlobalFog.cs
+* Easy setting game resolution: Game.SetDefaultSettings(width, height, fullscreen) and Game.OverrideDefaultSettings to set and save resolution of your game.
+* Easy generating procedural meshes: StagedMeshDraw takes a list of verticies and indicies, no "buffer binding" or "GraphicsDevice" needed. Also will actually upload the mesh when it tries to get rendered automatically, saving time and resources if the mesh doesn't actually ever get viewed.
+* Less likely to lose work: files are not actually deleted from GameStudio, just moved to the Recylce Bin. If you mess up a prefab or entity in a scene, or if you notice corruption in your project, select Help -> Restore Scene/Prefabs to return your scene and prefab files to the last time to opened your project.
+* Performance: lots of tweaks have been made throughout the engine to maximize performance. This includes reducing locks and enumeration reduction, for example. GameStudio editor itself runs much smoother and can handle multiple tabs much better.
+* Easy adding/removing entities from the scene: Just do myEntity.Scene = myScene (to add it) or myEntity.Scene = null (to remove it).
+* Includes dfkeenan's toolkit designed for this fork (from https://github.com/dfkeenan/XenkoToolkit). May need to add the Toolkit Nuget package to use.
+* Takes good things from many different Xenko/Stride forks, including the original branch when it gets updated. I don't get everything, as I focus on things that are more apparently beneficial to seasoned and commercial PC developers. I exclude tutorials, samples, non-PC platforms, launcher updates, internal naming conventions, building refactors etc. which I don't maintain.
+* Probably lots of other stuff: haven't kept that great of track of improvements, I usually fix things as needed and keep moving forward!
+
+## OK, show me something neat!
+
+![Lots of Boxes](https://i.imgur.com/E9J0skw.png)
+
+This is 6700+ physical boxes being rendered @ 50fps, which may not be the fastest thing out there, but it is pretty good! It is using BepuPhysics + Vulkan + https://github.com/phr00t/FocusEngine/blob/master/sources/engine/Xenko.Engine/Engine/Batching/BatchedMeshDraw.cs to draw all these boxes with 1 material, 1 mesh & 1 draw call. BatchedMeshDraw allows custom UV offsets per copy, hence why you see some boxes with different textures. Neat!
+
+![Steam Deck Support](https://i.imgur.com/c5XmyGp.jpg)
+
+FPS Infinite, powered by Focus Engine, running on the Steam Deck! Should work out-of-the-box when publishing Linux executables.
+
+## What is worse in this fork?
+
+Android/mobile support, different languages, and Universal Windows Platform support. I also work very little with DirectX, which is maintained just for the editor. Some changes I make to improve Vulkan might cause a (hopefully minor) bug in the DirectX API, which will be of low priority to fix. GPU instancing isn't implemented on Vulkan yet (although you may find the ModelBatcher & BatchedMeshDraw covers this in most cases).
+
+Documentation is worse in this fork, as I don't have time to go back and properly document the new features I add. The list above isn't updated often enough to showcase the latest improvements. I try to comment new additions, but would require looking at the source to see them. Stride documentation is mostly still applicable, but there may be better ways to do things in this fork (VR for example).
+
+Community support doesn't exist for this fork. The community usually revolves around the original Stride.
+
+You can now export games and projects targeting .NET 6 & Visual Studio 2022 is now supported. However, GameStudio (the editor) is still running on .NET Framework 4.8 (not a big deal, in my humble opinion).
+
+Creating templates with this fork is semi broken (you'll get an error, but it still gets created). Just browse for it next time you open Focus. There is an issue for it on the issues tab.
+
+## Why don't you merge all these improvements back into Stride?
+
+The Stride team doesn't really want most of my work, or they don't think these improvements are necessary. I've made decisions without their input to save time, so taking my work now would take significant review and likely significant rewrites to adhere to their opinions and standards. I stand by my code and its quality (otherwise I wouldn't trust making commercial games with it), but the Stride team would rather do it their way (if and when they ever get to it). Sometimes, some improvements do make it into Stride in some form, like the Fog and Outline post processing filters. Recently, I kickstarted bringing OpenXR support into Stride (but not all of my VR improvements), and they seem to be getting it to work with DirectX. Fully merging would take much more work than us "spare time devs" have. If you want to use my improvements, I only can recommend using (and building off of) my fork.
 
 ## License
 
-Xenko is covered by [MIT](LICENSE.md), unless stated otherwise (i.e. for some files that are copied from other projects).
+Focus is covered by [MIT](LICENSE.md), unless stated otherwise (i.e. for some files that are copied from other projects).
 
 You can find the list of third party projects [here](THIRD%20PARTY.md).
 
-Contributors need to sign the following [Contribution License Agreement](docs/ContributorLicenseAgreement.md).
-
 ## Documentation
 
 Find explanations and information about Xenko:
-* [Xenko Manual](https://doc.xenko.com/latest/manual/index.html)
-* [API Reference](https://doc.xenko.com/latest/api/index.html)
-* [Release Notes](https://doc.xenko.com/latest/ReleaseNotes/index.html)
+* [Stride Manual](https://doc.stride3d.net/latest/en/manual/index.html)
+* [API Reference](https://doc.stride3d.net/latest/api/index.html)
 
 ## Community
 
 Ask for help or report issues:
-* [Chat with the community on Discord](https://discord.gg/f6aerfE) [![Join the chat at https://discord.gg/f6aerfE](https://img.shields.io/discord/500285081265635328.svg?style=flat&logo=discord&label=discord)](https://discord.gg/f6aerfE)
-* [Discuss topics on our forums](http://forums.xenko.com/)
-* [Report engine issues](https://github.com/xenko3d/xenko/issues)
-* [Donate to support the project](https://www.patreon.com/xenko)
+* [Chat with the community on Discord](https://discord.gg/k563cUH)
+* [Report engine issues](https://github.com/phr00t/xenko/issues)
 
-## Building from source
+## Building and Using Focus Engine
 
 ### Prerequisites
 
 1. [Git](https://git-scm.com/downloads) (recent version that includes LFS, or install [Git LFS](https://git-lfs.github.com/) separately).
-2. [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the following workloads:
-  * `.NET desktop development` with `.NET Framework 4.7.2 targeting pack`
-  * `Desktop development with C++` with `Windows 10 SDK (10.0.17763.0)` or later, and `VC++ 2017 version 15.9 v14.16 latest v141 tools` or later (both should be enabled by default)
-  * `.NET Core cross-platform development`
-  * Optional (to target UWP): `Universal Windows Platform development` with `Windows 10 SDK (10.0.17763.0)`
-  * Optional (to target iOS/Android): `Mobile development with .NET` and `Android NDK R13B+` individual component
+2. [Visual Studio 2022](https://www.visualstudio.com/downloads/) (Tested working with v17.2 LTS, newer versions unknown) with the following workloads:
+  * `.NET desktop development` with `.NET Framework 4.8 targeting pack`
+  * `Desktop development with C++` with `Windows 10 SDK (latest)`, and `VC++ 2022 latest v143 tools` or later (both should be enabled by default)
+  * .NET Core 6 Runtime should automatically be supported and configured to develop for
 3. [FBX SDK 2019.0 VS2015](https://www.autodesk.com/developer-network/platform-technologies/fbx-sdk-2019-0)
 
-### Build Xenko
-
-1. Clone Xenko: `git clone https://github.com/xenko3d/xenko.git`
-2. Open `<XenkoDir>\build\Xenko.sln` with Visual Studio 2017, and build.
-3. Open `<XenkoDir>\samples\XenkoSamples.sln` and play with the samples.
-4. Optionally, open and build `Xenko.Android.sln`, `Xenko.iOS.sln`, etc...
-
-### Contribution Guidelines
-
-Please check our [Contributing Guidelines](docs/CONTRIBUTING.md).
-
-### Build Status
-
-|Branch| **master** |
-|:--:|:--:|
-|Windows D3D11|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsD3d11&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsD3d11),branch:master/statusIcon"/></a>
-|Windows D3D12|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsD3d12&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsD3d12),branch:master/statusIcon"/></a>
-|Windows Vulkan|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsVulkan&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsVulkan),branch:master/statusIcon"/></a>
-|Windows OpenGL|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsOpenGL&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsOpenGL),branch:master/statusIcon"/></a>
-|Windows OpenGL ES|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsOpenGLES&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsOpenGLES),branch:master/statusIcon"/></a>
-|UWP|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildWindowsUWP&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildWindowsUWP),branch:master/statusIcon"/></a>
-|iOS|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildiOS&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildiOS),branch:master/statusIcon"/></a>
-|Android|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildAndroid&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildAndroid),branch:master/statusIcon"/></a>
-|Linux Vulkan|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildLinuxVulkan&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildLinuxVulkan),branch:master/statusIcon"/></a>
-|Linux OpenGL|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_BuildLinuxOpenGL&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_BuildLinuxOpenGL),branch:master/statusIcon"/></a>
-|Tests Windows Simple| <a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_Tests_WindowsSimple&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_Tests_WindowsSimple),branch:master/statusIcon"/></a>
-|Tests Windows D3D11|<a href="https://teamcity.xenko.com/viewType.html?buildTypeId=Engine_Tests_WindowsD3D11&branch=master&guest=1"><img src="https://teamcity.xenko.com/app/rest/builds/buildType:(id:Engine_Tests_WindowsD3D11),branch:master/statusIcon"/></a> 
+### Build and Run Focus Engine Game Studio
+
+1. Clone Focus: `git clone https://github.com/phr00t/FocusEngine.git`
+2. Run `<FocusDir>\build\Xenko.PCPlatforms.bat`, which starts Visual Studio.
+3. Select building for "Release" for the best performance and compatibility.
+4. After building, find the GameStudio executable and run it (probably `<FocusDir>\sources\editor\Xenko.GameStudio\bin\Release\net48`).
+5. Some templates are outdated, especially the VR one... an empty game is your best bet.
+6. Use Focus Engine's GameStudio alongside Visual Studio for building the project (you can open projects from GameStudio into Visual Studio with a toolbar icon at the top)
+7. If using Bepu physics, make sure to add a reference to `BepuPhysics.dll` in `<FocusDir>\deps\bepuphysics2`
diff --git a/THIRD PARTY.md b/THIRD PARTY.md
index e9dba9f6cb..5d76e6bd23 100644
--- a/THIRD PARTY.md	
+++ b/THIRD PARTY.md	
@@ -20,7 +20,7 @@ Xenko uses the following open-source products.
 * [SDL2](https://www.libsdl.org/) (zlib License)
 * [SharpDX](http://sharpdx.org/) (MIT License)
 * [SharpFont](https://github.com/Robmaister/SharpFont) (MIT License)
-* [SharpVulkan](https://github.com/jwollen/SharpVulkan) (MIT License)
+* [Vortice.Vulkan](https://github.com/amerkoleci/Vortice.Vulkan) (MIT License)
 * [SharpYaml](https://github.com/xoofx/SharpYaml) (MIT License)
 * [SlimMath](https://code.google.com/p/slimmath/) (MIT License)
 * [SocketsForPCL](https://github.com/rdavisau/sockets-for-pcl) (MIT License)
diff --git a/build/.nuget/NuGet.exe b/build/.nuget/NuGet.exe
index b5954e0c8a..e5f58c5838 100644
--- a/build/.nuget/NuGet.exe
+++ b/build/.nuget/NuGet.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b461af6165cfed8af7e5d485f036669e74dff0596e6d6b5924abdf66f185da94
-size 5687080
+oid sha256:96a1dc5ad572716b2ab345a6830365cf0103661ec906b0e78fd04a064a7bb730
+size 5788552
diff --git a/build/Xenko.AllPlatforms.bat b/build/Xenko.AllPlatforms.bat
index 706107de8f..addac562e2 100644
--- a/build/Xenko.AllPlatforms.bat
+++ b/build/Xenko.AllPlatforms.bat
@@ -1,2 +1,2 @@
-set XenkoPlatforms=Windows;UWP;Android;iOS;Linux
+set XenkoPlatforms=Windows;Linux
 Xenko.sln
diff --git a/build/Xenko.Android.PreSettings.Local.targets b/build/Xenko.Android.PreSettings.Local.targets
deleted file mode 100644
index 857990b1de..0000000000
--- a/build/Xenko.Android.PreSettings.Local.targets
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Build file pre-included by all Xenko projects -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <XenkoCommonPreSettingsName>Xenko</XenkoCommonPreSettingsName>
-    <XenkoPlatforms Condition="'$(XenkoPlatforms)' == ''">Windows;Android</XenkoPlatforms>
-  </PropertyGroup>
-</Project>
-
diff --git a/build/Xenko.Android.TestApks.proj b/build/Xenko.Android.TestApks.proj
deleted file mode 100644
index 4d5bee96c9..0000000000
--- a/build/Xenko.Android.TestApks.proj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project DefaultTargets="SignAndroidPackage" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <SolutionDir>$(MSBuildThisFileDirectory)</SolutionDir>
-    <SolutionName>Xenko.Android</SolutionName>
-    <Platform>Android</Platform>
-    <Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectsToBuild Include="..\sources\**\*.Android.csproj"/>
-  </ItemGroup>
-  
-  <Target Name="SignAndroidPackage">
-    <MSBuild Projects ="@(ProjectsToBuild)" 
-             Targets="SignAndroidPackage"
-             Properties="Configuration=$(Configuration);Platform=$(Platform);SolutionName=$(SolutionName);SolutionDir=$(SolutionDir);AndroidDeploymentMode=AndroidAPKDeployment">
-      <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
-    </MSBuild>
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/build/Xenko.Android.sln b/build/Xenko.Android.sln
deleted file mode 100644
index 811aca9b5a..0000000000
--- a/build/Xenko.Android.sln
+++ /dev/null
@@ -1,455 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
-MinimumVisualStudioVersion = 16.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-XenkoRuntime", "20-XenkoRuntime", "{4C142567-C42B-40F5-B092-798882190209}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}"
-	ProjectSection(SolutionItems) = preProject
-		..\store.config = ..\store.config
-		..\sources\targets\Xenko.Core.Android.CSharp.targets = ..\sources\targets\Xenko.Core.Android.CSharp.targets
-		..\sources\targets\Xenko.Core.CoreCLR.Cpp.targets = ..\sources\targets\Xenko.Core.CoreCLR.Cpp.targets
-		..\sources\targets\Xenko.Core.CoreCLR.CSharp.targets = ..\sources\targets\Xenko.Core.CoreCLR.CSharp.targets
-		..\sources\targets\Xenko.Core.Cpp.targets = ..\sources\targets\Xenko.Core.Cpp.targets
-		..\sources\targets\Xenko.Core.CSharp.targets = ..\sources\targets\Xenko.Core.CSharp.targets
-		..\sources\targets\Xenko.Core.GlobalSettings.targets = ..\sources\targets\Xenko.Core.GlobalSettings.targets
-		..\sources\targets\Xenko.Core.iOS.CSharp.targets = ..\sources\targets\Xenko.Core.iOS.CSharp.targets
-		..\sources\targets\Xenko.Core.PostSettings.Dependencies.targets = ..\sources\targets\Xenko.Core.PostSettings.Dependencies.targets
-		..\sources\targets\Xenko.Core.PostSettings.targets = ..\sources\targets\Xenko.Core.PostSettings.targets
-		..\sources\targets\Xenko.Core.PreSettings.targets = ..\sources\targets\Xenko.Core.PreSettings.targets
-		..\sources\targets\Xenko.Core.Sign.targets = ..\sources\targets\Xenko.Core.Sign.targets
-		..\sources\targets\Xenko.Core.UWP.Cpp.targets = ..\sources\targets\Xenko.Core.UWP.Cpp.targets
-		..\sources\targets\Xenko.Core.UWP.CSharp.targets = ..\sources\targets\Xenko.Core.UWP.CSharp.targets
-		..\sources\targets\Xenko.GlobalSettings.targets = ..\sources\targets\Xenko.GlobalSettings.targets
-		..\sources\native\Xenko.Native.targets = ..\sources\native\Xenko.Native.targets
-		..\sources\targets\Xenko.PostSettings.References.targets = ..\sources\targets\Xenko.PostSettings.References.targets
-		..\sources\targets\Xenko.PostSettings.targets = ..\sources\targets\Xenko.PostSettings.targets
-		..\sources\targets\Xenko.PostSettings.User.targets = ..\sources\targets\Xenko.PostSettings.User.targets
-		..\sources\targets\Xenko.PreSettings.targets = ..\sources\targets\Xenko.PreSettings.targets
-		..\sources\targets\Xenko.PreSettings.UnitTests.targets = ..\sources\targets\Xenko.PreSettings.UnitTests.targets
-		..\sources\targets\Xenko.PreSettings.User.targets = ..\sources\targets\Xenko.PreSettings.User.targets
-		..\sources\targets\Xenko.UnitTests.DisableBuild.targets = ..\sources\targets\Xenko.UnitTests.DisableBuild.targets
-		..\sources\targets\Xenko.UnitTests.targets = ..\sources\targets\Xenko.UnitTests.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "80-Shaders", "80-Shaders", "{10D145AF-C8AE-428F-A80F-CA1B591D0DB2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Config", "00-Config", "{7662CECF-2A3D-4DBA-AB3D-77FD8536E7A3}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\shared\SharedAssemblyInfo.cs = ..\sources\shared\SharedAssemblyInfo.cs
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xenko.Shared", "Xenko.Shared", "{1AC70118-C90F-4EC6-9D8B-C628BDF900F7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "21-XenkoRuntime.Tests", "21-XenkoRuntime.Tests", "{A7ED9F01-7D78-4381-90A6-D50E51C17250}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11-CoreRuntime.Tests", "11-CoreRuntime.Tests", "{22ADD4CD-092E-4ADC-A21E-64CF42230152}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}"
-	ProjectSection(SolutionItems) = preProject
-		Xenko.build = Xenko.build
-		Xenko.Core.GlobalSettings.Local.targets = Xenko.Core.GlobalSettings.Local.targets
-		Xenko.Core.PostSettings.Local.targets = Xenko.Core.PostSettings.Local.targets
-		Xenko.Core.PreSettings.Local.targets = Xenko.Core.PreSettings.Local.targets
-		Xenko.PreSettings.Local.targets = Xenko.PreSettings.Local.targets
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Engine", "..\sources\engine\Xenko.Engine\Xenko.Engine.csproj", "{C121A566-555E-42B9-9B0A-1696529A9088}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics", "..\sources\engine\Xenko.Graphics\Xenko.Graphics.csproj", "{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Engine.Tests.Android", "..\sources\engine\Xenko.Engine.Tests\Xenko.Engine.Tests.Android.csproj", "{A8F8D125-7A22-489F-99BC-9A02F545A17F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Input.Tests.Android", "..\sources\engine\Xenko.Input.Tests\Xenko.Input.Tests.Android.csproj", "{01700344-CF44-482C-BEBC-60213B0F844C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Tests.Android", "..\sources\core\Xenko.Core.Tests\Xenko.Core.Tests.Android.csproj", "{5AA408BA-E766-453E-B661-E3D7EC46E2A6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Shaders", "..\sources\shaders\Xenko.Core.Shaders\Xenko.Core.Shaders.csproj", "{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irony", "..\sources\shaders\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games", "..\sources\engine\Xenko.Games\Xenko.Games.csproj", "{42780CBD-3FE7-48E3-BD5B-59945EA20137}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Audio.Tests.Android", "..\sources\engine\Xenko.Audio.Tests\Xenko.Audio.Tests.Android.csproj", "{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core", "..\sources\core\Xenko.Core\Xenko.Core.csproj", "{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Mathematics", "..\sources\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj", "{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Serialization", "..\sources\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj", "{5210FB81-B807-49BB-AF0D-31FB6A83A572}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.MicroThreading", "..\sources\core\Xenko.Core.MicroThreading\Xenko.Core.MicroThreading.csproj", "{1320F627-EE43-4115-8E89-19D1753E51F2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.IO", "..\sources\core\Xenko.Core.IO\Xenko.Core.IO.csproj", "{1DE01410-22C9-489B-9796-1ADDAB1F64E5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders.Parser", "..\sources\engine\Xenko.Shaders.Parser\Xenko.Shaders.Parser.csproj", "{14A47447-2A24-4ECD-B24D-6571499DCD4C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders", "..\sources\engine\Xenko.Shaders\Xenko.Shaders.csproj", "{273BDD15-7392-4078-91F0-AF23594A3D7B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Audio", "..\sources\engine\Xenko.Audio\Xenko.Audio.csproj", "{DE042125-C270-4D1D-9270-0759C167567A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko", "..\sources\engine\Xenko\Xenko.csproj", "{72390339-B2A1-4F61-A800-31ED0975B515}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders.Compiler", "..\sources\engine\Xenko.Shaders.Compiler\Xenko.Shaders.Compiler.csproj", "{E8B3553F-A79F-4E50-B75B-ACEE771C320C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Input", "..\sources\engine\Xenko.Input\Xenko.Input.csproj", "{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.UI", "..\sources\engine\Xenko.UI\Xenko.UI.csproj", "{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C121A566-555E-42B9-9B0A-1696529A9088} = {C121A566-555E-42B9-9B0A-1696529A9088}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.UI.Tests.Android", "..\sources\engine\Xenko.UI.Tests\Xenko.UI.Tests.Android.csproj", "{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Regression", "..\sources\engine\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj", "{D002FEB1-00A6-4AB1-A83F-1F253465E64D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Physics", "..\sources\engine\Xenko.Physics\Xenko.Physics.csproj", "{DD592516-B341-40FE-9100-1B0FA784A060}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.SpriteStudio.Runtime", "..\sources\engine\Xenko.SpriteStudio.Runtime\Xenko.SpriteStudio.Runtime.csproj", "{9BC63BEC-F305-451D-BB31-262938EA964D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.Android", "..\sources\engine\Xenko.Graphics.Tests\Xenko.Graphics.Tests.Android.csproj", "{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.10_0.Android", "..\sources\engine\Xenko.Graphics.Tests.10_0\Xenko.Graphics.Tests.10_0.Android.csproj", "{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.11_0.Android", "..\sources\engine\Xenko.Graphics.Tests.11_0\Xenko.Graphics.Tests.11_0.Android.csproj", "{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles", "..\sources\engine\Xenko.Particles\Xenko.Particles.csproj", "{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games.Testing", "..\sources\engine\Xenko.Games.Testing\Xenko.Games.Testing.csproj", "{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Native", "..\sources\engine\Xenko.Native\Xenko.Native.csproj", "{1DBBC150-F085-43EF-B41D-27C72D133770}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles.Tests.Android", "..\sources\engine\Xenko.Particles.Tests\Xenko.Particles.Tests.Android.csproj", "{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Refactor", "..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.shproj", "{B33E576F-2279-4BFC-A438-D9B84343B56B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Physics.Tests.Android", "..\sources\engine\Xenko.Physics.Tests\Xenko.Physics.Tests.Android.csproj", "{4F0E7E04-F067-4CE8-B8C8-1105F319D123}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VirtualReality", "..\sources\engine\Xenko.VirtualReality\Xenko.VirtualReality.csproj", "{53782603-3096-40C2-ABD3-F8F311BAE4BE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Navigation", "..\sources\engine\Xenko.Navigation\Xenko.Navigation.csproj", "{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Localization", "00-Localization", "{FC791F56-C1F1-4C41-A193-868D8197F8E2}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\localization\Xenko.Assets.Presentation.pot = ..\sources\localization\Xenko.Assets.Presentation.pot
-		..\sources\localization\Xenko.Core.Assets.Editor.pot = ..\sources\localization\Xenko.Core.Assets.Editor.pot
-		..\sources\localization\Xenko.Core.Presentation.pot = ..\sources\localization\Xenko.Core.Presentation.pot
-		..\sources\localization\Xenko.GameStudio.pot = ..\sources\localization\Xenko.GameStudio.pot
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ja", "ja", "{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\localization\ja\Xenko.Assets.Presentation.ja.po = ..\sources\localization\ja\Xenko.Assets.Presentation.ja.po
-		..\sources\localization\ja\Xenko.Core.Assets.Editor.ja.po = ..\sources\localization\ja\Xenko.Core.Assets.Editor.ja.po
-		..\sources\localization\ja\Xenko.Core.Presentation.ja.po = ..\sources\localization\ja\Xenko.Core.Presentation.ja.po
-		..\sources\localization\ja\Xenko.GameStudio.ja.po = ..\sources\localization\ja\Xenko.GameStudio.ja.po
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Video", "..\sources\engine\Xenko.Video\Xenko.Video.csproj", "{DA355C86-866F-4843-9B4D-63A173C750FB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{62E9A8E4-79AF-4081-84D5-FEC5A0B28598}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\localization\fr\Xenko.Assets.Presentation.fr.po = ..\sources\localization\fr\Xenko.Assets.Presentation.fr.po
-		..\sources\localization\fr\Xenko.Core.Assets.Editor.fr.po = ..\sources\localization\fr\Xenko.Core.Assets.Editor.fr.po
-		..\sources\localization\fr\Xenko.Core.Presentation.fr.po = ..\sources\localization\fr\Xenko.Core.Presentation.fr.po
-		..\sources\localization\fr\Xenko.GameStudio.fr.po = ..\sources\localization\fr\Xenko.GameStudio.fr.po
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Rendering", "..\sources\engine\Xenko.Rendering\Xenko.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}"
-EndProject
-Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 4
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 4
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Android = Debug|Android
-		Release|Android = Release|Android
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Android.ActiveCfg = Debug|Android
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Android.Build.0 = Debug|Android
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Android.Deploy.0 = Debug|Android
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Android.ActiveCfg = Release|Android
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Android.Build.0 = Release|Android
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Android.Deploy.0 = Release|Android
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Android.ActiveCfg = Debug|Android
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Android.Build.0 = Debug|Android
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Android.Deploy.0 = Debug|Android
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.ActiveCfg = Release|Android
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.Build.0 = Release|Android
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Android.Deploy.0 = Release|Android
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Android.ActiveCfg = Debug|Android
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Android.Build.0 = Debug|Android
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Android.Deploy.0 = Debug|Android
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Android.ActiveCfg = Release|Android
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Android.Build.0 = Release|Android
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Android.Deploy.0 = Release|Android
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Android.ActiveCfg = Debug|Android
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Android.Build.0 = Debug|Android
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Android.Deploy.0 = Debug|Android
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Android.ActiveCfg = Release|Android
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Android.Build.0 = Release|Android
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Android.Deploy.0 = Release|Android
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Android.ActiveCfg = Debug|Android
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Android.Build.0 = Debug|Android
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Android.Deploy.0 = Debug|Android
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Android.ActiveCfg = Debug|Android
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Android.Build.0 = Debug|Android
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Android.Deploy.0 = Debug|Android
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.ActiveCfg = Debug|Android
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Build.0 = Debug|Android
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Android.Deploy.0 = Debug|Android
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.ActiveCfg = Release|Android
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.Build.0 = Release|Android
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Android.Deploy.0 = Release|Android
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.ActiveCfg = Debug|Android
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Build.0 = Debug|Android
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Android.Deploy.0 = Debug|Android
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.ActiveCfg = Release|Android
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.Build.0 = Release|Android
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Android.Deploy.0 = Release|Android
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Android.ActiveCfg = Debug|Android
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Android.Build.0 = Debug|Android
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Android.Deploy.0 = Debug|Android
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Android.ActiveCfg = Release|Android
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Android.Build.0 = Release|Android
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Android.Deploy.0 = Release|Android
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Android.ActiveCfg = Debug|Android
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Android.Build.0 = Debug|Android
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Android.Deploy.0 = Debug|Android
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Android.ActiveCfg = Release|Android
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Android.Build.0 = Release|Android
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Android.Deploy.0 = Release|Android
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Android.ActiveCfg = Debug|Android
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Android.Build.0 = Debug|Android
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Android.Deploy.0 = Debug|Android
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Android.ActiveCfg = Release|Android
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Android.Build.0 = Release|Android
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Android.Deploy.0 = Release|Android
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Android.ActiveCfg = Debug|Android
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Android.Build.0 = Debug|Android
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Android.Deploy.0 = Debug|Android
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Android.ActiveCfg = Release|Android
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Android.Build.0 = Release|Android
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Android.Deploy.0 = Release|Android
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Android.ActiveCfg = Debug|Android
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Android.Build.0 = Debug|Android
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Android.Deploy.0 = Debug|Android
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Android.ActiveCfg = Release|Android
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Android.Build.0 = Release|Android
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Android.Deploy.0 = Release|Android
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Android.ActiveCfg = Debug|Android
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Android.Build.0 = Debug|Android
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Android.Deploy.0 = Debug|Android
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Android.ActiveCfg = Release|Android
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Android.Build.0 = Release|Android
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Android.Deploy.0 = Release|Android
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Android.ActiveCfg = Debug|Android
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Android.Build.0 = Debug|Android
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Android.Deploy.0 = Debug|Android
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Android.ActiveCfg = Release|Android
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Android.Build.0 = Release|Android
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Android.Deploy.0 = Release|Android
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Android.ActiveCfg = Debug|Android
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Android.Build.0 = Debug|Android
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Android.Deploy.0 = Debug|Android
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Android.ActiveCfg = Release|Android
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Android.Build.0 = Release|Android
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Android.Deploy.0 = Release|Android
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Android.ActiveCfg = Debug|Android
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Android.Build.0 = Debug|Android
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Android.Deploy.0 = Debug|Android
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Android.ActiveCfg = Release|Android
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Android.Build.0 = Release|Android
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Android.Deploy.0 = Release|Android
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Android.ActiveCfg = Debug|Android
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Android.Build.0 = Debug|Android
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Android.Deploy.0 = Debug|Android
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Android.ActiveCfg = Release|Android
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Android.Build.0 = Release|Android
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Android.Deploy.0 = Release|Android
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Android.ActiveCfg = Debug|Android
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Android.Build.0 = Debug|Android
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Android.Deploy.0 = Debug|Android
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Android.ActiveCfg = Release|Android
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Android.Build.0 = Release|Android
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Android.Deploy.0 = Release|Android
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Android.ActiveCfg = Debug|Android
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Android.Build.0 = Debug|Android
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Android.Deploy.0 = Debug|Android
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Android.ActiveCfg = Release|Android
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Android.Build.0 = Release|Android
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Android.Deploy.0 = Release|Android
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Android.ActiveCfg = Debug|Android
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Android.Build.0 = Debug|Android
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Android.Deploy.0 = Debug|Android
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Android.ActiveCfg = Release|Android
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Android.Build.0 = Release|Android
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Android.Deploy.0 = Release|Android
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Android.ActiveCfg = Debug|Android
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Android.Build.0 = Debug|Android
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Android.Deploy.0 = Debug|Android
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Android.ActiveCfg = Release|Android
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Android.Build.0 = Release|Android
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Android.Deploy.0 = Release|Android
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Android.ActiveCfg = Debug|Android
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Android.Build.0 = Debug|Android
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Android.Deploy.0 = Debug|Android
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Android.ActiveCfg = Release|Android
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Android.Build.0 = Release|Android
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Android.Deploy.0 = Release|Android
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Android.ActiveCfg = Debug|Android
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Android.Build.0 = Debug|Android
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Android.Deploy.0 = Debug|Android
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Android.ActiveCfg = Release|Android
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Android.Build.0 = Release|Android
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Android.Deploy.0 = Release|Android
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Android.ActiveCfg = Debug|Android
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Android.Build.0 = Debug|Android
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Android.Deploy.0 = Debug|Android
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Android.ActiveCfg = Release|Android
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Android.Build.0 = Release|Android
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Android.Deploy.0 = Release|Android
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Android.ActiveCfg = Debug|Android
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Android.Build.0 = Debug|Android
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Android.Deploy.0 = Debug|Android
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Android.ActiveCfg = Release|Android
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Android.Build.0 = Release|Android
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Android.Deploy.0 = Release|Android
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Android.ActiveCfg = Debug|Android
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Android.Build.0 = Debug|Android
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Android.Deploy.0 = Debug|Android
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Android.ActiveCfg = Release|Android
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Android.Build.0 = Release|Android
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Android.Deploy.0 = Release|Android
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Android.ActiveCfg = Debug|Android
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Android.Build.0 = Debug|Android
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Android.Deploy.0 = Debug|Android
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Android.ActiveCfg = Release|Android
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Android.Build.0 = Release|Android
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Android.Deploy.0 = Release|Android
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Android.ActiveCfg = Debug|Android
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Android.Build.0 = Debug|Android
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Android.Deploy.0 = Debug|Android
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Android.ActiveCfg = Release|Android
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Android.Build.0 = Release|Android
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Android.Deploy.0 = Release|Android
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Android.ActiveCfg = Debug|Android
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Android.Build.0 = Debug|Android
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Android.Deploy.0 = Debug|Android
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Android.ActiveCfg = Release|Android
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Android.Build.0 = Release|Android
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Android.Deploy.0 = Release|Android
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Android.ActiveCfg = Debug|Android
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Android.Build.0 = Debug|Android
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Android.Deploy.0 = Debug|Android
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Android.ActiveCfg = Release|Android
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Android.Build.0 = Release|Android
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Android.Deploy.0 = Release|Android
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Android.ActiveCfg = Debug|Android
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Android.Build.0 = Debug|Android
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Android.Deploy.0 = Debug|Android
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Android.ActiveCfg = Release|Android
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Android.Build.0 = Release|Android
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Android.Deploy.0 = Release|Android
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Android.ActiveCfg = Debug|Android
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Android.Build.0 = Debug|Android
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Android.Deploy.0 = Debug|Android
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Android.ActiveCfg = Release|Android
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Android.Build.0 = Release|Android
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Android.Deploy.0 = Release|Android
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Android.ActiveCfg = Debug|Android
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Android.Build.0 = Debug|Android
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Android.Deploy.0 = Debug|Android
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Android.ActiveCfg = Release|Android
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Android.Build.0 = Release|Android
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Android.Deploy.0 = Release|Android
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Android.ActiveCfg = Debug|Android
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Android.Build.0 = Debug|Android
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Android.Deploy.0 = Debug|Android
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Android.ActiveCfg = Release|Android
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Android.Build.0 = Release|Android
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Android.Deploy.0 = Release|Android
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Android.ActiveCfg = Debug|Android
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Android.Build.0 = Debug|Android
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Android.Deploy.0 = Debug|Android
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Android.ActiveCfg = Release|Android
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Android.Build.0 = Release|Android
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Android.Deploy.0 = Release|Android
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Android.ActiveCfg = Debug|Android
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Android.Build.0 = Debug|Android
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Android.Deploy.0 = Debug|Android
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Android.ActiveCfg = Release|Android
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Android.Build.0 = Release|Android
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Android.Deploy.0 = Release|Android
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Android.ActiveCfg = Debug|Android
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Android.Build.0 = Debug|Android
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Android.Deploy.0 = Debug|Android
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Android.ActiveCfg = Release|Android
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Android.Build.0 = Release|Android
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Android.Deploy.0 = Release|Android
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1AC70118-C90F-4EC6-9D8B-C628BDF900F7} = {4C142567-C42B-40F5-B092-798882190209}
-		{C121A566-555E-42B9-9B0A-1696529A9088} = {4C142567-C42B-40F5-B092-798882190209}
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5} = {4C142567-C42B-40F5-B092-798882190209}
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{01700344-CF44-482C-BEBC-60213B0F844C} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6} = {22ADD4CD-092E-4ADC-A21E-64CF42230152}
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2}
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2}
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137} = {4C142567-C42B-40F5-B092-798882190209}
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{1320F627-EE43-4115-8E89-19D1753E51F2} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C} = {4C142567-C42B-40F5-B092-798882190209}
-		{273BDD15-7392-4078-91F0-AF23594A3D7B} = {4C142567-C42B-40F5-B092-798882190209}
-		{DE042125-C270-4D1D-9270-0759C167567A} = {4C142567-C42B-40F5-B092-798882190209}
-		{72390339-B2A1-4F61-A800-31ED0975B515} = {4C142567-C42B-40F5-B092-798882190209}
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C} = {4C142567-C42B-40F5-B092-798882190209}
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E} = {4C142567-C42B-40F5-B092-798882190209}
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3} = {4C142567-C42B-40F5-B092-798882190209}
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{DD592516-B341-40FE-9100-1B0FA784A060} = {4C142567-C42B-40F5-B092-798882190209}
-		{9BC63BEC-F305-451D-BB31-262938EA964D} = {4C142567-C42B-40F5-B092-798882190209}
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31} = {4C142567-C42B-40F5-B092-798882190209}
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209}
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{B33E576F-2279-4BFC-A438-D9B84343B56B} = {1AC70118-C90F-4EC6-9D8B-C628BDF900F7}
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE} = {4C142567-C42B-40F5-B092-798882190209}
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088} = {4C142567-C42B-40F5-B092-798882190209}
-		{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
-		{DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209}
-		{62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
-	EndGlobalSection
-EndGlobal
diff --git a/build/Xenko.Android.sln.DotSettings b/build/Xenko.Android.sln.DotSettings
deleted file mode 100644
index 99cf1f9c40..0000000000
--- a/build/Xenko.Android.sln.DotSettings
+++ /dev/null
@@ -1,5 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A96ED9924B3760C758AE4B2F40058EC5/RelativePath/@EntryValue">..\Xenko.sln.DotSettings</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A96ED9924B3760C758AE4B2F40058EC5/@KeyIndexDefined">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA96ED9924B3760C758AE4B2F40058EC5/@KeyIndexDefined">True</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA96ED9924B3760C758AE4B2F40058EC5/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
diff --git a/build/Xenko.Core.PostSettings.Local.targets b/build/Xenko.Core.PostSettings.Local.targets
index 8db195c498..b4f99820d9 100644
--- a/build/Xenko.Core.PostSettings.Local.targets
+++ b/build/Xenko.Core.PostSettings.Local.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <!-- Override XenkoBuildDirectory only now so that Xenko common projects still get build in obj without XenkoGraphicsApi -->
     <XenkoAssemblyProcessorGlobal>true</XenkoAssemblyProcessorGlobal>
-    <XenkoAssemblyProcessorPath>$(XenkoPackageXenko)\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe</XenkoAssemblyProcessorPath>
+    <XenkoAssemblyProcessorPath>$(XenkoPackageXenko)\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed2.exe</XenkoAssemblyProcessorPath>
 
     <XenkoDependenciesDir Condition="'$(XenkoDependenciesDir)' == ''">$(XenkoPackageXenko)\deps\</XenkoDependenciesDir>
     <XenkoDependenciesDir Condition="'$(XenkoDependenciesDir)' != '' and !HasTrailingSlash('$(XenkoDependenciesDir)')">$(XenkoDependenciesDir)\</XenkoDependenciesDir>
diff --git a/build/Xenko.PCPlatforms.bat b/build/Xenko.PCPlatforms.bat
new file mode 100644
index 0000000000..468de53b91
--- /dev/null
+++ b/build/Xenko.PCPlatforms.bat
@@ -0,0 +1,2 @@
+set XenkoPlatforms=Windows;Linux;macOS
+Xenko.sln
diff --git a/build/Xenko.PreSettings.Local.targets b/build/Xenko.PreSettings.Local.targets
index d5d9bb36cc..975f32e9c5 100644
--- a/build/Xenko.PreSettings.Local.targets
+++ b/build/Xenko.PreSettings.Local.targets
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <XenkoCommonPreSettingsName>Xenko</XenkoCommonPreSettingsName>
     <XenkoPlatforms Condition="'$(XenkoPlatforms)' == ''">Windows</XenkoPlatforms>
-    <XenkoGraphicsApis Condition="'$(XenkoGraphicsApis)' == ''">Direct3D11</XenkoGraphicsApis>
+    <XenkoGraphicsApisWindows Condition="'$(XenkoGraphicsApisWindows)' == ''">Direct3D11;Vulkan</XenkoGraphicsApisWindows>
   </PropertyGroup>
 </Project>
 
diff --git a/build/Xenko.Runtime.sln b/build/Xenko.Runtime.sln
index f0b161c629..90d27ce699 100644
--- a/build/Xenko.Runtime.sln
+++ b/build/Xenko.Runtime.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 16.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
 EndProject
@@ -9,7 +9,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}"
 	ProjectSection(SolutionItems) = preProject
 		..\store.config = ..\store.config
-		..\sources\targets\Xenko.Core.Android.CSharp.targets = ..\sources\targets\Xenko.Core.Android.CSharp.targets
 		..\sources\targets\Xenko.Core.CoreCLR.Cpp.targets = ..\sources\targets\Xenko.Core.CoreCLR.Cpp.targets
 		..\sources\targets\Xenko.Core.CoreCLR.CSharp.targets = ..\sources\targets\Xenko.Core.CoreCLR.CSharp.targets
 		..\sources\targets\Xenko.Core.Cpp.targets = ..\sources\targets\Xenko.Core.Cpp.targets
@@ -149,9 +148,9 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 4
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 4
+		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5
+		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5
+		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/build/Xenko.UWP.bat b/build/Xenko.UWP.bat
deleted file mode 100644
index 24dac7b22a..0000000000
--- a/build/Xenko.UWP.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-set XenkoPlatforms=Windows;UWP
-Xenko.Runtime.sln
diff --git a/build/Xenko.build b/build/Xenko.build
index 3264f16f52..c303dcd9b1 100644
--- a/build/Xenko.build
+++ b/build/Xenko.build
@@ -11,12 +11,14 @@ Example of use:
     <XenkoSolutionLauncher>$(XenkoRoot)build\Xenko.Launcher</XenkoSolutionLauncher>
     <XenkoPlatforms Condition="'$(XenkoPlatforms)' == ''">Windows</XenkoPlatforms>
     <BuildProperties>Configuration=Release;NoWarn=1591;DeployExtension=false;XenkoPlatforms=$([MSBuild]::Escape('$(XenkoPlatforms)'));XenkoGraphicsApiDependentBuildAll=$(XenkoGraphicsApiDependentBuildAll)</BuildProperties>
+    <XenkoSign Condition="'$(XenkoSign)' == ''">true</XenkoSign>
     <BuildProperties Condition="'$(XenkoSign)' != ''">$(BuildProperties);XenkoSign=$(XenkoSign)</BuildProperties>
     <BuildProperties Condition="'$(XenkoOfficialBuild)' != ''">$(BuildProperties);XenkoOfficialBuild=$(XenkoOfficialBuild)</BuildProperties>
     <NuGetPath>$(MSBuildThisFileDirectory).nuget\NuGet.exe</NuGetPath>
     <XunitRunnerConsoleVersion>2.4.1</XunitRunnerConsoleVersion>
     <XenkoStoreUrl Condition="'$(XenkoStoreUrl)' == ''">https://api.nuget.org/v3/index.json</XenkoStoreUrl>
     <AdvancedInstallerPath Condition="'$(AdvancedInstallerPath)' == '' And Exists('$(MSBuildProgramFiles32)\Caphyon\Advanced Installer 15.5.1\bin\x86\advinst.exe')">$(MSBuildProgramFiles32)\Caphyon\Advanced Installer 15.5.1\bin\x86\advinst.exe</AdvancedInstallerPath>
+    <XenkoBuildPrerequisitesInstaller Condition="'$(XenkoBuildPrerequisitesInstaller)' == ''">true</XenkoBuildPrerequisitesInstaller>
   </PropertyGroup>
 
   <UsingTask TaskName="Xenko.GitVersioning.GenerateVersionFile" AssemblyFile="$(XenkoRoot)deps\Xenko.GitVersioning\bin\Debug\net472\Xenko.GitVersioning.dll" />
@@ -94,9 +96,9 @@ Example of use:
   <!-- Package -->
   <Target Name="PreparePackageBuild">
     <PropertyGroup>
-      <BuildProperties>$(BuildProperties);XenkoPublicApi=true;XenkoPackageBuild=true;XenkoSignTool=true</BuildProperties>
+      <BuildProperties>$(BuildProperties);XenkoPublicApi=true;XenkoPackageBuild=true</BuildProperties>
     </PropertyGroup>
-	
+    
     <ItemGroup>
       <FilesToDeletePackages Include="$(XenkoRoot)bin\packages\*.nupkg"/>
     </ItemGroup>
@@ -106,7 +108,7 @@ Example of use:
     <!-- Make sure Xenko.GitVersioning is built to run the task to update package version.
          It might be better to move it to a prebuilt assembly if that becomes a problem.
     -->
-	<MSBuild Targets="Restore" Projects="$(XenkoRoot)deps\Xenko.GitVersioning\Xenko.GitVersioning.csproj"/>
+    <MSBuild Targets="Restore" Projects="$(XenkoRoot)deps\Xenko.GitVersioning\Xenko.GitVersioning.csproj"/>
     <MSBuild Targets="Build" Projects="$(XenkoRoot)deps\Xenko.GitVersioning\Xenko.GitVersioning.csproj"/>
     
     <!-- Create SharedAssemblyInfo.NuGet.cs with Git information (different between official build and internal builds) -->
@@ -117,18 +119,17 @@ Example of use:
       <Output TaskParameter="NuGetVersion" PropertyName="XenkoPackageVersion"/>
     </GenerateVersionFile>
 
-	<Message Text="Done preparing build for version $(XenkoPackageVersion)"/>
-	<TeamCitySetBuildNumber BuildNumber="$(XenkoPackageVersion)" Condition="'$(TEAMCITY_BUILD_PROPERTIES_FILE)' != '' " />
+    <Message Text="Done preparing build for version $(XenkoPackageVersion)"/>
+    <TeamCitySetBuildNumber BuildNumber="$(XenkoPackageVersion)" Condition="'$(TEAMCITY_BUILD_PROPERTIES_FILE)' != '' " />
   </Target>
-  <Target Name="Package" DependsOnTargets="PreparePackageBuild;PrerequisitesInstaller;Build;VSIXPlugin"/>
+  <PropertyGroup>
+    <_XenkoPackageTargetPrerequisitesInstaller Condition="'$(XenkoBuildPrerequisitesInstaller)' == 'true'">PrerequisitesInstaller</_XenkoPackageTargetPrerequisitesInstaller>
+  </PropertyGroup>
+  <Target Name="Package" DependsOnTargets="PreparePackageBuild;$(_XenkoPackageTargetPrerequisitesInstaller);Build;VSIXPlugin"/>
   
-  <Target Name="CopyXenkoKey">
-    <Copy Condition="'$(XenkoSign)' == 'true' And Exists('$(LOCALAPPDATA)\Xenko\XenkoBuildKey\xenko.snk')" SourceFiles="$(LOCALAPPDATA)\Xenko\XenkoBuildKey\xenko.snk" DestinationFolder="$(MSBuildThisFileDirectory)"/>
-  </Target>
-
   <Target Name="Restore">
     <PropertyGroup>
-	  <RestoreExec><![CDATA[
+      <RestoreExec><![CDATA[
         set XenkoGraphicsApiDependentBuildAll=$(XenkoGraphicsApiDependentBuildAll)
         set XenkoGraphicsApi=$(XenkoGraphicsApi)
         set XenkoPlatforms=$(XenkoPlatforms)
@@ -138,62 +139,62 @@ Example of use:
     <Exec Command="$(RestoreExec)" />
   </Target>
 
-  <Target Name="Build" DependsOnTargets="CopyXenkoKey">
+  <Target Name="Build">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution);XenkoGraphicsApiDependentBuildAll=$(XenkoGraphicsApiDependentBuildAll)"/>
-	<MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
+    <MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);Platform=Mixed Platforms"/>
   </Target>
 
-  <Target Name="BuildRuntime" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildRuntime">
     <PropertyGroup>
       <XenkoSolution>$(XenkoSolution).Runtime</XenkoSolution>
     </PropertyGroup>
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution)"/>
-	<MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties)"/>
+    <MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties)"/>
   </Target>
   
-  <Target Name="BuildWindows" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindows">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution);XenkoGraphicsApiDependentBuildAll=$(XenkoGraphicsApiDependentBuildAll)"/>
     <MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);XenkoSkipAutoPack=true;XenkoSkipUnitTests=true;XenkoGraphicsApiDependentBuildAll=$(XenkoGraphicsApiDependentBuildAll)"/>
   </Target>
 
-  <Target Name="BuildWindowsDirect3D11" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsDirect3D11">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution).Runtime"/>
     <MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
   
-  <Target Name="BuildWindowsDirect3D12" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsDirect3D12">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution).Runtime;XenkoGraphicsApi=Direct3D12"/>
     <MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=Direct3D12;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
 
-  <Target Name="BuildWindowsOpenGL" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsOpenGL">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution).Runtime;XenkoGraphicsApi=OpenGL"/>
     <MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=OpenGL;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
 
-  <Target Name="BuildWindowsOpenGLES" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsOpenGLES">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution).Runtime;XenkoGraphicsApi=OpenGLES"/>
     <MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=OpenGLES;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
 
-  <Target Name="BuildAndroid" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildAndroid">
     <Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).Android.sln"' />
     <MSBuild Targets="Build" Projects="$(XenkoSolution).Android.sln" Properties="$(BuildProperties);XenkoPlatforms=Android;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
 
-  <Target Name="BuildiOS" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildiOS">
     <Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).iOS.sln"' />
     <MSBuild Targets="Build" Projects="$(XenkoSolution).iOS.sln" Properties="$(BuildProperties);XenkoPlatforms=iOS;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
   
-  <Target Name="BuildWindowsStore" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsStore">
     <!-- Only a warning since build servers might still call this target for old branches -->
     <Warning Text="Windows Store doesn't exist anymore"/>
   </Target>
 
   <Target Name="BuildWindows10" DependsOnTargets="BuildUWP" />
 
-  <Target Name="BuildUWP" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildUWP">
     <PropertyGroup>
       <XenkoSolution>$(XenkoSolution).Runtime</XenkoSolution>
       <XenkoPlatforms>UWP</XenkoPlatforms>
@@ -202,17 +203,17 @@ Example of use:
     <MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);XenkoPlatforms=$(XenkoPlatforms);XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
   
-  <Target Name="BuildWindowsPhone" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsPhone">
     <!-- Only a warning since build servers might still call this target for old branches -->
     <Warning Text="Windows Phone doesn't exist anymore"/>
   </Target>
   
-  <Target Name="BuildWindowsVulkan" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildWindowsVulkan">
     <MSBuild Targets="Restore" Projects="$(MSBuildThisFileFullPath)" Properties="XenkoPlatforms=$(XenkoPlatforms);XenkoSolution=$(XenkoSolution).Runtime;XenkoGraphicsApi=Vulkan"/>
     <MSBuild Targets="Build" Projects="$(XenkoSolution).Runtime.sln" Properties="$(BuildProperties);XenkoGraphicsApi=Vulkan;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target>
   
-  <Target Name="BuildLinux" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildLinux">
     <PropertyGroup>
       <XenkoSolution>$(XenkoSolution).Runtime</XenkoSolution>
       <XenkoPlatforms>Linux</XenkoPlatforms>
@@ -221,7 +222,7 @@ Example of use:
     <MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);XenkoPlatforms=$(XenkoPlatforms);XenkoSkipAutoPack=true;XenkoSkipUnitTests=true;XenkoGraphicsApiDependentBuildAll=$(XenkoGraphicsApiDependentBuildAll)"/>
   </Target> 
 
-  <Target Name="BuildLinuxVulkan" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildLinuxVulkan">
     <PropertyGroup>
       <XenkoSolution>$(XenkoSolution).Runtime</XenkoSolution>
       <XenkoPlatforms>Linux</XenkoPlatforms>
@@ -230,7 +231,7 @@ Example of use:
     <MSBuild Targets="Build" Projects="$(XenkoSolution).sln" Properties="$(BuildProperties);XenkoPlatforms=$(XenkoPlatforms);XenkoGraphicsApi=Vulkan;XenkoSkipAutoPack=true;XenkoSkipUnitTests=true"/>
   </Target> 
   
-  <Target Name="BuildmacOS" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildmacOS">
     <Exec Command='"$(NuGetPath)" restore "$(XenkoSolution).macOS.sln"' />
     <MSBuild Targets="Build" Projects="$(XenkoSolution).macOS.sln" Properties="$(BuildProperties);Platform=macOS"/>
   </Target> 
@@ -238,8 +239,8 @@ Example of use:
   <Target Name="DownloadXunitRunnerConsole">
     <MakeDir Directories="$(MSBuildThisFileDirectory)packages"/>
     <PropertyGroup>
-      <XunitRunnerConsolePathDefault>$(MSBuildThisFileDirectory)packages\xunit.runner.console.$(XunitRunnerConsoleVersion)\tools\net461\xunit.console.exe</XunitRunnerConsolePathDefault>
-      <XunitRunnerConsolePathX86>$(MSBuildThisFileDirectory)packages\xunit.runner.console.$(XunitRunnerConsoleVersion)\tools\net461\xunit.console.x86.exe</XunitRunnerConsolePathX86>
+      <XunitRunnerConsolePathDefault>$(MSBuildThisFileDirectory)packages\xunit.runner.console.$(XunitRunnerConsoleVersion)\tools\net48\xunit.console.exe</XunitRunnerConsolePathDefault>
+      <XunitRunnerConsolePathX86>$(MSBuildThisFileDirectory)packages\xunit.runner.console.$(XunitRunnerConsoleVersion)\tools\net48\xunit.console.x86.exe</XunitRunnerConsolePathX86>
     </PropertyGroup>
     <Exec Command='"$(NuGetPath)" install xunit.runner.console -Version $(XunitRunnerConsoleVersion)' Condition="!Exists('$(XunitRunnerConsolePathDefault)')" WorkingDirectory="$(MSBuildThisFileDirectory)packages" />
     <Error Text="Could not find xunit.runner at expected location [$(XunitRunnerConsolePathDefault)]" Condition="!Exists('$(XunitRunnerConsolePathDefault)')"/>
@@ -251,7 +252,7 @@ Example of use:
       <XenkoTestCategories Condition="'$(XenkoTestCategories)' == ''">Simple;Game;VSPackage</XenkoTestCategories>
       <!-- We enclose everything with ;, so that we could do full word matches more easily with string.Contains() -->
       <XenkoTestCategories>;$(XenkoTestCategories);</XenkoTestCategories>
-	  <XenkoTestExtraTargets></XenkoTestExtraTargets>
+      <XenkoTestExtraTargets></XenkoTestExtraTargets>
       <XenkoTestExtraTargets Condition="$(XenkoTestCategories.Contains(';GameAndroid;'))">$(XenkoTestExtraTargets);SignAndroidPackage</XenkoTestExtraTargets>
     </PropertyGroup>
     
@@ -330,14 +331,14 @@ Example of use:
       <UnitTestPrerequisites Include="@(UnitTestGame)"/>
       <UnitTest Include="@(UnitTestGame)"><Solution>$(XenkoSolution).Vulkan.sln</Solution></UnitTest>
     </ItemGroup>
-	
-	<!-- Android unit tests -->
+    
+    <!-- Android unit tests -->
     <ItemGroup Condition="$(XenkoTestCategories.Contains(';GameAndroid;'))">
       <UnitTestPrerequisites Include="@(UnitTestGame)"/>
       <UnitTest Include="@(UnitTestGameAndroid)"><Solution>$(XenkoSolution).Android.sln</Solution></UnitTest> 
     </ItemGroup>
-	
-	<!-- Samples unit tests -->
+    
+    <!-- Samples unit tests -->
     <ItemGroup Condition="$(XenkoTestCategories.Contains(';Samples;'))">
       <UnitTest Include="72-XenkoSamples\Xenko.Samples.Tests"/>
     </ItemGroup>
@@ -357,7 +358,7 @@ Example of use:
         <Solution Condition="'%(UnitTest.Solution)' == ''">$(XenkoSolution).sln</Solution>
       </UnitTest>
     </ItemGroup>
-	
+    
     <!-- Restore NuGet packages -->
     <Message Importance="High" Text="Restoring NuGet packages"/>
     <Exec Condition="'%(UnitTestPrerequisites.Solution)' != ''" Command='"$(NuGetPath)" restore "%(UnitTestPrerequisites.Solution)"' />
@@ -472,12 +473,12 @@ Example of use:
     
     <!-- Update store.config with additional parameters -->
     <Exec Command='"$(NuGetPath)" sources Add -Name "Xenko $(CustomInstaller)" -Source "$(CustomInstallerStoreUrl)" -ConfigFile "$(XenkoRoot)sources\launcher\Xenko.LauncherApp\bin\Release\store.config"'/>
-	
+    
     <!-- Run advanced installer -->
     <Exec Command='"$(AdvancedInstallerPath)" /rebuild "$(XenkoRoot)sources\launcher\Setup\setup-$(CustomInstallerNoSpace).aip"'/>
     <Copy SourceFiles="$(XenkoRoot)sources\launcher\Setup\setup-$(CustomInstallerNoSpace)-SetupFiles\XenkoSetup$(CustomInstallerNoSpace).exe" DestinationFolder="$(MSBuildThisFileDirectory)"/>
     <Delete Files="$(XenkoRoot)sources\launcher\Setup\setup-$(CustomInstallerNoSpace).aip"/>
-	
+    
     <!-- Restore store.config -->
     <Copy SourceFiles="$(XenkoRoot)sources\launcher\Xenko.LauncherApp\bin\Release\store.config.backup" DestinationFiles="$(XenkoRoot)Xenko.LauncherApp\bin\Release\store.config"/>
     <Delete Files="$(XenkoRoot)sources\launcher\Xenko.LauncherApp\bin\Release\store.config.backup"/>	
@@ -512,9 +513,9 @@ Example of use:
     <Exec Command='"$(NuGetPath)" push ..\bin\launcher\*.nupkg -ApiKey $(XenkoStoreApiKey) -Source $(XenkoStoreUrl) -NoSymbols'/>
   </Target>
   
-  <Target Name="BuildLauncher" DependsOnTargets="CopyXenkoKey">
+  <Target Name="BuildLauncher">
     <Exec Command='"$(NuGetPath)" restore "$(XenkoSolutionLauncher).sln"' />
-	<MSBuild Targets="Build" Projects="$(XenkoSolutionLauncher).sln" Properties="$(BuildProperties);XenkoSignTool=true;Platform=Any CPU"/>
+    <MSBuild Targets="Build" Projects="$(XenkoSolutionLauncher).sln" Properties="$(BuildProperties);Platform=Any CPU"/>
   </Target>
 
 </Project>
diff --git a/build/Xenko.iOS.PreSettings.Local.targets b/build/Xenko.iOS.PreSettings.Local.targets
deleted file mode 100644
index bcc531f223..0000000000
--- a/build/Xenko.iOS.PreSettings.Local.targets
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Build file pre-included by all Xenko projects -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <XenkoCommonPreSettingsName>Xenko</XenkoCommonPreSettingsName>
-    <XenkoPlatforms Condition="'$(XenkoPlatforms)' == ''">Windows;iOS</XenkoPlatforms>
-  </PropertyGroup>
-</Project>
-
diff --git a/build/Xenko.iOS.sln b/build/Xenko.iOS.sln
deleted file mode 100644
index 36d11a95c7..0000000000
--- a/build/Xenko.iOS.sln
+++ /dev/null
@@ -1,680 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
-MinimumVisualStudioVersion = 16.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "10-CoreRuntime", "10-CoreRuntime", "{2E93E2B5-4500-4E47-9B65-E705218AB578}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "20-XenkoRuntime", "20-XenkoRuntime", "{4C142567-C42B-40F5-B092-798882190209}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Targets.Private", "{97978864-95DD-43A6-9159-AA1C881BE99F}"
-	ProjectSection(SolutionItems) = preProject
-		..\store.config = ..\store.config
-		..\sources\targets\Xenko.Core.Android.CSharp.targets = ..\sources\targets\Xenko.Core.Android.CSharp.targets
-		..\sources\targets\Xenko.Core.CoreCLR.Cpp.targets = ..\sources\targets\Xenko.Core.CoreCLR.Cpp.targets
-		..\sources\targets\Xenko.Core.CoreCLR.CSharp.targets = ..\sources\targets\Xenko.Core.CoreCLR.CSharp.targets
-		..\sources\targets\Xenko.Core.Cpp.targets = ..\sources\targets\Xenko.Core.Cpp.targets
-		..\sources\targets\Xenko.Core.CSharp.targets = ..\sources\targets\Xenko.Core.CSharp.targets
-		..\sources\targets\Xenko.Core.GlobalSettings.targets = ..\sources\targets\Xenko.Core.GlobalSettings.targets
-		..\sources\targets\Xenko.Core.iOS.CSharp.targets = ..\sources\targets\Xenko.Core.iOS.CSharp.targets
-		..\sources\targets\Xenko.Core.PostSettings.Dependencies.targets = ..\sources\targets\Xenko.Core.PostSettings.Dependencies.targets
-		..\sources\targets\Xenko.Core.PostSettings.targets = ..\sources\targets\Xenko.Core.PostSettings.targets
-		..\sources\targets\Xenko.Core.PreSettings.targets = ..\sources\targets\Xenko.Core.PreSettings.targets
-		..\sources\targets\Xenko.Core.Sign.targets = ..\sources\targets\Xenko.Core.Sign.targets
-		..\sources\targets\Xenko.Core.UWP.Cpp.targets = ..\sources\targets\Xenko.Core.UWP.Cpp.targets
-		..\sources\targets\Xenko.Core.UWP.CSharp.targets = ..\sources\targets\Xenko.Core.UWP.CSharp.targets
-		..\sources\targets\Xenko.GlobalSettings.targets = ..\sources\targets\Xenko.GlobalSettings.targets
-		..\sources\native\Xenko.Native.targets = ..\sources\native\Xenko.Native.targets
-		..\sources\targets\Xenko.PostSettings.References.targets = ..\sources\targets\Xenko.PostSettings.References.targets
-		..\sources\targets\Xenko.PostSettings.targets = ..\sources\targets\Xenko.PostSettings.targets
-		..\sources\targets\Xenko.PostSettings.User.targets = ..\sources\targets\Xenko.PostSettings.User.targets
-		..\sources\targets\Xenko.PreSettings.targets = ..\sources\targets\Xenko.PreSettings.targets
-		..\sources\targets\Xenko.PreSettings.UnitTests.targets = ..\sources\targets\Xenko.PreSettings.UnitTests.targets
-		..\sources\targets\Xenko.PreSettings.User.targets = ..\sources\targets\Xenko.PreSettings.User.targets
-		..\sources\targets\Xenko.UnitTests.DisableBuild.targets = ..\sources\targets\Xenko.UnitTests.DisableBuild.targets
-		..\sources\targets\Xenko.UnitTests.targets = ..\sources\targets\Xenko.UnitTests.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "80-Shaders", "80-Shaders", "{10D145AF-C8AE-428F-A80F-CA1B591D0DB2}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Config", "00-Config", "{7662CECF-2A3D-4DBA-AB3D-77FD8536E7A3}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\shared\SharedAssemblyInfo.cs = ..\sources\shared\SharedAssemblyInfo.cs
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xenko.Shared", "Xenko.Shared", "{1AC70118-C90F-4EC6-9D8B-C628BDF900F7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "21-XenkoRuntime.Tests", "21-XenkoRuntime.Tests", "{A7ED9F01-7D78-4381-90A6-D50E51C17250}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11-CoreRuntime.Tests", "11-CoreRuntime.Tests", "{22ADD4CD-092E-4ADC-A21E-64CF42230152}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}"
-	ProjectSection(SolutionItems) = preProject
-		Xenko.build = Xenko.build
-		Xenko.Core.GlobalSettings.Local.targets = Xenko.Core.GlobalSettings.Local.targets
-		Xenko.Core.PostSettings.Local.targets = Xenko.Core.PostSettings.Local.targets
-		Xenko.Core.PreSettings.Local.targets = Xenko.Core.PreSettings.Local.targets
-		Xenko.PreSettings.Local.targets = Xenko.PreSettings.Local.targets
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Engine", "..\sources\engine\Xenko.Engine\Xenko.Engine.csproj", "{C121A566-555E-42B9-9B0A-1696529A9088}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {F2D52EDB-BC17-4243-B06D-33CD20F87A7F}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics", "..\sources\engine\Xenko.Graphics\Xenko.Graphics.csproj", "{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Engine.Tests.iOS", "..\sources\engine\Xenko.Engine.Tests\Xenko.Engine.Tests.iOS.csproj", "{A8F8D125-7A22-489F-99BC-9A02F545A17F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Input.Tests.iOS", "..\sources\engine\Xenko.Input.Tests\Xenko.Input.Tests.iOS.csproj", "{01700344-CF44-482C-BEBC-60213B0F844C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Tests.iOS", "..\sources\core\Xenko.Core.Tests\Xenko.Core.Tests.iOS.csproj", "{5AA408BA-E766-453E-B661-E3D7EC46E2A6}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Shaders", "..\sources\shaders\Xenko.Core.Shaders\Xenko.Core.Shaders.csproj", "{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irony", "..\sources\shaders\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games", "..\sources\engine\Xenko.Games\Xenko.Games.csproj", "{42780CBD-3FE7-48E3-BD5B-59945EA20137}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Audio.Tests.iOS", "..\sources\engine\Xenko.Audio.Tests\Xenko.Audio.Tests.iOS.csproj", "{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core", "..\sources\core\Xenko.Core\Xenko.Core.csproj", "{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Mathematics", "..\sources\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj", "{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Serialization", "..\sources\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj", "{5210FB81-B807-49BB-AF0D-31FB6A83A572}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.MicroThreading", "..\sources\core\Xenko.Core.MicroThreading\Xenko.Core.MicroThreading.csproj", "{1320F627-EE43-4115-8E89-19D1753E51F2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.IO", "..\sources\core\Xenko.Core.IO\Xenko.Core.IO.csproj", "{1DE01410-22C9-489B-9796-1ADDAB1F64E5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders.Parser", "..\sources\engine\Xenko.Shaders.Parser\Xenko.Shaders.Parser.csproj", "{14A47447-2A24-4ECD-B24D-6571499DCD4C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders", "..\sources\engine\Xenko.Shaders\Xenko.Shaders.csproj", "{273BDD15-7392-4078-91F0-AF23594A3D7B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Audio", "..\sources\engine\Xenko.Audio\Xenko.Audio.csproj", "{DE042125-C270-4D1D-9270-0759C167567A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko", "..\sources\engine\Xenko\Xenko.csproj", "{72390339-B2A1-4F61-A800-31ED0975B515}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders.Compiler", "..\sources\engine\Xenko.Shaders.Compiler\Xenko.Shaders.Compiler.csproj", "{E8B3553F-A79F-4E50-B75B-ACEE771C320C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Input", "..\sources\engine\Xenko.Input\Xenko.Input.csproj", "{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.UI", "..\sources\engine\Xenko.UI\Xenko.UI.csproj", "{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C121A566-555E-42B9-9B0A-1696529A9088} = {C121A566-555E-42B9-9B0A-1696529A9088}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.UI.Tests.iOS", "..\sources\engine\Xenko.UI.Tests\Xenko.UI.Tests.iOS.csproj", "{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Regression", "..\sources\engine\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj", "{D002FEB1-00A6-4AB1-A83F-1F253465E64D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Physics", "..\sources\engine\Xenko.Physics\Xenko.Physics.csproj", "{DD592516-B341-40FE-9100-1B0FA784A060}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.SpriteStudio.Runtime", "..\sources\engine\Xenko.SpriteStudio.Runtime\Xenko.SpriteStudio.Runtime.csproj", "{9BC63BEC-F305-451D-BB31-262938EA964D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.iOS", "..\sources\engine\Xenko.Graphics.Tests\Xenko.Graphics.Tests.iOS.csproj", "{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.10_0.iOS", "..\sources\engine\Xenko.Graphics.Tests.10_0\Xenko.Graphics.Tests.10_0.iOS.csproj", "{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.11_0.iOS", "..\sources\engine\Xenko.Graphics.Tests.11_0\Xenko.Graphics.Tests.11_0.iOS.csproj", "{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles", "..\sources\engine\Xenko.Particles\Xenko.Particles.csproj", "{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games.Testing", "..\sources\engine\Xenko.Games.Testing\Xenko.Games.Testing.csproj", "{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Native", "..\sources\engine\Xenko.Native\Xenko.Native.csproj", "{1DBBC150-F085-43EF-B41D-27C72D133770}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles.Tests.iOS", "..\sources\engine\Xenko.Particles.Tests\Xenko.Particles.Tests.iOS.csproj", "{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Refactor", "..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.shproj", "{B33E576F-2279-4BFC-A438-D9B84343B56B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Physics.Tests.iOS", "..\sources\engine\Xenko.Physics.Tests\Xenko.Physics.Tests.iOS.csproj", "{4F0E7E04-F067-4CE8-B8C8-1105F319D123}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VirtualReality", "..\sources\engine\Xenko.VirtualReality\Xenko.VirtualReality.csproj", "{53782603-3096-40C2-ABD3-F8F311BAE4BE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Navigation", "..\sources\engine\Xenko.Navigation\Xenko.Navigation.csproj", "{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Localization", "00-Localization", "{FC791F56-C1F1-4C41-A193-868D8197F8E2}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\localization\Xenko.Assets.Presentation.pot = ..\sources\localization\Xenko.Assets.Presentation.pot
-		..\sources\localization\Xenko.Core.Assets.Editor.pot = ..\sources\localization\Xenko.Core.Assets.Editor.pot
-		..\sources\localization\Xenko.Core.Presentation.pot = ..\sources\localization\Xenko.Core.Presentation.pot
-		..\sources\localization\Xenko.GameStudio.pot = ..\sources\localization\Xenko.GameStudio.pot
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ja", "ja", "{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\localization\ja\Xenko.Assets.Presentation.ja.po = ..\sources\localization\ja\Xenko.Assets.Presentation.ja.po
-		..\sources\localization\ja\Xenko.Core.Assets.Editor.ja.po = ..\sources\localization\ja\Xenko.Core.Assets.Editor.ja.po
-		..\sources\localization\ja\Xenko.Core.Presentation.ja.po = ..\sources\localization\ja\Xenko.Core.Presentation.ja.po
-		..\sources\localization\ja\Xenko.GameStudio.ja.po = ..\sources\localization\ja\Xenko.GameStudio.ja.po
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Video", "..\sources\engine\Xenko.Video\Xenko.Video.csproj", "{DA355C86-866F-4843-9B4D-63A173C750FB}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{62E9A8E4-79AF-4081-84D5-FEC5A0B28598}"
-	ProjectSection(SolutionItems) = preProject
-		..\sources\localization\fr\Xenko.Assets.Presentation.fr.po = ..\sources\localization\fr\Xenko.Assets.Presentation.fr.po
-		..\sources\localization\fr\Xenko.Core.Assets.Editor.fr.po = ..\sources\localization\fr\Xenko.Core.Assets.Editor.fr.po
-		..\sources\localization\fr\Xenko.Core.Presentation.fr.po = ..\sources\localization\fr\Xenko.Core.Presentation.fr.po
-		..\sources\localization\fr\Xenko.GameStudio.fr.po = ..\sources\localization\fr\Xenko.GameStudio.fr.po
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Rendering", "..\sources\engine\Xenko.Rendering\Xenko.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}"
-EndProject
-Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 4
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 4
-	EndGlobalSection
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|iPhone = Debug|iPhone
-		Debug|iPhoneSimulator = Debug|iPhoneSimulator
-		Release|iPhone = Release|iPhone
-		Release|iPhoneSimulator = Release|iPhoneSimulator
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhone.Build.0 = Debug|iPhone
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhone.ActiveCfg = Release|iPhone
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhone.Build.0 = Release|iPhone
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhone.Deploy.0 = Release|iPhone
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhone.Build.0 = Debug|iPhone
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhone.ActiveCfg = Release|iPhone
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhone.Build.0 = Release|iPhone
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhone.Deploy.0 = Release|iPhone
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|iPhone.Build.0 = Debug|iPhone
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|iPhone.ActiveCfg = Release|iPhone
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|iPhone.Build.0 = Release|iPhone
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|iPhone.Deploy.0 = Release|iPhone
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|iPhone.Build.0 = Debug|iPhone
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|iPhone.ActiveCfg = Release|iPhone
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|iPhone.Build.0 = Release|iPhone
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|iPhone.Deploy.0 = Release|iPhone
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|iPhone.Build.0 = Debug|iPhone
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|iPhone.ActiveCfg = Debug|iPhone
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|iPhone.Build.0 = Debug|iPhone
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|iPhone.Deploy.0 = Debug|iPhone
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhone.Build.0 = Debug|iPhone
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhone.ActiveCfg = Release|iPhone
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhone.Build.0 = Release|iPhone
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhone.Deploy.0 = Release|iPhone
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhone.Build.0 = Debug|iPhone
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhone.ActiveCfg = Release|iPhone
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhone.Build.0 = Release|iPhone
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhone.Deploy.0 = Release|iPhone
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhone.Build.0 = Debug|iPhone
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhone.ActiveCfg = Release|iPhone
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhone.Build.0 = Release|iPhone
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhone.Deploy.0 = Release|iPhone
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|iPhone.Build.0 = Debug|iPhone
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|iPhone.ActiveCfg = Release|iPhone
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|iPhone.Build.0 = Release|iPhone
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|iPhone.Deploy.0 = Release|iPhone
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhone.Build.0 = Debug|iPhone
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhone.ActiveCfg = Release|iPhone
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhone.Build.0 = Release|iPhone
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhone.Deploy.0 = Release|iPhone
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhone.Build.0 = Debug|iPhone
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhone.ActiveCfg = Release|iPhone
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhone.Build.0 = Release|iPhone
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhone.Deploy.0 = Release|iPhone
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhone.Build.0 = Debug|iPhone
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhone.ActiveCfg = Release|iPhone
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhone.Build.0 = Release|iPhone
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhone.Deploy.0 = Release|iPhone
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhone.Build.0 = Debug|iPhone
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhone.ActiveCfg = Release|iPhone
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhone.Build.0 = Release|iPhone
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhone.Deploy.0 = Release|iPhone
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhone.Build.0 = Debug|iPhone
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhone.ActiveCfg = Release|iPhone
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhone.Build.0 = Release|iPhone
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhone.Deploy.0 = Release|iPhone
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhone.Build.0 = Debug|iPhone
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhone.ActiveCfg = Release|iPhone
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhone.Build.0 = Release|iPhone
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhone.Deploy.0 = Release|iPhone
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhone.Build.0 = Debug|iPhone
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhone.ActiveCfg = Release|iPhone
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhone.Build.0 = Release|iPhone
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhone.Deploy.0 = Release|iPhone
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhone.Build.0 = Debug|iPhone
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhone.ActiveCfg = Release|iPhone
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhone.Build.0 = Release|iPhone
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhone.Deploy.0 = Release|iPhone
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhone.Build.0 = Debug|iPhone
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhone.ActiveCfg = Release|iPhone
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhone.Build.0 = Release|iPhone
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhone.Deploy.0 = Release|iPhone
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhone.Build.0 = Debug|iPhone
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhone.ActiveCfg = Release|iPhone
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhone.Build.0 = Release|iPhone
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhone.Deploy.0 = Release|iPhone
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhone.Build.0 = Debug|iPhone
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhone.ActiveCfg = Release|iPhone
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhone.Build.0 = Release|iPhone
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhone.Deploy.0 = Release|iPhone
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhone.Build.0 = Debug|iPhone
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhone.ActiveCfg = Release|iPhone
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhone.Build.0 = Release|iPhone
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhone.Deploy.0 = Release|iPhone
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|iPhone.Build.0 = Debug|iPhone
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|iPhone.ActiveCfg = Release|iPhone
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|iPhone.Build.0 = Release|iPhone
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|iPhone.Deploy.0 = Release|iPhone
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|iPhone.Build.0 = Debug|iPhone
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|iPhone.ActiveCfg = Release|iPhone
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|iPhone.Build.0 = Release|iPhone
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|iPhone.Deploy.0 = Release|iPhone
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhone.Build.0 = Debug|iPhone
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhone.ActiveCfg = Release|iPhone
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhone.Build.0 = Release|iPhone
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhone.Deploy.0 = Release|iPhone
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhone.Build.0 = Debug|iPhone
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhone.ActiveCfg = Release|iPhone
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhone.Build.0 = Release|iPhone
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhone.Deploy.0 = Release|iPhone
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|iPhone.Build.0 = Debug|iPhone
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|iPhone.ActiveCfg = Release|iPhone
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|iPhone.Build.0 = Release|iPhone
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|iPhone.Deploy.0 = Release|iPhone
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|iPhone.Build.0 = Debug|iPhone
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|iPhone.ActiveCfg = Release|iPhone
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|iPhone.Build.0 = Release|iPhone
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|iPhone.Deploy.0 = Release|iPhone
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|iPhone.Build.0 = Debug|iPhone
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|iPhone.ActiveCfg = Release|iPhone
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|iPhone.Build.0 = Release|iPhone
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|iPhone.Deploy.0 = Release|iPhone
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhone.Build.0 = Debug|iPhone
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhone.ActiveCfg = Release|iPhone
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhone.Build.0 = Release|iPhone
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhone.Deploy.0 = Release|iPhone
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|iPhone.Build.0 = Debug|iPhone
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|iPhone.ActiveCfg = Release|iPhone
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|iPhone.Build.0 = Release|iPhone
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|iPhone.Deploy.0 = Release|iPhone
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhone.Build.0 = Debug|iPhone
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhone.ActiveCfg = Release|iPhone
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhone.Build.0 = Release|iPhone
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhone.Deploy.0 = Release|iPhone
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|iPhone.Build.0 = Debug|iPhone
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|iPhone.ActiveCfg = Release|iPhone
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|iPhone.Build.0 = Release|iPhone
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|iPhone.Deploy.0 = Release|iPhone
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|iPhone.Build.0 = Debug|iPhone
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|iPhone.ActiveCfg = Release|iPhone
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|iPhone.Build.0 = Release|iPhone
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|iPhone.Deploy.0 = Release|iPhone
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhone.Build.0 = Debug|iPhone
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhone.ActiveCfg = Release|iPhone
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhone.Build.0 = Release|iPhone
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhone.Deploy.0 = Release|iPhone
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhone.Build.0 = Debug|iPhone
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhone.ActiveCfg = Release|iPhone
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhone.Build.0 = Release|iPhone
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhone.Deploy.0 = Release|iPhone
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhone.Build.0 = Debug|iPhone
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhone.ActiveCfg = Release|iPhone
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhone.Build.0 = Release|iPhone
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhone.Deploy.0 = Release|iPhone
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhone.ActiveCfg = Debug|iPhone
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhone.Build.0 = Debug|iPhone
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhone.Deploy.0 = Debug|iPhone
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhone.ActiveCfg = Release|iPhone
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhone.Build.0 = Release|iPhone
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhone.Deploy.0 = Release|iPhone
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|iPhoneSimulator.Deploy.0 = Debug|iPhoneSimulator
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|iPhoneSimulator.Deploy.0 = Release|iPhoneSimulator
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{1AC70118-C90F-4EC6-9D8B-C628BDF900F7} = {4C142567-C42B-40F5-B092-798882190209}
-		{C121A566-555E-42B9-9B0A-1696529A9088} = {4C142567-C42B-40F5-B092-798882190209}
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5} = {4C142567-C42B-40F5-B092-798882190209}
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{01700344-CF44-482C-BEBC-60213B0F844C} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6} = {22ADD4CD-092E-4ADC-A21E-64CF42230152}
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2}
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2}
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137} = {4C142567-C42B-40F5-B092-798882190209}
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{1320F627-EE43-4115-8E89-19D1753E51F2} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C} = {4C142567-C42B-40F5-B092-798882190209}
-		{273BDD15-7392-4078-91F0-AF23594A3D7B} = {4C142567-C42B-40F5-B092-798882190209}
-		{DE042125-C270-4D1D-9270-0759C167567A} = {4C142567-C42B-40F5-B092-798882190209}
-		{72390339-B2A1-4F61-A800-31ED0975B515} = {4C142567-C42B-40F5-B092-798882190209}
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C} = {4C142567-C42B-40F5-B092-798882190209}
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E} = {4C142567-C42B-40F5-B092-798882190209}
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3} = {4C142567-C42B-40F5-B092-798882190209}
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{DD592516-B341-40FE-9100-1B0FA784A060} = {4C142567-C42B-40F5-B092-798882190209}
-		{9BC63BEC-F305-451D-BB31-262938EA964D} = {4C142567-C42B-40F5-B092-798882190209}
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31} = {4C142567-C42B-40F5-B092-798882190209}
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209}
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{B33E576F-2279-4BFC-A438-D9B84343B56B} = {1AC70118-C90F-4EC6-9D8B-C628BDF900F7}
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE} = {4C142567-C42B-40F5-B092-798882190209}
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088} = {4C142567-C42B-40F5-B092-798882190209}
-		{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
-		{DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209}
-		{62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
-	EndGlobalSection
-EndGlobal
diff --git a/build/Xenko.iOS.sln.DotSettings b/build/Xenko.iOS.sln.DotSettings
deleted file mode 100644
index ab1b9eb5cd..0000000000
--- a/build/Xenko.iOS.sln.DotSettings
+++ /dev/null
@@ -1,5 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=741C7D8F1A8423ED3F341AD5B8A7434C/RelativePath/@EntryValue">..\Xenko.sln.DotSettings</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=741C7D8F1A8423ED3F341AD5B8A7434C/@KeyIndexDefined">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File741C7D8F1A8423ED3F341AD5B8A7434C/@KeyIndexDefined">True</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File741C7D8F1A8423ED3F341AD5B8A7434C/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
diff --git a/build/Xenko.sln b/build/Xenko.sln
index 5e0799e1a5..dd12a591a8 100644
--- a/build/Xenko.sln
+++ b/build/Xenko.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32228.430
 MinimumVisualStudioVersion = 16.0
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "90-Tools", "90-Tools", "{1AE1AC60-5D2F-4CA7-AE20-888F44551185}"
 EndProject
@@ -38,16 +38,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Private", "00-Ta
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "80-Shaders", "80-Shaders", "{10D145AF-C8AE-428F-A80F-CA1B591D0DB2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3D-Exporters", "3D-Exporters", "{47FFA9CA-781D-427E-9A41-365D789DD4B1}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "50-Presentation", "50-Presentation", "{75A820AB-0F21-40F2-9448-5D7F495B97A0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Internals", "Internals", "{860946E4-CC77-4FDA-A4FD-3DB2A502A696}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "40-Assets", "40-Assets", "{A2A4342E-024B-4063-B10C-1DA96CA3046D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "91-VisualStudio", "91-VisualStudio", "{E4508D15-6503-4A29-ADC4-27B3A5E99545}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "60-Editor", "60-Editor", "{5D2D3BE8-9910-45CA-8E45-95660DA4C563}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3D-Importers", "3D-Importers", "{6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}"
@@ -61,16 +57,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Config", "00-Config", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xenko.Shared", "Xenko.Shared", "{1AC70118-C90F-4EC6-9D8B-C628BDF900F7}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "21-XenkoRuntime.Tests", "21-XenkoRuntime.Tests", "{A7ED9F01-7D78-4381-90A6-D50E51C17250}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "11-CoreRuntime.Tests", "11-CoreRuntime.Tests", "{22ADD4CD-092E-4ADC-A21E-64CF42230152}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "41-Assets.Tests", "41-Assets.Tests", "{9D5D9861-AE68-429C-8B21-2263F9DA07A1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "61-Editor.Tests", "61-Editor.Tests", "{F5F744B5-803E-4180-B82A-8B1F0BCD6579}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "51-Presentation.Tests", "51-Presentation.Tests", "{52AE329E-B588-40D0-A578-8D0DB1BD83E5}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "70-XenkoAssets", "70-XenkoAssets", "{F765035E-F4F4-4CFA-BA02-755DC677AA97}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targets.Build", "{0B81090E-4066-4723-A658-8AEDBEADE619}"
@@ -84,14 +70,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "00-Targets.Build", "00-Targ
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "30-CoreDesign", "30-CoreDesign", "{25F10A0B-7259-404C-86BE-FD2363C92F72}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "31-CoreDesign.Tests", "31-CoreDesign.Tests", "{B175D318-B4D0-49EA-9AEF-A54ACA2F03DC}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "71-XenkoAssets.Tests", "71-XenkoAssets.Tests", "{A47B451D-3162-410F-BAF7-C650C4B7A4B0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.GameStudio", "..\sources\editor\Xenko.GameStudio\Xenko.GameStudio.csproj", "{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}"
 	ProjectSection(ProjectDependencies) = postProject
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514} = {BD176B28-49CD-4FAD-A430-CDBCF1C2E514}
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531} = {E25E7778-0B2F-4A0B-BCD6-1DE95320B531}
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF} = {550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
 	EndProjectSection
@@ -106,18 +87,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics", "..\source
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A} = {7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Engine.Tests.Windows", "..\sources\engine\Xenko.Engine.Tests\Xenko.Engine.Tests.Windows.csproj", "{A8F8D125-7A22-489F-99BC-9A02F545A17F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Input.Tests.Windows", "..\sources\engine\Xenko.Input.Tests\Xenko.Input.Tests.Windows.csproj", "{01700344-CF44-482C-BEBC-60213B0F844C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Tests", "..\sources\core\Xenko.Core.Tests\Xenko.Core.Tests.csproj", "{5AA408BA-E766-453E-B661-E3D7EC46E2A6}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xenko.Importer.FBX", "..\sources\tools\Xenko.Importer.FBX\Xenko.Importer.FBX.vcxproj", "{0467D515-FD66-4B8A-A128-CB642C2ED03F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Shaders", "..\sources\shaders\Xenko.Core.Shaders\Xenko.Core.Shaders.csproj", "{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}"
@@ -130,35 +99,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Presentation", "
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {5210FB81-B807-49BB-AF0D-31FB6A83A572}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Presentation.Tests", "..\sources\presentation\Xenko.Core.Presentation.Tests\Xenko.Core.Presentation.Tests.csproj", "{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xenko.Importer.Assimp", "..\sources\tools\Xenko.Importer.Assimp\Xenko.Importer.Assimp.vcxproj", "{C2306552-6C42-464C-8981-32FEF4F9458D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Irony", "..\sources\shaders\Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games", "..\sources\engine\Xenko.Games\Xenko.Games.csproj", "{42780CBD-3FE7-48E3-BD5B-59945EA20137}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VisualStudio.Package", "..\sources\tools\Xenko.VisualStudio.Package\Xenko.VisualStudio.Package.csproj", "{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.TextureConverter", "..\sources\tools\Xenko.TextureConverter\Xenko.TextureConverter.csproj", "{7F7BFF79-C400-435F-B359-56A2EF8956E0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.TextureConverter.Tests", "..\sources\tests\tools\Xenko.TextureConverter.Tests\Xenko.TextureConverter.Tests.csproj", "{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.ProjectGenerator", "..\sources\tools\Xenko.ProjectGenerator\Xenko.ProjectGenerator.csproj", "{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Audio.Tests.Windows", "..\sources\engine\Xenko.Audio.Tests\Xenko.Audio.Tests.Windows.csproj", "{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assimp", "..\sources\tools\Xenko.Assimp\Xenko.Assimp.csproj", "{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.BuildEngine.Tests", "..\sources\buildengine\Xenko.Core.BuildEngine.Tests\Xenko.Core.BuildEngine.Tests.csproj", "{09F32307-595A-4CBB-BF7C-F055DA1F70EE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.BuildEngine.Common", "..\sources\buildengine\Xenko.Core.BuildEngine.Common\Xenko.Core.BuildEngine.Common.csproj", "{7732CB84-A39A-4ADF-B740-FD32A352FA8A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xenko.Assimp.Translation", "..\sources\tools\Xenko.Assimp.Translation\Xenko.Assimp.Translation.vcxproj", "{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core", "..\sources\core\Xenko.Core\Xenko.Core.csproj", "{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Mathematics", "..\sources\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj", "{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}"
@@ -186,17 +140,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko", "..\sources\engine\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders.Compiler", "..\sources\engine\Xenko.Shaders.Compiler\Xenko.Shaders.Compiler.csproj", "{E8B3553F-A79F-4E50-B75B-ACEE771C320C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Shaders.Tests.Windows", "..\sources\engine\Xenko.Shaders.Tests\Xenko.Shaders.Tests.Windows.csproj", "{1BE90177-FE4D-4519-839E-7EB7D78AC973}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Input", "..\sources\engine\Xenko.Input\Xenko.Input.csproj", "{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets", "..\sources\assets\Xenko.Core.Assets\Xenko.Core.Assets.csproj", "{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets.Tests", "..\sources\assets\Xenko.Core.Assets.Tests\Xenko.Core.Assets.Tests.csproj", "{3E7B5D96-CF71-41EE-8CF0-70D090873390}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assets", "..\sources\engine\Xenko.Assets\Xenko.Assets.csproj", "{39AE9C77-E94B-404F-8768-B6261B3C1E0E}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets.Editor", "..\sources\editor\Xenko.Core.Assets.Editor\Xenko.Core.Assets.Editor.csproj", "{5863574D-7A55-49BC-8E65-BABB74D8E66E}"
@@ -208,41 +155,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets.CompilerA
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.FixProjectReferences", "..\sources\tools\Xenko.FixProjectReferences\Xenko.FixProjectReferences.csproj", "{7DBC5A0B-76F5-4D9E-9798-540DA214099C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assets.Tests", "..\sources\engine\Xenko.Assets.Tests\Xenko.Assets.Tests.csproj", "{117BF9F8-D2D9-4D32-9702-251C3E038090}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assets.Models", "..\sources\engine\Xenko.Assets.Models\Xenko.Assets.Models.csproj", "{C904D2C6-5A15-4E0B-8432-33967E1735AA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Quantum.Tests", "..\sources\presentation\Xenko.Core.Quantum.Tests\Xenko.Core.Quantum.Tests.csproj", "{49AAA22D-D1C8-4E0F-82E8-F462D5442463}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.UI", "..\sources\engine\Xenko.UI\Xenko.UI.csproj", "{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C121A566-555E-42B9-9B0A-1696529A9088} = {C121A566-555E-42B9-9B0A-1696529A9088}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.UI.Tests.Windows", "..\sources\engine\Xenko.UI.Tests\Xenko.UI.Tests.Windows.csproj", "{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Editor", "..\sources\editor\Xenko.Editor\Xenko.Editor.csproj", "{16E02D45-5530-4617-97DC-BC3BDF77DE2C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD} = {73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.GameStudio.Tests", "..\sources\editor\Xenko.GameStudio.Tests\Xenko.GameStudio.Tests.csproj", "{0EA748AF-E1DC-4788-BA50-8BABD56F220C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Design", "..\sources\core\Xenko.Core.Design\Xenko.Core.Design.csproj", "{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Regression", "..\sources\engine\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj", "{D002FEB1-00A6-4AB1-A83F-1F253465E64D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Xenko.Importer.Common", "..\sources\tools\Xenko.Importer.Common\Xenko.Importer.Common.vcxproj", "{43A6E62E-1B1C-4630-ABB8-C3F716004645}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.StorageTool", "..\sources\tools\Xenko.StorageTool\Xenko.StorageTool.csproj", "{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.ProjectTemplating", "..\sources\tools\Xenko.Core.ProjectTemplating\Xenko.Core.ProjectTemplating.csproj", "{2E2382F7-9576-49F0-AE43-93AFD7DB2368}"
@@ -252,14 +178,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assets.Presentation",
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B} = {EFD2472E-B0E1-442A-9057-BBEA2517064B}
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.ProjectTemplating.Tests", "..\sources\tools\Xenko.Core.ProjectTemplating.Tests\Xenko.Core.ProjectTemplating.Tests.csproj", "{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.TestRunner", "..\sources\tools\Xenko.TestRunner\Xenko.TestRunner.csproj", "{A5DC820B-9554-45B6-9677-6A2F902E7787}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Design.Tests", "..\sources\core\Xenko.Core.Design.Tests\Xenko.Core.Design.Tests.csproj", "{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VisualStudio.Commands", "..\sources\tools\Xenko.VisualStudio.Commands\Xenko.VisualStudio.Commands.csproj", "{E136B568-3E3F-498F-A8B4-2877B7768560}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Physics", "..\sources\engine\Xenko.Physics\Xenko.Physics.csproj", "{DD592516-B341-40FE-9100-1B0FA784A060}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Presentation.Dialogs", "..\sources\presentation\Xenko.Core.Presentation.Dialogs\Xenko.Core.Presentation.Dialogs.csproj", "{4FAC003A-2532-42F3-AED7-A296D1A1615E}"
@@ -268,10 +186,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.RenderDocPlu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Debugger", "..\sources\engine\Xenko.Debugger\Xenko.Debugger.csproj", "{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.ConnectionRouter", "..\sources\tools\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj", "{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.EffectCompilerServer", "..\sources\tools\Xenko.EffectCompilerServer\Xenko.EffectCompilerServer.csproj", "{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.PrivacyPolicy", "..\sources\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.shproj", "{950BADD0-AD5A-4F58-87EC-4ADAECBEA89B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.ExecServer", "..\sources\tools\Xenko.ExecServer\Xenko.ExecServer.csproj", "{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}"
@@ -284,39 +198,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.SpriteStudio.Runtime"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Core.MostRecentlyUsedFiles", "..\sources\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.shproj", "{9AC6D791-811E-4D6A-B08E-93F0093EF268}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.Windows", "..\sources\engine\Xenko.Graphics.Tests\Xenko.Graphics.Tests.Windows.csproj", "{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.10_0.Windows", "..\sources\engine\Xenko.Graphics.Tests.10_0\Xenko.Graphics.Tests.10_0.Windows.csproj", "{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Graphics.Tests.11_0.Windows", "..\sources\engine\Xenko.Graphics.Tests.11_0\Xenko.Graphics.Tests.11_0.Windows.csproj", "{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.SamplesTestServer", "..\sources\tools\Xenko.SamplesTestServer\Xenko.SamplesTestServer.csproj", "{75D71310-ECF7-4592-9E35-3FE540040982}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles", "..\sources\engine\Xenko.Particles\Xenko.Particles.csproj", "{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Games.Testing", "..\sources\engine\Xenko.Games.Testing\Xenko.Games.Testing.csproj", "{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Native", "..\sources\engine\Xenko.Native\Xenko.Native.csproj", "{1DBBC150-F085-43EF-B41D-27C72D133770}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Assets.Tests2", "..\sources\engine\Xenko.Assets.Tests2\Xenko.Assets.Tests2.csproj", "{370ADF53-DFFA-461E-B72A-1302C0A0DE00}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Particles.Tests.Windows", "..\sources\engine\Xenko.Particles.Tests\Xenko.Particles.Tests.Windows.csproj", "{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Refactor", "..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.shproj", "{B33E576F-2279-4BFC-A438-D9B84343B56B}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Core.ShellHelper", "..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.shproj", "{3A3CB33C-64D9-4948-86C1-0D86320D23C3}"
@@ -325,55 +210,22 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Packages", "..\s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Presentation.Graph", "..\sources\presentation\Xenko.Core.Presentation.Graph\Xenko.Core.Presentation.Graph.csproj", "{EFD2472E-B0E1-442A-9057-BBEA2517064B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets.Editor.Tests", "..\sources\editor\Xenko.Core.Assets.Editor.Tests\Xenko.Core.Assets.Editor.Tests.csproj", "{25F98E38-0249-45BC-B2ED-7899297B9CF6}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Yaml", "..\sources\core\Xenko.Core.Yaml\Xenko.Core.Yaml.csproj", "{BF32DE1B-6276-4341-B212-F8862ADBBA7A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Yaml.Tests", "..\sources\core\Xenko.Core.Yaml.Tests\Xenko.Core.Yaml.Tests.csproj", "{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Reflection", "..\sources\core\Xenko.Core.Reflection\Xenko.Core.Reflection.csproj", "{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Physics.Tests.Windows", "..\sources\engine\Xenko.Physics.Tests\Xenko.Physics.Tests.Windows.csproj", "{4F0E7E04-F067-4CE8-B8C8-1105F319D123}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets.Quantum", "..\sources\assets\Xenko.Core.Assets.Quantum\Xenko.Core.Assets.Quantum.csproj", "{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Assets.Quantum.Tests", "..\sources\assets\Xenko.Core.Assets.Quantum.Tests\Xenko.Core.Assets.Quantum.Tests.csproj", "{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VirtualReality", "..\sources\engine\Xenko.VirtualReality\Xenko.VirtualReality.csproj", "{53782603-3096-40C2-ABD3-F8F311BAE4BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Presentation.Quantum.Tests", "..\sources\presentation\Xenko.Core.Presentation.Quantum.Tests\Xenko.Core.Presentation.Quantum.Tests.csproj", "{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Code.Tests", "..\sources\tools\Xenko.Code.Tests\Xenko.Code.Tests.csproj", "{3C855DB2-EEA3-415C-A0A8-C834DEC40531}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Core.VisualStudio", "..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.shproj", "{991E796A-D1D1-48B8-B9AA-95C2744FE112}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Core.Assets.Yaml", "..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.shproj", "{FB9ED2C4-94A0-4004-A498-3F29A9D5BB5D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Navigation", "..\sources\engine\Xenko.Navigation\Xenko.Navigation.csproj", "{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Navigation.Tests.Windows", "..\sources\engine\Xenko.Navigation.Tests\Xenko.Navigation.Tests.Windows.csproj", "{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Mathematics.Tests", "..\sources\core\Xenko.Core.Mathematics.Tests\Xenko.Core.Mathematics.Tests.csproj", "{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.PackageInstall", "..\sources\tools\Xenko.PackageInstall\Xenko.PackageInstall.csproj", "{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Tasks", "..\sources\core\Xenko.Core.Tasks\Xenko.Core.Tasks.csproj", "{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VisualStudio.PackageInstall", "..\sources\tools\Xenko.VisualStudio.PackageInstall\Xenko.VisualStudio.PackageInstall.csproj", "{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.VisualStudio.Package.Tests", "..\sources\tools\Xenko.VisualStudio.Package.Tests\Xenko.VisualStudio.Package.Tests.csproj", "{5BFE4386-3C42-4118-96C8-4B68441F1661}"
-	ProjectSection(ProjectDependencies) = postProject
-		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A} = {7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}
-		{E136B568-3E3F-498F-A8B4-2877B7768560} = {E136B568-3E3F-498F-A8B4-2877B7768560}
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6} = {0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Translation", "..\sources\core\Xenko.Core.Translation\Xenko.Core.Translation.csproj", "{6A7B231E-36AA-4647-8C1A-FB1540ABC813}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Core.Translation.Presentation", "..\sources\presentation\Xenko.Core.Translation.Presentation\Xenko.Core.Translation.Presentation.csproj", "{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}"
@@ -402,12 +254,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.Editor.CrashReport",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "72-XenkoSamples", "72-XenkoSamples", "{75608B5C-1C03-4B38-810E-14EED5165E59}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Samples.Tests", "..\samples\Tests\Xenko.Samples.Tests.csproj", "{2FC40214-A4AA-45DC-9C93-72ED800C40B0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{75D71310-ECF7-4592-9E35-3FE540040982} = {75D71310-ECF7-4592-9E35-3FE540040982}
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}
-	EndProjectSection
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Xenko.NuGetResolver", "..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.shproj", "{00B72ED7-00E9-47F7-868D-8162027CD068}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Samples.Templates", "..\sources\editor\Xenko.Samples.Templates\Xenko.Samples.Templates.csproj", "{040F754C-17F4-4B5F-B974-93F1E39D107F}"
@@ -425,1160 +271,555 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fr", "fr", "{62E9A8E4-79AF-
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Rendering", "..\sources\engine\Xenko.Rendering\Xenko.Rendering.csproj", "{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Voxels", "..\sources\engine\Xenko.Voxels\Xenko.Voxels.csproj", "{66BE41FC-FC52-48D0-9C04-BCE8CC393020}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Toolkit", "..\sources\tools\Xenko.Toolkit\Xenko.Toolkit.csproj", "{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Importer.Common", "..\sources\tools\Xenko.Importer.Common\Xenko.Importer.Common.csproj", "{43A8197B-874F-4CE2-9D56-518A23547C96}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xenko.Importer.Assimp", "..\sources\tools\Xenko.Importer.Assimp\Xenko.Importer.Assimp.csproj", "{092984EF-90A1-46D2-8AEE-DE24744E6B2D}"
+EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems*{00b72ed7-00e9-47f7-868d-8162027cd068}*SharedItemsImports = 13
-		..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems*{0bd41add-2704-4a77-a9ab-15460a2abdc6}*SharedItemsImports = 4
-		..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems*{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}*SharedItemsImports = 4
-		..\sources\editor\Xenko.Editor.CrashReport\Xenko.Editor.CrashReport.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 4
-		..\sources\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 4
-		..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 4
-		..\sources\assets\Xenko.Core.Archive\Xenko.Core.Archive.projitems*{39ae9c77-e94b-404f-8768-b6261b3c1e0e}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{39ae9c77-e94b-404f-8768-b6261b3c1e0e}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{3a3cb33c-64d9-4948-86c1-0d86320d23c3}*SharedItemsImports = 13
-		..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems*{50d1a3bb-4b41-4ef5-8d2f-3618a3b6c698}*SharedItemsImports = 4
-		..\sources\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.projitems*{5863574d-7a55-49bc-8e65-babb74d8e66e}*SharedItemsImports = 4
-		..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems*{5bfe4386-3c42-4118-96c8-4b68441f1661}*SharedItemsImports = 4
-		..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems*{5e241be1-ffb6-49f2-98b4-7869ba7d9f5a}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{75d71310-ecf7-4592-9e35-3fe540040982}*SharedItemsImports = 4
-		..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems*{7732cb84-a39a-4adf-b740-fd32a352fa8a}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{77e2fcc0-4ca6-436c-be6f-9418cb807d45}*SharedItemsImports = 4
-		..\sources\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems*{950badd0-ad5a-4f58-87ec-4adaecbea89b}*SharedItemsImports = 13
-		..\sources\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems*{991e796a-d1d1-48b8-b9aa-95c2744fe112}*SharedItemsImports = 13
-		..\sources\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.projitems*{9ac6d791-811e-4d6a-b08e-93f0093ef268}*SharedItemsImports = 13
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{a5dc820b-9554-45b6-9677-6a2f902e7787}*SharedItemsImports = 4
-		..\sources\editor\Xenko.Editor.CrashReport\Xenko.Editor.CrashReport.projitems*{ab574f65-1402-4476-9314-74dcdaf19097}*SharedItemsImports = 13
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
-		..\sources\assets\Xenko.Core.Archive\Xenko.Core.Archive.projitems*{bd176b28-49cd-4fad-a430-cdbcf1c2e514}*SharedItemsImports = 4
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 4
-		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 4
-		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 4
-		..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems*{fb9ed2c4-94a0-4004-a498-3f29a9d5bb5d}*SharedItemsImports = 13
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|Win32 = Debug|Win32
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586}.Release|Win32.ActiveCfg = Release|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C121A566-555E-42B9-9B0A-1696529A9088}.Release|Win32.ActiveCfg = Release|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}.Release|Win32.ActiveCfg = Release|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F}.Release|Win32.ActiveCfg = Release|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{01700344-CF44-482C-BEBC-60213B0F844C}.Release|Win32.ActiveCfg = Release|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.ActiveCfg = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Any CPU.Build.0 = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Win32.ActiveCfg = Debug|Any CPU
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6}.Release|Win32.Build.0 = Debug|Any CPU
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Debug|Win32.Build.0 = Debug|Win32
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Release|Any CPU.ActiveCfg = Release|Win32
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Release|Mixed Platforms.ActiveCfg = Release|x64
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Release|Mixed Platforms.Build.0 = Release|x64
-		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Release|Win32.ActiveCfg = Release|Win32
-		{0467D515-FD66-4B8A-A128-CB642C2ED03F}.Release|Win32.Build.0 = Release|Win32
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}.Release|Win32.ActiveCfg = Release|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4}.Release|Win32.ActiveCfg = Release|Any CPU
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Debug|Win32.Build.0 = Debug|Win32
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Release|Any CPU.ActiveCfg = Release|Win32
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Release|Mixed Platforms.ActiveCfg = Release|x64
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Release|Mixed Platforms.Build.0 = Release|x64
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Release|Win32.ActiveCfg = Release|Win32
-		{C2306552-6C42-464C-8981-32FEF4F9458D}.Release|Win32.Build.0 = Release|Win32
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Win32.ActiveCfg = Release|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Any CPU.Build.0 = Release|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{42780CBD-3FE7-48E3-BD5B-59945EA20137}.Release|Win32.ActiveCfg = Release|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7F7BFF79-C400-435F-B359-56A2EF8956E0}.Release|Win32.ActiveCfg = Release|Any CPU
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7}.Release|Win32.ActiveCfg = Release|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD}.Release|Win32.ActiveCfg = Release|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A}.Release|Win32.ActiveCfg = Release|Any CPU
 		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA}.Release|Win32.ActiveCfg = Release|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7732CB84-A39A-4ADF-B740-FD32A352FA8A}.Release|Win32.ActiveCfg = Release|Any CPU
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Debug|Win32.Build.0 = Debug|Win32
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Release|Any CPU.ActiveCfg = Release|Win32
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Release|Mixed Platforms.ActiveCfg = Release|x64
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Release|Mixed Platforms.Build.0 = Release|x64
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Release|Win32.ActiveCfg = Release|Win32
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}.Release|Win32.Build.0 = Release|Win32
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}.Release|Win32.ActiveCfg = Release|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5210FB81-B807-49BB-AF0D-31FB6A83A572}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1D4210BD-FA51-4709-951B-50647617F97E}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1D4210BD-FA51-4709-951B-50647617F97E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1D4210BD-FA51-4709-951B-50647617F97E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CB6C4D8B-906E-4120-8146-09261B8D2885}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1320F627-EE43-4115-8E89-19D1753E51F2}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1DE01410-22C9-489B-9796-1ADDAB1F64E5}.Release|Win32.ActiveCfg = Release|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{14A47447-2A24-4ECD-B24D-6571499DCD4C}.Release|Win32.ActiveCfg = Release|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{273BDD15-7392-4078-91F0-AF23594A3D7B}.Release|Win32.ActiveCfg = Release|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DE042125-C270-4D1D-9270-0759C167567A}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DE042125-C270-4D1D-9270-0759C167567A}.Release|Win32.ActiveCfg = Release|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Any CPU.Build.0 = Release|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{72390339-B2A1-4F61-A800-31ED0975B515}.Release|Win32.ActiveCfg = Release|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E8B3553F-A79F-4E50-B75B-ACEE771C320C}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973}.Release|Win32.ActiveCfg = Release|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}.Release|Win32.ActiveCfg = Release|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390}.Release|Win32.ActiveCfg = Release|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{39AE9C77-E94B-404F-8768-B6261B3C1E0E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5863574D-7A55-49BC-8E65-BABB74D8E66E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Release|Any CPU.Build.0 = Release|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698}.Release|Win32.ActiveCfg = Release|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7DBC5A0B-76F5-4D9E-9798-540DA214099C}.Release|Win32.ActiveCfg = Release|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Release|Any CPU.Build.0 = Release|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{117BF9F8-D2D9-4D32-9702-251C3E038090}.Release|Win32.ActiveCfg = Release|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C904D2C6-5A15-4E0B-8432-33967E1735AA}.Release|Win32.ActiveCfg = Release|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Release|Any CPU.Build.0 = Release|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463}.Release|Win32.ActiveCfg = Release|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3}.Release|Win32.ActiveCfg = Release|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9}.Release|Win32.ActiveCfg = Release|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{16E02D45-5530-4617-97DC-BC3BDF77DE2C}.Release|Win32.ActiveCfg = Release|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C}.Release|Win32.ActiveCfg = Release|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Release|Any CPU.Build.0 = Release|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2}.Release|Win32.ActiveCfg = Release|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Debug|Mixed Platforms.Build.0 = Debug|x64
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Debug|Win32.ActiveCfg = Debug|Win32
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Debug|Win32.Build.0 = Debug|Win32
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Release|Any CPU.ActiveCfg = Release|Win32
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Release|Mixed Platforms.ActiveCfg = Release|x64
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Release|Mixed Platforms.Build.0 = Release|x64
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Release|Win32.ActiveCfg = Release|Win32
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645}.Release|Win32.Build.0 = Release|Win32
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Release|Any CPU.Build.0 = Release|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12}.Release|Win32.ActiveCfg = Release|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2E2382F7-9576-49F0-AE43-93AFD7DB2368}.Release|Win32.ActiveCfg = Release|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF}.Release|Win32.ActiveCfg = Release|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD}.Release|Win32.ActiveCfg = Release|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A5DC820B-9554-45B6-9677-6A2F902E7787}.Release|Win32.ActiveCfg = Release|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E136B568-3E3F-498F-A8B4-2877B7768560}.Release|Win32.ActiveCfg = Release|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DD592516-B341-40FE-9100-1B0FA784A060}.Release|Win32.ActiveCfg = Release|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4FAC003A-2532-42F3-AED7-A296D1A1615E}.Release|Win32.ActiveCfg = Release|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1}.Release|Win32.ActiveCfg = Release|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD}.Release|Win32.ActiveCfg = Release|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45}.Release|Win32.ActiveCfg = Release|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531}.Release|Win32.ActiveCfg = Release|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A}.Release|Win32.ActiveCfg = Release|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Debug|Win32.ActiveCfg = Debug|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{8D783A73-0BE3-423E-8FF6-984125C07BFE}.Release|Win32.ActiveCfg = Release|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Debug|Win32.Build.0 = Debug|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Release|Win32.ActiveCfg = Release|Any CPU
-		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4}.Release|Win32.Build.0 = Release|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Debug|Win32.Build.0 = Debug|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Win32.ActiveCfg = Release|Any CPU
-		{9BC63BEC-F305-451D-BB31-262938EA964D}.Release|Win32.Build.0 = Release|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Debug|Win32.Build.0 = Debug|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Win32.ActiveCfg = Release|Any CPU
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}.Release|Win32.Build.0 = Release|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Debug|Win32.Build.0 = Debug|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Win32.ActiveCfg = Release|Any CPU
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}.Release|Win32.Build.0 = Release|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Debug|Win32.Build.0 = Debug|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Win32.ActiveCfg = Release|Any CPU
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}.Release|Win32.Build.0 = Release|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Debug|Win32.Build.0 = Debug|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Release|Any CPU.Build.0 = Release|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Release|Win32.ActiveCfg = Release|Any CPU
-		{75D71310-ECF7-4592-9E35-3FE540040982}.Release|Win32.Build.0 = Release|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Debug|Win32.Build.0 = Debug|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Win32.ActiveCfg = Release|Any CPU
-		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31}.Release|Win32.Build.0 = Release|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Debug|Win32.Build.0 = Debug|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Win32.ActiveCfg = Release|Any CPU
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9}.Release|Win32.Build.0 = Release|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Debug|Win32.Build.0 = Debug|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1DBBC150-F085-43EF-B41D-27C72D133770}.Release|Win32.Build.0 = Release|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Debug|Win32.Build.0 = Debug|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Release|Any CPU.Build.0 = Release|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Release|Win32.ActiveCfg = Release|Any CPU
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00}.Release|Win32.Build.0 = Release|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Debug|Win32.Build.0 = Debug|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Any CPU.Build.0 = Release|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Win32.ActiveCfg = Release|Any CPU
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713}.Release|Win32.Build.0 = Release|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Debug|Win32.Build.0 = Debug|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Release|Any CPU.Build.0 = Release|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Release|Win32.ActiveCfg = Release|Any CPU
-		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73}.Release|Win32.Build.0 = Release|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Debug|Win32.Build.0 = Debug|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{EFD2472E-B0E1-442A-9057-BBEA2517064B}.Release|Win32.Build.0 = Release|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Debug|Win32.Build.0 = Debug|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Release|Win32.ActiveCfg = Release|Any CPU
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6}.Release|Win32.Build.0 = Release|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Debug|Win32.Build.0 = Debug|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Release|Win32.ActiveCfg = Release|Any CPU
-		{BF32DE1B-6276-4341-B212-F8862ADBBA7A}.Release|Win32.Build.0 = Release|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Debug|Win32.Build.0 = Debug|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Release|Win32.ActiveCfg = Release|Any CPU
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA}.Release|Win32.Build.0 = Release|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Debug|Win32.Build.0 = Debug|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Release|Win32.ActiveCfg = Release|Any CPU
-		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE}.Release|Win32.Build.0 = Release|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Debug|Win32.Build.0 = Debug|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Win32.ActiveCfg = Release|Any CPU
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123}.Release|Win32.Build.0 = Release|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Debug|Win32.Build.0 = Debug|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB}.Release|Win32.Build.0 = Release|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Debug|Win32.Build.0 = Debug|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Release|Win32.ActiveCfg = Release|Any CPU
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49}.Release|Win32.Build.0 = Release|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Debug|Win32.Build.0 = Debug|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Win32.ActiveCfg = Release|Any CPU
-		{53782603-3096-40C2-ABD3-F8F311BAE4BE}.Release|Win32.Build.0 = Release|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Debug|Win32.Build.0 = Debug|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Release|Win32.ActiveCfg = Release|Any CPU
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19}.Release|Win32.Build.0 = Release|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Debug|Win32.Build.0 = Debug|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Release|Win32.ActiveCfg = Release|Any CPU
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531}.Release|Win32.Build.0 = Release|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Debug|Win32.Build.0 = Debug|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Win32.ActiveCfg = Release|Any CPU
-		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088}.Release|Win32.Build.0 = Release|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Debug|Win32.Build.0 = Debug|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Release|Win32.ActiveCfg = Release|Any CPU
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF}.Release|Win32.Build.0 = Release|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Debug|Win32.Build.0 = Debug|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Win32.ActiveCfg = Release|Any CPU
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B}.Release|Win32.Build.0 = Release|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Debug|Win32.Build.0 = Debug|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Release|Win32.ActiveCfg = Release|Any CPU
-		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514}.Release|Win32.Build.0 = Release|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Debug|Win32.Build.0 = Debug|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Release|Win32.ActiveCfg = Release|Any CPU
-		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A}.Release|Win32.Build.0 = Release|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Debug|Win32.Build.0 = Debug|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Release|Win32.ActiveCfg = Release|Any CPU
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31}.Release|Win32.Build.0 = Release|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Debug|Win32.Build.0 = Debug|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Release|Win32.ActiveCfg = Release|Any CPU
-		{5BFE4386-3C42-4118-96C8-4B68441F1661}.Release|Win32.Build.0 = Release|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Debug|Win32.Build.0 = Debug|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Release|Win32.ActiveCfg = Release|Any CPU
-		{6A7B231E-36AA-4647-8C1A-FB1540ABC813}.Release|Win32.Build.0 = Release|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Debug|Win32.Build.0 = Debug|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Release|Win32.ActiveCfg = Release|Any CPU
-		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F}.Release|Win32.Build.0 = Release|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Debug|Win32.Build.0 = Debug|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Release|Win32.ActiveCfg = Release|Any CPU
-		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1}.Release|Win32.Build.0 = Release|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Debug|Win32.Build.0 = Debug|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Win32.ActiveCfg = Release|Any CPU
-		{DA355C86-866F-4843-9B4D-63A173C750FB}.Release|Win32.Build.0 = Release|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Debug|Win32.Build.0 = Debug|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Win32.ActiveCfg = Release|Any CPU
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0}.Release|Win32.Build.0 = Release|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Debug|Win32.Build.0 = Debug|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Win32.ActiveCfg = Release|Any CPU
-		{040F754C-17F4-4B5F-B974-93F1E39D107F}.Release|Win32.Build.0 = Release|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Debug|Win32.Build.0 = Debug|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Win32.ActiveCfg = Release|Any CPU
-		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4}.Release|Win32.Build.0 = Release|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Release|Any CPU.Build.0 = Release|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{43A8197B-874F-4CE2-9D56-518A23547C96}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{092984EF-90A1-46D2-8AEE-DE24744E6B2D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{47FFA9CA-781D-427E-9A41-365D789DD4B1} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{860946E4-CC77-4FDA-A4FD-3DB2A502A696} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{4A15BAAD-AA37-4754-A2BF-8D4049211E36} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
@@ -1586,25 +827,15 @@ Global
 		{2FCA2D8B-B10F-4DCA-9847-4221F74BA586} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
 		{C121A566-555E-42B9-9B0A-1696529A9088} = {4C142567-C42B-40F5-B092-798882190209}
 		{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5} = {4C142567-C42B-40F5-B092-798882190209}
-		{A8F8D125-7A22-489F-99BC-9A02F545A17F} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{01700344-CF44-482C-BEBC-60213B0F844C} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{5AA408BA-E766-453E-B661-E3D7EC46E2A6} = {22ADD4CD-092E-4ADC-A21E-64CF42230152}
 		{0467D515-FD66-4B8A-A128-CB642C2ED03F} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
 		{F2D52EDB-BC17-4243-B06D-33CD20F87A7F} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2}
 		{47AFCC2E-E9F0-47D6-9D75-9E646546A92B} = {75A820AB-0F21-40F2-9448-5D7F495B97A0}
-		{C223FCD7-CDCC-4943-9E11-9C2CC8FA9FC4} = {52AE329E-B588-40D0-A578-8D0DB1BD83E5}
-		{C2306552-6C42-464C-8981-32FEF4F9458D} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
 		{D81F5C91-D7DB-46E5-BC99-49488FB6814C} = {10D145AF-C8AE-428F-A80F-CA1B591D0DB2}
 		{42780CBD-3FE7-48E3-BD5B-59945EA20137} = {4C142567-C42B-40F5-B092-798882190209}
-		{0BD41ADD-2704-4A77-A9AB-15460A2ABDC6} = {E4508D15-6503-4A29-ADC4-27B3A5E99545}
 		{7F7BFF79-C400-435F-B359-56A2EF8956E0} = {4A15BAAD-AA37-4754-A2BF-8D4049211E36}
 		{C485CE61-3006-4C99-ACB3-A737F5CEBAE7} = {4A15BAAD-AA37-4754-A2BF-8D4049211E36}
 		{4B299721-18EA-4B6D-AFD5-2D6E188B97BD} = {860946E4-CC77-4FDA-A4FD-3DB2A502A696}
-		{7AF4B563-AAD3-42FF-B91E-84B9D34D904A} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{F61D86B5-7C3D-4441-957D-A0A6D2FA69CA} = {47FFA9CA-781D-427E-9A41-365D789DD4B1}
-		{09F32307-595A-4CBB-BF7C-F055DA1F70EE} = {B175D318-B4D0-49EA-9AEF-A54ACA2F03DC}
 		{7732CB84-A39A-4ADF-B740-FD32A352FA8A} = {25F10A0B-7259-404C-86BE-FD2363C92F72}
-		{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8} = {47FFA9CA-781D-427E-9A41-365D789DD4B1}
 		{0E916AB7-5A6C-4820-8AB1-AA492FE66D68} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
 		{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
 		{5210FB81-B807-49BB-AF0D-31FB6A83A572} = {2E93E2B5-4500-4E47-9B65-E705218AB578}
@@ -1617,88 +848,78 @@ Global
 		{DE042125-C270-4D1D-9270-0759C167567A} = {4C142567-C42B-40F5-B092-798882190209}
 		{72390339-B2A1-4F61-A800-31ED0975B515} = {4C142567-C42B-40F5-B092-798882190209}
 		{E8B3553F-A79F-4E50-B75B-ACEE771C320C} = {4C142567-C42B-40F5-B092-798882190209}
-		{1BE90177-FE4D-4519-839E-7EB7D78AC973} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
 		{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E} = {4C142567-C42B-40F5-B092-798882190209}
 		{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47} = {A2A4342E-024B-4063-B10C-1DA96CA3046D}
-		{3E7B5D96-CF71-41EE-8CF0-70D090873390} = {9D5D9861-AE68-429C-8B21-2263F9DA07A1}
 		{39AE9C77-E94B-404F-8768-B6261B3C1E0E} = {F765035E-F4F4-4CFA-BA02-755DC677AA97}
 		{5863574D-7A55-49BC-8E65-BABB74D8E66E} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
 		{50D1A3BB-4B41-4EF5-8D2F-3618A3B6C698} = {A2A4342E-024B-4063-B10C-1DA96CA3046D}
 		{7DBC5A0B-76F5-4D9E-9798-540DA214099C} = {860946E4-CC77-4FDA-A4FD-3DB2A502A696}
-		{117BF9F8-D2D9-4D32-9702-251C3E038090} = {A47B451D-3162-410F-BAF7-C650C4B7A4B0}
 		{C904D2C6-5A15-4E0B-8432-33967E1735AA} = {F765035E-F4F4-4CFA-BA02-755DC677AA97}
-		{49AAA22D-D1C8-4E0F-82E8-F462D5442463} = {52AE329E-B588-40D0-A578-8D0DB1BD83E5}
 		{BB9DEEEF-F18C-40D8-B016-6434CC71B8C3} = {4C142567-C42B-40F5-B092-798882190209}
-		{E7B1B17F-D04B-4978-B504-A6BB3EE846C9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
 		{16E02D45-5530-4617-97DC-BC3BDF77DE2C} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
-		{0EA748AF-E1DC-4788-BA50-8BABD56F220C} = {F5F744B5-803E-4180-B82A-8B1F0BCD6579}
 		{66581DAD-70AD-4475-AE47-C6C0DF1EC5E2} = {25F10A0B-7259-404C-86BE-FD2363C92F72}
-		{D002FEB1-00A6-4AB1-A83F-1F253465E64D} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{43A6E62E-1B1C-4630-ABB8-C3F716004645} = {6F473FA6-4F8B-4FBA-AE33-EE5AF997D50C}
 		{942A5B1D-2B3D-4B30-98DE-336CE93F4F12} = {860946E4-CC77-4FDA-A4FD-3DB2A502A696}
 		{2E2382F7-9576-49F0-AE43-93AFD7DB2368} = {860946E4-CC77-4FDA-A4FD-3DB2A502A696}
 		{550C1B7C-B7AD-46DF-ACF3-C36AEF35D5FF} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
-		{862C7C39-8E2B-4F18-88E9-ACD6EDF818CD} = {860946E4-CC77-4FDA-A4FD-3DB2A502A696}
-		{A5DC820B-9554-45B6-9677-6A2F902E7787} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
-		{4D13D69B-C8E8-4675-8198-1BE2785FFB6D} = {B175D318-B4D0-49EA-9AEF-A54ACA2F03DC}
-		{E136B568-3E3F-498F-A8B4-2877B7768560} = {E4508D15-6503-4A29-ADC4-27B3A5E99545}
 		{DD592516-B341-40FE-9100-1B0FA784A060} = {4C142567-C42B-40F5-B092-798882190209}
 		{4FAC003A-2532-42F3-AED7-A296D1A1615E} = {75A820AB-0F21-40F2-9448-5D7F495B97A0}
 		{FDF801D9-90CC-4CBD-9F53-7F32F7EDF4F1} = {860946E4-CC77-4FDA-A4FD-3DB2A502A696}
 		{73AA8A18-15C4-405B-BBF4-5D41C1CE44AD} = {4C142567-C42B-40F5-B092-798882190209}
-		{77E2FCC0-4CA6-436C-BE6F-9418CB807D45} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
-		{E25E7778-0B2F-4A0B-BCD6-1DE95320B531} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{950BADD0-AD5A-4F58-87EC-4ADAECBEA89B} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
 		{5E241BE1-FFB6-49F2-98B4-7869BA7D9F5A} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{8D783A73-0BE3-423E-8FF6-984125C07BFE} = {A2A4342E-024B-4063-B10C-1DA96CA3046D}
 		{63562B0A-E501-42C2-97BB-13D3AD3A7DB4} = {F765035E-F4F4-4CFA-BA02-755DC677AA97}
 		{9BC63BEC-F305-451D-BB31-262938EA964D} = {4C142567-C42B-40F5-B092-798882190209}
 		{9AC6D791-811E-4D6A-B08E-93F0093EF268} = {75A820AB-0F21-40F2-9448-5D7F495B97A0}
-		{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{570B0FF9-246F-4C6C-8384-F6BE1887A4A9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{75D71310-ECF7-4592-9E35-3FE540040982} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{F32FDA80-B6DD-47A8-8681-437E2C0D3F31} = {4C142567-C42B-40F5-B092-798882190209}
-		{B84ECB15-5E3F-4BD1-AB87-333BAE9B70F9} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
 		{1DBBC150-F085-43EF-B41D-27C72D133770} = {4C142567-C42B-40F5-B092-798882190209}
-		{370ADF53-DFFA-461E-B72A-1302C0A0DE00} = {A47B451D-3162-410F-BAF7-C650C4B7A4B0}
-		{33CC6216-3F30-4B5A-BB29-C5B47EFFA713} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
 		{B33E576F-2279-4BFC-A438-D9B84343B56B} = {1AC70118-C90F-4EC6-9D8B-C628BDF900F7}
 		{3A3CB33C-64D9-4948-86C1-0D86320D23C3} = {1AC70118-C90F-4EC6-9D8B-C628BDF900F7}
 		{ACD2C831-BDA2-4512-B4CC-75E8E1804F73} = {A2A4342E-024B-4063-B10C-1DA96CA3046D}
 		{EFD2472E-B0E1-442A-9057-BBEA2517064B} = {75A820AB-0F21-40F2-9448-5D7F495B97A0}
-		{25F98E38-0249-45BC-B2ED-7899297B9CF6} = {F5F744B5-803E-4180-B82A-8B1F0BCD6579}
 		{BF32DE1B-6276-4341-B212-F8862ADBBA7A} = {25F10A0B-7259-404C-86BE-FD2363C92F72}
-		{16D8043D-C3DB-4868-BFF3-B2EBDF537AAA} = {B175D318-B4D0-49EA-9AEF-A54ACA2F03DC}
 		{0BE7189B-F04E-4C0C-BBE9-F347C0A59FEE} = {25F10A0B-7259-404C-86BE-FD2363C92F72}
-		{4F0E7E04-F067-4CE8-B8C8-1105F319D123} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
 		{1123EAAD-3FE3-4FD8-8DF6-4DDCF13EFCFB} = {A2A4342E-024B-4063-B10C-1DA96CA3046D}
-		{A1A3EB96-46CE-4F2F-A3B6-EF869043DD49} = {9D5D9861-AE68-429C-8B21-2263F9DA07A1}
 		{53782603-3096-40C2-ABD3-F8F311BAE4BE} = {4C142567-C42B-40F5-B092-798882190209}
-		{E8C458AE-7B42-4DCE-B326-7F3A9065EA19} = {52AE329E-B588-40D0-A578-8D0DB1BD83E5}
-		{3C855DB2-EEA3-415C-A0A8-C834DEC40531} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
-		{991E796A-D1D1-48B8-B9AA-95C2744FE112} = {E4508D15-6503-4A29-ADC4-27B3A5E99545}
 		{FB9ED2C4-94A0-4004-A498-3F29A9D5BB5D} = {A2A4342E-024B-4063-B10C-1DA96CA3046D}
 		{FBE1FA7B-E699-4BB2-9C8F-41F4C9F3F088} = {4C142567-C42B-40F5-B092-798882190209}
-		{1AC5A693-3CC4-4450-AA76-70DA4F0C29DF} = {A7ED9F01-7D78-4381-90A6-D50E51C17250}
-		{A9A83BE5-271B-4347-9C4D-340FC3BD0B2B} = {22ADD4CD-092E-4ADC-A21E-64CF42230152}
 		{BD176B28-49CD-4FAD-A430-CDBCF1C2E514} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{7C67FF28-1B9E-4F13-8BDA-B833D588BC6A} = {25F10A0B-7259-404C-86BE-FD2363C92F72}
-		{AF6049CC-E60E-4174-9AB6-9AA282DE3A31} = {E4508D15-6503-4A29-ADC4-27B3A5E99545}
-		{5BFE4386-3C42-4118-96C8-4B68441F1661} = {E4508D15-6503-4A29-ADC4-27B3A5E99545}
 		{6A7B231E-36AA-4647-8C1A-FB1540ABC813} = {25F10A0B-7259-404C-86BE-FD2363C92F72}
 		{B686C194-D71D-4FF0-8B4F-F53AFBCD962F} = {75A820AB-0F21-40F2-9448-5D7F495B97A0}
 		{164A5B9A-E684-4B3F-9EF4-B7765FC0A8A1} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{B4EABB0D-E495-405C-B7B1-E2A7A3711AF5} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
 		{DA355C86-866F-4843-9B4D-63A173C750FB} = {4C142567-C42B-40F5-B092-798882190209}
 		{AB574F65-1402-4476-9314-74DCDAF19097} = {5D2D3BE8-9910-45CA-8E45-95660DA4C563}
-		{2FC40214-A4AA-45DC-9C93-72ED800C40B0} = {75608B5C-1C03-4B38-810E-14EED5165E59}
 		{00B72ED7-00E9-47F7-868D-8162027CD068} = {1AE1AC60-5D2F-4CA7-AE20-888F44551185}
 		{040F754C-17F4-4B5F-B974-93F1E39D107F} = {75608B5C-1C03-4B38-810E-14EED5165E59}
 		{62E9A8E4-79AF-4081-84D5-FEC5A0B28598} = {FC791F56-C1F1-4C41-A193-868D8197F8E2}
 		{AD4FDC24-B64D-4ED7-91AA-62C9EDA12FA4} = {4C142567-C42B-40F5-B092-798882190209}
+		{66BE41FC-FC52-48D0-9C04-BCE8CC393020} = {4C142567-C42B-40F5-B092-798882190209}
+		{42F46D75-ED70-46B4-8B0F-BAB923E3AC59} = {4C142567-C42B-40F5-B092-798882190209}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FF877973-604D-4EA7-B5F5-A129961F9EF2}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems*{00b72ed7-00e9-47f7-868d-8162027cd068}*SharedItemsImports = 13
+		..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems*{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}*SharedItemsImports = 5
+		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}*SharedItemsImports = 5
+		..\sources\editor\Xenko.Editor.CrashReport\Xenko.Editor.CrashReport.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
+		..\sources\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
+		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
+		..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems*{2fca2d8b-b10f-4dca-9847-4221f74ba586}*SharedItemsImports = 5
+		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{39ae9c77-e94b-404f-8768-b6261b3c1e0e}*SharedItemsImports = 5
+		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{3a3cb33c-64d9-4948-86c1-0d86320d23c3}*SharedItemsImports = 13
+		..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems*{50d1a3bb-4b41-4ef5-8d2f-3618a3b6c698}*SharedItemsImports = 5
+		..\sources\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.projitems*{5863574d-7a55-49bc-8e65-babb74d8e66e}*SharedItemsImports = 5
+		..\sources\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems*{950badd0-ad5a-4f58-87ec-4adaecbea89b}*SharedItemsImports = 13
+		..\sources\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.projitems*{9ac6d791-811e-4d6a-b08e-93f0093ef268}*SharedItemsImports = 13
+		..\sources\editor\Xenko.Editor.CrashReport\Xenko.Editor.CrashReport.projitems*{ab574f65-1402-4476-9314-74dcdaf19097}*SharedItemsImports = 13
+		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{b33e576f-2279-4bfc-a438-d9b84343b56b}*SharedItemsImports = 13
+		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{c121a566-555e-42b9-9b0a-1696529a9088}*SharedItemsImports = 5
+		..\sources\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems*{e8b3553f-a79f-4e50-b75b-acee771c320c}*SharedItemsImports = 5
+		..\sources\engine\Xenko.Shared\Refactor\Xenko.Refactor.projitems*{fb06c76a-6bb7-40be-9afa-fec13b045fb5}*SharedItemsImports = 5
+		..\sources\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems*{fb9ed2c4-94a0-4004-a498-3f29a9d5bb5d}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal
diff --git a/build/compile.bat b/build/compile.bat
index 4cfe2eb499..31643c3d12 100644
--- a/build/compile.bat
+++ b/build/compile.bat
@@ -153,7 +153,7 @@ rem Compile our solution. The following variables needs to be set:
 rem "Project" is the solution name
 rem "_platform_target" is the platform being targeted
 :compile
-set _option=/nologo /nr:false /m /verbosity:%__BuildVerbosity% /p:Configuration=%__BuildType% /p:Platform="%_platform_target%" /p:XenkoSkipUnitTests=%__SkipTestBuild% %Project%
+set _option=/nologo /nr:false /m /verbosity:%__BuildVerbosity% /p:Configuration=%__BuildType% /p:Platform="%_platform_target%" /p:XenkoSkipUnitTests=%__SkipTestBuild% %Project% /p:DeployExtension=false
 
 if "%__BuildDoc%" == "1" set _option=%_option% /p:XenkoGenerateDoc=true
 
diff --git a/deps/AssemblyProcessor/Mono.Cecil.Mdb.dll b/deps/AssemblyProcessor/Mono.Cecil.Mdb.dll
index 65b2b47d73..b41526d642 100644
--- a/deps/AssemblyProcessor/Mono.Cecil.Mdb.dll
+++ b/deps/AssemblyProcessor/Mono.Cecil.Mdb.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8cb8c40bb34158c28fe278d78b67219532cc241ae0ca69831b931be0320e5d0
-size 43520
+oid sha256:f5104aa2f42fd15d36a3c82c0d60b98c4f4e14e2dd0c027bcaf952ba1ecc1c2a
+size 43008
diff --git a/deps/AssemblyProcessor/Mono.Cecil.Pdb.dll b/deps/AssemblyProcessor/Mono.Cecil.Pdb.dll
index 97d17e6c4a..aa3bd6116f 100644
--- a/deps/AssemblyProcessor/Mono.Cecil.Pdb.dll
+++ b/deps/AssemblyProcessor/Mono.Cecil.Pdb.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:58a6cd3764a15ba9715fa4cc53ea0e61fbf9a8a0d4206762af40aea9167abe63
-size 87040
+oid sha256:a4788b2153629c49ab75297fa273ac0ca7ab0b799d36442ada968ed037023c71
+size 86528
diff --git a/deps/AssemblyProcessor/Mono.Cecil.Rocks.dll b/deps/AssemblyProcessor/Mono.Cecil.Rocks.dll
index a45c8a9d66..6d1c9f4ee4 100644
--- a/deps/AssemblyProcessor/Mono.Cecil.Rocks.dll
+++ b/deps/AssemblyProcessor/Mono.Cecil.Rocks.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddd6eb7e03cf200af3c560fe5717cbcca4b3df8932ac8511f7a2ad3dc1382390
+oid sha256:31183b063f8043437c07fd3e7168517e0a7ad588b9270190f3cf74556db955ee
 size 27648
diff --git a/deps/AssemblyProcessor/Mono.Cecil.dll b/deps/AssemblyProcessor/Mono.Cecil.dll
index 8b8e871696..190f8ecbfc 100644
--- a/deps/AssemblyProcessor/Mono.Cecil.dll
+++ b/deps/AssemblyProcessor/Mono.Cecil.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2802ecd87ca6c9cf35e4a4c2c40130139178d2b432eb65ab97b6464e77ff2c3c
-size 342528
+oid sha256:2c91802e6e95afc1d113f486df8c9c03792cb4898da219f0eb212bdd04fb3478
+size 339456
diff --git a/deps/AssemblyProcessor/README.md b/deps/AssemblyProcessor/README.md
new file mode 100644
index 0000000000..96c0f4b850
--- /dev/null
+++ b/deps/AssemblyProcessor/README.md
@@ -0,0 +1,2 @@
+Please update identity as soon as AssemblyProcessor is recompiled.
+This can be done by bumping version (i.e. currently ".Packed2.exe") doing a mass file replace.
diff --git a/deps/AssemblyProcessor/System.ValueTuple.dll b/deps/AssemblyProcessor/System.ValueTuple.dll
index f0cd47696d..ff4b6fb42b 100644
--- a/deps/AssemblyProcessor/System.ValueTuple.dll
+++ b/deps/AssemblyProcessor/System.ValueTuple.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:79fac2e8355a7bbb94d40d25fe0e34d5cedf5426a176f20f1ccd5e0606f0f082
-size 79200
+oid sha256:ad95c2b972a0bdd45513e26813ecd397b9cc557e66e9fe26ce5633a695c41d1a
+size 24776
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe
index cc4b4a89e3..5ccb1f868b 100644
--- a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe
+++ b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:17befecc20fbc92b84ef07b4b8edadc8f4ec96f9b7704c2ef19370cce7383499
-size 751616
+oid sha256:7d823c469184eadc6a6dbc322104e6c75ec290b48d704135811a184b4df1de5b
+size 688128
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.pdb b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.pdb
deleted file mode 100644
index eb2c1b8745..0000000000
--- a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:439302c79ab66131bf0f23eca868c2ad21f9442991cf532db2829640764915e4
-size 298496
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.exe b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.exe
new file mode 100644
index 0000000000..f15a832d79
--- /dev/null
+++ b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.exe
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ae0d82addb30df18d3236770c583bd72e69a5b2fd5355b9314586f054dbc7c68
+size 690176
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe.config b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.exe.config
similarity index 100%
rename from deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed.exe.config
rename to deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.exe.config
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.pdb b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.pdb
new file mode 100644
index 0000000000..a6239dfa2c
--- /dev/null
+++ b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.Packed2.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f8df5c9613d925197995194e6ee4eb91f7bd105950a3b2297d2b4984df1cf98
+size 302592
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe
index d4fceeac6d..12302ade50 100644
--- a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe
+++ b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de9f92bec3b9a30f85fdc0bd1f3fb4ac49968ce1bbec5a46cb6bca3157aedf19
-size 154624
+oid sha256:1ec781e548b880b7820a35d1865f3773a1b790c272881688d8ef639a40380d02
+size 156672
diff --git a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb
index 2532ee2925..ea8f985763 100644
--- a/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb
+++ b/deps/AssemblyProcessor/Xenko.Core.AssemblyProcessor.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2cb9d4d4cf1369a47060c4bbdda3b9313cc593d65274f9dfd970b01233137306
-size 409088
+oid sha256:7b8ea5c3e1d0dd2e06ff8d895f5349006ce9136b5a8ee9f2b183f79250c01c3c
+size 439808
diff --git a/deps/BulletPhysics/Android/arm64-v8a/libbulletc.so b/deps/BulletPhysics/Android/arm64-v8a/libbulletc.so
index 0f20a65e3d..ae4a295180 100644
--- a/deps/BulletPhysics/Android/arm64-v8a/libbulletc.so
+++ b/deps/BulletPhysics/Android/arm64-v8a/libbulletc.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab8a771f504afd34885178f1fc8ae507b0c45130d3365eea443c8ab774171c4b
-size 1385560
+oid sha256:82a8f2cdff26a6627a4f105a55587ef66d98ea678c192eeda350b4679808eb97
+size 3483168
diff --git a/deps/BulletPhysics/Android/armeabi-v7a/libbulletc.so b/deps/BulletPhysics/Android/armeabi-v7a/libbulletc.so
index d0e53bf242..16889cb9d7 100644
--- a/deps/BulletPhysics/Android/armeabi-v7a/libbulletc.so
+++ b/deps/BulletPhysics/Android/armeabi-v7a/libbulletc.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:61c96e5134d8db1266175b05d76862c38bf8ef8adea010302009a966be4088f3
-size 1213064
+oid sha256:c3eac3a1573588914e8b21479753d5eeba20023047913b05f9df54f48d5c3dc7
+size 2843512
diff --git a/deps/BulletPhysics/Android/armeabi/libbulletc.so b/deps/BulletPhysics/Android/armeabi/libbulletc.so
deleted file mode 100644
index c3bda905e1..0000000000
--- a/deps/BulletPhysics/Android/armeabi/libbulletc.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bf96f0c0e80e24962fae176a5870ee9c0872c17de833f7281f4711ab509756dc
-size 1340040
diff --git a/deps/BulletPhysics/Android/x86/libbulletc.so b/deps/BulletPhysics/Android/x86/libbulletc.so
index ac0c3018f1..d78870bd85 100644
--- a/deps/BulletPhysics/Android/x86/libbulletc.so
+++ b/deps/BulletPhysics/Android/x86/libbulletc.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b134a167f8ce0e8ca5d67bdd057cb7ac5652d2ff359b92ef39e8ae069345c7e9
-size 1622648
+oid sha256:1a915bc1e2d31fdf7b27ac5dcdf231962711593b99c5d555a17222012aa67926
+size 4088704
diff --git a/deps/BulletPhysics/Android/x86_64/libbulletc.so b/deps/BulletPhysics/Android/x86_64/libbulletc.so
index 800ca998ec..c8577c81a0 100644
--- a/deps/BulletPhysics/Android/x86_64/libbulletc.so
+++ b/deps/BulletPhysics/Android/x86_64/libbulletc.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be7d933991e1b7acbca7c7cace80a7482e2ec0587fa0b0dc04fb401f35d60ffc
-size 1643888
+oid sha256:83530aac2a491d7dc3f08ec1a631bca7bb7a029e8f9466fde1c745a2f0f78910
+size 4233016
diff --git a/deps/BulletPhysics/BulletSharp.NetStandard.dll b/deps/BulletPhysics/BulletSharp.NetStandard.dll
new file mode 100644
index 0000000000..42a7d2e865
--- /dev/null
+++ b/deps/BulletPhysics/BulletSharp.NetStandard.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a64b88b2dde526c0c857ac999d84ab76580c93f50c5b49920cc68027c52f6abe
+size 775168
diff --git a/deps/BulletPhysics/BulletSharp.dll.config b/deps/BulletPhysics/BulletSharp.NetStandard.dll.config
similarity index 100%
rename from deps/BulletPhysics/BulletSharp.dll.config
rename to deps/BulletPhysics/BulletSharp.NetStandard.dll.config
diff --git a/deps/BulletPhysics/Linux/libbulletc.so b/deps/BulletPhysics/Linux/libbulletc.so
index 6eab26dcaf..c02933f636 100644
--- a/deps/BulletPhysics/Linux/libbulletc.so
+++ b/deps/BulletPhysics/Linux/libbulletc.so
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2ebd4c5e85f5821b69f486273eb71e14e763ec07f1273389893f273a710a210d
-size 2250240
+oid sha256:71e26f26f4b92e5cc08ea30b35d6a7bdd644f4abc2b29a40ae53752ff0b8acd6
+size 4028808
diff --git a/deps/BulletPhysics/UWP/ARM/libbulletc.dll b/deps/BulletPhysics/UWP/ARM/libbulletc.dll
index 348004d7d0..7de06f29a8 100644
--- a/deps/BulletPhysics/UWP/ARM/libbulletc.dll
+++ b/deps/BulletPhysics/UWP/ARM/libbulletc.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d607e869c81b0381a1ebc1c81dfe3114a75a2f22062b3c51ff60ad6895293f95
-size 1041408
+oid sha256:e66db69a02c1d423dc5dd01354129c459b9f6207ee4f94e4f81ebe7bc671c10c
+size 1321472
diff --git a/deps/BulletPhysics/UWP/x64/libbulletc.dll b/deps/BulletPhysics/UWP/x64/libbulletc.dll
index 81756da7e4..928b91ad40 100644
--- a/deps/BulletPhysics/UWP/x64/libbulletc.dll
+++ b/deps/BulletPhysics/UWP/x64/libbulletc.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65944df8541ceb6ba9feafa87e1feef7012a7d514b2d3ec793abe9b180ffcb18
-size 1471488
+oid sha256:a3216d1b3ee9829fdb1eba3d007f36ef22f2fd32f5af7b8c62262ab874037cd5
+size 1835520
diff --git a/deps/BulletPhysics/UWP/x86/libbulletc.dll b/deps/BulletPhysics/UWP/x86/libbulletc.dll
index a2cbf207fb..614a48ae04 100644
--- a/deps/BulletPhysics/UWP/x86/libbulletc.dll
+++ b/deps/BulletPhysics/UWP/x86/libbulletc.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dbaa97cb8bc5f6c4c696866eb299703602345d06b3b6fdf805c259b8b340e05b
-size 1319936
+oid sha256:6d10abaf888b6d62b6f792b13984af90b7f4948dea6893b75d81763979be0ea6
+size 1605632
diff --git a/deps/BulletPhysics/Windows/BulletSharp.dll b/deps/BulletPhysics/Windows/BulletSharp.dll
deleted file mode 100644
index 22e7b5bac2..0000000000
--- a/deps/BulletPhysics/Windows/BulletSharp.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c57615a3883cd197e5273e2453db931fbe86233343f9606a52578cdce598419
-size 349696
diff --git a/deps/BulletPhysics/Windows/x64/libbulletc.dll b/deps/BulletPhysics/Windows/x64/libbulletc.dll
index 98c279f3c3..b3a6a2cdbb 100644
--- a/deps/BulletPhysics/Windows/x64/libbulletc.dll
+++ b/deps/BulletPhysics/Windows/x64/libbulletc.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:981a393e6b7f7533ada4a92c0b64073783dda5afd3ac8708ba5ae5404d0c23b5
-size 1458176
+oid sha256:fbbcadaafd01684a9d7a60ad4582d34f9511077391e9c6b93d7749fda083c9b0
+size 2078720
diff --git a/deps/BulletPhysics/Windows/x86/libbulletc.dll b/deps/BulletPhysics/Windows/x86/libbulletc.dll
index 61e1fe90d2..a04dfda0db 100644
--- a/deps/BulletPhysics/Windows/x86/libbulletc.dll
+++ b/deps/BulletPhysics/Windows/x86/libbulletc.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b6a499af30345c340367f4a2f8cc707562265fcb185ba80fe73b6361fb4c1720
-size 1310208
+oid sha256:64b4e7de363c529ac57454eb5c0f96d2b93ab4608fed4917f1a22d9476774b9d
+size 1814016
diff --git a/deps/BulletPhysics/checkout.bat b/deps/BulletPhysics/checkout.bat
index 24ecc3cc03..39b42902db 100644
--- a/deps/BulletPhysics/checkout.bat
+++ b/deps/BulletPhysics/checkout.bat
@@ -6,5 +6,5 @@ IF NOT ERRORLEVEL 0 (
   ECHO "Could not find git.exe"
   EXIT /B %ERRORLEVEL%
 ) 
-%GIT_CMD% clone git@github.com:xenko3d/bullet2-sharp-mobile.git ../../externals/bullet2-sharp-mobile
+%GIT_CMD% clone https://github.com/phr00t/bullet2-sharp-mobile.git ../../externals/bullet2-sharp-mobile
 if NOT ERRORLEVEL 0 pause
diff --git a/deps/BulletPhysics/iOS/BulletSharp.NetStandard.dll b/deps/BulletPhysics/iOS/BulletSharp.NetStandard.dll
new file mode 100644
index 0000000000..565f01de8f
--- /dev/null
+++ b/deps/BulletPhysics/iOS/BulletSharp.NetStandard.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dd8dc4520f55e8538fe382546fda918290060a3541540d0b571ac1fb81ce6279
+size 775168
diff --git a/deps/BulletPhysics/iOS/BulletSharp.dll b/deps/BulletPhysics/iOS/BulletSharp.dll
deleted file mode 100644
index f175db1dbc..0000000000
--- a/deps/BulletPhysics/iOS/BulletSharp.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:408af31baf63f03950999ad096c35c10256b5bc5a35cd7eeabffa71c415e0212
-size 343552
diff --git a/deps/BulletPhysics/iOS/libbulletc.a b/deps/BulletPhysics/iOS/libbulletc.a
index d9ac3e44b4..07f2dde586 100644
--- a/deps/BulletPhysics/iOS/libbulletc.a
+++ b/deps/BulletPhysics/iOS/libbulletc.a
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fc1710bff0091f7433f0505172b19b0770b053270d083c4f645386cf3f59a2a
-size 12409032
+oid sha256:1b81f4bebe9ece9d4fb77eb2d60b634d38e35529160142ba3eb91bf752713124
+size 6412480
diff --git a/deps/BulletPhysics/macOS/libbulletc.dylib b/deps/BulletPhysics/macOS/libbulletc.dylib
index d8c6cb9acf..ce23cbbf67 100644
--- a/deps/BulletPhysics/macOS/libbulletc.dylib
+++ b/deps/BulletPhysics/macOS/libbulletc.dylib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3e02e0a238b46223917e9af6b14a8e89bde6238c454431f93a8c23f6363994c
-size 1340892
+oid sha256:93032ee2c5f19b34034cd3f4b0fabc4773e091c993814755be87fdfe589c30a6
+size 2900016
diff --git a/deps/BulletPhysics/sign.bat b/deps/BulletPhysics/sign.bat
deleted file mode 100644
index fa32b4a9af..0000000000
--- a/deps/BulletPhysics/sign.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\vc\vcvarsall.bat" x86
-
-ildasm /all /out:Windows\BulletSharp.il Windows\BulletSharp.dll
-ildasm /all /out:iOS\BulletSharp.il iOS\BulletSharp.dll
-
-@echo "Please patch Windows\BulletSharp.il and iOS\BulletSharp.il Xenko.Core.Mathematics reference with .publickeytoken = ( BA CA CC 89 C3 B6 D5 56 )"
-pause
-
-mkdir Windows\Signed
-mkdir iOS\Signed
-ilasm /dll /key:..\..\build\paradox.snk /output:Windows\Signed\BulletSharp.dll Windows\BulletSharp.il
-ilasm /dll /key:..\..\build\paradox.snk /output:iOS\Signed\BulletSharp.dll iOS\BulletSharp.il
\ No newline at end of file
diff --git a/deps/FreeImage/Debug/x64/FreeImage.dll b/deps/FreeImage/Debug/x64/FreeImage.dll
index f16234f8ac..907eb022b9 100644
--- a/deps/FreeImage/Debug/x64/FreeImage.dll
+++ b/deps/FreeImage/Debug/x64/FreeImage.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:153acbe894674a98df589059868d7dacb79538016ddc59f3ef8fc437f76e389c
-size 10278912
+oid sha256:938ef7c5798b7a48e5c5e92b08576d1c1f605d4bee3cfe7e20dcc4f68f9f67c6
+size 10181632
diff --git a/deps/FreeImage/Debug/x64/FreeImageNET.dll b/deps/FreeImage/Debug/x64/FreeImageNET.dll
index 3a667996a9..6044966063 100644
--- a/deps/FreeImage/Debug/x64/FreeImageNET.dll
+++ b/deps/FreeImage/Debug/x64/FreeImageNET.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc6242fba03afcf566e69ec53bb5bd8eafedf468b7cc184e256de62b295b3578
-size 216064
+oid sha256:6e9b8880eb5a5b17312b301121a92103987caeb51762c706e05e403540d7c0a0
+size 207360
diff --git a/deps/FreeImage/Debug/x64/FreeImageNET.pdb b/deps/FreeImage/Debug/x64/FreeImageNET.pdb
index 0d4a3b6efe..69d08959b9 100644
--- a/deps/FreeImage/Debug/x64/FreeImageNET.pdb
+++ b/deps/FreeImage/Debug/x64/FreeImageNET.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b449b3fc030dc76515aa5f790872e03d9f2cfdb8e41e15e6ee2a77adc03f05e7
-size 632320
+oid sha256:2da587e23a15ab3d38913ca927855e4a739d459d6a2eb426796b80b86b022190
+size 114292
diff --git a/deps/FreeImage/Debug/x86/FreeImage.dll b/deps/FreeImage/Debug/x86/FreeImage.dll
index f9d23db166..514dea263a 100644
--- a/deps/FreeImage/Debug/x86/FreeImage.dll
+++ b/deps/FreeImage/Debug/x86/FreeImage.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:909054b49f2044dafc494b34b382edee9799165c920b2c03aded3de043a792db
-size 8317440
+oid sha256:755220fc93c27d4d61a0ec7b7ec927398710a2392280ba0fc82cf7bb796a17cb
+size 8183296
diff --git a/deps/FreeImage/Debug/x86/FreeImageNET.dll b/deps/FreeImage/Debug/x86/FreeImageNET.dll
index a67f9122f3..c261131435 100644
--- a/deps/FreeImage/Debug/x86/FreeImageNET.dll
+++ b/deps/FreeImage/Debug/x86/FreeImageNET.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa711c552b119d962e1a73d65e14754ae7b380f04fbb25942b8e0c8c384d5fbd
-size 208384
+oid sha256:98cfaa7f3ac7af8d28c8a0db6c075f37c9bb136a257c40086ca89a4882490ee2
+size 207872
diff --git a/deps/FreeImage/Debug/x86/FreeImageNET.pdb b/deps/FreeImage/Debug/x86/FreeImageNET.pdb
index 69d1c78a9b..69d08959b9 100644
--- a/deps/FreeImage/Debug/x86/FreeImageNET.pdb
+++ b/deps/FreeImage/Debug/x86/FreeImageNET.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fcae597e214511c042ade778ad18203f9b90a04b618d11255c88caaf856dd840
-size 632320
+oid sha256:2da587e23a15ab3d38913ca927855e4a739d459d6a2eb426796b80b86b022190
+size 114292
diff --git a/deps/FreeImage/Release/x64/FreeImage.dll b/deps/FreeImage/Release/x64/FreeImage.dll
index c564bee80b..97272eb2cd 100644
--- a/deps/FreeImage/Release/x64/FreeImage.dll
+++ b/deps/FreeImage/Release/x64/FreeImage.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f539b6c800c105ee63115b5945e761979e51cf93df8d1d79b5814b5d62a73275
-size 4319744
+oid sha256:819b8ae2d021300f75be8a09347bc07b0bfbfc01e0127ba869122a2d092697ea
+size 4257280
diff --git a/deps/FreeImage/Release/x64/FreeImageNET.dll b/deps/FreeImage/Release/x64/FreeImageNET.dll
index c962ecf7ff..2596f3ee5f 100644
--- a/deps/FreeImage/Release/x64/FreeImageNET.dll
+++ b/deps/FreeImage/Release/x64/FreeImageNET.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b15c3c45f74479fda13e6b3a9461f6b3c8d5d06a10ccc72744a2f6aa64733b5
-size 188928
+oid sha256:9cc7333845e364a8c5982806ad4416fad7a35c1d18af67048f4ac611c74658f9
+size 179712
diff --git a/deps/FreeImage/Release/x86/FreeImage.dll b/deps/FreeImage/Release/x86/FreeImage.dll
index 95ea7495d8..886fd6b823 100644
--- a/deps/FreeImage/Release/x86/FreeImage.dll
+++ b/deps/FreeImage/Release/x86/FreeImage.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aeba34601ef81af851e475a7ab46785ed621af8cb08e30f11f69ea16c20f66b2
-size 3649536
+oid sha256:2822d5b96ce00cea46c413aa0efb0485662f4c99ca100ecafa2406693b4f2f6c
+size 3625984
diff --git a/deps/FreeImage/Release/x86/FreeImageNET.dll b/deps/FreeImage/Release/x86/FreeImageNET.dll
index ed52aaea20..1dc56c0a5f 100644
--- a/deps/FreeImage/Release/x86/FreeImageNET.dll
+++ b/deps/FreeImage/Release/x86/FreeImageNET.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a6b7fe075820a0a51186c5cd42d67183de4879589dcdaaab84777af529263b2
+oid sha256:8bea695a9a8503ba0cf943e253b60ce838407724db78f27c89ea3a89aaf89215
 size 180224
diff --git a/deps/GraphX/GraphX.PCL.Common.dll b/deps/GraphX/GraphX.PCL.Common.dll
deleted file mode 100644
index 2a32026ea5..0000000000
--- a/deps/GraphX/GraphX.PCL.Common.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca07cc8586f560fd7defa3ff5aa6d091dcf51dbe96532421c3aa6b6bd687f04d
-size 42496
diff --git a/deps/GraphX/GraphX.PCL.Logic.dll b/deps/GraphX/GraphX.PCL.Logic.dll
deleted file mode 100644
index 06c5433099..0000000000
--- a/deps/GraphX/GraphX.PCL.Logic.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a203e08182fe37ec1c7d15d3a13a45542bb03bd93e5a7bd2dd51ad29a6afa548
-size 229888
diff --git a/deps/GraphX/GraphX.WPF.Controls.dll b/deps/GraphX/GraphX.WPF.Controls.dll
deleted file mode 100644
index 2abad3d423..0000000000
--- a/deps/GraphX/GraphX.WPF.Controls.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2ebcdfb455e11513ada8d9b3980b0bdf39b1fcd24cdc7b6bf14c914d6324280d
-size 212480
diff --git a/deps/GraphX/LICENSE.txt b/deps/GraphX/LICENSE.txt
deleted file mode 100644
index e06d208186..0000000000
--- a/deps/GraphX/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   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.
-
diff --git a/deps/GraphX/QuickGraph.dll b/deps/GraphX/QuickGraph.dll
deleted file mode 100644
index eeb7b4cbde..0000000000
--- a/deps/GraphX/QuickGraph.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18eff726aef1330c1b6112d5a7d680177db777fd7ae633f25b8ab618304fed03
-size 322048
diff --git a/deps/MoltenVK/macOS/libvulkan.1.dylib b/deps/MoltenVK/macOS/libvulkan.1.dylib
index a04f234b6b..bd2f2e3f7d 100644
--- a/deps/MoltenVK/macOS/libvulkan.1.dylib
+++ b/deps/MoltenVK/macOS/libvulkan.1.dylib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb860118682d68a0beacb649c303c11d13079f688389dd90b9a229ea5b41122d
-size 2711036
+oid sha256:ae6930ed4e79eafbcb84599187bc30ff151a2c8c65a304615b8c77a2836bbcaa
+size 13639344
diff --git a/deps/Mono.Cecil/Mono.Cecil.Rocks.dll b/deps/Mono.Cecil/Mono.Cecil.Rocks.dll
deleted file mode 100644
index a45c8a9d66..0000000000
--- a/deps/Mono.Cecil/Mono.Cecil.Rocks.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ddd6eb7e03cf200af3c560fe5717cbcca4b3df8932ac8511f7a2ad3dc1382390
-size 27648
diff --git a/deps/Mono.Cecil/build.bat b/deps/Mono.Cecil/build.bat
deleted file mode 100644
index 4f542efaf9..0000000000
--- a/deps/Mono.Cecil/build.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
-msbuild ..\..\externals\il-repack\cecil\Mono.Cecil.sln /Property:Configuration=net_4_0_Release;Platform="Any CPU"
-copy ..\..\externals\il-repack\cecil\bin\net_4_0_Release\*.* .
diff --git a/deps/Mono.Cecil/checkout.bat b/deps/Mono.Cecil/checkout.bat
deleted file mode 100644
index 1b8d8366f8..0000000000
--- a/deps/Mono.Cecil/checkout.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Checking out ILRepack which contains Cecil"
-..\ILRepack\checkout.bat
diff --git a/deps/NativePath/Android/armeabi/libCelt.a b/deps/NativePath/Android/armeabi/libCelt.a
deleted file mode 100644
index 6bd0377998..0000000000
--- a/deps/NativePath/Android/armeabi/libCelt.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffe0ca7e62578766c8d5ac3fd0ea4001294f381732cc5a041e309216e2d7d1b9
-size 182544
diff --git a/deps/NativePath/Android/armeabi/libCompilerRt.a b/deps/NativePath/Android/armeabi/libCompilerRt.a
deleted file mode 100644
index 3d4d980564..0000000000
--- a/deps/NativePath/Android/armeabi/libCompilerRt.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41383584d35792884e2a021117c31c1abfee18659b01b4b9c10ac824d142ddc6
-size 199828
diff --git a/deps/NativePath/Android/armeabi/libDetour.a b/deps/NativePath/Android/armeabi/libDetour.a
deleted file mode 100644
index f39366d594..0000000000
--- a/deps/NativePath/Android/armeabi/libDetour.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b704dd1eb9b24b979bdc31e3264ba07285860cc9fb2950517b39ad7d325a257d
-size 118280
diff --git a/deps/NativePath/Android/armeabi/libNativePath.a b/deps/NativePath/Android/armeabi/libNativePath.a
deleted file mode 100644
index 4173a41b36..0000000000
--- a/deps/NativePath/Android/armeabi/libNativePath.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:98cd07ec978374121d4e9665dbbde79baf348fccdb9da595a51a37d747e08630
-size 97782
diff --git a/deps/NativePath/Android/armeabi/libRecast.a b/deps/NativePath/Android/armeabi/libRecast.a
deleted file mode 100644
index 982dabad2e..0000000000
--- a/deps/NativePath/Android/armeabi/libRecast.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75c6e83bf98aabd7e2354ac1eeefae9f8070282709144f66ea1a382d63836c94
-size 161256
diff --git a/deps/NativePath/Android/armeabi/libc++abi.a b/deps/NativePath/Android/armeabi/libc++abi.a
deleted file mode 100644
index c157c1e223..0000000000
--- a/deps/NativePath/Android/armeabi/libc++abi.a
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ade1d31240ecc07561f3f96368398fe1dc5f79795e958a15e12c0033e984a469
-size 2275308
diff --git a/deps/Nuget/NuGet.exe b/deps/Nuget/NuGet.exe
index 72ebed5875..e6b0aa8159 100644
--- a/deps/Nuget/NuGet.exe
+++ b/deps/Nuget/NuGet.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:399ec24c26ed54d6887cde61994bb3d1cada7956c1b19ff880f06f060c039918
-size 4266712
+oid sha256:ae3bb02517b52a744833a4777e99d647cd80b29a62fd360e9aabaa34f09af59c
+size 6661528
diff --git a/deps/OpenAL/Windows/OpenAL.dll b/deps/OpenAL/Windows/OpenAL.dll
new file mode 100644
index 0000000000..70e620a236
--- /dev/null
+++ b/deps/OpenAL/Windows/OpenAL.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5eee04c029b6564b6a3ff00388212e4380dc89391dd4bd9ba8cf7109c6b764a5
+size 727040
diff --git a/deps/OpenAL/Windows/OpenAL32.dll b/deps/OpenAL/Windows/OpenAL32.dll
new file mode 100644
index 0000000000..dd03536e85
--- /dev/null
+++ b/deps/OpenAL/Windows/OpenAL32.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:741f4f01699c551b16adb810be8790ac691765f9a84543869092dd38e9ac01b9
+size 640000
diff --git a/deps/OpenTK/.gitignore b/deps/OpenTK/.gitignore
deleted file mode 100644
index 348b3e3568..0000000000
--- a/deps/OpenTK/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pdb
-*.nupkg
\ No newline at end of file
diff --git a/deps/OpenTK/Android/OpenTK-1.1.dll b/deps/OpenTK/Android/OpenTK-1.1.dll
deleted file mode 100644
index 7d6ead3ef5..0000000000
--- a/deps/OpenTK/Android/OpenTK-1.1.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d21d9811e85755709093f047afdd015af2407b1d09fa326e0337962993fd8412
-size 1732096
diff --git a/deps/OpenTK/CoreCLR/Linux/OpenTK.dll b/deps/OpenTK/CoreCLR/Linux/OpenTK.dll
deleted file mode 100644
index db135da8e2..0000000000
--- a/deps/OpenTK/CoreCLR/Linux/OpenTK.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02727386ebfacb0c7702ee9742116ccf9bebd83dced385163c59110326607a32
-size 4407808
diff --git a/deps/OpenTK/CoreCLR/Windows/OpenTK.dll b/deps/OpenTK/CoreCLR/Windows/OpenTK.dll
deleted file mode 100644
index fb041afb12..0000000000
--- a/deps/OpenTK/CoreCLR/Windows/OpenTK.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b72c6c6d110a9f4fbeffbe25d45172e96aea96137d881fe05b4277d7e88bd3d5
-size 4408320
diff --git a/deps/OpenTK/CoreCLR/macOS/OpenTK.dll b/deps/OpenTK/CoreCLR/macOS/OpenTK.dll
deleted file mode 100644
index 1b7e7ac45b..0000000000
--- a/deps/OpenTK/CoreCLR/macOS/OpenTK.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f15eee117c1aa3656b3fc642bb6e79819bec9b52dfdf638f9f551b2a1241f335
-size 4407808
diff --git a/deps/OpenTK/Linux/OpenTK.dll b/deps/OpenTK/Linux/OpenTK.dll
deleted file mode 100644
index 20f71da264..0000000000
--- a/deps/OpenTK/Linux/OpenTK.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f106371b9971f518e74173e815009a15aff3a0a71377c532dd30727183c497c6
-size 4406272
diff --git a/deps/OpenTK/Linux/OpenTK.dll.config b/deps/OpenTK/Linux/OpenTK.dll.config
deleted file mode 100644
index 7098d39e9c..0000000000
--- a/deps/OpenTK/Linux/OpenTK.dll.config
+++ /dev/null
@@ -1,25 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
-  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
-  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
-  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
-  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
-  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
-  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
-  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
-  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
-  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
-  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
-  <!-- XQuartz compatibility (X11 on Mac) -->
-  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
-  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
-  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
-  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
-  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
-  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
-</configuration>
diff --git a/deps/OpenTK/OpenTK.dll b/deps/OpenTK/OpenTK.dll
deleted file mode 100644
index 9ceff79153..0000000000
--- a/deps/OpenTK/OpenTK.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e96b4f836d579244f0ee90a5603a20561417daae942a534600a62ee20fc6aca3
-size 4616192
diff --git a/deps/OpenTK/OpenTK.dll.config b/deps/OpenTK/OpenTK.dll.config
deleted file mode 100644
index 7098d39e9c..0000000000
--- a/deps/OpenTK/OpenTK.dll.config
+++ /dev/null
@@ -1,25 +0,0 @@
-<configuration>
-  <dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
-  <dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
-  <dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
-  <dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
-  <dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
-  <dllmap os="linux" dll="libX11" target="libX11.so.6"/>
-  <dllmap os="linux" dll="libXi" target="libXi.so.6"/>
-  <dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
-  <dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
-  <dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
-  <dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
-  <dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
-  <dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
-  <!-- XQuartz compatibility (X11 on Mac) -->
-  <dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
-  <dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
-  <dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
-  <dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
-  <dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
-  <dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
-</configuration>
diff --git a/deps/OpenTK/Xenko.OpenTK.nuspec b/deps/OpenTK/Xenko.OpenTK.nuspec
deleted file mode 100644
index a8b293282d..0000000000
--- a/deps/OpenTK/Xenko.OpenTK.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>Xenko.OpenTK</id>
-    <version>1.0.2</version>
-    <authors>Xenko contributors and OpenTK team</authors>
-    <owners>Xenko contributors and OpenTK team</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>OpenTK for Xenko</description>
-  </metadata>
-  
-  <files>
-    <file src="OpenTK.dll" target="ref\net45" />
-    <file src="OpenTK.dll" target="runtimes\win\lib\net45" />
-	<file src="Linux\OpenTK.dll" target="lib\netstandard2.0" />
-	<file src="Android\OpenTK-1.1.dll" target="lib\monoandroid50" />
-	<file src="iOS\OpenTK-1.1.dll" target="lib\xamarinios10" />
-  </files>
-</package>
\ No newline at end of file
diff --git a/deps/OpenTK/build-debug.bat b/deps/OpenTK/build-debug.bat
deleted file mode 100644
index 5af814a99c..0000000000
--- a/deps/OpenTK/build-debug.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-
-rem If not already loaded, setup VisualStudio
-if "%VisualStudioVersion%" EQ "" call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
-
-msbuild ..\..\externals\opentk\OpenTK.sln /Property:Configuration=Debug;Platform="Any CPU"
-copy ..\..\externals\opentk\Binaries\OpenTK\Debug\OpenTK.dll .
-copy ..\..\externals\opentk\Binaries\OpenTK\Debug\OpenTK.pdb .
-copy ..\..\externals\opentk\Binaries\OpenTK\Debug\OpenTK.GLControl.dll .
-copy ..\..\externals\opentk\Binaries\OpenTK\Debug\OpenTK.GLControl.pdb .
diff --git a/deps/OpenTK/build.bat b/deps/OpenTK/build.bat
deleted file mode 100644
index 0e9c06ed5b..0000000000
--- a/deps/OpenTK/build.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@echo off
-
-rem If not already loaded, setup VisualStudio
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
-
-set opentk=..\..\externals\opentk
-
-pushd %opentk%
-..\..\build\.nuget\NuGet.exe  restore OpenTK.sln
-..\..\build\.nuget\NuGet.exe  restore source\OpenTK\OpenTK.NETStandard.csproj
-popd
-
-REM NET Standard
-msbuild %opentk%\source\OpenTK\OpenTK.NETStandard.csproj /Property:Configuration=Release;Platform="AnyCPU"
-copy /Y %opentk%\Binaries\OpenTK\Release\netstandard2.0\OpenTK.dll .
-copy /Y %opentk%\Binaries\OpenTK\Release\netstandard2.0\OpenTK.pdb .
-
-REM Android
-msbuild %opentk%\OpenTK.Android.sln /Property:Configuration=Release;Platform="Any CPU"
-if not exist Android mkdir Android
-copy /Y %opentk%\Binaries\Android\Release\OpenTK-1.1.dll Android
-copy /Y %opentk%\Binaries\Android\Release\OpenTK-1.1.dll.mdb Android
-
-REM iOS
-msbuild %opentk%\OpenTK.iOS.sln /Property:Configuration=Release;Platform="Any CPU"
-if not exist iOS mkdir iOS
-copy /Y %opentk%\Binaries\iOS\Release\OpenTK-1.1.dll iOS
-copy /Y %opentk%\Binaries\iOS\Release\OpenTK-1.1.dll.mdb iOS
diff --git a/deps/OpenTK/checkout.bat b/deps/OpenTK/checkout.bat
deleted file mode 100644
index b9e0aa72e6..0000000000
--- a/deps/OpenTK/checkout.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo OFF
-setlocal
-set HOME=%USERPROFILE%
-CALL ..\find_git.cmd
-IF NOT ERRORLEVEL 0 (
-  ECHO "Could not find git.exe"
-  EXIT /B %ERRORLEVEL%
-) 
-%GIT_CMD% clone git@github.com:xenko3d/opentk ../../externals/opentk -b develop
-if NOT ERRORLEVEL 0 pause
-pushd ..\..\externals\opentk
-%GIT_CMD% remote add upstream git@github.com:opentk/opentk.git
-%GIT_CMD% fetch --all
-popd
-if NOT ERRORLEVEL 0 pause
\ No newline at end of file
diff --git a/deps/OpenTK/iOS/OpenTK-1.1.dll b/deps/OpenTK/iOS/OpenTK-1.1.dll
deleted file mode 100644
index a2366ee942..0000000000
--- a/deps/OpenTK/iOS/OpenTK-1.1.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce8fb17099a496a07a4481b9663b06da7ce02f7e065fe177b82551f8b2136ba4
-size 457216
diff --git a/deps/OpenTK/iOS/link.bat b/deps/OpenTK/iOS/link.bat
deleted file mode 100644
index ee55e4a7da..0000000000
--- a/deps/OpenTK/iOS/link.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-pushd ..\..\..\bin\iOS-OpenGLES
-..\..\deps\Mono.Cecil\monolinker -a Xenko.Engine.dll -a Xenko.Games.dll -a Xenko.Input.dll -a Xenko.Graphics.dll -p link OpenTK-1.1 -u copy -b true -d "C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\Xamarin.iOS\v1.0"
-popd
-
-copy ..\..\..\bin\iOS-OpenGLES\output\OpenTK-1.1.dll .
\ No newline at end of file
diff --git a/deps/OpenTK/license.txt b/deps/OpenTK/license.txt
deleted file mode 100644
index 61edfe258f..0000000000
--- a/deps/OpenTK/license.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-Source: http://www.opentk.com/project/license
-
-The Open Toolkit library license
-Copyright (c) 2006 - 2013 Stefanos Apostolopoulos (stapostol@gmail.com) for the Open Toolkit library.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Third parties
-OpenTK.Platform.Windows and OpenTK.Platform.X11 include portions of the Mono class library. These portions are covered by the following license:
-Copyright (c) 2004 Novell, Inc.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-OpenTK.Compatibility includes portions of the Tao Framework library (Tao.OpenGl, Tao.OpenAl and Tao.Platform.Windows.SimpleOpenGlControl). These portions are covered by the following license:
-Copyright (c) 2003-2007 Tao Framework Team
-http://www.taoframework.com
-All rights reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-OpenTK.Half offers Half-to-Single and Single-to-Half conversions based on OpenEXR source code, which is covered by the following license:
-Copyright (c) 2002, Industrial Light & Magic, a division of Lucas Digital Ltd. LLC. All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of Industrial Light & Magic nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/deps/OpenTK/macOS/OpenTK.dll b/deps/OpenTK/macOS/OpenTK.dll
deleted file mode 100644
index a2d08f1eb0..0000000000
--- a/deps/OpenTK/macOS/OpenTK.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:57989c07a4d16349d83da90644d1d42315c484536dfa3c70db6ba8a5af922b6a
-size 4406784
diff --git a/deps/OpenVR/Linux/libopenvr_api.so b/deps/OpenVR/Linux/libopenvr_api.so
new file mode 100644
index 0000000000..129f237aab
--- /dev/null
+++ b/deps/OpenVR/Linux/libopenvr_api.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd77728b5ea0b93ee01e678c9a5f9d47e4ea8f90f41ba9dcfb6a164b1e2a83ac
+size 325366
diff --git a/deps/OpenVR/Windows/x64/openvr_api.dll b/deps/OpenVR/Windows/x64/openvr_api.dll
index eda79981b9..4fb8fe0b55 100644
--- a/deps/OpenVR/Windows/x64/openvr_api.dll
+++ b/deps/OpenVR/Windows/x64/openvr_api.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:877b038c01486f6014b7711f3d5d9f8c59d976d032edc8915261d2b5656d5098
-size 314656
+oid sha256:71db78e77e577db6d0666c25437695d42ceafb9c7f8da94fbe765525b8e2f5f2
+size 819664
diff --git a/deps/OpenVR/Windows/x86/openvr_api.dll b/deps/OpenVR/Windows/x86/openvr_api.dll
index 644ae0761c..e49ec9df6f 100644
--- a/deps/OpenVR/Windows/x86/openvr_api.dll
+++ b/deps/OpenVR/Windows/x86/openvr_api.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c4ddd7ea3fe7bfffa07867c07a7651b2a141e0d61aefe24b1d7dea7f832eafc2
-size 267040
+oid sha256:965d24d2b097880475fb825d7675c819e42dc392209c742dd0fbf23ad322e005
+size 621520
diff --git a/deps/OpenXR/openxr_loader.dll b/deps/OpenXR/openxr_loader.dll
new file mode 100644
index 0000000000..db9bda3498
--- /dev/null
+++ b/deps/OpenXR/openxr_loader.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d255fc8a2cb893712673b5de39bb308fb578df9dede972fd2e2240d850397eb2
+size 1959424
diff --git a/deps/PVRTT/include/PVRTArray.h b/deps/PVRTT/include/PVRTArray.h
index 9697e0709f..487ddbae09 100644
--- a/deps/PVRTT/include/PVRTArray.h
+++ b/deps/PVRTT/include/PVRTArray.h
@@ -57,7 +57,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      constructor from ordinary array.
+	@brief      Constructor from ordinary array.
 	@param[in]	pArray		an ordinary array
 	@param[in]	uiSize		number of elements passed
 	*****************************************************************************/
@@ -73,7 +73,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      constructor from a capacity and initial value.
+	@brief      Constructor from a capacity and initial value.
 	@param[in]	uiSize		initial capacity
 	@param[in]	val			value to populate with
 	*****************************************************************************/
@@ -192,7 +192,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      Changes the array to the new size
+	@brief      Changes the array to the new size.
 	@param[in]	uiSize		New size of array
 	*****************************************************************************/
 	EPVRTError Resize(const unsigned int uiSize)
@@ -207,7 +207,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      Expands array to new capacity
+	@brief      Expands array to new capacity.
 	@param[in]	uiSize		New capacity of array
 	*****************************************************************************/
 	EPVRTError SetCapacity(const unsigned int uiSize)
@@ -274,7 +274,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      assignment operator.
+	@brief      Assignment operator.
 	@param[in]	other	The CPVRTArray needing copied
 	*****************************************************************************/
 	CPVRTArray& operator=(const CPVRTArray<T>& other)
@@ -286,7 +286,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      appends an existing CPVRTArray on to this one.
+	@brief      Appends an existing CPVRTArray on to this one.
 	@param[in]	other		the array to append.
 	*****************************************************************************/
 	CPVRTArray& operator+=(const CPVRTArray<T>& other)
@@ -304,30 +304,30 @@ class CPVRTArray
 
 	/*!***************************************************************************
 	@brief      Indexed access into array. Note that this has no error
-				checking whatsoever
+				checking whatsoever.
 	@param[in]	uiIndex	index of element in array
 	@return 	the element indexed
 	*****************************************************************************/
 	T& operator[](const unsigned int uiIndex)
 	{
-		_ASSERT(uiIndex < m_uiCapacity);
+		_ASSERT(uiIndex < m_uiSize);
 		return m_pArray[uiIndex];
 	}
 
 	/*!***************************************************************************
-	@brief      Indexed access into array. Note that this has no error checking whatsoever
+	@brief      Indexed access into array. Note that this has no error checking whatsoever.
 	@param[in]	uiIndex	    index of element in array
 	@return 	The element indexed
 	*****************************************************************************/
 	const T& operator[](const unsigned int uiIndex) const
 	{
-		_ASSERT(uiIndex < m_uiCapacity);
+		_ASSERT(uiIndex < m_uiSize);
 		return m_pArray[uiIndex];
 	}
 
 	/*!***************************************************************************
 	@return 	Size of array
-	@brief      Gives current size of array/number of elements
+	@brief      Gives current size of array/number of elements.
 	*****************************************************************************/
 	unsigned int GetSize() const
 	{
@@ -335,7 +335,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      Gives the default size of array/number of elements
+	@brief      Gives the default size of array/number of elements.
 	@return 	Default size of array
 	*****************************************************************************/
 	static unsigned int GetDefaultSize()
@@ -344,7 +344,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief      Gives current allocated size of array/number of elements
+	@brief      Gives current allocated size of array/number of elements.
 	@return 	Capacity of array
 	*****************************************************************************/
 	unsigned int GetCapacity() const
@@ -422,7 +422,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	@brief    	Removes the last element. Simply decrements the size value
+	@brief    	Removes the last element. Simply decrements the size value.
 	@return 	success or failure
 	*****************************************************************************/
 	virtual EPVRTError RemoveLast()
@@ -446,7 +446,7 @@ class CPVRTArray
 	};
 
 	/*!***************************************************************************
-	 @brief     Internal sort algorithm
+	 @brief     Internal sort algorithm.
 	 @param[in]	first		The beginning index of the array
 	 @param[in]	last		The last index of the array
 	 @param[in]	predicate	A functor object to perform the comparison
@@ -465,7 +465,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	 @brief     Internal sort algorithm - in-place merge method
+	 @brief     Internal sort algorithm - in-place merge method.
 	 @param[in]	first		The beginning index of the array
 	 @param[in]	middle		The middle index of the array
 	 @param[in]	last		The last index of the array
@@ -512,7 +512,7 @@ class CPVRTArray
 	}
 
 	/*!***************************************************************************
-	 @brief     Internal sort algorithm - returns the bounded index of the range
+	 @brief     Internal sort algorithm - returns the bounded index of the range.
 	 @param[in]	first		The beginning index of the array
 	 @param[in]	last		The last index of the array
 	 @param[in]	v           Comparison object
@@ -543,7 +543,7 @@ class CPVRTArray
 
 	/*!***************************************************************************
 	 @brief     Internal sort algorithm - rotates the contents of the array such
-	            that the middle becomes the first element
+	            that the middle becomes the first element.
 	 @param[in]	first		The beginning index of the array
 	 @param[in]	middle		The middle index of the array
 	 @param[in]	last        The last index of the array
@@ -634,7 +634,7 @@ class CPVRTArrayManagedPointers : public CPVRTArray<T*>
 	}
 
 	/*!***************************************************************************
-	@brief      Removes the last element. Simply decrements the size value
+	@brief      Removes the last element. Simply decrements the size value.
 	@return 	success or failure
 	*****************************************************************************/
 	virtual EPVRTError RemoveLast()
diff --git a/deps/PVRTT/include/PVRTDecompress.h b/deps/PVRTT/include/PVRTDecompress.h
index 91f2b8e683..174b46074c 100644
--- a/deps/PVRTT/include/PVRTDecompress.h
+++ b/deps/PVRTT/include/PVRTDecompress.h
@@ -10,7 +10,7 @@
 #define _PVRTDECOMPRESS_H_
 
 /*!***********************************************************************
- @brief      	Decompresses PVRTC to RGBA 8888
+ @brief      	Decompresses PVRTC to RGBA 8888.
  @param[in]		pCompressedData The PVRTC texture data to decompress
  @param[in]		Do2bitMode      Signifies whether the data is PVRTC2 or PVRTC4
  @param[in]		XDim            X dimension of the texture
@@ -25,7 +25,7 @@ int PVRTDecompressPVRTC(const void *pCompressedData,
 				unsigned char* pResultImage);
 
 /*!***********************************************************************
- @brief      	Decompresses ETC to RGBA 8888
+ @brief      	Decompresses ETC to RGBA 8888.
  @param[in]		pSrcData        The ETC texture data to decompress
  @param[in]		x               X dimension of the texture
  @param[in]		y               Y dimension of the texture
diff --git a/deps/PVRTT/include/PVRTGlobal.h b/deps/PVRTT/include/PVRTGlobal.h
index 158b619aa0..729778f836 100644
--- a/deps/PVRTT/include/PVRTGlobal.h
+++ b/deps/PVRTT/include/PVRTGlobal.h
@@ -2,7 +2,7 @@
 
  @file         PVRTGlobal.h
  @copyright    Copyright (c) Imagination Technologies Limited.
- @brief        Global defines and typedefs for PVRTools
+ @brief        Global defines and typedefs for PVRTools.
 
 ******************************************************************************/
 #ifndef _PVRTGLOBAL_H_
@@ -56,8 +56,8 @@
 
 #else
 #if defined(__linux__) || defined(__APPLE__)
-#include <assert.h>
 #ifdef _DEBUG
+#include <signal.h>
 #ifndef _RPT0
 #define _RPT0(a,b) printf(b)
 #endif
@@ -65,10 +65,10 @@
 #define _RPT1(a,b,c) printf(b,c)
 #endif
 #ifndef _ASSERT
-#define _ASSERT(a) assert(a)
+#define _ASSERT(a) if (!(a)) ::raise(SIGTRAP)
 #endif
 #ifndef _ASSERTE
-#define _ASSERTE(a) assert(a)
+#define _ASSERTE(a) if (!(a)) ::raise(SIGTRAP)
 #endif
 #else
 #ifndef _RPT0
@@ -93,33 +93,6 @@
 #ifndef _RPT4
 #define _RPT4(a,b,c,d,e,f)((void)0)
 #endif
-#include <stdlib.h>
-#include <string.h>
-#ifndef BYTE
-#define BYTE unsigned char
-#endif
-#ifndef WORD
-#define WORD unsigned short
-#endif
-#ifndef DWORD
-#define DWORD unsigned int
-#endif
-#if !defined(BOOL) && !defined(OBJC_BOOL_DEFINED)
-#define BOOL	int
-#endif
-typedef struct tagRGBQUAD
-{
-	BYTE    rgbBlue;
-	BYTE    rgbGreen;
-	BYTE    rgbRed;
-	BYTE    rgbReserved;
-} RGBQUAD;
-#if !defined(TRUE)
-#define TRUE 1
-#endif
-#if !defined(FALSE)
-#define FALSE 0
-#endif
 #else
 #define _CRT_WARN 0
 #define _RPT0(a,b)
@@ -134,6 +107,7 @@ typedef struct tagRGBQUAD
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #define FREE(X)		{ if(X) { free(X); (X) = 0; } }
 
@@ -188,12 +162,13 @@ PVRTSIZEASSERT(PVRTfloat32, 4);
 
 /*!**************************************************************************
  @enum   ETextureFilter
- @brief  Enum values for defining texture filtering
+ @brief  Enum values for defining texture filtering.
 ****************************************************************************/
 enum ETextureFilter
 {
   eFilter_Nearest,
   eFilter_Linear,
+	eFilter_Cubic,
   eFilter_None,
 
   eFilter_Size,
@@ -203,7 +178,7 @@ enum ETextureFilter
 
 /*!**************************************************************************
  @enum   ETextureWrap
- @brief  Enum values for defining texture wrapping
+ @brief  Enum values for defining texture wrapping.
 ****************************************************************************/
 enum ETextureWrap
 {
@@ -218,7 +193,7 @@ enum ETextureWrap
 ** swap template function
 ****************************************************************************/
 /*!***************************************************************************
- @brief      	A swap template function that swaps a and b
+ @brief      	A swap template function that swaps a and b.
  @param[in]		a   Type a
  @param[in]		b   Type b
 *****************************************************************************/
@@ -248,7 +223,7 @@ inline T PVRTClamp(const T& val, const T& min, const T& max)
 }
 
 /*!***************************************************************************
- @brief      	Swaps the endianness of pBytes in place
+ @brief      	Swaps the endianness of pBytes in place.
  @param[in]		pBytes      A number
  @param[in]		i32ByteNo   Number of bytes in pBytes
 *****************************************************************************/
@@ -261,7 +236,7 @@ inline void PVRTByteSwap(unsigned char* pBytes, int i32ByteNo)
 }
 
 /*!***************************************************************************
- @brief      	Converts the endianness of an unsigned int
+ @brief      	Converts the endianness of an unsigned int.
  @param[in]		ui32Long    A number
  @return		ui32Long with its endianness changed
 *****************************************************************************/
@@ -271,7 +246,7 @@ inline unsigned int PVRTByteSwap32(unsigned int ui32Long)
 }
 
 /*!***************************************************************************
- @brief      	Converts the endianness of a unsigned short
+ @brief      	Converts the endianness of a unsigned short.
  @param[in]		ui16Short   A number
  @return		ui16Short with its endianness changed
 *****************************************************************************/
@@ -281,7 +256,7 @@ inline unsigned short PVRTByteSwap16(unsigned short ui16Short)
 }
 
 /*!***************************************************************************
- @brief      	Returns true if the platform the code is ran on is little endian
+ @brief      	Returns true if the platform the code is ran on is little endian.
  @return		True if the platform the code is ran on is little endian
 *****************************************************************************/
 inline bool PVRTIsLittleEndian()
@@ -302,7 +277,7 @@ inline bool PVRTIsLittleEndian()
 
 
 /*!***************************************************************************
- @brief      	Minimum of a, b. In case of tie, a is returned
+ @brief      	Minimum of a, b. In case of tie, a is returned.
  @return		Returns b if a > b, otherwise a
 *****************************************************************************/
 template<typename T>
@@ -312,7 +287,7 @@ inline const T& PVRTMin(const T& a, const T& b)
 }
 
 /*!***************************************************************************
- @brief      	Maximum of a, b. In case of tie, a is returned
+ @brief      	Maximum of a, b. In case of tie, a is returned.
  @return		Returns b if a < b. otherwise a
 *****************************************************************************/
 template<typename T>
diff --git a/deps/PVRTT/include/PVRTString.h b/deps/PVRTT/include/PVRTString.h
index d42adeaf68..5138ca39d5 100644
--- a/deps/PVRTT/include/PVRTString.h
+++ b/deps/PVRTT/include/PVRTString.h
@@ -15,7 +15,7 @@
 
 /*!***************************************************************************
  @class CPVRTString
- @brief A string class
+ @brief A string class.
 *****************************************************************************/
 
 #if defined(_WINDLL_EXPORT)
@@ -50,14 +50,14 @@ class CPVRTString
 	
 
 	/*!***********************************************************************
-	@brief      		CPVRTString constructor
+	@brief      		CPVRTString constructor.
 	@param[in]				_Ptr	A string
 	@param[in]				_Count	Length of _Ptr
 	************************************************************************/
 	CPVRTString(const char* _Ptr, size_t _Count = npos);
 
 	/*!***********************************************************************
-	@brief      		CPVRTString constructor
+	@brief      		CPVRTString constructor.
 	@param[in]				_Right	A string
 	@param[in]				_Roff	Offset into _Right
 	@param[in]				_Count	Number of chars from _Right to assign to the new string
@@ -65,37 +65,37 @@ class CPVRTString
 	CPVRTString(const CPVRTString& _Right, size_t _Roff = 0, size_t _Count = npos);
 
 	/*!***********************************************************************
-	@brief      		CPVRTString constructor 
+	@brief      		CPVRTString constructor.
 	@param[in]				_Count	Length of new string
 	@param[in]				_Ch		A char to fill it with
 	*************************************************************************/
 	CPVRTString(size_t _Count, const char _Ch);
 
 	/*!***********************************************************************
-	@brief      		Constructor
+	@brief      		Constructor.
 	@param[in]				_Ch	A char
 	*************************************************************************/
 	CPVRTString(const char _Ch);
 
 	/*!***********************************************************************
-	@brief      		Constructor
+	@brief      		Constructor.
 	************************************************************************/
 	CPVRTString();
 
 	/*!***********************************************************************
-	@brief      		Destructor
+	@brief      		Destructor.
 	************************************************************************/
 	virtual ~CPVRTString();
 
 	/*!***********************************************************************
-	@brief      		Appends a string
+	@brief      		Appends a string.
 	@param[in]			_Ptr	A string
 	@return 			Updated string
 	*************************************************************************/
 	CPVRTString& append(const char* _Ptr);
 
 	/*!***********************************************************************
-	@brief      		Appends a string of length _Count
+	@brief      		Appends a string of length _Count.
 	@param[in]			_Ptr	A string
 	@param[in]			_Count	String length
 	@return 			Updated string
@@ -103,14 +103,14 @@ class CPVRTString
 	CPVRTString& append(const char* _Ptr, size_t _Count);
 
 	/*!***********************************************************************
-	@brief      		Appends a string
+	@brief      		Appends a string.
 	@param[in]			_Str	A string
 	@return 			Updated string
 	*************************************************************************/
 	CPVRTString& append(const CPVRTString& _Str);
 
 	/*!***********************************************************************
-	@brief      		Appends _Count letters of _Str from _Off in _Str
+	@brief      		Appends _Count letters of _Str from _Off in _Str.
 	@param[in]			_Str	A string
 	@param[in]			_Off	A position in string
 	@param[in]			_Count	Number of letters to append
@@ -119,7 +119,7 @@ class CPVRTString
 	CPVRTString& append(const CPVRTString& _Str, size_t _Off, size_t _Count);
 
 	/*!***********************************************************************
-	@brief      		Appends _Ch _Count times
+	@brief      		Appends _Ch _Count times.
 	@param[in]				_Ch		A char
 	@param[in]				_Count	Number of times to append _Ch
 	@return 			Updated string
@@ -129,14 +129,14 @@ class CPVRTString
 	//template<class InputIterator> CPVRTString& append(InputIterator _First, InputIterator _Last);
 
 	/*!***********************************************************************
-	@brief      		Assigns the string to the string _Ptr
+	@brief      		Assigns the string to the string _Ptr.
 	@param[in]			_Ptr A string
 	@return 			Updated string
 	*************************************************************************/
 	CPVRTString& assign(const char* _Ptr);
 
 	/*!***********************************************************************
-	@brief      		Assigns the string to the string _Ptr
+	@brief      		Assigns the string to the string _Ptr.
 	@param[in]			_Ptr A string
 	@param[in]			_Count Length of _Ptr
 	@return 			Updated string
@@ -144,14 +144,14 @@ class CPVRTString
 	CPVRTString& assign(const char* _Ptr, size_t _Count);
 
 	/*!***********************************************************************
-	@brief      		Assigns the string to the string _Str
+	@brief      		Assigns the string to the string _Str.
 	@param[in]			_Str A string
 	@return 			Updated string
 	*************************************************************************/
 	CPVRTString& assign(const CPVRTString& _Str);
 
 	/*!***********************************************************************
-	@brief      		Assigns the string to _Count characters in string _Str starting at _Off
+	@brief      		Assigns the string to _Count characters in string _Str starting at _Off.
 	@param[in]			_Str A string
 	@param[in]			_Off First char to start assignment from
 	@param[in]			_Count Length of _Str
@@ -160,7 +160,7 @@ class CPVRTString
 	CPVRTString& assign(const CPVRTString& _Str, size_t _Off, size_t _Count=npos);
 
 	/*!***********************************************************************
-	@brief      		Assigns the string to _Count copies of _Ch
+	@brief      		Assigns the string to _Count copies of _Ch.
 	@param[in]			_Ch A string
 	@param[in]			_Count Number of times to repeat _Ch
 	@return 			Updated string
@@ -176,31 +176,31 @@ class CPVRTString
 	// iterator begin();
 
 	/*!***********************************************************************
-	@brief      		Returns a const char* pointer of the string
+	@brief      		Returns a const char* pointer of the string.
 	@return 			const char* pointer of the string
 	*************************************************************************/
 	const char* c_str() const;
 
 	/*!***********************************************************************
-	@brief      		Returns the size of the character array reserved
+	@brief      		Returns the size of the character array reserved.
 	@return 			The size of the character array reserved
 	*************************************************************************/
 	size_t capacity() const;
 
 	/*!***********************************************************************
-	@brief      		Clears the string
+	@brief      		Clears the string.
 	*************************************************************************/
 	void clear();
 
 	/*!***********************************************************************
-	@brief      		Compares the string with _Str
+	@brief      		Compares the string with _Str.
 	@param[in]			_Str A string to compare with
 	@return 			0 if the strings match
 	*************************************************************************/
 	int compare(const CPVRTString& _Str) const;
 
 	/*!***********************************************************************
-	@brief      		Compares the string with _Str
+	@brief      		Compares the string with _Str.
 	@param[in]			_Pos1	Position to start comparing from
 	@param[in]			_Num1	Number of chars to compare
 	@param[in]			_Str 	A string to compare with
@@ -209,7 +209,7 @@ class CPVRTString
 	int compare(size_t _Pos1, size_t _Num1, const CPVRTString& _Str) const;
 
 	/*!***********************************************************************
-	@brief      		Compares the string with _Str
+	@brief      		Compares the string with _Str.
 	@param[in]			_Pos1	Position to start comparing from
 	@param[in]			_Num1	Number of chars to compare
 	@param[in]			_Str 	A string to compare with
@@ -220,14 +220,14 @@ class CPVRTString
 	int compare(size_t _Pos1, size_t _Num1, const CPVRTString& _Str, size_t _Off, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Compares the string with _Ptr
+	@brief      		Compares the string with _Ptr.
 	@param[in]			_Ptr A string to compare with
 	@return 			0 if the strings match
 	*************************************************************************/
 	int compare(const char* _Ptr) const;
 
 	/*!***********************************************************************
-	@brief      		Compares the string with _Ptr
+	@brief      		Compares the string with _Ptr.
 	@param[in]			_Pos1	Position to start comparing from
 	@param[in]			_Num1	Number of chars to compare
 	@param[in]			_Ptr 	A string to compare with
@@ -236,7 +236,7 @@ class CPVRTString
 	int compare(size_t _Pos1, size_t _Num1, const char* _Ptr) const;
 
 	/*!***********************************************************************
-	@brief      		Compares the string with _Str
+	@brief      		Compares the string with _Str.
 	@param[in]			_Pos1	Position to start comparing from
 	@param[in]			_Num1	Number of chars to compare
 	@param[in]			_Ptr 	A string to compare with
@@ -246,35 +246,35 @@ class CPVRTString
 	int compare(size_t _Pos1, size_t _Num1, const char* _Ptr, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Less than operator
+	@brief      		Less than operator.
 	@param[in]			_Str A string to compare with
 	@return 			True on success
 	*************************************************************************/
 	bool operator<(const CPVRTString & _Str) const;
 
 	/*!***********************************************************************
-	@brief      	== Operator
+	@brief      	== Operator.
 	@param[in]		_Str 	A string to compare with
 	@return 		True if they match
 	*************************************************************************/
 	bool operator==(const CPVRTString& _Str) const;
 
 	/*!***********************************************************************
-	@brief      	== Operator
+	@brief      	== Operator.
 	@param[in]		_Ptr 	A string to compare with
 	@return 		True if they match
 	*************************************************************************/
 	bool operator==(const char* const _Ptr) const;
 
 	/*!***********************************************************************
-	@brief      		!= Operator
+	@brief      		!= Operator.
 	@param[in]				_Str 	A string to compare with
 	@return 			True if they don't match
 	*************************************************************************/
 	bool operator!=(const CPVRTString& _Str) const;
 
 	/*!***********************************************************************
-	@brief      		!= Operator
+	@brief      		!= Operator.
 	@param[in]			_Ptr 	A string to compare with
 	@return 			True if they don't match
 	*************************************************************************/
@@ -286,21 +286,21 @@ class CPVRTString
 	@param[in]			_Count	Size of _Ptr
 	@param[in]			_Off	Position to start copying from
 	@return 			Number of bytes copied
-	@brief      		Copies the string to _Ptr
+	@brief      		Copies the string to _Ptr.
 	*************************************************************************/
 	size_t copy(char* _Ptr, size_t _Count, size_t _Off = 0) const;
 
 	/*!***********************************************************************
 	@fn       			data
 	@return 			A const char* version of the string
-	@brief      		Returns a const char* version of the string
+	@brief      		Returns a const char* version of the string.
 	*************************************************************************/
 	const char* data( ) const;
 
 	/*!***********************************************************************
 	@fn       			empty
 	@return 			True if the string is empty
-	@brief      		Returns true if the string is empty
+	@brief      		Returns true if the string is empty.
 	*************************************************************************/
 	bool empty() const;
 
@@ -311,7 +311,7 @@ class CPVRTString
 	//iterator erase(iterator _It);
 
 	/*!***********************************************************************
-	@brief      		Erases a portion of the string
+	@brief      		Erases a portion of the string.
 	@param[in]			_Pos	The position to start erasing from
 	@param[in]			_Count	Number of chars to erase
 	@return 			An updated string
@@ -319,7 +319,7 @@ class CPVRTString
 	CPVRTString& erase(size_t _Pos = 0, size_t _Count = npos);
 
 	/*!***********************************************************************
-	@brief      		Erases a portion of the string
+	@brief      		Erases a portion of the string.
 	@param[in]			_src	Character to search
 	@param[in]			_subDes	Character to substitute for
 	@param[in]			_all	Substitute all
@@ -328,7 +328,7 @@ class CPVRTString
 	CPVRTString& substitute(char _src,char _subDes, bool _all = true);
 
 	/*!***********************************************************************
-	@brief      		Erases a portion of the string
+	@brief      		Erases a portion of the string.
 	@param[in]			_src	Character to search
 	@param[in]			_subDes	Character to substitute for
 	@param[in]			_all	Substitute all
@@ -357,7 +357,7 @@ class CPVRTString
 	size_t find(const CPVRTString& _Str, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that is not _Ch
+	@brief      		Returns the position of the first char that is not _Ch.
 	@param[in]			_Ch		A char
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the first char that is not _Ch
@@ -365,7 +365,7 @@ class CPVRTString
 	size_t find_first_not_of(char _Ch, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that is not in _Ptr
+	@brief      		Returns the position of the first char that is not in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the first char that is not in _Ptr
@@ -373,7 +373,7 @@ class CPVRTString
 	size_t find_first_not_of(const char* _Ptr, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that is not in _Ptr
+	@brief      		Returns the position of the first char that is not in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@param[in]			_Count	Number of chars in _Ptr
@@ -382,7 +382,7 @@ class CPVRTString
 	size_t find_first_not_of(const char* _Ptr, size_t _Off, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that is not in _Str
+	@brief      		Returns the position of the first char that is not in _Str.
 	@param[in]			_Str	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the first char that is not in _Str
@@ -390,7 +390,7 @@ class CPVRTString
 	size_t find_first_not_of(const CPVRTString& _Str, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that is _Ch
+	@brief      		Returns the position of the first char that is _Ch.
 	@param[in]			_Ch		A char
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the first char that is _Ch
@@ -398,7 +398,7 @@ class CPVRTString
 	size_t find_first_of(char _Ch, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that matches a char in _Ptr
+	@brief      		Returns the position of the first char that matches a char in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the first char that matches a char in _Ptr
@@ -406,7 +406,7 @@ class CPVRTString
 	size_t find_first_of(const char* _Ptr, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that matches a char in _Ptr
+	@brief      		Returns the position of the first char that matches a char in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@param[in]			_Count	Size of _Ptr
@@ -415,7 +415,7 @@ class CPVRTString
 	size_t find_first_of(const char* _Ptr, size_t _Off, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that matches all chars in _Ptr
+	@brief      		Returns the position of the first char that matches all chars in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@param[in]			_Count	Size of _Ptr
@@ -425,7 +425,7 @@ class CPVRTString
 	
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the first char that matches a char in _Str
+	@brief      		Returns the position of the first char that matches a char in _Str.
 	@param[in]			_Str	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the first char that matches a char in _Str
@@ -433,7 +433,7 @@ class CPVRTString
 	size_t find_first_of(const CPVRTString& _Str, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is not _Ch
+	@brief      		Returns the position of the last char that is not _Ch.
 	@param[in]			_Ch		A char
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the last char that is not _Ch
@@ -441,7 +441,7 @@ class CPVRTString
 	size_t find_last_not_of(char _Ch, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is not in _Ptr
+	@brief      		Returns the position of the last char that is not in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the last char that is not in _Ptr
@@ -449,7 +449,7 @@ class CPVRTString
 	size_t find_last_not_of(const char* _Ptr, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is not in _Ptr
+	@brief      		Returns the position of the last char that is not in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@param[in]			_Count	Length of _Ptr
@@ -458,7 +458,7 @@ class CPVRTString
 	size_t find_last_not_of(const char* _Ptr, size_t _Off, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is not in _Str
+	@brief      		Returns the position of the last char that is not in _Str.
 	@param[in]			_Str	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the last char that is not in _Str
@@ -466,7 +466,7 @@ class CPVRTString
 	size_t find_last_not_of(const CPVRTString& _Str, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is _Ch
+	@brief      		Returns the position of the last char that is _Ch.
 	@param[in]			_Ch		A char
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the last char that is _Ch
@@ -474,7 +474,7 @@ class CPVRTString
 	size_t find_last_of(char _Ch, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is in _Ptr
+	@brief      		Returns the position of the last char that is in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the last char that is in _Ptr
@@ -482,7 +482,7 @@ class CPVRTString
 	size_t find_last_of(const char* _Ptr, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is in _Ptr
+	@brief      		Returns the position of the last char that is in _Ptr.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
 	@param[in]			_Count	Length of _Ptr
@@ -491,7 +491,7 @@ class CPVRTString
 	size_t find_last_of(const char* _Ptr, size_t _Off, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the position of the last char that is in _Str
+	@brief      		Returns the position of the last char that is in _Str.
 	@param[in]			_Str	A string
 	@param[in]			_Off	Start position of the find
 	@return 			Position of the last char that is in _Str
@@ -569,7 +569,7 @@ class CPVRTString
 	int find_next_occurance_of(const CPVRTString& _Str, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the previous occurance of _Ch in the parent string
+	@brief      		Returns the previous occurance of _Ch in the parent string.
                         before _Off.	If not found, returns -1.
 	@param[in]			_Ch		A char
 	@param[in]			_Off	Start position of the find
@@ -578,7 +578,7 @@ class CPVRTString
 	int find_previous_occurance_of(char _Ch, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the previous occurance of _Ptr in the parent string
+	@brief      		Returns the previous occurance of _Ptr in the parent string.
                         before _Off.	If not found, returns -1.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
@@ -587,7 +587,7 @@ class CPVRTString
 	int find_previous_occurance_of(const char* _Ptr, size_t _Off = 0) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the previous occurance of _Ptr in the parent string
+	@brief      		Returns the previous occurance of _Ptr in the parent string.
                         before _Off.	If not found, returns -1.
 	@param[in]			_Ptr	A string
 	@param[in]			_Off	Start position of the find
@@ -597,7 +597,7 @@ class CPVRTString
 	int find_previous_occurance_of(const char* _Ptr, size_t _Off, size_t _Count) const;
 
 	/*!***********************************************************************
-	@brief      		Returns the previous occurance of _Str in the parent string
+	@brief      		Returns the previous occurance of _Str in the parent string.
                         before _Off.	If not found, returns -1.
 	@param[in]			_Str	A string
 	@param[in]			_Off	Start position of the find
@@ -639,21 +639,21 @@ class CPVRTString
 	/*!***********************************************************************
 	@fn       			length
 	@return 			Length of the string
-	@brief      		Returns the length of the string
+	@brief      		Returns the length of the string.
 	*************************************************************************/
 	size_t length() const;
 
 	/*!***********************************************************************
 	@fn       			max_size
 	@return 			The maximum number of chars that the string can contain
-	@brief      		Returns the maximum number of chars that the string can contain
+	@brief      		Returns the maximum number of chars that the string can contain.
 	*************************************************************************/
 	size_t max_size() const;
 
 	/*!***********************************************************************
 	@fn       			push_back
 	@param[in]			_Ch A char to append
-	@brief      		Appends _Ch to the string
+	@brief      		Appends _Ch to the string.
 	*************************************************************************/
 	void push_back(char _Ch);
 
@@ -678,7 +678,7 @@ class CPVRTString
 	/*!***********************************************************************
 	@fn       			reserve
 	@param[in]			_Count Size of string to reserve
-	@brief      		Reserves space for _Count number of chars
+	@brief      		Reserves space for _Count number of chars.
 	*************************************************************************/
 	void reserve(size_t _Count = 0);
 
@@ -686,7 +686,7 @@ class CPVRTString
 	@fn       			resize
 	@param[in]			_Count 	Size of string to resize to
 	@param[in]			_Ch		Character to use to fill any additional space
-	@brief      		Resizes the string to _Count in length
+	@brief      		Resizes the string to _Count in length.
 	*************************************************************************/
 	void resize(size_t _Count, char _Ch = char());
 
@@ -698,7 +698,7 @@ class CPVRTString
 	/*!***********************************************************************
 	@fn       			size
 	@return 			Size of the string
-	@brief      		Returns the size of the string
+	@brief      		Returns the size of the string.
 	*************************************************************************/
 	size_t size() const;
 
@@ -707,28 +707,28 @@ class CPVRTString
 	@param[in]			_Off	Start of the substring
 	@param[in]			_Count	Length of the substring
 	@return 			A substring of the string
-	@brief      		Returns the size of the string
+	@brief      		Returns the size of the string.
 	*************************************************************************/
 	CPVRTString substr(size_t _Off = 0, size_t _Count = npos) const;
 
 	/*!***********************************************************************
 	@fn       			swap
 	@param[in]			_Str	A string to swap with
-	@brief      		Swaps the contents of the string with _Str
+	@brief      		Swaps the contents of the string with _Str.
 	*************************************************************************/
 	void swap(CPVRTString& _Str);
 
 	/*!***********************************************************************
 	@fn       			toLower
 	@return 			An updated string
-	@brief      		Converts the string to lower case
+	@brief      		Converts the string to lower case.
 	*************************************************************************/
 	CPVRTString& toLower();
 	
 	/*!***********************************************************************
 	@fn       			toUpper
 	@return 			An updated string
-	@brief      		Converts the string to upper case
+	@brief      		Converts the string to upper case.
 	*************************************************************************/
 	CPVRTString& toUpper();
 
@@ -736,7 +736,7 @@ class CPVRTString
 	@fn       			format
 	@param[in]			pFormat A string containing the formating
 	@return 			A formatted string
-	@brief      		return the formatted string
+	@brief      		Return the formatted string.
 	************************************************************************/
 	CPVRTString format(const char *pFormat, ...);
 	
@@ -746,69 +746,69 @@ class CPVRTString
 	@param[in]			pFormat A string containing the formatting.
 								Positional modifiers may be used.
 	@return 			A formatted string
-	@brief      		return the formatted string
+	@brief      		Return the formatted string.
 	************************************************************************/
 	CPVRTString formatPositional(const char *pFormat, ...);
 #endif
 
 	/*!***********************************************************************
-	@brief      		+= Operator
+	@brief      		+= Operator.
 	@param[in]			_Ch A char
 	@return 			An updated string
 	*************************************************************************/
 	CPVRTString& operator+=(char _Ch);
 
 	/*!***********************************************************************
-	@brief      		+= Operator
+	@brief      		+= Operator.
 	@param[in]			_Ptr A string
 	@return 			An updated string
 	*************************************************************************/
 	CPVRTString& operator+=(const char* _Ptr);
 
 	/*!***********************************************************************
-	@brief      		+= Operator
+	@brief      		+= Operator.
 	@param[in]			_Right A string
 	@return 			An updated string
 	*************************************************************************/
 	CPVRTString& operator+=(const CPVRTString& _Right);
 
 	/*!***********************************************************************
-	@brief      		= Operator
+	@brief      		= Operator.
 	@param[in]			_Ch A char
 	@return 			An updated string
 	*************************************************************************/
 	CPVRTString& operator=(char _Ch);
 
 	/*!***********************************************************************
-	@brief      		= Operator
+	@brief      		= Operator.
 	@param[in]			_Ptr A string
 	@return 			An updated string
 	*************************************************************************/
 	CPVRTString& operator=(const char* _Ptr);
 
 	/*!***********************************************************************
-	@brief      		= Operator
+	@brief      		= Operator.
 	@param[in]			_Right A string
 	@return 			An updated string
 	*************************************************************************/
 	CPVRTString& operator=(const CPVRTString& _Right);
 
 	/*!***********************************************************************
-	@brief      		[] Operator
+	@brief      		[] Operator.
 	@param[in]			_Off An index into the string
 	@return 			A character
 	*************************************************************************/
 	const_reference operator[](size_t _Off) const;
 
 	/*!***********************************************************************
-	@brief      		[] Operator
+	@brief      		[] Operator.
 	@param[in]			_Off An index into the string
 	@return 			A character
 	*************************************************************************/
 	reference operator[](size_t _Off);
 
 	/*!***********************************************************************
-	@brief      		+ Operator
+	@brief      		+ Operator.
 	@param[in]			_Left A string
 	@param[in]			_Right A string
 	@return 			An updated string
@@ -816,7 +816,7 @@ class CPVRTString
 	friend CPVRTString operator+ (const CPVRTString& _Left, const CPVRTString& _Right);
 
 	/*!***********************************************************************
-	@brief      		+ Operator
+	@brief      		+ Operator.
 	@param[in]			_Left A string
 	@param[in]			_Right A string
 	@return 			An updated string
@@ -824,7 +824,7 @@ class CPVRTString
 	friend CPVRTString operator+ (const CPVRTString& _Left, const char* _Right);
 
 	/*!***********************************************************************
-	@brief      		+ Operator
+	@brief      		+ Operator.
 	@param[in]			_Left A string
 	@param[in]			_Right A string
 	@return 			An updated string
@@ -832,7 +832,7 @@ class CPVRTString
 	friend CPVRTString operator+ (const CPVRTString& _Left, const char _Right);
 
 	/*!***********************************************************************
-	@brief      		+ Operator
+	@brief      		+ Operator.
 	@param[in]			_Left A string
 	@param[in]			_Right A string
 	@return 			An updated string
@@ -841,7 +841,7 @@ class CPVRTString
 
 
 	/*!***********************************************************************
-	@brief      		+ Operator
+	@brief      		+ Operator.
 	@param[in]			_Left A string
 	@param[in]			_Right A string
 	@return 			An updated string
@@ -886,7 +886,7 @@ CPVRTString PVRTStringGetFileName(const CPVRTString& strFilePath);
  @fn       			PVRTStringStripWhiteSpaceFromStartOf
  @param[in]			strLine A string
  @return 			Result of the white space stripping
- @brief      		strips white space characters from the beginning of a CPVRTString.
+ @brief      		Strips white space characters from the beginning of a CPVRTString.
 ************************************************************************/
 CPVRTString PVRTStringStripWhiteSpaceFromStartOf(const CPVRTString& strLine);
 
@@ -894,7 +894,7 @@ CPVRTString PVRTStringStripWhiteSpaceFromStartOf(const CPVRTString& strLine);
  @fn       			PVRTStringStripWhiteSpaceFromEndOf
  @param[in]			strLine A string
  @return 			Result of the white space stripping
- @brief      		strips white space characters from the end of a CPVRTString.
+ @brief      		Strips white space characters from the end of a CPVRTString.
 ************************************************************************/
 CPVRTString PVRTStringStripWhiteSpaceFromEndOf(const CPVRTString& strLine);
 
@@ -902,7 +902,7 @@ CPVRTString PVRTStringStripWhiteSpaceFromEndOf(const CPVRTString& strLine);
  @fn       			PVRTStringFromFormattedStr
  @param[in]			pFormat A string containing the formating
  @return 			A formatted string
- @brief      		Creates a formatted string
+ @brief      		Creates a formatted string.
 ************************************************************************/
 CPVRTString PVRTStringFromFormattedStr(const char *pFormat, ...);
 
diff --git a/deps/PVRTT/include/PVRTTexture.h b/deps/PVRTT/include/PVRTTexture.h
index 409914127d..23765f0c0a 100644
--- a/deps/PVRTT/include/PVRTTexture.h
+++ b/deps/PVRTT/include/PVRTTexture.h
@@ -107,6 +107,32 @@ enum EPVRTPixelFormat
 	ePVRTPF_EAC_R11,
 	ePVRTPF_EAC_RG11,
 
+	ePVRTPF_ASTC_4x4,
+	ePVRTPF_ASTC_5x4,
+	ePVRTPF_ASTC_5x5,
+	ePVRTPF_ASTC_6x5,
+	ePVRTPF_ASTC_6x6,
+	ePVRTPF_ASTC_8x5,
+	ePVRTPF_ASTC_8x6,
+	ePVRTPF_ASTC_8x8,
+	ePVRTPF_ASTC_10x5,
+	ePVRTPF_ASTC_10x6,
+	ePVRTPF_ASTC_10x8,
+	ePVRTPF_ASTC_10x10,
+	ePVRTPF_ASTC_12x10,
+	ePVRTPF_ASTC_12x12,
+
+	ePVRTPF_ASTC_3x3x3,
+	ePVRTPF_ASTC_4x3x3,
+	ePVRTPF_ASTC_4x4x3,
+	ePVRTPF_ASTC_4x4x4,
+	ePVRTPF_ASTC_5x4x4,
+	ePVRTPF_ASTC_5x5x4,
+	ePVRTPF_ASTC_5x5x5,
+	ePVRTPF_ASTC_6x5x5,
+	ePVRTPF_ASTC_6x6x5,
+	ePVRTPF_ASTC_6x6x6,
+
 	//Invalid value
 	ePVRTPF_NumCompressedPFs
 };
@@ -151,14 +177,14 @@ struct MetaDataBlock
 		
 	/*!***********************************************************************
 		@fn       		MetaDataBlock
-		@brief      	Meta Data Block Constructor
+		@brief      	Meta Data Block Constructor.
 	*************************************************************************/
 	MetaDataBlock() : DevFOURCC(0), u32Key(0), u32DataSize(0), Data(NULL)
 	{}
 		
 	/*!***********************************************************************
 		@fn       		MetaDataBlock
-		@brief      	Meta Data Block Copy Constructor
+		@brief      	Meta Data Block Copy Constructor.
 	*************************************************************************/
 	MetaDataBlock(const MetaDataBlock& rhs)  : DevFOURCC(rhs.DevFOURCC), u32Key(rhs.u32Key), u32DataSize(rhs.u32DataSize)
 	{
@@ -172,7 +198,7 @@ struct MetaDataBlock
 
 	/*!***********************************************************************
 		@fn       		~MetaDataBlock
-		@brief      	Meta Data Block Destructor
+		@brief      	Meta Data Block Destructor.
 	*************************************************************************/
 	~MetaDataBlock()
 	{
@@ -629,7 +655,7 @@ void PVRTGetFormatMinDims(PVRTuint64 u64PixelFormat, PVRTuint32 &minX, PVRTuint3
  @param[in,out]	NewHeader		New header to output into.
  @param[in,out]	pMetaData		MetaData Map to output into.
  @brief      	Converts a legacy texture header (V1 or V2) to a current 
-				generation header (V3)
+				generation header (V3).
 *************************************************************************/
 void PVRTConvertOldTextureHeaderToV3(const PVR_Texture_Header* LegacyHeader, PVRTextureHeaderV3& NewHeader, CPVRTMap<PVRTuint32, CPVRTMap<PVRTuint32,MetaDataBlock> >* pMetaData);
 
@@ -654,7 +680,7 @@ void PVRTMapLegacyTextureEnumToNewFormat(PVRTPixelType OldFormat, PVRTuint64& ne
  @param[in]		nHeightSrc		Height of source texture
  @param[in] 	nElementSize	Bytes per pixel
  @param[in]		bTwiddled		True if the data is twiddled
- @brief      	Needed by PVRTTextureTile() in the various PVRTTextureAPIs
+ @brief      	Needed by PVRTTextureTile() in the various PVRTTextureAPIs.
 *****************************************************************************/
 void PVRTTextureLoadTiled(
 						  PVRTuint8		* const pDst,
@@ -672,7 +698,7 @@ void PVRTTextureLoadTiled(
  @param[out]	a	Twiddled value
  @param[in]		u	Coordinate axis 0
  @param[in]		v	Coordinate axis 1
- @brief      	Combine a 2D coordinate into a twiddled value
+ @brief      	Combine a 2D coordinate into a twiddled value.
 *****************************************************************************/
 void PVRTTextureTwiddle(unsigned int &a, const unsigned int u, const unsigned int v);
 
diff --git a/deps/PVRTT/include/PVRTexture.h b/deps/PVRTT/include/PVRTexture.h
index 500b9c47b8..b1694a7817 100644
--- a/deps/PVRTT/include/PVRTexture.h
+++ b/deps/PVRTT/include/PVRTexture.h
@@ -44,7 +44,8 @@ in the PowerVR Insider SDK directory.
 #ifndef _PVRTEXTURE_H
 #define _PVRTEXTURE_H
 
-#include "PVRTextureDefines.h"
+#include <iostream>
+
 #include "PVRTextureHeader.h"
 #include "PVRTString.h"
 
@@ -169,6 +170,39 @@ namespace pvrtexture
 		*************************************************************************/
 		bool saveFileLegacyPVR(const CPVRTString& filepath, ELegacyApi eApi) const;
 
+		/*!***********************************************************************
+		@brief      	Saves an ASTC File.
+		@param[in]	    filepath        File path to write to
+		@return			True if the method succeeds.
+		*************************************************************************/
+		bool saveASTCFile(const CPVRTString& filepath) const;
+
+		/*!***********************************************************************
+		@brief      	Convert texture to KTX
+		@param[in]	    out        Output stream for KTX data
+		*************************************************************************/
+		void toKTX(std::ostream & out) const;
+
+		/*!***********************************************************************
+		@brief      	Convert texture to ASTC
+		@param[in]	    out        Output stream for ASTC data
+		*************************************************************************/
+		void toASTC(std::ostream & out) const;
+
+		/*!***********************************************************************
+		@brief      	Makes a PVRTexture from a KTX file stream
+		@param[in]	    in        The KTX file stream
+		@return			The texture
+		*************************************************************************/
+		static CPVRTexture fromKTX(std::istream & in);
+
+		/*!***********************************************************************
+		@brief      	Makes a PVRTexture from a pointer to an ASTC file in memory
+		@param[in]	    in        The ASTC file stream
+		@return			The texture
+		*************************************************************************/
+		static CPVRTexture fromASTC(std::istream & in);
+
 	private:
 		size_t	m_stDataSize;		//!< Size of the texture data.
 		uint8*	m_pTextureData;		//!< Pointer to texture data.
@@ -191,32 +225,48 @@ namespace pvrtexture
 
 		/*!***********************************************************************
 		 @brief      	Loads a KTX file.
-		 @param[in]		pTextureFile    PVR texture file
+		 @param[in]		pTextureFile    KTX texture file
 		 @return		True if the method succeeds.
 		*************************************************************************/
 		bool privateLoadKTXFile(FILE* pTextureFile);
+		bool privateLoadKTXFile(std::istream & in);
 
 		/*!***********************************************************************
 		 @brief      	Saves a KTX File.
-		 @param[in]		pTextureFile    PVR texture file
+		 @param[in]		pTextureFile    KTX texture file
 		 @return		True if the method succeeds.
 		*************************************************************************/
 		bool privateSaveKTXFile(FILE* pTextureFile) const;
 
 		/*!***********************************************************************
 		 @brief      	Loads a DDS file.
-		 @param[in]		pTextureFile    PVR texture file
+		 @param[in]		pTextureFile    DDS texture file
 		 @return		True if the method succeeds.
 		 *************************************************************************/
 		bool privateLoadDDSFile(FILE* pTextureFile);
 
 		/*!***********************************************************************
 		 @brief      	Saves a DDS File.
-		 @param[in]		pTextureFile    PVR texture file
+		 @param[in]		pTextureFile    DDS texture file
 		 @return		True if the method succeeds.
 		*************************************************************************/
 		bool privateSaveDDSFile(FILE* pTextureFile) const;
 
+		/*!***********************************************************************
+		@brief      	Loads an ASTC file.
+		@param[in]		pTextureFile    ASTC texture file
+		@return			True if the method succeeds.
+		*************************************************************************/
+		bool privateLoadASTCFile(FILE* pTextureFile);
+		bool privateLoadASTCFile(std::istream & in);
+
+		/*!***********************************************************************
+		@brief      	Saves an ASTC file.
+		@param[in]		pTextureFile    ASTC texture file
+		@return			True if the method succeeds.
+		*************************************************************************/
+		bool privateSaveASTCFile(FILE* pTextureFile) const;
+
 	//Legacy IO
     
 		/*!***********************************************************************
@@ -235,7 +285,7 @@ namespace pvrtexture
 		*************************************************************************/
 		bool privateSaveLegacyPVRFile(FILE* pTextureFile, ELegacyApi eApi) const;
 	};
-};
+}
 
 #endif //_PVRTEXTURE_H
 
diff --git a/deps/PVRTT/include/PVRTextureDefines.h b/deps/PVRTT/include/PVRTextureDefines.h
index d936fdff49..cb66e55eff 100644
--- a/deps/PVRTT/include/PVRTextureDefines.h
+++ b/deps/PVRTT/include/PVRTextureDefines.h
@@ -80,7 +80,14 @@ namespace pvrtexture
 		eETCFastPerceptual,     //!< ETC fast perceptual
 		eETCSlow,               //!< ETC slow
 		eETCSlowPerceptual,     //!< ETC slow perceptual
-		eNumETCModes            //!< Number of ETC modes
+		eNumETCModes,           //!< Number of ETC modes
+
+		eASTCVeryFast=0,        //!< ASTC very fast
+		eASTCFast,              //!< ASTC fast
+		eASTCMedium,            //!< ASTC medium
+		eASTCThorough,          //!< ASTC thorough
+		eASTCExhaustive,        //!< ASTC exhaustive
+		eNumASTCModes           //!< Number of ASTC modes
 	};
     
     /*!***********************************************************************
@@ -129,5 +136,5 @@ namespace pvrtexture
      @brief         Useful typedef for generating maps of MetaData blocks.
 	*****************************************************************************/
 	typedef CPVRTMap<uint32, CPVRTMap<uint32,MetaDataBlock> > MetaDataMap;
-};
+}
 #endif //_PVRTEXTURE_DEFINES_H
diff --git a/deps/PVRTT/include/PVRTextureHeader.h b/deps/PVRTT/include/PVRTextureHeader.h
index 12f11c9378..f6109416b5 100644
--- a/deps/PVRTT/include/PVRTextureHeader.h
+++ b/deps/PVRTT/include/PVRTextureHeader.h
@@ -76,6 +76,11 @@ namespace pvrtexture
 							EPVRTVariableType	eChannelType=ePVRTVarTypeUnsignedByteNorm,
 							bool				bPreMultiplied=false);
 
+		/*!***********************************************************************
+		@brief      	Deconstructor for CPVRTextureHeader.
+		*************************************************************************/
+		~CPVRTextureHeader();
+
 		/*!***********************************************************************
 		 @brief      	Will copy the contents and information of another header into this one.
 		 @param[in]		rhs     Header to copy.
@@ -240,6 +245,14 @@ namespace pvrtexture
 		*************************************************************************/
 		void getOGLESFormat(uint32& internalformat, uint32& format, uint32& type) const;
 
+		/*!***********************************************************************
+		@brief      	Gets the Vulkan equivalent values for this texture.
+						This will return any supported Vulkan texture formats, it is up to
+						the user to decide if these are valid for their current platform.
+		@return			VkFormat, represented by a uint32.
+		*************************************************************************/
+		uint32 getVulkanFormat() const;
+
 		/*!***********************************************************************
 		 @brief      	Gets the D3DFormat (up to DirectX 9 and Direct 3D Mobile)
 						equivalent values for this texture. This will return any 
@@ -254,7 +267,7 @@ namespace pvrtexture
 						for this texture. This will return any supported DX texture
 						formats, it is up to the user to decide if this is valid 
 						for their current platform.
-		 @return		GXGIFormat, represented by a uint32. 
+		 @return		DXGIFormat, represented by a uint32. 
 		*************************************************************************/
 		uint32 getDXGIFormat() const;
 
@@ -534,6 +547,6 @@ namespace pvrtexture
 		*************************************************************************/
 		void removeMetaData(const uint32& DevFOURCC, const uint32& u32Key);
 	};
-};
+}
 
 #endif
diff --git a/deps/PVRTT/include/PVRTextureUtilities.h b/deps/PVRTT/include/PVRTextureUtilities.h
index 96f0b31bc5..7aabe1a721 100644
--- a/deps/PVRTT/include/PVRTextureUtilities.h
+++ b/deps/PVRTT/include/PVRTextureUtilities.h
@@ -175,6 +175,6 @@ namespace pvrtexture
 	 @return		True if the method succeeds.					
 	*************************************************************************/
 	bool PVR_DLL Transcode(CPVRTexture& sTexture, const PixelType ptFormat, const EPVRTVariableType eChannelType, const EPVRTColourSpace eColourspace, const ECompressorQuality eQuality=ePVRTCNormal, const bool bDoDither=false);
-};
+}
 #endif //_PVRTEXTURE_UTILTIES_H
 
diff --git a/deps/PVRTT/include/PVRTextureVersion.h b/deps/PVRTT/include/PVRTextureVersion.h
index 6358e30368..872f17e86d 100644
--- a/deps/PVRTT/include/PVRTextureVersion.h
+++ b/deps/PVRTT/include/PVRTextureVersion.h
@@ -1,7 +1,7 @@
 #ifndef PVRTEXLIBVERSION_H
 #define PVRTEXLIBVERSION_H
 #define PVRTLMAJORVERSION	4
-#define PVRTLMINORVERSION	14
-#define PVRTLSUBVERSION	6
-#define PVRTLSTRINGVERSION "4.14.6"
+#define PVRTLMINORVERSION	22
+#define PVRTLSUBVERSION	0
+#define PVRTLSTRINGVERSION "4.22.0"
 #endif
diff --git a/deps/PVRTT/x64/PVRTexLib.dll b/deps/PVRTT/x64/PVRTexLib.dll
index 4b38a74a30..3b46352c73 100644
--- a/deps/PVRTT/x64/PVRTexLib.dll
+++ b/deps/PVRTT/x64/PVRTexLib.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:df7d5b0f1094b8d0bd7d81e9cd235ff029cdc943797eb91909ae0608c5c00ec7
-size 2817024
+oid sha256:9b686bacc28059ab06517a39a741346195817e93782cb72bd3eb3b7e336e9c4f
+size 2182144
diff --git a/deps/PVRTT/x64/PVRTexLib.lib b/deps/PVRTT/x64/PVRTexLib.lib
index 296f4b3e47..5e7ae82d9b 100644
--- a/deps/PVRTT/x64/PVRTexLib.lib
+++ b/deps/PVRTT/x64/PVRTexLib.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1937b153d98ac7790f1d586df08e8449c1db69c708f8a4827f6998466a34a288
-size 100654
+oid sha256:1a5b85a2714ddbb3d4f607578cee925e9c601f16222eff0578c4c5b929e77271
+size 4498620
diff --git a/deps/PVRTT/x86/PVRTexLib.dll b/deps/PVRTT/x86/PVRTexLib.dll
index 23169bf578..dc7716f2cb 100644
--- a/deps/PVRTT/x86/PVRTexLib.dll
+++ b/deps/PVRTT/x86/PVRTexLib.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:877e96a9cbed32fdc029b9018f3c8981aef5c734e089e9758386e35c98609091
-size 2719232
+oid sha256:1816a1f3c9fe0b994347ecf2f449e1fbd1870f157fb4283a73a8d74b9801f967
+size 2180608
diff --git a/deps/PVRTT/x86/PVRTexLib.lib b/deps/PVRTT/x86/PVRTexLib.lib
index 5dab68c0f1..f06870bc8a 100644
--- a/deps/PVRTT/x86/PVRTexLib.lib
+++ b/deps/PVRTT/x86/PVRTexLib.lib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9ea9ca04e6073df9c75cccd63022dc307f01bf77d01c6ba6fc3e590b383e5d9f
-size 98132
+oid sha256:74fa42864a5347d5464ed257273cad7eaf1e23ef470db8cd9300b9b960114332
+size 3685238
diff --git a/deps/RoslynPad/README.md b/deps/RoslynPad/README.md
index 3b7a8ad2e2..d39f071f25 100644
--- a/deps/RoslynPad/README.md
+++ b/deps/RoslynPad/README.md
@@ -1 +1 @@
-Version: https://github.com/aelij/RoslynPad/commit/184451f2fc3552c9fa8c99bf7e3b8d11334a18b2
\ No newline at end of file
+Version: https://github.com/aelij/RoslynPad/commit/c2f1c488ad3a418b0fc5d7f46ecaf3ab6fe8e7c3
\ No newline at end of file
diff --git a/deps/RoslynPad/RoslynPad.Editor.Windows.dll b/deps/RoslynPad/RoslynPad.Editor.Windows.dll
deleted file mode 100644
index 4d29943daa..0000000000
--- a/deps/RoslynPad/RoslynPad.Editor.Windows.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9fa4e2916bb2fa965d1f21b3bdd24b387261e91694f96576c770cd3af0c87a0
-size 130560
diff --git a/deps/RoslynPad/RoslynPad.Editor.Windows.pdb b/deps/RoslynPad/RoslynPad.Editor.Windows.pdb
deleted file mode 100644
index 1a34753535..0000000000
--- a/deps/RoslynPad/RoslynPad.Editor.Windows.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:afb793797a1fcc2319ac08625a71455c43ab80c8760584fb54d589621aaeb017
-size 30056
diff --git a/deps/RoslynPad/RoslynPad.Roslyn.Windows.dll b/deps/RoslynPad/RoslynPad.Roslyn.Windows.dll
deleted file mode 100644
index 89ac0046de..0000000000
--- a/deps/RoslynPad/RoslynPad.Roslyn.Windows.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af6091435a373053625f7a51e255cde836f70215fc6d57032b0a91b0351c4db0
-size 104448
diff --git a/deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb b/deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb
deleted file mode 100644
index 21348e9ce1..0000000000
--- a/deps/RoslynPad/RoslynPad.Roslyn.Windows.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cda968adc1a84a2920112324d9dedf4d949259161e8fad366bac4a50f7f39f08
-size 8388
diff --git a/deps/RoslynPad/RoslynPad.Roslyn.dll b/deps/RoslynPad/RoslynPad.Roslyn.dll
deleted file mode 100644
index 1397985c63..0000000000
--- a/deps/RoslynPad/RoslynPad.Roslyn.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83d15236ab583389e4bd2d5fd3c1d688d5a3a08a9dacfb9483a38913d4484d9e
-size 190976
diff --git a/deps/RoslynPad/RoslynPad.Roslyn.pdb b/deps/RoslynPad/RoslynPad.Roslyn.pdb
deleted file mode 100644
index 1b2d2d59de..0000000000
--- a/deps/RoslynPad/RoslynPad.Roslyn.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0cdc6b380ca86362d98e9293a1e43d24edfb334e8b1915120d657f8009f1d121
-size 50872
diff --git a/deps/RoslynPad/build.bat b/deps/RoslynPad/build.bat
new file mode 100644
index 0000000000..a53873432c
--- /dev/null
+++ b/deps/RoslynPad/build.bat
@@ -0,0 +1,18 @@
+@echo off
+setlocal
+set ROSLYNPAD=%~dp0..\..\externals\RoslynPad
+
+pushd %ROSLYNPAD%\src
+
+msbuild /nologo /restore /p:Configuration=Release RoslynPad.sln
+if ERRORLEVEL 1 echo "Cannot build RoslynPad" && pause
+
+popd
+
+xcopy /Y /Q %ROSLYNPAD%\src\RoslynPad.Editor.Windows\bin\Release\net462\RoslynPad*.* net462 > nul
+if ERRORLEVEL 1  echo "Cannot copy RoslynPad net462 files" && pause
+
+xcopy /Y /Q %ROSLYNPAD%\src\RoslynPad.Editor.Windows\bin\Release\netcoreapp3.1\RoslynPad*.* netcoreapp3.1 > nul
+if ERRORLEVEL 1  echo "Cannot copy RoslynPad netcoreapp3.1 files" && pause
+
+echo RoslynPad build completed successfully
diff --git a/deps/RoslynPad/checkout.bat b/deps/RoslynPad/checkout.bat
new file mode 100644
index 0000000000..5e59cacf7b
--- /dev/null
+++ b/deps/RoslynPad/checkout.bat
@@ -0,0 +1,13 @@
+@echo OFF
+setlocal
+set HOME=%USERPROFILE%
+CALL ..\find_git.cmd
+IF NOT ERRORLEVEL 0 (
+  ECHO "Could not find git.exe"
+  EXIT /B %ERRORLEVEL%
+) 
+%GIT_CMD% clone --recursive https://github.com/aelij/RoslynPad -b master ../../externals/RoslynPad
+pushd ..\..\externals\RoslynPad
+%GIT_CMD% checkout 0d576ca5d18d67d447bce5d078f0a568a69a677d
+popd
+if ERRORLEVEL 1 echo "Could not checkout RoslynPad" && pause
diff --git a/deps/RoslynPad/net462/RoslynPad.Editor.Windows.dll b/deps/RoslynPad/net462/RoslynPad.Editor.Windows.dll
new file mode 100644
index 0000000000..a3197cb6d9
--- /dev/null
+++ b/deps/RoslynPad/net462/RoslynPad.Editor.Windows.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e5cc3d68ed93824d6ea45ff690e0121c2dfe4fdaf754d626030201e50fba939
+size 135168
diff --git a/deps/RoslynPad/net462/RoslynPad.Editor.Windows.pdb b/deps/RoslynPad/net462/RoslynPad.Editor.Windows.pdb
new file mode 100644
index 0000000000..11e16b6cd1
--- /dev/null
+++ b/deps/RoslynPad/net462/RoslynPad.Editor.Windows.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f044716f4bf79ea1f030a8dca2fc728786030b63efb8096064f39eea5dda6932
+size 31684
diff --git a/deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.dll b/deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.dll
new file mode 100644
index 0000000000..6174cd97e0
--- /dev/null
+++ b/deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d88980edfdfa982281bceb4e07a7c61864c145daa059398d360a6ddcf7e4121b
+size 105984
diff --git a/deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.pdb b/deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.pdb
new file mode 100644
index 0000000000..24c275f52f
--- /dev/null
+++ b/deps/RoslynPad/net462/RoslynPad.Roslyn.Windows.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9faeadbc894bb56cd88ed48ad000c2ea5c5d6d7ff092139990123c7261fb3e5f
+size 9192
diff --git a/deps/RoslynPad/net462/RoslynPad.Roslyn.dll b/deps/RoslynPad/net462/RoslynPad.Roslyn.dll
new file mode 100644
index 0000000000..5fefff9a2a
--- /dev/null
+++ b/deps/RoslynPad/net462/RoslynPad.Roslyn.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:249273517b2c37185749fe1f8db7bde3a9a7bd2289b4f960de4d5ecc7dd93410
+size 190464
diff --git a/deps/RoslynPad/net462/RoslynPad.Roslyn.pdb b/deps/RoslynPad/net462/RoslynPad.Roslyn.pdb
new file mode 100644
index 0000000000..da31ac27d4
--- /dev/null
+++ b/deps/RoslynPad/net462/RoslynPad.Roslyn.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f78a30a78d459530dfe30b328f19f1314ab3bd2cd638612314601b09df7dca2
+size 48936
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.deps.json b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.deps.json
new file mode 100644
index 0000000000..70cc9d0cd1
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.deps.json
@@ -0,0 +1,1265 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v3.1",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v3.1": {
+      "RoslynPad.Editor.Windows/1.2.0": {
+        "dependencies": {
+          "AvalonEdit": "6.0.0",
+          "RoslynPad.Roslyn": "3.4.0",
+          "RoslynPad.Roslyn.Windows": "3.4.0",
+          "System.Reactive.Linq": "4.3.1",
+          "System.Reactive.Reference": "4.3.0.0"
+        },
+        "runtime": {
+          "RoslynPad.Editor.Windows.dll": {}
+        }
+      },
+      "AvalonEdit/6.0.0": {
+        "runtime": {
+          "lib/netcoreapp3.0/ICSharpCode.AvalonEdit.dll": {
+            "assemblyVersion": "6.0.0.0",
+            "fileVersion": "6.0.0.0"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.Analyzers/2.9.6": {},
+      "Microsoft.CodeAnalysis.Common/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Analyzers": "2.9.6",
+          "System.Collections.Immutable": "1.5.0",
+          "System.Memory": "4.5.3",
+          "System.Reflection.Metadata": "1.6.0",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2",
+          "System.Text.Encoding.CodePages": "4.5.1",
+          "System.Threading.Tasks.Extensions": "4.5.3"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.CSharp/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "3.4.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.CSharp.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.CSharp.Features/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.CSharp": "3.4.0",
+          "Microsoft.CodeAnalysis.CSharp.Workspaces": "3.4.0",
+          "Microsoft.CodeAnalysis.Common": "3.4.0",
+          "Microsoft.CodeAnalysis.Features": "3.4.0",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "3.4.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.CSharp.Features.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.Features.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.CSharp.Scripting/3.4.0": {
+        "dependencies": {
+          "Microsoft.CSharp": "4.3.0",
+          "Microsoft.CodeAnalysis.CSharp": "3.4.0",
+          "Microsoft.CodeAnalysis.Common": "3.4.0",
+          "Microsoft.CodeAnalysis.Scripting.Common": "3.4.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.CSharp.Scripting.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.Scripting.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.CSharp.Workspaces/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.CSharp": "3.4.0",
+          "Microsoft.CodeAnalysis.Common": "3.4.0",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "3.4.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.CSharp.Workspaces.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.Features/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "3.4.0",
+          "Microsoft.CodeAnalysis.FlowAnalysis.Utilities": "2.9.6",
+          "Microsoft.CodeAnalysis.Workspaces.Common": "3.4.0",
+          "Microsoft.DiaSymReader": "1.3.0",
+          "System.Threading.Tasks.Extensions": "4.5.3"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.Features.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.Features.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.FlowAnalysis.Utilities/2.9.6": {
+        "runtime": {
+          "lib/netstandard1.3/Microsoft.CodeAnalysis.FlowAnalysis.Utilities.dll": {
+            "assemblyVersion": "2.9.5.0",
+            "fileVersion": "2.9.519.46601"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.Scripting.Common/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "3.4.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.Scripting.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.Scripting.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CodeAnalysis.Workspaces.Common/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.Common": "3.4.0",
+          "System.Composition": "1.0.31"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.CodeAnalysis.Workspaces.dll": {
+            "assemblyVersion": "3.4.0.0",
+            "fileVersion": "3.400.19.56804"
+          }
+        },
+        "resources": {
+          "lib/netstandard2.0/cs/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "cs"
+          },
+          "lib/netstandard2.0/de/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "de"
+          },
+          "lib/netstandard2.0/es/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "es"
+          },
+          "lib/netstandard2.0/fr/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "fr"
+          },
+          "lib/netstandard2.0/it/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "it"
+          },
+          "lib/netstandard2.0/ja/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "ja"
+          },
+          "lib/netstandard2.0/ko/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "ko"
+          },
+          "lib/netstandard2.0/pl/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "pl"
+          },
+          "lib/netstandard2.0/pt-BR/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "pt-BR"
+          },
+          "lib/netstandard2.0/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "ru"
+          },
+          "lib/netstandard2.0/tr/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "tr"
+          },
+          "lib/netstandard2.0/zh-Hans/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "zh-Hans"
+          },
+          "lib/netstandard2.0/zh-Hant/Microsoft.CodeAnalysis.Workspaces.resources.dll": {
+            "locale": "zh-Hant"
+          }
+        }
+      },
+      "Microsoft.CSharp/4.3.0": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Dynamic.Runtime": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.Linq.Expressions": "4.3.0",
+          "System.ObjectModel": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Extensions": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Reflection.TypeExtensions": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0",
+          "System.Runtime.InteropServices": "4.3.0",
+          "System.Threading": "4.3.0"
+        }
+      },
+      "Microsoft.DiaSymReader/1.3.0": {
+        "runtime": {
+          "lib/netstandard1.1/Microsoft.DiaSymReader.dll": {
+            "assemblyVersion": "1.3.0.0",
+            "fileVersion": "1.3.0.63011"
+          }
+        }
+      },
+      "Microsoft.NETCore.Platforms/2.1.2": {},
+      "Microsoft.NETCore.Targets/1.1.0": {},
+      "System.Collections/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Collections.Immutable/1.5.0": {},
+      "System.Composition/1.0.31": {
+        "dependencies": {
+          "System.Composition.AttributedModel": "1.0.31",
+          "System.Composition.Convention": "1.0.31",
+          "System.Composition.Hosting": "1.0.31",
+          "System.Composition.Runtime": "1.0.31",
+          "System.Composition.TypedParts": "1.0.31"
+        }
+      },
+      "System.Composition.AttributedModel/1.0.31": {
+        "dependencies": {
+          "System.Reflection": "4.3.0",
+          "System.Runtime": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.0/System.Composition.AttributedModel.dll": {
+            "assemblyVersion": "1.0.31.0",
+            "fileVersion": "4.6.24705.1"
+          }
+        }
+      },
+      "System.Composition.Convention/1.0.31": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Composition.AttributedModel": "1.0.31",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Diagnostics.Tools": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.Linq.Expressions": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Extensions": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Threading": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.0/System.Composition.Convention.dll": {
+            "assemblyVersion": "1.0.31.0",
+            "fileVersion": "4.6.24705.1"
+          }
+        }
+      },
+      "System.Composition.Hosting/1.0.31": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Composition.Runtime": "1.0.31",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Diagnostics.Tools": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.Linq.Expressions": "4.3.0",
+          "System.ObjectModel": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Extensions": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Threading": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.0/System.Composition.Hosting.dll": {
+            "assemblyVersion": "1.0.31.0",
+            "fileVersion": "4.6.24705.1"
+          }
+        }
+      },
+      "System.Composition.Runtime/1.0.31": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Diagnostics.Tools": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.0/System.Composition.Runtime.dll": {
+            "assemblyVersion": "1.0.31.0",
+            "fileVersion": "4.6.24705.1"
+          }
+        }
+      },
+      "System.Composition.TypedParts/1.0.31": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Composition.AttributedModel": "1.0.31",
+          "System.Composition.Hosting": "1.0.31",
+          "System.Composition.Runtime": "1.0.31",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Diagnostics.Tools": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.Linq.Expressions": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Extensions": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0"
+        },
+        "runtime": {
+          "lib/netstandard1.0/System.Composition.TypedParts.dll": {
+            "assemblyVersion": "1.0.31.0",
+            "fileVersion": "4.6.24705.1"
+          }
+        }
+      },
+      "System.Diagnostics.Debug/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Diagnostics.Tools/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Dynamic.Runtime/4.3.0": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.Linq.Expressions": "4.3.0",
+          "System.ObjectModel": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Emit": "4.3.0",
+          "System.Reflection.Emit.ILGeneration": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Reflection.TypeExtensions": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0",
+          "System.Threading": "4.3.0"
+        }
+      },
+      "System.Globalization/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.IO/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0",
+          "System.Text.Encoding": "4.3.0",
+          "System.Threading.Tasks": "4.3.0"
+        }
+      },
+      "System.Linq/4.3.0": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0"
+        }
+      },
+      "System.Linq.Expressions/4.3.0": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Globalization": "4.3.0",
+          "System.IO": "4.3.0",
+          "System.Linq": "4.3.0",
+          "System.ObjectModel": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Emit": "4.3.0",
+          "System.Reflection.Emit.ILGeneration": "4.3.0",
+          "System.Reflection.Emit.Lightweight": "4.3.0",
+          "System.Reflection.Extensions": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Reflection.TypeExtensions": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Extensions": "4.3.0",
+          "System.Threading": "4.3.0"
+        }
+      },
+      "System.Memory/4.5.3": {},
+      "System.ObjectModel/4.3.0": {
+        "dependencies": {
+          "System.Collections": "4.3.0",
+          "System.Diagnostics.Debug": "4.3.0",
+          "System.Resources.ResourceManager": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Threading": "4.3.0"
+        }
+      },
+      "System.Reactive/4.3.1": {},
+      "System.Reactive.Linq/4.3.1": {
+        "dependencies": {
+          "System.Reactive": "4.3.1",
+          "System.Threading.Tasks.Extensions": "4.5.3"
+        },
+        "runtime": {
+          "lib/netstandard2.0/System.Reactive.Linq.dll": {
+            "assemblyVersion": "3.0.6000.0",
+            "fileVersion": "3.0.6000.0"
+          }
+        }
+      },
+      "System.Reflection/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.IO": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Reflection.Emit/4.3.0": {
+        "dependencies": {
+          "System.IO": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Emit.ILGeneration": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Reflection.Emit.ILGeneration/4.3.0": {
+        "dependencies": {
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Reflection.Emit.Lightweight/4.3.0": {
+        "dependencies": {
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Emit.ILGeneration": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Reflection.Extensions/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Reflection": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Reflection.Metadata/1.6.0": {},
+      "System.Reflection.Primitives/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Reflection.TypeExtensions/4.3.0": {
+        "dependencies": {
+          "System.Reflection": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Resources.ResourceManager/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Globalization": "4.3.0",
+          "System.Reflection": "4.3.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Runtime/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0"
+        }
+      },
+      "System.Runtime.CompilerServices.Unsafe/4.5.2": {},
+      "System.Runtime.Extensions/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Runtime.Handles/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Runtime.InteropServices/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Reflection": "4.3.0",
+          "System.Reflection.Primitives": "4.3.0",
+          "System.Runtime": "4.3.0",
+          "System.Runtime.Handles": "4.3.0"
+        }
+      },
+      "System.Text.Encoding/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Text.Encoding.CodePages/4.5.1": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "System.Runtime.CompilerServices.Unsafe": "4.5.2"
+        }
+      },
+      "System.Threading/4.3.0": {
+        "dependencies": {
+          "System.Runtime": "4.3.0",
+          "System.Threading.Tasks": "4.3.0"
+        }
+      },
+      "System.Threading.Tasks/4.3.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.1.2",
+          "Microsoft.NETCore.Targets": "1.1.0",
+          "System.Runtime": "4.3.0"
+        }
+      },
+      "System.Threading.Tasks.Extensions/4.5.3": {},
+      "RoslynPad.Roslyn/3.4.0": {
+        "dependencies": {
+          "Microsoft.CodeAnalysis.CSharp": "3.4.0",
+          "Microsoft.CodeAnalysis.CSharp.Features": "3.4.0",
+          "Microsoft.CodeAnalysis.CSharp.Scripting": "3.4.0",
+          "Microsoft.CodeAnalysis.CSharp.Workspaces": "3.4.0"
+        },
+        "runtime": {
+          "RoslynPad.Roslyn.dll": {}
+        }
+      },
+      "RoslynPad.Roslyn.Windows/3.4.0": {
+        "dependencies": {
+          "RoslynPad.Roslyn": "3.4.0"
+        },
+        "runtime": {
+          "RoslynPad.Roslyn.Windows.dll": {}
+        }
+      },
+      "System.Reactive.Reference/4.3.0.0": {
+        "runtime": {
+          "System.Reactive.dll": {
+            "assemblyVersion": "4.3.0.0",
+            "fileVersion": "4.3.1.32151"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "RoslynPad.Editor.Windows/1.2.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "AvalonEdit/6.0.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-QMbyJrlhOuWzLRPqvW724ly9XbSEkp8Xg2mQY7tvsh1se1pDEJnmDjS6c6OuqDe2Q37uCnXwKdV8tJUx2iLUnw==",
+      "path": "avalonedit/6.0.0",
+      "hashPath": "avalonedit.6.0.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.Analyzers/2.9.6": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-Kmms3TxGQMNb95Cu/3K+0bIcMnV4qf/phZBLAB0HUi65rBPxP4JO3aM2LoAcb+DFS600RQJMZ7ZLyYDTbLwJOQ==",
+      "path": "microsoft.codeanalysis.analyzers/2.9.6",
+      "hashPath": "microsoft.codeanalysis.analyzers.2.9.6.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.Common/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-3ncA7cV+iXGA1VYwe2UEZXcvWyZSlbexWjM9AvocP7sik5UD93qt9Hq0fMRGk0jFRmvmE4T2g+bGfXiBVZEhLw==",
+      "path": "microsoft.codeanalysis.common/3.4.0",
+      "hashPath": "microsoft.codeanalysis.common.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.CSharp/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-/LsTtgcMN6Tu1oo7/WYbRAHL4/ubXC/miEakwTpcZKJKtFo7D0AK95Hw0dbGxul6C8WJu60v6NP2435TDYZM+Q==",
+      "path": "microsoft.codeanalysis.csharp/3.4.0",
+      "hashPath": "microsoft.codeanalysis.csharp.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.CSharp.Features/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-JGtqSGzy5bR+BKPYK4/vE/TMUJG4lNjBTtwM7uJH3t5/rpeRvDK8BCSzxqhtrRHUHWmG01k1/a9trbYD3BWbDQ==",
+      "path": "microsoft.codeanalysis.csharp.features/3.4.0",
+      "hashPath": "microsoft.codeanalysis.csharp.features.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.CSharp.Scripting/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-tLgqc76qXHmONUhWhxo7z3TcL/LmGFWIUJm1exbQmVJohuQvJnejUMxmVkdxDfMuMZU1fIyJXPZ6Fkp4FEneAg==",
+      "path": "microsoft.codeanalysis.csharp.scripting/3.4.0",
+      "hashPath": "microsoft.codeanalysis.csharp.scripting.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.CSharp.Workspaces/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-ReUtqcb+Pz1jtnVZTfDZl1uPV0mrngVA2U+pzxJ7MtrFM1rjlCU2KxuXs8VaOXUteYYAlAn1ZhMYlE3P8j2hIg==",
+      "path": "microsoft.codeanalysis.csharp.workspaces/3.4.0",
+      "hashPath": "microsoft.codeanalysis.csharp.workspaces.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.Features/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-Vfa9b4mX8ov9uWWZfmkxxvyK39bHIF2Zg+UH3lp8TKmnGJa+A8cKIF1Q6YrRzHt9DiXeCA5JtkMBqM9VLbIrZg==",
+      "path": "microsoft.codeanalysis.features/3.4.0",
+      "hashPath": "microsoft.codeanalysis.features.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.FlowAnalysis.Utilities/2.9.6": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-JKvxsOOCvOnpBpkX6I7L7Wl29nlC2w2Z4aKsXZDuK8JfH+aXeiYv7g/i2h965tWphl0uZ67nmAoCDH0J9ux5rQ==",
+      "path": "microsoft.codeanalysis.flowanalysis.utilities/2.9.6",
+      "hashPath": "microsoft.codeanalysis.flowanalysis.utilities.2.9.6.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.Scripting.Common/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-+b6I3DZL2zvck+B/E/aiOveakj5U2G2BcYODQxcGh2IDbatNU3XXxGT1HumkWB5uIZI2Leu0opBgBpjScmjGMA==",
+      "path": "microsoft.codeanalysis.scripting.common/3.4.0",
+      "hashPath": "microsoft.codeanalysis.scripting.common.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CodeAnalysis.Workspaces.Common/3.4.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-AJszIKY+hXBXDqbcYTiztAQ17GTYfSMDB5u2plzJQqwKN17bqYKr1aC/1NkI5Oho9tixVJ0T/SoeYHpDUMsIBA==",
+      "path": "microsoft.codeanalysis.workspaces.common/3.4.0",
+      "hashPath": "microsoft.codeanalysis.workspaces.common.3.4.0.nupkg.sha512"
+    },
+    "Microsoft.CSharp/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-P+MBhIM0YX+JqROuf7i306ZLJEjQYA9uUyRDE+OqwUI5sh41e2ZbPQV3LfAPh+29cmceE1pUffXsGfR4eMY3KA==",
+      "path": "microsoft.csharp/4.3.0",
+      "hashPath": "microsoft.csharp.4.3.0.nupkg.sha512"
+    },
+    "Microsoft.DiaSymReader/1.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-/fn1Tfo7j7k/slViPlM8azJuxQmri7FZ8dQ+gTeLbI29leN/1VK0U/BFcRdJNctsRCUgyKJ2q+I0Tjq07Rc1/Q==",
+      "path": "microsoft.diasymreader/1.3.0",
+      "hashPath": "microsoft.diasymreader.1.3.0.nupkg.sha512"
+    },
+    "Microsoft.NETCore.Platforms/2.1.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-mOJy3M0UN+LUG21dLGMxaWZEP6xYpQEpLuvuEQBaownaX4YuhH6NmNUlN9si+vNkAS6dwJ//N1O4DmLf2CikVg==",
+      "path": "microsoft.netcore.platforms/2.1.2",
+      "hashPath": "microsoft.netcore.platforms.2.1.2.nupkg.sha512"
+    },
+    "Microsoft.NETCore.Targets/1.1.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-aOZA3BWfz9RXjpzt0sRJJMjAscAUm3Hoa4UWAfceV9UTYxgwZ1lZt5nO2myFf+/jetYQo4uTP7zS8sJY67BBxg==",
+      "path": "microsoft.netcore.targets/1.1.0",
+      "hashPath": "microsoft.netcore.targets.1.1.0.nupkg.sha512"
+    },
+    "System.Collections/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-3Dcj85/TBdVpL5Zr+gEEBUuFe2icOnLalmEh9hfck1PTYbbyWuZgh4fmm2ysCLTrqLQw6t3TgTyJ+VLp+Qb+Lw==",
+      "path": "system.collections/4.3.0",
+      "hashPath": "system.collections.4.3.0.nupkg.sha512"
+    },
+    "System.Collections.Immutable/1.5.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-EXKiDFsChZW0RjrZ4FYHu9aW6+P4MCgEDCklsVseRfhoO0F+dXeMSsMRAlVXIo06kGJ/zv+2w1a2uc2+kxxSaQ==",
+      "path": "system.collections.immutable/1.5.0",
+      "hashPath": "system.collections.immutable.1.5.0.nupkg.sha512"
+    },
+    "System.Composition/1.0.31": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-I+D26qpYdoklyAVUdqwUBrEIckMNjAYnuPJy/h9dsQItpQwVREkDFs4b4tkBza0kT2Yk48Lcfsv2QQ9hWsh9Iw==",
+      "path": "system.composition/1.0.31",
+      "hashPath": "system.composition.1.0.31.nupkg.sha512"
+    },
+    "System.Composition.AttributedModel/1.0.31": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-NHWhkM3ZkspmA0XJEsKdtTt1ViDYuojgSND3yHhTzwxepiwqZf+BCWuvCbjUt4fe0NxxQhUDGJ5km6sLjo9qnQ==",
+      "path": "system.composition.attributedmodel/1.0.31",
+      "hashPath": "system.composition.attributedmodel.1.0.31.nupkg.sha512"
+    },
+    "System.Composition.Convention/1.0.31": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-GLjh2Ju71k6C0qxMMtl4efHa68NmWeIUYh4fkUI8xbjQrEBvFmRwMDFcylT8/PR9SQbeeL48IkFxU/+gd0nYEQ==",
+      "path": "system.composition.convention/1.0.31",
+      "hashPath": "system.composition.convention.1.0.31.nupkg.sha512"
+    },
+    "System.Composition.Hosting/1.0.31": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-fN1bT4RX4vUqjbgoyuJFVUizAl2mYF5VAb+bVIxIYZSSc0BdnX+yGAxcavxJuDDCQ1K+/mdpgyEFc8e9ikjvrg==",
+      "path": "system.composition.hosting/1.0.31",
+      "hashPath": "system.composition.hosting.1.0.31.nupkg.sha512"
+    },
+    "System.Composition.Runtime/1.0.31": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-0LEJN+2NVM89CE4SekDrrk5tHV5LeATltkp+9WNYrR+Huiyt0vaCqHbbHtVAjPyeLWIc8dOz/3kthRBj32wGQg==",
+      "path": "system.composition.runtime/1.0.31",
+      "hashPath": "system.composition.runtime.1.0.31.nupkg.sha512"
+    },
+    "System.Composition.TypedParts/1.0.31": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-0Zae/FtzeFgDBBuILeIbC/T9HMYbW4olAmi8XqqAGosSOWvXfiQLfARZEhiGd0LVXaYgXr0NhxiU1LldRP1fpQ==",
+      "path": "system.composition.typedparts/1.0.31",
+      "hashPath": "system.composition.typedparts.1.0.31.nupkg.sha512"
+    },
+    "System.Diagnostics.Debug/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-ZUhUOdqmaG5Jk3Xdb8xi5kIyQYAA4PnTNlHx1mu9ZY3qv4ELIdKbnL/akbGaKi2RnNUWaZsAs31rvzFdewTj2g==",
+      "path": "system.diagnostics.debug/4.3.0",
+      "hashPath": "system.diagnostics.debug.4.3.0.nupkg.sha512"
+    },
+    "System.Diagnostics.Tools/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-UUvkJfSYJMM6x527dJg2VyWPSRqIVB0Z7dbjHst1zmwTXz5CcXSYJFWRpuigfbO1Lf7yfZiIaEUesfnl/g5EyA==",
+      "path": "system.diagnostics.tools/4.3.0",
+      "hashPath": "system.diagnostics.tools.4.3.0.nupkg.sha512"
+    },
+    "System.Dynamic.Runtime/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==",
+      "path": "system.dynamic.runtime/4.3.0",
+      "hashPath": "system.dynamic.runtime.4.3.0.nupkg.sha512"
+    },
+    "System.Globalization/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-kYdVd2f2PAdFGblzFswE4hkNANJBKRmsfa2X5LG2AcWE1c7/4t0pYae1L8vfZ5xvE2nK/R9JprtToA61OSHWIg==",
+      "path": "system.globalization/4.3.0",
+      "hashPath": "system.globalization.4.3.0.nupkg.sha512"
+    },
+    "System.IO/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-3qjaHvxQPDpSOYICjUoTsmoq5u6QJAFRUITgeT/4gqkF1bajbSmb1kwSxEA8AHlofqgcKJcM8udgieRNhaJ5Cg==",
+      "path": "system.io/4.3.0",
+      "hashPath": "system.io.4.3.0.nupkg.sha512"
+    },
+    "System.Linq/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-5DbqIUpsDp0dFftytzuMmc0oeMdQwjcP/EWxsksIz/w1TcFRkZ3yKKz0PqiYFMmEwPSWw+qNVqD7PJ889JzHbw==",
+      "path": "system.linq/4.3.0",
+      "hashPath": "system.linq.4.3.0.nupkg.sha512"
+    },
+    "System.Linq.Expressions/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-PGKkrd2khG4CnlyJwxwwaWWiSiWFNBGlgXvJpeO0xCXrZ89ODrQ6tjEWS/kOqZ8GwEOUATtKtzp1eRgmYNfclg==",
+      "path": "system.linq.expressions/4.3.0",
+      "hashPath": "system.linq.expressions.4.3.0.nupkg.sha512"
+    },
+    "System.Memory/4.5.3": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA==",
+      "path": "system.memory/4.5.3",
+      "hashPath": "system.memory.4.5.3.nupkg.sha512"
+    },
+    "System.ObjectModel/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-bdX+80eKv9bN6K4N+d77OankKHGn6CH711a6fcOpMQu2Fckp/Ft4L/kW9WznHpyR0NRAvJutzOMHNNlBGvxQzQ==",
+      "path": "system.objectmodel/4.3.0",
+      "hashPath": "system.objectmodel.4.3.0.nupkg.sha512"
+    },
+    "System.Reactive/4.3.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-zoUO99u1mJlsNure7gyMIYMAfR0R4ey6rFob4jr8sSFKiuwgT5PEYNC/04JCyZDIS6YDFfP5uRgIjwSyCacCmQ==",
+      "path": "system.reactive/4.3.1",
+      "hashPath": "system.reactive.4.3.1.nupkg.sha512"
+    },
+    "System.Reactive.Linq/4.3.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-UFiiMI11bX5/d6qR0Rez1+tN271DwpXRTd1H7ROB/fz5Rqa+0Lt8CH5G8UJUzCWHLTReFQOTGZI0Zzj8un92iw==",
+      "path": "system.reactive.linq/4.3.1",
+      "hashPath": "system.reactive.linq.4.3.1.nupkg.sha512"
+    },
+    "System.Reflection/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-KMiAFoW7MfJGa9nDFNcfu+FpEdiHpWgTcS2HdMpDvt9saK3y/G4GwprPyzqjFH9NTaGPQeWNHU+iDlDILj96aQ==",
+      "path": "system.reflection/4.3.0",
+      "hashPath": "system.reflection.4.3.0.nupkg.sha512"
+    },
+    "System.Reflection.Emit/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==",
+      "path": "system.reflection.emit/4.3.0",
+      "hashPath": "system.reflection.emit.4.3.0.nupkg.sha512"
+    },
+    "System.Reflection.Emit.ILGeneration/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-59tBslAk9733NXLrUJrwNZEzbMAcu8k344OYo+wfSVygcgZ9lgBdGIzH/nrg3LYhXceynyvTc8t5/GD4Ri0/ng==",
+      "path": "system.reflection.emit.ilgeneration/4.3.0",
+      "hashPath": "system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512"
+    },
+    "System.Reflection.Emit.Lightweight/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==",
+      "path": "system.reflection.emit.lightweight/4.3.0",
+      "hashPath": "system.reflection.emit.lightweight.4.3.0.nupkg.sha512"
+    },
+    "System.Reflection.Extensions/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-rJkrJD3kBI5B712aRu4DpSIiHRtr6QlfZSQsb0hYHrDCZORXCFjQfoipo2LaMUHoT9i1B7j7MnfaEKWDFmFQNQ==",
+      "path": "system.reflection.extensions/4.3.0",
+      "hashPath": "system.reflection.extensions.4.3.0.nupkg.sha512"
+    },
+    "System.Reflection.Metadata/1.6.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==",
+      "path": "system.reflection.metadata/1.6.0",
+      "hashPath": "system.reflection.metadata.1.6.0.nupkg.sha512"
+    },
+    "System.Reflection.Primitives/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-5RXItQz5As4xN2/YUDxdpsEkMhvw3e6aNveFXUn4Hl/udNTCNhnKp8lT9fnc3MhvGKh1baak5CovpuQUXHAlIA==",
+      "path": "system.reflection.primitives/4.3.0",
+      "hashPath": "system.reflection.primitives.4.3.0.nupkg.sha512"
+    },
+    "System.Reflection.TypeExtensions/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-7u6ulLcZbyxB5Gq0nMkQttcdBTx57ibzw+4IOXEfR+sXYQoHvjW5LTLyNr8O22UIMrqYbchJQJnos4eooYzYJA==",
+      "path": "system.reflection.typeextensions/4.3.0",
+      "hashPath": "system.reflection.typeextensions.4.3.0.nupkg.sha512"
+    },
+    "System.Resources.ResourceManager/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-/zrcPkkWdZmI4F92gL/TPumP98AVDu/Wxr3CSJGQQ+XN6wbRZcyfSKVoPo17ilb3iOr0cCRqJInGwNMolqhS8A==",
+      "path": "system.resources.resourcemanager/4.3.0",
+      "hashPath": "system.resources.resourcemanager.4.3.0.nupkg.sha512"
+    },
+    "System.Runtime/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
+      "path": "system.runtime/4.3.0",
+      "hashPath": "system.runtime.4.3.0.nupkg.sha512"
+    },
+    "System.Runtime.CompilerServices.Unsafe/4.5.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-wprSFgext8cwqymChhrBLu62LMg/1u92bU+VOwyfBimSPVFXtsNqEWC92Pf9ofzJFlk4IHmJA75EDJn1b2goAQ==",
+      "path": "system.runtime.compilerservices.unsafe/4.5.2",
+      "hashPath": "system.runtime.compilerservices.unsafe.4.5.2.nupkg.sha512"
+    },
+    "System.Runtime.Extensions/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-guW0uK0fn5fcJJ1tJVXYd7/1h5F+pea1r7FLSOz/f8vPEqbR2ZAknuRDvTQ8PzAilDveOxNjSfr0CHfIQfFk8g==",
+      "path": "system.runtime.extensions/4.3.0",
+      "hashPath": "system.runtime.extensions.4.3.0.nupkg.sha512"
+    },
+    "System.Runtime.Handles/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-OKiSUN7DmTWeYb3l51A7EYaeNMnvxwE249YtZz7yooT4gOZhmTjIn48KgSsw2k2lYdLgTKNJw/ZIfSElwDRVgg==",
+      "path": "system.runtime.handles/4.3.0",
+      "hashPath": "system.runtime.handles.4.3.0.nupkg.sha512"
+    },
+    "System.Runtime.InteropServices/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-uv1ynXqiMK8mp1GM3jDqPCFN66eJ5w5XNomaK2XD+TuCroNTLFGeZ+WCmBMcBDyTFKou3P6cR6J/QsaqDp7fGQ==",
+      "path": "system.runtime.interopservices/4.3.0",
+      "hashPath": "system.runtime.interopservices.4.3.0.nupkg.sha512"
+    },
+    "System.Text.Encoding/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==",
+      "path": "system.text.encoding/4.3.0",
+      "hashPath": "system.text.encoding.4.3.0.nupkg.sha512"
+    },
+    "System.Text.Encoding.CodePages/4.5.1": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==",
+      "path": "system.text.encoding.codepages/4.5.1",
+      "hashPath": "system.text.encoding.codepages.4.5.1.nupkg.sha512"
+    },
+    "System.Threading/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-VkUS0kOBcUf3Wwm0TSbrevDDZ6BlM+b/HRiapRFWjM5O0NS0LviG0glKmFK+hhPDd1XFeSdU1GmlLhb2CoVpIw==",
+      "path": "system.threading/4.3.0",
+      "hashPath": "system.threading.4.3.0.nupkg.sha512"
+    },
+    "System.Threading.Tasks/4.3.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-LbSxKEdOUhVe8BezB/9uOGGppt+nZf6e1VFyw6v3DN6lqitm0OSn2uXMOdtP0M3W4iMcqcivm2J6UgqiwwnXiA==",
+      "path": "system.threading.tasks/4.3.0",
+      "hashPath": "system.threading.tasks.4.3.0.nupkg.sha512"
+    },
+    "System.Threading.Tasks.Extensions/4.5.3": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-+MvhNtcvIbqmhANyKu91jQnvIRVSTiaOiFNfKWwXGHG48YAb4I/TyH8spsySiPYla7gKal5ZnF3teJqZAximyQ==",
+      "path": "system.threading.tasks.extensions/4.5.3",
+      "hashPath": "system.threading.tasks.extensions.4.5.3.nupkg.sha512"
+    },
+    "RoslynPad.Roslyn/3.4.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "RoslynPad.Roslyn.Windows/3.4.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "System.Reactive.Reference/4.3.0.0": {
+      "type": "reference",
+      "serviceable": false,
+      "sha512": ""
+    }
+  }
+}
\ No newline at end of file
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.dll b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.dll
new file mode 100644
index 0000000000..95612c1bd6
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9a0e0b22bc3bc79ccea90629dbcc19bb03d5c909860a2011bbaee29c51da7182
+size 135680
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.pdb b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.pdb
new file mode 100644
index 0000000000..fd638b0e61
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Editor.Windows.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fb37f577ac4fa2e35f7c3b019e72278e76a14be1b9c55eeb5f32bae71323c43
+size 31688
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.Windows.dll b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.Windows.dll
new file mode 100644
index 0000000000..7240cec7ac
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.Windows.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa9eb1948bde2b6fdd7fee5c52730023bd9c607a1fd5c1345f644b0c1d160ca3
+size 106496
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.Windows.pdb b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.Windows.pdb
new file mode 100644
index 0000000000..5e9b2cb467
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.Windows.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fdf8871b4a60a2ff206439cbcbcf143a88b3c19bbd5b2be01d8c4fff22511857
+size 9204
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.dll b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.dll
new file mode 100644
index 0000000000..5fefff9a2a
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:249273517b2c37185749fe1f8db7bde3a9a7bd2289b4f960de4d5ecc7dd93410
+size 190464
diff --git a/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.pdb b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.pdb
new file mode 100644
index 0000000000..da31ac27d4
--- /dev/null
+++ b/deps/RoslynPad/netcoreapp3.1/RoslynPad.Roslyn.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f78a30a78d459530dfe30b328f19f1314ab3bd2cd638612314601b09df7dca2
+size 48936
diff --git a/deps/SDL2-CS/SDL2-CS.dll b/deps/SDL2-CS/SDL2-CS.dll
index 99ff3f59d3..c7c4afd256 100644
--- a/deps/SDL2-CS/SDL2-CS.dll
+++ b/deps/SDL2-CS/SDL2-CS.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a91a09a61a79521fc4d913e610f24dd4c31ea85189ea9798ae6095b7b389fd
-size 104448
+oid sha256:702ca2d11d244f4d97d29ff902946bcd4ac866b3bbae1bc4098b41779db1a6f4
+size 141824
diff --git a/deps/SDL2-CS/build.bat b/deps/SDL2-CS/build.bat
deleted file mode 100644
index 6c0744559c..0000000000
--- a/deps/SDL2-CS/build.bat
+++ /dev/null
@@ -1,22 +0,0 @@
-@echo off
-
-if "%1" == "" (
-	echo Missing Debug or Release argument
-	EXIT /B 1
-)
-
-pushd ..\..\externals\SDL2-CS
-
-REM SDL2-CS
-call "%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat"
-msbuild /p:Configuration="%1" SDL2-CS.Core.csproj /restore
-if %ERRORLEVEL% neq 0 (
-	echo Error during compilation
-	popd
-	EXIT /B %ERRORLEVEL%
-)
-
-popd
-
-rem Copying assemblies
-copy ..\..\externals\SDL2-CS\bin\%1\netstandard2.0\*.* .
diff --git a/deps/SDL2-CS/checkout.bat b/deps/SDL2-CS/checkout.bat
deleted file mode 100644
index 1720ca0736..0000000000
--- a/deps/SDL2-CS/checkout.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo OFF
-setlocal
-set HOME=%USERPROFILE%
-CALL ..\find_git.cmd
-IF NOT ERRORLEVEL 0 (
-  ECHO "Could not find git.exe"
-  EXIT /B %ERRORLEVEL%
-) 
-%GIT_CMD% clone "https://github.com/flibitijibibo/SDL2-CS.git" ../../externals/SDL2-CS
diff --git a/deps/SDL2/Linux/libSDL2.so b/deps/SDL2/Linux/libSDL2.so
new file mode 100644
index 0000000000..02361e14d6
--- /dev/null
+++ b/deps/SDL2/Linux/libSDL2.so
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7d11e8aa1d8455583b2ce37be290f567f7fb8e8454df6447650bcbe9e5ca6fb
+size 1600040
diff --git a/deps/SDL2/Windows/x64/SDL2.dll b/deps/SDL2/Windows/x64/SDL2.dll
index 0dcbc0089a..ab622162a2 100644
--- a/deps/SDL2/Windows/x64/SDL2.dll
+++ b/deps/SDL2/Windows/x64/SDL2.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5b603fd71086b15a81fb294297f634d242519828ba0f20d027d8a2a4d8c4f70
-size 1331712
+oid sha256:f1a82c299206d5bd3231f5edb16fb7f33aaf4dc7c20bf57c25cf8e92eda6ec72
+size 1599488
diff --git a/deps/SDL2/Windows/x86/SDL2.dll b/deps/SDL2/Windows/x86/SDL2.dll
index 4dda4959e4..e1906e94dc 100644
--- a/deps/SDL2/Windows/x86/SDL2.dll
+++ b/deps/SDL2/Windows/x86/SDL2.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6510202682a42c85928267e17746d88e972b062c99a4e01b750483954c59ddc8
-size 1088000
+oid sha256:fd0fced955da838e5138e6ac37a7ffd56b5919ce5339b0ed81df0ff5575719d5
+size 1364480
diff --git a/deps/SDL2/gamecontrollerdb.txt b/deps/SDL2/gamecontrollerdb.txt
new file mode 100644
index 0000000000..066fc2f524
--- /dev/null
+++ b/deps/SDL2/gamecontrollerdb.txt
@@ -0,0 +1,2048 @@
+# Game Controller DB for SDL in 2.0.16 format
+# Source: https://github.com/gabomdq/SDL_GameControllerDB
+
+# Windows
+03000000300f00000a01000000000000,3 In 1 Conversion Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
+03000000fa2d00000100000000000000,3dRudder Foot Motion Controller,leftx:a0,lefty:a1,rightx:a5,righty:a2,platform:Windows,
+03000000d0160000040d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000050d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000060d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000070d000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000d0160000600a000000000000,4Play Adapter,a:b1,b:b3,back:b4,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,leftstick:b14,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b15,righttrigger:b9,rightx:a3,righty:a4,start:b5,x:b0,y:b2,platform:Windows,
+03000000c82d00000031000000000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000531000000000000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000951000000000000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
+03000000008000000210000000000000,8BitDo F30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000003512000011ab000000000000,8BitDo F30 Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000c82d00001028000000000000,8BitDo F30 Arcade Joystick,a:b0,b:b1,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d000011ab000000000000,8BitDo F30 Arcade Joystick,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000801000000900000000000000,8BitDo F30 Arcade Stick,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001038000000000000,8BitDo F30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000090000000000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001251000000000000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001151000000000000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000150000000000000,8BitDo M30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000151000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000650000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00005106000000000000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,guide:b2,leftshoulder:b8,lefttrigger:b9,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00002090000000000000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000310000000000000,8BitDo N30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000451000000000000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a2,rightx:a3,righty:a5,start:b11,platform:Windows,
+03000000c82d00002028000000000000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00008010000000000000,8BitDo N30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d0000e002000000000000,8BitDo N30,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b6,platform:Windows,
+03000000c82d00000190000000000000,8BitDo N30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001590000000000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00006528000000000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000290000000000000,8BitDo N64,+rightx:b9,+righty:b3,-rightx:b4,-righty:b8,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,platform:Windows,
+03000000c82d00003038000000000000,8BitDo N64,+rightx:b9,+righty:b3,-rightx:b4,-righty:b8,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,platform:Windows,
+03000000c82d00006928000000000000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b11,platform:Windows,
+03000000c82d00002590000000000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000003512000012ab000000000000,8BitDo NES30,a:b2,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Windows,
+03000000c82d000012ab000000000000,8BitDo NES30,a:b1,b:b0,back:b10,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000022000000090000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000203800000900000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00002038000000000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000751000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000851000000000000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000360000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000361000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000660000000000000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000131000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000231000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000331000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000431000000000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00002867000000000000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a2,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a5,start:b10,x:b3,y:b4,platform:Windows,
+03000000c82d00000130000000000000,8BitDo SF30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000060000000000000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000061000000000000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000102800000900000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d000021ab000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00003028000000000000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+030000003512000020ab000000000000,8BitDo SN30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000030000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000351000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a2,rightshoulder:b7,rightx:a3,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001290000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d000020ab000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00004028000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00006228000000000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000021000000000000,8BitDo SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000160000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000161000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000260000000000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00000261000000000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00001230000000000000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001530000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001630000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001730000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001130000000000000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b26,paddle1:b24,paddle2:b25,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001330000000000000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000121000000000000,8BitDo Xbox One SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000a00500003232000000000000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00001890000000000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Windows,
+03000000c82d00003032000000000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Windows,
+030000008f0e00001200000000000000,Acme GA02,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000c01100000355000000000000,Acrux,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000fa190000f0ff000000000000,Acteck AGJ 3200,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d1180000402c000000000000,ADT1,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a3,rightx:a2,righty:a5,x:b3,y:b4,platform:Windows,
+030000006f0e00008801000000000000,Afterglow Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000341a00003608000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00000263000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001101000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001401000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001402000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001901000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001a01000000000000,Afterglow PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001301000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001302000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001304000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00001413000000000000,Afterglow Xbox Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00003901000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ab1200000103000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000000f9000000000000,Afterglow Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000100000008200000000000000,Akishop Customs PS360,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000007c1800000006000000000000,Alienware Dual Compatible PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000491900001904000000000000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000710100001904000000000000,Amazon Luna Controller,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b8,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b4,rightstick:b7,rightx:a3,righty:a4,start:b6,x:b3,y:b2,platform:Windows,
+0300000008100000e501000000000000,Anbernic Game Pad,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000830500000160000000000000,Arcade,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b3,x:b4,y:b4,platform:Windows,
+03000000120c0000100e000000000000,Armor 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000490b00004406000000000000,ASCII Seamic Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000869800002500000000000000,Astro C40 TR PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000a30c00002700000000000000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000a30c00002800000000000000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a3,lefty:a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000050b00000579000000000000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000050b00000679000000000000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,start:b3,platform:Windows,
+03000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
+030000008a3500000102000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+030000008a3500000201000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+030000008a3500000302000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+030000008a3500000402000000000000,Backbone One,a:b4,b:b5,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b10,leftstick:b17,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b18,righttrigger:b13,rightx:a3,righty:a4,start:b15,x:b7,y:b8,platform:Windows,
+03000000e4150000103f000000000000,Batarang,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d6200000e557000000000000,Batarang PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000c01100001352000000000000,Battalife Joystick,a:b6,b:b7,back:b2,leftshoulder:b0,leftx:a0,lefty:a1,rightshoulder:b1,start:b3,x:b4,y:b5,platform:Windows,
+030000006f0e00003201000000000000,Battlefield 4 PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ad1b000001f9000000000000,BB 070,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000002a79000000000000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000bc2000005250000000000000,Beitong G3,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a3,righty:a4,start:b15,x:b3,y:b4,platform:Windows,
+030000000d0500000208000000000000,Belkin Nostromo N40,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000bc2000006012000000000000,Betop 2126F,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000bc2000000055000000000000,Betop BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000bc2000006312000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000bc2000006321000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000bc2000006412000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000c01100000555000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000c01100000655000000000000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000000700000000000000,Betop Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+03000000808300000300000000000000,Betop Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+030000006f0e00006401000000000000,BF One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000300f00000202000000000000,Bigben,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a5,righty:a2,start:b7,x:b2,y:b3,platform:Windows,
+030000006b1400000209000000000000,Bigben,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006b1400000055000000000000,Bigben PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006b1400000103000000000000,Bigben PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
+03000000120c0000200e000000000000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000210e000000000000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f10e000000000000,Brook PS2 Adapter,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000310c000000000000,Brook Super Converter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000d81d00000b00000000000000,Buffalo BSGP1601 Series,a:b5,b:b3,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b4,y:b2,platform:Windows,
+030000005b1c00002400000000000000,Capcom Home Arcade Controller,a:b3,b:b4,back:b7,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b6,x:b0,y:b1,platform:Windows,
+030000005b1c00002500000000000000,Capcom Home Arcade Controller,a:b3,b:b4,back:b7,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b6,x:b0,y:b1,platform:Windows,
+030000006d04000042c2000000000000,ChillStream,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000e82000006058000000000000,Cideko AK08b,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000457500000401000000000000,Cobra,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000b0400003365000000000000,Competition Pro,a:b0,b:b1,back:b2,leftx:a0,lefty:a1,start:b3,platform:Windows,
+030000004c050000c505000000000000,CronusMax Adapter,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000d814000007cd000000000000,Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000d8140000cefa000000000000,Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000260900008888000000000000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a4,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Windows,
+030000003807000002cb000000000000,Cyborg,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000a306000022f6000000000000,Cyborg V.3 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000f806000000a3000000000000,DA Leader,a:b7,b:b6,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b0,leftstick:b8,lefttrigger:b1,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:b3,rightx:a2,righty:a3,start:b12,x:b4,y:b5,platform:Windows,
+030000001a1c00000001000000000000,Datel Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000451300000830000000000000,Defender Game Racer X7,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000791d00000103000000000000,Dual Box Wii,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000c0160000e105000000000000,Dual Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+030000004f040000070f000000000000,Dual Power,a:b8,b:b9,back:b4,dpdown:b1,dpleft:b2,dpright:b3,dpup:b0,leftshoulder:b13,leftstick:b6,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b12,rightstick:b7,righttrigger:b15,start:b5,x:b10,y:b11,platform:Windows,
+030000004f04000012b3000000000000,Dual Power 3,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000004f04000020b3000000000000,Dual Trigger,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+03000000bd12000002e0000000000000,Dual Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000ff1100003133000000000000,DualForce,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b1,platform:Windows,
+030000008f0e00000910000000000000,DualShock 2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000317300000100000000000000,DualShock 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000006f0e00003001000000000000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000fc0400000250000000000000,Easy Grip,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000bc2000000091000000000000,EasySMX Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000006e0500000a20000000000000,Elecom DUX60 MMO,a:b2,b:b3,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b14,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b15,righttrigger:b13,rightx:a3,righty:a4,start:b20,x:b0,y:b1,platform:Windows,
+03000000b80500000410000000000000,Elecom Gamepad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+03000000b80500000610000000000000,Elecom Gamepad,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+030000006e0500000520000000000000,Elecom P301U PlayStation Controller Adapter,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+03000000411200004450000000000000,Elecom U1012,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000320000000000000,Elecom U3613M,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000e20000000000000,Elecom U3912T,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000f20000000000000,Elecom U4013S,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500001320000000000000,Elecom U4113,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006e0500001020000000000000,Elecom U4113S,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Windows,
+030000006e0500000720000000000000,Elecom W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+030000007d0400000640000000000000,Eliminator AfterShock,a:b1,b:b2,back:b9,dpdown:+a3,dpleft:-a5,dpright:+a5,dpup:-a3,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a4,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
+03000000120c0000f61c000000000000,Elite,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000430b00000300000000000000,EMS Production PS2 Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000242f000000b7000000000000,ESM 9110,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Windows,
+03000000101c0000181c000000000000,Essential,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b4,leftx:a1,lefty:a0,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000008f0e00000f31000000000000,EXEQ,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
+03000000341a00000108000000000000,EXEQ RF Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006f0e00008401000000000000,Faceoff Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00008101000000000000,Faceoff Deluxe Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00008001000000000000,Faceoff Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000021000000090000000000000,FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Windows,
+0300000011040000c600000000000000,FC801,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000852100000201000000000000,FF GP1,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ad1b000028f0000000000000,Fightpad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b00002ef0000000000000,Fightpad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000038f0000000000000,Fightpad TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03005036852100000000000000000000,Final Fantasy XIV Online Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000f806000001a3000000000000,Firestorm,a:b9,b:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b0,leftstick:b10,lefttrigger:b1,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,start:b12,x:b8,y:b4,platform:Windows,
+03000000b50700000399000000000000,Firestorm 2,a:b2,b:b4,back:b10,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,righttrigger:b9,start:b11,x:b3,y:b5,platform:Windows,
+03000000b50700001302000000000000,Firestorm D3,a:b0,b:b2,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,x:b1,y:b3,platform:Windows,
+03000000b40400001024000000000000,Flydigi Apex,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000151900004000000000000000,Flydigi Vader 2,a:b27,b:b26,back:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b23,leftstick:b17,lefttrigger:b21,leftx:a0,lefty:a1,misc1:b15,paddle1:b11,paddle2:b10,paddle3:b13,paddle4:b12,rightshoulder:b22,rightstick:b16,righttrigger:b20,rightx:a3,righty:a4,start:b18,x:b25,y:b24,platform:Windows,
+03000000b40400001124000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b14,paddle1:b4,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b2,y:b3,platform:Windows,
+03000000b40400001224000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000008305000000a0000000000000,G08XU,a:b0,b:b1,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b5,x:b2,y:b3,platform:Windows,
+0300000066f700000100000000000000,Game VIB Joystick,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Windows,
+03000000260900002625000000000000,GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,lefttrigger:a4,leftx:a0,lefty:a1,righttrigger:a5,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a000005f7000000000000,GameCube Controller,a:b2,b:b3,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b1,y:b0,platform:Windows,
+03000000430b00000500000000000000,GameCube Controller,a:b0,b:b2,dpdown:b10,dpleft:b8,dpright:b9,dpup:b11,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a3,rightx:a5,righty:a2,start:b7,x:b1,y:b3,platform:Windows,
+03000000790000004718000000000000,GameCube Controller,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000790000004618000000000000,GameCube Controller Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+030000008f0e00000d31000000000000,Gamepad 3 Turbo,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ac0500003d03000000000000,GameSir G3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500005b05000000000000,GameSir G3w,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000ac0500002d02000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500004d04000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ac0500001a06000000000000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000004c0e00001035000000000000,Gamester,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00001110000000000000,GameStick Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+0300000047530000616d000000000000,GameStop,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000c01100000140000000000000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000b62500000100000000000000,Gametel GT004 01,a:b3,b:b0,dpdown:b10,dpleft:b9,dpright:b8,dpup:b11,leftshoulder:b4,rightshoulder:b5,start:b7,x:b1,y:b2,platform:Windows,
+030000008f0e00001411000000000000,Gamo2 Divaller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000a857000000000000,Gator Claw,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000c9110000f055000000000000,GC100XF,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000008305000009a0000000000000,Genius,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000008305000031b0000000000000,Genius Maxfire Blaze 3,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000451300000010000000000000,Genius Maxfire Grandias 12,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000005c1a00003330000000000000,Genius MaxFire Grandias 12V,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000300f00000b01000000000000,GGE909 Recoil,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000f0250000c283000000000000,Gioteck PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f025000021c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f025000031c1000000000000,Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f0250000c383000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000f0250000c483000000000000,Gioteck VX2 PlayStation Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000004f04000026b3000000000000,GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+0300000079000000d418000000000000,GPD Win,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000025b000000000000,GPX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000007d0400000840000000000000,Gravis Destroyer Tilt,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,x:b0,y:b3,platform:Windows,
+030000007d0400000540000000000000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000280400000140000000000000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a3,dpup:-a4,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000008f0e00000610000000000000,GreenAsia,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a5,righty:a2,start:b11,x:b3,y:b0,platform:Windows,
+03000000ac0500006b05000000000000,GT2a,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000341a00000302000000000000,Hama Scorpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00004900000000000000,Hatsune Miku Sho PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000001008000001e1000000000000,Havit HV G60,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b0,platform:Windows,
+030000000d0f00000c00000000000000,HEXT,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d81400000862000000000000,HitBox Edition Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+03000000632500002605000000000000,HJD X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+030000000d0f00000a00000000000000,Hori DOA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008500000000000000,Hori Fighting Commander 2016 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002500000000000000,Hori Fighting Commander 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002d00000000000000,Hori Fighting Commander 3 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005f00000000000000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005e00000000000000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008400000000000000,Hori Fighting Commander 5,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006201000000000000,Hori Fighting Commander Octa,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006401000000000000,Hori Fighting Commander Octa,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00005100000000000000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008600000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000ba00000000000000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008800000000000000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
+030000000d0f00008700000000000000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00001000000000000000,Hori Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00003200000000000000,Hori Fightstick 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000c000000000000000,Hori Fightstick 4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00000d00000000000000,Hori Fightstick EX2,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00003701000000000000,Hori Fightstick Mini,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Windows,
+030000000d0f00004000000000000000,Hori Fightstick Mini 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b4,rightshoulder:b7,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002100000000000000,Hori Fightstick V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002700000000000000,Hori Fightstick V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000a000000000000000,Hori Grip TAC4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b13,x:b0,y:b3,platform:Windows,
+030000000d0f0000a500000000000000,Hori Miku Project Diva X HD PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000a600000000000000,Hori Miku Project Diva X HD PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00000101000000000000,Hori Mini Hatsune Miku FT,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005400000000000000,Hori Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00000900000000000000,Hori Pad 3 Turbo,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00004d00000000000000,Hori Pad A,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00003801000000000000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Windows,
+030000000d0f00009200000000000000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002301000000000000,Hori PS4 Controller Light,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000000d0f00001100000000000000,Hori Real Arcade Pro 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00002600000000000000,Hori Real Arcade Pro 3P,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00004b00000000000000,Hori Real Arcade Pro 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006a00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006b00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008a00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00008b00000000000000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006f00000000000000,Hori Real Arcade Pro 4 VLX,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00007000000000000000,Hori Real Arcade Pro 4 VLX,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00003d00000000000000,Hori Real Arcade Pro N3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b10,leftstick:b4,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b6,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000ae00000000000000,Hori Real Arcade Pro N4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f00008c00000000000000,Hori Real Arcade Pro P4,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000aa00000000000000,Hori Real Arcade Pro S,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000d800000000000000,Hori Real Arcade Pro S,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00002200000000000000,Hori Real Arcade Pro V3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005b00000000000000,Hori Real Arcade Pro V4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005c00000000000000,Hori Real Arcade Pro V4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000af00000000000000,Hori Real Arcade Pro VHS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00001b00000000000000,Hori Real Arcade Pro VX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000002f5000000000000,Hori Real Arcade Pro VX,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00009c00000000000000,Hori TAC Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000c900000000000000,Hori Taiko Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006400000000000000,Horipad 3TP,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00001300000000000000,Horipad 3W,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00005500000000000000,Horipad 4 FPS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006e00000000000000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00006600000000000000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f00004200000000000000,Horipad A,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000ad1b000001f5000000000000,Horipad EXT2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000ee00000000000000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000c100000000000000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000000d0f0000f600000000000000,Horipad Nintendo Switch Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000000d0f00006700000000000000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000000d0f0000dc00000000000000,Horipad Switch,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000242e00000b20000000000000,Hyperkin Admiral N64 Controller,+rightx:b11,+righty:b13,-rightx:b8,-righty:b12,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,platform:Windows,
+03000000242e0000ff0b000000000000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Windows,
+03000000790000004e95000000000000,Hyperkin N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a5,righty:a2,start:b9,platform:Windows,
+03000000242e00006a48000000000000,Hyperkin RetroN Sq,a:b3,b:b7,back:b5,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b0,rightshoulder:b1,start:b4,x:b2,y:b6,platform:Windows,
+03000000242e00006a38000000000000,Hyperkin Trooper 2,a:b0,b:b1,back:b4,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b3,start:b5,platform:Windows,
+03000000d81d00000e00000000000000,iBuffalo AC02 Arcade Joystick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,rightx:a2,righty:a5,start:b8,x:b4,y:b5,platform:Windows,
+03000000d81d00000f00000000000000,iBuffalo BSGP1204 Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d81d00001000000000000000,iBuffalo BSGP1204P Series,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000005c0a00000285000000000000,iDroidCon,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b6,platform:Windows,
+03000000696400006964000000000000,iDroidCon Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000511d00000230000000000000,iGUGU Gamecore,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b1,leftstick:b4,lefttrigger:b3,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b2,platform:Windows,
+03000000b50700001403000000000000,Impact Black,a:b2,b:b3,back:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+030000006f0e00002401000000000000,Injustice Fightstick PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000830500005130000000000000,InterAct ActionPad,a:b0,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000ef0500000300000000000000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Windows,
+03000000fd0500000230000000000000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a5,start:b11,x:b0,y:b1,platform:Windows,
+03000000fd0500000030000000000000,Interact GoPad,a:b3,b:b4,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Windows,
+03000000fd0500003902000000000000,InterAct Hammerhead,a:b3,b:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b2,lefttrigger:b8,rightshoulder:b7,rightstick:b5,righttrigger:b9,start:b10,x:b0,y:b1,platform:Windows,
+03000000fd0500002a26000000000000,InterAct Hammerhead FX,a:b3,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b0,y:b1,platform:Windows,
+03000000fd0500002f26000000000000,InterAct Hammerhead FX,a:b4,b:b5,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b1,y:b2,platform:Windows,
+03000000fd0500005302000000000000,InterAct ProPad,a:b3,b:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Windows,
+03000000ac0500002c02000000000000,Ipega Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000491900000204000000000000,Ipega PG9023,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000491900000304000000000000,Ipega PG9087,+righty:+a5,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
+030000007e0500000620000000000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Windows,
+030000007e0500000720000000000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
+03000000250900000017000000000000,Joypad Adapter,a:b2,b:b1,back:b9,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b8,x:b3,y:b0,platform:Windows,
+03000000bd12000003c0000000000000,Joypad Alpha Shock,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ff1100004033000000000000,JPD FFB,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a2,start:b15,x:b3,y:b0,platform:Windows,
+03000000242f00002d00000000000000,JYS Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000242f00008a00000000000000,JYS Adapter,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
+03000000c4100000c082000000000000,KADE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000828200000180000000000000,Keio,a:b4,b:b5,back:b8,leftshoulder:b2,lefttrigger:b3,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b9,x:b0,y:b1,platform:Windows,
+03000000790000000200000000000000,King PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+03000000bd12000001e0000000000000,Leadership,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000006f0e00000103000000000000,Logic3,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00000104000000000000,Logic3,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000008f0e00001300000000000000,Logic3,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000006d040000d1ca000000000000,Logitech ChillStream,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d040000d2ca000000000000,Logitech Cordless Precision,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000011c2000000000000,Logitech Cordless Wingman,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b5,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b2,righttrigger:b7,rightx:a3,righty:a4,x:b4,platform:Windows,
+030000006d04000016c2000000000000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d0400001dc2000000000000,Logitech F310,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006d04000018c2000000000000,Logitech F510,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d0400001ec2000000000000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006d04000019c2000000000000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d0400001fc2000000000000,Logitech F710,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006d0400001ac2000000000000,Logitech Precision,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000009c2000000000000,Logitech WingMan,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000006d0400000bc2000000000000,Logitech WingMan Action Pad,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b8,lefttrigger:a5~,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:a2~,start:b8,x:b3,y:b4,platform:Windows,
+030000006d0400000ac2000000000000,Logitech WingMan RumblePad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,rightx:a3,righty:a4,x:b3,y:b4,platform:Windows,
+03000000380700005645000000000000,Lynx,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000222200006000000000000000,Macally,a:b1,b:b2,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b33,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700003888000000000000,Mad Catz Arcade Fightstick TE S Plus PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008532000000000000,Mad Catz Arcade Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700006352000000000000,Mad Catz CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700006652000000000000,Mad Catz CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700005032000000000000,Mad Catz Fightpad Pro PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700005082000000000000,Mad Catz Fightpad Pro PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008031000000000000,Mad Catz FightStick Alpha PS3	,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000003807000038b7000000000000,Mad Catz Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700008433000000000000,Mad Catz Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008483000000000000,Mad Catz Fightstick TE S PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008134000000000000,Mad Catz Fightstick TE2 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b7,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b4,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008184000000000000,Mad Catz Fightstick TE2 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,leftstick:b10,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700006252000000000000,Mad Catz Micro CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008232000000000000,Mad Catz PlayStation Brawlpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008731000000000000,Mad Catz PlayStation Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000003807000056a8000000000000,Mad Catz PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700001888000000000000,Mad Catz SFIV Fightstick PS3,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b6,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000380700008081000000000000,Mad Catz SFV Arcade Fightstick Alpha PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700001847000000000000,Mad Catz Street Fighter 4 Xbox 360 FightStick,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700008034000000000000,Mad Catz TE2 PS3 Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700008084000000000000,Mad Catz TE2 PS4 Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000002a0600001024000000000000,Matricom,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
+030000009f000000adbb000000000000,MaxJoypad Virtual Controller,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900000128000000000000,Mayflash Arcade Stick,a:b1,b:b2,back:b8,leftshoulder:b0,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b7,start:b9,x:b5,y:b6,platform:Windows,
+030000008f0e00001330000000000000,Mayflash Controller Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f00003700000000000000,Mayflash F101,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000003018000000000000,Mayflash F300 Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f00003900000000000000,Mayflash F300 Elite Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000004418000000000000,Mayflash GameCube Controller,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000004318000000000000,Mayflash GameCube Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f00007300000000000000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b0,y:b3,platform:Windows,
+0300000079000000d218000000000000,Mayflash Magic NS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d620000010a7000000000000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000242f0000f400000000000000,Mayflash N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
+03000000790000007918000000000000,Mayflash N64 Controller Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,righttrigger:b7,rightx:a3,righty:a2,start:b8,platform:Windows,
+030000008f0e00001030000000000000,Mayflash Saturn Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+0300000025090000e803000000000000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:a5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
+03000000790000000318000000000000,Mayflash Wii DolphinBar,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
+03000000790000000018000000000000,Mayflash Wii U Pro Adapter,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000002418000000000000,Mega Drive Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,rightshoulder:b2,start:b9,x:b3,y:b4,platform:Windows,
+0300000079000000ae18000000000000,Mega Drive Controller,a:b0,b:b1,back:b7,dpdown:b14,dpleft:b15,dpright:b13,dpup:b2,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000c0160000990a000000000000,Mega Drive Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,righttrigger:b2,start:b3,platform:Windows,
+030000005e0400002800000000000000,Microsoft Dual Strike,a:b3,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,rightx:a0,righty:a1~,start:b5,x:b1,y:b0,platform:Windows,
+030000005e0400000300000000000000,Microsoft SideWinder,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000005e0400000700000000000000,Microsoft SideWinder,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+030000005e0400000e00000000000000,Microsoft SideWinder Freestyle Pro,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,start:b8,x:b3,y:b4,platform:Windows,
+030000005e0400002700000000000000,Microsoft SideWinder Plug and Play,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b4,righttrigger:b5,x:b2,y:b3,platform:Windows,
+03000000280d00000202000000000000,Miller Lite Cantroller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b5,x:b2,y:b3,platform:Windows,
+03000000ad1b000023f0000000000000,MLG,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a6,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000ad1b00003ef0000000000000,MLG Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b8,rightshoulder:b5,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700006382000000000000,MLG PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000004523000015e0000000000000,Mobapad Chitu HD,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000491900000904000000000000,Mobapad Chitu HD,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000ffff00000000000000000000,Mocute M053,a:b3,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b11,leftstick:b7,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b6,righttrigger:b4,rightx:a3,righty:a4,start:b8,x:b1,y:b0,platform:Windows,
+03000000d6200000e589000000000000,Moga 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000007162000000000000,Moga Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+03000000d6200000ad0d000000000000,Moga Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c62400002a89000000000000,Moga XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c62400002b89000000000000,Moga XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c62400001a89000000000000,Moga XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c62400001b89000000000000,Moga XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000250900006688000000000000,MP-8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000091200004488000000000000,MUSIA PlayStation 2 Input Display,a:b0,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,leftstick:b6,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b9,rightstick:b7,righttrigger:b11,rightx:a2,righty:a3,start:b5,x:b1,y:b3,platform:Windows,
+03000000f70600000100000000000000,N64 Adaptoid,+rightx:b2,+righty:b1,-rightx:b4,-righty:b5,a:b0,b:b3,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,start:b8,platform:Windows,
+030000006f0e00001311000000000000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Windows,
+030000006b140000010c000000000000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006b1400001106000000000000,Nacon Revolution 3 PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+0300000085320000170d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+0300000085320000190d000000000000,Nacon Revolution 5 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000006b140000100d000000000000,Nacon Revolution Infinity PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006b140000080d000000000000,Nacon Revolution Unlimited Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000bd12000001c0000000000000,Nebular,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000eb0300000000000000000000,NeGcon Adapter,a:a2,b:b13,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,lefttrigger:a4,leftx:a1,righttrigger:b11,start:b3,x:a3,y:b12,platform:Windows,
+0300000038070000efbe000000000000,NEO SE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+0300000092120000474e000000000000,NeoGeo X Arcade Stick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b3,y:b2,platform:Windows,
+03000000921200004b46000000000000,NES 2 port Adapter,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b11,platform:Windows,
+03000000000f00000100000000000000,NES Controller,a:b1,b:b0,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Windows,
+03000000921200004346000000000000,NES Controller,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Windows,
+03000000790000004518000000000000,NEXILUX GameCube Controller Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+030000001008000001e5000000000000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Windows,
+03000000050b00000045000000000000,Nexus,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b10,x:b2,y:b3,platform:Windows,
+03000000152000000182000000000000,NGDS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+030000007e0500000920000000000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000000d0500000308000000000000,Nostromo N45,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b12,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b2,y:b3,platform:Windows,
+030000007e0500001920000000000000,NSO N64 Controller,+rightx:b8,+righty:b2,-rightx:b3,-righty:b7,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Windows,
+030000007e0500001720000000000000,NSO SNES Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b15,start:b9,x:b2,y:b3,platform:Windows,
+03000000550900001472000000000000,NVIDIA Controller,a:b11,b:b10,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b7,leftstick:b5,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b4,righttrigger:a5,rightx:a3,righty:a6,start:b3,x:b9,y:b8,platform:Windows,
+03000000550900001072000000000000,NVIDIA Shield,a:b9,b:b8,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b3,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b2,righttrigger:a4,rightx:a2,righty:a5,start:b0,x:b7,y:b6,platform:Windows,
+030000005509000000b4000000000000,NVIDIA Virtual,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000120c00000288000000000000,Nyko Air Flo Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000004b120000014d000000000000,NYKO Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000d62000001d57000000000000,Nyko Airflo PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000791d00000900000000000000,Nyko Playpad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000782300000a10000000000000,Onlive Controller,a:b15,b:b14,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b11,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b13,y:b12,platform:Windows,
+030000000d0f00000401000000000000,Onyx,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000008916000001fd000000000000,Onza CE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a3,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000008916000000fd000000000000,Onza TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000006d57000000000000,OPP PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006b14000001a1000000000000,Orange Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Windows,
+03000000362800000100000000000000,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Windows,
+03000000120c0000f60e000000000000,P4 Gamepad,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b7,rightshoulder:b4,righttrigger:b6,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000002201000000000000,PC Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000006f0e00008501000000000000,PDP Fightpad Pro GameCube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006f0e00000901000000000000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000008f0e00004100000000000000,PlaySega,a:b1,b:b0,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b4,y:b3,platform:Windows,
+03000000666600006706000000000000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Windows,
+03000000e30500009605000000000000,PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000004c050000da0c000000000000,PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000632500002306000000000000,PlayStation Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000f0250000c183000000000000,PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d9040000160f000000000000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000004c0500003713000000000000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000011a7000000000000,PowerA Core Plus GameCube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000dd62000015a7000000000000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000012a7000000000000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000dd62000016a7000000000000,PowerA Fusion Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000013a7000000000000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d62000006dca000000000000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+0300000062060000d570000000000000,PowerA PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d620000014a7000000000000,PowerA Spectra Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000084ca000000000000,Precision,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000d62000009557000000000000,Pro Elite PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000c62400001a53000000000000,Pro Ex Mini,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000009f31000000000000,Pro Ex mini PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000d6200000c757000000000000,Pro Ex mini PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000110e000000000000,Pro5,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000100800000100000000000000,PS1 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+030000008f0e00007530000000000000,PS1 Controller,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b1,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000100800000300000000000000,PS2 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000250900000088000000000000,PS2 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900006888000000000000,PS2 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b6,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900008888000000000000,PS2 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000006b1400000303000000000000,PS2 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000009d0d00001330000000000000,PS2 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000151a00006222000000000000,PS2 Dual Plus Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000120a00000100000000000000,PS3 Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000120c00001307000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c00001cf1000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f90e000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000250900000118000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900000218000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000250900000500000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.8,dpleft:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b0,y:b3,platform:Windows,
+030000004c0500006802000000000000,PS3 Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b10,lefttrigger:a3~,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:a4~,rightx:a2,righty:a5,start:b8,x:b3,y:b0,platform:Windows,
+030000004f1f00000800000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+03000000632500007505000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000888800000803000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b9,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Windows,
+03000000888800000804000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Windows,
+030000008f0e00000300000000000000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+030000008f0e00001431000000000000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000ba2200002010000000000000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b2,platform:Windows,
+03000000120c00000807000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000111e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000121e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000130e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000150e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000180e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000181e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000191e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c00001e0e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000a957000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000aa57000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f21c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f31c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f41c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f51c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120c0000f70e000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000120e0000120c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000160e0000120c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000001a1e0000120c000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004c050000a00b000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004c050000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000cc09000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004c0500005f0e000000000000,PS5 Access Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000e60c000000000000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+030000004c050000f20d000000000000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
+03000000830500005020000000000000,PSX,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b2,y:b3,platform:Windows,
+03000000300f00000111000000000000,Qanba 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00000211000000000000,Qanba 2P,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000300f00000011000000000000,Qanba Arcade Stick 1008,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b10,x:b0,y:b3,platform:Windows,
+03000000300f00001611000000000000,Qanba Arcade Stick 4018,a:b1,b:b2,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b8,x:b0,y:b3,platform:Windows,
+03000000222c00000025000000000000,Qanba Dragon Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000222c00000020000000000000,Qanba Drone Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,rightshoulder:b5,righttrigger:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001211000000000000,Qanba Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001210000000000000,Qanba Joystick Plus,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Windows,
+03000000341a00000104000000000000,Qanba Joystick Q4RAF,a:b5,b:b6,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b0,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b7,start:b9,x:b1,y:b2,platform:Windows,
+03000000222c00000223000000000000,Qanba Obsidian Arcade Stick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000222c00000023000000000000,Qanba Obsidian Arcade Stick PS4,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000008a2400006682000000000000,R1 Mobile Controller,a:b3,b:b1,back:b7,leftx:a0,lefty:a1,start:b6,x:b4,y:b0,platform:Windows,
+03000000086700006626000000000000,RadioShack,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000ff1100004733000000000000,Ramox FPS Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b0,platform:Windows,
+030000009b2800002300000000000000,Raphnet 3DO Adapter,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b2,start:b3,platform:Windows,
+030000009b2800006900000000000000,Raphnet 3DO Adapter,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b2,start:b3,platform:Windows,
+030000009b2800000800000000000000,Raphnet Dreamcast Adapter,a:b2,b:b1,dpdown:b5,dpleft:b6,dpright:b7,dpup:b4,lefttrigger:a2,leftx:a0,righttrigger:a3,righty:a1,start:b3,x:b10,y:b9,platform:Windows,
+030000009b280000d000000000000000,Raphnet Dreamcast Adapter,a:b1,b:b0,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,lefttrigger:+a5,leftx:a0,lefty:a1,righttrigger:+a2,start:b3,x:b5,y:b4,platform:Windows,
+030000009b2800006200000000000000,Raphnet GameCube Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Windows,
+030000009b2800003200000000000000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:+a2,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Windows,
+030000009b2800006000000000000000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:+a2,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Windows,
+030000009b2800001800000000000000,Raphnet Jaguar Adapter,a:b2,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b10,start:b3,x:b11,y:b12,platform:Windows,
+030000009b2800006100000000000000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Windows,
+030000009b2800006300000000000000,Raphnet N64 Adapter,+rightx:b9,+righty:b7,-rightx:b8,-righty:b6,a:b0,b:b1,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,lefttrigger:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Windows,
+030000009b2800000200000000000000,Raphnet NES Adapter,a:b7,b:b6,back:b5,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,start:b4,platform:Windows,
+030000009b2800004400000000000000,Raphnet PS1 and PS2 Adapter,a:b1,b:b2,back:b5,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b9,rightx:a3,righty:a4,start:b4,x:b0,y:b3,platform:Windows,
+030000009b2800004300000000000000,Raphnet Saturn,a:b0,b:b1,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000009b2800000500000000000000,Raphnet Saturn Adapter 2.0,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
+030000009b2800000300000000000000,Raphnet SNES Adapter,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+030000009b2800002600000000000000,Raphnet SNES Adapter,a:b1,b:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800002e00000000000000,Raphnet SNES Adapter,a:b1,b:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800002f00000000000000,Raphnet SNES Adapter,a:b1,b:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800005600000000000000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800005700000000000000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800001e00000000000000,Raphnet Vectrex Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a1,lefty:a2,x:b2,y:b3,platform:Windows,
+030000009b2800002b00000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800002c00000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
+030000009b2800008000000000000000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Windows,
+03000000790000008f18000000000000,Rapoo Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000321500000003000000000000,Razer Hydra,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000f8270000bf0b000000000000,Razer Kishi,a:b6,b:b7,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b18,leftshoulder:b12,leftstick:b19,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b13,rightstick:b20,righttrigger:b15,rightx:a3,righty:a4,start:b17,x:b9,y:b10,platform:Windows,
+03000000321500000204000000000000,Razer Panthera PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000104000000000000,Razer Panthera PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000010000000000000,Razer Raiju,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000507000000000000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000321500000707000000000000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000321500000710000000000000,Razer Raiju TE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000a10000000000000,Razer Raiju TE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000410000000000000,Razer Raiju UE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000910000000000000,Razer Raiju UE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000011000000000000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000321500000009000000000000,Razer Serval,+lefty:+a2,-lefty:-a1,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,leftx:a0,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000921200004547000000000000,Retro Bit Sega Genesis Controller Adapter,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b6,x:b3,y:b4,platform:Windows,
+03000000790000001100000000000000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
+03000000830500006020000000000000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
+0300000003040000c197000000000000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+03000000bd12000013d0000000000000,Retrolink Sega Saturn Classic Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b5,lefttrigger:b6,rightshoulder:b2,righttrigger:b7,start:b8,x:b3,y:b4,platform:Windows,
+03000000bd12000015d0000000000000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000341200000400000000000000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Windows,
+0300000000f000000300000000000000,RetroUSB RetroPad,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
+0300000000f00000f100000000000000,RetroUSB Super RetroPort,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
+03000000830500000960000000000000,Revenger,a:b0,b:b1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b3,x:b4,y:b5,platform:Windows,
+030000006b140000010d000000000000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000006b140000020d000000000000,Revolution Pro Controller 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000006b140000130d000000000000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001f01000000000000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00004601000000000000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000fefa000000000000,Rock Candy Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e00008701000000000000,Rock Candy Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00001e01000000000000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00002801000000000000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00002f01000000000000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000050b0000e318000000000000,ROG Chakram,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b0000e518000000000000,ROG Chakram,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b00005819000000000000,ROG Chakram Core,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b0000181a000000000000,ROG Chakram X,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b00001a1a000000000000,ROG Chakram X,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+03000000050b00001c1a000000000000,ROG Chakram X,a:b1,b:b0,leftx:a0,lefty:a1,x:b2,y:b3,platform:Windows,
+030000004f04000001d0000000000000,Rumble Force,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000000d0f0000ad00000000000000,RX Gamepad,a:b0,b:b4,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b6,start:b9,x:b2,y:b1,platform:Windows,
+030000008916000000fe000000000000,Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000045d000000000000,Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000a30600001af5000000000000,Saitek Cyborg,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000a306000023f6000000000000,Saitek Cyborg V.1 Game,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001201000000000000,Saitek Dual Analog,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000a30600000701000000000000,Saitek P220,a:b2,b:b3,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,x:b0,y:b1,platform:Windows,
+03000000a30600000cff000000000000,Saitek P2500 Force Rumble,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b0,y:b1,platform:Windows,
+03000000a30600000d5f000000000000,Saitek P2600,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
+03000000a30600000dff000000000000,Saitek P2600,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b8,x:b0,y:b3,platform:Windows,
+03000000a30600000c04000000000000,Saitek P2900,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000a306000018f5000000000000,Saitek P3200,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001001000000000000,Saitek P480 Rumble,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000a30600000901000000000000,Saitek P880,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b8,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b5,rightx:a3,righty:a2,x:b0,y:b1,platform:Windows,
+03000000a30600000b04000000000000,Saitek P990,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
+03000000a30600002106000000000000,Saitek PS1000 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000a306000020f6000000000000,Saitek PS2700 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Windows,
+03000000300f00001101000000000000,Saitek Rumble,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000e804000000a0000000000000,Samsung EIGP20,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c01100000252000000000000,Sanwa Easy Grip,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000c01100004350000000000000,Sanwa Micro Grip P3,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,x:b3,y:b2,platform:Windows,
+03000000411200004550000000000000,Sanwa Micro Grip Pro,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a1,righty:a2,start:b9,x:b1,y:b3,platform:Windows,
+03000000c01100004150000000000000,Sanwa Micro Grip Pro,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+03000000c01100004450000000000000,Sanwa Online Grip,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b11,righttrigger:b9,rightx:a3,righty:a2,start:b14,x:b3,y:b4,platform:Windows,
+03000000730700000401000000000000,Sanwa PlayOnline Mobile,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Windows,
+03000000830500006120000000000000,Sanwa Smart Grip II,a:b0,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,x:b1,y:b3,platform:Windows,
+03000000c01100000051000000000000,Satechi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+030000004f04000028b3000000000000,Score A,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000952e00002577000000000000,Scuf PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000a30c00002500000000000000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Windows,
+03000000a30c00002400000000000000,Sega Mega Drive Mini 6B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000d804000086e6000000000000,Sega Multi Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+0300000000050000289b000000000000,Sega Saturn Adapter,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b0,y:b3,platform:Windows,
+0300000000f000000800000000000000,Sega Saturn Controller,a:b1,b:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b7,righttrigger:b3,start:b0,x:b5,y:b6,platform:Windows,
+03000000730700000601000000000000,Sega Saturn Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
+03000000b40400000a01000000000000,Sega Saturn Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Windows,
+030000003b07000004a1000000000000,SFX,a:b0,b:b2,back:b7,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b5,start:b8,x:b1,y:b3,platform:Windows,
+03000000f82100001900000000000000,Shogun Bros Chameleon X1,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000120c00001c1e000000000000,SnakeByte 4S PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000140300000918000000000000,SNES Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+0300000081170000960a000000000000,SNES Controller,a:b4,b:b0,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b5,y:b1,platform:Windows,
+03000000811700009d0a000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+030000008b2800000300000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+03000000921200004653000000000000,SNES Controller,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Windows,
+03000000ff000000cb01000000000000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a00000208000000000000,Speedlink 6555,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:-a4,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a3,righty:a2,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a00000908000000000000,Speedlink 6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000380700001722000000000000,Speedlink Competition Pro,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,x:b2,y:b3,platform:Windows,
+030000008f0e00000800000000000000,Speedlink Strike FX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000c01100000591000000000000,Speedlink Torid,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000d11800000094000000000000,Stadia Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b11,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
+03000000de280000fc11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000de280000ff11000000000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000120c0000160e000000000000,Steel Play Metaltech PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000110100001914000000000000,SteelSeries,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftstick:b13,lefttrigger:b6,leftx:a0,lefty:a1,rightstick:b14,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000381000001214000000000000,SteelSeries Free,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
+03000000110100003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000381000003014000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000381000003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000381000001814000000000000,SteelSeries Stratus XL,a:b0,b:b1,back:b18,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b19,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b2,y:b3,platform:Windows,
+03000000790000001c18000000000000,STK 7024X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000380700003847000000000000,Street Fighter Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,start:b7,x:b2,y:b3,platform:Windows,
+030000001f08000001e4000000000000,Super Famicom Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000000418000000000000,Super Famicom Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b33,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000341200001300000000000000,Super Racer,a:b2,b:b3,back:b8,leftshoulder:b5,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b7,x:b0,y:b1,platform:Windows,
+03000000457500002211000000000000,Szmy Power PC Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000004f0400000ab1000000000000,T16000M,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b10,x:b2,y:b3,platform:Windows,
+030000000d0f00007b00000000000000,TAC GEAR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000e40a00000307000000000000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Windows,
+03000000e40a00000207000000000000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b9,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Windows,
+03000000d814000001a0000000000000,TE Kitty,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000fa1900000706000000000000,Team 5,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000b50700001203000000000000,Techmobility X6-38V,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000ba2200000701000000000000,Technology Innovation PS2 Adapter,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b2,platform:Windows,
+03000000c61100001000000000000000,Tencent Xianyou Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,x:b3,y:b4,platform:Windows,
+03000000790000002601000000000000,TGZ,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000591c00002400000000000000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000591c00002600000000000000,THEGamepad,a:b2,b:b1,back:b6,leftx:a0,lefty:a1,start:b7,x:b3,y:b0,platform:Windows,
+030000004f04000015b3000000000000,Thrustmaster Dual Analog 4,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000004f04000023b3000000000000,Thrustmaster Dual Trigger PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f0400000ed0000000000000,ThrustMaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000008d0000000000000,ThrustMaster Ferrari 150 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Windows,
+030000004f04000004b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Windows,
+030000004f04000003d0000000000000,ThrustMaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:a3,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:a4,rightstick:b11,righttrigger:b5,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000004f04000009d0000000000000,ThrustMaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+030000006d04000088ca000000000000,Thunderpad,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000666600000288000000000000,TigerGame PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+03000000666600000488000000000000,TigerGame PlayStation Adapter,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000004f04000007d0000000000000,TMini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000571d00002100000000000000,Tomee NES Controller Adapter,a:b1,b:b0,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,start:b3,platform:Windows,
+03000000571d00002000000000000000,Tomee SNES Controller Adapter,a:b0,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000d62000006000000000000000,Tournament PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000c01100000055000000000000,Tronsmart,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000005f140000c501000000000000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000b80500000210000000000000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000004f04000087b6000000000000,TWCS Throttle,dpdown:b8,dpleft:b9,dpright:b7,dpup:b6,leftstick:b5,lefttrigger:-a5,leftx:a0,lefty:a1,righttrigger:+a5,platform:Windows,
+03000000411200000450000000000000,Twin Shock,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Windows,
+03000000d90400000200000000000000,TwinShock PS2 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000151900005678000000000000,Uniplay U6,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000101c0000171c000000000000,uRage Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+030000000b0400003065000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000242f00006e00000000000000,USB Controller,a:b1,b:b4,back:b10,leftshoulder:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b7,rightx:a2,righty:a5,start:b11,x:b0,y:b3,platform:Windows,
+03000000300f00000701000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000341a00002308000000000000,USB Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000666600000188000000000000,USB Controller,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000006b1400000203000000000000,USB Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000790000000a00000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b3,y:b0,platform:Windows,
+03000000b404000081c6000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b3,y:b0,platform:Windows,
+03000000b50700001503000000000000,USB Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b0,y:b1,platform:Windows,
+03000000bd12000012d0000000000000,USB Controller,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Windows,
+03000000ff1100004133000000000000,USB Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000632500002305000000000000,USB Vibration Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
+03000000790000001a18000000000000,Venom,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
+03000000790000001b18000000000000,Venom Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00000302000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+030000006f0e00000702000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
+0300000034120000adbe000000000000,vJoy Device,a:b0,b:b1,back:b15,dpdown:b6,dpleft:b7,dpright:b8,dpup:b5,guide:b16,leftshoulder:b9,leftstick:b13,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b14,righttrigger:b12,rightx:a3,righty:a4,start:b4,x:b2,y:b3,platform:Windows,
+03000000120c0000ab57000000000000,Warrior Joypad JS083,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+030000007e0500003003000000000000,Wii U Pro,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,leftshoulder:b6,leftstick:b11,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b12,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
+0300000032150000030a000000000000,Wildcat,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+0300000032150000140a000000000000,Wolverine,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000002e160000efbe000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,rightshoulder:b5,righttrigger:b11,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700001647000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700002045000000000000,Xbox 360 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+03000000380700002644000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a2,righty:a5,start:b8,x:b2,y:b3,platform:Windows,
+03000000380700002647000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000003807000026b7000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700003647000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a7,righty:a5,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400001907000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400008e02000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400009102000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000000fd000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000001fd000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b000016f0000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000ad1b00008e02000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c62400000053000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c6240000fdfa000000000000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700002847000000000000,Xbox 360 Fightpad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000a102000000000000,Xbox 360 Wireless Receiver,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400000a0b000000000000,Xbox Adaptive Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000120c00000a88000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000120c00001088000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2~,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5~,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000002a0600002000000000000000,Xbox Controller,a:b0,b:b1,back:b13,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b5,leftstick:b14,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b15,righttrigger:b7,rightx:a2,righty:a5,start:b12,x:b2,y:b3,platform:Windows,
+03000000300f00008888000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:b13,dpleft:b10,dpright:b11,dpup:b12,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000380700001645000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000380700002645000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000380700003645000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+03000000380700008645000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400000202000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000005e0400008502000000000000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400008702000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000005e0400008902000000000000,Xbox Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b10,leftstick:b8,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b9,righttrigger:b4,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
+030000000d0f00006300000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b9,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e0400000c0b000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000fd02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000ff02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:-a2,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e0000a802000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000006f0e0000c802000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000c62400003a54000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000005e040000130b000000000000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+03000000341a00000608000000000000,Xeox,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+03000000450c00002043000000000000,Xeox SL6556BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
+030000006f0e00000300000000000000,XGear,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Windows,
+03000000e0ff00000201000000000000,Xiaomi Black Shark (L),back:b0,dpdown:b11,dpleft:b9,dpright:b10,dpup:b8,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,platform:Windows,
+03000000172700004431000000000000,Xiaomi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a7,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
+03000000172700003350000000000000,Xiaomi XMGP01YM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000bc2000005060000000000000,Xiaomi XMGP01YM,+lefty:+a2,+righty:+a5,-lefty:-a1,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
+xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
+030000007d0400000340000000000000,Xterminator Digital Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:-a4,lefttrigger:+a4,leftx:a0,lefty:a1,paddle1:b7,paddle2:b6,rightshoulder:b5,rightstick:b9,righttrigger:b2,rightx:a3,righty:a5,start:b8,x:b3,y:b4,platform:Windows,
+030000002c3600000100000000000000,Yawman Arrow,+rightx:h0.2,+righty:h0.4,-rightx:h0.8,-righty:h0.1,a:b4,b:b5,back:b6,dpdown:b15,dpleft:b14,dpright:b16,dpup:b13,leftshoulder:b10,leftstick:b0,lefttrigger:-a4,leftx:a0,lefty:a1,paddle1:b11,paddle2:b12,rightshoulder:b8,rightstick:b9,righttrigger:+a4,start:b3,x:b1,y:b2,platform:Windows,
+03000000790000004f18000000000000,ZDT Android Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000120c00000500000000000000,Zeroplus Adapter,a:b2,b:b1,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b0,righttrigger:b5,rightx:a3,righty:a2,start:b8,x:b3,y:b0,platform:Windows,
+03000000120c0000101e000000000000,Zeroplus P4 Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
+
+# Mac OS X
+030000008f0e00000300000009010000,2 In 1 Joystick,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000c82d00000031000001000000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000531000000020000,8BitDo Adapter 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00000090000001000000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001251000000020000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001151000000020000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000a30c00002400000006020000,8BitDo M30,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,guide:b9,leftshoulder:b6,lefttrigger:b5,rightshoulder:b4,righttrigger:b7,start:b8,x:b3,y:b0,platform:Mac OS X,
+03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000650000001000000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00005106000000010000,8BitDo M30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b2,leftshoulder:b6,lefttrigger:a5,rightshoulder:b7,righttrigger:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00002090000000010000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00001590000001000000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00006928000000010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Mac OS X,
+03000000c82d00002590000000010000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00002590000001000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00002690000000010000,8BitDo NEOGEO,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b10,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000003512000012ab000001000000,8BitDo NES30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d000012ab000001000000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00002028000000010000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000022000000090000001000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000203800000900000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000190000001000000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000660000000020000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000131000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000231000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000331000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000431000001000000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00003028000000010000,8Bitdo SFC30 Gamepad,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000102800000900000000000000,8BitDo SFC30 Joystick,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000351000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001290000001000000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00004028000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000160000001000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000161000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000260000001000000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001530000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001630000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001730000001000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001130000000020000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b24,paddle2:b25,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001330000001000000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001330000000020000,8BitDo Ultimate Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000a00500003232000008010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000a00500003232000009010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c82d00001890000001000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000c82d00003032000000010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a31,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000491900001904000001010000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000710100001904000000010000,Amazon Luna Controller,a:b0,b:b1,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Mac OS X,
+0300000008100000e501000019040000,Anbernic Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b4,y:b3,platform:Mac OS X,
+03000000a30c00002700000003030000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000a30c00002800000003030000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a3,lefty:a4,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000050b00000045000031000000,ASUS Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000050b00000579000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b42,paddle1:b9,paddle2:b11,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
+03000000050b00000679000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b23,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
+03000000503200000110000047010000,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b3,start:b2,platform:Mac OS X,
+03000000503200000210000047010000,Atari VCS Modern Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000102000000010000,Backbone One,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000201000000010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000008a3500000202000000010000,Backbone One,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+030000008a3500000402000000010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000008a3500000302000000010000,Backbone One PlayStationÆ Edition,a:b0,b:b1,back:b16,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b17,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b15,x:b2,y:b3,platform:Mac OS X,
+03000000c62400001a89000000010000,BDA MOGA XP5-X Plus,a:b0,b:b1,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b14,leftshoulder:b6,leftstick:b15,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b16,righttrigger:a4,rightx:a2,righty:a3,start:b13,x:b3,y:b4,platform:Mac OS X,
+03000000c62400001b89000000010000,BDA MOGA XP5-X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000d62000002a79000000010000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000120c0000200e000000010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000120c0000210e000000010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008305000031b0000000000000,Cideko AK08b,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d8140000cecf000000000000,Cthulhu,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000260900008888000088020000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000a306000022f6000001030000,Cyborg V3 Rumble Pad PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000791d00000103000009010000,Dual Box Wii Classic Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000006e0500000720000010020000,Elecom JC-W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Mac OS X,
+030000006f0e00008401000003010000,Faceoff Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b13,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000151900004000000001000000,Flydigi Vader 2,a:b14,b:b15,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Mac OS X,
+03000000b40400001124000001040000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000b40400001224000003030000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000790000004618000000010000,GameCube Controller Adapter,a:b4,b:b0,dpdown:b56,dpleft:b60,dpright:b52,dpup:b48,lefttrigger:a12,leftx:a0,lefty:a4,rightshoulder:b28,righttrigger:a16,rightx:a20,righty:a8,start:b36,x:b8,y:b12,platform:Mac OS X,
+03000000ac0500001a06000002020000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000ad1b000001f9000000000000,Gamestop BB070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000c01100000140000000010000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006f0e00000102000000000000,GameStop Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000ff1100003133000007010000,GameWare PC Control Pad,a:b2,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Mac OS X,
+030000007d0400000540000001010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000280400000140000000020000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008f0e00000300000007010000,GreenAsia Joystick,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Mac OS X,
+030000000d0f00002d00000000100000,Hori Fighting Commander 3 Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005f00000000000000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005f00000000010000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005e00000000000000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00005e00000000010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008400000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008500000000010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000341a00000302000014010000,Hori Fighting Stick Mini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008800000000010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00008700000000010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00004d00000000000000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00003801000008010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Mac OS X,
+030000000d0f00009200000000010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f0000aa00000072050000,Hori Real Arcade Pro for Nintendo Switch,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000000d0f00000002000017010000,Hori Split Pad Fit,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00000002000015010000,Hori Switch Split Pad Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00006e00000000010000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00006600000000010000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f00006600000000000000,Horipad FPS Plus 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f0000ee00000000010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000000d0f0000c100000072050000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000242e0000ff0b000000010000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Mac OS X,
+03000000790000004e95000000010000,Hyperkin N64 Controller Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a5,righty:a2,start:b9,platform:Mac OS X,
+03000000830500006020000000000000,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Mac OS X,
+03000000ef0500000300000000020000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Mac OS X,
+03000000fd0500000030000010010000,Interact GoPad,a:b3,b:b4,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Mac OS X,
+030000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000242f00002d00000007010000,JYS Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000006d04000019c2000000000000,Logitech Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000016c2000000020000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000016c2000000030000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000016c2000014040000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000016c2000000000000,Logitech F310,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000018c2000000000000,Logitech F510,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d04000019c2000005030000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006d0400001fc2000000000000,Logitech F710,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000006d04000018c2000000010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3~,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700005032000000010000,Mad Catz PS3 Fightpad Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700008433000000010000,Mad Catz PS3 Fightstick TE S Plus,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700005082000000010000,Mad Catz PS4 Fightpad Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000380700008483000000010000,Mad Catz PS4 Fightstick TE S Plus,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000790000000600000007010000,Marvo GT-004,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000008f0e00001330000011010000,Mayflash Controller Adapter,a:b2,b:b4,back:b16,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b12,lefttrigger:b16,leftx:a0,lefty:a2,rightshoulder:b14,rightx:a6~,righty:a4,start:b18,x:b0,y:b6,platform:Mac OS X,
+03000000790000004318000000010000,Mayflash GameCube Adapter,a:b4,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a12,leftx:a0,lefty:a4,rightshoulder:b28,righttrigger:a16,rightx:a20,righty:a8,start:b36,x:b8,y:b12,platform:Mac OS X,
+03000000790000004418000000010000,Mayflash GameCube Controller,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000242f00007300000000020000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Mac OS X,
+0300000079000000d218000026010000,Mayflash Magic NS,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000d620000010a7000003010000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008f0e00001030000011010000,Mayflash Saturn Adapter,a:b0,b:b2,dpdown:b28,dpleft:b30,dpright:b26,dpup:b24,leftshoulder:b10,lefttrigger:b14,rightshoulder:b12,righttrigger:b4,start:b18,x:b6,y:b8,platform:Mac OS X,
+0300000025090000e803000000000000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:b13,dpleft:b12,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Mac OS X,
+03000000790000000318000000010000,Mayflash Wii DolphinBar,a:b8,b:b12,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b44,leftshoulder:b16,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b4,platform:Mac OS X,
+03000000790000000018000000000000,Mayflash Wii U Pro Adapter,a:b4,b:b8,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b16,leftstick:b40,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,rightstick:b44,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b12,platform:Mac OS X,
+03000000790000000018000000010000,Mayflash Wii U Pro Adapter,a:b4,b:b8,back:b32,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b16,leftstick:b40,lefttrigger:b24,leftx:a0,lefty:a4,rightshoulder:b20,rightstick:b44,righttrigger:b28,rightx:a8,righty:a12,start:b36,x:b0,y:b12,platform:Mac OS X,
+030000005e0400002800000002010000,Microsoft Dual Strike,a:b3,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,rightx:a0,righty:a1~,start:b5,x:b1,y:b0,platform:Mac OS X,
+030000005e0400000300000006010000,Microsoft SideWinder,a:b0,b:b1,back:b9,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Mac OS X,
+030000005e0400000700000006010000,Microsoft SideWinder,a:b0,b:b1,back:b8,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Mac OS X,
+030000005e0400002700000001010000,Microsoft SideWinder Plug and Play,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b4,righttrigger:b5,x:b2,y:b3,platform:Mac OS X,
+030000004523000015e0000072050000,Mobapad Chitu HD,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000d62000007162000001000000,Moga Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Mac OS X,
+03000000c62400002a89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c62400002b89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000632500007505000000020000,NeoGeo mini PAD Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000921200004b46000003020000,NES 2-port Adapter,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b11,platform:Mac OS X,
+030000001008000001e5000006010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000007e0500000920000000000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+030000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+030000007e0500000920000010020000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:Mac OS X,
+050000007e05000009200000ff070000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:Mac OS X,
+030000007e0500001920000001000000,NSO N64 Controller,+rightx:b8,+righty:b7,-rightx:b3,-righty:b2,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Mac OS X,
+030000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b15,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000550900001472000025050000,NVIDIA Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Mac OS X,
+030000004b120000014d000000010000,Nyko Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Mac OS X,
+030000006f0e00000901000002010000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000008f0e00000300000000000000,Piranha Xtreme PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000666600006706000088020000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Mac OS X,
+030000004c050000da0c000000010000,PlayStation Classic Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000004c0500003713000000010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d620000011a7000000020000,PowerA Core Plus Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000d620000011a7000010050000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d62000006dca000000010000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000100800000300000006010000,PS2 Adapter,a:b2,b:b1,back:b8,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a4,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+030000004c0500006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
+030000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
+030000004c0500006802000072050000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Mac OS X,
+030000004c050000a00b000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c050000c405000000000000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+0300004b4c0500005f0e000000010000,PS5 Access Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+050000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+050000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Mac OS X,
+030000005e040000e002000001000000,PXN P30 Pro Mobile,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000222c00000225000000010000,Qanba Dragon Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000222c00000020000000010000,Qanba Drone Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000009b2800005600000020020000,Raphnet SNES Adapter,a:b1,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Mac OS X,
+030000009b2800008000000022020000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b10,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a3,righty:a4,start:b3,x:b0,y:b5,platform:Mac OS X,
+030000008916000000fd000000000000,Razer Onza TE,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000321500000204000000010000,Razer Panthera PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000104000000010000,Razer Panthera PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000010000000010000,Razer Raiju,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000507000001010000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000321500000011000000010000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000321500000009000000020000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
+0300000032150000030a000000000000,Razer Wildcat,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000632500008005000000010000,Redgear,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000921200004547000000020000,Retro Bit Sega Genesis Controller Adapter,a:b0,b:b2,dpdown:+a2,dpleft:-a0,dpright:+a0,dpup:-a2,lefttrigger:b14,rightshoulder:b10,righttrigger:b4,start:b12,x:b6,y:b8,platform:Mac OS X,
+03000000790000001100000000000000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000790000001100000005010000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000830500006020000000010000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Mac OS X,
+0300000003040000c197000000000000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Mac OS X,
+03000000790000001100000006010000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000341200000400000000000000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Mac OS X,
+030000006b140000010d000000010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006b140000130d000000010000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c0500006802000002100000,Rii RK707,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b2,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b3,righttrigger:b9,rightx:a2,righty:a3,start:b1,x:b15,y:b12,platform:Mac OS X,
+030000006f0e00008701000005010000,Rock Candy Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000c6240000fefa000000000000,Rock Candy PS3,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000e804000000a000001b010000,Samsung EIGP20,a:b1,b:b3,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b11,leftx:a1,lefty:a3,rightshoulder:b12,rightx:a4,righty:a5,start:b16,x:b7,y:b9,platform:Mac OS X,
+03000000730700000401000000010000,Sanwa PlayOnline Mobile,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Mac OS X,
+03000000a30c00002500000006020000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Mac OS X,
+03000000811700007e05000000000000,Sega Saturn,a:b2,b:b4,dpdown:b16,dpleft:b15,dpright:b14,dpup:b17,leftshoulder:b8,lefttrigger:a5,leftx:a0,lefty:a2,rightshoulder:b9,righttrigger:a4,start:b13,x:b0,y:b6,platform:Mac OS X,
+03000000b40400000a01000000000000,Sega Saturn,a:b0,b:b1,back:b5,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b2,leftshoulder:b6,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Mac OS X,
+030000003512000021ab000000000000,SFC30 Joystick,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
+0300000000f00000f100000000000000,SNES RetroPort,a:b2,b:b3,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b5,rightshoulder:b7,start:b6,x:b0,y:b1,platform:Mac OS X,
+030000004c050000a00b000000000000,Sony DualShock 4 Adapter,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004c050000cc09000000000000,Sony DualShock 4 V2,a:b1,b:b2,back:b13,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000d11800000094000000010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005e0400008e02000001000000,Steam Virtual Gamepad,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000110100002014000000000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
+03000000110100002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
+03000000381000002014000001000000,SteelSeries Nimbus,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,x:b2,y:b3,platform:Mac OS X,
+05000000484944204465766963650000,SteelSeries Nimbus Plus,a:b0,b:b1,back:b15,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b16,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b14,x:b2,y:b3,platform:Mac OS X,
+050000004e696d6275732b0000000000,SteelSeries Nimbus Plus,a:b0,b:b1,back:b15,dpdown:b11,dpleft:b13,dpright:b12,dpup:b10,guide:b16,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3~,start:b14,x:b2,y:b3,platform:Mac OS X,
+03000000381000003014000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000381000003114000000000000,SteelSeries Stratus Duo,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000110100001714000000000000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,start:b12,x:b2,y:b3,platform:Mac OS X,
+03000000110100001714000020010000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:b9,dpleft:b11,dpright:b10,dpup:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1~,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3~,start:b12,x:b2,y:b3,platform:Mac OS X,
+030000000d0f0000f600000000010000,Switch Hori Pad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
+03000000457500002211000000010000,SZMY Power PC Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000e40a00000307000001000000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Mac OS X,
+03000000e40a00000207000001000000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Mac OS X,
+03000000790000001c18000003100000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000591c00002400000021000000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Mac OS X,
+03000000591c00002600000021000000,THEGamepad,a:b2,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Mac OS X,
+030000004f04000015b3000000000000,Thrustmaster Dual Analog 3.2,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Mac OS X,
+030000004f0400000ed0000000020000,ThrustMaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000004f04000000b3000000000000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Mac OS X,
+03000000571d00002100000021000000,Tomee NES Controller Adapter,a:b1,b:b0,back:b2,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,start:b3,platform:Mac OS X,
+03000000bd12000015d0000000010000,Tomee Retro Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000bd12000015d0000000000000,Tomee SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000571d00002000000021000000,Tomee SNES Controller Adapter,a:b0,b:b1,back:b6,dpdown:+a4,dpleft:-a0,dpright:+a0,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005f140000c501000000020000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
+03000000100800000100000000000000,Twin USB Joystick,a:b4,b:b2,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b12,leftstick:b20,lefttrigger:b8,leftx:a0,lefty:a2,rightshoulder:b14,rightstick:b22,righttrigger:b10,rightx:a6,righty:a4,start:b18,x:b6,y:b0,platform:Mac OS X,
+03000000632500002605000000010000,Uberwith Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000151900005678000010010000,Uniplay U6,a:b3,b:b6,back:b25,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,leftstick:b31,lefttrigger:b21,leftx:a1,lefty:a3,rightshoulder:b19,rightstick:b33,righttrigger:b23,rightx:a4,righty:a5,start:b27,x:b11,y:b13,platform:Mac OS X,
+030000006f0e00000302000025040000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+030000006f0e00000702000003060000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
+050000005769696d6f74652028303000,Wii Remote,a:b4,b:b5,back:b7,dpdown:b3,dpleft:b0,dpright:b1,dpup:b2,guide:b8,leftshoulder:b11,lefttrigger:b12,leftx:a0,lefty:a1,start:b6,x:b10,y:b9,platform:Mac OS X,
+050000005769696d6f74652028313800,Wii U Pro Controller,a:b16,b:b15,back:b7,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b8,leftshoulder:b19,leftstick:b23,lefttrigger:b21,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b24,righttrigger:b22,rightx:a2,righty:a3,start:b6,x:b18,y:b17,platform:Mac OS X,
+030000005e0400008e02000000000000,Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000006f0e00000104000000000000,Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+03000000c6240000045d000000000000,Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e0400000a0b000000000000,Xbox Adaptive Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000050b000003090000,Xbox Elite Controller Series 2,a:b0,b:b1,back:b31,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b53,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000200b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000200b000013050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000200b000015050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
+030000005e040000e002000003090000,Xbox One Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000fd02000003090000,Xbox One Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000c62400003a54000000000000,Xbox One PowerA Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
+030000005e040000130b000001050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000009050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000013050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000015050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000130b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+030000005e040000220b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Mac OS X,
+03000000120c0000100e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+03000000120c0000101e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
+
+# Linux
+03000000c82d00000031000011010000,8BitDo Adapter,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000951000000010000,8BitDo Dogbone,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
+03000000021000000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000090000011010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001038000000010000,8BitDo FC30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001251000011010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001251000000010000,8BitDo Lite 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001151000011010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001151000000010000,8BitDo Lite SE,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000151000000010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000650000011010000,8BitDo M30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00005106000000010000,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00002090000011010000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00002090000000010000,8BitDo Micro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000451000000010000,8BitDo N30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b11,platform:Linux,
+03000000c82d00001590000011010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00006528000000010000,8BitDo N30 Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00006928000000010000,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,platform:Linux,
+05000000c82d00002590000001000000,8BitDo NEOGEO,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000008000000210000011010000,8BitDo NES30,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000c82d00000310000011010000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b9,righttrigger:b8,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00008010000000010000,8BitDo NES30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b9,righttrigger:b8,start:b11,x:b3,y:b4,platform:Linux,
+03000000022000000090000011010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000190000011010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000203800000900000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00002038000000010000,8BitDo NES30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000660000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001030000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000020000000000000,8BitDo Pro 2 for Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+06000000c82d00000020000006010000,8BitDo Pro 2 for Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000131000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000231000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000331000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000431000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00002867000000010000,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b8,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b3,y:b4,platform:Linux,
+05000000c82d00000060000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000061000000010000,8BitDo SF30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+030000003512000012ab000010010000,8BitDo SFC30,a:b2,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
+030000003512000021ab000010010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d000021ab000010010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000102800000900000000010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00003028000000010000,8BitDo SFC30,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000351000000010000,8BitDo SN30,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000160000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000160000011010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000161000000000000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001290000011010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000161000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00006228000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00000260000011010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+05000000202800000900000000010000,8BitDo SNES30,a:b1,b:b0,back:b10,dpdown:b122,dpleft:b119,dpright:b120,dpup:b117,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+05000000c82d00001230000000010000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001530000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001630000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001730000011010000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001130000011010000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b24,paddle2:b25,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000631000010010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000760000011010000,8BitDo Ultimate Wireless,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c82d00001230000011010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001330000011010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00000631000014010000,8BitDo Ultimate Wireless Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c82d00000121000011010000,8BitDo Xbox One SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c82d00000121000000010000,8BitDo Xbox One SN30 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000a00500003232000001000000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
+05000000a00500003232000008010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
+03000000c82d00001890000011010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
+050000005e040000e002000030110000,8BitDo Zero 2,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+05000000c82d00003032000000010000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
+03000000c01100000355000011010000,Acrux Gamepad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00008801000011010000,Afterglow Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00003901000000430000,Afterglow Prismatic Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00003901000013020000,Afterglow Prismatic Controller 048-007-NA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00001302000000010000,Afterglow Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00003901000020060000,Afterglow Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000100000008200000011010000,Akishop Customs PS360,a:b1,b:b2,back:b12,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000007c1800000006000010010000,Alienware Dual Compatible Game PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+05000000491900000204000021000000,Amazon Fire Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b17,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000491900001904000011010000,Amazon Luna Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b9,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+05000000710100001904000000010000,Amazon Luna Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+0300000008100000e501000001010000,Anbernic Gamepad,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a4,start:b11,x:b3,y:b4,platform:Linux,
+03000000790000003018000011010000,Arcade Fightstick F300,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000a30c00002700000011010000,Astro City Mini,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000a30c00002800000011010000,Astro City Mini,a:b2,b:b1,back:b8,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+05000000050b00000045000031000000,ASUS Gamepad,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b10,x:b2,y:b3,platform:Linux,
+05000000050b00000045000040000000,ASUS Gamepad,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b10,x:b2,y:b3,platform:Linux,
+03000000050b00000579000011010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b36,paddle1:b52,paddle2:b53,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000050b00000679000000010000,ASUS ROG Kunai 3,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b21,paddle1:b22,paddle2:b23,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+03000000503200000110000011010000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+05000000503200000110000000000000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+05000000503200000110000044010000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+05000000503200000110000046010000,Atari VCS Classic Controller,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b4,start:b3,platform:Linux,
+03000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Linux,
+03000000503200000210000011010000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000000000000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000045010000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000046010000,Atari VCS Modern Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+05000000503200000210000047010000,Atari VCS Modern Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:-a4,rightx:a2,righty:a3,start:b8,x:b2,y:b3,platform:Linux,
+030000008a3500000201000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008a3500000202000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008a3500000302000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008a3500000402000011010000,Backbone One,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000c62400001b89000011010000,BDA MOGA XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000d62000002a79000011010000,BDA PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000c21100000791000011010000,Be1 GC101 Controller 1.03,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000c31100000791000011010000,Be1 GC101 Controller 1.03,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000005e0400008e02000003030000,Be1 GC101 Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000bc2000004d50000011010000,Beitong A1T2 BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000bc2000000055000001000000,Betop AX1 BFM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000bc2000006412000011010000,Betop Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b30,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000006b1400000209000011010000,Bigben,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000200e000011010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000210e000011010000,Brook Mars PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000f70e000011010000,Brook Universal Fighting Board,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000e82000006058000001010000,Cideko AK08b,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000af1e00002400000010010000,Clockwork Pi DevTerm,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b9,x:b3,y:b0,platform:Linux,
+030000000b0400003365000000010000,Competition Pro,a:b0,b:b1,back:b2,leftx:a0,lefty:a1,start:b3,platform:Linux,
+03000000260900008888000000010000,Cyber Gadget GameCube Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a2,righty:a3~,start:b7,x:b2,y:b3,platform:Linux,
+03000000a306000022f6000011010000,Cyborg V3 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:-a3,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000791d00000103000010010000,Dual Box Wii Classic Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000006f0e00003001000001010000,EA Sports PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c11100000191000011010000,EasySMX,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000242f00009100000000010000,EasySMX ESM-9101,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006e0500000320000010010000,Elecom U3613M,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Linux,
+030000006e0500000720000010010000,Elecom W01U,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Linux,
+030000007d0400000640000010010000,Eliminator AfterShock,a:b1,b:b2,back:b9,dpdown:+a3,dpleft:-a5,dpright:+a5,dpup:-a3,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a4,righty:a2,start:b8,x:b0,y:b3,platform:Linux,
+03000000430b00000300000000010000,EMS Production PS2 Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a5,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000006f0e00008401000011010000,Faceoff Deluxe Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00008101000011010000,Faceoff Deluxe Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00008001000011010000,Faceoff Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03005036852100000201000010010000,Final Fantasy XIV Online Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000b40400001124000011010000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000b40400001224000011010000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b2,paddle1:b16,paddle2:b17,paddle3:b14,paddle4:b15,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000151900004000000001000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b12,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b14,paddle1:b2,paddle2:b5,paddle3:b16,paddle4:b17,rightshoulder:b7,rightstick:b13,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000007e0500003703000000000000,GameCube Adapter,a:b0,b:b1,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b2,platform:Linux,
+19000000030000000300000002030000,GameForce Controller,a:b1,b:b0,back:b8,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,guide:b16,leftshoulder:b4,leftstick:b14,lefttrigger:b6,leftx:a1,lefty:a0,rightshoulder:b5,rightstick:b15,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000ac0500005b05000010010000,GameSir G3w,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000bc2000000055000011010000,GameSir G3w,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000558500001b06000010010000,GameSir G4 Pro,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000ac0500002d0200001b010000,GameSir G4s,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b33,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000ac0500007a05000011010000,GameSir G5,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b16,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000bc2000005656000011010000,GameSir T4w,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000ac0500001a06000011010000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000006f0e00000104000000010000,Gamestop Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000008f0e00000800000010010000,Gasia PlayStation Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000451300000010000010010000,Genius Maxfire Grandias 12,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+190000004b4800000010000000010000,GO-Advance Controller,a:b1,b:b0,back:b10,dpdown:b7,dpleft:b8,dpright:b9,dpup:b6,leftshoulder:b4,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b13,start:b15,x:b2,y:b3,platform:Linux,
+190000004b4800000010000001010000,GO-Advance Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b4,leftstick:b13,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b16,righttrigger:b15,start:b17,x:b2,y:b3,platform:Linux,
+190000004b4800000011000000010000,GO-Super Controller,a:b1,b:b0,back:b12,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b16,leftshoulder:b4,leftstick:b14,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b15,righttrigger:b7,rightx:a2,righty:a3,start:b13,x:b2,y:b3,platform:Linux,
+03000000f0250000c183000010010000,Goodbetterbest Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+0300000079000000d418000000010000,GPD Win 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000001010000,GPD Win Max 2 (6800U) Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000007d0400000540000000010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000280400000140000000010000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000008f0e00000610000000010000,GreenAsia Electronics Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a3,righty:a2,start:b11,x:b3,y:b0,platform:Linux,
+030000008f0e00001200000010010000,GreenAsia Joystick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+0500000047532067616d657061640000,GS gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000f0250000c383000010010000,GT VX2,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+06000000adde0000efbe000002010000,Hidromancer Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d81400000862000011010000,HitBox PS3 PC Analog Mode,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b9,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b12,x:b0,y:b3,platform:Linux,
+03000000c9110000f055000011010000,HJC Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00006d00000020010000,Hori EDGE 301,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:+a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00008400000011010000,Hori Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00005f00000011010000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00005e00000011010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00005001000009040000,Hori Fighting Commander OCTA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00008500000010010000,Hori Fighting Commander PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00008600000002010000,Hori Fighting Commander Xbox 360,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00003701000013010000,Hori Fighting Stick Mini,a:b1,b:b0,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b3,y:b2,platform:Linux,
+030000000d0f00008800000011010000,Hori Fighting Stick mini 4 (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,rightstick:b11,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00008700000011010000,Hori Fighting Stick mini 4 (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,rightstick:b11,righttrigger:a4,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00001000000011010000,Hori Fightstick 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000ad1b000003f5000033050000,Hori Fightstick VX,+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b8,guide:b10,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f00004d00000011010000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000ad1b000001f5000033050000,Hori Pad EX Turbo 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00003801000011010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Linux,
+030000000d0f00009200000011010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00001100000011010000,Hori Real Arcade Pro 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00002200000011010000,Hori Real Arcade Pro 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006a00000011010000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006b00000011010000,Hori Real Arcade Pro 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00001600000000010000,Hori Real Arcade Pro EXSE,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
+030000000d0f0000aa00000011010000,Hori Real Arcade Pro for Nintendo Switch,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000000d0f00008501000017010000,Hori Split Pad Fit,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00008501000015010000,Hori Switch Split Pad Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00006e00000011010000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006600000011010000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f0000ee00000011010000,Horipad Mini 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f0000c100000011010000,Horipad Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000000d0f00006700000001010000,Horipad One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000000d0f0000f600000001000000,Horipad Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000341a000005f7000010010000,HuiJia GameCube Controller Adapter,a:b1,b:b2,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+05000000242e00000b20000001000000,Hyperkin Admiral N64 Controller,+rightx:b11,+righty:b13,-rightx:b8,-righty:b12,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b14,leftx:a0,lefty:a1,rightshoulder:b5,start:b9,platform:Linux,
+03000000242e0000ff0b000011010000,Hyperkin N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,platform:Linux,
+03000000242e00006a38000010010000,Hyperkin Trooper 2,a:b0,b:b1,back:b4,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b3,start:b5,platform:Linux,
+03000000242e00008816000001010000,Hyperkin X91,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000f00300008d03000011010000,HyperX Clutch,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000830500006020000010010000,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
+030000008f0e00001330000001010000,iCode Retro Adapter,b:b3,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b1,start:b7,x:b2,y:b0,platform:Linux,
+050000006964726f69643a636f6e0000,idroidcon Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700001503000010010000,Impact,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000d80400008200000003000000,IMS PCU0,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b5,x:b3,y:b2,platform:Linux,
+03000000120c00000500000010010000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Linux,
+03000000ef0500000300000000010000,InterAct AxisPad,a:b2,b:b3,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b11,x:b0,y:b1,platform:Linux,
+03000000fd0500000030000000010000,InterAct GoPad,a:b3,b:b4,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,x:b0,y:b1,platform:Linux,
+03000000fd0500002a26000000010000,InterAct HammerHead FX,a:b3,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b2,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b5,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b1,platform:Linux,
+0500000049190000020400001b010000,Ipega PG 9069,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b161,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000632500007505000011010000,Ipega PG 9099,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+0500000049190000030400001b010000,Ipega PG9099,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000491900000204000000000000,Ipega PG9118,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000300f00001001000010010000,Jess Tech Dual Analog Rumble,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000300f00000b01000010010000,Jess Tech GGE909 PC Recoil,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+03000000ba2200002010000001010000,Jess Technology Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Linux,
+050000007e0500000620000001000000,Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b13,leftshoulder:b4,leftstick:b10,rightshoulder:b5,start:b8,x:b2,y:b3,platform:Linux,
+030000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500000720000001000000,Joy-Con (R),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b1,back:b12,leftshoulder:b4,leftstick:b11,rightshoulder:b5,start:b9,x:b2,y:b3,platform:Linux,
+03000000bd12000003c0000010010000,Joypad Alpha Shock,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000242f00002d00000011010000,JYS Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000242f00008a00000011010000,JYS Adapter,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Linux,
+030000006f0e00000103000000020000,Logic3 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d040000d1ca000000000000,Logitech Chillstream,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d040000d1ca000011010000,Logitech Chillstream,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d04000019c2000010010000,Logitech Cordless RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d04000016c2000010010000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d04000016c2000011010000,Logitech Dual Action,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d0400001dc2000014400000,Logitech F310,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d0400001ec2000019200000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d0400001ec2000020200000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d04000019c2000011010000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d0400001fc2000005030000,Logitech F710,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d04000018c2000010010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006d04000011c2000010010000,Logitech WingMan Cordless RumblePad,a:b0,b:b1,back:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b10,rightx:a3,righty:a4,start:b8,x:b3,y:b4,platform:Linux,
+030000006d0400000ac2000010010000,Logitech WingMan RumblePad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,rightx:a3,righty:a4,x:b3,y:b4,platform:Linux,
+05000000380700006652000025010000,Mad Catz CTRLR,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008532000010010000,Mad Catz Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700005032000011010000,Mad Catz Fightpad Pro PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700005082000011010000,Mad Catz Fightpad Pro PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000ad1b00002ef0000090040000,Mad Catz Fightpad SFxT,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000380700008034000011010000,Mad Catz Fightstick PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008084000011010000,Mad Catz Fightstick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008433000011010000,Mad Catz Fightstick TE S PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700008483000011010000,Mad Catz Fightstick TE S PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700001888000010010000,Mad Catz Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700003888000010010000,Mad Catz Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:a0,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000380700001647000010040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000380700003847000090040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000ad1b000016f0000090040000,Mad Catz Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000120c00000500000000010000,Manta Dualshock 2,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+030000008f0e00001330000010010000,Mayflash Controller Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Linux,
+03000000790000004318000010010000,Mayflash GameCube Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000790000004418000010010000,Mayflash GameCube Controller,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000242f00007300000011010000,Mayflash Magic NS,a:b1,b:b4,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b0,y:b3,platform:Linux,
+0300000079000000d218000011010000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000010a7000011010000,Mayflash Magic NS,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000242f0000f700000001010000,Mayflash Magic S Pro,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000008f0e00001030000010010000,Mayflash Saturn Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Linux,
+0300000025090000e803000001010000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:a5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+03000000790000000318000011010000,Mayflash Wii DolphinBar,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Linux,
+03000000790000000018000011010000,Mayflash Wii U Pro Adapter,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700001203000010010000,Mega World Logic 3 Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000b50700004f00000000010000,Mega World Logic 3 Controller,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Linux,
+03000000780000000600000010010000,Microntek Joystick,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+030000005e0400002800000000010000,Microsoft Dual Strike,a:b3,b:b2,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,rightx:a0,righty:a1~,start:b5,x:b1,y:b0,platform:Linux,
+030000005e0400000300000000010000,Microsoft SideWinder,a:b0,b:b1,back:b9,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Linux,
+030000005e0400000700000000010000,Microsoft SideWinder,a:b0,b:b1,back:b8,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,start:b9,x:b3,y:b4,platform:Linux,
+030000005e0400000e00000000010000,Microsoft SideWinder Freestyle Pro,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,rightshoulder:b7,start:b8,x:b3,y:b4,platform:Linux,
+030000005e0400002700000000010000,Microsoft SideWinder Plug and Play,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,lefttrigger:b4,righttrigger:b5,x:b2,y:b3,platform:Linux,
+030000005e0400008502000000010000,Microsoft Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+030000005e0400008902000021010000,Microsoft Xbox,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+030000005e0400008e02000001000000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.1,dpleft:h0.2,dpright:h0.8,dpup:h0.4,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000004010000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000056210000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000062230000,Microsoft Xbox 360,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000d102000001010000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000d102000003020000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000dd02000003020000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000ea02000008040000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b000009050000,Microsoft Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000e302000003020000,Microsoft Xbox One Elite,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000000b000007040000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b12,paddle2:b14,paddle3:b13,paddle4:b15,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000000b000008040000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b12,paddle2:b14,paddle3:b13,paddle4:b15,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000050b000003090000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e0400008e02000030110000,Microsoft Xbox One Elite 2,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b13,paddle3:b12,paddle4:b14,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b00000b050000,Microsoft Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000030000000300000002000000,Miroof,a:b1,b:b0,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b2,platform:Linux,
+03000000790000001c18000010010000,Mobapad Chitu HD,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000004d4f435554452d3035335800,Mocute 053X,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+05000000e80400006e0400001b010000,Mocute 053X M59,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000004d4f435554452d3035305800,Mocute 054X,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000d6200000e589000001000000,Moga 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+05000000d6200000ad0d000001000000,Moga Pro,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+05000000d62000007162000001000000,Moga Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Linux,
+03000000c62400002b89000011010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c62400002a89000000010000,MOGA XP5A Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b22,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000c62400001a89000000010000,MOGA XP5X Plus,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000250900006688000000010000,MP8866 Super Dual Box,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
+030000005e0400008e02000010020000,MSI GC20 V2,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00001311000011010000,N64 Controller,+rightx:b10,+righty:b3,-rightx:b0,-righty:b11,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,platform:Linux,
+030000006b1400000906000014010000,Nacon Asymmetric Wireless PS4 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006b140000010c000010010000,Nacon GC 400ES,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000853200000706000012010000,Nacon GC-100,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000000d0f00000900000010010000,Natec Genesis P44,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000004f1f00000800000011010000,NeoGeo PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+0300000092120000474e000000010000,NeoGeo X Arcade Stick,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b3,y:b2,platform:Linux,
+03000000790000004518000010010000,Nexilux GameCube Controller Adapter,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:a4,rightx:a5,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+030000001008000001e5000010010000,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Linux,
+060000007e0500003713000000000000,Nintendo 3DS,a:b0,b:b1,back:b8,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+030000007e0500003703000000016800,Nintendo GameCube Controller,a:b0,b:b2,dpdown:b6,dpleft:b4,dpright:b5,dpup:b7,lefttrigger:a4,leftx:a0,lefty:a1~,rightshoulder:b9,righttrigger:a5,rightx:a2,righty:a3~,start:b8,x:b1,y:b3,platform:Linux,
+03000000790000004618000010010000,Nintendo GameCube Controller Adapter,a:b1,b:b0,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a5~,righty:a2~,start:b9,x:b2,y:b3,platform:Linux,
+060000004e696e74656e646f20537700,Nintendo Switch Combined Joy-Cons,a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+060000007e0500000620000000000000,Nintendo Switch Combined Joy-Cons,a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+060000007e0500000820000000000000,Nintendo Switch Combined Joy-Cons,a:b0,b:b1,back:b9,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000004c69632050726f20436f6e00,Nintendo Switch Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500000620000001800000,Nintendo Switch Left Joy-Con,a:b16,b:b15,back:b4,leftshoulder:b6,leftstick:b12,leftx:a1,lefty:a0~,rightshoulder:b8,start:b9,x:b14,y:b17,platform:Linux,
+030000007e0500000920000000026803,Nintendo Switch Pro Controller,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Linux,
+030000007e0500000920000011810000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500000920000001000000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500000920000001800000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b5,leftstick:b12,lefttrigger:b7,leftx:a0,lefty:a1,misc1:b4,rightshoulder:b6,rightstick:b13,righttrigger:b8,rightx:a2,righty:a3,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500000720000001800000,Nintendo Switch Right Joy-Con,a:b1,b:b2,back:b9,leftshoulder:b4,leftstick:b10,leftx:a1~,lefty:a0,rightshoulder:b6,start:b8,x:b0,y:b3,platform:Linux,
+05000000010000000100000003000000,Nintendo Wii Remote,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000007e0500003003000001000000,Nintendo Wii U Pro Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+030000000d0500000308000010010000,Nostromo n45 Dual Analog,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b12,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b2,y:b3,platform:Linux,
+030000007e0500001920000011810000,NSO N64 Controller,+rightx:b10,+righty:b8,-rightx:b9,-righty:b7,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b3,lefttrigger:b2,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b4,righttrigger:b5,start:b6,platform:Linux,
+050000007e0500001920000001000000,NSO N64 Controller,+rightx:b8,+righty:b7,-rightx:b3,-righty:b2,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Linux,
+050000007e0500001920000001800000,NSO N64 Controller,+rightx:b10,+righty:b8,-rightx:b9,-righty:b7,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b3,lefttrigger:b2,leftx:a0,lefty:a1,misc1:b12,rightshoulder:b4,righttrigger:b5,start:b6,platform:Linux,
+030000007e0500001720000011810000,NSO SNES Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
+050000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b8,start:b10,x:b3,y:b2,platform:Linux,
+050000007e0500001720000001800000,NSO SNES Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
+03000000550900001072000011010000,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b8,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000550900001472000011010000,NVIDIA Controller v01.04,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
+05000000550900001472000001000000,NVIDIA Controller v01.04,a:b0,b:b1,back:b14,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Linux,
+030000004b120000014d000000010000,NYKO Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+03000000451300000830000010010000,NYKO CORE,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+19000000010000000100000001010000,ODROID Go 2,a:b1,b:b0,dpdown:b7,dpleft:b8,dpright:b9,dpup:b6,guide:b10,leftshoulder:b4,leftstick:b12,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b13,righttrigger:b14,start:b15,x:b2,y:b3,platform:Linux,
+19000000010000000200000011000000,ODROID Go 2,a:b1,b:b0,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b12,leftshoulder:b4,leftstick:b14,lefttrigger:b13,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b15,righttrigger:b16,start:b17,x:b2,y:b3,platform:Linux,
+05000000362800000100000002010000,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Linux,
+05000000362800000100000003010000,OUYA Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,platform:Linux,
+05000000362800000100000004010000,OUYA Controller,a:b0,b:b3,back:b14,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,leftshoulder:b4,leftstick:b6,lefttrigger:b12,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:b13,rightx:a3,righty:a4,start:b16,x:b1,y:b2,platform:Linux,
+03000000830500005020000010010000,Padix Rockfire PlayStation Bridge,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b11,x:b2,y:b3,platform:Linux,
+03000000ff1100003133000010010000,PC Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000006f0e0000b802000001010000,PDP Afterglow Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000b802000013020000,PDP Afterglow Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00006401000001010000,PDP Battlefield One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000d702000006640000,PDP Black Camo Wired Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b13,dpup:b14,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00003101000000010000,PDP EA Sports Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00008501000011010000,PDP Fightpad Pro Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000006f0e0000c802000012010000,PDP Kingdom Hearts Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00002801000011010000,PDP PS3 Rock Candy Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00000901000011010000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00002f01000011010000,PDP Wired PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000ad1b000004f9000000010000,PDP Xbox 360 Versus Fighting,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,rightshoulder:b5,righttrigger:a5,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000a802000023020000,PDP Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+030000006f0e0000a702000023020000,PDP Xbox One Raven Black,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000d802000006640000,PDP Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e0000ef02000007640000,PDP Xbox Series Kinetic Wired Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000666600006706000000010000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b9,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b10,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Linux,
+030000004c050000da0c000011010000,PlayStation Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000d9040000160f000000010000,PlayStation Controller Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+030000004c0500003713000011010000,PlayStation Vita,a:b1,b:b2,back:b8,dpdown:b13,dpleft:b15,dpright:b14,dpup:b12,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000c62400000053000000010000,PowerA,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c62400003a54000001010000,PowerA 1428124-01,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d620000011a7000011010000,PowerA Core Plus Gamecube Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+03000000dd62000015a7000011010000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000012a7000011010000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d62000000140000001010000,PowerA Fusion Pro 2 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000dd62000016a7000000000000,PowerA Fusion Pro Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c62400001a53000000010000,PowerA Mini Pro Ex,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d620000013a7000011010000,PowerA Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d62000006dca000011010000,PowerA Pro Ex,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000d620000014a7000011010000,PowerA Spectra Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c62400001a58000001010000,PowerA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000220000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
+03000000d62000000228000001010000,PowerA Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c62400001a54000001010000,PowerA Xbox One Mini Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000240000001010000,PowerA Xbox One Spectra Infinity,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d62000000f20000001010000,PowerA Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b7,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006d040000d2ca000011010000,Precision Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000ff1100004133000010010000,PS2 Controller,a:b2,b:b1,back:b8,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000341a00003608000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000004c0500006802000010010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
+030000004c0500006802000010810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
+030000004c0500006802000011810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000005f1400003102000010010000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000006f0e00001402000011010000,PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000008f0e00000300000010010000,PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+050000004c0500006802000000000000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
+050000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:a12,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:a13,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
+050000004c0500006802000000800000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c0500006802000000810000,PS3 Controller,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+05000000504c415953544154494f4e00,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
+060000004c0500006802000000010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,platform:Linux,
+030000004c050000a00b000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000a00b000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000004c050000c405000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000c405000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000cc09000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004c050000cc09000011810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+03000000c01100000140000011010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+050000004c050000c405000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+050000004c050000c405000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c050000c405000001800000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c050000cc09000000010000,PS4 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+050000004c050000cc09000000810000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c050000cc09000001800000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+0300004b4c0500005f0e000011010000,PS5 Access Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000004c050000e60c000011010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+030000004c050000e60c000011810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+030000004c050000f20d000011010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b14,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+050000004c050000e60c000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+050000004c050000e60c000000810000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:Linux,
+050000004c050000f20d000000010000,PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000300f00001211000011010000,Qanba Arcade Joystick,a:b2,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b5,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b6,start:b9,x:b1,y:b3,platform:Linux,
+03000000222c00000225000011010000,Qanba Dragon Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000025000011010000,Qanba Dragon Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000020000011010000,Qanba Drone Arcade PS4 Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,rightshoulder:b5,righttrigger:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000300f00001210000010010000,Qanba Joystick Plus,a:b0,b:b1,back:b8,leftshoulder:b5,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b4,righttrigger:b6,start:b9,x:b2,y:b3,platform:Linux,
+03000000222c00000223000011010000,Qanba Obsidian Arcade Joystick (PS3),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000222c00000023000011010000,Qanba Obsidian Arcade Joystick (PS4),a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000009b2800000300000001010000,Raphnet 4nes4snes,a:b0,b:b4,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
+030000009b2800004200000001010000,Raphnet Dual NES Adapter,a:b0,b:b1,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b3,platform:Linux,
+030000009b2800003200000001010000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+030000009b2800006000000001010000,Raphnet GC and N64 Adapter,a:b0,b:b7,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b5,rightx:a3,righty:a4,start:b3,x:b1,y:b8,platform:Linux,
+030000009b2800008000000020020000,Raphnet Wii Classic Adapter,a:b1,b:b4,back:b2,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b5,platform:Linux,
+03000000f8270000bf0b000011010000,Razer Kishi,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000008916000001fd000024010000,Razer Onza Classic Edition,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000321500000204000011010000,Razer Panthera PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000104000011010000,Razer Panthera PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000810000011010000,Razer Panthera PS4 Evo Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000010000011010000,Razer Raiju,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000507000000010000,Razer Raiju Mobile,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b21,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000321500000a10000001000000,Razer Raiju Tournament Edition,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b13,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000321500000011000011010000,Razer Raion PS4 Fightpad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000008916000000fe000024010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c6240000045d000024010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c6240000045d000025010000,Razer Sabertooth,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000321500000009000011010000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+050000003215000000090000163a0000,Razer Serval,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+0300000032150000030a000001010000,Razer Wildcat,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000321500000b10000011010000,Razer Wolverine PS5 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Linux,
+03000000790000001100000010010000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,start:b9,x:b0,y:b3,platform:Linux,
+0300000003040000c197000011010000,Retrode Adapter,a:b0,b:b4,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b1,y:b5,platform:Linux,
+190000004b4800000111000000010000,RetroGame Joypad,a:b1,b:b0,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+0300000081170000990a000001010000,Retronic Adapter,a:b0,leftx:a0,lefty:a1,platform:Linux,
+0300000000f000000300000000010000,RetroPad,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
+00000000526574726f53746f6e653200,RetroStone 2 Controller,a:b1,b:b0,back:b10,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,righttrigger:b9,start:b11,x:b4,y:b3,platform:Linux,
+03000000341200000400000000010000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Linux,
+030000006b140000010d000011010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000006b140000130d000011010000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00001f01000000010000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00008701000011010000,Rock Candy Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00001e01000011010000,Rock Candy PS3 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000c6240000fefa000000010000,Rock Candy Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000006f0e00004601000001010000,Rock Candy Xbox One Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000a306000023f6000011010000,Saitek Cyborg V1 PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000a30600001005000000010000,Saitek P150,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b7,lefttrigger:b6,rightshoulder:b2,righttrigger:b5,x:b3,y:b4,platform:Linux,
+03000000a30600000701000000010000,Saitek P220,a:b2,b:b3,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b4,righttrigger:b5,x:b0,y:b1,platform:Linux,
+03000000a30600000cff000010010000,Saitek P2500 Force Rumble,a:b2,b:b3,back:b11,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,start:b10,x:b0,y:b1,platform:Linux,
+03000000a30600000c04000011010000,Saitek P2900,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b12,x:b0,y:b3,platform:Linux,
+03000000a306000018f5000010010000,Saitek P3200 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+03000000300f00001201000010010000,Saitek P380,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Linux,
+03000000a30600000901000000010000,Saitek P880,a:b2,b:b3,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a2,x:b0,y:b1,platform:Linux,
+03000000a30600000b04000000010000,Saitek P990 Dual Analog,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a2,start:b8,x:b0,y:b3,platform:Linux,
+03000000a306000020f6000011010000,Saitek PS2700 Rumble,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a4,start:b9,x:b0,y:b3,platform:Linux,
+05000000e804000000a000001b010000,Samsung EIGP20,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000d81d00000e00000010010000,Savior,a:b0,b:b1,back:b8,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b11,righttrigger:b3,start:b9,x:b4,y:b5,platform:Linux,
+03000000952e00004b43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000952e00004d43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000952e00004e43000011010000,Scuf Envision,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b9,righttrigger:a4,rightx:a2,righty:a5,start:b7,x:b2,y:b3,platform:Linux,
+03000000a30c00002500000011010000,Sega Genesis Mini 3B Controller,a:b2,b:b1,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,righttrigger:b5,start:b9,platform:Linux,
+03000000790000001100000011010000,Sega Saturn,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Linux,
+03000000790000002201000011010000,Sega Saturn,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b6,righttrigger:b7,start:b9,x:b2,y:b3,platform:Linux,
+03000000b40400000a01000000010000,Sega Saturn,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b3,y:b4,platform:Linux,
+030000001f08000001e4000010010000,SFC Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000632500002305000010010000,ShanWan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000632500002605000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000632500007505000010010000,Shanwan Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000bc2000000055000010010000,Shanwan Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000f025000021c1000010010000,Shanwan Gioteck PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000341a00000908000010010000,SL6566,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+050000004c050000cc09000001000000,Sony DualShock 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000ff000000cb01000010010000,Sony PlayStation Portable,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+03000000250900000500000000010000,Sony PS2 pad with SmartJoy Adapter,a:b2,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
+030000005e0400008e02000073050000,Speedlink Torid,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000020200000,SpeedLink Xeox Pro Analog,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000d11800000094000011010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000d11800000094000000010000,Stadia Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000112000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000112000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:+a5,dpleft:-a4,dpright:+a4,dpup:-a5,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,paddle1:b15,paddle2:b16,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
+03000000de2800000211000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000211000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:b18,dpleft:b19,dpright:b20,dpup:b17,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b16,paddle2:b15,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
+03000000de2800004211000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800004211000011010000,Steam Controller,a:b2,b:b3,back:b10,dpdown:b18,dpleft:b19,dpright:b20,dpup:b17,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,paddle1:b16,paddle2:b15,rightshoulder:b7,righttrigger:a6,rightx:a2,righty:a3,start:b11,x:b4,y:b5,platform:Linux,
+03000000de280000fc11000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+05000000de2800000212000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b10,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Linux,
+03000000de2800000512000010010000,Steam Deck,a:b3,b:b4,back:b11,dpdown:b17,dpleft:b18,dpright:b19,dpup:b16,guide:b13,leftshoulder:b7,leftstick:b14,lefttrigger:a9,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b15,righttrigger:a8,rightx:a2,righty:a3,start:b12,x:b5,y:b6,platform:Linux,
+03000000de2800000512000011010000,Steam Deck,a:b3,b:b4,back:b11,dpdown:b17,dpleft:b18,dpright:b19,dpup:b16,guide:b13,leftshoulder:b7,leftstick:b14,lefttrigger:a9,leftx:a0,lefty:a1,misc1:b2,paddle1:b21,paddle2:b20,paddle3:b23,paddle4:b22,rightshoulder:b8,rightstick:b15,righttrigger:a8,rightx:a2,righty:a3,start:b12,x:b5,y:b6,platform:Linux,
+03000000de280000ff11000001000000,Steam Virtual Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000004e696d6275732b0000000000,SteelSeries Nimbus Plus,a:b0,b:b1,back:b10,guide:b11,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a2,righty:a3,start:b12,x:b2,y:b3,platform:Linux,
+03000000381000003014000075010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000381000003114000075010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+0500000011010000311400001b010000,SteelSeries Stratus Duo,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b32,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+05000000110100001914000009010000,SteelSeries Stratus XL,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000ad1b000038f0000090040000,Street Fighter IV Fightstick TE,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000003b07000004a1000000010000,Suncom SFX Plus,a:b0,b:b2,back:b7,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b4,rightshoulder:b9,righttrigger:b5,start:b8,x:b1,y:b3,platform:Linux,
+03000000666600000488000000010000,Super Joy Box 5 Pro,a:b2,b:b1,back:b9,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Linux,
+0300000000f00000f100000000010000,Super RetroPort,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
+030000008f0e00000d31000010010000,SZMY Power 3 Turbo,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000457500000401000011010000,SZMY Power DS4 Wired Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000457500002211000010010000,SZMY Power Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+030000008f0e00001431000010010000,SZMY Power PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+03000000e40a00000307000011010000,Taito Egret II Mini Control Panel,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Linux,
+03000000e40a00000207000011010000,Taito Egret II Mini Controller,a:b4,b:b2,back:b6,guide:b9,leftx:a0,lefty:a1,rightshoulder:b0,righttrigger:b1,start:b7,x:b8,y:b3,platform:Linux,
+03000000ba2200000701000001010000,Technology Innovation PS2 Adapter,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a5,righty:a2,start:b9,x:b3,y:b2,platform:Linux,
+03000000790000001c18000011010000,TGZ Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000591c00002400000010010000,THEC64 Joystick,a:b0,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+03000000591c00002600000010010000,THEGamepad,a:b2,b:b1,back:b6,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b3,y:b0,platform:Linux,
+030000004f04000015b3000001010000,Thrustmaster Dual Analog 3.2,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+030000004f04000020b3000010010000,Thrustmaster Dual Trigger,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+030000004f04000023b3000000010000,Thrustmaster Dual Trigger PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004f0400000ed0000011010000,Thrustmaster eSwap Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000b50700000399000000010000,Thrustmaster Firestorm Digital 2,a:b2,b:b4,back:b11,leftshoulder:b6,leftstick:b10,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b8,rightstick:b0,righttrigger:b9,start:b1,x:b3,y:b5,platform:Linux,
+030000004f04000003b3000010010000,Thrustmaster Firestorm Dual Analog 2,a:b0,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b9,rightx:a2,righty:a3,x:b1,y:b3,platform:Linux,
+030000004f04000000b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b11,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b10,x:b1,y:b3,platform:Linux,
+030000004f04000004b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+030000004f04000026b3000002040000,Thrustmaster GP XID,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c6240000025b000002020000,Thrustmaster GPX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000004f04000008d0000000010000,Thrustmaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000009d0000000010000,Thrustmaster Run N Drive PlayStation Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000007d0000000010000,Thrustmaster T Mini,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
+030000004f04000012b3000010010000,Thrustmaster Vibrating Gamepad,a:b0,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b1,y:b3,platform:Linux,
+03000000571d00002000000010010000,Tomee SNES Adapter,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b7,x:b2,y:b3,platform:Linux,
+03000000bd12000015d0000010010000,Tomee SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Linux,
+03000000d814000007cd000011010000,Toodles 2008 Chimp PC PS3,a:b0,b:b1,back:b8,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b3,y:b2,platform:Linux,
+030000005e0400008e02000070050000,Torid,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000c01100000591000011010000,Torid,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+03000000680a00000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+03000000780300000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+03000000e00d00000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+03000000f00600000300000003000000,TRBot Virtual Joypad,a:b11,b:b12,back:b15,dpdown:b6,dpleft:b3,dpright:b4,dpup:b5,leftshoulder:b17,leftstick:b21,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b22,righttrigger:a2,rightx:a3,righty:a4,start:b16,x:b13,y:b14,platform:Linux,
+030000005f140000c501000010010000,Trust Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Linux,
+06000000f51000000870000003010000,Turtle Beach Recon,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000100800000100000010010000,Twin PS2 Adapter,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+03000000151900005678000010010000,Uniplay U6,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000100800000300000010010000,USB Gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Linux,
+03000000790000000600000007010000,USB gamepad,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b3,y:b0,platform:Linux,
+03000000790000001100000000010000,USB Gamepad,a:b2,b:b1,back:b8,dpdown:a0,dpleft:a1,dpright:a2,dpup:a4,start:b9,platform:Linux,
+030000006f0e00000302000011010000,Victrix Pro Fightstick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+030000006f0e00000702000011010000,Victrix Pro Fightstick PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
+05000000ac0500003232000001000000,VR Box Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Linux,
+05000000434f4d4d414e440000000000,VX Gaming Command Series,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+0000000058626f782033363020576900,Xbox 360 Controller,a:b0,b:b1,back:b14,dpdown:b11,dpleft:b12,dpright:b13,dpup:b10,guide:b7,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Linux,
+030000005e0400001907000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000010010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000014010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400009102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000000010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000007010000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000030060000,Xbox 360 Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400008e02000000010000,Xbox 360 EasySMX,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000a102000014010000,Xbox 360 Receiver,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400000202000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+030000006f0e00001304000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000ffff0000ffff000000010000,Xbox Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b2,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b3,y:b4,platform:Linux,
+0000000058626f782047616d65706100,Xbox Gamepad,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a3,start:b7,x:b2,y:b3,platform:Linux,
+030000005e0400000a0b000005040000,Xbox One Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Linux,
+030000005e040000d102000002010000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000ea02000001030000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000e002000003090000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000fd02000003090000,Xbox One Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b16,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000fd02000030110000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000e302000002090000,Xbox One Elite,a:b0,b:b1,back:b136,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000220b000013050000,Xbox One Elite 2 Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000050b000002090000,Xbox One Elite Series 2,a:b0,b:b1,back:b136,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+030000005e040000ea02000011050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000ea0200000b050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000ea0200000d050000,Xbox One S Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000001050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000005050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000007050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000009050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b00000d050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b00000f050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:b13,dpleft:b14,dpright:b15,dpup:b12,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000001050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000007050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000009050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000011050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000013050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000130b000015050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+060000005e040000120b000007050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b00000b050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+060000005e040000120b00000f050000,Xbox Series Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000011050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+030000005e040000120b000014050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000130b000017050000,Xbox Series X Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b15,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+060000005e040000120b00000d050000,Xbox Series X Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+050000005e040000200b000013050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000200b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+050000005e040000220b000017050000,Xbox Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
+03000000450c00002043000010010000,XEOX SL6556 BK,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Linux,
+05000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:a7,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Linux,
+03000000c0160000e105000001010000,XinMo Dual Arcade,a:b4,b:b3,back:b6,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b9,leftshoulder:b2,leftx:a0,lefty:a1,rightshoulder:b5,start:b7,x:b1,y:b0,platform:Linux,
+030000005e0400008e02000020010000,XInput Adapter,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
+03000000120c0000100e000011010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+03000000120c0000101e000011010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
+
+# Android
+38653964633230666463343334313533,8BitDo Adapter,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+36666264316630653965636634386234,8BitDo Adapter 2,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f20417263616465205374,8BitDo Arcade Stick,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b5,leftshoulder:b9,lefttrigger:a4,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61393962646434393836356631636132,8BitDo Arcade Stick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+64323139346131306233636562663738,8BitDo Arcade Stick,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+64643565386136613265663236636564,8BitDo Arcade Stick,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+33313433353539306634656436353432,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f20446f67626f6e65204d,8BitDo Dogbone,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+34343439373236623466343934376233,8BitDo FC30 Pro,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b28,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b4,rightstick:b29,righttrigger:b7,start:b5,x:b30,y:b2,platform:Android,
+38426974446f2038426974446f204c69,8BitDo Lite,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+30643332373663313263316637356631,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f204c6974652032000000,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+62656331626461363634633735353032,8BitDo Lite 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38393936616436383062666232653338,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f204c6974652053450000,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+39356430616562366466646636643435,8BitDo Lite SE,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000006500000ffff3f00,8BitDo M30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b17,leftshoulder:b9,lefttrigger:a5,rightshoulder:b10,righttrigger:a4,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000051060000ffff3f00,8BitDo M30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,guide:b17,leftshoulder:b9,lefttrigger:a4,rightshoulder:b10,righttrigger:a5,start:b6,x:b3,y:b2,platform:Android,
+32323161363037623637326438643634,8BitDo M30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+33656266353630643966653238646264,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:a5,start:b10,x:b19,y:b2,platform:Android,
+38426974446f204d3330204d6f646b69,8BitDo M30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39366630663062373237616566353437,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,start:b6,x:b2,y:b3,platform:Android,
+64653533313537373934323436343563,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,start:b6,x:b2,y:b3,platform:Android,
+66356438346136366337386437653934,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,start:b18,x:b19,y:b2,platform:Android,
+66393064393162303732356665666366,8BitDo M30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,start:b6,x:b2,y:b3,platform:Android,
+38426974446f204d6963726f2067616d,8BitDo Micro,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,lefttrigger:a4,leftx:b0,lefty:b1,rightshoulder:b10,righttrigger:a5,rightx:b2,righty:b3,start:b6,x:b3,y:b2,platform:Android,
+61653365323561356263373333643266,8BitDo Micro,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,lefttrigger:a4,leftx:b0,lefty:b1,rightshoulder:b10,righttrigger:a5,rightx:b2,righty:b3,start:b6,x:b3,y:b2,platform:Android,
+62613137616239666338343866326336,8BitDo Micro,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,lefttrigger:a4,leftx:b0,lefty:b1,rightshoulder:b10,righttrigger:a5,rightx:b2,righty:b3,start:b6,x:b3,y:b2,platform:Android,
+33663431326134333366393233616633,8BitDo N30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+38426974446f204e3330204d6f646b69,8BitDo N30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,rightx:a2,righty:a3,start:b6,platform:Android,
+05000000c82d000015900000ffff3f00,8BitDo N30 Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000065280000ffff3f00,8BitDo N30 Pro 2,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b17,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38323035343766666239373834336637,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,platform:Android,
+38426974446f204e3634204d6f646b69,8BitDo N64,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,platform:Android,
+32363135613966656338666638666237,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35363534633333373639386466346631,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f204e454f47454f204750,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39383963623932353561633733306334,8BitDo NEOGEO,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000000220000000900000ffff3f00,8BitDo NES30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+050000002038000009000000ffff3f00,8BitDo NES30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38313433643131656262306631373166,8BitDo P30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38326536643339353865323063616339,8BitDo P30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38426974446f2050333020636c617373,8BitDo P30,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35376664343164386333616535333434,8BitDo Pro 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,start:b10,x:b19,y:b2,platform:Android,
+38426974446f2038426974446f205072,8BitDo Pro 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f2050726f203200000000,8BitDo Pro 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+61333362366131643730353063616330,8BitDo Pro 2,a:b1,b:b0,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+62373739366537363166326238653463,8BitDo Pro 2,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b3,y:b2,platform:Android,
+38386464613034326435626130396565,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f2038426974446f205265,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+66303230343038613365623964393766,8BitDo Receiver,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20533330204d6f646b69,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66316462353561376330346462316137,8BitDo S30,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:a4,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b9,righttrigger:b10,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000c82d000000600000ffff3f00,8BitDo SF30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b16,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000000610000ffff3f00,8BitDo SF30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974646f20534633302050726f00,8BitDo SF30 Pro,a:b1,b:b0,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b17,platform:Android,
+61623334636338643233383735326439,8BitDo SFC30,a:b0,b:b1,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b31,start:b5,x:b30,y:b2,platform:Android,
+05000000c82d000012900000ffff3f00,8BitDo SN30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000062280000ffff3f00,8BitDo SN30,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+38316230613931613964356666353839,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20534e3330204d6f646b,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+65323563303231646531383162646335,8BitDo SN30,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+35383531346263653330306238353131,8BitDo SN30 PP,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000c82d000001600000ffff3f00,8BitDo SN30 Pro,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000002600000ffff0f00,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b17,leftshoulder:b9,leftstick:b7,lefttrigger:b15,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b16,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+36653638656632326235346264663661,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+38303232393133383836366330346462,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+38346630346135363335366265656666,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38426974446f20534e33302050726f2b,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+536f6e7920436f6d707574657220456e,8BitDo SN30 Pro Plus,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66306331643531333230306437353936,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+050000002028000009000000ffff3f00,8BitDo SNES30,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+050000003512000020ab000000780f00,8BitDo SNES30,a:b21,b:b20,back:b30,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b26,rightshoulder:b27,start:b31,x:b24,y:b23,platform:Android,
+33666663316164653937326237613331,8BitDo Zero,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+38426974646f205a65726f2047616d65,8BitDo Zero,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+05000000c82d000018900000ffff0f00,8BitDo Zero 2,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+05000000c82d000030320000ffff0f00,8BitDo Zero 2,a:b1,b:b0,back:b4,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+33663434393362303033616630346337,8BitDo Zero 2,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftx:a0,lefty:a1,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+34656330626361666438323266633963,8BitDo Zero 2,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftx:a0,lefty:a1,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
+63396666386564393334393236386630,8BitDo Zero 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+63633435623263373466343461646430,8BitDo Zero 2,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftx:a0,lefty:a1,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+32333634613735616163326165323731,Amazon Luna Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+4c696e757820342e31392e3137322077,Anbernic Gamepad,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+417374726f2063697479206d696e6920,Astro City Mini,a:b23,b:b22,back:b29,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
+35643263313264386134376362363435,Atari VCS Classic Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,start:b6,platform:Android,
+32353831643566306563643065356239,Atari VCS Modern Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4f64696e20436f6e74726f6c6c657200,AYN Odin,a:b1,b:b0,back:b4,dpdown:b12,dpleft:b14,dpright:b13,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:+a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:+a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+32303165626138343962363666346165,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+38383337343564366131323064613561,Brook Mars PS4 Controller,a:b1,b:b19,back:b17,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+34313430343161653665353737323365,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+4875694a6961204a432d573031550000,Elecom JC-W01U,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+30363230653635633863366338623265,Evo VR,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftx:a0,lefty:a1,x:b2,y:b3,platform:Android,
+05000000b404000011240000dfff3f00,Flydigi Vader 2,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000bc20000000550000ffff3f00,GameSir G3w,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34323662653333636330306631326233,Google Nexus,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35383633353935396534393230616564,Google Stadia Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000d6020000e5890000dfff3f00,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+05000000d6020000e5890000dfff3f80,GPD XD Plus,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a3,rightx:a4,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+66633030656131663837396562323935,Hori Battle,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+35623466343433653739346434636330,Hori Fighting Commander 3 Pro,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+484f524920434f2e2c4c54442e203130,Hori Fighting Commander 3 Pro,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b20,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b9,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+484f524920434f2e2c4c544420205041,Hori Gem Pad 3,a:b1,b:b17,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b0,y:b2,platform:Android,
+65656436646661313232656661616130,Hori PC Engine Mini Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b18,platform:Android,
+31303433326562636431653534636633,Hori Real Arcade Pro 3,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+32656664353964393561366362333636,Hori Switch Split Pad Pro,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+30306539356238653637313730656134,HORIPAD Switch Pro Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+48797065726b696e2050616400000000,Hyperkin Admiral N64 Controller,+rightx:b6,+righty:b7,-rightx:b17,-righty:b5,a:b1,b:b0,leftshoulder:b3,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b20,start:b18,platform:Android,
+62333331353131353034386136626636,Hyperkin Admiral N64 Controller,+rightx:b6,+righty:b7,-rightx:b17,-righty:b5,a:b1,b:b0,leftshoulder:b3,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b20,start:b18,platform:Android,
+31306635363562663834633739396333,Hyperkin N64 Adapter,a:b1,b:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+5368616e57616e202020202048797065,Hyperkin N64 Adapter,a:b1,b:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+0500000083050000602000000ffe0000,iBuffalo SNES Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b15,rightshoulder:b16,start:b10,x:b2,y:b3,platform:Android,
+5553422c322d6178697320382d627574,iBuffalo Super Famicom Controller,a:b1,b:b0,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,rightshoulder:b18,start:b10,x:b3,y:b2,platform:Android,
+64306137363261396266353433303531,InterAct GoPad,a:b24,b:b25,leftshoulder:b23,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,x:b21,y:b22,platform:Android,
+532e542e442e20496e74657261637420,InterAct HammerHead FX,a:b23,b:b24,back:b30,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,leftstick:b22,lefttrigger:b28,leftx:a0,lefty:a1,rightshoulder:b27,rightstick:b25,righttrigger:b29,rightx:a2,righty:a3,start:b31,x:b20,y:b21,platform:Android,
+65346535636333663931613264643164,Joy-Con,a:b21,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b23,y:b24,platform:Android,
+33346566643039343630376565326335,Joy-Con (L),a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
+35313531613435623366313835326238,Joy-Con (L),a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
+4a6f792d436f6e20284c290000000000,Joy-Con (L),a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b20,start:b17,x:b19,y:b2,platform:Android,
+38383665633039363066383334653465,Joy-Con (R),a:b0,b:b1,back:b5,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+39363561613936303237333537383931,Joy-Con (R),a:b0,b:b1,back:b5,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+4a6f792d436f6e202852290000000000,Joy-Con (R),a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+39656136363638323036303865326464,JYS Aapter,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+63316564383539663166353034616434,JYS Adapter,a:b1,b:b3,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b0,y:b2,platform:Android,
+64623163333561643339623235373232,Logitech F310,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35623364393661626231343866613337,Logitech F710,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4c6f6769746563682047616d65706164,Logitech F710,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+64396331333230326333313330336533,Logitech F710,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39653365373864633935383236363438,Logitech G Cloud,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+416d617a6f6e2047616d6520436f6e74,Luna Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+4c756e612047616d6570616400000000,Luna Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30363066623539323534363639323363,Magic NS,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+31353762393935386662336365626334,Magic NS,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+39623565346366623931666633323530,Magic NS,a:b1,b:b3,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b0,y:b2,platform:Android,
+6d6179666c617368206c696d69746564,Mayflash GameCube Adapter,a:b22,b:b21,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a5,righty:a2,start:b30,x:b23,y:b24,platform:Android,
+436f6e74726f6c6c6572000000000000,Mayflash N64 Adapter,a:b1,b:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+65666330633838383061313633326461,Mayflash N64 Adapter,a:b1,b:b19,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a2,righty:a3,start:b18,platform:Android,
+37316565396364386635383230353365,Mayflash Saturn Adapter,a:b21,b:b22,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
+4875694a696120205553422047616d65,Mayflash Saturn Adapter,a:b21,b:b22,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
+535a4d792d706f776572204c54442043,Mayflash Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b31,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+30653962643666303631376438373532,Mayflash Wii DolphinBar,a:b23,b:b24,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b0,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b22,platform:Android,
+39346131396233376535393665363161,Mayflash Wii U Pro Adapter,a:b22,b:b23,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,leftstick:b31,lefttrigger:b27,rightshoulder:b26,rightstick:b0,righttrigger:b28,rightx:a0,righty:a1,start:b30,x:b21,y:b24,platform:Android,
+31323564663862633234646330373138,Mega Drive,a:b23,b:b22,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,rightshoulder:b25,righttrigger:b26,start:b30,x:b24,y:b21,platform:Android,
+37333564393261653735306132613061,Mega Drive,a:b21,b:b22,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,lefttrigger:b28,rightshoulder:b27,righttrigger:b23,start:b30,x:b24,y:b25,platform:Android,
+64363363336633363736393038313464,Mega Drive,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,x:b2,y:b3,platform:Android,
+33323763323132376537376266393366,Microsoft Dual Strike,a:b24,b:b23,back:b25,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b27,lefttrigger:b29,rightshoulder:b78,rightx:a0,righty:a1~,start:b26,x:b22,y:b21,platform:Android,
+30306461613834333439303734316539,Microsoft SideWinder Pro,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b20,lefttrigger:b9,rightshoulder:b19,righttrigger:b10,start:b17,x:b2,y:b3,platform:Android,
+32386235353630393033393135613831,Microsoft Xbox Series Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4d4f42415041442050726f2d48440000,Mobapad Chitu HD,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4d4f435554452d303533582d4d35312d,Mocute 053X,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+33343361376163623438613466616531,Mocute M053,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39306635663061636563316166303966,Mocute M053,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+7573622067616d657061642020202020,NEXT SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,righttrigger:b6,start:b9,x:b3,y:b0,platform:Android,
+050000007e05000009200000ffff0f00,Nintendo Switch Pro Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b17,y:b2,platform:Android,
+34323437396534643531326161633738,Nintendo Switch Pro Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,misc1:b5,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+50726f20436f6e74726f6c6c65720000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b2,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b10,rightx:a2,righty:a3,start:b18,y:b3,platform:Android,
+36326533353166323965623661303933,NSO N64 Controller,+rightx:b17,+righty:b10,-rightx:b2,-righty:b19,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,righttrigger:b15,start:b18,platform:Android,
+4e363420436f6e74726f6c6c65720000,NSO N64 Controller,+rightx:b17,+righty:b10,-rightx:b2,-righty:b19,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,righttrigger:b15,start:b18,platform:Android,
+534e455320436f6e74726f6c6c657200,NSO SNES Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+64623863346133633561626136366634,NSO SNES Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,rightshoulder:b20,start:b18,x:b19,y:b2,platform:Android,
+050000005509000003720000cf7f3f00,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005509000010720000ffff3f00,NVIDIA Controller,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005509000014720000df7f3f00,NVIDIA Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+050000005509000014720000df7f3f80,NVIDIA Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a3,rightx:a4,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+37336435666338653565313731303834,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4e564944494120436f72706f72617469,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61363931656135336130663561616264,NVIDIA Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+39383335313438623439373538343266,OUYA Controller,a:b0,b:b2,dpdown:b18,dpleft:b15,dpright:b16,dpup:b17,leftshoulder:b3,leftstick:b9,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b10,righttrigger:b7,rightx:a3,righty:a4,x:b1,y:b19,platform:Android,
+4f5559412047616d6520436f6e74726f,OUYA Controller,a:b0,b:b2,dpdown:b18,dpleft:b15,dpright:b6,dpup:b17,leftshoulder:b3,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b19,platform:Android,
+506572666f726d616e63652044657369,PDP PS3 Rock Candy Controller,a:b1,b:b17,back:h0.2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b4,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b16,x:b0,y:b2,platform:Android,
+62653335326261303663356263626339,PlayStation Classic Controller,a:b19,b:b1,back:b17,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,lefttrigger:b3,rightshoulder:b10,righttrigger:b20,start:b18,x:b2,y:b0,platform:Android,
+536f6e7920496e746572616374697665,PlayStation Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+576972656c65737320436f6e74726f6c,PlayStation Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61653962353232366130326530363061,Pokken,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,rightshoulder:b20,righttrigger:b10,start:b18,x:b0,y:b2,platform:Android,
+32666633663735353234363064386132,PS2,a:b23,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a3,righty:a2,start:b30,x:b24,y:b21,platform:Android,
+050000004c05000068020000dfff3f00,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+536f6e7920504c415953544154494f4e,PS3 Controller,a:b0,b:b1,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+61363034663839376638653463633865,PS3 Controller,a:b0,b:b1,back:b15,dpdown:a14,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66366539656564653432353139356536,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66383132326164626636313737373037,PS3 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000c405000000783f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000c4050000fffe3f00,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000c4050000fffe3f80,PS4 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a3,rightx:a4,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000c4050000ffff3f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000cc090000fffe3f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000004c050000cc090000ffff3f00,PS4 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30303839663330346632363232623138,PS4 Controller,a:b1,b:b17,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+31326235383662333266633463653332,PS4 Controller,a:b1,b:b16,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b17,x:b0,y:b2,platform:Android,
+31373231336561636235613666323035,PS4 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+31663838336334393132303338353963,PS4 Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34613139376634626133336530386430,PS4 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+35643031303033326130316330353564,PS4 Controller,a:b1,b:b17,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:+a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:+a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+37626233336235343937333961353732,PS4 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+37626464343430636562316661643863,PS4 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38393161636261653636653532386639,PS4 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+63313733393535663339656564343962,PS4 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+63393662363836383439353064663939,PS4 Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65366465656364636137653363376531,PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+66613532303965383534396638613230,PS4 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+050000004c050000e60c0000fffe3f00,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a4,rightx:a2,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000e60c0000fffe3f80,PS5 Controller,a:b1,b:b17,back:b15,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b3,leftstick:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b6,righttrigger:a3,rightx:a4,righty:a5,start:b16,x:b0,y:b2,platform:Android,
+050000004c050000e60c0000ffff3f00,PS5 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+32346465346533616263386539323932,PS5 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+32633532643734376632656664383733,PS5 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+37363764353731323963323639666565,PS5 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+61303162353165316365336436343139,PS5 Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b8,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a5,start:b18,x:b0,y:b2,platform:Android,
+64336263393933626535303339616332,Qanba 4RAF,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b20,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b9,rightx:a2,righty:a3,start:b18,x:b19,y:b2,platform:Android,
+36626666353861663864336130363137,Razer Junglecat,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000f8270000bf0b0000ffff3f00,Razer Kishi,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+62653861643333663663383332396665,Razer Kishi,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000003215000005070000ffff3f00,Razer Raiju Mobile,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000003215000007070000ffff3f00,Razer Raiju Mobile,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000003215000000090000bf7f3f00,Razer Serval,a:b0,b:b1,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+5a6869587520526574726f2042697420,Retro Bit Saturn Controller,a:b21,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b26,rightshoulder:b27,righttrigger:b28,start:b30,x:b23,y:b24,platform:Android,
+32417865732031314b6579732047616d,Retro Bit SNES Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+36313938306539326233393732613361,Retro Bit SNES Controller,a:b0,b:b1,back:b15,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b2,y:b3,platform:Android,
+526574726f466c616720576972656420,Retro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,rightshoulder:b18,start:b10,x:b2,y:b3,platform:Android,
+61343739353764363165343237303336,Retro Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b17,lefttrigger:b18,leftx:a0,lefty:a1,start:b10,x:b2,y:b3,platform:Android,
+526574726f696420506f636b65742043,Retroid Pocket,a:b1,b:b0,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+582d426f7820436f6e74726f6c6c6572,Retroid Pocket,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,paddle1:b17,paddle2:b18,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38653130373365613538333235303036,Retroid Pocket 2,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+64363363336633363736393038313463,Retrolink,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b6,platform:Android,
+37393234373533633333323633646531,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,
+5365616c6965436f6d707574696e6720,RetroUSB N64 RetroPort,+rightx:b17,+righty:b15,-rightx:b18,-righty:b6,a:b10,b:b9,dpdown:b19,dpleft:b1,dpright:b0,dpup:b2,leftshoulder:b7,lefttrigger:b20,leftx:a0,lefty:a1,rightshoulder:b5,start:b3,platform:Android,
+526574726f5553422e636f6d20534e45,RetroUSB SNES RetroPort,a:b1,b:b20,back:b19,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b2,x:b0,y:b3,platform:Android,
+64643037633038386238303966376137,RetroUSB SNES RetroPort,a:b1,b:b20,back:b19,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,rightshoulder:b10,start:b2,x:b0,y:b3,platform:Android,
+37656564346533643138636436356230,Rock Candy Switch Controller,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b3,leftstick:b15,lefttrigger:b9,leftx:a0,lefty:a1,misc1:b7,rightshoulder:b20,rightstick:b6,righttrigger:b10,rightx:a2,righty:a3,start:b18,x:b0,y:b2,platform:Android,
+33373336396634316434323337666361,RumblePad 2,a:b22,b:b23,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,lefttrigger:b27,leftx:a0,lefty:a1,rightshoulder:b26,righttrigger:b28,rightx:a2,righty:a3,start:b30,x:b21,y:b24,platform:Android,
+36363537303435333566386638366333,Samsung EIGP20,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+53616d73756e672047616d6520506164,Samsung EIGP20,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+66386565396238363534313863353065,Sanwa PlayOnline Mobile,a:b21,b:b22,back:b23,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,start:b24,platform:Android,
+32383165316333383766336338373261,Saturn,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:a4,righttrigger:a5,x:b2,y:b3,platform:Android,
+38613865396530353338373763623431,Saturn,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b9,lefttrigger:b10,rightshoulder:b20,righttrigger:b19,start:b17,x:b2,y:b3,platform:Android,
+61316232336262373631343137633631,Saturn,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:a4,righttrigger:a5,x:b2,y:b3,platform:Android,
+30353835333338613130373363646337,SG H510,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+66386262366536653765333235343634,SG H510,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,x:b2,y:b3,platform:Android,
+66633132393363353531373465633064,SG H510,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftstick:b17,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b20,rightstick:b18,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b19,y:b2,platform:Android,
+62653761636366393366613135366338,SN30 PP,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b3,y:b2,platform:Android,
+38376662666661636265313264613039,SNES,a:b0,b:b1,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
+5346432f555342205061640000000000,SNES Adapter,a:b0,b:b1,back:b9,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b3,rightshoulder:b20,start:b10,x:b19,y:b2,platform:Android,
+5553422047616d657061642000000000,SNES Controller,a:b1,b:b0,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,rightshoulder:b10,start:b6,x:b3,y:b2,platform:Android,
+63303964303462366136616266653561,Sony PSP,a:b21,b:b22,back:b27,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b28,x:b23,y:b24,platform:Android,
+63376637643462343766333462383235,Sony Vita,a:b1,b:b19,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,leftx:a0,lefty:a1,rightshoulder:b20,rightx:a3,righty:a4,start:b18,x:b0,y:b2,platform:Android,
+476f6f676c65204c4c43205374616469,Stadia Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+5374616469614e3848532d6532633400,Stadia Controller,a:b0,b:b1,back:b15,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Android,
+05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:Android,
+0500000011010000201400000f7e0f00,SteelSeries Nimbus,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b3,lefttrigger:b9,leftx:a0,lefty:a1,rightshoulder:b20,righttrigger:b10,rightx:a2,righty:a3,x:b19,y:b2,platform:Android,
+35306436396437373135383665646464,SteelSeries Nimbus Plus,a:b0,b:b1,leftshoulder:b3,leftstick:b17,lefttrigger:b9,leftx:a0,rightshoulder:b20,rightstick:b18,righttrigger:b10,rightx:a2,x:b19,y:b2,platform:Android,
+33313930373536613937326534303931,Taito Egret II Mini Control Panel,a:b25,b:b23,back:b27,guide:b30,leftx:a0,lefty:a1,rightshoulder:b21,righttrigger:b22,start:b28,x:b29,y:b24,platform:Android,
+54475a20436f6e74726f6c6c65720000,TGZ Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+62363434353532386238336663643836,TGZ Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:b17,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:b18,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+37323236633763666465316365313236,THEC64 Joystick,a:b21,b:b22,back:b27,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b27,x:b23,y:b24,platform:Android,
+38346162326232346533316164363336,THEGamepad,a:b23,b:b22,back:b27,leftshoulder:b25,leftx:a0,lefty:a1,rightshoulder:b26,start:b28,x:b24,y:b21,platform:Android,
+050000004f0400000ed00000fffe3f00,ThrustMaster eSwap Pro Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+5477696e20555342204a6f7973746963,Twin Joystick,a:b22,b:b21,back:b28,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b26,leftstick:b30,lefttrigger:b24,leftx:a0,lefty:a1,rightshoulder:b27,rightstick:b31,righttrigger:b25,rightx:a3,righty:a2,start:b29,x:b23,y:b20,platform:Android,
+30623739343039643830333266346439,Valve Steam Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,paddle1:b24,paddle2:b23,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+31643365666432386133346639383937,Valve Steam Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,leftx:a0,lefty:a1,paddle1:b24,paddle2:b23,rightshoulder:b10,rightstick:b8,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30386438313564306161393537333663,Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+33333034646336346339646538643633,Wii Classic Adapter,a:b23,b:b22,back:b29,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b27,lefttrigger:b25,leftx:a0,lefty:a1,rightshoulder:b28,righttrigger:b26,rightx:a2,righty:a3,start:b30,x:b24,y:b21,platform:Android,
+050000005e0400008e02000000783f00,Xbox 360 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+30396232393162346330326334636566,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+38313038323730383864666463383533,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+58626f782033363020576972656c6573,Xbox 360 Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65353331386662343338643939643636,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65613532386633373963616462363038,Xbox 360 Controller,a:b0,b:b1,back:b4,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+47656e6572696320582d426f78207061,Xbox Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+4d6963726f736f667420582d426f7820,Xbox Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a4,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+64633436313965656664373634323364,Xbox Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b19,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e04000091020000ff073f00,Xbox One Controller,a:b0,b:b1,back:b4,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+050000005e04000091020000ff073f80,Xbox One Controller,a:b0,b:b1,back:b4,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000e00200000ffe3f00,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000e00200000ffe3f80,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b3,leftstick:b15,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a2,righty:a3,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000e0020000ffff3f00,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b4,leftshoulder:b3,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000e0020000ffff3f80,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b4,leftshoulder:b3,leftstick:b8,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b7,righttrigger:a5,rightx:a2,righty:a3,start:b10,x:b17,y:b2,platform:Android,
+050000005e040000fd020000ffff3f00,Xbox One Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+33356661323266333733373865656366,Xbox One Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+34356136633366613530316338376136,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b3,leftstick:b15,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b18,rightstick:b16,righttrigger:a5,rightx:a3,righty:a4,x:b17,y:b2,platform:Android,
+35623965373264386238353433656138,Xbox One Controller,a:b0,b:b1,back:b4,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+36616131643361333337396261666433,Xbox One Controller,a:b0,b:b1,back:b15,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+58626f7820576972656c65737320436f,Xbox One Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000000b000000783f00,Xbox One Elite 2 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000000b000000783f80,Xbox One Elite 2 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000050b0000ffff3f00,Xbox One Elite 2 Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a6,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000e002000000783f00,Xbox One S Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000ea02000000783f00,Xbox One S Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000fd020000ff7f3f00,Xbox One S Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000120b000000783f00,Xbox Series Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000120b000000783f80,Xbox Series Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000005e040000130b0000ffff3f00,Xbox Series Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+65633038363832353634653836396239,Xbox Series Controller,a:b0,b:b1,back:b15,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b5,leftshoulder:b9,leftstick:b7,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a5,rightx:a2,righty:a3,start:b6,x:b2,y:b3,platform:Android,
+050000001727000044310000ffff3f00,XiaoMi Controller,a:b0,b:b1,back:b4,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,leftshoulder:b9,leftstick:b7,lefttrigger:a7,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b8,righttrigger:a6,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Android,
+
+# iOS
+05000000ac0500000100000000006d01,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,x:b2,y:b3,platform:iOS,
+05000000ac050000010000004f066d01,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,x:b2,y:b3,platform:iOS,
+05000000ac05000001000000cf076d01,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b2,y:b3,platform:iOS,
+05000000ac05000001000000df076d01,*,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+05000000ac05000001000000ff076d01,*,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+05000000ac0500000200000000006d02,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b2,y:b3,platform:iOS,
+05000000ac050000020000004f066d02,*,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b2,y:b3,platform:iOS,
+050000008a35000003010000ff070000,Backbone One,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000008a35000004010000ff070000,Backbone One,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+4d466947616d65706164010000000000,MFi Extended Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a5,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:iOS,
+4d466947616d65706164020000000000,MFi Gamepad,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,rightshoulder:b5,start:b6,x:b2,y:b3,platform:iOS,
+050000007e050000062000000f060000,Nintendo Switch Joy-Con (L),+leftx:h0.2,+lefty:h0.4,-leftx:h0.8,-lefty:h0.1,a:b0,b:b2,leftshoulder:b4,rightshoulder:b5,x:b1,y:b3,platform:iOS,
+050000007e050000062000004f060000,Nintendo Switch Joy-Con (L),+leftx:h0.1,+lefty:h0.2,-leftx:h0.4,-lefty:h0.8,dpdown:b2,dpleft:b0,dpright:b3,dpup:b1,leftshoulder:b4,misc1:b6,rightshoulder:b5,platform:iOS,
+050000007e05000008200000df070000,Nintendo Switch Joy-Con (L/R),a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000007e0500000e200000df070000,Nintendo Switch Joy-Con (L/R),a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:iOS,
+050000007e050000072000004f060000,Nintendo Switch Joy-Con (R),+rightx:h0.4,+righty:h0.8,-rightx:h0.1,-righty:h0.2,a:b1,b:b0,guide:b6,leftshoulder:b4,rightshoulder:b5,x:b3,y:b2,platform:iOS,
+050000007e05000009200000df870000,Nintendo Switch Pro Controller,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b10,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b3,y:b2,platform:iOS,
+050000007e05000009200000ff870000,Nintendo Switch Pro Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000df070000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000df870001,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000ff070000,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000ff870001,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,touchpad:b11,x:b2,y:b3,platform:iOS,
+050000004c050000cc090000ff876d01,PS4 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000004c050000e60c0000df870000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,touchpad:b10,x:b2,y:b3,platform:iOS,
+050000004c050000e60c0000ff870000,PS5 Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,touchpad:b11,x:b2,y:b3,platform:iOS,
+05000000ac0500000300000000006d03,Remote,a:b0,b:b2,leftx:a0,lefty:a1,platform:iOS,
+05000000ac0500000300000043006d03,Remote,a:b0,b:b2,leftx:a0,lefty:a1,platform:iOS,
+05000000de2800000511000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:iOS,
+05000000de2800000611000001000000,Steam Controller,a:b0,b:b1,back:b6,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a3,start:b7,x:b2,y:b3,platform:iOS,
+050000005e040000050b0000df070001,Xbox Elite Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b10,paddle2:b12,paddle3:b11,paddle4:b13,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000005e040000050b0000ff070001,Xbox Elite Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,paddle1:b11,paddle2:b13,paddle3:b12,paddle4:b14,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000005e040000e0020000df070000,Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000005e040000e0020000ff070000,Xbox One Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
+050000005e040000130b0000df870001,Xbox Series X Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b10,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:iOS,
+050000005e040000130b0000ff870001,Xbox Series X Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b9,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,misc1:b11,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b10,x:b2,y:b3,platform:iOS,
\ No newline at end of file
diff --git a/deps/SDL2/macOS/libSDL2.dylib b/deps/SDL2/macOS/libSDL2.dylib
index 4f2407ce2e..4e3311c436 100644
--- a/deps/SDL2/macOS/libSDL2.dylib
+++ b/deps/SDL2/macOS/libSDL2.dylib
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c01d7de4de91278c6f895271a0aaa8fa6e20f3f121771ff43687331a528c9a7
-size 1307232
+oid sha256:21827eef9a41a9b3c283d832ad64a207b77169f8d13fb9cbeb11cf47d74868a1
+size 1283460
diff --git a/deps/SharpVulkan/Other/SharpVulkan.dll b/deps/SharpVulkan/Other/SharpVulkan.dll
deleted file mode 100644
index faa1cdec0d..0000000000
--- a/deps/SharpVulkan/Other/SharpVulkan.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9244b489319006d979030f99a51fa7775f177c5242589faa399bc8118ecef4a0
-size 115712
diff --git a/deps/SharpVulkan/Other/SharpVulkan.pdb b/deps/SharpVulkan/Other/SharpVulkan.pdb
deleted file mode 100644
index f30422c83e..0000000000
--- a/deps/SharpVulkan/Other/SharpVulkan.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5930544d1492211e21ff8648e65bd361cdbad3a6a55c9eed2d74a33e2151769
-size 23072
diff --git a/deps/SharpVulkan/Windows/SharpVulkan.dll b/deps/SharpVulkan/Windows/SharpVulkan.dll
deleted file mode 100644
index e18604b65c..0000000000
--- a/deps/SharpVulkan/Windows/SharpVulkan.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0a0ac69d935f89d0aaf3e169b9a8289c3e65d77d9e870eba8cb17a5b86ff357
-size 115712
diff --git a/deps/SharpVulkan/Windows/SharpVulkan.pdb b/deps/SharpVulkan/Windows/SharpVulkan.pdb
deleted file mode 100644
index f30422c83e..0000000000
--- a/deps/SharpVulkan/Windows/SharpVulkan.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5930544d1492211e21ff8648e65bd361cdbad3a6a55c9eed2d74a33e2151769
-size 23072
diff --git a/deps/SharpVulkan/build.bat b/deps/SharpVulkan/build.bat
deleted file mode 100644
index 5316a6d410..0000000000
--- a/deps/SharpVulkan/build.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-@echo off
-
-if "%1" == "" (
-	echo Missing Debug or Release argument
-	EXIT /B 1
-)
-
-pushd ..\..\externals\SharpVulkan\Source\SharpVulkan
-
-REM SDL2-CS
-call "%PROGRAMFILES(X86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\VsMSBuildCmd.bat"
-msbuild /p:Configuration="%1" /p:SharpVulkanPlatformDefine=PLATFORM_WINDOWS /p:SharpVulkanPlatformName=Windows SharpVulkan.csproj /restore
-if %ERRORLEVEL% neq 0 (
-	echo Error during compilation
-	popd
-	EXIT /B %ERRORLEVEL%
-)
-
-msbuild /p:Configuration="%1" /p:SharpVulkanPlatformDefine=PLATFORM_MACOS /p:SharpVulkanPlatformName=macOS SharpVulkan.csproj /restore
-if %ERRORLEVEL% neq 0 (
-	echo Error during compilation
-	popd
-	EXIT /B %ERRORLEVEL%
-)
-
-msbuild /p:Configuration="%1" /p:SharpVulkanPlatformName=Other SharpVulkan.csproj /restore
-if %ERRORLEVEL% neq 0 (
-	echo Error during compilation
-	popd
-	EXIT /B %ERRORLEVEL%
-)
-
-popd
-
-rem Copying assemblies
-copy ..\..\externals\SharpVulkan\Source\SharpVulkan\bin\%1\Windows\*.* Windows
-copy ..\..\externals\SharpVulkan\Source\SharpVulkan\bin\%1\macOS\*.* macOS
-copy ..\..\externals\SharpVulkan\Source\SharpVulkan\bin\%1\Other\*.* Other
diff --git a/deps/SharpVulkan/checkout.bat b/deps/SharpVulkan/checkout.bat
deleted file mode 100644
index 17c83ca099..0000000000
--- a/deps/SharpVulkan/checkout.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-CALL ..\find_git.cmd
-IF NOT ERRORLEVEL 0 (
-  ECHO "Could not find git.exe"
-  EXIT /B %ERRORLEVEL%
-) 
-%GIT_CMD% clone https://github.com/xenko3d/SharpVulkan ../../externals/SharpVulkan
-IF NOT ERRORLEVEL 0 PAUSE
-
diff --git a/deps/SharpVulkan/macOS/SharpVulkan.dll b/deps/SharpVulkan/macOS/SharpVulkan.dll
deleted file mode 100644
index fe9ba9d7ea..0000000000
--- a/deps/SharpVulkan/macOS/SharpVulkan.dll
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fe59be2789fe618181360ad5536d1d3cdd22b9eb26bf9cfca4643f4b8c6068f1
-size 115712
diff --git a/deps/SharpVulkan/macOS/SharpVulkan.pdb b/deps/SharpVulkan/macOS/SharpVulkan.pdb
deleted file mode 100644
index f30422c83e..0000000000
--- a/deps/SharpVulkan/macOS/SharpVulkan.pdb
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5930544d1492211e21ff8648e65bd361cdbad3a6a55c9eed2d74a33e2151769
-size 23072
diff --git a/deps/TextureWrappers/Debug/x64/AtitcWrapper.dll b/deps/TextureWrappers/Debug/x64/AtitcWrapper.dll
index 8df8a58d0c..d3f1b2d53d 100644
--- a/deps/TextureWrappers/Debug/x64/AtitcWrapper.dll
+++ b/deps/TextureWrappers/Debug/x64/AtitcWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:43f6ddf666fc14ee91a995d18d8baa8e03d69945cdb79194113c266fadc501e5
-size 773632
+oid sha256:f2d8125ccf5a03e7c2acdcdbcf16752de84411b076478c44fe580a56edcefede
+size 785408
diff --git a/deps/TextureWrappers/Debug/x64/AtitcWrapper.pdb b/deps/TextureWrappers/Debug/x64/AtitcWrapper.pdb
index 506b51101a..6d6fec1317 100644
--- a/deps/TextureWrappers/Debug/x64/AtitcWrapper.pdb
+++ b/deps/TextureWrappers/Debug/x64/AtitcWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:aa1677074a92a87ad5df330a07180daa736dafe6b35adba580ad021c00554670
-size 855040
+oid sha256:28919087672fa12c887acbe09b60eeff16a0afc85579816ba6e1cf6a9463867f
+size 790528
diff --git a/deps/TextureWrappers/Debug/x64/DxtWrapper.dll b/deps/TextureWrappers/Debug/x64/DxtWrapper.dll
index 3d34dd1281..3ebc43f605 100644
--- a/deps/TextureWrappers/Debug/x64/DxtWrapper.dll
+++ b/deps/TextureWrappers/Debug/x64/DxtWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2323fe3f748acbb703ac04060fe34c0a6b19ef9f3006a322010871a74f7cff44
-size 926720
+oid sha256:cd7b1f91df1a76b68a3e2ef0762cdfd2f88457ab06643a34e6cd557c82c86504
+size 988160
diff --git a/deps/TextureWrappers/Debug/x64/DxtWrapper.pdb b/deps/TextureWrappers/Debug/x64/DxtWrapper.pdb
index 2d3919ae09..9765077d45 100644
--- a/deps/TextureWrappers/Debug/x64/DxtWrapper.pdb
+++ b/deps/TextureWrappers/Debug/x64/DxtWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2fb2bcf770452f1dd2172e4efd5b09fb2c7d53edb946886d36deef0c3b0156a
-size 4721664
+oid sha256:a3ceebe1e3e13e590f2b79868ffc0e968224e4b287a70c8773969730bc4b87d4
+size 1806336
diff --git a/deps/TextureWrappers/Debug/x64/PvrttWrapper.dll b/deps/TextureWrappers/Debug/x64/PvrttWrapper.dll
index 92ecb76da3..74f324b25e 100644
--- a/deps/TextureWrappers/Debug/x64/PvrttWrapper.dll
+++ b/deps/TextureWrappers/Debug/x64/PvrttWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec5c3c4cb5e9bf9769501177acc4ca18be42fe4982ea6bf3c54c5ea3806d707b
-size 101888
+oid sha256:c5f2b585d77e55848855082e20c48d476a05a0c045f9ade6fe3570935c271cf4
+size 3765248
diff --git a/deps/TextureWrappers/Debug/x64/PvrttWrapper.pdb b/deps/TextureWrappers/Debug/x64/PvrttWrapper.pdb
index b52e991a3e..ab7c09c94f 100644
--- a/deps/TextureWrappers/Debug/x64/PvrttWrapper.pdb
+++ b/deps/TextureWrappers/Debug/x64/PvrttWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07f0c87e38290dc555a3f09253836f2beb993101cca473484e296d51190156ca
-size 879616
+oid sha256:352edf7bec9c4efeacbba934408115a59ab883c661df6668c92a8898790ca5a3
+size 1118208
diff --git a/deps/TextureWrappers/Debug/x86/AtitcWrapper.dll b/deps/TextureWrappers/Debug/x86/AtitcWrapper.dll
index a727181c2d..a0fa70eb7d 100644
--- a/deps/TextureWrappers/Debug/x86/AtitcWrapper.dll
+++ b/deps/TextureWrappers/Debug/x86/AtitcWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e4698d399bc77f46af41382744d1b4ba1ef1e6c6da20a5247fd3a4c06ec1272
-size 651264
+oid sha256:3df89f4701f794cd4717cb6d3b1261f4ced05b0564cd25203f9933a38217d5ad
+size 653824
diff --git a/deps/TextureWrappers/Debug/x86/AtitcWrapper.pdb b/deps/TextureWrappers/Debug/x86/AtitcWrapper.pdb
index 2448a69a3b..632a702425 100644
--- a/deps/TextureWrappers/Debug/x86/AtitcWrapper.pdb
+++ b/deps/TextureWrappers/Debug/x86/AtitcWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:470a178b124f9468271f1223e70f2edec608e6c8d08f7941b20aa7a92d894453
-size 733184
+oid sha256:cf91977b8118a295c1bce88962c46074f6b00c4339d2768d747d9af3170aa64b
+size 757760
diff --git a/deps/TextureWrappers/Debug/x86/DxtWrapper.dll b/deps/TextureWrappers/Debug/x86/DxtWrapper.dll
index f614d8d6e9..008a5e835a 100644
--- a/deps/TextureWrappers/Debug/x86/DxtWrapper.dll
+++ b/deps/TextureWrappers/Debug/x86/DxtWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f78dec360f13da27bd883d72777c56eadee7373f6567bb760f6231b88a4015f
-size 764416
+oid sha256:b502a8edbeba1b9fe576b539b16106bef6df826ffd31f74bde753caff32eecd3
+size 754176
diff --git a/deps/TextureWrappers/Debug/x86/DxtWrapper.pdb b/deps/TextureWrappers/Debug/x86/DxtWrapper.pdb
index 3fc641c212..44aaf27092 100644
--- a/deps/TextureWrappers/Debug/x86/DxtWrapper.pdb
+++ b/deps/TextureWrappers/Debug/x86/DxtWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:16276f1b2600a9be6395c3da140d7aab954dd4a5b2ef99359459c6f3a9c5e96f
-size 1929216
+oid sha256:ba15ad836f8a700baebeae6eb32baf84bd5cbaf3cc594f2092d61c795efd3ef2
+size 1896448
diff --git a/deps/TextureWrappers/Debug/x86/PvrttWrapper.dll b/deps/TextureWrappers/Debug/x86/PvrttWrapper.dll
index 6c2783fb7b..a450e29413 100644
--- a/deps/TextureWrappers/Debug/x86/PvrttWrapper.dll
+++ b/deps/TextureWrappers/Debug/x86/PvrttWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f3c2822b17698bb29d3564b23025b3e8d71d5fc3c619bee7bb57416b2613810
-size 78336
+oid sha256:a9dda5b511882cd26b2bc8a095a635d1b27b00353509a3eb9ce0ee9941477d59
+size 3564544
diff --git a/deps/TextureWrappers/Debug/x86/PvrttWrapper.pdb b/deps/TextureWrappers/Debug/x86/PvrttWrapper.pdb
index 30c0ef9d79..80e5ea70ce 100644
--- a/deps/TextureWrappers/Debug/x86/PvrttWrapper.pdb
+++ b/deps/TextureWrappers/Debug/x86/PvrttWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1716b4e277a7ac0445bb39b1e43626e25d4e0fe88221161598333207bf4ad6a6
-size 512000
+oid sha256:b7ed578fecdc89ae8f8771c522932b544c01ee35d1cc5e6468929d305a184aad
+size 1413120
diff --git a/deps/TextureWrappers/Release/x64/AtitcWrapper.dll b/deps/TextureWrappers/Release/x64/AtitcWrapper.dll
index ee280159fc..f4cb141524 100644
--- a/deps/TextureWrappers/Release/x64/AtitcWrapper.dll
+++ b/deps/TextureWrappers/Release/x64/AtitcWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce23e245b5cd5d6b83fba888c37acb3117b6bb51e60351aaebd37515a2b96b92
+oid sha256:cd9132012ed0591cff258d2ae019eb80598b5eae54b04cb7bf4fcda231845c8c
 size 588800
diff --git a/deps/TextureWrappers/Release/x64/AtitcWrapper.pdb b/deps/TextureWrappers/Release/x64/AtitcWrapper.pdb
index 176d1b2bcd..27847a0b50 100644
--- a/deps/TextureWrappers/Release/x64/AtitcWrapper.pdb
+++ b/deps/TextureWrappers/Release/x64/AtitcWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6a3763585fa3a87cfa6eb562a47601297acd17dcdff0dc6f437cc1cdb7f939bb
+oid sha256:8fd46c9249540b1af44ed2485e12885c601ff2c499c41acea3f46872da8ebf5c
 size 757760
diff --git a/deps/TextureWrappers/Release/x64/DxtWrapper.dll b/deps/TextureWrappers/Release/x64/DxtWrapper.dll
index ed7e13087a..214b8634c0 100644
--- a/deps/TextureWrappers/Release/x64/DxtWrapper.dll
+++ b/deps/TextureWrappers/Release/x64/DxtWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1ab2a16d37165bdadf4c5efc6590cb729deb023192b50f3a88d74d44d3674d3
-size 250368
+oid sha256:ec674dc66570198c6ac2aed2d365b6ea6d56c31407144313740a168627a2711c
+size 260608
diff --git a/deps/TextureWrappers/Release/x64/DxtWrapper.pdb b/deps/TextureWrappers/Release/x64/DxtWrapper.pdb
index 098cee8ade..976f3a2754 100644
--- a/deps/TextureWrappers/Release/x64/DxtWrapper.pdb
+++ b/deps/TextureWrappers/Release/x64/DxtWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5de8e0fc317db0e97a16ca5e2f86f2f4e6eeff9fcf6dac3217cec02eb9d6578b
-size 3682304
+oid sha256:63e5fc360e441e9380abf028b84cad06a71313d83b2c69c2abf1df89647fb89f
+size 3133440
diff --git a/deps/TextureWrappers/Release/x64/PvrttWrapper.dll b/deps/TextureWrappers/Release/x64/PvrttWrapper.dll
index 17e00aafe6..bfc9ef4333 100644
--- a/deps/TextureWrappers/Release/x64/PvrttWrapper.dll
+++ b/deps/TextureWrappers/Release/x64/PvrttWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5f267fb90f265bf078f74724ae6ddc10f7a188f4b138ae6183802549ae8e080
-size 19456
+oid sha256:a5043f0fcf13c203e65660f5c72fb7635ab925d7535204c36935d3494a07a6ce
+size 2849280
diff --git a/deps/TextureWrappers/Release/x64/PvrttWrapper.pdb b/deps/TextureWrappers/Release/x64/PvrttWrapper.pdb
index c5561d4b0e..90ce8d8a82 100644
--- a/deps/TextureWrappers/Release/x64/PvrttWrapper.pdb
+++ b/deps/TextureWrappers/Release/x64/PvrttWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93357533ee2227668f08e9afc7650c6f4d4bc2ecae76c39c5b4ab0ead85f0079
-size 503808
+oid sha256:501157c577dfd76201e2adc747bc164a5ea06559b27800cb444ff07a0a104dff
+size 1191936
diff --git a/deps/TextureWrappers/Release/x86/AtitcWrapper.dll b/deps/TextureWrappers/Release/x86/AtitcWrapper.dll
index 76adb90758..72cba93f89 100644
--- a/deps/TextureWrappers/Release/x86/AtitcWrapper.dll
+++ b/deps/TextureWrappers/Release/x86/AtitcWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38cbd1928b357364b6c5d74b9f5e32089fa776a9e4d63cb02212837aae6c0c11
-size 489984
+oid sha256:e7b060d939d4d94efdd27e17c3c4f91fce91ab9361760be07ac6987d9eeca3d2
+size 490496
diff --git a/deps/TextureWrappers/Release/x86/AtitcWrapper.pdb b/deps/TextureWrappers/Release/x86/AtitcWrapper.pdb
index 20062a1f48..2ac6610d69 100644
--- a/deps/TextureWrappers/Release/x86/AtitcWrapper.pdb
+++ b/deps/TextureWrappers/Release/x86/AtitcWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6eefc48a9df1cbf698eba106965e69b69aaa65c11f4a04e64968cbaf065b1e5e
-size 782336
+oid sha256:437dc9babb92f0a03ef8972edda1148c05d514a7e36d6fc246b45e8682b48214
+size 741376
diff --git a/deps/TextureWrappers/Release/x86/DxtWrapper.dll b/deps/TextureWrappers/Release/x86/DxtWrapper.dll
index cb0efc86c6..3177ff9116 100644
--- a/deps/TextureWrappers/Release/x86/DxtWrapper.dll
+++ b/deps/TextureWrappers/Release/x86/DxtWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a162680ec416d8f057436e3d31ae005a457a0be0d24dcad2b48410a537faa8b0
-size 217600
+oid sha256:00c280c6919da340604fe7b874bc260e73a3c9acdaeb9be41ffa3ceaabd431dd
+size 223232
diff --git a/deps/TextureWrappers/Release/x86/DxtWrapper.pdb b/deps/TextureWrappers/Release/x86/DxtWrapper.pdb
index 312bcee2f5..ed8846cdac 100644
--- a/deps/TextureWrappers/Release/x86/DxtWrapper.pdb
+++ b/deps/TextureWrappers/Release/x86/DxtWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccb18aeb4aa3c1dfb84fab9eb3c8dfbfea5112089a9be157747c66b32b83dcf0
-size 4263936
+oid sha256:1985ef7078ee45d0dcff4eb7018db37c6f52ebc12d2cdfe83402c2751301f4a0
+size 3149824
diff --git a/deps/TextureWrappers/Release/x86/PvrttWrapper.dll b/deps/TextureWrappers/Release/x86/PvrttWrapper.dll
index b3e590e4a6..15e264e1cd 100644
--- a/deps/TextureWrappers/Release/x86/PvrttWrapper.dll
+++ b/deps/TextureWrappers/Release/x86/PvrttWrapper.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2aadad513e04ac3371c58bea12f6e0551e514cffd039c32aa1e105a1e014a246
-size 15872
+oid sha256:b1e09b968aacde5d3ac7239bd9473fc364881d6a330274e386d1d9021ca6dd06
+size 2723328
diff --git a/deps/TextureWrappers/Release/x86/PvrttWrapper.pdb b/deps/TextureWrappers/Release/x86/PvrttWrapper.pdb
index 1ec17a7d0d..f0c7504959 100644
--- a/deps/TextureWrappers/Release/x86/PvrttWrapper.pdb
+++ b/deps/TextureWrappers/Release/x86/PvrttWrapper.pdb
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62da6b85eb8e14d23e47e457740885dd7591f2a65b12ad83fc1ebd747fb95508
-size 569344
+oid sha256:5e0470e9dc4060fd209cf68988d55ce2591a98cc7de84ca395e95cba83787627
+size 1191936
diff --git a/deps/VHACD/build.bat b/deps/VHACD/build.bat
index 2c0115c69b..94722cd580 100644
--- a/deps/VHACD/build.bat
+++ b/deps/VHACD/build.bat
@@ -1,7 +1,8 @@
-pushd ..\..\externals\bullet2-sharp-mobile\src\Windows
+pushd ..\..\externals\BulletSharpPInvoke\src\VHACD_Lib\VHACD
 
 REM Compile vhacd
-call build-vhacd-windows.bat
+msbuild VHACD.vcxproj /p:Configuration=Release;Platform=x64
+msbuild VHACD.vcxproj /p:Configuration=Release;Platform=Win32
 if %ERRORLEVEL% neq 0 GOTO :error_popd
 popd
 
@@ -9,8 +10,8 @@ REM Create folders
 mkdir x86
 mkdir x64
 
-copy ..\..\externals\bullet2-sharp-mobile\src\VHACD_Lib\VHACD\Release\*.dll x86
-copy ..\..\externals\bullet2-sharp-mobile\src\VHACD_Lib\VHACD\x64\Release\*.dll x64
+copy ..\..\externals\BulletSharpPInvoke\src\VHACD_Lib\VHACD\Release\*.dll x86
+copy ..\..\externals\BulletSharpPInvoke\src\VHACD_Lib\VHACD\x64\Release\*.dll x64
 
 GOTO :end
 :error_popd
diff --git a/deps/VHACD/x64/VHACD.dll b/deps/VHACD/x64/VHACD.dll
index 13c430caa4..62939c7f69 100644
--- a/deps/VHACD/x64/VHACD.dll
+++ b/deps/VHACD/x64/VHACD.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7e23ac79a0d1dd448aa163404b0cb7b8b556866cc7c4d770ec677ddc37e8f44
-size 175616
+oid sha256:1f96e453cf819ce151d1eaa0c70438310cd0118acbfb37dd90d502cbc05e55fa
+size 159232
diff --git a/deps/VHACD/x86/VHACD.dll b/deps/VHACD/x86/VHACD.dll
index 2b8828c3c2..b905214bc5 100644
--- a/deps/VHACD/x86/VHACD.dll
+++ b/deps/VHACD/x86/VHACD.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:19ca0604b31e005354d3eb8d34c031cf23d3edfb01d6775904d94bac3af582ee
-size 152576
+oid sha256:e869ead8faff3ca66b24742eed03a887086111e9eb6ea08b085d12503f5c5020
+size 141824
diff --git a/deps/WindowsRegistry/Microsoft.Win32.Registry.dll b/deps/WindowsRegistry/Microsoft.Win32.Registry.dll
new file mode 100644
index 0000000000..58bd56cc2c
--- /dev/null
+++ b/deps/WindowsRegistry/Microsoft.Win32.Registry.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5738f1e014d65979898848781075db25eede1f14d7e38d68cea6a4c49bc2b2c4
+size 53640
diff --git a/deps/assimp/bin/x64/Assimp64.dll b/deps/assimp/bin/x64/Assimp64.dll
new file mode 100644
index 0000000000..07e8b4b854
--- /dev/null
+++ b/deps/assimp/bin/x64/Assimp64.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7c490d6c6e29e1cf788d84273a30e19ccab96530cf5702a8613be33193076518
+size 6660096
diff --git a/deps/assimp/bin/x64/D3DCompiler_42.dll b/deps/assimp/bin/x64/D3DCompiler_42.dll
new file mode 100644
index 0000000000..6e72d87f8f
--- /dev/null
+++ b/deps/assimp/bin/x64/D3DCompiler_42.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c976311406c23aa71018d274da0ecdef43b6e3a3b0b01e941a5e8e4e974386c
+size 1974616
diff --git a/deps/assimp/bin/x64/D3DX9_42.dll b/deps/assimp/bin/x64/D3DX9_42.dll
new file mode 100644
index 0000000000..4a61fe5506
--- /dev/null
+++ b/deps/assimp/bin/x64/D3DX9_42.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f8b9cfab7fffbc8f98e41aa439d72921dc180634a1febca2a9d41a0df35d3472
+size 1892184
diff --git a/deps/assimp/bin/x64/assimp.exe b/deps/assimp/bin/x64/assimp.exe
new file mode 100644
index 0000000000..557b82636f
--- /dev/null
+++ b/deps/assimp/bin/x64/assimp.exe
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d8d72e23d440497ad00ff95f229bedf8c0911c3bdc25d91a58fbcfdabc23c6a
+size 209408
diff --git a/deps/assimp/bin/x64/assimp_viewer.exe b/deps/assimp/bin/x64/assimp_viewer.exe
new file mode 100644
index 0000000000..e2efec9be9
--- /dev/null
+++ b/deps/assimp/bin/x64/assimp_viewer.exe
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bffdca3e1e43368fc8df936473703d42609fcc9874fca6d0e3e95c2a513b44df
+size 552960
diff --git a/deps/bepuphysics2/BepuPhysics.dll b/deps/bepuphysics2/BepuPhysics.dll
new file mode 100644
index 0000000000..c120406912
--- /dev/null
+++ b/deps/bepuphysics2/BepuPhysics.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79cdb9042aeed4e137415d4a5b6a43de5d4f3a4c68c495e421f1ddf57dd7864c
+size 879616
diff --git a/deps/bepuphysics2/BepuUtilities.dll b/deps/bepuphysics2/BepuUtilities.dll
new file mode 100644
index 0000000000..cf452a9749
--- /dev/null
+++ b/deps/bepuphysics2/BepuUtilities.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72e246cb07d549c5fe1827990c2baf40c4336903001b307c51ea9486c244ca5c
+size 157184
diff --git a/deps/bepuphysics2/Debug/BepuPhysics.dll b/deps/bepuphysics2/Debug/BepuPhysics.dll
new file mode 100644
index 0000000000..3e1f05a80f
--- /dev/null
+++ b/deps/bepuphysics2/Debug/BepuPhysics.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f8fdb5f3f607d0bd553e60928992d5924269ca18fdf39d2fc5a3f47fe040835
+size 830976
diff --git a/deps/bepuphysics2/Debug/BepuPhysics.pdb b/deps/bepuphysics2/Debug/BepuPhysics.pdb
new file mode 100644
index 0000000000..da9b1020f5
--- /dev/null
+++ b/deps/bepuphysics2/Debug/BepuPhysics.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:68d4631923ea23306e8bb9d5ec9dc269689c71e3853e40b8298667be41828acf
+size 419332
diff --git a/deps/bepuphysics2/Debug/BepuUtilities.dll b/deps/bepuphysics2/Debug/BepuUtilities.dll
new file mode 100644
index 0000000000..0d14fa727c
--- /dev/null
+++ b/deps/bepuphysics2/Debug/BepuUtilities.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c3338ac85ad7705e875561945a82b229d2b93f6d10987b3b48bc0e0e496170b
+size 152064
diff --git a/deps/bepuphysics2/Debug/BepuUtilities.pdb b/deps/bepuphysics2/Debug/BepuUtilities.pdb
new file mode 100644
index 0000000000..d6cef5e1e3
--- /dev/null
+++ b/deps/bepuphysics2/Debug/BepuUtilities.pdb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:006f060064a5c2310e2f4e28b82c14ae00398eea5ce1470991e81c6710b789b1
+size 75372
diff --git a/deps/bepuphysics2/Release/BepuPhysics.dll b/deps/bepuphysics2/Release/BepuPhysics.dll
new file mode 100644
index 0000000000..c120406912
--- /dev/null
+++ b/deps/bepuphysics2/Release/BepuPhysics.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79cdb9042aeed4e137415d4a5b6a43de5d4f3a4c68c495e421f1ddf57dd7864c
+size 879616
diff --git a/deps/bepuphysics2/Release/BepuUtilities.dll b/deps/bepuphysics2/Release/BepuUtilities.dll
new file mode 100644
index 0000000000..cf452a9749
--- /dev/null
+++ b/deps/bepuphysics2/Release/BepuUtilities.dll
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72e246cb07d549c5fe1827990c2baf40c4336903001b307c51ea9486c244ca5c
+size 157184
diff --git a/deps/freetype/Android/armeabi/libfreetype.so b/deps/freetype/Android/armeabi/libfreetype.so
deleted file mode 100644
index 5eb441fdfe..0000000000
--- a/deps/freetype/Android/armeabi/libfreetype.so
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:36f4c9df3a11830ae3d97cb141d19327a30a5e908a874fc223add2975c400b32
-size 716876
diff --git a/deps/glslang/Linux/glslangValidator b/deps/glslang/Linux/glslangValidator
index 772a7db836..53893ab44b 100644
--- a/deps/glslang/Linux/glslangValidator
+++ b/deps/glslang/Linux/glslangValidator
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5597a562721da4c8153d61ec189d5bd2751dd31f63c3e4db810530b906b71df6
-size 1641090
+oid sha256:82aff71e096ebee938455fa2e3dbccbc5504709bd7ef73aa3f1bf2642fb02fb8
+size 5757268
diff --git a/deps/glslang/README.md b/deps/glslang/README.md
new file mode 100644
index 0000000000..bc644b96d0
--- /dev/null
+++ b/deps/glslang/README.md
@@ -0,0 +1,5 @@
+glslang
+=======
+
+Downloaded from https://github.com/KhronosGroup/glslang/releases/tag/7.11.3214
+Release versions
diff --git a/deps/glslang/Windows/glslangValidator.exe b/deps/glslang/Windows/glslangValidator.exe
index b7d942b9be..cc9b635bf5 100644
--- a/deps/glslang/Windows/glslangValidator.exe
+++ b/deps/glslang/Windows/glslangValidator.exe
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a5f568052b11b54ad17de24008bfb7c6e5367a0251786dc05cf6143eb887de16
-size 858912
+oid sha256:1995da26768ef6aa55aea28e3ad6e3c20f47e4072b52e3406850058dcb955e10
+size 4182528
diff --git a/deps/glslang/macOS/glslangValidator b/deps/glslang/macOS/glslangValidator
index 65dab5950a..810ed2ead0 100644
--- a/deps/glslang/macOS/glslangValidator
+++ b/deps/glslang/macOS/glslangValidator
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f3130b88aeb933c37bd3d3031e87d4dced2c290406a318e0f7a7f6b5b2955c27
-size 5823048
+oid sha256:ac7394700b3cd860ac7503485f43281693c20e0ad0563230087de47898d09b70
+size 6104252
diff --git a/deps/Mono.Cecil/.gitignore b/deps/monolinker/.gitignore
similarity index 100%
rename from deps/Mono.Cecil/.gitignore
rename to deps/monolinker/.gitignore
diff --git a/deps/Mono.Cecil/License.txt b/deps/monolinker/License.txt
similarity index 100%
rename from deps/Mono.Cecil/License.txt
rename to deps/monolinker/License.txt
diff --git a/deps/Mono.Cecil/Mono.Cecil.Mdb.dll b/deps/monolinker/Mono.Cecil.Mdb.dll
similarity index 100%
rename from deps/Mono.Cecil/Mono.Cecil.Mdb.dll
rename to deps/monolinker/Mono.Cecil.Mdb.dll
diff --git a/deps/Mono.Cecil/Mono.Cecil.Pdb.dll b/deps/monolinker/Mono.Cecil.Pdb.dll
similarity index 100%
rename from deps/Mono.Cecil/Mono.Cecil.Pdb.dll
rename to deps/monolinker/Mono.Cecil.Pdb.dll
diff --git a/deps/Mono.Cecil/Mono.Cecil.dll b/deps/monolinker/Mono.Cecil.dll
similarity index 100%
rename from deps/Mono.Cecil/Mono.Cecil.dll
rename to deps/monolinker/Mono.Cecil.dll
diff --git a/deps/Mono.Cecil/monolinker.exe b/deps/monolinker/monolinker.exe
similarity index 100%
rename from deps/Mono.Cecil/monolinker.exe
rename to deps/monolinker/monolinker.exe
diff --git a/samples/Audio/SimpleAudio/Assets/Shared/GameSettings.xkgamesettings b/samples/Audio/SimpleAudio/Assets/Shared/GameSettings.xkgamesettings
index 72112b57e0..17d61ea19a 100644
--- a/samples/Audio/SimpleAudio/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Audio/SimpleAudio/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: e5747128-7063-4215-b67d-7f798285d381
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 5f4a3789-b182-4b32-9088-acbf9e13edb5:Scene
 GraphicsCompositor: c73fddfe-01b7-4fe0-ab60-51f001463388:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Audio/SimpleAudio/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Audio/SimpleAudio/Assets/Shared/GraphicsCompositor.xkgfxcomp
index d2ec4387f9..45a7148f5f 100644
--- a/samples/Audio/SimpleAudio/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Audio/SimpleAudio/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: c73fddfe-01b7-4fe0-ab60-51f001463388
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,19 +91,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: b461da84-8226-4ca7-b475-02c695905706
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 57e08c0b-503c-44d7-9d9b-8ba93e72fea6
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! b461da84-8226-4ca7-b475-02c695905706
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! b461da84-8226-4ca7-b475-02c695905706
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj b/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj
index 0dc3dda92e..e262dad866 100644
--- a/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj
+++ b/samples/Audio/SimpleAudio/SimpleAudio.Game/SimpleAudio.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>SimpleAudio</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Audio/SimpleAudio/SimpleAudio.Windows/Resources/Icon.ico b/samples/Audio/SimpleAudio/SimpleAudio.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Audio/SimpleAudio/SimpleAudio.Windows/Resources/Icon.ico and b/samples/Audio/SimpleAudio/SimpleAudio.Windows/Resources/Icon.ico differ
diff --git a/samples/Games/JumpyJet/Assets/Shared/GameSettings.xkgamesettings b/samples/Games/JumpyJet/Assets/Shared/GameSettings.xkgamesettings
index 3fdea08293..d45e769338 100644
--- a/samples/Games/JumpyJet/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Games/JumpyJet/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 01d3d03e-3826-4da4-982f-449133dec729
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 286382bf-b1c4-41b4-b566-949b1ad1e443:Scene
 GraphicsCompositor: 5f2073ff-fa35-4484-a925-0b899d8e759d:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.016667
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Games/JumpyJet/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Games/JumpyJet/Assets/Shared/GraphicsCompositor.xkgfxcomp
index 548d65e453..f01c803c6d 100644
--- a/samples/Games/JumpyJet/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Games/JumpyJet/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 5f2073ff-fa35-4484-a925-0b899d8e759d
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,9 +91,10 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 4bb7b2dc-8c31-4097-bb5c-950933dde3f5
         DebugRenderStages: {}
 Game*: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
@@ -104,6 +105,7 @@ Game*: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
         ParallaxBackgrounds: c3781c30-af81-4faf-a8ab-64aded2f4403:ParallaxBackgrounds
         OpaqueRenderStage*: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
         TransparentRenderStage*: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Games/JumpyJet/Assets/Shared/Scene.xkscene b/samples/Games/JumpyJet/Assets/Shared/Scene.xkscene
index bc0191ae48..d95201a596 100644
--- a/samples/Games/JumpyJet/Assets/Shared/Scene.xkscene
+++ b/samples/Games/JumpyJet/Assets/Shared/Scene.xkscene
@@ -85,8 +85,9 @@ Hierarchy:
                         Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                         Scale: {X: 1.0, Y: 1.0, Z: 1.0}
                         Children: {}
-                    a941cd713c0995458f02918f1c0258bd: !JumpyJet.PipesScript,JumpyJet.Game
-                        Id: 71cd41a9-093c-4595-8f02-918f1c0258bd
+                    a124a98b8ada02d77a29033b4c58dcc8: !JumpyJet.PipesScript,JumpyJet.Game
+                        Id: a3abb282-de05-4800-b279-e562372a4185
+                        PipePrefabUrl: ce7c2b81-110c-4150-bf9a-d902b03b3d41:Pipe Set
         -   Entity:
                 Id: fb0a2c4b-0ae0-47c0-a222-089448e7890c
                 Name: Character
diff --git a/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj b/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj
index 4aeb4da3ec..4223abe768 100644
--- a/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj
+++ b/samples/Games/JumpyJet/JumpyJet.Game/JumpyJet.Game.csproj
@@ -4,11 +4,11 @@
     <RootNamespace>JumpyJet</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Games/JumpyJet/JumpyJet.Game/PipesScript.cs b/samples/Games/JumpyJet/JumpyJet.Game/PipesScript.cs
index 820e903573..c0116509f9 100644
--- a/samples/Games/JumpyJet/JumpyJet.Game/PipesScript.cs
+++ b/samples/Games/JumpyJet/JumpyJet.Game/PipesScript.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization;
 using Xenko.Engine;
 using Xenko.Engine.Events;
 
@@ -29,9 +30,11 @@ public class PipesScript : SyncScript
         private float sceneWidth;
         private float pipeOvervaluedWidth = 1f;
 
+        public UrlReference<Prefab> PipePrefabUrl { get; set; }
+
         public override void Start()
         {
-            var pipeSetPrefab = Content.Load<Prefab>("Pipe Set");
+            var pipeSetPrefab = Content.Load(PipePrefabUrl);
 
             // Create PipeSets
             sceneWidth = GameGlobals.GamePixelToUnitScale*GraphicsDevice.Presenter.BackBuffer.Width;
diff --git a/samples/Games/JumpyJet/JumpyJet.Windows/Resources/Icon.ico b/samples/Games/JumpyJet/JumpyJet.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Games/JumpyJet/JumpyJet.Windows/Resources/Icon.ico and b/samples/Games/JumpyJet/JumpyJet.Windows/Resources/Icon.ico differ
diff --git a/samples/Games/SpaceEscape/Assets/Shared/EffectCompileLog.xkeffectlog b/samples/Games/SpaceEscape/Assets/Shared/EffectCompileLog.xkeffectlog
index 56bdcd5452..01796fb105 100644
--- a/samples/Games/SpaceEscape/Assets/Shared/EffectCompileLog.xkeffectlog
+++ b/samples/Games/SpaceEscape/Assets/Shared/EffectCompileLog.xkeffectlog
@@ -4,20 +4,23 @@ EffectName: SpaceEscapeEffectMain
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -26,12 +29,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -45,20 +51,23 @@ EffectName: SpaceEscapeEffectMain
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaDiscard, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -66,7 +75,8 @@ UsedParameters:
                                 GenericArguments: [Material.AlphaDiscardValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -77,12 +87,15 @@ UsedParameters:
                         ClassName: MaterialSurfaceTransparentAlphaDiscard
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -96,20 +109,23 @@ EffectName: SpaceEscapeEffectMain
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -118,12 +134,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -137,20 +156,23 @@ EffectName: SpaceEscapeEffectMain
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -159,12 +181,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -184,20 +209,23 @@ EffectName: SpaceEscapeEffectMain
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaDiscard, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -205,7 +233,8 @@ UsedParameters:
                                 GenericArguments: [Material.AlphaDiscardValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -216,12 +245,15 @@ UsedParameters:
                         ClassName: MaterialSurfaceTransparentAlphaDiscard
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -241,20 +273,23 @@ EffectName: SpaceEscapeEffectMain
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -263,12 +298,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
diff --git a/samples/Games/SpaceEscape/Assets/Shared/GameSettings.xkgamesettings b/samples/Games/SpaceEscape/Assets/Shared/GameSettings.xkgamesettings
index 50204214a5..10bdc8caf1 100644
--- a/samples/Games/SpaceEscape/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Games/SpaceEscape/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 30ea4b14-3937-4a9c-8b02-2e4bb0f52f26
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 7207a5b4-cbf4-4edc-a7fb-0dfa83e2414e:Scene
 GraphicsCompositor: de5e5f4f-73e4-4411-8fa8-11a0b9aa80c2:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Games/SpaceEscape/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Games/SpaceEscape/Assets/Shared/GraphicsCompositor.xkgfxcomp
index d0ca7fcde8..da99e51a90 100644
--- a/samples/Games/SpaceEscape/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Games/SpaceEscape/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: de5e5f4f-73e4-4411-8fa8-11a0b9aa80c2
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,47 +24,47 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 2dd24df6-33f1-4fc5-8d49-79db348db785
                 TransparentRenderStage: ref!! ab05402a-6b3f-4a95-a079-bedf1617419d
                 EffectName*: SpaceEscapeEffectMain
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! ddc0d74e-006f-439b-8c70-235818496d9d
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! ab05402a-6b3f-4a95-a079-bedf1617419d
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! ddc0d74e-006f-439b-8c70-235818496d9d
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
                     2eda85523d76b3f9e1e7d3e55aab5280: ~(Deleted)
                     5890e37af0e4bbc2cfdc1de648ff07d4: ~(Deleted)
                     411fdcfb9fc388449a0443173dfa3f27: ~(Deleted)
                 ShadowMapRenderer: null
             4e6e32bcbd8f38a663c636bab78dba4a*: !SpaceEscape.Rendering.BendFogRenderFeature,SpaceEscape.Game {}
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 2dd24df6-33f1-4fc5-8d49-79db348db785
                 TransparentRenderStage: ref!! ab05402a-6b3f-4a95-a079-bedf1617419d
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 2dd24df6-33f1-4fc5-8d49-79db348db785
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! ab05402a-6b3f-4a95-a079-bedf1617419d
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -92,19 +92,20 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: fae67d72-4491-4117-99ea-bd8250047c10
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 2a6bcd90-e26a-4017-87b2-5c322e57f92d
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 3f5395d3-5cfe-4e1b-8be7-0988bec3b0c0
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! fae67d72-4491-4117-99ea-bd8250047c10
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! fae67d72-4491-4117-99ea-bd8250047c10
     RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 3f5395d3-5cfe-4e1b-8be7-0988bec3b0c0
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 3f5395d3-5cfe-4e1b-8be7-0988bec3b0c0
diff --git a/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/FogEffect.cs b/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/FogEffect.xksl.cs
similarity index 100%
rename from samples/Games/SpaceEscape/SpaceEscape.Game/Effects/FogEffect.cs
rename to samples/Games/SpaceEscape/SpaceEscape.Game/Effects/FogEffect.xksl.cs
diff --git a/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/SpaceEscapeEffectMain.cs b/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/SpaceEscapeEffectMain.xkfx.cs
similarity index 100%
rename from samples/Games/SpaceEscape/SpaceEscape.Game/Effects/SpaceEscapeEffectMain.cs
rename to samples/Games/SpaceEscape/SpaceEscape.Game/Effects/SpaceEscapeEffectMain.xkfx.cs
diff --git a/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationBendWorld.cs b/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationBendWorld.xksl.cs
similarity index 100%
rename from samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationBendWorld.cs
rename to samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationBendWorld.xksl.cs
diff --git a/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationTextureUV.cs b/samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationTextureUV.xksl.cs
similarity index 100%
rename from samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationTextureUV.cs
rename to samples/Games/SpaceEscape/SpaceEscape.Game/Effects/TransformationTextureUV.xksl.cs
diff --git a/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj b/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj
index 8845a6e88c..c6fa89730a 100644
--- a/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj
+++ b/samples/Games/SpaceEscape/SpaceEscape.Game/SpaceEscape.Game.csproj
@@ -5,52 +5,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Effects\FogEffect.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FogEffect.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\FogEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>FogEffect.xksl</DependentUpon>
-    </Compile>
-    <None Include="Effects\SpaceEscapeEffectMain.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpaceEscapeEffectMain.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\SpaceEscapeEffectMain.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpaceEscapeEffectMain.xkfx</DependentUpon>
-    </Compile>
-    <None Include="Effects\TransformationBendWorld.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationBendWorld.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\TransformationBendWorld.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TransformationBendWorld.xksl</DependentUpon>
-    </Compile>
-    <None Include="Effects\TransformationTextureUV.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationTextureUV.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\TransformationTextureUV.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TransformationTextureUV.xksl</DependentUpon>
-    </Compile>
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Games/SpaceEscape/SpaceEscape.Windows/Resources/Icon.ico b/samples/Games/SpaceEscape/SpaceEscape.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Games/SpaceEscape/SpaceEscape.Windows/Resources/Icon.ico and b/samples/Games/SpaceEscape/SpaceEscape.Windows/Resources/Icon.ico differ
diff --git a/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj b/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj
index 9c284294fe..1f64e741e8 100644
--- a/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj
+++ b/samples/Graphics/AnimatedModel/AnimatedModel.Game/AnimatedModel.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>AnimatedModel</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Graphics/AnimatedModel/AnimatedModel.Windows/Resources/Icon.ico b/samples/Graphics/AnimatedModel/AnimatedModel.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Graphics/AnimatedModel/AnimatedModel.Windows/Resources/Icon.ico and b/samples/Graphics/AnimatedModel/AnimatedModel.Windows/Resources/Icon.ico differ
diff --git a/samples/Graphics/AnimatedModel/Assets/Shared/EffectCompileLog.xkeffectlog b/samples/Graphics/AnimatedModel/Assets/Shared/EffectCompileLog.xkeffectlog
index abde1900df..6c06843799 100644
--- a/samples/Graphics/AnimatedModel/Assets/Shared/EffectCompileLog.xkeffectlog
+++ b/samples/Graphics/AnimatedModel/Assets/Shared/EffectCompileLog.xkeffectlog
@@ -8,20 +8,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -29,7 +32,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -37,14 +41,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -53,7 +59,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -65,13 +72,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -92,20 +102,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -113,14 +126,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -129,7 +144,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -141,12 +157,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -167,20 +186,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -188,14 +210,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -203,7 +227,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -211,7 +236,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -219,7 +245,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -227,7 +254,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -235,7 +263,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -244,7 +273,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -256,12 +286,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -282,20 +315,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -303,14 +339,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -318,7 +356,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -326,7 +365,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -335,7 +375,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -350,12 +391,15 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -376,20 +420,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -398,12 +445,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
diff --git a/samples/Graphics/AnimatedModel/Assets/Shared/GameSettings.xkgamesettings b/samples/Graphics/AnimatedModel/Assets/Shared/GameSettings.xkgamesettings
index 16e8a3ea63..097345e0a6 100644
--- a/samples/Graphics/AnimatedModel/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Graphics/AnimatedModel/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 139fbe2e-f80a-4334-a64b-5a9d10e643c7
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 84efeed8-fdd2-4e9b-9cfb-d4ea3e5aa6aa:Scene
 GraphicsCompositor: 832f0013-9afb-42ad-a8c5-601efec9d95d:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Graphics/AnimatedModel/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Graphics/AnimatedModel/Assets/Shared/GraphicsCompositor.xkgfxcomp
index b7550c673d..cee38c6262 100644
--- a/samples/Graphics/AnimatedModel/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Graphics/AnimatedModel/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 832f0013-9afb-42ad-a8c5-601efec9d95d
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -31,49 +31,49 @@ RenderStages:
         Name: UI
         EffectSlotName: Main
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85*: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85*: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderGroup*: All
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-            8d5b3699e5b44c008d415e378d5aaf64*: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            8d5b3699e5b44c008d415e378d5aaf64*: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderGroup: Group1
                 RenderStage: ref!! e40ae29a-9b90-4288-8169-9e21506ee3d9
                 EffectName: Test
@@ -102,9 +102,10 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 2d551380-5cf6-4c45-b9c2-4983e6320ab0
         DebugRenderStages: {}
     5e26a9708283c4a37389cf296b83206d*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -124,32 +125,36 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-Game*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+Game*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Children:
         0998c63a8edf6ac29bd1b282de30d373: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
             Id: fb31026c-3588-46ac-be9c-39be5729adbe
             Camera: ref!! b52cb3ea-3070-4405-af33-6d9d57a7e4e2
-            Child: !Xenko.Rendering.Compositing.RenderTextureSceneRenderer,Xenko.Engine
+            Child: !Xenko.Rendering.Compositing.RenderTextureSceneRenderer,Xenko.Rendering
                 Id: cc5c9b5d-a888-455f-a4ca-a1bd7c909415
                 RenderTexture: 2355d4e2-1680-48ca-8ad6-34d291c1489d:RenderTexture
                 Child: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! d9252557-23fc-4917-8973-0bd4354053a6
+            RenderMask: All
         cee6682ea104d5d6e73271576ca22678: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
             Id: 0f3e82cf-8863-4902-901b-e310a904d1ef
             Camera: ref!! e68181f0-ebaf-457b-a0e2-b143569d8105
-            Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+            Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
                 Id: 849eb95a-c3da-4373-b573-dad84e43181a
                 Children:
                     8b3451f3d0b53f918c1872c82f6121eb: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-                    03645ddeafe2406cbeb097d7d2e77fed: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Engine
+                    03645ddeafe2406cbeb097d7d2e77fed: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Rendering
                         Id: f90dbaaa-d050-4c2f-a63d-65a6a7d408ce
                         RenderStage: ref!! e40ae29a-9b90-4288-8169-9e21506ee3d9
+            RenderMask: All
         2f9d9b0dfc8c5629466a76a2943ead39: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
             Id: 6bb892e7-7a6d-4d9d-aa51-41a5d8ffb082
             Camera: ref!! e68181f0-ebaf-457b-a0e2-b143569d8105
-            Child: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 2d551380-5cf6-4c45-b9c2-4983e6320ab0
+            Child: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 2d551380-5cf6-4c45-b9c2-4983e6320ab0
+            RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Graphics/AnimatedModel/Assets/Shared/Scene.xkscene b/samples/Graphics/AnimatedModel/Assets/Shared/Scene.xkscene
index 19872eef3a..caf294b76c 100644
--- a/samples/Graphics/AnimatedModel/Assets/Shared/Scene.xkscene
+++ b/samples/Graphics/AnimatedModel/Assets/Shared/Scene.xkscene
@@ -103,8 +103,8 @@ Hierarchy:
                                 Size: Large
                                 DepthRange: {}
                                 PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
-                                ComputeTransmittance: false
                                 BiasParameters: {}
+                                ComputeTransmittance: false
                         Intensity: 0.6
         -   Entity:
                 Id: bb7065d2-498a-45d7-b4b1-0bb1a573cc69
@@ -158,8 +158,8 @@ Hierarchy:
                                 Size: Large
                                 DepthRange: {}
                                 PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
-                                ComputeTransmittance: false
                                 BiasParameters: {}
+                                ComputeTransmittance: false
                         Intensity: 0.6
         -   Entity:
                 Id: df07ee24-de65-4561-8f4a-da086654e07b
diff --git a/samples/Graphics/CustomEffect/Assets/Shared/GameSettings.xkgamesettings b/samples/Graphics/CustomEffect/Assets/Shared/GameSettings.xkgamesettings
index 0cd949191b..40fee6f735 100644
--- a/samples/Graphics/CustomEffect/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Graphics/CustomEffect/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 22ae89be-900a-4a73-a5b5-94907b01732b
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: null
 GraphicsCompositor: c3b08bc2-7b1c-4c48-8982-d32cb86a08de:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Graphics/CustomEffect/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Graphics/CustomEffect/Assets/Shared/GraphicsCompositor.xkgfxcomp
index 9b30aa4f1a..6b228d9c97 100644
--- a/samples/Graphics/CustomEffect/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Graphics/CustomEffect/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: c3b08bc2-7b1c-4c48-8982-d32cb86a08de
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,9 +91,10 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: b9c2164f-3be2-446e-9073-6a88040b8b17
         DebugRenderStages: {}
 Game*: !CustomEffect.CustomEffectRenderer,CustomEffect.Game
diff --git a/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj b/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj
index ba690b1fe9..9a2dd1a514 100644
--- a/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj
+++ b/samples/Graphics/CustomEffect/CustomEffect.Game/CustomEffect.Game.csproj
@@ -4,22 +4,10 @@
     <RootNamespace>CustomEffect</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Effects\Effect.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Effect.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\Effect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Effect.xksl</DependentUpon>
-    </Compile>
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Graphics/CustomEffect/CustomEffect.Game/Effects/Effect.cs b/samples/Graphics/CustomEffect/CustomEffect.Game/Effects/Effect.xksl.cs
similarity index 100%
rename from samples/Graphics/CustomEffect/CustomEffect.Game/Effects/Effect.cs
rename to samples/Graphics/CustomEffect/CustomEffect.Game/Effects/Effect.xksl.cs
diff --git a/samples/Graphics/CustomEffect/CustomEffect.Windows/Resources/Icon.ico b/samples/Graphics/CustomEffect/CustomEffect.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Graphics/CustomEffect/CustomEffect.Windows/Resources/Icon.ico and b/samples/Graphics/CustomEffect/CustomEffect.Windows/Resources/Icon.ico differ
diff --git a/samples/Graphics/CustomEffect/Resources/LogoXenko.png b/samples/Graphics/CustomEffect/Resources/LogoXenko.png
index 765967a7ff..94cc23f633 100644
--- a/samples/Graphics/CustomEffect/Resources/LogoXenko.png
+++ b/samples/Graphics/CustomEffect/Resources/LogoXenko.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3c398902f89e80b7393b425004d29685d595738c38d6f31070c1549cf22e339b
-size 14752
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/samples/Graphics/MaterialShader/Assets/Shared/EffectCompileLog.xkeffectlog b/samples/Graphics/MaterialShader/Assets/Shared/EffectCompileLog.xkeffectlog
index 3d9e06352b..efb4294c67 100644
--- a/samples/Graphics/MaterialShader/Assets/Shared/EffectCompileLog.xkeffectlog
+++ b/samples/Graphics/MaterialShader/Assets/Shared/EffectCompileLog.xkeffectlog
@@ -4,18 +4,21 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.VertexStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDisplacement, r]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorWave
@@ -28,24 +31,29 @@ UsedParameters:
                         GenericArguments: [Position, meshNormal, false]
     Material.VertexStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialDisplacementStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialDisplacementStream
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -53,7 +61,8 @@ UsedParameters:
                                 GenericArguments: [5, 0.1, -0.03]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -61,7 +70,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -69,7 +79,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -77,7 +88,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -86,7 +98,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -98,13 +111,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -119,18 +135,21 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.VertexStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDisplacement, r]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorWave
@@ -143,24 +162,29 @@ UsedParameters:
                         GenericArguments: [Position, meshNormal, false]
     Material.VertexStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialDisplacementStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialDisplacementStream
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -168,7 +192,8 @@ UsedParameters:
                                 GenericArguments: [5, 0.1, -0.03]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -176,7 +201,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -184,7 +210,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -192,7 +219,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -201,7 +229,8 @@ UsedParameters:
                                         GenericArguments: [true]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -213,13 +242,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
diff --git a/samples/Graphics/MaterialShader/Assets/Shared/GameSettings.xkgamesettings b/samples/Graphics/MaterialShader/Assets/Shared/GameSettings.xkgamesettings
index 813f7d50f1..0f1cfdccbc 100644
--- a/samples/Graphics/MaterialShader/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Graphics/MaterialShader/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 87d42653-0603-4da6-be26-7ea6544f959f
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 877bd450-9cd3-48ce-b612-97e7545a5e1f:Scene
 GraphicsCompositor: 00b33396-8cf3-431f-9283-df2c852a340d:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Graphics/MaterialShader/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Graphics/MaterialShader/Assets/Shared/GraphicsCompositor.xkgfxcomp
index b72f727398..80794d6f0f 100644
--- a/samples/Graphics/MaterialShader/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Graphics/MaterialShader/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 00b33396-8cf3-431f-9283-df2c852a340d
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,19 +91,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: c07a60ed-44bb-4d26-93e1-637ddf7001b1
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! d7498257-2125-4118-afef-0aaf351c0471
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 160c53b4-b0ab-4f6d-a1dc-d54076cedd30
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! c07a60ed-44bb-4d26-93e1-637ddf7001b1
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! c07a60ed-44bb-4d26-93e1-637ddf7001b1
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 160c53b4-b0ab-4f6d-a1dc-d54076cedd30
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 160c53b4-b0ab-4f6d-a1dc-d54076cedd30
 BlockPositions: {}
diff --git a/samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWave.cs b/samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWave.xksl.cs
similarity index 100%
rename from samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWave.cs
rename to samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWave.xksl.cs
diff --git a/samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWaveNormal.cs b/samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWaveNormal.xksl.cs
similarity index 100%
rename from samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWaveNormal.cs
rename to samples/Graphics/MaterialShader/MaterialShader.Game/Effects/ComputeColorWaveNormal.xksl.cs
diff --git a/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj b/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj
index eaf9577cb6..6502f60ec7 100644
--- a/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj
+++ b/samples/Graphics/MaterialShader/MaterialShader.Game/MaterialShader.Game.csproj
@@ -4,32 +4,10 @@
     <RootNamespace>MaterialShader</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Effects\ComputeColorWave.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorWave.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ComputeColorWave.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorWave.xksl</DependentUpon>
-    </Compile>
-    <None Include="Effects\ComputeColorWaveNormal.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorWaveNormal.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ComputeColorWaveNormal.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorWaveNormal.xksl</DependentUpon>
-    </Compile>
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Graphics/MaterialShader/MaterialShader.Windows/Resources/Icon.ico b/samples/Graphics/MaterialShader/MaterialShader.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Graphics/MaterialShader/MaterialShader.Windows/Resources/Icon.ico and b/samples/Graphics/MaterialShader/MaterialShader.Windows/Resources/Icon.ico differ
diff --git a/samples/Graphics/SpriteFonts/Assets/Shared/GameSettings.xkgamesettings b/samples/Graphics/SpriteFonts/Assets/Shared/GameSettings.xkgamesettings
index 4e80a5452a..c9af8c40d2 100644
--- a/samples/Graphics/SpriteFonts/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Graphics/SpriteFonts/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 0ce7df5d-66c0-4f28-a28d-579a49e5a7a3
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: null
 GraphicsCompositor: 37c9d129-9559-439d-9181-6e804ff718cf:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Graphics/SpriteFonts/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Graphics/SpriteFonts/Assets/Shared/GraphicsCompositor.xkgfxcomp
index 7d24360778..a6f1c5aab7 100644
--- a/samples/Graphics/SpriteFonts/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Graphics/SpriteFonts/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 37c9d129-9559-439d-9181-6e804ff718cf
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,9 +91,10 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: dfb2772d-7173-4513-909d-43adb42e915f
         DebugRenderStages: {}
 Game*: !SpriteFonts.FontRenderer,SpriteFonts.Game
diff --git a/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj b/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj
index 66005ae1cc..e310aedb45 100644
--- a/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj
+++ b/samples/Graphics/SpriteFonts/SpriteFonts.Game/SpriteFonts.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>SpriteFonts</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Graphics/SpriteFonts/SpriteFonts.Windows/Resources/Icon.ico b/samples/Graphics/SpriteFonts/SpriteFonts.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Graphics/SpriteFonts/SpriteFonts.Windows/Resources/Icon.ico and b/samples/Graphics/SpriteFonts/SpriteFonts.Windows/Resources/Icon.ico differ
diff --git a/samples/Graphics/SpriteStudioDemo/Assets/Shared/Bullet_CS.xkphy b/samples/Graphics/SpriteStudioDemo/Assets/Shared/Bullet_CS.xkphy
index 21fee1a06f..5228a48bbd 100644
--- a/samples/Graphics/SpriteStudioDemo/Assets/Shared/Bullet_CS.xkphy
+++ b/samples/Graphics/SpriteStudioDemo/Assets/Shared/Bullet_CS.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 7946c040-eeda-424d-a2f5-3ede14470c1a
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     f3cf2db302c02d42908f15dcaeaf6ba0: !SphereColliderShapeDesc
diff --git a/samples/Graphics/SpriteStudioDemo/Assets/Shared/GameSettings.xkgamesettings b/samples/Graphics/SpriteStudioDemo/Assets/Shared/GameSettings.xkgamesettings
index 8a33aadfd5..620c170954 100644
--- a/samples/Graphics/SpriteStudioDemo/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Graphics/SpriteStudioDemo/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 0c348282-d28d-4932-9472-0416d131c04d
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: d23da80d-8ef3-4400-9f16-190a9c6bd3b3:SpriteEntityScene
 GraphicsCompositor: 399ae22b-f756-4f77-844d-3d5bfe4b599c:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Graphics/SpriteStudioDemo/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Graphics/SpriteStudioDemo/Assets/Shared/GraphicsCompositor.xkgfxcomp
index 108a72c5bc..783b2900a0 100644
--- a/samples/Graphics/SpriteStudioDemo/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Graphics/SpriteStudioDemo/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 399ae22b-f756-4f77-844d-3d5bfe4b599c
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -75,7 +75,7 @@ RenderFeatures:
         PipelineProcessors: {}
     c5a6b94b452d57606111d9c7482fe906*: !Xenko.SpriteStudio.Runtime.SpriteStudioRenderFeature,Xenko.SpriteStudio.Runtime
         RenderStageSelectors:
-            c01afde0da346a6e9f22ac3ea860226b: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            c01afde0da346a6e9f22ac3ea860226b: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: SpriteStudio
 SharedRenderers:
@@ -96,19 +96,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 228b489b-63c5-4642-9c4a-4421f372df71
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 20be0aae-ab04-4f48-a08a-7e8ae0718d7d
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 228b489b-63c5-4642-9c4a-4421f372df71
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 228b489b-63c5-4642-9c4a-4421f372df71
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Graphics/SpriteStudioDemo/Assets/Shared/enemy_collider.xkphy b/samples/Graphics/SpriteStudioDemo/Assets/Shared/enemy_collider.xkphy
index 6d654e13a1..7a749b4b2b 100644
--- a/samples/Graphics/SpriteStudioDemo/Assets/Shared/enemy_collider.xkphy
+++ b/samples/Graphics/SpriteStudioDemo/Assets/Shared/enemy_collider.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 77a32831-fdf3-41b4-9443-751500fcbc10
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     e803604e1edf064bb9d035b760568ca5: !BoxColliderShapeDesc
diff --git a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj
index eeaee06b5c..6037e257ff 100644
--- a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj
+++ b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Game/SpriteStudioDemo.Game.csproj
@@ -4,12 +4,12 @@
     <RootNamespace>SpriteStudioDemo</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.SpriteStudio.Runtime" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.SpriteStudio.Runtime" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/Resources/Icon.ico b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/Resources/Icon.ico and b/samples/Graphics/SpriteStudioDemo/SpriteStudioDemo.Windows/Resources/Icon.ico differ
diff --git a/samples/Input/GravitySensor/Assets/Shared/GameSettings.xkgamesettings b/samples/Input/GravitySensor/Assets/Shared/GameSettings.xkgamesettings
index b79391319e..d8b5913263 100644
--- a/samples/Input/GravitySensor/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Input/GravitySensor/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: c96947ca-873e-4711-b47c-3241920266b5
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 3b831f6c-eb4c-4276-9f4c-fd6c9fe13f77:Scene
 GraphicsCompositor: 8962575a-b65c-47ff-b8fb-2812b72601dd:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Input/GravitySensor/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Input/GravitySensor/Assets/Shared/GraphicsCompositor.xkgfxcomp
index f0ba419838..ccc6bd769d 100644
--- a/samples/Input/GravitySensor/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Input/GravitySensor/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 8962575a-b65c-47ff-b8fb-2812b72601dd
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,19 +91,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: c4d0ddb1-61b2-4cd3-af9d-d11aecccab58
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! ed330d34-6073-4e57-97f8-6a6a29610451
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! c4d0ddb1-61b2-4cd3-af9d-d11aecccab58
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! c4d0ddb1-61b2-4cd3-af9d-d11aecccab58
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Input/GravitySensor/Assets/Shared/Limit.xkphy b/samples/Input/GravitySensor/Assets/Shared/Limit.xkphy
index a772e8c39e..8fa41e1a2a 100644
--- a/samples/Input/GravitySensor/Assets/Shared/Limit.xkphy
+++ b/samples/Input/GravitySensor/Assets/Shared/Limit.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 46edbb45-f107-4e33-a959-8d5de5aef08b
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dae8609773cd5246806776ec0693a2f3: !StaticPlaneColliderShapeDesc
diff --git a/samples/Input/GravitySensor/Assets/Shared/ball_cs.xkphy b/samples/Input/GravitySensor/Assets/Shared/ball_cs.xkphy
index 85504dd00a..455b746409 100644
--- a/samples/Input/GravitySensor/Assets/Shared/ball_cs.xkphy
+++ b/samples/Input/GravitySensor/Assets/Shared/ball_cs.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: cc052d82-9498-4400-9dbf-dd9a9ee6bf38
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     0aeeb5aa663a6c46b607a063d67912a4: !SphereColliderShapeDesc
diff --git a/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj b/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj
index 365ec720aa..d19f1e2837 100644
--- a/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj
+++ b/samples/Input/GravitySensor/GravitySensor.Game/GravitySensor.Game.csproj
@@ -4,11 +4,11 @@
     <RootNamespace>GravitySensor</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Input/GravitySensor/GravitySensor.Windows/Resources/Icon.ico b/samples/Input/GravitySensor/GravitySensor.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Input/GravitySensor/GravitySensor.Windows/Resources/Icon.ico and b/samples/Input/GravitySensor/GravitySensor.Windows/Resources/Icon.ico differ
diff --git a/samples/Input/TouchInputs/Assets/Shared/GameSettings.xkgamesettings b/samples/Input/TouchInputs/Assets/Shared/GameSettings.xkgamesettings
index 089a8ad54c..c0ce52a1cf 100644
--- a/samples/Input/TouchInputs/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Input/TouchInputs/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: a008e8ac-ccf1-4cf9-9891-6a14af73da17
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 8da52091-f3ce-45a3-8f1b-01fbf1a19f42:TouchInputsScene
 GraphicsCompositor: a1b28f96-7a2b-44d4-b37d-08932e34a43d:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Input/TouchInputs/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Input/TouchInputs/Assets/Shared/GraphicsCompositor.xkgfxcomp
index ab6c2f522f..d25f56eeb5 100644
--- a/samples/Input/TouchInputs/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Input/TouchInputs/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: a1b28f96-7a2b-44d4-b37d-08932e34a43d
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,9 +91,10 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: af9da8de-7620-4208-b47d-4cd44d77c001
         DebugRenderStages: {}
 Game*: !TouchInputs.TouchInputsRenderer,TouchInputs.Game
diff --git a/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj b/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj
index 367a8d6781..202fd97bb0 100644
--- a/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj
+++ b/samples/Input/TouchInputs/TouchInputs.Game/TouchInputs.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>TouchInputs</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Input/TouchInputs/TouchInputs.Windows/Resources/Icon.ico b/samples/Input/TouchInputs/TouchInputs.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Input/TouchInputs/TouchInputs.Windows/Resources/Icon.ico and b/samples/Input/TouchInputs/TouchInputs.Windows/Resources/Icon.ico differ
diff --git a/samples/Particles/ParticlesSample/Assets/Shared/EffectCompileLog.xkeffectlog b/samples/Particles/ParticlesSample/Assets/Shared/EffectCompileLog.xkeffectlog
index 04ac75416a..d6b3b36113 100644
--- a/samples/Particles/ParticlesSample/Assets/Shared/EffectCompileLog.xkeffectlog
+++ b/samples/Particles/ParticlesSample/Assets/Shared/EffectCompileLog.xkeffectlog
@@ -4,20 +4,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -25,7 +28,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -33,7 +37,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -41,7 +46,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -50,7 +56,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -62,12 +69,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -87,7 +97,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -102,7 +113,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
@@ -117,7 +129,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorFromStream
@@ -135,20 +148,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -156,14 +172,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -172,7 +190,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -184,12 +203,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -200,20 +222,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -221,14 +246,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -237,7 +264,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -249,12 +277,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -265,20 +296,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -286,14 +320,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -301,7 +337,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -309,7 +346,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -317,7 +355,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -325,7 +364,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -333,7 +373,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -342,7 +383,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -354,12 +396,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -371,7 +416,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -386,14 +432,16 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                 GenericArguments: [ParticleBase.EmissiveMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorFromStream
@@ -408,11 +456,13 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorFromStream
@@ -437,7 +487,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorFromStream
@@ -461,25 +512,29 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScroll
                                         GenericArguments: [3, 1]
                                     color2: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorMultiply
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorMultiply
                                         Compositions:
                                             color1: !ShaderClassSource
                                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -489,7 +544,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -497,19 +553,22 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, rg]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMaterialAlphaBlend
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMaterialAlphaBlend
                                 Compositions:
                                     color: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -522,33 +581,39 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScroll
                                         GenericArguments: [-0.5, 1]
                                     color2: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorMultiply
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorMultiply
                                         Compositions:
                                             color1: !ShaderClassSource
                                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -558,7 +623,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -566,19 +632,22 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, rg]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMaterialAlphaBlend
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMaterialAlphaBlend
                                 Compositions:
                                     color: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -591,33 +660,39 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScroll
                                         GenericArguments: [1, 1]
                                     color2: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorMultiply
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorMultiply
                                         Compositions:
                                             color1: !ShaderClassSource
                                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -627,7 +702,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -635,19 +711,22 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, rg]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMaterialAlphaBlend
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMaterialAlphaBlend
                                 Compositions:
                                     color: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -660,28 +739,33 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -690,16 +774,20 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -710,20 +798,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -731,14 +822,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -747,7 +840,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -759,16 +853,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -779,27 +877,31 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -808,7 +910,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -820,16 +923,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -840,20 +947,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -861,14 +971,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -876,7 +988,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -884,7 +997,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -892,7 +1006,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -900,7 +1015,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -908,7 +1024,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -917,7 +1034,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -929,16 +1047,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -957,20 +1079,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -978,14 +1103,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -994,7 +1121,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1006,12 +1134,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1022,20 +1153,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1043,7 +1177,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1051,7 +1186,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1059,7 +1195,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1068,7 +1205,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1080,12 +1218,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1096,20 +1237,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1117,14 +1261,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1132,7 +1278,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1140,7 +1287,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1149,7 +1297,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1164,12 +1313,15 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1180,20 +1332,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1201,14 +1356,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1216,7 +1373,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1224,7 +1382,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1232,7 +1391,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1240,7 +1400,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1248,7 +1409,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1257,7 +1419,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1269,12 +1432,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1289,20 +1455,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1310,14 +1479,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1326,7 +1497,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1338,12 +1510,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1358,20 +1533,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1379,7 +1557,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1387,14 +1566,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1403,7 +1584,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1415,13 +1597,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1436,20 +1621,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1457,14 +1645,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1472,7 +1662,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1480,7 +1671,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1489,7 +1681,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1504,12 +1697,15 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1524,20 +1720,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1545,14 +1744,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1560,7 +1761,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1568,7 +1770,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1576,7 +1779,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1584,7 +1788,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1592,7 +1797,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1601,7 +1807,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1613,12 +1820,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1630,7 +1840,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorOverlay3ds
+            - !ShaderClassSource
+                ClassName: ComputeColorOverlay3ds
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorFromStream
@@ -1644,20 +1855,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1665,7 +1879,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1673,7 +1888,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1681,7 +1897,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1690,7 +1907,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1702,12 +1920,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1724,20 +1945,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1745,14 +1969,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1761,7 +1987,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1773,12 +2000,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1795,20 +2025,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1816,14 +2049,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1832,7 +2067,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1844,12 +2080,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1866,20 +2105,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1887,14 +2129,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1902,7 +2146,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1910,7 +2155,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1918,7 +2164,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1926,7 +2173,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1934,7 +2182,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1943,7 +2192,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1955,12 +2205,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1977,25 +2230,29 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScroll
                                         GenericArguments: [3, 1]
                                     color2: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorMultiply
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorMultiply
                                         Compositions:
                                             color1: !ShaderClassSource
                                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2005,7 +2262,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2013,19 +2271,22 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, rg]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMaterialAlphaBlend
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMaterialAlphaBlend
                                 Compositions:
                                     color: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2038,8 +2299,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     XenkoEffectBase.RenderTargetExtensions: !ShaderMixinSource
         Macros:
             -   Name: XENKO_MULTISAMPLE_COUNT
@@ -2050,25 +2313,29 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScroll
                                         GenericArguments: [-0.5, 1]
                                     color2: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorMultiply
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorMultiply
                                         Compositions:
                                             color1: !ShaderClassSource
                                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2078,7 +2345,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2086,19 +2354,22 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, rg]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMaterialAlphaBlend
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMaterialAlphaBlend
                                 Compositions:
                                     color: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2111,8 +2382,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     XenkoEffectBase.RenderTargetExtensions: !ShaderMixinSource
         Macros:
             -   Name: XENKO_MULTISAMPLE_COUNT
@@ -2123,25 +2396,29 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScroll
                                         GenericArguments: [1, 1]
                                     color2: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorMultiply
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorMultiply
                                         Compositions:
                                             color1: !ShaderClassSource
                                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2151,7 +2428,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2159,19 +2437,22 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, rg]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMaterialAlphaBlend
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMaterialAlphaBlend
                                 Compositions:
                                     color: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2184,8 +2465,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     XenkoEffectBase.RenderTargetExtensions: !ShaderMixinSource
         Macros:
             -   Name: XENKO_MULTISAMPLE_COUNT
@@ -2196,20 +2479,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2218,16 +2504,20 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2244,27 +2534,31 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2273,7 +2567,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2285,16 +2580,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2311,20 +2610,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2332,14 +2634,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2348,7 +2652,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2360,16 +2665,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2386,20 +2695,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2407,14 +2719,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2422,7 +2736,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2430,7 +2745,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2438,7 +2754,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2446,7 +2763,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2454,7 +2772,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2463,7 +2782,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2475,16 +2795,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightPointGroup
+                - !ShaderClassSource
+                    ClassName: LightPointGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2501,20 +2825,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2522,14 +2849,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2538,7 +2867,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2550,12 +2880,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2572,20 +2905,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2593,14 +2929,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2608,7 +2946,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2616,7 +2955,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2625,7 +2965,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2640,12 +2981,15 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2662,20 +3006,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2683,7 +3030,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2691,7 +3039,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2699,7 +3048,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2708,7 +3058,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2720,12 +3071,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2742,20 +3096,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2763,14 +3120,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2778,7 +3137,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2786,7 +3146,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2794,7 +3155,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2802,7 +3164,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2810,7 +3173,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2819,7 +3183,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2831,12 +3196,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2857,20 +3225,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2878,14 +3249,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2894,7 +3267,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2906,12 +3280,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -2932,20 +3309,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2953,7 +3333,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2961,14 +3342,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2977,7 +3360,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2989,13 +3373,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -3016,20 +3403,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3037,14 +3427,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3052,7 +3444,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3060,7 +3453,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3069,7 +3463,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3084,12 +3479,15 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -3110,20 +3508,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3131,14 +3532,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3146,7 +3549,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3154,7 +3558,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3162,7 +3567,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3170,7 +3576,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3178,7 +3585,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3187,7 +3595,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3199,12 +3608,15 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [2]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
diff --git a/samples/Particles/ParticlesSample/Assets/Shared/GameSettings.xkgamesettings b/samples/Particles/ParticlesSample/Assets/Shared/GameSettings.xkgamesettings
index ca46873cf8..dcd4f3ed52 100644
--- a/samples/Particles/ParticlesSample/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Particles/ParticlesSample/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: e6395b48-106b-4111-bc8b-8cf309b8edb6
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: b4210f42-14a3-4917-80b6-006d7f81b1c6:MainScene
 GraphicsCompositor: 07078f4f-a078-4ad4-bc35-bb0656a0f4f8:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Particles/ParticlesSample/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Particles/ParticlesSample/Assets/Shared/GraphicsCompositor.xkgfxcomp
index bd88891573..d89aa81657 100644
--- a/samples/Particles/ParticlesSample/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Particles/ParticlesSample/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 07078f4f-a078-4ad4-bc35-bb0656a0f4f8
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,19 +91,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: ca0af89a-f417-4580-8fbd-442bbce9e5e1
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 3217b71f-b48d-4321-bab1-7cb4da999c19
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! ca0af89a-f417-4580-8fbd-442bbce9e5e1
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! ca0af89a-f417-4580-8fbd-442bbce9e5e1
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRadial.cs b/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRadial.xksl.cs
similarity index 100%
rename from samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRadial.cs
rename to samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRadial.xksl.cs
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRed.cs b/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRed.xksl.cs
similarity index 100%
rename from samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRed.cs
rename to samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorRed.xksl.cs
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorTextureScroll.cs b/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorTextureScroll.xksl.cs
similarity index 100%
rename from samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorTextureScroll.cs
rename to samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ComputeColorTextureScroll.xksl.cs
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomEffect.cs b/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomEffect.xkfx.cs
similarity index 100%
rename from samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomEffect.cs
rename to samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomEffect.xkfx.cs
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomShader.cs b/samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomShader.xksl.cs
similarity index 100%
rename from samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomShader.cs
rename to samples/Particles/ParticlesSample/ParticlesSample.Game/Effects/ParticleCustomShader.xksl.cs
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj b/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj
index c0b23fed77..41ab43cc8b 100644
--- a/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj
+++ b/samples/Particles/ParticlesSample/ParticlesSample.Game/ParticlesSample.Game.csproj
@@ -5,62 +5,10 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Effects\ComputeColorRadial.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorRadial.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ComputeColorRadial.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorRadial.xksl</DependentUpon>
-    </Compile>
-    <None Include="Effects\ComputeColorRed.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorRed.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ComputeColorRed.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorRed.xksl</DependentUpon>
-    </Compile>
-    <None Include="Effects\ComputeColorTextureScroll.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScroll.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ComputeColorTextureScroll.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorTextureScroll.xksl</DependentUpon>
-    </Compile>
-    <None Include="Effects\ParticleCustomEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleCustomEffect.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ParticleCustomEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleCustomEffect.xkfx</DependentUpon>
-    </Compile>
-    <None Include="Effects\ParticleCustomShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleCustomShader.cs</LastGenOutput>
-    </None>
-    <Compile Update="Effects\ParticleCustomShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleCustomShader.xksl</DependentUpon>
-    </Compile>
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Particles/ParticlesSample/ParticlesSample.Windows/Resources/Icon.ico b/samples/Particles/ParticlesSample/ParticlesSample.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Particles/ParticlesSample/ParticlesSample.Windows/Resources/Icon.ico and b/samples/Particles/ParticlesSample/ParticlesSample.Windows/Resources/Icon.ico differ
diff --git a/samples/Particles/ParticlesSample/Resources/XenkoLogoGray.png b/samples/Particles/ParticlesSample/Resources/XenkoLogoGray.png
index fdd3adf224..94cc23f633 100644
--- a/samples/Particles/ParticlesSample/Resources/XenkoLogoGray.png
+++ b/samples/Particles/ParticlesSample/Resources/XenkoLogoGray.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc94ee66c9b6587ee597cf8beb00f4a2ffda72c931da31b58273e613579f06f3
-size 2438
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/samples/Particles/ParticlesSample/Resources/XenkoLogoRed.png b/samples/Particles/ParticlesSample/Resources/XenkoLogoRed.png
index ecaaed944c..94cc23f633 100644
--- a/samples/Particles/ParticlesSample/Resources/XenkoLogoRed.png
+++ b/samples/Particles/ParticlesSample/Resources/XenkoLogoRed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20ac89d82088bb5c72c3f4cf2e21bb4042aaf838fdbac72b37c50bcd4c9b2769
-size 4188
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/samples/Particles/ParticlesSample/Resources/XenkoLogoWhite.png b/samples/Particles/ParticlesSample/Resources/XenkoLogoWhite.png
index f920290824..94cc23f633 100644
--- a/samples/Particles/ParticlesSample/Resources/XenkoLogoWhite.png
+++ b/samples/Particles/ParticlesSample/Resources/XenkoLogoWhite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c15f4eda5a8e9cafbfbdb46c512b8708b040141cf614d83d30be62e05ff167f3
-size 1744
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/crate_cs.xkphy b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/crate_cs.xkphy
index adf231bc24..9d9f200ef6 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/crate_cs.xkphy
+++ b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/crate_cs.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: cfd030c9-44df-401e-a192-32278a642f8b
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     74528ec25c6e7247be2bb1132ba4fd1e: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: e51b50db-d4e0-45c1-bf2e-47440aab2217:Models/BoxE
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/cube_cs.xkphy b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/cube_cs.xkphy
index 34cbe5a288..b455df2b17 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/cube_cs.xkphy
+++ b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/cube_cs.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: f9e50676-761f-47c9-87e3-1e949c24ff9e
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     cb86efc2ed59034c8ebc99a900f3e7ef: !BoxColliderShapeDesc
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/ground_csR.xkphy b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/ground_csR.xkphy
index c7a5c18dcc..6a0638cc50 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/ground_csR.xkphy
+++ b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/ground_csR.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 1a7f15af-ac01-4464-adfe-7689bd50966e
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     7107ddc00d8be146887f6c682efdee3e: !StaticPlaneColliderShapeDesc
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/sphere_cs.xkphy b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/sphere_cs.xkphy
index 3c2693e305..12386895c0 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/sphere_cs.xkphy
+++ b/samples/Physics/PhysicsSample/Assets/Shared/ColliderShapes/sphere_cs.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 7e1985f8-0b02-4b1e-b636-1614deb4f36b
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     7da230e6be91aa4badbe0ab85ca705f6: !SphereColliderShapeDesc
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/EffectCompileLog.xkeffectlog b/samples/Physics/PhysicsSample/Assets/Shared/EffectCompileLog.xkeffectlog
index 6f9e2247d6..2c6469182c 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/EffectCompileLog.xkeffectlog
+++ b/samples/Physics/PhysicsSample/Assets/Shared/EffectCompileLog.xkeffectlog
@@ -4,20 +4,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -25,7 +28,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -33,7 +37,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -41,7 +46,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -49,7 +55,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -57,7 +64,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -65,7 +73,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -73,7 +82,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -81,7 +91,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -89,12 +100,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -104,7 +117,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -112,7 +126,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -121,7 +136,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -136,8 +152,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
@@ -149,20 +167,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -170,7 +191,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -178,7 +200,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -186,7 +209,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -194,7 +218,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -202,7 +227,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -210,7 +236,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -218,7 +245,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -226,7 +254,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -234,7 +263,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -243,7 +273,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -255,7 +286,8 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -263,20 +295,23 @@ UsedParameters:
                                 GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i5, Material.TextureOffset.i5]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceShadingBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceShadingBlend
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceNormalMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceNormalMap
                                                 GenericArguments: [false, true]
                                         Compositions:
                                             normalMap: !ShaderClassSource
@@ -284,7 +319,8 @@ UsedParameters:
                                                 GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceGlossinessMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceGlossinessMap
                                                 GenericArguments: [false]
                                         Compositions:
                                             glossinessMap: !ShaderClassSource
@@ -292,7 +328,8 @@ UsedParameters:
                                                 GenericArguments: [Material.GlossinessValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecular, rgb]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -300,7 +337,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecularIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -308,7 +346,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularIntensityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusion, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -316,7 +355,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -324,7 +364,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -332,7 +373,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavityDiffuse, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -340,7 +382,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityDiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavitySpecular, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -348,12 +391,14 @@ UsedParameters:
                                                 GenericArguments: [Material.CavitySpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissive, rgba]
                                         Compositions:
                                             computeColorSource: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -363,7 +408,8 @@ UsedParameters:
                                                         GenericArguments: [Material.EmissiveValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissiveIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -371,7 +417,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveIntensity]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceLightingAndShading
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceLightingAndShading
                                         Compositions:
                                             surfaces: !ShaderArraySource
                                                 Values:
@@ -380,7 +427,8 @@ UsedParameters:
                                                         GenericArguments: [false]
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                         Compositions:
                                                             environmentFunction: !ShaderClassSource
                                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -395,8 +443,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
@@ -412,20 +462,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -434,12 +487,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -450,20 +506,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -472,8 +531,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -484,20 +545,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -505,7 +569,8 @@ UsedParameters:
                                 GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -513,7 +578,8 @@ UsedParameters:
                                 GenericArguments: [Material.AlphaBlendColorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -524,8 +590,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -536,20 +604,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -557,7 +628,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -565,7 +637,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -573,7 +646,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -581,7 +655,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -589,7 +664,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -597,7 +673,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -605,7 +682,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -613,7 +691,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -621,12 +700,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -636,7 +717,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -644,7 +726,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -653,7 +736,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -668,8 +752,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
@@ -687,20 +773,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -708,7 +797,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -716,7 +806,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -724,7 +815,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -732,7 +824,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -740,7 +833,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -748,7 +842,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -756,7 +851,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -764,7 +860,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -772,7 +869,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -781,7 +879,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -793,7 +892,8 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -801,20 +901,23 @@ UsedParameters:
                                 GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i5, Material.TextureOffset.i5]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceShadingBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceShadingBlend
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceNormalMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceNormalMap
                                                 GenericArguments: [false, true]
                                         Compositions:
                                             normalMap: !ShaderClassSource
@@ -822,7 +925,8 @@ UsedParameters:
                                                 GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceGlossinessMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceGlossinessMap
                                                 GenericArguments: [false]
                                         Compositions:
                                             glossinessMap: !ShaderClassSource
@@ -830,7 +934,8 @@ UsedParameters:
                                                 GenericArguments: [Material.GlossinessValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecular, rgb]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -838,7 +943,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecularIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -846,7 +952,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularIntensityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusion, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -854,7 +961,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -862,7 +970,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -870,7 +979,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavityDiffuse, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -878,7 +988,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityDiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavitySpecular, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -886,12 +997,14 @@ UsedParameters:
                                                 GenericArguments: [Material.CavitySpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissive, rgba]
                                         Compositions:
                                             computeColorSource: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -901,7 +1014,8 @@ UsedParameters:
                                                         GenericArguments: [Material.EmissiveValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissiveIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -909,7 +1023,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveIntensity]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceLightingAndShading
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceLightingAndShading
                                         Compositions:
                                             surfaces: !ShaderArraySource
                                                 Values:
@@ -918,7 +1033,8 @@ UsedParameters:
                                                         GenericArguments: [false]
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                         Compositions:
                                                             environmentFunction: !ShaderClassSource
                                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -933,8 +1049,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
@@ -952,20 +1070,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -974,12 +1095,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -996,20 +1120,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1018,8 +1145,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -1036,20 +1165,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1057,7 +1189,8 @@ UsedParameters:
                                 GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1065,7 +1198,8 @@ UsedParameters:
                                 GenericArguments: [Material.AlphaBlendColorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1076,8 +1210,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderClassSource
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/GameSettings.xkgamesettings b/samples/Physics/PhysicsSample/Assets/Shared/GameSettings.xkgamesettings
index 0483b74199..22a92969f8 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/Physics/PhysicsSample/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 8b386f9f-7a68-4d71-afd8-5f10c3cbdaf5
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 86fed268-baa8-4929-9eba-4d14cf3a0e68:Raycasting
 GraphicsCompositor: d0f9813f-8924-4b77-a91e-51be4084acf7:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Physics/PhysicsSample/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/Physics/PhysicsSample/Assets/Shared/GraphicsCompositor.xkgfxcomp
index 75ff08d92f..b562d5825e 100644
--- a/samples/Physics/PhysicsSample/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/Physics/PhysicsSample/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: d0f9813f-8924-4b77-a91e-51be4084acf7
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,19 +91,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 7d35571d-edba-4925-be03-1af8de1df514
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 95fe37f1-35a8-41ff-9358-192ff159e956
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 7d35571d-edba-4925-be03-1af8de1df514
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 7d35571d-edba-4925-be03-1af8de1df514
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj b/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj
index 9e1ea8aa6d..98a418bd95 100644
--- a/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj
+++ b/samples/Physics/PhysicsSample/PhysicsSample.Game/PhysicsSample.Game.csproj
@@ -4,11 +4,11 @@
     <RootNamespace>PhysicsSample</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Physics/PhysicsSample/PhysicsSample.Windows/Resources/Icon.ico b/samples/Physics/PhysicsSample/PhysicsSample.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Physics/PhysicsSample/PhysicsSample.Windows/Resources/Icon.ico and b/samples/Physics/PhysicsSample/PhysicsSample.Windows/Resources/Icon.ico differ
diff --git a/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/EffectCompileLog.xkeffectlog b/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/EffectCompileLog.xkeffectlog
index df827da46b..611b3bb154 100644
--- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/EffectCompileLog.xkeffectlog
+++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/EffectCompileLog.xkeffectlog
@@ -4,17 +4,20 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -24,7 +27,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -32,14 +36,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -48,7 +54,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -60,28 +67,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -89,7 +101,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -97,7 +110,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -105,7 +119,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -113,7 +128,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -121,7 +137,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -129,7 +146,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -137,7 +155,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -145,7 +164,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -153,7 +173,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceStreamsBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceStreamsBlend
                         Compositions:
                             blends: !ShaderArraySource
                                 Values:
@@ -191,20 +212,23 @@ UsedParameters:
                                         GenericArguments: [matCavitySpecular]
                             layer: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceArray
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceArray
                                 Compositions:
                                     layers: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceDiffuse
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceDiffuse
                                                 Compositions:
                                                     diffuseMap: !ShaderClassSource
                                                         ClassName: ComputeColorConstantColorLink
                                                         GenericArguments: [Material.DiffuseValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceNormalMap
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceNormalMap
                                                         GenericArguments: [true, true]
                                                 Compositions:
                                                     normalMap: !ShaderClassSource
@@ -212,7 +236,8 @@ UsedParameters:
                                                         GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceGlossinessMap
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceGlossinessMap
                                                         GenericArguments: [false]
                                                 Compositions:
                                                     glossinessMap: !ShaderClassSource
@@ -220,7 +245,8 @@ UsedParameters:
                                                         GenericArguments: [Material.GlossinessValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matSpecular, rgb]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -228,7 +254,8 @@ UsedParameters:
                                                         GenericArguments: [Material.SpecularValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matSpecularIntensity, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -236,7 +263,8 @@ UsedParameters:
                                                         GenericArguments: [Material.SpecularIntensityValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matAmbientOcclusion, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -244,7 +272,8 @@ UsedParameters:
                                                         GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -252,7 +281,8 @@ UsedParameters:
                                                         GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavity, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -260,7 +290,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavityValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavityDiffuse, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -268,7 +299,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavityDiffuseValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavitySpecular, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -276,7 +308,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavitySpecularValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matBlend, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -284,7 +317,8 @@ UsedParameters:
                                                         GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i4, Material.TextureOffset.i4]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -293,7 +327,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -305,8 +340,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -314,17 +351,20 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -334,7 +374,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -342,14 +383,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -358,7 +401,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -370,16 +414,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -409,20 +458,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -430,14 +482,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -446,7 +500,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -458,16 +513,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -497,20 +557,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -518,7 +581,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -526,14 +590,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -541,7 +607,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -549,7 +616,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -557,7 +625,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -565,7 +634,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -573,7 +643,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -582,7 +653,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -594,8 +666,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -603,20 +677,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -624,14 +701,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -640,7 +719,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -652,25 +732,30 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -680,7 +765,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -688,14 +774,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -704,7 +792,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -716,16 +805,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -749,20 +843,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -770,14 +867,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -786,7 +885,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -798,16 +898,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -831,20 +936,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -852,7 +960,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -860,7 +969,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -868,7 +978,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -876,7 +987,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -884,7 +996,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -892,7 +1005,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -900,7 +1014,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -908,7 +1023,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -916,7 +1032,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -925,7 +1042,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -937,7 +1055,8 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -945,20 +1064,23 @@ UsedParameters:
                                 GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i5, Material.TextureOffset.i5]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceShadingBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceShadingBlend
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceNormalMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceNormalMap
                                                 GenericArguments: [true, true]
                                         Compositions:
                                             normalMap: !ShaderClassSource
@@ -966,7 +1088,8 @@ UsedParameters:
                                                 GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceGlossinessMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceGlossinessMap
                                                 GenericArguments: [false]
                                         Compositions:
                                             glossinessMap: !ShaderClassSource
@@ -974,7 +1097,8 @@ UsedParameters:
                                                 GenericArguments: [Material.GlossinessValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecular, rgb]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -982,7 +1106,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecularIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -990,7 +1115,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularIntensityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusion, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -998,7 +1124,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1006,7 +1133,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1014,7 +1142,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavityDiffuse, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1022,7 +1151,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityDiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavitySpecular, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1030,12 +1160,14 @@ UsedParameters:
                                                 GenericArguments: [Material.CavitySpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissive, rgba]
                                         Compositions:
                                             computeColorSource: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1045,7 +1177,8 @@ UsedParameters:
                                                         GenericArguments: [Material.EmissiveValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissiveIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1053,7 +1186,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveIntensity]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceLightingAndShading
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceLightingAndShading
                                         Compositions:
                                             surfaces: !ShaderArraySource
                                                 Values:
@@ -1062,7 +1196,8 @@ UsedParameters:
                                                         GenericArguments: [false]
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                         Compositions:
                                                             environmentFunction: !ShaderClassSource
                                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1077,17 +1212,22 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1117,20 +1257,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1138,7 +1281,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1146,7 +1290,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1154,7 +1299,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1162,7 +1308,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1170,7 +1317,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1178,7 +1326,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1186,7 +1335,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1194,7 +1344,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1202,7 +1353,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1211,7 +1363,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1223,7 +1376,8 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1231,20 +1385,23 @@ UsedParameters:
                                 GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i5, Material.TextureOffset.i5]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceShadingBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceShadingBlend
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceNormalMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceNormalMap
                                                 GenericArguments: [true, true]
                                         Compositions:
                                             normalMap: !ShaderClassSource
@@ -1252,7 +1409,8 @@ UsedParameters:
                                                 GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceGlossinessMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceGlossinessMap
                                                 GenericArguments: [false]
                                         Compositions:
                                             glossinessMap: !ShaderClassSource
@@ -1260,7 +1418,8 @@ UsedParameters:
                                                 GenericArguments: [Material.GlossinessValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecular, rgb]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1268,7 +1427,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecularIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1276,7 +1436,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularIntensityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusion, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1284,7 +1445,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1292,7 +1454,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1300,7 +1463,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavityDiffuse, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1308,7 +1472,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityDiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavitySpecular, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1316,12 +1481,14 @@ UsedParameters:
                                                 GenericArguments: [Material.CavitySpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissive, rgba]
                                         Compositions:
                                             computeColorSource: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1331,7 +1498,8 @@ UsedParameters:
                                                         GenericArguments: [Material.EmissiveValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissiveIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -1339,7 +1507,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveIntensity]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceLightingAndShading
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceLightingAndShading
                                         Compositions:
                                             surfaces: !ShaderArraySource
                                                 Values:
@@ -1348,7 +1517,8 @@ UsedParameters:
                                                         GenericArguments: [false]
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                         Compositions:
                                                             environmentFunction: !ShaderClassSource
                                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1363,8 +1533,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -1372,20 +1544,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1393,7 +1568,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1401,7 +1577,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1409,7 +1586,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1417,7 +1595,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1425,7 +1604,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1433,7 +1613,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1441,7 +1622,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1449,7 +1631,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1457,12 +1640,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1472,7 +1657,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1480,7 +1666,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1489,7 +1676,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1504,17 +1692,22 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1544,20 +1737,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1565,7 +1761,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1573,7 +1770,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1581,7 +1779,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1589,7 +1788,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1597,7 +1797,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1605,7 +1806,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1613,7 +1815,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1621,7 +1824,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1629,12 +1833,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1644,7 +1850,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1652,7 +1859,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1661,7 +1869,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1676,8 +1885,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -1685,20 +1896,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1706,7 +1920,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1714,7 +1929,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1722,7 +1938,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1730,7 +1947,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1738,7 +1956,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1746,7 +1965,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1754,7 +1974,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1762,7 +1983,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1770,12 +1992,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1785,7 +2009,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1793,7 +2018,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1802,7 +2028,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1817,17 +2044,22 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1851,20 +2083,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1872,7 +2107,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1880,14 +2116,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1895,7 +2133,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1903,7 +2142,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1911,7 +2151,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1919,7 +2160,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1927,7 +2169,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1936,7 +2179,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1948,17 +2192,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1988,20 +2237,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2009,7 +2261,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2017,14 +2270,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2032,7 +2287,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2040,7 +2296,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2048,7 +2305,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2056,7 +2314,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2064,7 +2323,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2073,7 +2333,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2085,17 +2346,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -2119,20 +2385,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2140,7 +2409,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2148,7 +2418,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2156,7 +2427,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2164,7 +2436,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2172,7 +2445,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2180,7 +2454,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2188,7 +2463,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2196,7 +2472,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2204,7 +2481,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceStreamsBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceStreamsBlend
                         Compositions:
                             blends: !ShaderArraySource
                                 Values:
@@ -2242,20 +2520,23 @@ UsedParameters:
                                         GenericArguments: [matCavitySpecular]
                             layer: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceArray
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceArray
                                 Compositions:
                                     layers: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceDiffuse
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceDiffuse
                                                 Compositions:
                                                     diffuseMap: !ShaderClassSource
                                                         ClassName: ComputeColorConstantColorLink
                                                         GenericArguments: [Material.DiffuseValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceNormalMap
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceNormalMap
                                                         GenericArguments: [true, true]
                                                 Compositions:
                                                     normalMap: !ShaderClassSource
@@ -2263,7 +2544,8 @@ UsedParameters:
                                                         GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceGlossinessMap
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceGlossinessMap
                                                         GenericArguments: [false]
                                                 Compositions:
                                                     glossinessMap: !ShaderClassSource
@@ -2271,7 +2553,8 @@ UsedParameters:
                                                         GenericArguments: [Material.GlossinessValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matSpecular, rgb]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2279,7 +2562,8 @@ UsedParameters:
                                                         GenericArguments: [Material.SpecularValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matSpecularIntensity, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2287,7 +2571,8 @@ UsedParameters:
                                                         GenericArguments: [Material.SpecularIntensityValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matAmbientOcclusion, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2295,7 +2580,8 @@ UsedParameters:
                                                         GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2303,7 +2589,8 @@ UsedParameters:
                                                         GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavity, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2311,7 +2598,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavityValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavityDiffuse, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2319,7 +2607,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavityDiffuseValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavitySpecular, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2327,7 +2616,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavitySpecularValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matBlend, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2335,7 +2625,8 @@ UsedParameters:
                                                         GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i4, Material.TextureOffset.i4]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2344,7 +2635,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2356,17 +2648,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -2396,20 +2693,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2417,14 +2717,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2433,7 +2735,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2445,28 +2748,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2474,7 +2782,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2482,7 +2791,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2490,7 +2800,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2498,7 +2809,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2506,7 +2818,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2514,7 +2827,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2522,7 +2836,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2530,7 +2845,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2538,7 +2854,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceStreamsBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceStreamsBlend
                         Compositions:
                             blends: !ShaderArraySource
                                 Values:
@@ -2576,20 +2893,23 @@ UsedParameters:
                                         GenericArguments: [matCavitySpecular]
                             layer: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceArray
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceArray
                                 Compositions:
                                     layers: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceDiffuse
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceDiffuse
                                                 Compositions:
                                                     diffuseMap: !ShaderClassSource
                                                         ClassName: ComputeColorConstantColorLink
                                                         GenericArguments: [Material.DiffuseValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceNormalMap
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceNormalMap
                                                         GenericArguments: [true, true]
                                                 Compositions:
                                                     normalMap: !ShaderClassSource
@@ -2597,7 +2917,8 @@ UsedParameters:
                                                         GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceGlossinessMap
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceGlossinessMap
                                                         GenericArguments: [false]
                                                 Compositions:
                                                     glossinessMap: !ShaderClassSource
@@ -2605,7 +2926,8 @@ UsedParameters:
                                                         GenericArguments: [Material.GlossinessValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matSpecular, rgb]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2613,7 +2935,8 @@ UsedParameters:
                                                         GenericArguments: [Material.SpecularValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matSpecularIntensity, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2621,7 +2944,8 @@ UsedParameters:
                                                         GenericArguments: [Material.SpecularIntensityValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matAmbientOcclusion, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2629,7 +2953,8 @@ UsedParameters:
                                                         GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2637,7 +2962,8 @@ UsedParameters:
                                                         GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavity, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2645,7 +2971,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavityValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavityDiffuse, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2653,7 +2980,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavityDiffuseValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matCavitySpecular, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2661,7 +2989,8 @@ UsedParameters:
                                                         GenericArguments: [Material.CavitySpecularValue.i1]
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                         GenericArguments: [matBlend, r]
                                                 Compositions:
                                                     computeColorSource: !ShaderClassSource
@@ -2669,7 +2998,8 @@ UsedParameters:
                                                         GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i4, Material.TextureOffset.i4]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2678,7 +3008,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2690,17 +3021,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -2724,20 +3060,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2745,14 +3084,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2760,7 +3101,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2768,7 +3110,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2776,7 +3119,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2784,7 +3128,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2792,7 +3137,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2801,7 +3147,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2813,16 +3160,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -2852,20 +3204,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2873,14 +3228,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2888,7 +3245,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2896,7 +3254,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2904,7 +3263,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2912,7 +3272,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2920,7 +3281,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2929,7 +3291,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2941,28 +3304,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2970,14 +3338,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2985,7 +3355,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2993,7 +3364,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3001,7 +3373,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3009,7 +3382,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3017,7 +3391,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3026,7 +3401,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3038,16 +3414,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -3071,20 +3452,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3092,14 +3476,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3108,7 +3494,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3120,16 +3507,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -3163,20 +3555,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3184,14 +3579,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3199,7 +3596,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3207,7 +3605,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3216,7 +3615,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3231,16 +3631,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -3274,20 +3679,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3295,14 +3703,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3310,7 +3720,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3318,7 +3729,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3327,7 +3739,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3342,8 +3755,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -3354,20 +3769,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3375,14 +3793,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3390,7 +3810,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3398,7 +3819,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3407,7 +3829,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3422,16 +3845,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -3459,20 +3887,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3480,14 +3911,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3496,7 +3929,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3508,16 +3942,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -3551,20 +3990,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3572,14 +4014,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3588,7 +4032,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3600,28 +4045,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3629,14 +4079,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3645,7 +4097,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3657,16 +4110,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -3694,20 +4152,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3715,7 +4176,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3723,14 +4185,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3739,7 +4203,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3751,8 +4216,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -3764,20 +4231,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3785,14 +4255,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3800,7 +4272,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3808,7 +4281,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3816,7 +4290,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3824,7 +4299,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3832,7 +4308,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3841,7 +4318,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3853,28 +4331,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3882,14 +4365,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3897,7 +4382,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3905,7 +4391,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3914,7 +4401,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3929,28 +4417,33 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3958,7 +4451,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3966,7 +4460,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3974,7 +4469,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3982,7 +4478,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3990,7 +4487,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3998,7 +4496,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4006,7 +4505,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4014,7 +4514,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4022,7 +4523,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4031,7 +4533,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4043,7 +4546,8 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4051,20 +4555,23 @@ UsedParameters:
                                 GenericArguments: [Material.BlendMap, TEXCOORD0, Material.Sampler.i0, a, Material.TextureScale.i5, Material.TextureOffset.i5]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceShadingBlend
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceShadingBlend
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceNormalMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceNormalMap
                                                 GenericArguments: [true, true]
                                         Compositions:
                                             normalMap: !ShaderClassSource
@@ -4072,7 +4579,8 @@ UsedParameters:
                                                 GenericArguments: [Material.NormalMap.i1, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i2, Material.TextureOffset.i2]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceGlossinessMap
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceGlossinessMap
                                                 GenericArguments: [false]
                                         Compositions:
                                             glossinessMap: !ShaderClassSource
@@ -4080,7 +4588,8 @@ UsedParameters:
                                                 GenericArguments: [Material.GlossinessValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecular, rgb]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4088,7 +4597,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matSpecularIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4096,7 +4606,8 @@ UsedParameters:
                                                 GenericArguments: [Material.SpecularIntensityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusion, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4104,7 +4615,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionMap.i1, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i3, Material.TextureOffset.i3]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4112,7 +4624,8 @@ UsedParameters:
                                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4120,7 +4633,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavityDiffuse, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4128,7 +4642,8 @@ UsedParameters:
                                                 GenericArguments: [Material.CavityDiffuseValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matCavitySpecular, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4136,12 +4651,14 @@ UsedParameters:
                                                 GenericArguments: [Material.CavitySpecularValue.i1]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissive, rgba]
                                         Compositions:
                                             computeColorSource: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -4151,7 +4668,8 @@ UsedParameters:
                                                         GenericArguments: [Material.EmissiveValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matEmissiveIntensity, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -4159,7 +4677,8 @@ UsedParameters:
                                                 GenericArguments: [Material.EmissiveIntensity]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceLightingAndShading
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceLightingAndShading
                                         Compositions:
                                             surfaces: !ShaderArraySource
                                                 Values:
@@ -4168,7 +4687,8 @@ UsedParameters:
                                                         GenericArguments: [false]
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                         Compositions:
                                                             environmentFunction: !ShaderClassSource
                                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4183,17 +4703,22 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4221,20 +4746,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4242,14 +4770,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4257,7 +4787,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4265,7 +4796,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4273,7 +4805,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4281,7 +4814,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4289,7 +4823,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4298,7 +4833,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4310,16 +4846,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4353,20 +4894,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4374,14 +4918,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4389,7 +4935,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4397,7 +4944,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4405,7 +4953,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4413,7 +4962,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4421,7 +4971,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4430,7 +4981,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4442,16 +4994,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4479,20 +5036,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4500,14 +5060,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4516,7 +5078,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4528,16 +5091,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4565,20 +5133,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -4586,7 +5157,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4594,14 +5166,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4610,7 +5184,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4622,17 +5197,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4660,20 +5240,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -4681,7 +5264,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4689,14 +5273,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4705,7 +5291,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4717,17 +5304,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4843,20 +5435,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4864,14 +5459,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4879,7 +5476,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4887,7 +5485,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4896,7 +5495,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4911,16 +5511,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -4944,20 +5549,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4965,14 +5573,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4980,7 +5590,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4988,7 +5599,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4997,7 +5609,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -5012,16 +5625,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -5052,14 +5670,16 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
                 GenericArguments: [ParticleBase.EmissiveValue]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -5078,14 +5698,16 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 1
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
                 GenericArguments: [ParticleBase.EmissiveValue]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -5104,21 +5726,24 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 1
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
                 GenericArguments: [ParticleBase.EmissiveValue]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                         GenericArguments: [ParticleBase.EmissiveMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     color2: !ShaderMixinSource
                         Mixins:
-                            -   ClassName: ComputeColorMultiply
+                            - !ShaderClassSource
+                                ClassName: ComputeColorMultiply
                         Compositions:
                             color1: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
diff --git a/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GameSettings.xkgamesettings b/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GameSettings.xkgamesettings
index c70e4f87d1..7a0613f84f 100644
--- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GameSettings.xkgamesettings
+++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 1e817413-2f49-48e3-b245-ee9acc49ce2e
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: bc8d83e5-a707-4213-b92c-d2e699e02d5f:MainScene
 GraphicsCompositor: f96b754e-e14f-43b1-94a9-4e676dd26fe4:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GraphicsCompositor.xkgfxcomp b/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GraphicsCompositor.xkgfxcomp
index 50919d3c1e..9c200cb232 100644
--- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GraphicsCompositor.xkgfxcomp
+++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/Assets/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: f96b754e-e14f-43b1-94a9-4e676dd26fe4
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 823a81bf-bac0-4552-9267-aeed499c40df:DefaultGraphicsCompositorLevel10
 Cameras:
@@ -39,73 +39,73 @@ RenderStages:
         EffectSlotName: GBuffer
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 9c51229d-d259-46dd-bf48-77578cd01f97
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterParaboloid
-            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 738e433b-332b-437c-8d19-d4e99be09069
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterCubeMap
-            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 0fd29cfa-e18c-4936-a1ff-706523f5ea8e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 9c51229d-d259-46dd-bf48-77578cd01f97
                 DepthClipping: true
-            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 738e433b-332b-437c-8d19-d4e99be09069
                 DepthClipping: true
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Engine {}
-                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
-                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Engine {}
-                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Engine
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Rendering {}
+                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
+                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Rendering
                     Renderers:
-                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Engine
+                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Engine
+                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Engine
+                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 9c51229d-d259-46dd-bf48-77578cd01f97
-                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Engine
+                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 738e433b-332b-437c-8d19-d4e99be09069
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -133,6 +133,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     d5b2e71c088247e21556decdce138d96: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -152,6 +153,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     34ecb9b2633eacfc439ba8744fe05102: !PostProcessingEffects
@@ -161,7 +163,6 @@ SharedRenderers:
         LocalReflections:
             Enabled: false
             ResolvePassResolution: Full
-            DebugMode: None
             DepthResolution: Half
         DepthOfField:
             Enabled: false
@@ -185,17 +186,17 @@ SharedRenderers:
                     Enabled: false
                     Color: {R: 0.0, G: 0.0, B: 0.0}
         Antialiasing: !FXAAEffect {}
-    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 7f627be4-065f-4541-bfd2-f7e6cef58a96
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! f1ef5817-0725-4b1a-abc9-845d101ec0e6
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: 82568e46-92e7-421a-8dca-114a74e0cd69
         Children:
             d39c5ddbf8b7d5ca02bafb6496b1cc3c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 7f627be4-065f-4541-bfd2-f7e6cef58a96
+            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 7f627be4-065f-4541-bfd2-f7e6cef58a96
     RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! f73edb54-66b5-4d61-ba47-af960f05d385
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
diff --git a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj
index 957727f556..58f23161fd 100644
--- a/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj
+++ b/samples/Templates/FirstPersonShooter/FirstPersonShooter/FirstPersonShooter.Game/FirstPersonShooter.Game.csproj
@@ -4,12 +4,12 @@
     <RootNamespace>FirstPersonShooter</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
     <ProjectReference Include="..\..\..\Packs\VFXPackage\VFXPackage.csproj" />
     <ProjectReference Include="..\..\..\Packs\PrototypingBlocks\PrototypingBlocks.csproj" />
     <ProjectReference Include="..\..\..\Packs\mannequinModel\mannequinModel.csproj" />
diff --git a/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj b/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj
index 5e2515dbbc..1e0f213097 100644
--- a/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj
+++ b/samples/Templates/Packs/MaterialPackage/MaterialPackage.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x1.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x1.xkphy
index c3f958882c..8262b4f4db 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x1.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x1.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 974ee62e-4d36-4005-a27f-da07b6ae36a7
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: c262e230-382e-451b-8392-6c1441e58792:Models/Ramp1x1_2x1
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x2.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x2.xkphy
index 480f163006..99545bb178 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x2.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1_2x2.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: ae62d5af-0efc-40e2-af1d-02af859774a1
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: 898b8f2c-6cd6-4320-9dad-418fdb30e20d:Models/Ramp1x1_2x2
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1x1.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1x1.xkphy
index f029e85a23..992ac18749 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1x1.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp1x1x1.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 26f14582-93fd-4080-9f17-1f4444fe2205
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: e55d79be-700a-44db-a70f-8512c67dd07d:Models/Ramp1x1x1
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp2x1_2x1.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp2x1_2x1.xkphy
index a01f829501..db67c7e35d 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp2x1_2x1.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Ramp2x1_2x1.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 815bd728-6629-4b0e-aa73-0dcf3435c715
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: fe9e63cd-9e41-4e66-b66b-67d0e1f67a85:Models/Ramp2x2_1x1
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1.xkphy
index 261b61dd28..78ee58745f 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: f1034796-324c-4a40-a626-3d57b1d87fbf
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: ef7ac5ee-fbc4-4990-aa48-a7e60f283326:Models/Stairs1x1x1
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_25.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_25.xkphy
index d174a26837..e92c829e7f 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_25.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_25.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 99e92203-3bfa-4947-a970-cf3c3b94fb84
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: 4c293323-c1b7-4b6f-8cdd-a240f179e5f5:Models/Stairs1x1x1_25
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_50.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_50.xkphy
index 22d5e1dc6d..5e5605f41a 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_50.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x1_50.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 0bbcc6fe-9120-44e5-b6e8-6976bfa64b2c
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: 026c2dd9-6f56-47d4-a4cc-c80a1a69d8a8:Models/Stairs1x1x1_50
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x2.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x2.xkphy
index 825d9fff05..07ca170af1 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x2.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs1x1x2.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 934024bf-9a3a-4e33-8fb0-fa4e14832f2b
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: da028d29-e641-4020-8977-dafaaf656ad4:Models/Stairs1x1x2
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs2x2x4.xkphy b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs2x2x4.xkphy
index 09a4ab7846..f9ecac9108 100644
--- a/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs2x2x4.xkphy
+++ b/samples/Templates/Packs/PrototypingBlocks/Assets/CollisionMeshes/Stairs2x2x4.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 60258ea8-0806-483e-a80d-4ad76595042d
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     dd1b93604c80c24fa67766d259000d5f: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: 19b45002-2276-4da1-b346-f0bd841b008e:Models/Stairs2x2x4
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj b/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj
index 7065a3e3cd..bb15ce2041 100644
--- a/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj
+++ b/samples/Templates/Packs/PrototypingBlocks/PrototypingBlocks.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj b/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj
index 5e2515dbbc..1e0f213097 100644
--- a/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj
+++ b/samples/Templates/Packs/SamplesAssetPackage/SamplesAssetPackage.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Templates/Packs/VFXPackage/VFXPackage.csproj b/samples/Templates/Packs/VFXPackage/VFXPackage.csproj
index c6af001043..5eed6cdeb3 100644
--- a/samples/Templates/Packs/VFXPackage/VFXPackage.csproj
+++ b/samples/Templates/Packs/VFXPackage/VFXPackage.csproj
@@ -3,8 +3,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Templates/Packs/mannequinModel/mannequinModel.csproj b/samples/Templates/Packs/mannequinModel/mannequinModel.csproj
index 6745b8ea39..b29f22b548 100644
--- a/samples/Templates/Packs/mannequinModel/mannequinModel.csproj
+++ b/samples/Templates/Packs/mannequinModel/mannequinModel.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/EffectCompileLog.xkeffectlog b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/EffectCompileLog.xkeffectlog
index feb491437c..64c81cff9b 100644
--- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/EffectCompileLog.xkeffectlog
+++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/EffectCompileLog.xkeffectlog
@@ -8,20 +8,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -29,14 +32,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -45,7 +50,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -57,16 +63,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -96,20 +107,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -117,14 +131,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -133,7 +149,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -145,16 +162,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -184,17 +206,20 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -204,7 +229,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -212,14 +238,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -228,7 +256,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -240,16 +269,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -279,17 +313,20 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -299,7 +336,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -307,14 +345,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -323,7 +363,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -335,8 +376,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -347,20 +390,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -369,8 +415,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -381,20 +429,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -402,14 +453,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -418,7 +471,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -430,8 +484,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -442,20 +498,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -463,14 +522,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -479,7 +540,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -491,16 +553,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -528,20 +595,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -549,14 +619,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -564,7 +636,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -572,7 +645,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -581,7 +655,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -596,16 +671,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -639,20 +719,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -660,14 +743,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -675,7 +760,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -683,7 +769,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -692,7 +779,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -707,8 +795,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -719,20 +809,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -740,14 +833,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -755,7 +850,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -763,7 +859,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -771,7 +868,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -779,7 +877,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -787,7 +886,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -796,7 +896,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -808,25 +909,30 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -836,7 +942,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -844,14 +951,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -860,7 +969,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -872,16 +982,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -909,20 +1024,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -930,14 +1048,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -945,7 +1065,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -953,7 +1074,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -962,7 +1084,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -977,16 +1100,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1010,20 +1138,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1031,14 +1162,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1047,7 +1180,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1059,8 +1193,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -1071,20 +1207,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1092,7 +1231,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1100,14 +1240,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1116,7 +1258,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1128,8 +1271,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -1141,20 +1286,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1162,14 +1310,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1177,7 +1327,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1185,7 +1336,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1193,7 +1345,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1201,7 +1354,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1209,7 +1363,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1218,7 +1373,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1230,16 +1386,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1273,20 +1434,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1294,14 +1458,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1309,7 +1475,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1317,7 +1484,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1325,7 +1493,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1333,7 +1502,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1341,7 +1511,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1350,7 +1521,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1362,16 +1534,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1395,20 +1572,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1416,14 +1596,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1432,7 +1614,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1444,16 +1627,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1481,20 +1669,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1502,7 +1693,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1510,14 +1702,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1526,7 +1720,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1538,17 +1733,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1582,20 +1782,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1603,7 +1806,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1611,14 +1815,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1627,7 +1833,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1639,17 +1846,22 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1763,20 +1975,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1785,16 +2000,21 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -1822,20 +2042,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1844,16 +2067,21 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GameSettings.xkgamesettings b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GameSettings.xkgamesettings
index 9d494b6334..dc1a4dcc0b 100644
--- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GameSettings.xkgamesettings
+++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 4117e0c4-74e7-486c-aed4-984217303139
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 98760599-6f0e-4c6b-9ba2-613e9d68d2e3:MainScene
 GraphicsCompositor: ddd023e5-3d0c-4fd9-a18b-0136736ce437:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GraphicsCompositor.xkgfxcomp b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GraphicsCompositor.xkgfxcomp
index 744333a086..2242c43f0d 100644
--- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GraphicsCompositor.xkgfxcomp
+++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/Assets/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: ddd023e5-3d0c-4fd9-a18b-0136736ce437
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 823a81bf-bac0-4552-9267-aeed499c40df:DefaultGraphicsCompositorLevel10
 Cameras:
@@ -39,73 +39,73 @@ RenderStages:
         EffectSlotName: GBuffer
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 03fb5179-1ec3-46c6-9f21-e99bd570d6c6
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterParaboloid
-            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 4316c937-6f9a-4961-a899-6394ffcc1cfe
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterCubeMap
-            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 2230593d-d4a3-4a72-be17-359d0aead755
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 03fb5179-1ec3-46c6-9f21-e99bd570d6c6
                 DepthClipping: true
-            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 4316c937-6f9a-4961-a899-6394ffcc1cfe
                 DepthClipping: true
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Engine {}
-                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
-                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Engine {}
-                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Engine
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Rendering {}
+                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
+                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Rendering
                     Renderers:
-                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Engine
+                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Engine
+                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Engine
+                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 03fb5179-1ec3-46c6-9f21-e99bd570d6c6
-                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Engine
+                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 4316c937-6f9a-4961-a899-6394ffcc1cfe
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -133,6 +133,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     d5b2e71c088247e21556decdce138d96: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -152,6 +153,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     34ecb9b2633eacfc439ba8744fe05102: !PostProcessingEffects
@@ -161,7 +163,6 @@ SharedRenderers:
         LocalReflections:
             Enabled: false
             ResolvePassResolution: Full
-            DebugMode: None
             DepthResolution: Half
         DepthOfField:
             Enabled: false
@@ -185,17 +186,17 @@ SharedRenderers:
                     Enabled: false
                     Color: {R: 0.0, G: 0.0, B: 0.0}
         Antialiasing: !FXAAEffect {}
-    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 2f51782e-e23a-46fc-b1a4-6385a207d263
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 9aeac611-d1f6-46da-a235-e20cc154e170
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: 82568e46-92e7-421a-8dca-114a74e0cd69
         Children:
             d39c5ddbf8b7d5ca02bafb6496b1cc3c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 2f51782e-e23a-46fc-b1a4-6385a207d263
+            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 2f51782e-e23a-46fc-b1a4-6385a207d263
     RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 04d863bd-4bbd-4dca-9a49-29e21171975a
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj
index 23cd2858e0..3c2df7fe7d 100644
--- a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj
+++ b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Game/ThirdPersonPlatformer.Game.csproj
@@ -4,12 +4,12 @@
     <RootNamespace>ThirdPersonPlatformer</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
     <ProjectReference Include="..\..\..\Packs\PrototypingBlocks\PrototypingBlocks.csproj" />
     <ProjectReference Include="..\..\..\Packs\mannequinModel\mannequinModel.csproj" />
   </ItemGroup>
diff --git a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/Resources/Icon.ico b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/Resources/Icon.ico and b/samples/Templates/ThirdPersonPlatformer/ThirdPersonPlatformer/ThirdPersonPlatformer.Windows/Resources/Icon.ico differ
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/Assets/DynamicScene.xkscene b/samples/Templates/TopDownRPG/TopDownRPG/Assets/DynamicScene.xkscene
index 614d24bcb5..6ca596a086 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/Assets/DynamicScene.xkscene
+++ b/samples/Templates/TopDownRPG/TopDownRPG/Assets/DynamicScene.xkscene
@@ -45,8 +45,8 @@ Hierarchy:
                                 Size: XLarge
                                 DepthRange: {}
                                 PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
-                                ComputeTransmittance: false
                                 BiasParameters: {}
+                                ComputeTransmittance: false
                         Intensity: 5.0
         -   Entity:
                 Id: 2b57370f-e61c-41c5-b8c4-df6619837e29
@@ -84,7 +84,7 @@ Hierarchy:
                                 LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                     2eac96e8c90a836d8754e3f24fa1a99e: !Gameplay.SceneStreaming,TopDownRPG.Game
                         Id: 5b6e2307-e465-4da0-8d84-b9624682ef9f
-                        Url: EasternChunk
+                        Url: feaab56f-3f56-48e0-83be-dfe2f38f65a6:EasternChunk
                         Trigger: !RigidbodyComponent ref!! 00eee251-501b-4d85-b1b2-cdf1d7608ee4
         -   Entity:
                 Id: 3113203c-2276-420b-bf0d-fce00d95dc58
@@ -122,7 +122,7 @@ Hierarchy:
                                 LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                     2eac96e8c90a836d8754e3f24fa1a99e: !Gameplay.SceneStreaming,TopDownRPG.Game
                         Id: 276ff6f0-dcc0-4945-b13e-f2dd2664b4e0
-                        Url: SouthernChunk
+                        Url: 7cdb3d4a-151d-4851-a736-fec1bba593d3:SouthernChunk
                         Trigger: !RigidbodyComponent ref!! 52032222-a039-47be-9d21-4a6c3adca582
         -   Entity:
                 Id: 36396dfa-6aa4-4489-a7f5-e45f569bb082
@@ -291,7 +291,7 @@ Hierarchy:
                                 LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                     2eac96e8c90a836d8754e3f24fa1a99e: !Gameplay.SceneStreaming,TopDownRPG.Game
                         Id: 0d6efc2a-7d05-4295-aa27-1438d51972c0
-                        Url: WesternChunk
+                        Url: 465718fa-96e7-4d3b-897d-8e7075b1a9ae:WesternChunk
                         Trigger: !RigidbodyComponent ref!! 06ed6375-b5de-40e6-88e8-16ba15e8f474
         -   Folder: GlobalLights
             Entity:
@@ -376,7 +376,7 @@ Hierarchy:
                                 LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                     2eac96e8c90a836d8754e3f24fa1a99e: !Gameplay.SceneStreaming,TopDownRPG.Game
                         Id: 1f7da7c0-2b66-4b6b-b5c2-924baea7652c
-                        Url: NorthernChunk
+                        Url: cd7db7bc-2d8e-45be-a6d9-4b7e9008e949:NorthernChunk
                         Trigger: !RigidbodyComponent ref!! 34034a61-5c72-4401-8c28-f112ab89f36b
         -   Entity:
                 Id: c3648c46-3fef-42fd-a935-6c2663254381
@@ -414,7 +414,7 @@ Hierarchy:
                                 LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                     2eac96e8c90a836d8754e3f24fa1a99e: !Gameplay.SceneStreaming,TopDownRPG.Game
                         Id: 399f44ea-00ce-44fc-80ff-474e65ec1c9b
-                        Url: CentralChunk
+                        Url: 805ec36b-feab-40fb-93cd-8f5083937659:CentralChunk
                         Trigger: !RigidbodyComponent ref!! 78b1ff69-cfed-4a09-8c1b-eb12cbf817b1
         -   Entity:
                 Id: f7e977f3-a569-4ae2-a4e8-89afaf7e0817
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/Assets/EffectCompileLog.xkeffectlog b/samples/Templates/TopDownRPG/TopDownRPG/Assets/EffectCompileLog.xkeffectlog
index adee5958c0..fa38ee3c74 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/Assets/EffectCompileLog.xkeffectlog
+++ b/samples/Templates/TopDownRPG/TopDownRPG/Assets/EffectCompileLog.xkeffectlog
@@ -4,20 +4,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -25,7 +28,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -33,14 +37,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -48,7 +54,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -56,7 +63,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -65,7 +73,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -77,8 +86,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -86,17 +97,20 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -106,7 +120,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -114,14 +129,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -130,7 +147,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -142,25 +160,30 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -170,7 +193,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -178,14 +202,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -194,7 +220,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -206,20 +233,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -250,20 +283,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -271,14 +307,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -287,7 +325,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -299,20 +338,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -339,17 +384,20 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -359,7 +407,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -367,14 +416,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -383,7 +434,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -395,20 +447,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -429,20 +487,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -450,14 +511,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -466,7 +529,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -478,28 +542,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -507,14 +576,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -523,7 +594,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -535,20 +607,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -573,20 +651,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -594,14 +675,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -610,7 +693,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -622,8 +706,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -634,20 +720,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -655,14 +744,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -671,7 +762,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -683,20 +775,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -721,20 +819,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -742,14 +843,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -757,7 +860,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -765,7 +869,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -774,7 +879,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -789,8 +895,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -801,20 +909,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -822,14 +933,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -837,7 +950,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -845,7 +959,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -854,7 +969,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -869,20 +985,26 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -907,20 +1029,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -928,14 +1053,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -943,7 +1070,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -951,7 +1079,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -959,7 +1088,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -967,7 +1097,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -975,7 +1106,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -984,7 +1116,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -996,20 +1129,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1040,20 +1179,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1061,14 +1203,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1076,7 +1220,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1084,7 +1229,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1092,7 +1238,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1100,7 +1247,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1108,7 +1256,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1117,7 +1266,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1129,28 +1279,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1158,7 +1313,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1166,7 +1322,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1174,7 +1331,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1182,7 +1340,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1190,7 +1349,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1198,7 +1358,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1206,7 +1367,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1214,7 +1376,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1222,12 +1385,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1237,7 +1402,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1245,7 +1411,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1254,7 +1421,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1269,8 +1437,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -1278,20 +1448,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1299,7 +1472,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1307,14 +1481,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1322,7 +1498,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1330,7 +1507,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1338,7 +1516,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1346,7 +1525,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1354,7 +1534,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1363,7 +1544,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1375,8 +1557,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -1384,20 +1568,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1405,14 +1592,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1421,7 +1610,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1433,20 +1623,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1477,20 +1673,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1498,7 +1697,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1506,14 +1706,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1522,7 +1724,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1534,8 +1737,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -1547,20 +1752,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1568,14 +1776,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1583,7 +1793,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1591,7 +1802,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1600,7 +1812,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1615,20 +1828,26 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1659,20 +1878,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1681,8 +1903,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -1693,20 +1917,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1715,20 +1942,26 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1753,20 +1986,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1774,14 +2010,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1789,7 +2027,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1797,7 +2036,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1805,7 +2045,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1813,7 +2054,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1821,7 +2063,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1830,7 +2073,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1842,20 +2086,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1880,20 +2130,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1902,20 +2155,26 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1946,20 +2205,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1967,7 +2229,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1975,14 +2238,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1991,7 +2256,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2003,21 +2269,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2042,20 +2314,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2063,7 +2338,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2071,14 +2347,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2087,7 +2365,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2099,21 +2378,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2227,7 +2512,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2246,14 +2532,16 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
                 GenericArguments: [ParticleBase.EmissiveValue]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2271,20 +2559,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2292,7 +2583,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2300,14 +2592,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2315,7 +2609,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2323,7 +2618,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2331,7 +2627,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2339,7 +2636,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2347,7 +2645,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2356,7 +2655,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2368,21 +2668,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2403,20 +2709,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2424,7 +2733,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2432,14 +2742,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2447,7 +2759,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2455,7 +2768,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2463,7 +2777,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2471,7 +2786,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2479,7 +2795,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2488,7 +2805,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2500,21 +2818,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2541,20 +2865,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2562,7 +2889,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2570,7 +2898,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2578,7 +2907,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2586,7 +2916,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2594,7 +2925,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2602,7 +2934,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2610,7 +2943,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2618,7 +2952,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2626,12 +2961,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2641,7 +2978,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2649,7 +2987,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2658,7 +2997,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2673,21 +3013,27 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2708,20 +3054,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2729,7 +3078,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2737,7 +3087,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2745,7 +3096,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2753,7 +3105,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2761,7 +3114,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2769,7 +3123,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2777,7 +3132,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2785,7 +3141,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2793,12 +3150,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2808,7 +3167,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2816,7 +3176,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2825,7 +3186,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2840,21 +3202,27 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2881,26 +3249,31 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.VertexStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDisplacement, r]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorSubtract
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorSubtract
                                         Compositions:
                                             color1: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorConstantFloatLink
@@ -2919,17 +3292,21 @@ UsedParameters:
                         GenericArguments: [Position, meshNormal, false]
     Material.VertexStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialDisplacementStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialDisplacementStream
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2937,7 +3314,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2945,7 +3323,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2953,7 +3332,8 @@ UsedParameters:
                                 GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2966,8 +3346,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     XenkoEffectBase.RenderTargetExtensions: !ShaderMixinSource
         Macros:
             -   Name: XENKO_MULTISAMPLE_COUNT
@@ -2978,20 +3360,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2999,7 +3384,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3007,14 +3393,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3022,7 +3410,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3030,7 +3419,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3039,7 +3429,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3051,21 +3442,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3086,20 +3483,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3107,7 +3507,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3115,14 +3516,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3130,7 +3533,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3138,7 +3542,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3147,7 +3552,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3159,21 +3565,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, true, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/Assets/GameSettings.xkgamesettings b/samples/Templates/TopDownRPG/TopDownRPG/Assets/GameSettings.xkgamesettings
index c55c7ffd2a..d050651123 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/Assets/GameSettings.xkgamesettings
+++ b/samples/Templates/TopDownRPG/TopDownRPG/Assets/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 2eabc4de-eca3-4407-83d7-8640d12f8b1c
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 961e35a8-ba9a-47b4-82c6-2a2450282c00:MainScene
 GraphicsCompositor: ce13d5ed-a9d2-46c0-97d0-e52f7482d0c6:GraphicsCompositor
@@ -43,7 +43,7 @@ Defaults:
                     MaxClimb: 0.3
                     MaxSlope: {Radians: 0.7853982}
                     Radius: 0.5
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/Assets/GraphicsCompositor.xkgfxcomp b/samples/Templates/TopDownRPG/TopDownRPG/Assets/GraphicsCompositor.xkgfxcomp
index db4fdfc03e..303d2ff1d8 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/Assets/GraphicsCompositor.xkgfxcomp
+++ b/samples/Templates/TopDownRPG/TopDownRPG/Assets/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: ce13d5ed-a9d2-46c0-97d0-e52f7482d0c6
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 823a81bf-bac0-4552-9267-aeed499c40df:DefaultGraphicsCompositorLevel10
 Cameras:
@@ -39,73 +39,73 @@ RenderStages:
         EffectSlotName: GBuffer
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 3bb83710-3c46-4189-bc60-6a4e24765272
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterParaboloid
-            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 8aff140a-5c35-4404-a34d-9e4ae1f4820d
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterCubeMap
-            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! fdb004f3-e692-4a74-ac3a-e95b40e2a4dd
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 3bb83710-3c46-4189-bc60-6a4e24765272
                 DepthClipping: true
-            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 8aff140a-5c35-4404-a34d-9e4ae1f4820d
                 DepthClipping: true
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Engine {}
-                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
-                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Engine {}
-                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Engine
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Rendering {}
+                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
+                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Rendering
                     Renderers:
-                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Engine
+                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Engine
+                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Engine
+                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 3bb83710-3c46-4189-bc60-6a4e24765272
-                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Engine
+                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 8aff140a-5c35-4404-a34d-9e4ae1f4820d
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -133,6 +133,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     d5b2e71c088247e21556decdce138d96: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -152,6 +153,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     34ecb9b2633eacfc439ba8744fe05102: !PostProcessingEffects
@@ -161,7 +163,6 @@ SharedRenderers:
         LocalReflections:
             Enabled: false
             ResolvePassResolution: Full
-            DebugMode: None
             DepthResolution: Half
         DepthOfField:
             Enabled: false
@@ -185,17 +186,17 @@ SharedRenderers:
                     Enabled: false
                     Color: {R: 0.0, G: 0.0, B: 0.0}
         Antialiasing: !FXAAEffect {}
-    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 7f8953c1-a839-4b27-92c9-687292331dac
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! c15adccd-88f4-4cd9-a45a-55ce9f8e89e5
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: 82568e46-92e7-421a-8dca-114a74e0cd69
         Children:
             d39c5ddbf8b7d5ca02bafb6496b1cc3c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 7f8953c1-a839-4b27-92c9-687292331dac
+            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 7f8953c1-a839-4b27-92c9-687292331dac
     RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 722b7819-f252-47c9-be1d-ae5acbc94bb8
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Core/Utils.cs b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Core/Utils.cs
index 3a5bd4c7e8..87d7c96f0e 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Core/Utils.cs
+++ b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Core/Utils.cs
@@ -161,7 +161,8 @@ public static bool ScreenPositionToWorldPositionRaycast(Vector2 screenPos, Camer
 
             var minDistance = float.PositiveInfinity;
 
-            var result = simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ());
+            var result = new FastList<HitResult>();
+            simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ(), result);
             foreach (var hitResult in result)
             {
                 ClickType type = ClickType.Empty;
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Gameplay/SceneStreaming.cs b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Gameplay/SceneStreaming.cs
index ef25fbc8c8..60f5313e2e 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Gameplay/SceneStreaming.cs
+++ b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/Gameplay/SceneStreaming.cs
@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization;
 using Xenko.Engine;
 using Xenko.Physics;
 
@@ -29,7 +30,7 @@ public class SceneStreaming : SyncScript
         /// <summary>
         /// The url of the scene to load
         /// </summary>
-        public string Url { get; set; }
+        public UrlReference<Scene> Url { get; set; }
 
         /// <summary>
         /// The trigger volume. This should be a static collider, set to be a trigger
@@ -99,14 +100,14 @@ public override void Update()
                     if (shouldLoad)
                     {
                         // If we should load syncrhonously, just create a completed task and load 
-                        Instance = Content.Load<Scene>(Url);
+                        Instance = Content.Load(Url);
                         loadingTask = Task.FromResult(Instance);
                     }
                     else if (shouldPreLoad)
                     {
                         loadCancellation = new CancellationTokenSource();
 
-                        var localLoadingTask = loadingTask = Content.LoadAsync<Scene>(Url);
+                        var localLoadingTask = loadingTask = Content.LoadAsync(Url);
                         Script.AddTask(async () =>
                         {
                             await loadingTask;
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj
index e209538cb5..d915e41e6a 100644
--- a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj
+++ b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Game/TopDownRPG.Game.csproj
@@ -4,13 +4,13 @@
     <RootNamespace>TopDownRPG</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Navigation" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Navigation" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
     <ProjectReference Include="..\..\..\Packs\VFXPackage\VFXPackage.csproj" />
     <ProjectReference Include="..\..\..\Packs\PrototypingBlocks\PrototypingBlocks.csproj" />
     <ProjectReference Include="..\..\..\Packs\mannequinModel\mannequinModel.csproj" />
diff --git a/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/Resources/Icon.ico b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/Resources/Icon.ico
new file mode 100644
index 0000000000..29256adf26
Binary files /dev/null and b/samples/Templates/TopDownRPG/TopDownRPG/TopDownRPG.Windows/Resources/Icon.ico differ
diff --git a/samples/Templates/VRSandbox/VRSandbox/Assets/ColliderHull.xkphy b/samples/Templates/VRSandbox/VRSandbox/Assets/ColliderHull.xkphy
index 51a9427388..ce2da4de0c 100644
--- a/samples/Templates/VRSandbox/VRSandbox/Assets/ColliderHull.xkphy
+++ b/samples/Templates/VRSandbox/VRSandbox/Assets/ColliderHull.xkphy
@@ -1,6 +1,6 @@
 !ColliderShapeAsset
 Id: 7d081988-3699-4ccc-8bc2-c31b37b172d4
-SerializedVersion: {Xenko: 2.0.0.0}
+SerializedVersion: {Xenko: 3.0.0.0}
 Tags: []
 ColliderShapes:
     e37a9ac2f8b620ffd45945407271cd76: !ConvexHullColliderShapeDesc
@@ -9,12 +9,13 @@ ColliderShapes:
         Model: 5c759e03-f13d-4962-b8f2-4ff82e154629:Models/standCurved
         LocalOffset: {X: 0.0, Y: 0.0, Z: 0.0}
         LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
-        SimpleWrap: true
         Scaling: {X: 1.0, Y: 1.0, Z: 1.0}
-        Depth: 10
-        PosSampling: 10
-        AngleSampling: 10
-        PosRefine: 5
-        AngleRefine: 5
-        Alpha: 0.01
-        Threshold: 0.01
+        Decomposition:
+            Depth: 10
+            PosSampling: 10
+            AngleSampling: 10
+            PosRefine: 5
+            AngleRefine: 5
+            Alpha: 0.01
+            Threshold: 0.01
+            Enabled: false
diff --git a/samples/Templates/VRSandbox/VRSandbox/Assets/EffectCompileLog.xkeffectlog b/samples/Templates/VRSandbox/VRSandbox/Assets/EffectCompileLog.xkeffectlog
index 0628c598c7..62dae757fc 100644
--- a/samples/Templates/VRSandbox/VRSandbox/Assets/EffectCompileLog.xkeffectlog
+++ b/samples/Templates/VRSandbox/VRSandbox/Assets/EffectCompileLog.xkeffectlog
@@ -4,20 +4,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -25,7 +28,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -33,7 +37,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -41,7 +46,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -50,7 +56,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -62,16 +69,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -93,20 +104,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -114,7 +128,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -122,7 +137,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -130,7 +146,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -138,7 +155,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -146,7 +164,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -154,7 +173,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -162,7 +182,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -170,7 +191,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -179,7 +201,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -191,16 +214,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -226,20 +253,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -247,14 +277,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -262,7 +294,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -270,7 +303,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -278,7 +312,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -286,7 +321,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -294,7 +330,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -303,7 +340,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -315,16 +353,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -346,20 +388,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -367,7 +412,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -375,7 +421,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -383,7 +430,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -392,7 +440,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -404,16 +453,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -433,20 +486,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -454,7 +510,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -462,14 +519,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -478,7 +537,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -490,17 +550,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -522,20 +586,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -543,7 +610,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -551,14 +619,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -566,7 +636,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -574,7 +645,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -582,7 +654,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -590,7 +663,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -598,7 +672,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -607,7 +682,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -619,17 +695,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -655,20 +735,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -676,7 +759,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -684,14 +768,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -700,7 +786,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -712,17 +799,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -738,20 +829,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -759,7 +853,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -767,7 +862,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -775,7 +871,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -783,7 +880,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -791,7 +889,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -799,7 +898,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -807,7 +907,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -815,7 +916,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -823,12 +925,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -838,7 +942,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -846,7 +951,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -855,7 +961,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -870,17 +977,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -902,20 +1013,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -923,7 +1037,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -931,14 +1046,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -946,7 +1063,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -954,7 +1072,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -963,7 +1082,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -975,17 +1095,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1007,13 +1131,15 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1021,7 +1147,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1032,8 +1159,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     XenkoEffectBase.RenderTargetExtensions: !ShaderMixinSource
         Macros:
             -   Name: XENKO_RENDER_TARGET_COUNT
@@ -1046,13 +1175,15 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1060,7 +1191,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1071,28 +1203,33 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1100,7 +1237,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1108,7 +1246,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1116,7 +1255,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1124,7 +1264,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1132,7 +1273,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1140,7 +1282,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1148,7 +1291,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1156,7 +1300,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1164,12 +1309,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1179,7 +1326,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1187,7 +1335,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1196,7 +1345,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1211,17 +1361,21 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1237,20 +1391,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1258,7 +1415,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1266,14 +1424,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1281,7 +1441,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1289,7 +1450,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1297,7 +1459,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1305,7 +1468,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1313,7 +1477,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1322,7 +1487,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1334,17 +1500,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1360,20 +1530,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -1381,7 +1554,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1389,14 +1563,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1404,7 +1580,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1412,7 +1589,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1421,7 +1599,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1433,17 +1612,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1459,25 +1642,29 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, false]
                         Compositions:
                             normalMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1487,12 +1674,14 @@ UsedParameters:
                                         GenericArguments: [Material.NormalValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [true]
                         Compositions:
                             glossinessMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1502,7 +1691,8 @@ UsedParameters:
                                         GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1510,7 +1700,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i3, Material.TextureOffset.i3]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1518,7 +1709,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1527,7 +1719,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1539,17 +1732,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1571,20 +1768,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1592,7 +1792,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1600,7 +1801,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1608,7 +1810,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1616,7 +1819,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1624,7 +1828,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1632,7 +1837,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1640,7 +1846,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1648,7 +1855,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1657,7 +1865,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1669,16 +1878,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1698,20 +1911,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1719,14 +1935,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1734,7 +1952,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1742,7 +1961,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1750,7 +1970,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1758,7 +1979,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1766,7 +1988,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1775,7 +1998,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1787,16 +2011,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1812,25 +2040,29 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, false]
                         Compositions:
                             normalMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1840,12 +2072,14 @@ UsedParameters:
                                         GenericArguments: [Material.NormalValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [true]
                         Compositions:
                             glossinessMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1855,7 +2089,8 @@ UsedParameters:
                                         GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1863,7 +2098,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i3, Material.TextureOffset.i3]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1871,7 +2107,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1880,7 +2117,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1892,17 +2130,21 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -1922,20 +2164,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -1943,14 +2188,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -1959,7 +2206,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -1971,16 +2219,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2006,20 +2258,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2027,14 +2282,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2043,7 +2300,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2055,16 +2313,20 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2096,25 +2358,29 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, false]
                         Compositions:
                             normalMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2124,12 +2390,14 @@ UsedParameters:
                                         GenericArguments: [Material.NormalValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [true]
                         Compositions:
                             glossinessMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2139,7 +2407,8 @@ UsedParameters:
                                         GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2147,7 +2416,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i3, Material.TextureOffset.i3]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2155,7 +2425,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2164,7 +2435,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2176,8 +2448,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -2185,20 +2459,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2206,7 +2483,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2214,14 +2492,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2229,7 +2509,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2237,7 +2518,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2245,7 +2527,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2253,7 +2536,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2261,7 +2545,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2270,7 +2555,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2282,8 +2568,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -2291,20 +2579,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2312,7 +2603,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2320,7 +2612,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2328,7 +2621,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2337,7 +2631,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2349,28 +2644,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2378,7 +2678,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2386,7 +2687,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2394,7 +2696,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2402,7 +2705,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2410,7 +2714,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2418,7 +2723,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2426,7 +2732,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2434,7 +2741,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2443,7 +2751,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2455,28 +2764,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2484,7 +2798,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2492,7 +2807,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2500,7 +2816,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2508,7 +2825,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2516,7 +2834,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2524,7 +2843,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2532,7 +2852,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2540,7 +2861,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2548,12 +2870,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2563,7 +2887,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2571,7 +2896,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2580,7 +2906,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2595,8 +2922,10 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -2608,20 +2937,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2629,7 +2961,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2637,14 +2970,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2653,7 +2988,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2665,8 +3001,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -2674,20 +3012,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -2695,7 +3036,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2703,14 +3045,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2718,7 +3062,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2726,7 +3071,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2735,7 +3081,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2747,8 +3094,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
 ---
 !EffectCompileRequest
@@ -2756,25 +3105,29 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, false]
                         Compositions:
                             normalMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2784,12 +3137,14 @@ UsedParameters:
                                         GenericArguments: [Material.NormalValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [true]
                         Compositions:
                             glossinessMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -2799,7 +3154,8 @@ UsedParameters:
                                         GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2807,7 +3163,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i3, Material.TextureOffset.i3]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2815,7 +3172,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2824,7 +3182,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2836,21 +3195,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2872,20 +3237,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -2893,7 +3261,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2901,7 +3270,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2909,7 +3279,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2917,7 +3288,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2925,7 +3297,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2933,7 +3306,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2941,7 +3315,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -2949,7 +3324,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -2958,7 +3334,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -2970,20 +3347,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -2999,20 +3382,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3020,7 +3406,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3028,7 +3415,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3036,7 +3424,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3045,7 +3434,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3057,20 +3447,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3086,25 +3482,29 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, false]
                         Compositions:
                             normalMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -3114,12 +3514,14 @@ UsedParameters:
                                         GenericArguments: [Material.NormalValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [true]
                         Compositions:
                             glossinessMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -3129,7 +3531,8 @@ UsedParameters:
                                         GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3137,7 +3540,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i3, Material.TextureOffset.i3]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3145,7 +3549,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3154,7 +3559,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3166,21 +3572,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3196,20 +3608,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3217,7 +3632,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3225,7 +3641,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3233,7 +3650,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3241,7 +3659,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3249,7 +3668,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3257,7 +3677,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3265,7 +3686,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3273,7 +3695,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3282,7 +3705,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3294,20 +3718,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3329,20 +3759,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3350,7 +3783,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3358,7 +3792,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3366,7 +3801,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3375,7 +3811,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3387,20 +3824,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3426,20 +3869,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3447,7 +3893,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3455,14 +3902,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3471,7 +3920,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3483,21 +3933,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3519,20 +3975,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3540,7 +3999,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3548,14 +4008,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3563,7 +4025,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3571,7 +4034,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3580,7 +4044,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3592,21 +4057,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3632,20 +4103,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3653,7 +4127,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3661,14 +4136,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3677,7 +4154,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3689,21 +4167,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3723,20 +4207,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3744,14 +4231,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3759,7 +4248,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3767,7 +4257,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3775,7 +4266,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3783,7 +4275,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3791,7 +4284,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3800,7 +4294,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3812,8 +4307,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -3824,20 +4321,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3845,14 +4345,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3861,7 +4363,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3873,28 +4376,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -3902,7 +4410,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -3910,14 +4419,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3925,7 +4436,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -3933,7 +4445,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -3942,7 +4455,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -3954,21 +4468,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -3984,20 +4504,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -4005,7 +4528,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4013,14 +4537,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4028,7 +4554,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4036,7 +4563,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4044,7 +4572,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4052,7 +4581,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4060,7 +4590,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4069,7 +4600,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4081,21 +4613,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4117,20 +4655,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -4138,7 +4679,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4146,14 +4688,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4161,7 +4705,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4169,7 +4714,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4177,7 +4723,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4185,7 +4732,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4193,7 +4741,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4202,7 +4751,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4214,21 +4764,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4248,20 +4804,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4269,14 +4828,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4284,7 +4845,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4292,7 +4854,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4300,7 +4863,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4308,7 +4872,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4316,7 +4881,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4325,7 +4891,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4337,20 +4904,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4366,20 +4939,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -4387,7 +4963,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4395,7 +4972,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4403,7 +4981,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4411,7 +4990,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4419,7 +4999,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4427,7 +5008,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4435,7 +5017,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4443,7 +5026,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4451,12 +5035,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -4466,7 +5052,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4474,7 +5061,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4483,7 +5071,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4498,21 +5087,27 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4528,20 +5123,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [true, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -4549,7 +5147,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4557,7 +5156,8 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4565,7 +5165,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4573,7 +5174,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4581,7 +5183,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionMap, TEXCOORD0, Material.Sampler.i0, r, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4589,7 +5192,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4597,7 +5201,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4605,7 +5210,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4613,12 +5219,14 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -4628,7 +5236,8 @@ UsedParameters:
                                         GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4636,7 +5245,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4645,7 +5255,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4660,21 +5271,27 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4700,20 +5317,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4721,14 +5341,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4737,7 +5359,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4749,20 +5372,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4782,20 +5411,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4803,14 +5435,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4819,7 +5453,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4831,20 +5466,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
@@ -4870,20 +5511,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -4891,14 +5535,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4906,7 +5552,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4914,7 +5561,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4922,7 +5570,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4930,7 +5579,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -4938,7 +5588,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -4947,7 +5598,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -4959,20 +5611,26 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, true, false, false, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
     Lighting.EnvironmentLights:
diff --git a/samples/Templates/VRSandbox/VRSandbox/Assets/GameSettings.xkgamesettings b/samples/Templates/VRSandbox/VRSandbox/Assets/GameSettings.xkgamesettings
index e5bc67426d..e145c3153f 100644
--- a/samples/Templates/VRSandbox/VRSandbox/Assets/GameSettings.xkgamesettings
+++ b/samples/Templates/VRSandbox/VRSandbox/Assets/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: f0373465-779e-49a5-8ae8-92a737831a9f
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 11913d23-3ce0-4773-88a4-227aa4d933e7:MainScene
 GraphicsCompositor: 8d329486-e5dc-4222-be4d-93c697dcdae8:GraphicsCompositor
@@ -22,7 +22,7 @@ Defaults:
         FixedTimeStep: 0.011111
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/Templates/VRSandbox/VRSandbox/Assets/GraphicsCompositor.xkgfxcomp b/samples/Templates/VRSandbox/VRSandbox/Assets/GraphicsCompositor.xkgfxcomp
index a7a150c8de..5b29019e25 100644
--- a/samples/Templates/VRSandbox/VRSandbox/Assets/GraphicsCompositor.xkgfxcomp
+++ b/samples/Templates/VRSandbox/VRSandbox/Assets/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 8d329486-e5dc-4222-be4d-93c697dcdae8
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 823a81bf-bac0-4552-9267-aeed499c40df:DefaultGraphicsCompositorLevel10
 Cameras:
@@ -48,77 +48,77 @@ RenderStages:
         Name: UIRenderStage
         EffectSlotName: Main
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 3a2a384d-1cca-4f9a-99be-24aec9790f26
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterParaboloid
-            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 4b938af9-e4cd-4b26-8f2c-33ad2ba2f6d9
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterCubeMap
-            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 1e10562d-806e-456b-a329-8bb5f97979b9
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            39ef65b9ba494c8486f253267a9ed113*: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            39ef65b9ba494c8486f253267a9ed113*: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 07a126dc-39ad-4bf7-88e9-6b051a66b1eb
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 3a2a384d-1cca-4f9a-99be-24aec9790f26
                 DepthClipping: true
-            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 4b938af9-e4cd-4b26-8f2c-33ad2ba2f6d9
                 DepthClipping: true
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Engine {}
-                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
-                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Engine {}
-                    8fb9bbed7a570fdc9d16ee6ae5602519*: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Engine {}
-                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Engine
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Rendering {}
+                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
+                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                    8fb9bbed7a570fdc9d16ee6ae5602519*: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Rendering
                     Renderers:
-                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Engine
+                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Engine
+                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Engine
+                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 3a2a384d-1cca-4f9a-99be-24aec9790f26
-                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Engine
+                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 4b938af9-e4cd-4b26-8f2c-33ad2ba2f6d9
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage*: ref!! e139baa9-6bb0-42db-8bcb-4732c127c8e1
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -162,9 +162,10 @@ SharedRenderers:
                     LocalRotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                     SurfaceSize: {X: 0.1, Y: 0.1}
                     FollowsHeadRotation: true
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel*: X4
         MSAAResolver: {}
-    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 237c52f0-dd85-4a36-a6b9-45f94545fdb4
         DebugRenderStages: {}
     e4fdc03ab99242b3b516df183f259aad*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -187,6 +188,7 @@ SharedRenderers:
             IgnoreCameraRotation: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     1bb079da57cd9ac93c46e238091dcef5*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -206,6 +208,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: X4
         MSAAResolver: {}
     d5b2e71c088247e21556decdce138d96: ~(Deleted)
@@ -213,17 +216,18 @@ SharedRenderers:
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! f70c25f8-3ab5-4afd-a6da-3f48277293b7
-    Child*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: 00705c6a-f385-4c7a-934a-3f4319865af8
         Children:
-            d39c5ddbf8b7d5ca02bafb6496b1cc3c*: !Xenko.Rendering.Compositing.RenderTextureSceneRenderer,Xenko.Engine
+            d39c5ddbf8b7d5ca02bafb6496b1cc3c*: !Xenko.Rendering.Compositing.RenderTextureSceneRenderer,Xenko.Rendering
                 Id: 4070a990-c647-4ab9-8853-8d4a558c4202
                 RenderTexture: f9768e6e-2d83-470e-925e-8a1db9342c5d:UIRenderTexture
-                Child: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Engine
+                Child: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Rendering
                     Id: fadaa3ec-6887-4bf2-a813-68d281523ec6
                     RenderStage: ref!! e139baa9-6bb0-42db-8bcb-4732c127c8e1
             01d338078e9b21121ead0868932613dd*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            e182ad0830302a7658f54ae655aba716*: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 237c52f0-dd85-4a36-a6b9-45f94545fdb4
+            e182ad0830302a7658f54ae655aba716*: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 237c52f0-dd85-4a36-a6b9-45f94545fdb4
+    RenderMask: All
 SingleView*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 7e02cd29-ca10-41f1-88d1-0ec22e083549
 Editor*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 70e4e095-41b2-4ebc-95f9-2d81f39632c9
 BlockPositions: {}
diff --git a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj
index 30f666cf53..9c9f0e134f 100644
--- a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj
+++ b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Game/VRSandbox.Game.csproj
@@ -4,12 +4,12 @@
     <RootNamespace>VRSandbox</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Physics" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
     <ProjectReference Include="..\..\..\Packs\mannequinModel\mannequinModel.csproj" />
     <ProjectReference Include="..\..\..\Packs\SamplesAssetPackage\SamplesAssetPackage.csproj" />
   </ItemGroup>
diff --git a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/Resources/Icon.ico b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/Resources/Icon.ico and b/samples/Templates/VRSandbox/VRSandbox/VRSandbox.Windows/Resources/Icon.ico differ
diff --git a/samples/Tests/LocalConnectionRouterInitializer.cs b/samples/Tests/LocalConnectionRouterInitializer.cs
deleted file mode 100644
index f738a9269b..0000000000
--- a/samples/Tests/LocalConnectionRouterInitializer.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Net.Sockets;
-using System.Threading;
-using Xenko.Core;
-using Xenko.Engine.Network;
-
-namespace Xenko.Samples.Tests
-{
-    //This is how we inject the assembly to run automatically at game start, paired with Xenko.targets and the msbuild property XenkoAutoTesting
-    internal class LocalConnectionRouterInitializer
-    {
-        [ModuleInitializer]
-        public static void Initialize()
-        {
-            // Locate connection router
-            var connectionRouterPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Xenko.ConnectionRouter.exe");
-            if (!File.Exists(connectionRouterPath))
-                throw new InvalidOperationException("Connection router not found");
-
-            // Kill any existing connection router
-            foreach (var process in Process.GetProcessesByName("Xenko.ConnectionRouter"))
-            {
-                try
-                {
-                    process.Kill();
-                    process.WaitForExit();
-                    break;
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            // Start connection router
-            var connectionRouterProcess = Process.Start(connectionRouterPath);
-            // attach job so that it gets killed when tests are finished
-            new AttachedChildProcessJob(connectionRouterProcess);
-
-            // Wait for port to open
-            using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
-            {
-                // Try during 5 seconds (10 * 500 msec)
-                for (int i = 0; i < 10; ++i)
-                {
-                    try
-                    {
-                        socket.Connect("localhost", RouterClient.DefaultPort);
-                    }
-                    catch (SocketException)
-                    {
-                        // Try again in 500 msec
-                        Thread.Sleep(500);
-                        continue;
-                    }
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/samples/Tests/Xenko.Samples.Tests.csproj b/samples/Tests/Xenko.Samples.Tests.csproj
index 5bf4b72e37..a8c398926f 100644
--- a/samples/Tests/Xenko.Samples.Tests.csproj
+++ b/samples/Tests/Xenko.Samples.Tests.csproj
@@ -1,9 +1,9 @@
-<Project>
+<Project>
   <Import Project="..\..\sources\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="..\..\sources\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
@@ -29,10 +29,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\sources\editor\Xenko.Assets.Presentation\Xenko.Assets.Presentation.csproj" />
     <ProjectReference Include="..\..\sources\editor\Xenko.Samples.Templates\Xenko.Samples.Templates.csproj" />
-    <ProjectReference Include="..\..\sources\engine\Xenko.Games.Testing\Xenko.Games.Testing.csproj" />
-    <ProjectReference Include="..\..\sources\tools\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj" />
-    <ProjectReference Include="..\..\sources\tools\Xenko.SamplesTestServer\Xenko.SamplesTestServer.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj
new file mode 100644
index 0000000000..9ac020033e
--- /dev/null
+++ b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>CSharpBeginner</RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" />
+    <PackageReference Include="Xenko.Video" Version="3.2.0.1-beta01" />
+    <PackageReference Include="Xenko.Physics" Version="3.2.0.1-beta01" />
+    <PackageReference Include="Xenko.Navigation" Version="3.2.0.1-beta01" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" IncludeAssets="build;buildTransitive" />
+    <ProjectReference Include="..\..\..\..\Templates\Packs\PrototypingBlocks\PrototypingBlocks.csproj" />
+    <ProjectReference Include="..\..\..\..\Templates\Packs\mannequinModel\mannequinModel.csproj" />
+    <ProjectReference Include="..\..\..\..\Templates\Packs\SamplesAssetPackage\SamplesAssetPackage.csproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.xkpkg b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.xkpkg
new file mode 100644
index 0000000000..4455d1e391
--- /dev/null
+++ b/samples/Tutorials/CSharpBeginner/CSharpBeginner/CSharpBeginner.Game/CSharpBeginner.Game.xkpkg
@@ -0,0 +1,32 @@
+!Package
+SerializedVersion: {Assets: 3.1.0.0}
+Meta:
+    Name: CSharpBeginner.Game
+    Version: 1.0.0
+    Authors: []
+    Owners: []
+    RootNamespace: CSharpBasics
+    Dependencies: null
+AssetFolders:
+    -   Path: !dir ../Assets
+    -   Path: !dir Effects
+ResourceFolders:
+    - !dir ../Resources
+OutputGroupDirectories: {}
+ExplicitFolders: []
+Bundles: []
+TemplateFolders: []
+RootAssets:
+    - 0a019d87-d943-4543-9b51-a4016200dff9:Scenes/Basics/Properties
+    - 137dcdfa-bfc8-4805-92a3-dd48f2b79061:Scenes/Basics/DeltaTime
+    - 328aea72-1405-48be-bf32-2363a61870f7:Scenes/Basics/Virtual buttons
+    - 52a557d6-1f2c-4983-a0bb-2c12d562d3bf:Scenes/Basics/Cloning entities
+    - 678cb64e-9dcd-44ea-8cdd-947667bbcc5a:Scenes/Basics/Adding a component
+    - 79af0b55-a70f-4c7a-8f5b-967d55661736:XenkoUILibrary
+    - 90c8a632-2df9-4335-8f09-24cb13e131b6:Scenes/Basics/Getting the entity
+    - 9e1b53ff-dc0c-410a-8972-14f949f83a01:Scenes/Basics/Child entities
+    - ba8ed57d-74b9-4121-baf0-6a92463b600a:Scenes/Basics/Getting a component
+    - c00aec52-d6b8-4eab-80c2-460ac8109da6:Scenes/Basics/Mouse input
+    - d8597439-175b-42b3-81ca-d6553655e38f:Scenes/Basics/Removing entities
+    - dbb3b809-4ff0-41da-b125-78a5ea1ec89c:Scenes/Basics/TransformPosition
+    - ee2eb459-7847-42b5-bd69-fc43a6625fd5:Scenes/Basics/Keyboard input
diff --git a/samples/UI/GameMenu/Assets/Shared/GameSettings.xkgamesettings b/samples/UI/GameMenu/Assets/Shared/GameSettings.xkgamesettings
index 9369bb979d..31ed6cab04 100644
--- a/samples/UI/GameMenu/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/UI/GameMenu/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: e6a60237-e287-40d1-acb1-4bce2273fd45
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 49fe9241-18f3-478f-8f71-e87f87346da2:SplashScene
 GraphicsCompositor: 733c24da-ac75-4fce-b148-d6d2d3753157:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/UI/GameMenu/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/UI/GameMenu/Assets/Shared/GraphicsCompositor.xkgfxcomp
index e649ed7e7d..fa95f3e29f 100644
--- a/samples/UI/GameMenu/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/UI/GameMenu/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 733c24da-ac75-4fce-b148-d6d2d3753157
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -24,46 +24,46 @@ RenderStages:
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -91,19 +91,21 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 2e15aa15-7a9f-44e6-8ad7-1bc44847d8e5
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera*: ref!! 33a02921-a3f4-4baa-91b2-b557748dca5e
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: e1b3f028-e125-4ffb-9b63-0942d78251d1
         Children:
             ce29e81d8821fbf2a3d2264868e9921c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 2e15aa15-7a9f-44e6-8ad7-1bc44847d8e5
+            6efe857054d875d04a6788c9b40428bc: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 2e15aa15-7a9f-44e6-8ad7-1bc44847d8e5
+    RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
 BlockPositions: {}
diff --git a/samples/UI/GameMenu/Assets/Shared/SplashScene.xkscene b/samples/UI/GameMenu/Assets/Shared/SplashScene.xkscene
index 942e216af8..d28e564027 100644
--- a/samples/UI/GameMenu/Assets/Shared/SplashScene.xkscene
+++ b/samples/UI/GameMenu/Assets/Shared/SplashScene.xkscene
@@ -19,14 +19,15 @@ Hierarchy:
                         Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                         Scale: {X: 1.0, Y: 1.0, Z: 1.0}
                         Children: {}
-                    ac2b7de7553bbc4ba5bbd9c3ba319cc1: !GameMenu.SplashScript,GameMenu.Game
-                        Id: e77d2bac-3b55-4bbc-a5bb-d9c3ba319cc1
                     f6b6b1a8d48a8045bd940370455f3450: !UIComponent
                         Id: a8b1b6f6-8ad4-4580-bd94-0370455f3450
                         Page: 62c493c2-13ea-4fac-bbaf-578afafac104:SplashUI
                         Resolution: {X: 640.0, Y: 1136.0, Z: 1000.0}
                         Size: {X: 1.0, Y: 1.0, Z: 1.0}
                         ResolutionStretch: FixedWidthFixedHeight
+                    fd54344b6ac8b2ed232d62dc08820239: !GameMenu.SplashScript,GameMenu.Game
+                        Id: c7c92d4b-2c04-446f-b8c5-59e9d2b989cd
+                        NextSceneUrl: 9294c606-6173-4215-a8dc-0d5043d68333:MainScene
         -   Entity:
                 Id: a604bc4e-f7f3-42c1-b98f-eeea9e10b54c
                 Name: Camera
diff --git a/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj b/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj
index fc49ca967b..b179442729 100644
--- a/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj
+++ b/samples/UI/GameMenu/GameMenu.Game/GameMenu.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>GameMenu</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/UI/GameMenu/GameMenu.Game/SplashScript.cs b/samples/UI/GameMenu/GameMenu.Game/SplashScript.cs
index 7bfdd9e0c3..779e6df9cf 100644
--- a/samples/UI/GameMenu/GameMenu.Game/SplashScript.cs
+++ b/samples/UI/GameMenu/GameMenu.Game/SplashScript.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Linq;
+using Xenko.Core.Serialization;
 using Xenko.Engine;
 using Xenko.Input;
 
@@ -8,6 +9,8 @@ namespace GameMenu
 {
     public class SplashScript : UISceneBase
     {
+        public UrlReference<Scene> NextSceneUrl { get; set; }
+
         protected override void LoadScene()
         {
             // Allow user to resize the window with the mouse.
@@ -19,7 +22,7 @@ protected override void UpdateScene()
             if (Input.PointerEvents.Any(e => e.EventType == PointerEventType.Pressed))
             {
                 // Next scene
-                SceneSystem.SceneInstance.RootScene = Content.Load<Scene>("MainScene");
+                SceneSystem.SceneInstance.RootScene = Content.Load(NextSceneUrl);
                 Cancel();
             }
         }
diff --git a/samples/UI/GameMenu/GameMenu.Windows/Resources/Icon.ico b/samples/UI/GameMenu/GameMenu.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/UI/GameMenu/GameMenu.Windows/Resources/Icon.ico and b/samples/UI/GameMenu/GameMenu.Windows/Resources/Icon.ico differ
diff --git a/samples/UI/UIElementLink/Assets/Shared/BillboardedScreen.xkscene b/samples/UI/UIElementLink/Assets/Shared/BillboardedScreen.xkscene
index 1eeafff442..60a95ed5e7 100644
--- a/samples/UI/UIElementLink/Assets/Shared/BillboardedScreen.xkscene
+++ b/samples/UI/UIElementLink/Assets/Shared/BillboardedScreen.xkscene
@@ -63,8 +63,8 @@ Hierarchy:
                                 Size: Large
                                 DepthRange: {}
                                 PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
-                                ComputeTransmittance: false
                                 BiasParameters: {}
+                                ComputeTransmittance: false
         -   Entity:
                 Id: 820d34a8-2971-4381-abfa-2965d94ec672
                 Name: Splash
@@ -78,7 +78,7 @@ Hierarchy:
                     a7872780eefdc542b4880d3c4b46f129: !UIElementLink.SplashScript,UIElementLink.Game
                         Id: 802787a7-fdee-42c5-b488-0d3c4b46f129
                         SplashScreenImages: e8e2f386-e79e-4875-993f-8bdaf0ef72c5:SplashScreenImages
-                        NextScene: FullScreen
+                        NextScene: 67a9eb30-7686-4b8c-89c3-19f12755774e:FullScreen
                     f6b6b1a8d48a8045bd940370455f3450: !UIComponent
                         Id: a8b1b6f6-8ad4-4580-bd94-0370455f3450
                         Page: null
@@ -153,8 +153,8 @@ Hierarchy:
                                             InheritRotation: true
                                             Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                                             InheritScale: true
-                                            ScaleUniform: 1.0
                                             Scale: {X: 1.0, Y: 1.0, Z: 1.0}
+                                            ScaleUniform: 1.0
                                             SeedOffset: 0
                                             DisplayParticlePosition: false
                                             DisplayParticleRotation: true
diff --git a/samples/UI/UIElementLink/Assets/Shared/EffectCompileLog.xkeffectlog b/samples/UI/UIElementLink/Assets/Shared/EffectCompileLog.xkeffectlog
index 3a7894350f..bc672dab47 100644
--- a/samples/UI/UIElementLink/Assets/Shared/EffectCompileLog.xkeffectlog
+++ b/samples/UI/UIElementLink/Assets/Shared/EffectCompileLog.xkeffectlog
@@ -4,20 +4,23 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -26,12 +29,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -48,20 +54,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -70,12 +79,15 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -102,20 +114,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -123,7 +138,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -131,7 +147,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -139,7 +156,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -148,7 +166,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -160,13 +179,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionBlinnPhong
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
@@ -187,20 +209,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceNormalMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceNormalMap
                                 GenericArguments: [false, true]
                         Compositions:
                             normalMap: !ShaderClassSource
@@ -208,7 +233,8 @@ UsedParameters:
                                 GenericArguments: [Material.NormalMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale.i1, Material.TextureOffset.i1]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecular, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -216,7 +242,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matSpecularIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -224,7 +251,8 @@ UsedParameters:
                                 GenericArguments: [Material.SpecularIntensityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -233,7 +261,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             environmentFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -245,13 +274,16 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionBlinnPhong
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Material.HasNormalMap: true
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [8]
         - !ShaderClassSource
             ClassName: LightClusteredPointGroup
diff --git a/samples/UI/UIElementLink/Assets/Shared/FullScreen.xkscene b/samples/UI/UIElementLink/Assets/Shared/FullScreen.xkscene
index d88bad5327..4ff3cb52a0 100644
--- a/samples/UI/UIElementLink/Assets/Shared/FullScreen.xkscene
+++ b/samples/UI/UIElementLink/Assets/Shared/FullScreen.xkscene
@@ -63,8 +63,8 @@ Hierarchy:
                                 Size: Large
                                 DepthRange: {}
                                 PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
-                                ComputeTransmittance: false
                                 BiasParameters: {}
+                                ComputeTransmittance: false
         -   Entity:
                 Id: 820d34a8-2971-4381-abfa-2965d94ec672
                 Name: Splash
@@ -78,7 +78,7 @@ Hierarchy:
                     a7872780eefdc542b4880d3c4b46f129: !UIElementLink.SplashScript,UIElementLink.Game
                         Id: 802787a7-fdee-42c5-b488-0d3c4b46f129
                         SplashScreenImages: e8e2f386-e79e-4875-993f-8bdaf0ef72c5:SplashScreenImages
-                        NextScene: TiltedScreen
+                        NextScene: 0bbdf1ab-bb41-46c5-86ef-4f2635d65c6a:TiltedScreen
                     f6b6b1a8d48a8045bd940370455f3450: !UIComponent
                         Id: a8b1b6f6-8ad4-4580-bd94-0370455f3450
                         Page: null
@@ -152,8 +152,8 @@ Hierarchy:
                                             InheritRotation: true
                                             Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                                             InheritScale: true
-                                            ScaleUniform: 1.0
                                             Scale: {X: 1.0, Y: 1.0, Z: 1.0}
+                                            ScaleUniform: 1.0
                                             SeedOffset: 0
                                             DisplayParticlePosition: false
                                             DisplayParticleRotation: true
diff --git a/samples/UI/UIElementLink/Assets/Shared/GameSettings.xkgamesettings b/samples/UI/UIElementLink/Assets/Shared/GameSettings.xkgamesettings
index 103b320e58..05db9668bb 100644
--- a/samples/UI/UIElementLink/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/UI/UIElementLink/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: d60dae7b-9e44-44ad-bbe6-1e790cbc9f83
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: 67a9eb30-7686-4b8c-89c3-19f12755774e:FullScreen
 GraphicsCompositor: e571b655-a83d-4c90-b560-d3b182426fc7:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/UI/UIElementLink/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/UI/UIElementLink/Assets/Shared/GraphicsCompositor.xkgfxcomp
index d2690cdd25..1c135a4c50 100644
--- a/samples/UI/UIElementLink/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/UI/UIElementLink/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: e571b655-a83d-4c90-b560-d3b182426fc7
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 823a81bf-bac0-4552-9267-aeed499c40df:DefaultGraphicsCompositorLevel10
 Cameras:
@@ -39,73 +39,73 @@ RenderStages:
         EffectSlotName: GBuffer
         SortMode: !FrontToBackSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 7d180630-a9ea-4c6c-89fa-223d135e9bf3
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterParaboloid
-            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 4b2b17e0-1517-46c3-9d96-594d1faf8b97
                 EffectName: XenkoForwardShadingEffect.ShadowMapCasterCubeMap
-            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! d27953f7-41f7-4e8c-ae43-ed81f4f4d1db
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 7d180630-a9ea-4c6c-89fa-223d135e9bf3
                 DepthClipping: true
-            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! 4b2b17e0-1517-46c3-9d96-594d1faf8b97
                 DepthClipping: true
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Engine {}
-                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
-                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Engine {}
-                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Engine
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Rendering {}
+                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
+                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Rendering
                     Renderers:
-                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Engine
+                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Engine
+                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Engine
+                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 7d180630-a9ea-4c6c-89fa-223d135e9bf3
-                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Engine
+                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! 4b2b17e0-1517-46c3-9d96-594d1faf8b97
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -133,6 +133,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     d5b2e71c088247e21556decdce138d96: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
@@ -152,6 +153,7 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
     34ecb9b2633eacfc439ba8744fe05102: !PostProcessingEffects
@@ -161,7 +163,6 @@ SharedRenderers:
         LocalReflections:
             Enabled: false
             ResolvePassResolution: Full
-            DebugMode: None
             DepthResolution: Half
         DepthOfField:
             Enabled: false
@@ -185,17 +186,17 @@ SharedRenderers:
                     Enabled: false
                     Color: {R: 0.0, G: 0.0, B: 0.0}
         Antialiasing: !FXAAEffect {}
-    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: dae8d18d-399f-4dd6-b868-311692e60675
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! 39e59472-e064-4463-9097-403dadbc041e
-    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: 82568e46-92e7-421a-8dca-114a74e0cd69
         Children:
             d39c5ddbf8b7d5ca02bafb6496b1cc3c: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! dae8d18d-399f-4dd6-b868-311692e60675
+            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! dae8d18d-399f-4dd6-b868-311692e60675
     RenderMask: All
 SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! b41f7807-0a56-4c00-ad86-fdf2d8d39d74
 Editor: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
diff --git a/samples/UI/UIElementLink/Assets/Shared/TiltedScreen.xkscene b/samples/UI/UIElementLink/Assets/Shared/TiltedScreen.xkscene
index c9eb58bc57..1675b5fed3 100644
--- a/samples/UI/UIElementLink/Assets/Shared/TiltedScreen.xkscene
+++ b/samples/UI/UIElementLink/Assets/Shared/TiltedScreen.xkscene
@@ -63,8 +63,8 @@ Hierarchy:
                                 Size: Large
                                 DepthRange: {}
                                 PartitionMode: !LightDirectionalShadowMap.PartitionLogarithmic {}
-                                ComputeTransmittance: false
                                 BiasParameters: {}
+                                ComputeTransmittance: false
         -   Entity:
                 Id: 820d34a8-2971-4381-abfa-2965d94ec672
                 Name: Splash
@@ -78,7 +78,7 @@ Hierarchy:
                     a7872780eefdc542b4880d3c4b46f129: !UIElementLink.SplashScript,UIElementLink.Game
                         Id: 802787a7-fdee-42c5-b488-0d3c4b46f129
                         SplashScreenImages: e8e2f386-e79e-4875-993f-8bdaf0ef72c5:SplashScreenImages
-                        NextScene: BillboardedScreen
+                        NextScene: a140a866-a7b3-4c89-8953-5f7adc428c0a:BillboardedScreen
                     f6b6b1a8d48a8045bd940370455f3450: !UIComponent
                         Id: a8b1b6f6-8ad4-4580-bd94-0370455f3450
                         Page: null
@@ -154,8 +154,8 @@ Hierarchy:
                                             InheritRotation: true
                                             Rotation: {X: 0.0, Y: 0.0, Z: 0.0, W: 1.0}
                                             InheritScale: true
-                                            ScaleUniform: 1.0
                                             Scale: {X: 1.0, Y: 1.0, Z: 1.0}
+                                            ScaleUniform: 1.0
                                             SeedOffset: 0
                                             DisplayParticlePosition: false
                                             DisplayParticleRotation: true
diff --git a/samples/UI/UIElementLink/UIElementLink.Game/SplashScript.cs b/samples/UI/UIElementLink/UIElementLink.Game/SplashScript.cs
index 2e61b128d4..7ad4767dac 100644
--- a/samples/UI/UIElementLink/UIElementLink.Game/SplashScript.cs
+++ b/samples/UI/UIElementLink/UIElementLink.Game/SplashScript.cs
@@ -3,6 +3,7 @@
 using System;
 using Xenko.Core.Extensions;
 using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization;
 using Xenko.Engine;
 using Xenko.Graphics;
 using Xenko.Rendering.Sprites;
@@ -16,7 +17,7 @@ public class SplashScript : UISceneBase
     {
         public SpriteSheet SplashScreenImages;
 
-        public string NextScene;
+        public UrlReference<Scene> NextScene;
 
         private Button followedButton;
 
@@ -24,10 +25,10 @@ public class SplashScript : UISceneBase
 
         private void LoadNextScene()
         {
-            if (NextScene.IsNullOrEmpty())
+            if (NextScene?.IsEmpty ?? true)
                 return;
 
-            SceneSystem.SceneInstance.RootScene = Content.Load<Scene>(NextScene);
+            SceneSystem.SceneInstance.RootScene = Content.Load(NextScene);
             Cancel();
         }
 
diff --git a/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj b/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj
index d4c0de7fd2..8620fee23f 100644
--- a/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj
+++ b/samples/UI/UIElementLink/UIElementLink.Game/UIElementLink.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>UIElementLink</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/UI/UIElementLink/UIElementLink.Windows/Resources/Icon.ico b/samples/UI/UIElementLink/UIElementLink.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/UI/UIElementLink/UIElementLink.Windows/Resources/Icon.ico and b/samples/UI/UIElementLink/UIElementLink.Windows/Resources/Icon.ico differ
diff --git a/samples/UI/UIParticles/Assets/Shared/GameSettings.xkgamesettings b/samples/UI/UIParticles/Assets/Shared/GameSettings.xkgamesettings
index 25db182fc4..614f571f6d 100644
--- a/samples/UI/UIParticles/Assets/Shared/GameSettings.xkgamesettings
+++ b/samples/UI/UIParticles/Assets/Shared/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: ee826f6c-55f8-4082-b5bd-9fc206888a73
-SerializedVersion: {Xenko: 2.1.0.3}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 DefaultScene: a8ddac34-2bf1-452c-bdf5-47e2d633e83a:SplashScene
 GraphicsCompositor: 028b9394-b500-4383-ad72-f4b813eaeccc:GraphicsCompositor
@@ -18,7 +18,7 @@ Defaults:
         TextureQuality: Fast
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Streaming.StreamingSettings,Xenko.Engine
+    - !Xenko.Streaming.StreamingSettings,Xenko.Rendering
         ManagerUpdatesInterval: 0:00:00:00.0330000
         ResourceLiveTimeout: 0:00:00:08.0000000
 Overrides: []
diff --git a/samples/UI/UIParticles/Assets/Shared/GraphicsCompositor.xkgfxcomp b/samples/UI/UIParticles/Assets/Shared/GraphicsCompositor.xkgfxcomp
index 6970665ecf..f77464bdab 100644
--- a/samples/UI/UIParticles/Assets/Shared/GraphicsCompositor.xkgfxcomp
+++ b/samples/UI/UIParticles/Assets/Shared/GraphicsCompositor.xkgfxcomp
@@ -1,6 +1,6 @@
 !GraphicsCompositorAsset
 Id: 028b9394-b500-4383-ad72-f4b813eaeccc
-SerializedVersion: {Xenko: 2.1.0.2}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Archetype: 9af53371-51ba-49fc-b420-ee7874892e75:DefaultGraphicsCompositorLevel9
 Cameras:
@@ -29,46 +29,46 @@ RenderStages:
         EffectSlotName: Main
         SortMode: !BackToFrontSortMode {}
 RenderFeatures:
-    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Engine
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Engine
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: XenkoForwardShadingEffect
-            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Engine
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
         PipelineProcessors:
-            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Engine
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
-            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Engine
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
         RenderFeatures:
-            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Engine {}
-            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Engine {}
-            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Engine {}
-            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Engine
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
                 LightRenderers:
-                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Engine {}
-                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Engine {}
-                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Engine {}
-                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Engine {}
-                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Engine {}
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    5890e37af0e4bbc2cfdc1de648ff07d4: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    2eda85523d76b3f9e1e7d3e55aab5280: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
                 ShadowMapRenderer: null
-    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Engine
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Engine
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
-    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Engine
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
         RenderStageSelectors:
-            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 50671147-a5c1-49d4-b4ad-3625f71439b3
                 EffectName: Test
     93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
         RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
                 RenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
                 EffectName: Test
     9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
@@ -97,35 +97,37 @@ SharedRenderers:
             Enabled: false
             RequiredApis: {}
             Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
         MSAALevel: None
         MSAAResolver: {}
-    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine
+    b83eea5d6052fff4db0c8d7efa7568f6: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
         Id: 77660a58-73b5-428e-bce5-c3407a62de31
         DebugRenderStages: {}
 Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
     Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
     Camera: ref!! a070cf65-a750-4060-bcc0-e3303fca30b2
-    Child*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+    Child*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
         Id: cac20e52-d7fa-43d5-b4dc-e7038d008a9e
         Children:
             ce29e81d8821fbf2a3d2264868e9921c*: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-            6efe857054d875d04a6788c9b40428bc*: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Engine
+            6efe857054d875d04a6788c9b40428bc*: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Rendering
                 Id: 70784831-182a-490d-8fe4-b9ece8b7dbcf
                 RenderStage: ref!! 1131b093-3589-47d1-bb60-62166a6647a3
-            5c3efec9389bbcda4a9ec8113c233439*: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Engine ref!! 77660a58-73b5-428e-bce5-c3407a62de31
+            5c3efec9389bbcda4a9ec8113c233439*: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 77660a58-73b5-428e-bce5-c3407a62de31
+    RenderMask: All
 SingleView: null
-Editor*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Engine
+Editor*: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
     Id: c3f5d39a-57e9-4cd8-9895-ca0e78582b8a
     Children:
-        32f300f15ced1149d18f0acf207b3560: !Xenko.Rendering.Compositing.ClearRenderer,Xenko.Engine
+        32f300f15ced1149d18f0acf207b3560: !Xenko.Rendering.Compositing.ClearRenderer,Xenko.Rendering
             Id: 46f07118-5d51-4110-ba49-b39376d85df4
             Color: {R: 0.40491876, G: 0.411895424, B: 0.43775, A: 1.0}
         2ca9e8847ef4a97fe3a8e86859b08ab9: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 4d409a59-d3c6-4b55-a5c7-4bd9b8886ea5
-        7d840e9deb2a194b8db6fe5c50728ced: !Xenko.Rendering.Compositing.ClearRenderer,Xenko.Engine
+        7d840e9deb2a194b8db6fe5c50728ced: !Xenko.Rendering.Compositing.ClearRenderer,Xenko.Rendering
             Id: 82a34f6e-44fa-4956-8b0a-2da0e38139cd
             ClearFlags: DepthOnly
             Color: {R: 0.40491876, G: 0.411895424, B: 0.43775, A: 1.0}
-        b9a5c3cb9707ce953871585234ce7822: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Engine
+        b9a5c3cb9707ce953871585234ce7822: !Xenko.Rendering.Compositing.SingleStageRenderer,Xenko.Rendering
             Id: 3e645954-bb86-47a8-9c6a-3a47bf1dd560
             RenderStage: ref!! 1131b093-3589-47d1-bb60-62166a6647a3
 BlockPositions: {}
diff --git a/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj b/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj
index e0ef5b3b08..3dbd7696f5 100644
--- a/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj
+++ b/samples/UI/UIParticles/UIParticles.Game/UIParticles.Game.csproj
@@ -4,10 +4,10 @@
     <RootNamespace>UIParticles</RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Xenko.Core" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
-    <PackageReference Include="Xenko.Engine" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.Particles" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
-    <PackageReference Include="Xenko.UI" Version="3.1.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Core.Assets.CompilerApp" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" IncludeAssets="build" />
+    <PackageReference Include="Xenko.Engine" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.Particles" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
+    <PackageReference Include="Xenko.UI" Version="3.2.0.1-beta01" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/UI/UIParticles/UIParticles.Windows/Resources/Icon.ico b/samples/UI/UIParticles/UIParticles.Windows/Resources/Icon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/samples/UI/UIParticles/UIParticles.Windows/Resources/Icon.ico and b/samples/UI/UIParticles/UIParticles.Windows/Resources/Icon.ico differ
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/BuildThreadMonitor.cs b/sources/assets/Xenko.Core.Assets.CompilerApp/BuildThreadMonitor.cs
similarity index 97%
rename from sources/buildengine/Xenko.Core.BuildEngine.Common/BuildThreadMonitor.cs
rename to sources/assets/Xenko.Core.Assets.CompilerApp/BuildThreadMonitor.cs
index db23a550b7..53be58487b 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Common/BuildThreadMonitor.cs
+++ b/sources/assets/Xenko.Core.Assets.CompilerApp/BuildThreadMonitor.cs
@@ -9,10 +9,11 @@
 using Xenko.Core.Diagnostics;
 using Xenko.Core.MicroThreading;
 using System.ServiceModel;
+using Xenko.Core.BuildEngine;
 
-namespace Xenko.Core.BuildEngine
+namespace Xenko.Core.Assets.CompilerApp
 {
-    internal class BuildThreadMonitor
+    internal class BuildThreadMonitor : IBuildThreadMonitor
     {
         /// <summary>
         /// This class stores informations relative to a build step, used to build data to send to the clients. It is immutable.
@@ -69,7 +70,7 @@ public override string ToString()
 
         private Thread monitorThread;
 
-        internal BuildThreadMonitor(Scheduler scheduler, Guid builderId, string monitorPipeName = Builder.MonitorPipeName)
+        public BuildThreadMonitor(Scheduler scheduler, Guid builderId, string monitorPipeName = Builder.MonitorPipeName)
         {
             this.monitorPipeName = monitorPipeName;
             this.builderId = builderId;
@@ -81,7 +82,7 @@ internal BuildThreadMonitor(Scheduler scheduler, Guid builderId, string monitorP
             stopWatch.Start();
         }
 
-        internal void RegisterThread(int threadId)
+        public void RegisterThread(int threadId)
         {
             lock (threadExecutionIntervals)
             {
@@ -89,7 +90,7 @@ internal void RegisterThread(int threadId)
             }
         }
 
-        internal void RegisterBuildStep(BuildStep buildStep, TimestampLocalLogger logger)
+        public void RegisterBuildStep(BuildStep buildStep, TimestampLocalLogger logger)
         {
             lock (buildStepInfosToSend)
             {
diff --git a/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilder.cs b/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilder.cs
index 1470a5adc5..7cf3ffcfdd 100644
--- a/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilder.cs
+++ b/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilder.cs
@@ -80,6 +80,7 @@ private BuildResultCode BuildMaster()
                     AutoCompileProjects = !builderOptions.DisableAutoCompileProjects,
                     ExtraCompileProperties = builderOptions.ExtraCompileProperties,
                     RemoveUnloadableObjects = true,
+                    RegisterPackageAssemblies = true,
                     BuildConfiguration = builderOptions.ProjectConfiguration,
                 };
 
@@ -113,7 +114,8 @@ private BuildResultCode BuildMaster()
                 {
                     Platform = builderOptions.Platform,
                     CompilationContext = typeof(AssetCompilationContext),
-                    BuildConfiguration = builderOptions.ProjectConfiguration
+                    BuildConfiguration = builderOptions.ProjectConfiguration,
+                    Package = package,
                 };
 
                 // Command line properties
@@ -364,14 +366,6 @@ public async Task<ResultStatus> TryExecuteRemote(Command command, BuilderContext
             var address = "net.pipe://localhost/" + Guid.NewGuid();
             var arguments = $"--slave=\"{address}\" --build-path=\"{builderOptions.BuildDirectory}\"";
 
-            using (var debugger = VisualStudioDebugger.GetAttached())
-            {
-                if (debugger != null)
-                {
-                    arguments += $" --reattach-debugger={debugger.ProcessId}";
-                }
-            }
-
             // Start WCF pipe for communication with process
             var processBuilderRemote = new ProcessBuilderRemote(assemblyContainer, commandContext, command);
             var host = new ServiceHost(processBuilderRemote);
diff --git a/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilderApp.cs b/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilderApp.cs
index 78e78aa653..6ae42f7250 100644
--- a/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilderApp.cs
+++ b/sources/assets/Xenko.Core.Assets.CompilerApp/PackageBuilderApp.cs
@@ -150,22 +150,6 @@ public int Run(string[] args)
                     }
                 }
                 },
-                {
-                    "reattach-debugger=", "Reattach to a Visual Studio debugger", v =>
-                    {
-                        int debuggerProcessId;
-                        if (!string.IsNullOrEmpty(v) && int.TryParse(v, out debuggerProcessId))
-                        {
-                            if (!Debugger.IsAttached)
-                            {
-                                using (var debugger = VisualStudioDebugger.GetByProcess(debuggerProcessId))
-                                {
-                                    debugger?.Attach();
-                                }
-                            }
-                        }
-                    }
-                },
             };
 
             TextWriterLogListener fileLogListener = null;
@@ -194,7 +178,7 @@ public int Run(string[] args)
                     }
                     else
                     {
-                        globalLoggerOnGlobalMessageLogged = new ConsoleLogListener { LogMode = ConsoleLogMode.Always };
+                        globalLoggerOnGlobalMessageLogged = new ConsoleLogListener();
                     }
                     globalLoggerOnGlobalMessageLogged.TextFormatter = FormatLog;
                     GlobalLogger.GlobalMessageLogged += globalLoggerOnGlobalMessageLogged;
@@ -263,6 +247,69 @@ public int Run(string[] args)
 
                     options.Logger.Info("BuildEngine arguments: " + string.Join(" ", args));
                     options.Logger.Info("Starting builder.");
+
+                    try
+                    {
+                        var baseDirectory = Path.Combine(options.BuildDirectory, @"../../../../../");
+                        var changeFile = baseDirectory + "/files_changed";
+                        var buildFile = baseDirectory + "/files_built";
+                        var skipFile = baseDirectory + "/always_build";
+                        long files_changed_ticks = 0, files_built_ticks = 0;
+                        string[] buildlines = null;
+                        string platform = options.Platform.ToString() + "-" + options.ProjectConfiguration;
+
+                        if (File.Exists(changeFile))
+                            long.TryParse(File.ReadAllText(changeFile), out files_changed_ticks);
+
+                        if (File.Exists(buildFile))
+                        {
+                            buildlines = File.ReadAllLines(buildFile);
+                            for (int i = 0; i < buildlines.Length; i += 2)
+                            {
+                                if (buildlines[i] == platform)
+                                {
+                                    long.TryParse(buildlines[i + 1], out files_built_ticks);
+                                    // also update with now time
+                                    buildlines[i + 1] = System.DateTime.Now.Ticks.ToString();
+                                }
+                            }
+                        }
+
+                        if (File.Exists(skipFile))
+                        {
+                            options.Logger.Info("Found always_build, so always building assets.");
+                        }
+                        else if (Process.GetProcessesByName("Focus.GameStudio").Length == 0)
+                        {
+                            options.Logger.Warning("Focus.GameStudio does not appear to be running, so the AssetCompiler will always rebuild assets.");
+                        }
+                        else if (files_changed_ticks > 0 && files_built_ticks > 0 && files_built_ticks > files_changed_ticks)
+                        {
+                            options.Logger.Info("All Assets/ and Resources/ appear up date for " + platform + ", so skipping recompilation. If this is a mistake, delete files_changed and files_built in the root project directory. If you want to always build assets, make a file called always_build in the root project directory.");
+                            return 0;
+                        }
+
+                        // if there was no changefile, do it now
+                        if (File.Exists(changeFile) == false)
+                        {
+                            File.WriteAllText(changeFile, System.DateTime.Now.Ticks.ToString());
+                        }
+
+                        // update file with changes
+                        if (File.Exists(buildFile) == false)
+                        {
+                            File.WriteAllText(buildFile, platform + "\n" + System.DateTime.Now.Ticks.ToString());
+                        }
+                        else
+                        {
+                            File.WriteAllLines(buildFile, buildlines);
+                            if (files_built_ticks <= 0) File.AppendAllText(buildFile, platform + "\n" + System.DateTime.Now.Ticks.ToString());
+                        }
+                    }
+                    catch (Exception)
+                    {
+                        options.Logger.Warning("Error reading/writing files_changed and/or files_built to see if we can skip asset compilation. Reverting to building them.");
+                    }
                 }
                 else
                 {
diff --git a/sources/assets/Xenko.Core.Assets.CompilerApp/Xenko.Core.Assets.CompilerApp.csproj b/sources/assets/Xenko.Core.Assets.CompilerApp/Xenko.Core.Assets.CompilerApp.csproj
index 1c0e456d99..4844bafb9f 100644
--- a/sources/assets/Xenko.Core.Assets.CompilerApp/Xenko.Core.Assets.CompilerApp.csproj
+++ b/sources/assets/Xenko.Core.Assets.CompilerApp/Xenko.Core.Assets.CompilerApp.csproj
@@ -9,7 +9,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -25,8 +25,13 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EnvDTE" Version="8.0.1" />
-    <PackageReference Include="Mono.Options" Version="5.3.0.1" />
+    <PackageReference Include="EnvDTE" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
+	<PackageReference Include="System.Numerics.Vectors" Version="4.5.0">
+	  <NoWarn>NU1605</NoWarn>
+	</PackageReference>
+	<PackageReference Include="Mono.Options" Version="6.12.0.148" />
+	<PackageReference Include="System.Text.Json" Version="9.0.8" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
@@ -37,6 +42,16 @@
     <None Include="build\**\*.targets" PackagePath="build\" Pack="true" />
     <None Include="build\**\*.targets" PackagePath="buildTransitive\" Pack="true" />
   </ItemGroup>
+  <ItemGroup>
+    <XenkoNativeLib Include="..\..\..\deps\assimp\bin\x64\Assimp64.dll">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+    </XenkoNativeLib>
+    <XenkoNativeLib Include="..\..\..\sources\tools\Xenko.Importer.FBX\bin\x64\$(Configuration)\Xenko.Importer.FBX.dll">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+    </XenkoNativeLib>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\engine\Xenko.Assets.Models\Xenko.Assets.Models.csproj" />
     <ProjectReference Include="..\..\engine\Xenko.Particles\Xenko.Particles.csproj" />
@@ -44,10 +59,9 @@
     <ProjectReference Include="..\..\engine\Xenko.SpriteStudio.Offline\Xenko.SpriteStudio.Offline.csproj" />
     <ProjectReference Include="..\..\engine\Xenko.UI\Xenko.UI.csproj" />
   </ItemGroup>
-  <Import Project="..\..\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems" Label="Shared" />
   <Import Project="..\..\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.config</AllowedOutputExtensionsInPackageBuildOutputFolder>
diff --git a/sources/assets/Xenko.Core.Assets.CompilerApp/app.config b/sources/assets/Xenko.Core.Assets.CompilerApp/app.config
index f19c6a0677..d1c816ddf6 100644
--- a/sources/assets/Xenko.Core.Assets.CompilerApp/app.config
+++ b/sources/assets/Xenko.Core.Assets.CompilerApp/app.config
@@ -2,25 +2,21 @@
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Build" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Build.Utilities.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Build.Tasks.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-15.1.0.0" newVersion="15.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/sources/assets/Xenko.Core.Assets.CompilerApp/build/Xenko.Core.Assets.CompilerApp.targets b/sources/assets/Xenko.Core.Assets.CompilerApp/build/Xenko.Core.Assets.CompilerApp.targets
index 15b3dd4e8f..0639e6f234 100644
--- a/sources/assets/Xenko.Core.Assets.CompilerApp/build/Xenko.Core.Assets.CompilerApp.targets
+++ b/sources/assets/Xenko.Core.Assets.CompilerApp/build/Xenko.Core.Assets.CompilerApp.targets
@@ -45,8 +45,8 @@
     <!--asset OutputPath for other platforms. Note: this is overridden for UnitTests projects. -->
     <XenkoCompileAssetOutputPath Condition="'$(XenkoCompileAssetOutputPath)' == ''">$(TargetDir)data</XenkoCompileAssetOutputPath>
 
-    <XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\lib\net472\Xenko.Core.Assets.CompilerApp.exe')">$(MSBuildThisFileDirectory)..\lib\net472\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
-    <XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net472\Xenko.Core.Assets.CompilerApp.exe')">$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net472\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
+    <XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\lib\net48\Xenko.Core.Assets.CompilerApp.exe')">$(MSBuildThisFileDirectory)..\lib\net48\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
+    <XenkoCompileAssetCommand Condition="'$(XenkoCompileAssetCommand)' == '' And Exists('$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net48\Xenko.Core.Assets.CompilerApp.exe')">$(MSBuildThisFileDirectory)..\bin\$(Configuration)\net48\Xenko.Core.Assets.CompilerApp.exe</XenkoCompileAssetCommand>
 
     <!--<XenkoCompileAssetCommandProxy Condition="'$(DisableAssetCompilerExecServerProxy)' == 'true' Or '$(XenkoDisableAssetCompilerExecServerProxy)' == 'true'">&quot;$(XenkoCompileAssetCommand)&quot;</XenkoCompileAssetCommandProxy>
     <XenkoCompileAssetCommandProxy Condition="'$(XenkoCompileAssetCommandProxy)' == ''">&quot;$(XenkoPackageXenkoSdkBin)\Xenko.Core.Assets.CompilerClient.exe&quot;</XenkoCompileAssetCommandProxy>-->
@@ -148,4 +148,16 @@
       </None>
     </ItemGroup>
   </Target>
+
+  <!-- 
+  *****************************************************************************************************************************
+  Default items for xksl/xkfx (mark generated files as dependent)
+  *****************************************************************************************************************************
+  -->
+  <ItemGroup>
+    <Compile Update="**\*.xksl.cs" DependentUpon="%(Filename)" />
+    <None Update="**\*.xksl" Generator="XenkoShaderKeyGenerator" />
+    <Compile Update="**\*.xkfx.cs" DependentUpon="%(Filename)" />
+    <None Update="**\*.xkfx" Generator="XenkoEffectCodeGenerator" />
+  </ItemGroup>
 </Project>
diff --git a/sources/assets/Xenko.Core.Assets.CompilerClient/Xenko.Core.Assets.CompilerClient.csproj b/sources/assets/Xenko.Core.Assets.CompilerClient/Xenko.Core.Assets.CompilerClient.csproj
index 1ba68603ac..90e192a479 100644
--- a/sources/assets/Xenko.Core.Assets.CompilerClient/Xenko.Core.Assets.CompilerClient.csproj
+++ b/sources/assets/Xenko.Core.Assets.CompilerClient/Xenko.Core.Assets.CompilerClient.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
     <OutputType>Exe</OutputType>
@@ -28,5 +28,5 @@
     <ProjectReference Include="..\..\tools\Xenko.ExecServer\Xenko.ExecServer.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/AssetNodeInternalExtensions.cs b/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/AssetNodeInternalExtensions.cs
index e7ecdc199c..22d99d79a0 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/AssetNodeInternalExtensions.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/AssetNodeInternalExtensions.cs
@@ -8,12 +8,12 @@ namespace Xenko.Core.Assets.Quantum.Tests.Helpers
 {
     public static class AssetNodeInternalExtensions
     {
-        public static OverrideType GetItemOverride(this IAssetNode node, Index index)
+        public static OverrideType GetItemOverride(this IAssetNode node, NodeIndex index)
         {
             return ((IAssetObjectNodeInternal)node).GetItemOverride(index);
         }
 
-        public static OverrideType GetKeyOverride(this IAssetNode node, Index index)
+        public static OverrideType GetKeyOverride(this IAssetNode node, NodeIndex index)
         {
             return ((IAssetObjectNodeInternal)node).GetKeyOverride(index);
         }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/Types.cs b/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/Types.cs
index a0b6b7530a..e073b98b74 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/Types.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/Helpers/Types.cs
@@ -165,14 +165,14 @@ public class SomeObject2 : IMyInterface
         [AssetPropertyGraphDefinition(typeof(MyAssetWithRef))]
         public class AssetWithRefPropertyGraphDefinition : AssetPropertyGraphDefinition
         {
-            public static Func<IGraphNode, Index, bool> IsObjectReferenceFunc { get; set; }
+            public static Func<IGraphNode, NodeIndex, bool> IsObjectReferenceFunc { get; set; }
 
             public override bool IsMemberTargetObjectReference(IMemberNode member, object value)
             {
-                return IsObjectReferenceFunc?.Invoke(member, Index.Empty) ?? base.IsMemberTargetObjectReference(member, value);
+                return IsObjectReferenceFunc?.Invoke(member, NodeIndex.Empty) ?? base.IsMemberTargetObjectReference(member, value);
             }
 
-            public override bool IsTargetItemObjectReference(IObjectNode collection, Index itemIndex, object value)
+            public override bool IsTargetItemObjectReference(IObjectNode collection, NodeIndex itemIndex, object value)
             {
                 return IsObjectReferenceFunc?.Invoke(collection, itemIndex) ?? base.IsTargetItemObjectReference(collection, itemIndex, value);
             }
@@ -186,7 +186,7 @@ public override bool IsMemberTargetObjectReference(IMemberNode member, object va
                 return member.Name == nameof(MyAssetWithRef2.Reference);
             }
 
-            public override bool IsTargetItemObjectReference(IObjectNode collection, Index itemIndex, object value)
+            public override bool IsTargetItemObjectReference(IObjectNode collection, NodeIndex itemIndex, object value)
             {
                 return collection.Retrieve() is List<MyReferenceable>;
             }
@@ -244,16 +244,16 @@ public AssetCompositeHierarchyData<MyPartDesign, MyPart> CreatePartInstances()
         public class MyAssetHierarchyPropertyGraph : AssetCompositeHierarchyPropertyGraph<MyPartDesign, MyPart>
         {
             public MyAssetHierarchyPropertyGraph(AssetPropertyGraphContainer container, AssetItem assetItem, ILogger logger) : base(container, assetItem, logger) { }
-            public override bool IsChildPartReference(IGraphNode node, Index index) => node.Type == typeof(ChildrenList);
+            public override bool IsChildPartReference(IGraphNode node, NodeIndex index) => node.Type == typeof(ChildrenList);
             protected override void AddChildPartToParentPart(MyPart parentPart, MyPart childPart, int index)
             {
-                Container.NodeContainer.GetNode(parentPart)[nameof(MyPart.Children)].Target.Add(childPart, new Index(index));
+                Container.NodeContainer.GetNode(parentPart)[nameof(MyPart.Children)].Target.Add(childPart, new NodeIndex(index));
                 Container.NodeContainer.GetNode(childPart)[nameof(MyPart.Parent)].Update(parentPart);
             }
 
             protected override void RemoveChildPartFromParentPart(MyPart parentPart, MyPart childPart)
             {
-                Container.NodeContainer.GetNode(parentPart)[nameof(MyPart.Children)].Target.Remove(childPart, new Index(parentPart.Children.IndexOf(childPart)));
+                Container.NodeContainer.GetNode(parentPart)[nameof(MyPart.Children)].Target.Remove(childPart, new NodeIndex(parentPart.Children.IndexOf(childPart)));
                 Container.NodeContainer.GetNode(childPart)[nameof(MyPart.Parent)].Update(null);
             }
 
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesAdvanced.cs b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesAdvanced.cs
index 8dc832cf9b..11d14cd899 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesAdvanced.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesAdvanced.cs
@@ -21,25 +21,25 @@ public void TestSimpleDictionaryAddWithCollision()
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset3.MyDictionary)];
 
             // Update a key to derived and then the same key to the base
-            derivedPropertyNode.Target.Add("String3", new Index("Key3"));
-            basePropertyNode.Target.Add("String4", new Index("Key3"));
+            derivedPropertyNode.Target.Add("String3", new NodeIndex("Key3"));
+            basePropertyNode.Target.Add("String4", new NodeIndex("Key3"));
 
             Assert.Equal(3, context.BaseAsset.MyDictionary.Count);
             Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key3")));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index("Key3")));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key3")));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key3")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
             Assert.NotEqual(baseIds, derivedIds);
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -66,24 +66,24 @@ public void TestSimpleCollectionRemoveDeleted()
             // Delete an item from the derived and then delete the same from the base
             var derivedDeletedId = derivedIds[2];
             var baseDeletedId = baseIds[2];
-            derivedPropertyNode.Target.Remove("String3", new Index(2));
-            basePropertyNode.Target.Remove("String3", new Index(2));
+            derivedPropertyNode.Target.Remove("String3", new NodeIndex(2));
+            basePropertyNode.Target.Remove("String3", new NodeIndex(2));
             Assert.Equal(3, context.BaseAsset.MyStrings.Count);
             Assert.Equal(3, context.DerivedAsset.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(2)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(3, derivedIds.KeyCount);
@@ -107,25 +107,25 @@ public void TestSimpleDictionaryRemoveDeleted()
 
             // Delete an item from the derived and then delete the same from the base
             var derivedDeletedId = derivedIds["Key3"];
-            derivedPropertyNode.Target.Remove("String3", new Index("Key3"));
+            derivedPropertyNode.Target.Remove("String3", new NodeIndex("Key3"));
             var baseDeletedId = baseIds["Key3"];
-            basePropertyNode.Target.Remove("String3", new Index("Key3"));
+            basePropertyNode.Target.Remove("String3", new NodeIndex("Key3"));
             Assert.Equal(3, context.BaseAsset.MyDictionary.Count);
             Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key4")));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index("Key4")));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key4")));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key4")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(3, derivedIds.KeyCount);
@@ -149,26 +149,26 @@ public void TestSimpleCollectionUpdateDeleted()
 
             // Delete an item from the derived and then update the same from the base
             var derivedDeletedId = derivedIds[2];
-            derivedPropertyNode.Target.Remove("String3", new Index(2));
-            basePropertyNode.Target.Update("String3.5", new Index(2));
+            derivedPropertyNode.Target.Remove("String3", new NodeIndex(2));
+            basePropertyNode.Target.Update("String3.5", new NodeIndex(2));
             Assert.Equal(4, context.BaseAsset.MyStrings.Count);
             Assert.Equal(3, context.DerivedAsset.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String3.5", basePropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index(3)));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(2)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String3.5", basePropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(3)));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(3)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(3)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(4, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(3, derivedIds.KeyCount);
@@ -191,26 +191,26 @@ public void TestSimpleDictionaryUpdateDeleted()
 
             // Delete an item from the derived and then update the same from the base
             var derivedDeletedId = derivedIds["Key3"];
-            derivedPropertyNode.Target.Remove("String3", new Index("Key3"));
-            basePropertyNode.Target.Update("String3.5", new Index("Key3"));
+            derivedPropertyNode.Target.Remove("String3", new NodeIndex("Key3"));
+            basePropertyNode.Target.Update("String3.5", new NodeIndex("Key3"));
             Assert.Equal(4, context.BaseAsset.MyDictionary.Count);
             Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String3.5", basePropertyNode.Retrieve(new Index("Key3")));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key4")));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index("Key4")));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String3.5", basePropertyNode.Retrieve(new NodeIndex("Key3")));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key4")));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key3")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key4")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
             Assert.Equal(4, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(3, derivedIds.KeyCount);
@@ -231,36 +231,36 @@ public void TestSimpleCollectionAddMultipleAndCheckOrder()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset2.MyStrings)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset2.MyStrings)];
 
-            derivedPropertyNode.Target.Add("String3.5", new Index(3));
-            derivedPropertyNode.Target.Add("String1.5", new Index(1));
+            derivedPropertyNode.Target.Add("String3.5", new NodeIndex(3));
+            derivedPropertyNode.Target.Add("String1.5", new NodeIndex(1));
             Assert.Equal(6, context.DerivedAsset.MyStrings.Count);
             AssertCollection(derivedPropertyNode, "String1", "String1.5", "String2", "String3", "String3.5", "String4");
 
-            basePropertyNode.Target.Add("String0.1", new Index(0));
+            basePropertyNode.Target.Add("String0.1", new NodeIndex(0));
             Assert.Equal(5, context.BaseAsset.MyStrings.Count);
             AssertCollection(basePropertyNode, "String0.1", "String1", "String2", "String3", "String4");
             Assert.Equal(7, context.DerivedAsset.MyStrings.Count);
             AssertCollection(derivedPropertyNode, "String0.1", "String1", "String1.5", "String2", "String3", "String3.5", "String4");
 
-            basePropertyNode.Target.Add("String1.1", new Index(2));
+            basePropertyNode.Target.Add("String1.1", new NodeIndex(2));
             Assert.Equal(6, context.BaseAsset.MyStrings.Count);
             AssertCollection(basePropertyNode, "String0.1", "String1", "String1.1", "String2", "String3", "String4");
             Assert.Equal(8, context.DerivedAsset.MyStrings.Count);
             AssertCollection(derivedPropertyNode, "String0.1", "String1", "String1.1", "String1.5", "String2", "String3", "String3.5", "String4");
 
-            basePropertyNode.Target.Add("String2.1", new Index(4));
+            basePropertyNode.Target.Add("String2.1", new NodeIndex(4));
             Assert.Equal(7, context.BaseAsset.MyStrings.Count);
             AssertCollection(basePropertyNode, "String0.1", "String1", "String1.1", "String2", "String2.1", "String3", "String4");
             Assert.Equal(9, context.DerivedAsset.MyStrings.Count);
             AssertCollection(derivedPropertyNode, "String0.1", "String1", "String1.1", "String1.5", "String2", "String2.1", "String3", "String3.5", "String4");
 
-            basePropertyNode.Target.Add("String3.1", new Index(6));
+            basePropertyNode.Target.Add("String3.1", new NodeIndex(6));
             Assert.Equal(8, context.BaseAsset.MyStrings.Count);
             AssertCollection(basePropertyNode, "String0.1", "String1", "String1.1", "String2", "String2.1", "String3", "String3.1", "String4");
             Assert.Equal(10, context.DerivedAsset.MyStrings.Count);
             AssertCollection(derivedPropertyNode, "String0.1", "String1", "String1.1", "String1.5", "String2", "String2.1", "String3", "String3.1", "String3.5", "String4");
 
-            basePropertyNode.Target.Add("String4.1", new Index(8));
+            basePropertyNode.Target.Add("String4.1", new NodeIndex(8));
             Assert.Equal(9, context.BaseAsset.MyStrings.Count);
             AssertCollection(basePropertyNode, "String0.1", "String1", "String1.1", "String2", "String2.1", "String3", "String3.1", "String4", "String4.1");
             Assert.Equal(11, context.DerivedAsset.MyStrings.Count);
@@ -295,28 +295,28 @@ public void TestRemoveBaseAddDerivedWithSubDerived()
 
             // Delete an item from the derived and then update the same from the base
             var derivedDeletedId = derivedIds[1];
-            derivedPropertyNode.Target.Remove("String2", new Index(1));
+            derivedPropertyNode.Target.Remove("String2", new NodeIndex(1));
             basePropertyNode.Target.Add("String3");
             Assert.Equal(3, context.BaseAsset.MyStrings.Count);
             Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
             Assert.Equal(2, context.SubDerivedAsset.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String3", basePropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String1", subDerivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String3", subDerivedPropertyNode.Retrieve(new Index(1)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String1", subDerivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String3", subDerivedPropertyNode.Retrieve(new NodeIndex(1)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
             Assert.Equal(OverrideType.Base, subDerivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new Index(1)));
+            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(2, derivedIds.KeyCount);
@@ -345,34 +345,34 @@ public void TestAddBaseRemoveDerivedAndAddInBaseWithSubDerived()
             // Delete an item from the derived and then update the same from the base
             basePropertyNode.Target.Add("String3");
             var derivedDeletedId = derivedIds[2];
-            derivedPropertyNode.Target.Remove("String3", new Index(2));
+            derivedPropertyNode.Target.Remove("String3", new NodeIndex(2));
             basePropertyNode.Target.Add("String4");
             Assert.Equal(4, context.BaseAsset.MyStrings.Count);
             Assert.Equal(3, context.DerivedAsset.MyStrings.Count);
             Assert.Equal(3, context.SubDerivedAsset.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String3", basePropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index(3)));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String1", subDerivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", subDerivedPropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", subDerivedPropertyNode.Retrieve(new Index(2)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(3)));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String1", subDerivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", subDerivedPropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", subDerivedPropertyNode.Retrieve(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(3)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(3)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, subDerivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, subDerivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(4, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(3, derivedIds.KeyCount);
@@ -393,7 +393,7 @@ private static void AssertCollection(IGraphNode node, params string[] items)
             for (var i = 0; i < items.Length; i++)
             {
                 var item = items[i];
-                Assert.Equal(item, node.Retrieve(new Index(i)));
+                Assert.Equal(item, node.Retrieve(new NodeIndex(i)));
             }
         }
     }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesBasic.cs b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesBasic.cs
index 5c7142a0be..fd5ddf097e 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesBasic.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestArchetypesBasic.cs
@@ -164,16 +164,16 @@ public static TestArchetypesRun PrepareSimpleCollectionUpdate()
             {
                 Assert.Equal(2, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -184,21 +184,21 @@ public static TestArchetypesRun PrepareSimpleCollectionUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.FirstChange = () => { basePropertyNode.Target.Update("MyBaseString", new Index(1)); };
+            test.FirstChange = () => { basePropertyNode.Target.Update("MyBaseString", new NodeIndex(1)); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -209,21 +209,21 @@ public static TestArchetypesRun PrepareSimpleCollectionUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.SecondChange = () => { derivedPropertyNode.Target.Update("MyDerivedString", new Index(0)); };
+            test.SecondChange = () => { derivedPropertyNode.Target.Update("MyDerivedString", new NodeIndex(0)); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -257,16 +257,16 @@ public static TestArchetypesRun PrepareSimpleCollectionAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -282,18 +282,18 @@ public static TestArchetypesRun PrepareSimpleCollectionAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(3, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index(2)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex(2)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.Equal(2, baseIds.KeyCount);
@@ -308,22 +308,22 @@ public static TestArchetypesRun PrepareSimpleCollectionAdd()
             {
                 Assert.Equal(3, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(4, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String4", basePropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index(3)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex(3)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(3)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(3)));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.Equal(3, baseIds.KeyCount);
@@ -359,24 +359,24 @@ public static TestArchetypesRun PrepareSimpleCollectionRemove()
             {
                 Assert.Equal(4, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(4, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String3", basePropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String4", basePropertyNode.Retrieve(new Index(3)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(3)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(3)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(3)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(3)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(3)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(3)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(3)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -392,28 +392,28 @@ public static TestArchetypesRun PrepareSimpleCollectionRemove()
             test.FirstChange = () =>
             {
                 derivedDeletedId = derivedIds[2];
-                derivedPropertyNode.Target.Remove("String3", new Index(2));
+                derivedPropertyNode.Target.Remove("String3", new NodeIndex(2));
             };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(4, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(3, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String3", basePropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String4", basePropertyNode.Retrieve(new Index(3)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(2)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(3)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(2)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(3)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(3)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -429,24 +429,24 @@ public static TestArchetypesRun PrepareSimpleCollectionRemove()
             test.SecondChange = () =>
             {
                 baseDeletedId = baseIds[3];
-                basePropertyNode.Target.Remove("String4", new Index(3));
+                basePropertyNode.Target.Remove("String4", new NodeIndex(3));
             };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(3, context.BaseAsset.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String3", basePropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.Equal(3, baseIds.KeyCount);
@@ -483,16 +483,16 @@ public static TestArchetypesRun PrepareCollectionInStructUpdate()
             {
                 Assert.Equal(2, context.BaseAsset.Struct.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.Struct.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -503,21 +503,21 @@ public static TestArchetypesRun PrepareCollectionInStructUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.FirstChange = () => { basePropertyNode.Target.Update("MyBaseString", new Index(1)); };
+            test.FirstChange = () => { basePropertyNode.Target.Update("MyBaseString", new NodeIndex(1)); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.Struct.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.Struct.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -528,21 +528,21 @@ public static TestArchetypesRun PrepareCollectionInStructUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.SecondChange = () => { derivedPropertyNode.Target.Update("MyDerivedString", new Index(0)); };
+            test.SecondChange = () => { derivedPropertyNode.Target.Update("MyDerivedString", new NodeIndex(0)); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.Struct.MyStrings.Count);
                 Assert.Equal(2, context.DerivedAsset.Struct.MyStrings.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index(1)));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -576,16 +576,16 @@ public static TestArchetypesRun PrepareSimpleDictionaryUpdate()
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -596,21 +596,21 @@ public static TestArchetypesRun PrepareSimpleDictionaryUpdate()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.FirstChange = () => { basePropertyNode.Target.Update("MyBaseString", new Index("Key2")); };
+            test.FirstChange = () => { basePropertyNode.Target.Update("MyBaseString", new NodeIndex("Key2")); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index("Key2")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -621,21 +621,21 @@ public static TestArchetypesRun PrepareSimpleDictionaryUpdate()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.SecondChange = () => { derivedPropertyNode.Target.Update("MyDerivedString", new Index("Key1")); };
+            test.SecondChange = () => { derivedPropertyNode.Target.Update("MyDerivedString", new NodeIndex("Key1")); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index("Key2")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -669,16 +669,16 @@ public static TestArchetypesRun PrepareSimpleDictionaryAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -689,23 +689,23 @@ public static TestArchetypesRun PrepareSimpleDictionaryAdd()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.FirstChange = () => { derivedPropertyNode.Target.Add("String3", new Index("Key3")); };
+            test.FirstChange = () => { derivedPropertyNode.Target.Add("String3", new NodeIndex("Key3")); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index("Key3")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -718,27 +718,27 @@ public static TestArchetypesRun PrepareSimpleDictionaryAdd()
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
             };
-            test.SecondChange = () => { basePropertyNode.Target.Add("String4", new Index("Key4")); };
+            test.SecondChange = () => { basePropertyNode.Target.Add("String4", new NodeIndex("Key4")); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(3, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(4, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key4")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index("Key4")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key4")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key4")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -777,24 +777,24 @@ public static TestArchetypesRun PrepareSimpleDictionaryRemove()
             {
                 Assert.Equal(4, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(4, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String3", basePropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key4")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index("Key4")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key4")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key3")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key4")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -810,28 +810,28 @@ public static TestArchetypesRun PrepareSimpleDictionaryRemove()
             test.FirstChange = () =>
             {
                 derivedDeletedId = derivedIds["Key3"];
-                derivedPropertyNode.Target.Remove("String3", new Index("Key3"));
+                derivedPropertyNode.Target.Remove("String3", new NodeIndex("Key3"));
             };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(4, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String3", basePropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key4")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index("Key4")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key4")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key3")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key4")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -847,24 +847,24 @@ public static TestArchetypesRun PrepareSimpleDictionaryRemove()
             test.SecondChange = () =>
             {
                 baseDeletedId = baseIds["Key4"];
-                basePropertyNode.Target.Remove("String4", new Index("Key4"));
+                basePropertyNode.Target.Remove("String4", new NodeIndex("Key4"));
             };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(3, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String3", basePropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
+                Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String3", basePropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key3")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.Equal(3, baseIds.KeyCount);
@@ -906,24 +906,24 @@ public static TestArchetypesRun PrepareObjectCollectionUpdate()
             {
                 Assert.Equal(2, context.BaseAsset.MyObjects.Count);
                 Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -934,29 +934,29 @@ public static TestArchetypesRun PrepareObjectCollectionUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.FirstChange = () => { basePropertyNode.Target.Update(newObjB, new Index(1)); };
+            test.FirstChange = () => { basePropertyNode.Target.Update(newObjB, new NodeIndex(1)); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyObjects.Count);
                 Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -967,29 +967,29 @@ public static TestArchetypesRun PrepareObjectCollectionUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.SecondChange = () => { derivedPropertyNode.Target.Update(newObjD, new Index(0)); };
+            test.SecondChange = () => { derivedPropertyNode.Target.Update(newObjD, new NodeIndex(0)); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyObjects.Count);
                 Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1030,24 +1030,24 @@ public static TestArchetypesRun PrepareObjectCollectionAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyObjects.Count);
                 Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1063,28 +1063,28 @@ public static TestArchetypesRun PrepareObjectCollectionAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyObjects.Count);
                 Assert.Equal(3, context.DerivedAsset.MyObjects.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(2))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(2))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1100,35 +1100,35 @@ public static TestArchetypesRun PrepareObjectCollectionAdd()
             {
                 Assert.Equal(3, context.BaseAsset.MyObjects.Count);
                 Assert.Equal(4, context.DerivedAsset.MyObjects.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index(2)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.NotEqual(newObjB, derivedPropertyNode.Retrieve(new Index(2)));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index(3)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String4", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(2))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String4", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(2))).Value);
-                Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(3))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.NotEqual(newObjB, derivedPropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex(3)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String4", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(2))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String4", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(2))).Value);
+                Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(3))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(3)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(3)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(3)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(3)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1170,25 +1170,25 @@ public static TestArchetypesRun PrepareAbstractCollectionUpdate()
             {
                 Assert.Equal(2, context.BaseAsset.MyInterfaces.Count);
                 Assert.Equal(2, context.DerivedAsset.MyInterfaces.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
                 // NOTE: we're using this code to test undo/redo and in this case, we have different objects in the derived object after undoing due to the fact that the type of the instance has changed
                 //Assert.Equal(objD0, derivedPropertyNode.Content.Retrieve(new Index(0)));
                 //Assert.Equal(objD1, derivedPropertyNode.Content.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1199,29 +1199,29 @@ public static TestArchetypesRun PrepareAbstractCollectionUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.FirstChange = () => { basePropertyNode.Target.Update(newObjB, new Index(1)); };
+            test.FirstChange = () => { basePropertyNode.Target.Update(newObjB, new NodeIndex(1)); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyInterfaces.Count);
                 Assert.Equal(2, context.DerivedAsset.MyInterfaces.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1232,29 +1232,29 @@ public static TestArchetypesRun PrepareAbstractCollectionUpdate()
                 Assert.Equal(baseIds[0], derivedIds[0]);
                 Assert.Equal(baseIds[1], derivedIds[1]);
             };
-            test.SecondChange = () => { derivedPropertyNode.Target.Update(newObjD, new Index(0)); };
+            test.SecondChange = () => { derivedPropertyNode.Target.Update(newObjD, new NodeIndex(0)); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyInterfaces.Count);
                 Assert.Equal(2, context.DerivedAsset.MyInterfaces.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("MyDerivedString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("MyDerivedString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1295,24 +1295,24 @@ public static TestArchetypesRun PrepareAbstractCollectionAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyInterfaces.Count);
                 Assert.Equal(2, context.DerivedAsset.MyInterfaces.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1328,28 +1328,28 @@ public static TestArchetypesRun PrepareAbstractCollectionAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyInterfaces.Count);
                 Assert.Equal(3, context.DerivedAsset.MyInterfaces.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index(2)));
-                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(2))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(2))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1365,35 +1365,35 @@ public static TestArchetypesRun PrepareAbstractCollectionAdd()
             {
                 Assert.Equal(3, context.BaseAsset.MyInterfaces.Count);
                 Assert.Equal(4, context.DerivedAsset.MyInterfaces.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index(1)));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index(2)));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index(0)));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index(1)));
-                Assert.NotEqual(newObjB, derivedPropertyNode.Retrieve(new Index(2)));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index(3)));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String4", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index(2))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(0))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(1))).Value);
-                Assert.Equal("String4", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(2))).Value);
-                Assert.Equal("String3", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index(3))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex(0)));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex(1)));
+                Assert.NotEqual(newObjB, derivedPropertyNode.Retrieve(new NodeIndex(2)));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex(3)));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String4", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex(2))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
+                Assert.Equal("String4", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(2))).Value);
+                Assert.Equal("String3", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex(3))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(3)));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(3)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(3)));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(3)].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1435,25 +1435,25 @@ public static TestArchetypesRun PrepareAbstractDictionaryUpdate()
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index("Key2")));
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex("Key2")));
                 // NOTE: we're using this code to test undo/redo and in this case, we have different objects in the derived object after undoing due to the fact that the type of the instance has changed
                 //Assert.Equal(objD0, derivedPropertyNode.Content.Retrieve(new Index("Key1")));
                 //Assert.Equal(objD1, derivedPropertyNode.Content.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key2"))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1464,29 +1464,29 @@ public static TestArchetypesRun PrepareAbstractDictionaryUpdate()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.FirstChange = () => { basePropertyNode.Target.Update(newObjB, new Index("Key2")); };
+            test.FirstChange = () => { basePropertyNode.Target.Update(newObjB, new NodeIndex("Key2")); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key2"))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1497,29 +1497,29 @@ public static TestArchetypesRun PrepareAbstractDictionaryUpdate()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.SecondChange = () => { derivedPropertyNode.Target.Update(newObjD, new Index("Key1")); };
+            test.SecondChange = () => { derivedPropertyNode.Target.Update(newObjD, new NodeIndex("Key1")); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("MyDerivedString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key2"))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.NotEqual(objD1, derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("MyDerivedString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("MyBaseString", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1560,24 +1560,24 @@ public static TestArchetypesRun PrepareAbstractDictionaryAdd()
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key2"))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1588,33 +1588,33 @@ public static TestArchetypesRun PrepareAbstractDictionaryAdd()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.FirstChange = () => { derivedPropertyNode.Target.Add(newObjD, new Index("Key3")); };
+            test.FirstChange = () => { derivedPropertyNode.Target.Add(newObjD, new NodeIndex("Key3")); };
             test.FirstChangeCheck = () =>
             {
                 Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(3, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String3", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key3"))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String3", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key3"))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key3")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key3")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
@@ -1625,40 +1625,40 @@ public static TestArchetypesRun PrepareAbstractDictionaryAdd()
                 Assert.Equal(baseIds["Key1"], derivedIds["Key1"]);
                 Assert.Equal(baseIds["Key2"], derivedIds["Key2"]);
             };
-            test.SecondChange = () => { basePropertyNode.Target.Add(newObjB, new Index("Key4")); };
+            test.SecondChange = () => { basePropertyNode.Target.Add(newObjB, new NodeIndex("Key4")); };
             test.SecondChangeCheck = () =>
             {
                 Assert.Equal(3, context.BaseAsset.MyDictionary.Count);
                 Assert.Equal(4, context.DerivedAsset.MyDictionary.Count);
-                Assert.Equal(objB0, basePropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objB1, basePropertyNode.Retrieve(new Index("Key2")));
-                Assert.Equal(newObjB, basePropertyNode.Retrieve(new Index("Key4")));
-                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new Index("Key1")));
-                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new Index("Key2")));
-                Assert.NotEqual(newObjB, derivedPropertyNode.Retrieve(new Index("Key4")));
-                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new Index("Key3")));
-                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String4", ((Types.IMyInterface)basePropertyNode.Retrieve(new Index("Key4"))).Value);
-                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key1"))).Value);
-                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key2"))).Value);
-                Assert.Equal("String4", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key4"))).Value);
-                Assert.Equal("String3", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new Index("Key3"))).Value);
+                Assert.Equal(objB0, basePropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objB1, basePropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.Equal(newObjB, basePropertyNode.Retrieve(new NodeIndex("Key4")));
+                Assert.Equal(objD0, derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+                Assert.Equal(objD1, derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+                Assert.NotEqual(newObjB, derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
+                Assert.Equal(newObjD, derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
+                Assert.Equal("String1", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String4", ((Types.IMyInterface)basePropertyNode.Retrieve(new NodeIndex("Key4"))).Value);
+                Assert.Equal("String1", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key1"))).Value);
+                Assert.Equal("String2", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key2"))).Value);
+                Assert.Equal("String4", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key4"))).Value);
+                Assert.Equal("String3", ((Types.IMyInterface)derivedPropertyNode.Retrieve(new NodeIndex("Key3"))).Value);
                 Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index("Key4")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex("Key4")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
-                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key3")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
-                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index("Key4")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+                Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+                Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key1")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key2")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key3")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
+                Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex("Key4")].TargetNode[nameof(Types.IMyInterface.Value)]).GetContentOverride());
                 Assert.Single(derivedPropertyNode.Target.GetOverriddenItemIndices());
                 Assert.Empty(derivedPropertyNode.Target.GetOverriddenKeyIndices());
                 Assert.NotSame(baseIds, derivedIds);
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestObjectReferenceGraph.cs b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestObjectReferenceGraph.cs
index c06660bb8d..05a6949031 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestObjectReferenceGraph.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestObjectReferenceGraph.cs
@@ -59,12 +59,12 @@ public void TestCollectionObjectReferenceGraph()
             Assert.True(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.NonReference)].IsReference);
             Assert.Equal(obj, context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.NonReference)].Target.Retrieve());
             Assert.True(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].IsReference);
-            Assert.Equal(obj, context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.Retrieve(new Index(0)));
-            Assert.Equal(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.NonReference)].Target, context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.IndexedTarget(new Index(0)));
+            Assert.Equal(obj, context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.Retrieve(new NodeIndex(0)));
+            Assert.Equal(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.NonReference)].Target, context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.IndexedTarget(new NodeIndex(0)));
 
             Assert.Equal(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)], context.DerivedGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].BaseNode);
             Assert.Equal(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target, context.DerivedGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.BaseNode);
-            Assert.Equal(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.NonReference)].Target, context.DerivedGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.IndexedTarget(new Index(0)).BaseNode);
+            Assert.Equal(context.BaseGraph.RootNode[nameof(Types.MyAssetWithRef2.NonReference)].Target, context.DerivedGraph.RootNode[nameof(Types.MyAssetWithRef2.References)].Target.IndexedTarget(new NodeIndex(0)).BaseNode);
         }
     }
 }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestOverrideSerialization.cs b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestOverrideSerialization.cs
index 2562558e2b..d4b775ceb8 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestOverrideSerialization.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/TestOverrideSerialization.cs
@@ -278,8 +278,8 @@ public void TestSimpleCollectionUpdateSerialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset2.MyStrings)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset2.MyStrings)];
 
-            basePropertyNode.Target.Update("MyBaseString", new Index(1));
-            derivedPropertyNode.Target.Update("MyDerivedString", new Index(0));
+            basePropertyNode.Target.Update("MyBaseString", new NodeIndex(1));
+            derivedPropertyNode.Target.Update("MyDerivedString", new NodeIndex(0));
             SerializationHelper.SerializeAndCompare(context.BaseAssetItem, context.BaseGraph, SimpleCollectionUpdateBaseYaml, false);
             SerializationHelper.SerializeAndCompare(context.DerivedAssetItem, context.DerivedGraph, SimpleCollectionUpdateDerivedYaml, true);
         }
@@ -295,16 +295,16 @@ public void TestSimpleCollectionUpdateDeserialization()
 
             Assert.Equal(2, context.BaseAsset.MyStrings.Count);
             Assert.Equal(2, context.DerivedAsset.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index(1)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex(1)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(2, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -325,8 +325,8 @@ public void TestSimpleDictionaryUpdateSerialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset3.MyDictionary)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset3.MyDictionary)];
 
-            basePropertyNode.Target.Update("MyBaseString", new Index("Key2"));
-            derivedPropertyNode.Target.Update("MyDerivedString", new Index("Key1"));
+            basePropertyNode.Target.Update("MyBaseString", new NodeIndex("Key2"));
+            derivedPropertyNode.Target.Update("MyDerivedString", new NodeIndex("Key1"));
             SerializationHelper.SerializeAndCompare(context.BaseAssetItem, context.BaseGraph, SimpleDictionaryUpdateBaseYaml, false);
             SerializationHelper.SerializeAndCompare(context.DerivedAssetItem, context.DerivedGraph, SimpleDictionaryUpdateDerivedYaml, true);
 
@@ -338,16 +338,16 @@ public void TestSimpleDictionaryUpdateSerialization()
 
             Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
             Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index("Key2")));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(2, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -368,16 +368,16 @@ public void TestSimpleDictionaryDeserialization()
 
             Assert.Equal(2, context.BaseAsset.MyDictionary.Count);
             Assert.Equal(2, context.DerivedAsset.MyDictionary.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index("Key2")));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(2, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -400,8 +400,8 @@ public void TestCollectionInStructUpdateSerialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset2.Struct)].Target[nameof(Types.MyAsset2.MyStrings)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset2.Struct)].Target[nameof(Types.MyAsset2.MyStrings)];
 
-            basePropertyNode.Target.Update("MyBaseString", new Index(1));
-            derivedPropertyNode.Target.Update("MyDerivedString", new Index(0));
+            basePropertyNode.Target.Update("MyBaseString", new NodeIndex(1));
+            derivedPropertyNode.Target.Update("MyDerivedString", new NodeIndex(0));
             SerializationHelper.SerializeAndCompare(context.BaseAssetItem, context.BaseGraph, CollectionInStructBaseYaml, false);
             SerializationHelper.SerializeAndCompare(context.DerivedAssetItem, context.DerivedGraph, CollectionInStructDerivedYaml, true);
         }
@@ -417,16 +417,16 @@ public void TestCollectionInStructUpdateDeserialization()
 
             Assert.Equal(2, context.BaseAsset.Struct.MyStrings.Count);
             Assert.Equal(2, context.DerivedAsset.Struct.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new Index(1)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("MyBaseString", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("MyDerivedString", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("MyBaseString", derivedPropertyNode.Retrieve(new NodeIndex(1)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(2, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -469,22 +469,22 @@ public void TestSimpleCollectionAddDeserialization()
 
             Assert.Equal(3, context.BaseAsset.MyStrings.Count);
             Assert.Equal(4, context.DerivedAsset.MyStrings.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index(0)));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index(1)));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index(2)));
-            Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index(3)));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex(1)));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex(2)));
+            Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex(3)));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(2)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(2)));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(3)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(3)));
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
             Assert.Equal(4, derivedIds.KeyCount);
@@ -506,8 +506,8 @@ public void TestSimpleDictionaryAddSerialization()
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset3.MyDictionary)];
 
             // Update derived and check
-            derivedPropertyNode.Target.Add("String3", new Index("Key3"));
-            basePropertyNode.Target.Add("String4", new Index("Key4"));
+            derivedPropertyNode.Target.Add("String3", new NodeIndex("Key3"));
+            basePropertyNode.Target.Add("String4", new NodeIndex("Key4"));
 
             var derivedIds = CollectionItemIdHelper.GetCollectionItemIds(context.DerivedAsset.MyDictionary);
             var expectedBaseYaml = string.Format(SimpleDictionaryAddBaseYaml.Replace("{}", "{{}}"), baseIds["Key4"]);
@@ -529,22 +529,22 @@ public void TestSimpleDictionaryAddDeserialization()
 
             Assert.Equal(3, context.BaseAsset.MyDictionary.Count);
             Assert.Equal(4, context.DerivedAsset.MyDictionary.Count);
-            Assert.Equal("String1", basePropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", basePropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String4", basePropertyNode.Retrieve(new Index("Key4")));
-            Assert.Equal("String1", derivedPropertyNode.Retrieve(new Index("Key1")));
-            Assert.Equal("String2", derivedPropertyNode.Retrieve(new Index("Key2")));
-            Assert.Equal("String3", derivedPropertyNode.Retrieve(new Index("Key3")));
-            Assert.Equal("String4", derivedPropertyNode.Retrieve(new Index("Key4")));
+            Assert.Equal("String1", basePropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", basePropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String4", basePropertyNode.Retrieve(new NodeIndex("Key4")));
+            Assert.Equal("String1", derivedPropertyNode.Retrieve(new NodeIndex("Key1")));
+            Assert.Equal("String2", derivedPropertyNode.Retrieve(new NodeIndex("Key2")));
+            Assert.Equal("String3", derivedPropertyNode.Retrieve(new NodeIndex("Key3")));
+            Assert.Equal("String4", derivedPropertyNode.Retrieve(new NodeIndex("Key4")));
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index("Key4")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key1")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key2")));
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index("Key3")));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index("Key4")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key1")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key2")));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key3")));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex("Key4")));
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -568,8 +568,8 @@ public void TestObjectCollectionUpdateSerialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset4.MyObjects)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset4.MyObjects)];
 
-            basePropertyNode.Target.Update(new Types.SomeObject { Value = "MyBaseString" }, new Index(1));
-            derivedPropertyNode.Target.Update(new Types.SomeObject { Value = "MyDerivedString" }, new Index(0));
+            basePropertyNode.Target.Update(new Types.SomeObject { Value = "MyBaseString" }, new NodeIndex(1));
+            derivedPropertyNode.Target.Update(new Types.SomeObject { Value = "MyDerivedString" }, new NodeIndex(0));
             SerializationHelper.SerializeAndCompare(context.BaseAssetItem, context.BaseGraph, ObjectCollectionUpdateBaseYaml, false);
             SerializationHelper.SerializeAndCompare(context.DerivedAssetItem, context.DerivedGraph, ObjectCollectionUpdateDerivedYaml, true);
         }
@@ -585,20 +585,20 @@ public void TestObjectCollectionUpdateDeserialization()
 
             Assert.Equal(2, context.BaseAsset.MyObjects.Count);
             Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-            Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+            Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(2, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -641,28 +641,28 @@ public void TestObjectCollectionAddDeserialization()
 
             Assert.Equal(3, context.BaseAsset.MyObjects.Count);
             Assert.Equal(4, context.DerivedAsset.MyObjects.Count);
-            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-            Assert.Equal("String4", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(2))).Value);
-            Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
-            Assert.Equal("String4", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(2))).Value);
-            Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(3))).Value);
+            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("String2", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+            Assert.Equal("String4", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(2))).Value);
+            Assert.Equal("String1", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("String2", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
+            Assert.Equal("String4", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(2))).Value);
+            Assert.Equal("String3", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(3))).Value);
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(2)));
-            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new Index(3)));
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(3)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(2)));
+            Assert.Equal(OverrideType.New, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(3)));
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(2)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(3)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(3, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -684,8 +684,8 @@ public void TestObjectCollectionPropertyUpdateSerialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset4.MyObjects)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset4.MyObjects)];
 
-            basePropertyNode.Target.IndexedTarget(new Index(1))[nameof(Types.SomeObject.Value)].Update("MyBaseString");
-            derivedPropertyNode.Target.IndexedTarget(new Index(0))[nameof(Types.SomeObject.Value)].Update("MyDerivedString");
+            basePropertyNode.Target.IndexedTarget(new NodeIndex(1))[nameof(Types.SomeObject.Value)].Update("MyBaseString");
+            derivedPropertyNode.Target.IndexedTarget(new NodeIndex(0))[nameof(Types.SomeObject.Value)].Update("MyDerivedString");
             SerializationHelper.SerializeAndCompare(context.BaseAssetItem, context.BaseGraph, ObjectCollectionPropertyUpdateBaseYaml, false);
             SerializationHelper.SerializeAndCompare(context.DerivedAssetItem, context.DerivedGraph, ObjectCollectionPropertyUpdateDerivedYaml, true);
         }
@@ -701,20 +701,20 @@ public void TestObjectCollectionPropertyUpdateDeserialization()
 
             Assert.Equal(2, context.BaseAsset.MyObjects.Count);
             Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-            Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+            Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.New, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.New, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.NotSame(baseIds, derivedIds);
             Assert.Equal(2, baseIds.KeyCount);
             Assert.Equal(0, baseIds.DeletedCount);
@@ -732,12 +732,12 @@ public void TestNonIdentifiableObjectCollectionUpdateSerialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset8.MyObjects)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset8.MyObjects)];
             // Manually link base of non-identifiable items - this simulates a scenario similar to prefabs
-            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new Index(0)), basePropertyNode.Target.IndexedTarget(new Index(0)));
-            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new Index(1)), basePropertyNode.Target.IndexedTarget(new Index(1)));
+            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new NodeIndex(0)), basePropertyNode.Target.IndexedTarget(new NodeIndex(0)));
+            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new NodeIndex(1)), basePropertyNode.Target.IndexedTarget(new NodeIndex(1)));
             context.DerivedGraph.RefreshBase();
 
-            basePropertyNode.Target.IndexedTarget(new Index(1))[nameof(Types.SomeObject.Value)].Update("MyBaseString");
-            derivedPropertyNode.Target.IndexedTarget(new Index(0))[nameof(Types.SomeObject.Value)].Update("MyDerivedString");
+            basePropertyNode.Target.IndexedTarget(new NodeIndex(1))[nameof(Types.SomeObject.Value)].Update("MyBaseString");
+            derivedPropertyNode.Target.IndexedTarget(new NodeIndex(0))[nameof(Types.SomeObject.Value)].Update("MyDerivedString");
             SerializationHelper.SerializeAndCompare(context.BaseAssetItem, context.BaseGraph, NonIdentifiableObjectCollectionPropertyUpdateBaseYaml, false);
             SerializationHelper.SerializeAndCompare(context.DerivedAssetItem, context.DerivedGraph, NonIdentifiableObjectCollectionPropertyUpdateDerivedYaml, true);
         }
@@ -749,26 +749,26 @@ public void TestNonIdentifiableObjectCollectionUpdateDeserialization()
             var basePropertyNode = context.BaseGraph.RootNode[nameof(Types.MyAsset8.MyObjects)];
             var derivedPropertyNode = context.DerivedGraph.RootNode[nameof(Types.MyAsset8.MyObjects)];
             // Manually link base of non-identifiable items - this simulates a scenario similar to prefabs
-            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new Index(0)), basePropertyNode.Target.IndexedTarget(new Index(0)));
-            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new Index(1)), basePropertyNode.Target.IndexedTarget(new Index(1)));
+            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new NodeIndex(0)), basePropertyNode.Target.IndexedTarget(new NodeIndex(0)));
+            context.DerivedGraph.RegisterCustomBaseLink(derivedPropertyNode.Target.IndexedTarget(new NodeIndex(1)), basePropertyNode.Target.IndexedTarget(new NodeIndex(1)));
             context.DerivedGraph.RefreshBase();
 
             Assert.Equal(2, context.BaseAsset.MyObjects.Count);
             Assert.Equal(2, context.DerivedAsset.MyObjects.Count);
-            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new Index(1))).Value);
-            Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(0))).Value);
-            Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new Index(1))).Value);
+            Assert.Equal("String1", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("MyBaseString", ((Types.SomeObject)basePropertyNode.Retrieve(new NodeIndex(1))).Value);
+            Assert.Equal("MyDerivedString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(0))).Value);
+            Assert.Equal("MyBaseString", ((Types.SomeObject)derivedPropertyNode.Retrieve(new NodeIndex(1))).Value);
             Assert.Equal(OverrideType.Base, basePropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, basePropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)basePropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
             Assert.Equal(OverrideType.Base, derivedPropertyNode.GetContentOverride());
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(0)));
-            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new Index(1)));
-            Assert.Equal(OverrideType.New, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
-            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new Index(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(0)));
+            Assert.Equal(OverrideType.Base, derivedPropertyNode.Target.GetItemOverride(new NodeIndex(1)));
+            Assert.Equal(OverrideType.New, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(0)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
+            Assert.Equal(OverrideType.Base, ((AssetMemberNode)derivedPropertyNode.Target.ItemReferences[new NodeIndex(1)].TargetNode[nameof(Types.SomeObject.Value)]).GetContentOverride());
         }
 
         [Fact]
@@ -819,7 +819,7 @@ public void TestGenerateOverridesForSerializationOfCollectionItem()
 ";
             var asset = new Types.MyAsset4 { MyObjects = { new Types.SomeObject { Value = "String1" }, new Types.SomeObject { Value = "String2" } } };
             var context = DeriveAssetTest<Types.MyAsset4, Types.MyAssetBasePropertyGraph>.DeriveAsset(asset);
-            var derivedPropertyNode = (AssetObjectNode)context.DerivedGraph.RootNode[nameof(Types.MyAsset4.MyObjects)].Target.IndexedTarget(new Index(1));
+            var derivedPropertyNode = (AssetObjectNode)context.DerivedGraph.RootNode[nameof(Types.MyAsset4.MyObjects)].Target.IndexedTarget(new NodeIndex(1));
             derivedPropertyNode[nameof(Types.SomeObject.Value)].Update("OverriddenString");
             var expectedPath = new YamlAssetPath();
             expectedPath.PushMember(nameof(Types.SomeObject.Value));
diff --git a/sources/assets/Xenko.Core.Assets.Quantum.Tests/Xenko.Core.Assets.Quantum.Tests.csproj b/sources/assets/Xenko.Core.Assets.Quantum.Tests/Xenko.Core.Assets.Quantum.Tests.csproj
index cd499ef4a4..0ead68ad8e 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum.Tests/Xenko.Core.Assets.Quantum.Tests.csproj
+++ b/sources/assets/Xenko.Core.Assets.Quantum.Tests/Xenko.Core.Assets.Quantum.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -42,5 +42,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraph.cs b/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraph.cs
index 21db7355c6..1c9006eb55 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraph.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraph.cs
@@ -80,7 +80,7 @@ protected AssetCompositeHierarchyPropertyGraph([NotNull] AssetPropertyGraphConta
         /// </summary>
         public event EventHandler<AssetPartChangeEventArgs> PartRemoved;
 
-        public abstract bool IsChildPartReference(IGraphNode node, Index index);
+        public abstract bool IsChildPartReference(IGraphNode node, NodeIndex index);
 
         /// <inheritdoc/>
         public override void Dispose()
@@ -161,7 +161,7 @@ public void AddPartToAsset(AssetPartCollection<TAssetPartDesign, TAssetPart> new
             if (parent == null)
             {
                 var rootPartsNode = HierarchyNode[nameof(AssetCompositeHierarchyData<TAssetPartDesign, TAssetPart>.RootParts)].Target;
-                rootPartsNode.Add(child.Part, new Index(index));
+                rootPartsNode.Add(child.Part, new NodeIndex(index));
             }
             else
             {
@@ -185,7 +185,7 @@ public void RemovePartFromAsset([NotNull] TAssetPartDesign partDesign)
             }
             else
             {
-                var index = new Index(Asset.Hierarchy.RootParts.IndexOf(partDesign.Part));
+                var index = new NodeIndex(Asset.Hierarchy.RootParts.IndexOf(partDesign.Part));
                 var rootPartsNode = HierarchyNode[nameof(AssetCompositeHierarchyData<TAssetPartDesign, TAssetPart>.RootParts)].Target;
                 rootPartsNode.Remove(partDesign.Part, index);
             }
@@ -744,7 +744,7 @@ private void PartRemovedInBaseAsset(object sender, AssetPartChangeEventArgs e)
         private void InsertPartInPartsCollection(AssetPartCollection<TAssetPartDesign, TAssetPart> newPartCollection, [NotNull] TAssetPartDesign rootPart)
         {
             var node = HierarchyNode[nameof(AssetCompositeHierarchyData<TAssetPartDesign, TAssetPart>.Parts)].Target;
-            node.Add(rootPart, new Index(rootPart.Part.Id));
+            node.Add(rootPart, new NodeIndex(rootPart.Part.Id));
             foreach (var childPart in Asset.EnumerateChildParts(rootPart.Part, false))
             {
                 var partDesign = newPartCollection[childPart.Id];
@@ -760,7 +760,7 @@ private void RemovePartFromPartsCollection([NotNull] TAssetPartDesign rootPart)
                 RemovePartFromPartsCollection(partDesign);
             }
             var node = HierarchyNode[nameof(AssetCompositeHierarchyData<TAssetPartDesign, TAssetPart>.Parts)].Target;
-            var index = new Index(rootPart.Part.Id);
+            var index = new NodeIndex(rootPart.Part.Id);
             node.Remove(rootPart, index);
         }
 
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraphDefinition.cs b/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraphDefinition.cs
index 436ec5e72e..2d5c48334b 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraphDefinition.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/AssetCompositeHierarchyPropertyGraphDefinition.cs
@@ -19,7 +19,7 @@ public override bool IsMemberTargetObjectReference(IMemberNode member, object va
             return base.IsMemberTargetObjectReference(member, value);
         }
 
-        public override bool IsTargetItemObjectReference(IObjectNode collection, Index itemIndex, object value)
+        public override bool IsTargetItemObjectReference(IObjectNode collection, NodeIndex itemIndex, object value)
         {
             return value is TAssetPart || base.IsTargetItemObjectReference(collection, itemIndex, value);
         }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/AssetGraphNodeLinker.cs b/sources/assets/Xenko.Core.Assets.Quantum/AssetGraphNodeLinker.cs
index 80571ec666..197b09e90a 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/AssetGraphNodeLinker.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/AssetGraphNodeLinker.cs
@@ -21,7 +21,7 @@ protected override bool ShouldVisitMemberTarget([NotNull] IMemberNode member)
             return !propertyGraphDefinition.IsMemberTargetObjectReference(member, member.Retrieve()) && base.ShouldVisitMemberTarget(member);
         }
 
-        protected override bool ShouldVisitTargetItem([NotNull] IObjectNode collectionNode, Index index)
+        protected override bool ShouldVisitTargetItem([NotNull] IObjectNode collectionNode, NodeIndex index)
         {
             return !propertyGraphDefinition.IsTargetItemObjectReference(collectionNode, index, collectionNode.Retrieve(index)) && base.ShouldVisitTargetItem(collectionNode, index);
         }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraph.cs b/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraph.cs
index 03b171af9f..8be0ca33e6 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraph.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraph.cs
@@ -26,14 +26,14 @@ public class AssetPropertyGraph : IDisposable
 
         public struct NodeOverride
         {
-            public NodeOverride(IAssetNode overriddenNode, Index overriddenIndex, OverrideTarget target)
+            public NodeOverride(IAssetNode overriddenNode, NodeIndex overriddenIndex, OverrideTarget target)
             {
                 Node = overriddenNode;
                 Index = overriddenIndex;
                 Target = target;
             }
             public readonly IAssetNode Node;
-            public readonly Index Index;
+            public readonly NodeIndex Index;
             public readonly OverrideTarget Target;
         }
 
@@ -211,7 +211,7 @@ public void ReconcileWithBase()
             ReconcileWithBase(RootNode);
         }
 
-        private void ReconcileWithBase([NotNull] IAssetNode rootNode, Dictionary<IGraphNode, Index> nodesToReset = null)
+        private void ReconcileWithBase([NotNull] IAssetNode rootNode, Dictionary<IGraphNode, NodeIndex> nodesToReset = null)
         {
             // Two passes: first pass will reconcile almost everything, but skip object reference.
             // The reason is that the target of the reference might not exist yet (might need to be reconcilied)
@@ -230,18 +230,18 @@ private void ReconcileWithBase([NotNull] IAssetNode rootNode, Dictionary<IGraphN
         /// </summary>
         /// <param name="rootNode">The node for which to reset overrides.</param>
         /// <param name="indexToReset">The index of the override to reset in this node, if relevant.</param>
-        internal void ResetAllOverridesRecursively([NotNull] IAssetNode rootNode, Index indexToReset)
+        internal void ResetAllOverridesRecursively([NotNull] IAssetNode rootNode, NodeIndex indexToReset)
         {
-            if (rootNode is IAssetMemberNode && indexToReset != Index.Empty) throw new ArgumentException(@"The index must be empty when invoking this method on a member node.", nameof(indexToReset));
+            if (rootNode is IAssetMemberNode && indexToReset != NodeIndex.Empty) throw new ArgumentException(@"The index must be empty when invoking this method on a member node.", nameof(indexToReset));
 
             // We first use a visitor to reset recursively all overrides
-            var nodesToReset = new Dictionary<IGraphNode, Index>();
+            var nodesToReset = new Dictionary<IGraphNode, NodeIndex>();
 
             IGraphNode visitRoot = null;
             var memberNode = rootNode as AssetMemberNode;
             if (memberNode != null)
             {
-                if (indexToReset != Index.Empty) throw new InvalidOperationException("Expecting empty index when resetting a member node.");
+                if (indexToReset != NodeIndex.Empty) throw new InvalidOperationException("Expecting empty index when resetting a member node.");
                 visitRoot = memberNode.Target;
                 nodesToReset.Add(rootNode, indexToReset);
             }
@@ -249,7 +249,7 @@ internal void ResetAllOverridesRecursively([NotNull] IAssetNode rootNode, Index
             var objectNode = rootNode as AssetObjectNode;
             if (objectNode != null)
             {
-                if (indexToReset != Index.Empty)
+                if (indexToReset != NodeIndex.Empty)
                 {
                     nodesToReset.Add(rootNode, indexToReset);
                     visitRoot = objectNode.IsReference ? objectNode.IndexedTarget(indexToReset) : null;
@@ -265,7 +265,7 @@ internal void ResetAllOverridesRecursively([NotNull] IAssetNode rootNode, Index
             {
                 var visitor = new AssetGraphVisitorBase(Definition);
                 // If we're in scenario where rootNode is an object node and index is not empty, we might already have the node in the dictionary so let's check this in Visiting
-                visitor.Visiting += (node, path) => { if (!nodesToReset.ContainsKey(node)) nodesToReset.Add(node, Index.Empty); };
+                visitor.Visiting += (node, path) => { if (!nodesToReset.ContainsKey(node)) nodesToReset.Add(node, NodeIndex.Empty); };
                 visitor.Visit(rootNode);
             }
             // Then we reconcile (recursively) with the base.
@@ -329,10 +329,10 @@ protected virtual void OnItemChanged(ItemChangeEventArgs args)
         }
 
         [CanBeNull]
-        private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotNull] YamlAssetPath path, out Index index, out bool resolveOnIndex)
+        private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotNull] YamlAssetPath path, out NodeIndex index, out bool resolveOnIndex)
         {
             var currentNode = rootNode;
-            index = Index.Empty;
+            index = NodeIndex.Empty;
             resolveOnIndex = false;
             for (var i = 0; i < path.Elements.Count; i++)
             {
@@ -341,7 +341,7 @@ private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotN
                 {
                     case YamlAssetPath.ElementType.Member:
                     {
-                        index = Index.Empty;
+                        index = NodeIndex.Empty;
                         resolveOnIndex = false;
                         if (currentNode.IsReference)
                         {
@@ -357,7 +357,7 @@ private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotN
                     }
                     case YamlAssetPath.ElementType.Index:
                     {
-                        index = new Index(item.Value);
+                        index = new NodeIndex(item.Value);
                         resolveOnIndex = true;
                         var memberNode = currentNode as IMemberNode;
                         if (memberNode == null) throw new InvalidOperationException($"An IMemberNode was expected when processing the path [{path}]");
@@ -366,7 +366,7 @@ private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotN
                         {
                             var objNode = currentNode as IObjectNode;
                             if (objNode == null) throw new InvalidOperationException($"An IObjectNode was expected when processing the path [{path}]");
-                            currentNode = (IAssetNode)objNode.IndexedTarget(new Index(item.Value));
+                            currentNode = (IAssetNode)objNode.IndexedTarget(new NodeIndex(item.Value));
                         }
                         break;
                     }
@@ -374,7 +374,7 @@ private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotN
                     {
                         var ids = CollectionItemIdHelper.GetCollectionItemIds(currentNode.Retrieve());
                         var key = ids.GetKey(item.AsItemId());
-                        index = new Index(key);
+                        index = new NodeIndex(key);
                         resolveOnIndex = false;
                         var memberNode = currentNode as IMemberNode;
                         if (memberNode == null) throw new InvalidOperationException($"An IMemberNode was expected when processing the path [{path}]");
@@ -383,7 +383,7 @@ private static IAssetNode ResolveObjectPath([NotNull] IAssetNode rootNode, [NotN
                         {
                             var objNode = currentNode as IObjectNode;
                             if (objNode == null) throw new InvalidOperationException($"An IObjectNode was expected when processing the path [{path}]");
-                            currentNode = (IAssetNode)objNode.IndexedTarget(new Index(key));
+                            currentNode = (IAssetNode)objNode.IndexedTarget(new NodeIndex(key));
                         }
                         break;
                     }
@@ -427,7 +427,7 @@ public static void ApplyOverrides([NotNull] IAssetNode rootNode, YamlAssetMetada
 
             foreach (var overrideInfo in overrides)
             {
-                var node = ResolveObjectPath(rootNode, overrideInfo.Key, out Index index, out bool overrideOnKey);
+                var node = ResolveObjectPath(rootNode, overrideInfo.Key, out NodeIndex index, out bool overrideOnKey);
                 // The node is unreachable, skip this override.
                 if (node == null)
                     continue;
@@ -469,7 +469,7 @@ public List<NodeOverride> ClearAllOverrides()
                     if (memberNode != null && memberNode.IsContentOverridden())
                     {
                         memberNode.OverrideContent(false);
-                        clearedOverrides.Add(new NodeOverride(memberNode, Index.Empty, OverrideTarget.Content));
+                        clearedOverrides.Add(new NodeOverride(memberNode, NodeIndex.Empty, OverrideTarget.Content));
                     }
                     if (objectNode != null)
                     {
@@ -532,7 +532,7 @@ protected virtual IBaseToDerivedRegistry CreateBaseToDerivedRegistry()
         }
 
         // TODO: this method is should be called in every scenario of ReconcileWithBase, it is not the case yet.
-        protected virtual bool CanUpdate(IAssetNode node, ContentChangeType changeType, Index index, object value)
+        protected virtual bool CanUpdate(IAssetNode node, ContentChangeType changeType, NodeIndex index, object value)
         {
             return true;
         }
@@ -566,11 +566,11 @@ private static object CloneFromBase(object value)
 
         private void LinkBaseNode([NotNull] IGraphNode currentNode, IGraphNode baseNode)
         {
-            var assetNode = (IAssetNode)currentNode;
-            ((IAssetNodeInternal)assetNode).SetPropertyGraph(this);
-            ((IAssetNodeInternal)assetNode).SetBaseNode(baseNode);
+            var assetNode = (IAssetNodeInternal)currentNode;
+            assetNode.SetPropertyGraph(this);
+            assetNode.SetBaseNode(baseNode);
 
-            BaseToDerivedRegistry.RegisterBaseToDerived((IAssetNode)baseNode, (IAssetNode)currentNode);
+            BaseToDerivedRegistry.RegisterBaseToDerived((IAssetNode)baseNode, assetNode);
 
             if (!baseLinkedNodes.ContainsKey(assetNode))
             {
@@ -578,14 +578,13 @@ private void LinkBaseNode([NotNull] IGraphNode currentNode, IGraphNode baseNode)
                 EventHandler<ItemChangeEventArgs> itemChange = null;
                 if (baseNode != null)
                 {
-                    var member = assetNode.BaseNode as IMemberNode;
-                    if (member != null)
+                    if (assetNode.BaseNode is IMemberNode member)
                     {
                         valueChange = (s, e) => OnBaseContentChanged(e, currentNode);
                         member.ValueChanged += valueChange;
                     }
-                    var objectNode = assetNode.BaseNode as IObjectNode;
-                    if (objectNode != null)
+
+                    if (assetNode.BaseNode is IObjectNode objectNode)
                     {
                         itemChange = (s, e) => OnBaseContentChanged(e, currentNode);
                         objectNode.ItemChanged += itemChange;
@@ -601,13 +600,12 @@ private void UnlinkBaseNode(IGraphNode currentNode, IGraphNode baseNode)
 
             if (baseLinkedNodes.TryGetValue(assetNode, out NodeChangeHandlers linkedNode))
             {
-                var member = assetNode.BaseNode as IMemberNode;
-                if (member != null)
+                if (assetNode.BaseNode is IMemberNode member)
                 {
                     member.ValueChanged -= linkedNode.ValueChange;
                 }
-                var objectNode = assetNode.BaseNode as IObjectNode;
-                if (objectNode != null)
+
+                if (assetNode.BaseNode is IObjectNode objectNode)
                 {
                     objectNode.ItemChanged -= linkedNode.ItemChange;
                 }
@@ -619,13 +617,12 @@ private void ClearAllBaseLinks()
         {
             foreach (var linkedNode in baseLinkedNodes)
             {
-                var member = linkedNode.Key.BaseNode as IMemberNode;
-                if (member != null)
+                if (linkedNode.Key.BaseNode is IMemberNode member)
                 {
                     member.ValueChanged -= linkedNode.Value.ValueChange;
                 }
-                var objectNode = linkedNode.Key.BaseNode as IObjectNode;
-                if (objectNode != null)
+
+                if (linkedNode.Key.BaseNode is IObjectNode objectNode)
                 {
                     objectNode.ItemChanged -= linkedNode.Value.ItemChange;
                 }
@@ -744,7 +741,7 @@ private void OnBaseContentChanged(INodeChangeEventArgs e, IGraphNode node)
             BaseContentChanged?.Invoke(e, node);
         }
 
-        private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectReference, Dictionary<IGraphNode, Index> nodesToReset)
+        private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectReference, Dictionary<IGraphNode, NodeIndex> nodesToReset)
         {
             var memberNode = assetNode as AssetMemberNode;
             var objectNode = assetNode as IAssetObjectNodeInternal;
@@ -796,7 +793,7 @@ private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectRef
                     foreach (var index in objectNode.Indices)
                     {
                         // Skip overridden items, if they are not marked to be reset.
-                        if (objectNode.IsItemOverridden(index) || (nodesToReset != null && nodesToReset.TryGetValue(objectNode, out Index indexToReset) && indexToReset != index))
+                        if (objectNode.IsItemOverridden(index) || (nodesToReset != null && nodesToReset.TryGetValue(objectNode, out NodeIndex indexToReset) && indexToReset != index))
                             continue;
 
                         var itemId = objectNode.IndexToId(index);
@@ -841,7 +838,7 @@ private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectRef
                             continue;
                         }
 
-                        if (!objectNode.TryIdToIndex(itemId, out Index localIndex))
+                        if (!objectNode.TryIdToIndex(itemId, out NodeIndex localIndex))
                         {
                             // For dictionary, we might have a key collision, if so, we consider that the new value from the base is deleted in the instance.
                             var keyCollision = assetNode.Descriptor is DictionaryDescriptor && (objectNode.ItemReferences?.HasIndex(index) == true || objectNode.Indices.Any(x => index.Equals(x)));
@@ -881,7 +878,7 @@ private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectRef
                                 if (ShouldReconcileIndex(localIndex, index))
                                 {
                                     // Reconcile using a move (Remove + Add) of the key-value pair
-                                    var clonedIndex = new Index(CloneValueFromBase(index.Value, assetNode));
+                                    var clonedIndex = new NodeIndex(CloneValueFromBase(index.Value, assetNode));
                                     var localItemValue = assetNode.Retrieve(localIndex);
                                     objectNode.Remove(localItemValue, localIndex);
                                     objectNode.Add(localItemValue, clonedIndex);
@@ -914,19 +911,19 @@ private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectRef
                             var currentBaseIndex = baseIndex.Int - 1;
 
                             // Initialize the target index to zero, in case we don't find any better index.
-                            var localIndex = new Index(0);
+                            var localIndex = new NodeIndex(0);
 
                             // Find the first item of the base that also exists (in term of id) in the local node, iterating backward (from baseIndex to 0)
                             while (currentBaseIndex >= 0)
                             {
                                 // This should not happen since the currentBaseIndex comes from the base.
-                                if (!baseNode.TryIndexToId(new Index(currentBaseIndex), out ItemId baseId))
+                                if (!baseNode.TryIndexToId(new NodeIndex(currentBaseIndex), out ItemId baseId))
                                     throw new InvalidOperationException("Cannot find an identifier matching the index in the base collection");
 
                                 // If we have an matching item, we want to insert right after it
-                                if (objectNode.TryIdToIndex(baseId, out Index sameIndexInInstance))
+                                if (objectNode.TryIdToIndex(baseId, out NodeIndex sameIndexInInstance))
                                 {
-                                    localIndex = new Index(sameIndexInInstance.Int + 1);
+                                    localIndex = new NodeIndex(sameIndexInInstance.Int + 1);
                                     break;
                                 }
                                 currentBaseIndex--;
@@ -946,16 +943,16 @@ private void ReconcileWithBaseNode(IAssetNode assetNode, bool reconcileObjectRef
             }
         }
 
-        private bool ShouldReconcileMember([NotNull] IAssetMemberNode memberNode, bool reconcileObjectReference, Dictionary<IGraphNode, Index> nodesToReset)
+        private bool ShouldReconcileMember([NotNull] IAssetMemberNode memberNode, bool reconcileObjectReference, Dictionary<IGraphNode, NodeIndex> nodesToReset)
         {
             var localValue = memberNode.Retrieve();
             var baseValue = memberNode.BaseNode.Retrieve();
 
             // First rule: if the node is to be reset, we should reconcile.
-            var index = Index.Empty;
+            var index = NodeIndex.Empty;
             if (nodesToReset?.TryGetValue(memberNode, out index) ?? false)
             {
-                return index == Index.Empty;
+                return index == NodeIndex.Empty;
             }
 
             // Second rule: if the node is overridden, we shouldn't reconcile.
@@ -990,16 +987,16 @@ private bool ShouldReconcileMember([NotNull] IAssetMemberNode memberNode, bool r
             return !Equals(localValue, baseValue);
         }
 
-        private bool ShouldReconcileItem([NotNull] IAssetObjectNode node, Index localIndex, Index baseIndex, bool reconcileObjectReference, Dictionary<IGraphNode, Index> nodesToReset)
+        private bool ShouldReconcileItem([NotNull] IAssetObjectNode node, NodeIndex localIndex, NodeIndex baseIndex, bool reconcileObjectReference, Dictionary<IGraphNode, NodeIndex> nodesToReset)
         {
             var localValue = node.Retrieve(localIndex);
             var baseValue = node.BaseNode.Retrieve(baseIndex);
 
             // First rule: if the node is to be reset, we should reconcile.
-            var index = Index.Empty;
+            var index = NodeIndex.Empty;
             if (nodesToReset?.TryGetValue(node, out index) ?? false)
             {
-                return index == Index.Empty || index == localIndex;
+                return index == NodeIndex.Empty || index == localIndex;
             }
 
             // Second rule: if the node is overridden, we shouldn't reconcile.
@@ -1034,7 +1031,7 @@ private bool ShouldReconcileItem([NotNull] IAssetObjectNode node, Index localInd
             return !Equals(localValue, baseValue);
         }
 
-        private static bool ShouldReconcileIndex(Index localIndex, Index baseIndex)
+        private static bool ShouldReconcileIndex(NodeIndex localIndex, NodeIndex baseIndex)
         {
             return !Equals(localIndex, baseIndex);
         }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraphDefinition.cs b/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraphDefinition.cs
index 97fe51a3da..712ae11e12 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraphDefinition.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/AssetPropertyGraphDefinition.cs
@@ -29,7 +29,7 @@ public virtual bool IsMemberTargetObjectReference(IMemberNode member, object val
             return false;
         }
 
-        public virtual bool IsTargetItemObjectReference(IObjectNode collection, Index itemIndex, object value)
+        public virtual bool IsTargetItemObjectReference(IObjectNode collection, NodeIndex itemIndex, object value)
         {
             return false;
         }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/AssetToBaseNodeLinker.cs b/sources/assets/Xenko.Core.Assets.Quantum/AssetToBaseNodeLinker.cs
index ba02eb920f..87f6bfe6da 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/AssetToBaseNodeLinker.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/AssetToBaseNodeLinker.cs
@@ -48,7 +48,13 @@ public override ObjectReference FindTargetReference(IGraphNode sourceNode, IGrap
             var targetIds = CollectionItemIdHelper.GetCollectionItemIds(targetNode.Retrieve());
             var itemId = sourceIds[sourceReference.Index.Value];
             var targetKey = targetIds.GetKey(itemId);
-            return targetReference.FirstOrDefault(x => Equals(x.Index.Value, targetKey));
+            foreach (var targetRef in targetReference)
+            {
+                if (Equals(targetRef.Index.Value, targetKey))
+                    return targetRef;
+            }
+
+            return null;
         }
     }
 }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/IAssetObjectNode.cs b/sources/assets/Xenko.Core.Assets.Quantum/IAssetObjectNode.cs
index 2cf95110d6..a65158d651 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/IAssetObjectNode.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/IAssetObjectNode.cs
@@ -12,11 +12,11 @@ public interface IAssetObjectNode : IAssetNode, IObjectNode
         [NotNull]
         new IAssetMemberNode this[string name] { get; }
 
-        new IAssetObjectNode IndexedTarget(Index index);
+        new IAssetObjectNode IndexedTarget(NodeIndex index);
 
-        void OverrideItem(bool isOverridden, Index index);
+        void OverrideItem(bool isOverridden, NodeIndex index);
 
-        void OverrideKey(bool isOverridden, Index index);
+        void OverrideKey(bool isOverridden, NodeIndex index);
 
         void OverrideDeletedItem(bool isOverridden, ItemId deletedId);
 
@@ -24,38 +24,38 @@ public interface IAssetObjectNode : IAssetNode, IObjectNode
 
         void Restore(object restoredItem, ItemId id);
 
-        void Restore(object restoredItem, Index index, ItemId id);
+        void Restore(object restoredItem, NodeIndex index, ItemId id);
 
-        void RemoveAndDiscard(object item, Index itemIndex, ItemId id);
+        void RemoveAndDiscard(object item, NodeIndex itemIndex, ItemId id);
 
-        bool IsItemInherited(Index index);
+        bool IsItemInherited(NodeIndex index);
 
-        bool IsKeyInherited(Index index);
+        bool IsKeyInherited(NodeIndex index);
 
-        bool IsItemOverridden(Index index);
+        bool IsItemOverridden(NodeIndex index);
 
         bool IsItemOverriddenDeleted(ItemId id);
 
-        bool IsKeyOverridden(Index index);
+        bool IsKeyOverridden(NodeIndex index);
 
-        ItemId IndexToId(Index index);
+        ItemId IndexToId(NodeIndex index);
 
-        bool TryIndexToId(Index index, out ItemId id);
+        bool TryIndexToId(NodeIndex index, out ItemId id);
 
         bool HasId(ItemId id);
 
-        Index IdToIndex(ItemId id);
+        NodeIndex IdToIndex(ItemId id);
 
-        bool TryIdToIndex(ItemId id, out Index index);
+        bool TryIdToIndex(ItemId id, out NodeIndex index);
 
         /// <summary>
         /// Resets the overrides attached to this node at a specific index and to its descendants, recursively.
         /// </summary>
         /// <param name="indexToReset">The index of the override to reset in this node.</param>
-        void ResetOverrideRecursively(Index indexToReset);
+        void ResetOverrideRecursively(NodeIndex indexToReset);
 
-        IEnumerable<Index> GetOverriddenItemIndices();
+        IEnumerable<NodeIndex> GetOverriddenItemIndices();
 
-        IEnumerable<Index> GetOverriddenKeyIndices();
+        IEnumerable<NodeIndex> GetOverriddenKeyIndices();
     }
 }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetBoxedNode.cs b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetBoxedNode.cs
index 5cca96c2ad..8ff3c19d0c 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetBoxedNode.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetBoxedNode.cs
@@ -34,13 +34,13 @@ public AssetBoxedNode([NotNull] INodeBuilder nodeBuilder, object value, Guid gui
         [CanBeNull]
         public IGraphNode GetContent([NotNull] string key) => ex.GetContent(key);
 
-        public void ResetOverrideRecursively() => ex.ResetOverrideRecursively(Index.Empty);
+        public void ResetOverrideRecursively() => ex.ResetOverrideRecursively(NodeIndex.Empty);
 
-        public void ResetOverrideRecursively(Index indexToReset) => ex.ResetOverrideRecursively(indexToReset);
+        public void ResetOverrideRecursively(NodeIndex indexToReset) => ex.ResetOverrideRecursively(indexToReset);
 
-        public void OverrideItem(bool isOverridden, Index index) => ex.OverrideItem(isOverridden, index);
+        public void OverrideItem(bool isOverridden, NodeIndex index) => ex.OverrideItem(isOverridden, index);
 
-        public void OverrideKey(bool isOverridden, Index index) => ex.OverrideKey(isOverridden, index);
+        public void OverrideKey(bool isOverridden, NodeIndex index) => ex.OverrideKey(isOverridden, index);
 
         public void OverrideDeletedItem(bool isOverridden, ItemId deletedId) => ex.OverrideDeletedItem(isOverridden, deletedId);
 
@@ -48,39 +48,39 @@ public AssetBoxedNode([NotNull] INodeBuilder nodeBuilder, object value, Guid gui
 
         public void Restore(object restoredItem, ItemId id) => ex.Restore(restoredItem, id);
 
-        public void Restore(object restoredItem, Index index, ItemId id) => ex.Restore(restoredItem, index, id);
+        public void Restore(object restoredItem, NodeIndex index, ItemId id) => ex.Restore(restoredItem, index, id);
 
-        public void RemoveAndDiscard(object item, Index itemIndex, ItemId id) => ex.RemoveAndDiscard(item, itemIndex, id);
+        public void RemoveAndDiscard(object item, NodeIndex itemIndex, ItemId id) => ex.RemoveAndDiscard(item, itemIndex, id);
 
-        public OverrideType GetItemOverride(Index index) => ex.GetItemOverride(index);
+        public OverrideType GetItemOverride(NodeIndex index) => ex.GetItemOverride(index);
 
-        public OverrideType GetKeyOverride(Index index) => ex.GetKeyOverride(index);
+        public OverrideType GetKeyOverride(NodeIndex index) => ex.GetKeyOverride(index);
 
-        public bool IsItemInherited(Index index) => ex.IsItemInherited(index);
+        public bool IsItemInherited(NodeIndex index) => ex.IsItemInherited(index);
 
-        public bool IsKeyInherited(Index index) => ex.IsKeyInherited(index);
+        public bool IsKeyInherited(NodeIndex index) => ex.IsKeyInherited(index);
 
-        public bool IsItemOverridden(Index index) => ex.IsItemOverridden(index);
+        public bool IsItemOverridden(NodeIndex index) => ex.IsItemOverridden(index);
 
         public bool IsItemOverriddenDeleted(ItemId id) => ex.IsItemOverriddenDeleted(id);
 
-        public bool IsKeyOverridden(Index index) => ex.IsKeyOverridden(index);
+        public bool IsKeyOverridden(NodeIndex index) => ex.IsKeyOverridden(index);
 
-        public IEnumerable<Index> GetOverriddenItemIndices() => ex.GetOverriddenItemIndices();
+        public IEnumerable<NodeIndex> GetOverriddenItemIndices() => ex.GetOverriddenItemIndices();
 
-        public IEnumerable<Index> GetOverriddenKeyIndices() => ex.GetOverriddenKeyIndices();
+        public IEnumerable<NodeIndex> GetOverriddenKeyIndices() => ex.GetOverriddenKeyIndices();
 
-        public ItemId IndexToId(Index index) => ex.IndexToId(index);
+        public ItemId IndexToId(NodeIndex index) => ex.IndexToId(index);
 
-        public bool TryIndexToId(Index index, out ItemId id) => ex.TryIndexToId(index, out id);
+        public bool TryIndexToId(NodeIndex index, out ItemId id) => ex.TryIndexToId(index, out id);
 
         public bool HasId(ItemId id) => ex.HasId(id);
 
-        public Index IdToIndex(ItemId id) => ex.IdToIndex(id);
+        public NodeIndex IdToIndex(ItemId id) => ex.IdToIndex(id);
 
-        public bool TryIdToIndex(ItemId id, out Index index) => ex.TryIdToIndex(id, out index);
+        public bool TryIdToIndex(ItemId id, out NodeIndex index) => ex.TryIdToIndex(id, out index);
 
-        IAssetObjectNode IAssetObjectNode.IndexedTarget(Index index) => (IAssetObjectNode)IndexedTarget(index);
+        IAssetObjectNode IAssetObjectNode.IndexedTarget(NodeIndex index) => (IAssetObjectNode)IndexedTarget(index);
 
         void IAssetObjectNodeInternal.DisconnectOverriddenDeletedItem(ItemId deletedId) => ex.DisconnectOverriddenDeletedItem(deletedId);
 
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetMemberNode.cs b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetMemberNode.cs
index 91a89efbe8..0a3203ad74 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetMemberNode.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetMemberNode.cs
@@ -69,18 +69,18 @@ public void OverrideContent(bool isOverridden)
         /// <inheritdoc/>
         public void ResetOverrideRecursively()
         {
-            PropertyGraph.ResetAllOverridesRecursively(this, Index.Empty);
+            PropertyGraph.ResetAllOverridesRecursively(this, NodeIndex.Empty);
         }
 
         private void ContentChanged(object sender, [NotNull] MemberNodeChangeEventArgs e)
         {
-            // Make sure that we have item ids everywhere we're supposed to.
-            AssetCollectionItemIdHelper.GenerateMissingItemIds(e.Member.Retrieve());
-
             var node = (AssetMemberNode)e.Member;
             if (node.IsNonIdentifiableCollectionContent)
                 return;
 
+            // Make sure that we have item ids everywhere we're supposed to.
+            AssetCollectionItemIdHelper.GenerateMissingItemIds(e.Member.Retrieve());
+
             // Don't update override if propagation from base is disabled.
             if (PropertyGraph?.Container == null || PropertyGraph?.Container?.PropagateChangesFromBase == false)
                 return;
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNode.cs b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNode.cs
index 18ef0a18f2..14498b848e 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNode.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNode.cs
@@ -35,13 +35,13 @@ public AssetObjectNode([NotNull] INodeBuilder nodeBuilder, object value, Guid gu
         [CanBeNull]
         public IGraphNode GetContent([NotNull] string key) => ex.GetContent(key);
 
-        public void ResetOverrideRecursively() => ex.ResetOverrideRecursively(Index.Empty);
+        public void ResetOverrideRecursively() => ex.ResetOverrideRecursively(NodeIndex.Empty);
 
-        public void ResetOverrideRecursively(Index indexToReset) => ex.ResetOverrideRecursively(indexToReset);
+        public void ResetOverrideRecursively(NodeIndex indexToReset) => ex.ResetOverrideRecursively(indexToReset);
 
-        public void OverrideItem(bool isOverridden, Index index) => ex.OverrideItem(isOverridden, index);
+        public void OverrideItem(bool isOverridden, NodeIndex index) => ex.OverrideItem(isOverridden, index);
 
-        public void OverrideKey(bool isOverridden, Index index) => ex.OverrideKey(isOverridden, index);
+        public void OverrideKey(bool isOverridden, NodeIndex index) => ex.OverrideKey(isOverridden, index);
 
         public void OverrideDeletedItem(bool isOverridden, ItemId deletedId) => ex.OverrideDeletedItem(isOverridden, deletedId);
 
@@ -49,39 +49,39 @@ public AssetObjectNode([NotNull] INodeBuilder nodeBuilder, object value, Guid gu
 
         public void Restore(object restoredItem, ItemId id) => ex.Restore(restoredItem, id);
 
-        public void Restore(object restoredItem, Index index, ItemId id) => ex.Restore(restoredItem, index, id);
+        public void Restore(object restoredItem, NodeIndex index, ItemId id) => ex.Restore(restoredItem, index, id);
 
-        public void RemoveAndDiscard(object item, Index itemIndex, ItemId id) => ex.RemoveAndDiscard(item, itemIndex, id);
+        public void RemoveAndDiscard(object item, NodeIndex itemIndex, ItemId id) => ex.RemoveAndDiscard(item, itemIndex, id);
 
-        public OverrideType GetItemOverride(Index index) => ex.GetItemOverride(index);
+        public OverrideType GetItemOverride(NodeIndex index) => ex.GetItemOverride(index);
 
-        public OverrideType GetKeyOverride(Index index) => ex.GetKeyOverride(index);
+        public OverrideType GetKeyOverride(NodeIndex index) => ex.GetKeyOverride(index);
 
-        public bool IsItemInherited(Index index) => ex.IsItemInherited(index);
+        public bool IsItemInherited(NodeIndex index) => ex.IsItemInherited(index);
 
-        public bool IsKeyInherited(Index index) => ex.IsKeyInherited(index);
+        public bool IsKeyInherited(NodeIndex index) => ex.IsKeyInherited(index);
 
-        public bool IsItemOverridden(Index index) => ex.IsItemOverridden(index);
+        public bool IsItemOverridden(NodeIndex index) => ex.IsItemOverridden(index);
 
         public bool IsItemOverriddenDeleted(ItemId id) => ex.IsItemOverriddenDeleted(id);
 
-        public bool IsKeyOverridden(Index index) => ex.IsKeyOverridden(index);
+        public bool IsKeyOverridden(NodeIndex index) => ex.IsKeyOverridden(index);
 
-        public IEnumerable<Index> GetOverriddenItemIndices() => ex.GetOverriddenItemIndices();
+        public IEnumerable<NodeIndex> GetOverriddenItemIndices() => ex.GetOverriddenItemIndices();
 
-        public IEnumerable<Index> GetOverriddenKeyIndices() => ex.GetOverriddenKeyIndices();
+        public IEnumerable<NodeIndex> GetOverriddenKeyIndices() => ex.GetOverriddenKeyIndices();
 
-        public ItemId IndexToId(Index index) => ex.IndexToId(index);
+        public ItemId IndexToId(NodeIndex index) => ex.IndexToId(index);
 
-        public bool TryIndexToId(Index index, out ItemId id) => ex.TryIndexToId(index, out id);
+        public bool TryIndexToId(NodeIndex index, out ItemId id) => ex.TryIndexToId(index, out id);
 
         public bool HasId(ItemId id) => ex.HasId(id);
 
-        public Index IdToIndex(ItemId id) => ex.IdToIndex(id);
+        public NodeIndex IdToIndex(ItemId id) => ex.IdToIndex(id);
 
-        public bool TryIdToIndex(ItemId id, out Index index) => ex.TryIdToIndex(id, out index);
+        public bool TryIdToIndex(ItemId id, out NodeIndex index) => ex.TryIdToIndex(id, out index);
 
-        IAssetObjectNode IAssetObjectNode.IndexedTarget(Index index) => (IAssetObjectNode)IndexedTarget(index);
+        IAssetObjectNode IAssetObjectNode.IndexedTarget(NodeIndex index) => (IAssetObjectNode)IndexedTarget(index);
 
         void IAssetObjectNodeInternal.DisconnectOverriddenDeletedItem(ItemId deletedId) => ex.DisconnectOverriddenDeletedItem(deletedId);
 
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNodeExtended.cs b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNodeExtended.cs
index 97a9557989..827215908f 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNodeExtended.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Internal/AssetObjectNodeExtended.cs
@@ -51,13 +51,13 @@ public IGraphNode GetContent([NotNull] string key)
         }
 
         /// <inheritdoc/>
-        public void ResetOverrideRecursively(Index indexToReset)
+        public void ResetOverrideRecursively(NodeIndex indexToReset)
         {
             OverrideItem(false, indexToReset);
             PropertyGraph.ResetAllOverridesRecursively(node, indexToReset);
         }
 
-        public void OverrideItem(bool isOverridden, Index index)
+        public void OverrideItem(bool isOverridden, NodeIndex index)
         {
             node.NotifyOverrideChanging();
             var id = IndexToId(index);
@@ -65,7 +65,7 @@ public void OverrideItem(bool isOverridden, Index index)
             node.NotifyOverrideChanged();
         }
 
-        public void OverrideKey(bool isOverridden, Index index)
+        public void OverrideKey(bool isOverridden, NodeIndex index)
         {
             node.NotifyOverrideChanging();
             var id = IndexToId(index);
@@ -136,7 +136,7 @@ public void Restore(object restoredItem, ItemId id)
             node.Add(restoredItem);
         }
 
-        public void Restore(object restoredItem, Index index, ItemId id)
+        public void Restore(object restoredItem, NodeIndex index, ItemId id)
         {
             restoringId = id;
             node.Add(restoredItem, index);
@@ -149,7 +149,7 @@ public void Restore(object restoredItem, Index index, ItemId id)
             }
         }
 
-        public void RemoveAndDiscard(object item, Index itemIndex, ItemId id)
+        public void RemoveAndDiscard(object item, NodeIndex itemIndex, ItemId id)
         {
             node.Remove(item, itemIndex);
             CollectionItemIdentifiers ids;
@@ -160,7 +160,7 @@ public void RemoveAndDiscard(object item, Index itemIndex, ItemId id)
             }
         }
 
-        public OverrideType GetItemOverride(Index index)
+        public OverrideType GetItemOverride(NodeIndex index)
         {
             var result = OverrideType.Base;
             ItemId id;
@@ -169,7 +169,7 @@ public OverrideType GetItemOverride(Index index)
             return itemOverrides.TryGetValue(id, out result) ? result : OverrideType.Base;
         }
 
-        public OverrideType GetKeyOverride(Index index)
+        public OverrideType GetKeyOverride(NodeIndex index)
         {
             var result = OverrideType.Base;
             ItemId id;
@@ -178,17 +178,17 @@ public OverrideType GetKeyOverride(Index index)
             return keyOverrides.TryGetValue(id, out result) ? result : OverrideType.Base;
         }
 
-        public bool IsItemInherited(Index index)
+        public bool IsItemInherited(NodeIndex index)
         {
             return BaseNode != null && !IsItemOverridden(index);
         }
 
-        public bool IsKeyInherited(Index index)
+        public bool IsKeyInherited(NodeIndex index)
         {
             return BaseNode != null && !IsKeyOverridden(index);
         }
 
-        public bool IsItemOverridden(Index index)
+        public bool IsItemOverridden(NodeIndex index)
         {
             OverrideType result;
             ItemId id;
@@ -203,7 +203,7 @@ public bool IsItemOverriddenDeleted(ItemId id)
             return IsItemDeleted(id) && itemOverrides.TryGetValue(id, out result) && (result & OverrideType.New) == OverrideType.New;
         }
 
-        public bool IsKeyOverridden(Index index)
+        public bool IsKeyOverridden(NodeIndex index)
         {
             OverrideType result;
             ItemId id;
@@ -212,7 +212,7 @@ public bool IsKeyOverridden(Index index)
             return keyOverrides.TryGetValue(id, out result) && (result & OverrideType.New) == OverrideType.New;
         }
 
-        public IEnumerable<Index> GetOverriddenItemIndices()
+        public IEnumerable<NodeIndex> GetOverriddenItemIndices()
         {
             if (BaseNode == null)
                 yield break;
@@ -235,7 +235,7 @@ public IEnumerable<Index> GetOverriddenItemIndices()
             }
         }
 
-        public IEnumerable<Index> GetOverriddenKeyIndices()
+        public IEnumerable<NodeIndex> GetOverriddenKeyIndices()
         {
             if (BaseNode == null)
                 yield break;
@@ -260,22 +260,22 @@ public IEnumerable<Index> GetOverriddenKeyIndices()
 
         public bool HasId(ItemId id)
         {
-            Index index;
+            NodeIndex index;
             return TryIdToIndex(id, out index);
         }
 
-        public Index IdToIndex(ItemId id)
+        public NodeIndex IdToIndex(ItemId id)
         {
-            Index index;
+            NodeIndex index;
             if (!TryIdToIndex(id, out index)) throw new InvalidOperationException("No Collection item identifier associated to the given collection.");
             return index;
         }
 
-        public bool TryIdToIndex(ItemId id, out Index index)
+        public bool TryIdToIndex(ItemId id, out NodeIndex index)
         {
             if (id == ItemId.Empty)
             {
-                index = Index.Empty;
+                index = NodeIndex.Empty;
                 return true;
             }
 
@@ -283,24 +283,24 @@ public bool TryIdToIndex(ItemId id, out Index index)
             CollectionItemIdentifiers ids;
             if (TryGetCollectionItemIds(collection, out ids))
             {
-                index = new Index(ids.GetKey(id));
+                index = new NodeIndex(ids.GetKey(id));
                 return !index.IsEmpty;
             }
-            index = Index.Empty;
+            index = NodeIndex.Empty;
             return false;
 
         }
 
-        public ItemId IndexToId(Index index)
+        public ItemId IndexToId(NodeIndex index)
         {
             ItemId id;
             if (!TryIndexToId(index, out id)) throw new InvalidOperationException("No Collection item identifier associated to the given collection.");
             return id;
         }
 
-        public bool TryIndexToId(Index index, out ItemId id)
+        public bool TryIndexToId(NodeIndex index, out ItemId id)
         {
-            if (index == Index.Empty)
+            if (index == NodeIndex.Empty)
             {
                 id = ItemId.Empty;
                 return true;
@@ -338,15 +338,31 @@ internal void OnItemChanged(object sender, ItemChangeEventArgs e)
             switch (e.ChangeType)
             {
                 case ContentChangeType.CollectionUpdate:
+                {
+                    if (collectionDescriptor is SetDescriptor setDescriptor)
+                    {
+                        itemIds.Delete(e.OldValue);
+                        object newValue = e.NewValue;
+                        if (newValue == null && !setDescriptor.ElementType.IsNullable())
+                        {
+                            newValue = setDescriptor.ElementType.Default();
+                        }
+                        if (!itemIds.ContainsKey(newValue))
+                        {
+                            var itemId = restoringId != ItemId.Empty ? restoringId : ItemId.New();
+                            itemIds[newValue] = itemId;
+                        }
+                    }
                     break;
+                }
                 case ContentChangeType.CollectionAdd:
                 {
                     // Compute the id we will add for this item
                     var itemId = restoringId != ItemId.Empty ? restoringId : ItemId.New();
                     // Add the id to the proper location (insert or add)
-                    if (collectionDescriptor != null)
+                    if (collectionDescriptor != null && collectionDescriptor.Category != DescriptorCategory.Set)
                     {
-                        if (e.Index == Index.Empty)
+                        if (e.Index == NodeIndex.Empty)
                             throw new InvalidOperationException("An item has been added to a collection that does not have a predictable Add. Consider using NonIdentifiableCollectionItemsAttribute on this collection.");
 
                         itemIds.Insert(e.Index.Int, itemId);
@@ -362,7 +378,14 @@ internal void OnItemChanged(object sender, ItemChangeEventArgs e)
                     var itemId = itemIds[e.Index.Value];
                     // update isOverriding, it should be true only if the item being removed exist in the base.
                     isOverriding = isOverriding && baseNode.HasId(itemId);
-                    removedId = collectionDescriptor != null ? itemIds.DeleteAndShift(e.Index.Int, isOverriding) : itemIds.Delete(e.Index.Value, isOverriding);
+                    if (collectionDescriptor != null && collectionDescriptor.Category != DescriptorCategory.Set)
+                    {
+                        removedId = itemIds.DeleteAndShift(e.Index.Int, isOverriding);
+                    }
+                    else
+                    {
+                        removedId = itemIds.Delete(e.Index.Value, isOverriding);
+                    }
                     break;
                 }
                 default:
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Internal/IAssetObjectNodeInternal.cs b/sources/assets/Xenko.Core.Assets.Quantum/Internal/IAssetObjectNodeInternal.cs
index b6b16e0e14..90896ecec4 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Internal/IAssetObjectNodeInternal.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Internal/IAssetObjectNodeInternal.cs
@@ -11,9 +11,9 @@ namespace Xenko.Core.Assets.Quantum.Internal
     /// </summary>
     internal interface IAssetObjectNodeInternal : IAssetObjectNode, IAssetNodeInternal
     {
-        OverrideType GetItemOverride(Index index);
+        OverrideType GetItemOverride(NodeIndex index);
 
-        OverrideType GetKeyOverride(Index index);
+        OverrideType GetKeyOverride(NodeIndex index);
 
         /// <summary>
         /// Removes the given <see cref="ItemId"/> from the list of overridden deleted items in the underlying <see cref="CollectionItemIdentifiers"/>, but keep
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/AssetGraphVisitorBase.cs b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/AssetGraphVisitorBase.cs
index fa81c7e6f4..8c6c0c83e8 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/AssetGraphVisitorBase.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/AssetGraphVisitorBase.cs
@@ -31,7 +31,7 @@ protected override bool ShouldVisitMemberTarget(IMemberNode member)
         }
 
         /// <inheritdoc/>
-        protected override bool ShouldVisitTargetItem(IObjectNode collectionNode, Index index)
+        protected override bool ShouldVisitTargetItem(IObjectNode collectionNode, NodeIndex index)
         {
             return base.ShouldVisitTargetItem(collectionNode, index) && !PropertyGraphDefinition.IsTargetItemObjectReference(collectionNode, index, collectionNode.Retrieve(index));
         }
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ClearObjectReferenceVisitor.cs b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ClearObjectReferenceVisitor.cs
index 65b4a607a6..8d0734034b 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ClearObjectReferenceVisitor.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ClearObjectReferenceVisitor.cs
@@ -14,7 +14,7 @@ namespace Xenko.Core.Assets.Quantum.Visitors
     public class ClearObjectReferenceVisitor : IdentifiableObjectVisitorBase
     {
         private readonly HashSet<Guid> targetIds;
-        private readonly Func<IGraphNode, Index, bool> shouldClearReference;
+        private readonly Func<IGraphNode, NodeIndex, bool> shouldClearReference;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ClearObjectReferenceVisitor"/> class.
@@ -22,7 +22,7 @@ public class ClearObjectReferenceVisitor : IdentifiableObjectVisitorBase
         /// <param name="propertyGraphDefinition">The <see cref="AssetPropertyGraphDefinition"/> used to analyze object references.</param>
         /// <param name="targetIds">The identifiers of the objects for which to clear references.</param>
         /// <param name="shouldClearReference">A method allowing to select which object reference to clear. If null, all object references to the given id will be cleared.</param>
-        public ClearObjectReferenceVisitor([NotNull] AssetPropertyGraphDefinition propertyGraphDefinition, [NotNull] IEnumerable<Guid> targetIds, [CanBeNull] Func<IGraphNode, Index, bool> shouldClearReference = null)
+        public ClearObjectReferenceVisitor([NotNull] AssetPropertyGraphDefinition propertyGraphDefinition, [NotNull] IEnumerable<Guid> targetIds, [CanBeNull] Func<IGraphNode, NodeIndex, bool> shouldClearReference = null)
             : base(propertyGraphDefinition)
         {
             if (propertyGraphDefinition == null) throw new ArgumentNullException(nameof(propertyGraphDefinition));
@@ -39,7 +39,7 @@ protected override void ProcessIdentifiableMembers(IIdentifiable identifiable, I
 
             if (PropertyGraphDefinition.IsMemberTargetObjectReference(member, identifiable))
             {
-                if (shouldClearReference?.Invoke(member, Index.Empty) ?? true)
+                if (shouldClearReference?.Invoke(member, NodeIndex.Empty) ?? true)
                 {
                     member.Update(null);
                 }
@@ -48,7 +48,7 @@ protected override void ProcessIdentifiableMembers(IIdentifiable identifiable, I
         }
 
         /// <inheritdoc/>
-        protected override void ProcessIdentifiableItems(IIdentifiable identifiable, IObjectNode collection, Index index)
+        protected override void ProcessIdentifiableItems(IIdentifiable identifiable, IObjectNode collection, NodeIndex index)
         {
             if (!targetIds.Contains(identifiable.Id))
                 return;
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ExternalReferenceCollector.cs b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ExternalReferenceCollector.cs
index 2ab911bed8..2d22adb20d 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ExternalReferenceCollector.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/ExternalReferenceCollector.cs
@@ -74,7 +74,7 @@ protected override void ProcessIdentifiableMembers(IIdentifiable identifiable, I
                 internalReferences.Add(identifiable);
         }
 
-        protected override void ProcessIdentifiableItems(IIdentifiable identifiable, IObjectNode collection, Index index)
+        protected override void ProcessIdentifiableItems(IIdentifiable identifiable, IObjectNode collection, NodeIndex index)
         {
             if (propertyGraphDefinition.IsTargetItemObjectReference(collection, index, identifiable))
             {
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/IdentifiableObjectVisitorBase.cs b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/IdentifiableObjectVisitorBase.cs
index a5051af5dd..8b33502474 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Visitors/IdentifiableObjectVisitorBase.cs
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Visitors/IdentifiableObjectVisitorBase.cs
@@ -48,7 +48,7 @@ protected override void VisitItemTargets(IObjectNode node)
         /// <param name="identifiable">The identifiable instance to process.</param>
         /// <param name="collection">The object node representing the collection referencing the identifiable instance.</param>
         /// <param name="index">The index at which the identifiable instance is referenced.</param>
-        protected abstract void ProcessIdentifiableItems([NotNull] IIdentifiable identifiable, IObjectNode collection, Index index);
+        protected abstract void ProcessIdentifiableItems([NotNull] IIdentifiable identifiable, IObjectNode collection, NodeIndex index);
 
         private void CheckAndProcessIdentifiableMember([NotNull] IMemberNode member)
         {
@@ -59,7 +59,7 @@ private void CheckAndProcessIdentifiableMember([NotNull] IMemberNode member)
             ProcessIdentifiableMembers(identifiable, member);
         }
 
-        private void CheckAndProcessIdentifiableItem([NotNull] IObjectNode collection, Index index)
+        private void CheckAndProcessIdentifiableItem([NotNull] IObjectNode collection, NodeIndex index)
         {
             var identifiable = collection.Retrieve(index) as IIdentifiable;
             if (identifiable == null)
diff --git a/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj b/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj
index a871e0b0f8..24dd38e068 100644
--- a/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj
+++ b/sources/assets/Xenko.Core.Assets.Quantum/Xenko.Core.Assets.Quantum.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -13,17 +13,18 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <Reference Include="System.ServiceModel" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="WindowsBase" />
@@ -38,5 +39,5 @@
     <ProjectReference Include="..\Xenko.Core.Assets\Xenko.Core.Assets.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/assets/Xenko.Core.Assets.Tests/Xenko.Core.Assets.Tests.csproj b/sources/assets/Xenko.Core.Assets.Tests/Xenko.Core.Assets.Tests.csproj
index c14dc2f875..74c887e917 100644
--- a/sources/assets/Xenko.Core.Assets.Tests/Xenko.Core.Assets.Tests.csproj
+++ b/sources/assets/Xenko.Core.Assets.Tests/Xenko.Core.Assets.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -75,5 +75,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/assets/Xenko.Core.Assets/Analysis/AssetAnalysis.cs b/sources/assets/Xenko.Core.Assets/Analysis/AssetAnalysis.cs
index 9fc9c0c3cd..0efccb5dfe 100644
--- a/sources/assets/Xenko.Core.Assets/Analysis/AssetAnalysis.cs
+++ b/sources/assets/Xenko.Core.Assets/Analysis/AssetAnalysis.cs
@@ -132,7 +132,7 @@ internal static void UpdateAssetReferences(AssetItem assetItem, IEnumerable<Asse
                 {
                     if (parameters.IsLoggingAssetNotFoundAsError)
                     {
-                        log.Error(package, contentReference, AssetMessageCode.AssetForPackageNotFound, contentReference, packageName);
+                        log.Warning(package, contentReference, AssetMessageCode.AssetForPackageNotFound, contentReference, packageName);
 
                         var packageFound = package.Session.Packages.FirstOrDefault(x => x.FindAsset(contentReference.Location) != null);
                         if (packageFound != null)
diff --git a/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencies.cs b/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencies.cs
index 035356a3ae..baf45ec15e 100644
--- a/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencies.cs
+++ b/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencies.cs
@@ -295,8 +295,8 @@ private void AddLink(ref Dictionary<AssetId, AssetLink> dictionary, AssetLink co
                 dictionary = new Dictionary<AssetId, AssetLink>();
 
             var id = contentLink.Element.Id;
-            if (dictionary.ContainsKey(id))
-                contentLink.Type |= dictionary[id].Type;
+            if (dictionary.TryGetValue(id, out var existingLink))
+                contentLink.Type |= existingLink.Type;
 
             dictionary[id] = contentLink;
         }
diff --git a/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencyManager.cs b/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencyManager.cs
index 079ae1a31d..dd0ebf6425 100644
--- a/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencyManager.cs
+++ b/sources/assets/Xenko.Core.Assets/Analysis/AssetDependencyManager.cs
@@ -700,6 +700,14 @@ public IEnumerable<IContentLink> GetDependencies(AssetItem item)
                 return dependencies.BrokenLinksOut;
             }
 
+            public override void VisitArray(Array array, ArrayDescriptor descriptor)
+            {
+                if (!IsArrayOfPrimitiveType(descriptor))
+                {
+                    base.VisitArray(array, descriptor);
+                }
+            }
+
             public override void VisitObject(object obj, ObjectDescriptor descriptor, bool visitMembers)
             {
                 // references and base
diff --git a/sources/assets/Xenko.Core.Assets/Analysis/AssetReferenceAnalysis.cs b/sources/assets/Xenko.Core.Assets/Analysis/AssetReferenceAnalysis.cs
index 7845f9404a..569b04bb4b 100644
--- a/sources/assets/Xenko.Core.Assets/Analysis/AssetReferenceAnalysis.cs
+++ b/sources/assets/Xenko.Core.Assets/Analysis/AssetReferenceAnalysis.cs
@@ -240,6 +240,53 @@ public override void VisitDictionaryKeyValue(object dictionaryObj, DictionaryDes
                 }
             }
 
+            public override void VisitSetItem(IEnumerable setObject, SetDescriptor descriptor, object item, ITypeDescriptor itemDescriptor)
+            {
+                base.VisitSetItem(setObject, descriptor, item, itemDescriptor);
+                var assetReference = item as AssetReference;
+                var attachedReference = AttachedReferenceManager.GetAttachedReference(item);
+                if (assetReference != null)
+                {
+                    AddLink(assetReference,
+                        (guid, location) =>
+                        {
+                            var link = AssetReference.New(guid ?? assetReference.Id, location);
+                            descriptor.Add(setObject, link);
+                            return link;
+                        });
+                }
+                else if (attachedReference != null)
+                {
+                    AddLink(attachedReference,
+                        (guid, location) =>
+                        {
+                            object link = guid.HasValue && guid.Value != AssetId.Empty ? AttachedReferenceManager.CreateProxyObject(descriptor.ElementType, guid.Value, location) : null;
+                            descriptor.Add(setObject, link);
+                            return link;
+                        });
+                }
+                else if (item is UFile)
+                {
+                    AddLink(item,
+                        (guid, location) =>
+                        {
+                            var link = new UFile(location);
+                            descriptor.Add(setObject, link);
+                            return link;
+                        });
+                }
+                else if (item is UDirectory)
+                {
+                    AddLink(item,
+                        (guid, location) =>
+                        {
+                            var link = new UDirectory(location);
+                            descriptor.Add(setObject, link);
+                            return link;
+                        });
+                }
+            }
+
             public override void VisitObjectMember(object container, ObjectDescriptor containerDescriptor, IMemberDescriptor member, object value)
             {
                 base.VisitObjectMember(container, containerDescriptor, member, value);
diff --git a/sources/assets/Xenko.Core.Assets/Analysis/BuildAssetNode.cs b/sources/assets/Xenko.Core.Assets/Analysis/BuildAssetNode.cs
index d8a43bcc60..c6d9805e9f 100644
--- a/sources/assets/Xenko.Core.Assets/Analysis/BuildAssetNode.cs
+++ b/sources/assets/Xenko.Core.Assets/Analysis/BuildAssetNode.cs
@@ -262,6 +262,14 @@ public IEnumerable<IReference> GetDependencies(AssetItem item)
                 return references;
             }
 
+            public override void VisitArray(Array array, ArrayDescriptor descriptor)
+            {
+                if (!IsArrayOfPrimitiveType(descriptor))
+                {
+                    base.VisitArray(array, descriptor);
+                }
+            }
+
             public override void VisitObject(object obj, ObjectDescriptor descriptor, bool visitMembers)
             {
                 var enteringRuntimeObject = visitedRuntimeObject == null && types.Any(x => x.IsInstanceOfType(obj));
diff --git a/sources/assets/Xenko.Core.Assets/Analysis/CollectionItemIdsAnalysis.cs b/sources/assets/Xenko.Core.Assets/Analysis/CollectionItemIdsAnalysis.cs
index 1e0a1a8c6d..a00fa9edae 100644
--- a/sources/assets/Xenko.Core.Assets/Analysis/CollectionItemIdsAnalysis.cs
+++ b/sources/assets/Xenko.Core.Assets/Analysis/CollectionItemIdsAnalysis.cs
@@ -47,18 +47,24 @@ public override void VisitArray(Array array, ArrayDescriptor descriptor)
                 base.VisitArray(array, descriptor);
             }
 
-            public override void VisitCollection(IEnumerable collection, CollectionDescriptor descriptor)
-            {
-                Fixup(collection);
-                base.VisitCollection(collection, descriptor);
-            }
-
             public override void VisitDictionary(object dictionary, DictionaryDescriptor descriptor)
             {
                 Fixup(dictionary);
                 base.VisitDictionary(dictionary, descriptor);
             }
 
+            public override void VisitSet(IEnumerable set, SetDescriptor descriptor)
+            {
+                Fixup(set);
+                base.VisitSet(set, descriptor);
+            }
+
+            public override void VisitCollection(IEnumerable collection, CollectionDescriptor descriptor)
+            {
+                Fixup(collection);
+                base.VisitCollection(collection, descriptor);
+            }
+
             /// <summary>
             /// Fixes up the <see cref="CollectionItemIdentifiers"/> of a collection by generating new ids if there are any duplicate.
             /// </summary>
diff --git a/sources/assets/Xenko.Core.Assets/AssetImporterParameters.cs b/sources/assets/Xenko.Core.Assets/AssetImporterParameters.cs
index f1156faf3e..abcf5dd772 100644
--- a/sources/assets/Xenko.Core.Assets/AssetImporterParameters.cs
+++ b/sources/assets/Xenko.Core.Assets/AssetImporterParameters.cs
@@ -24,6 +24,7 @@ public class AssetImporterParameters
         /// </summary>
         public AssetImporterParameters()
         {
+            InputParameters = new PropertyCollection();
             SelectedOutputTypes = new Dictionary<Type, bool>();
         }
 
@@ -54,6 +55,12 @@ public AssetImporterParameters(IEnumerable<Type> supportedTypes) : this()
             }
         }
 
+        /// <summary>
+        /// Gets the import input parameters.
+        /// </summary>
+        /// <value>The import input parameters.</value>
+        public PropertyCollection InputParameters { get; private set; }
+
         /// <summary>
         /// Gets the selected output types.
         /// </summary>
diff --git a/sources/assets/Xenko.Core.Assets/AssetItemExtensions.cs b/sources/assets/Xenko.Core.Assets/AssetItemExtensions.cs
index 34e2ddc671..636cdf441a 100644
--- a/sources/assets/Xenko.Core.Assets/AssetItemExtensions.cs
+++ b/sources/assets/Xenko.Core.Assets/AssetItemExtensions.cs
@@ -29,7 +29,7 @@ public static string GetProjectInclude([NotNull] this AssetItem assetItem)
         [NotNull]
         public static UFile GetGeneratedAbsolutePath([NotNull] this AssetItem assetItem)
         {
-            return new UFile(new UFile(assetItem.FullPath).GetFullPathWithoutExtension() + ".cs");
+            return new UFile(assetItem.FullPath + ".cs");
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ public static UFile GetGeneratedAbsolutePath([NotNull] this AssetItem assetItem)
         /// <returns></returns>
         public static string GetGeneratedInclude([NotNull] this AssetItem assetItem)
         {
-            return Path.ChangeExtension(GetProjectInclude(assetItem), ".cs");
+            return GetProjectInclude(assetItem) + ".cs";
         }
     }
 }
diff --git a/sources/assets/Xenko.Core.Assets/AssetReferenceDataSerializer.cs b/sources/assets/Xenko.Core.Assets/AssetReferenceDataSerializer.cs
index 3c2b204e81..9504032086 100644
--- a/sources/assets/Xenko.Core.Assets/AssetReferenceDataSerializer.cs
+++ b/sources/assets/Xenko.Core.Assets/AssetReferenceDataSerializer.cs
@@ -17,7 +17,7 @@ public override void Serialize(ref AssetReference assetReference, ArchiveMode mo
             if (mode == ArchiveMode.Serialize)
             {
                 stream.Write(assetReference.Id);
-                stream.Write(assetReference.Location);
+                stream.Write(assetReference.Location ?? "");
             }
             else
             {
diff --git a/sources/assets/Xenko.Core.Assets/AssetRegistry.cs b/sources/assets/Xenko.Core.Assets/AssetRegistry.cs
index c87cd88e10..2ef2c4c726 100644
--- a/sources/assets/Xenko.Core.Assets/AssetRegistry.cs
+++ b/sources/assets/Xenko.Core.Assets/AssetRegistry.cs
@@ -11,6 +11,7 @@
 using Xenko.Core.Serialization.Contents;
 using Xenko.Core.VisualStudio;
 using Xenko.Core.Yaml.Serialization;
+using Xenko.Core.Serialization;
 
 namespace Xenko.Core.Assets
 {
@@ -289,6 +290,14 @@ public static IReadOnlyList<Type> GetAssetTypes(Type contentType)
             lock (RegistryLock)
             {
                 var currentType = contentType;
+                if (UrlReferenceHelper.IsGenericUrlReferenceType(currentType))
+                {
+                    currentType = UrlReferenceHelper.GetTargetContentType(currentType);
+                }
+                else if (UrlReferenceHelper.IsUrlReferenceType(contentType))
+                {
+                    return GetPublicTypes().Where(t => IsAssetType(t)).ToList();
+                }
                 List<Type> assetTypes;
                 return ContentToAssetTypes.TryGetValue(currentType, out assetTypes) ? new List<Type>(assetTypes) : new List<Type>();
             }
diff --git a/sources/assets/Xenko.Core.Assets/CollectionIdGenerator.cs b/sources/assets/Xenko.Core.Assets/CollectionIdGenerator.cs
index 6fa4a1cffa..497a93eaf1 100644
--- a/sources/assets/Xenko.Core.Assets/CollectionIdGenerator.cs
+++ b/sources/assets/Xenko.Core.Assets/CollectionIdGenerator.cs
@@ -66,7 +66,11 @@ public override void VisitArray(Array array, ArrayDescriptor descriptor)
                     itemIds.Add(i, ItemId.New());
                 }
             }
-            base.VisitArray(array, descriptor);
+
+            if (!IsArrayOfPrimitiveType(descriptor))
+            {
+                base.VisitArray(array, descriptor);
+            }
         }
 
         public override void VisitCollection(IEnumerable collection, CollectionDescriptor descriptor)
@@ -80,7 +84,11 @@ public override void VisitCollection(IEnumerable collection, CollectionDescripto
                     itemIds.Add(i, ItemId.New());
                 }
             }
-            base.VisitCollection(collection, descriptor);
+
+            if (!descriptor.ElementType.IsValueType)
+            {
+                base.VisitCollection(collection, descriptor);
+            }
         }
 
         public override void VisitDictionary(object dictionary, DictionaryDescriptor descriptor)
@@ -93,7 +101,20 @@ public override void VisitDictionary(object dictionary, DictionaryDescriptor des
                     itemIds.Add(element.Key, ItemId.New());
                 }
             }
-            base.VisitDictionary(dictionary, descriptor);
+        }
+
+        public override void VisitSet(IEnumerable set, SetDescriptor descriptor)
+        {
+            if (ShouldGenerateItemIdCollection(set))
+            {
+                IEnumerator enumerator = (set as IEnumerable).GetEnumerator();
+                var itemIds = CollectionItemIdHelper.GetCollectionItemIds(set);
+                while (enumerator.MoveNext())
+                {
+                    itemIds.Add(enumerator.Current, ItemId.New());
+                }
+            }
+            base.VisitSet(set, descriptor);
         }
 
         private bool ShouldGenerateItemIdCollection(object collection)
diff --git a/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerContext.cs b/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerContext.cs
index f370201c4f..a6eb0899f0 100644
--- a/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerContext.cs
+++ b/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerContext.cs
@@ -21,6 +21,11 @@ public class AssetCompilerContext : CompilerContext
         /// </summary>
         public string BuildConfiguration { get; set; }
 
+        /// <summary>
+        /// Gets or sets the entry package this build was called upon.
+        /// </summary>
+        public Package Package { get; set; }
+
         /// <summary>
         /// Gets or sets the target platform for compiler is being used for.
         /// </summary>
diff --git a/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerRegistry.cs b/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerRegistry.cs
index 7035e94e9e..3d7d7155dd 100644
--- a/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerRegistry.cs
+++ b/sources/assets/Xenko.Core.Assets/Compiler/AssetCompilerRegistry.cs
@@ -181,27 +181,34 @@ private void RegisterAssembly(Assembly assembly)
         private void RegisterCompilersFromAssembly(Assembly assembly)
         {
             // Process Asset types.
-            foreach (var type in assembly.GetTypes())
+            try
             {
-                // Only process Asset types
-                if (!typeof(IAssetCompiler).IsAssignableFrom(type) || !type.IsClass)
-                    continue;
+                foreach (var type in assembly.GetTypes())
+                {
+                    // Only process Asset types
+                    if (!typeof(IAssetCompiler).IsAssignableFrom(type) || !type.IsClass)
+                        continue;
 
-                // Asset compiler
-                var compilerAttribute = type.GetCustomAttribute<AssetCompilerAttribute>();
+                    // Asset compiler
+                    var compilerAttribute = type.GetCustomAttribute<AssetCompilerAttribute>();
 
-                if (compilerAttribute == null) // no compiler attribute in this asset
-                    continue;
+                    if (compilerAttribute == null) // no compiler attribute in this asset
+                        continue;
 
-                try
-                {
-                    ProcessAttribute(compilerAttribute, type);
-                }
-                catch (Exception ex)
-                {
-                    log.Error($"Unable to instantiate compiler [{compilerAttribute.TypeName}]", ex);
+                    try
+                    {
+                        ProcessAttribute(compilerAttribute, type);
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error($"Unable to instantiate compiler [{compilerAttribute.TypeName}]", ex);
+                    }
                 }
             }
+            catch (Exception e)
+            {
+                log.Warning($"Unable to register asset compilers from assembly [{assembly}]");
+            }
         }
 
         private void UnregisterAssembly(Assembly assembly)
diff --git a/sources/assets/Xenko.Core.Assets/Package.cs b/sources/assets/Xenko.Core.Assets/Package.cs
index f08c5c1ccb..14ae4ed7e6 100644
--- a/sources/assets/Xenko.Core.Assets/Package.cs
+++ b/sources/assets/Xenko.Core.Assets/Package.cs
@@ -118,7 +118,7 @@ public Package()
         /// </summary>
         /// <value><c>true</c> if this package is a system package; otherwise, <c>false</c>.</value>
         [DataMemberIgnore]
-        public bool IsSystem { get; internal set; }
+        public bool IsSystem => !(Container is SolutionProject);
 
         /// <summary>
         /// Gets or sets the metadata associated with this package.
@@ -274,6 +274,23 @@ public bool IsDirty
         [DataMemberIgnore]
         public string RootNamespace { get; private set; }
 
+        [DataMemberIgnore]
+        public bool IsImplicitProject
+        {
+            get
+            {
+                // To keep in sync with LoadProject() .csproj
+                // Note: Meta is ignored since it is supposedly "read-only" from csproj
+                return (AssetFolders.Count == 1 && AssetFolders.First().Path == "Assets"
+                    && ResourceFolders.Count == 1 && ResourceFolders.First() == "Resources"
+                    && OutputGroupDirectories.Count == 0
+                    && ExplicitFolders.Count == 0
+                    && Bundles.Count == 0
+                    && RootAssets.Count == 0
+                    && TemplateFolders.Count == 0);
+            }
+        }
+
         /// <summary>
         /// Adds an existing project to this package.
         /// </summary>
@@ -612,6 +629,14 @@ public static PackageContainer LoadProject(ILogger log, string filePath)
                 }
                 else
                 {
+                    // Try to get version from NuGet folder
+                    var path = new UFile(filePath);
+                    var nuspecPath = UPath.Combine(path.GetFullDirectory().GetParent(), new UFile(path.GetFileNameWithoutExtension() + ".nuspec"));
+                    if (path.GetFullDirectory().GetDirectoryName() == "xenko" && File.Exists(nuspecPath)
+                        && PackageVersion.TryParse(path.GetFullDirectory().GetParent().GetDirectoryName(), out var packageVersion))
+                    {
+                        package.Meta.Version = packageVersion;
+                    }
                     return new StandalonePackage(package);
                 }
             }
@@ -1240,7 +1265,7 @@ private static void FindAssetsInProject(ICollection<PackageLoadingAssetFile> lis
             if (package.IsSystem) return;
 
             var project = package.Container as SolutionProject;
-            if (project == null || project.FullPath == null || project.Type != ProjectType.Library)
+            if (project == null || project.FullPath == null)
                 return;
 
             string defaultNamespace;
diff --git a/sources/assets/Xenko.Core.Assets/PackageCollection.cs b/sources/assets/Xenko.Core.Assets/PackageCollection.cs
index 90ffa99fbd..30d5399a53 100644
--- a/sources/assets/Xenko.Core.Assets/PackageCollection.cs
+++ b/sources/assets/Xenko.Core.Assets/PackageCollection.cs
@@ -141,7 +141,10 @@ public void CopyTo(Package[] array, int arrayIndex)
         public bool Remove(Package item)
         {
             if (item == null) throw new ArgumentNullException("item");
-            return packages.Remove(item);
+            var success = packages.Remove(item);
+            if (success)
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, item));
+            return success;
         }
 
         private void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
diff --git a/sources/assets/Xenko.Core.Assets/PackageLoadParameters.cs b/sources/assets/Xenko.Core.Assets/PackageLoadParameters.cs
index 474e42902d..0857371e98 100644
--- a/sources/assets/Xenko.Core.Assets/PackageLoadParameters.cs
+++ b/sources/assets/Xenko.Core.Assets/PackageLoadParameters.cs
@@ -42,6 +42,7 @@ public static bool ShouldUpgrade(PackageUpgradeRequestedAnswer answer)
         public PackageLoadParameters()
         {
             LoadMissingDependencies = true;
+            RegisterPackageAssemblies = false;
             LoadAssemblyReferences = true;
             AutoCompileProjects = true;
             AutoLoadTemporaryAssets = true;
@@ -55,6 +56,11 @@ public PackageLoadParameters()
         /// <value><c>true</c> if [load missing dependencies]; otherwise, <c>false</c>.</value>
         public bool LoadMissingDependencies { get; set; }
 
+        /// <summary>
+        /// Register the package's assemblies from the project.
+        /// </summary>
+        public bool RegisterPackageAssemblies { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether [load assembly references].
         /// </summary>
diff --git a/sources/assets/Xenko.Core.Assets/PackageSession.Dependencies.cs b/sources/assets/Xenko.Core.Assets/PackageSession.Dependencies.cs
index 836e3d0b82..ed48d58ab9 100644
--- a/sources/assets/Xenko.Core.Assets/PackageSession.Dependencies.cs
+++ b/sources/assets/Xenko.Core.Assets/PackageSession.Dependencies.cs
@@ -6,7 +6,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyModel;
 using NuGet.Commands;
+using NuGet.Common;
 using NuGet.DependencyResolver;
 using NuGet.LibraryModel;
 using NuGet.ProjectModel;
@@ -20,7 +22,7 @@ namespace Xenko.Core.Assets
 {
     partial class PackageSession
     {
-        private async Task<RestoreTargetGraph> GenerateRestoreGraph(ILogger log, string projectName, string projectPath)
+        private async Task<RestoreTargetGraph> GenerateRestoreGraph(Core.Diagnostics.ILogger log, string projectName, string projectPath)
         {
             var dgFile = await VSProjectHelper.GenerateRestoreGraphFile(log, projectPath);
             var dgProvider = new DependencyGraphSpecRequestProvider(new RestoreCommandProvidersCache(), dgFile);
@@ -52,13 +54,7 @@ private async Task<RestoreTargetGraph> GenerateRestoreGraph(ILogger log, string
 
                 var requestProject = request.Request.Project;
 
-                var projectRange = new LibraryRange()
-                {
-                    Name = projectName,
-                    VersionRange = new NuGet.Versioning.VersionRange(requestProject.Version),
-                    TypeConstraint = LibraryDependencyTarget.Project | LibraryDependencyTarget.ExternalProject
-                };
-
+                var projectRange = new LibraryRange(projectName, new NuGet.Versioning.VersionRange(requestProject.Version), LibraryDependencyTarget.Project | LibraryDependencyTarget.ExternalProject);
                 var framework = requestProject.TargetFrameworks.First();
                 var graphs = new List<GraphNode<RemoteResolveResult>>
                 {
@@ -73,7 +69,7 @@ await walker.WalkAsync(
             }
         }
 
-        private async Task PreLoadPackageDependencies(ILogger log, SolutionProject project, PackageLoadParameters loadParameters)
+        private async Task PreLoadPackageDependencies(Core.Diagnostics.ILogger log, SolutionProject project, PackageLoadParameters loadParameters)
         {
             if (log == null) throw new ArgumentNullException(nameof(log));
             if (project == null) throw new ArgumentNullException(nameof(project));
@@ -271,37 +267,7 @@ private async Task PreLoadPackageDependencies(ILogger log, SolutionProject proje
                 }
             }
 
-            project.FlattenedDependencies.Clear();
-            project.DirectDependencies.Clear();
-            var projectAssetsJsonPath = Path.Combine(project.FullPath.GetFullDirectory(), @"obj", LockFileFormat.AssetsFileName);
-            if (File.Exists(projectAssetsJsonPath))
-            {
-                var format = new LockFileFormat();
-                var projectAssets = format.Read(projectAssetsJsonPath);
-
-                // Update dependencies
-                foreach (var library in projectAssets.Libraries)
-                {
-                    project.FlattenedDependencies.Add(new Dependency(library.Name, library.Version.ToPackageVersion(), library.Type == "project" ? DependencyType.Project : DependencyType.Package) { MSBuildProject = library.Type == "project" ? library.MSBuildProject : null });
-                }
-
-                foreach (var projectReference in projectAssets.PackageSpec.RestoreMetadata.TargetFrameworks.First().ProjectReferences)
-                {
-                    var projectName = new UFile(projectReference.ProjectUniqueName).GetFileNameWithoutExtension();
-                    project.DirectDependencies.Add(new DependencyRange(projectName, null, DependencyType.Project) { MSBuildProject = projectReference.ProjectPath });
-                }
-
-                foreach (var dependency in projectAssets.PackageSpec.TargetFrameworks.First().Dependencies)
-                {
-                    if (dependency.AutoReferenced)
-                        continue;
-                    project.DirectDependencies.Add(new DependencyRange(dependency.Name, dependency.LibraryRange.VersionRange.ToPackageVersionRange(), DependencyType.Package));
-                }
-
-                // Load dependency (if external)
-
-                // Compute output path
-            }
+            UpdateDependencies(project, true, true);
 
             // 1. Load store package
             foreach (var projectDependency in project.FlattenedDependencies)
@@ -324,7 +290,7 @@ private async Task PreLoadPackageDependencies(ILogger log, SolutionProject proje
                     if (file != null && File.Exists(file))
                     {
                         // Load package
-                        var loadedProject = LoadProject(log, file, true, loadParameters);
+                        var loadedProject = LoadProject(log, file, loadParameters);
                         loadedProject.Package.Meta.Name = projectDependency.Name;
                         loadedProject.Package.Meta.Version = projectDependency.Version;
                         Projects.Add(loadedProject);
@@ -365,10 +331,100 @@ private async Task PreLoadPackageDependencies(ILogger log, SolutionProject proje
             }
         }
 
+        public class ConsoleLogger : NuGet.Common.ILogger
+        {
+            public void Log(LogLevel level, string data)
+            {
+                WriteDebugLine($"NuGet [{level}]: {data}");
+            }
+
+            public void Log(NuGet.Common.ILogMessage message)
+            {
+                Log(message.Level, message.Message);
+            }
+
+            public Task LogAsync(LogLevel level, string data)
+            {
+                Log(level, data);
+                return Task.CompletedTask;
+            }
+
+            public Task LogAsync(NuGet.Common.ILogMessage message)
+            {
+                Log(message);
+                return Task.CompletedTask;
+            }
+
+            public void LogDebug(string data) => Log(LogLevel.Debug, data);
+            public void LogVerbose(string data) => Log(LogLevel.Verbose, data);
+            public void LogInformation(string data) => Log(LogLevel.Information, data);
+            public void LogMinimal(string data) => Log(LogLevel.Minimal, data);
+            public void LogWarning(string data) => Log(LogLevel.Warning, data);
+            public void LogError(string data) => Log(LogLevel.Error, data);
+            public void LogInformationSummary(string data) => Log(LogLevel.Information, data);
+        }
+
+        public static void WriteDebugLine(string line)
+        {
+            System.Diagnostics.Debug.WriteLine(line);
+            Console.WriteLine(line);
+            Console.Error.WriteLine(line);
+        }
+
+        public static void UpdateDependencies(SolutionProject project, bool directDependencies, bool flattenedDependencies)
+        {
+            if (flattenedDependencies)
+                project.FlattenedDependencies.Clear();
+            if (directDependencies)
+                project.DirectDependencies.Clear();
+            var projectAssetsJsonPath = Path.Combine(project.FullPath.GetFullDirectory(), @"obj", LockFileFormat.AssetsFileName);
+            if (File.Exists(projectAssetsJsonPath))
+            {
+                var format = new LockFileFormat();
+                ConsoleLogger consoleLogger = new ConsoleLogger();
+                var projectAssets = format.Read(projectAssetsJsonPath, consoleLogger);
+
+                // Update dependencies
+                if (flattenedDependencies)
+                {
+                    foreach (var library in projectAssets.Libraries)
+                    {
+                        var projectDependency = new Dependency(library.Name, library.Version.ToPackageVersion(), library.Type == "project" ? DependencyType.Project : DependencyType.Package) { MSBuildProject = library.Type == "project" ? library.MSBuildProject : null };
+                        project.FlattenedDependencies.Add(projectDependency);
+                        // Try to resolve package if already loaded
+                        projectDependency.Package = project.Session.Packages.Find(projectDependency);
+                    }
+                }
+
+                if (directDependencies)
+                {
+                    PackageSpec ps = projectAssets.PackageSpec;
+
+                    if (ps?.RestoreMetadata?.TargetFrameworks != null)
+                    {
+                        foreach (var projectReference in ps.RestoreMetadata.TargetFrameworks.First().ProjectReferences)
+                        {
+                            var projectName = new UFile(projectReference.ProjectUniqueName).GetFileNameWithoutExtension();
+                            project.DirectDependencies.Add(new DependencyRange(projectName, null, DependencyType.Project) { MSBuildProject = projectReference.ProjectPath });
+                        }
+
+                        foreach (var dependency in ps.TargetFrameworks.First().Dependencies)
+                        {
+                            if (dependency.AutoReferenced)
+                                continue;
+                            project.DirectDependencies.Add(new DependencyRange(dependency.Name, dependency.LibraryRange.VersionRange.ToPackageVersionRange(), DependencyType.Package));
+                        }
+                    } else {
+                        WriteDebugLine("Warning: " + projectAssets.Path + " couldn't find PackageSpec.");
+                    }
+                }
+            }
+        }
+
         private static RemoteWalkContext CreateRemoteWalkContext(RestoreRequest request, RestoreCollectorLogger logger)
         {
             var context = new RemoteWalkContext(
-                request.CacheContext,
+                request.CacheContext, request.PackageSourceMapping,
                 logger);
 
             foreach (var provider in request.DependencyProviders.LocalProviders)
diff --git a/sources/assets/Xenko.Core.Assets/PackageSession.cs b/sources/assets/Xenko.Core.Assets/PackageSession.cs
index 09923994c3..d2d790cf92 100644
--- a/sources/assets/Xenko.Core.Assets/PackageSession.cs
+++ b/sources/assets/Xenko.Core.Assets/PackageSession.cs
@@ -114,7 +114,7 @@ public void Save(ILogger log, PackageSaveParameters saveParameters = null)
                         {
                             try
                             {
-                                File.Delete(file.FullPath);
+                                Microsoft.VisualBasic.FileIO.FileSystem.DeleteFile(file.FullPath, Microsoft.VisualBasic.FileIO.UIOption.OnlyErrorDialogs, Microsoft.VisualBasic.FileIO.RecycleOption.SendToRecycleBin);
                             }
                             catch (Exception ex)
                             {
@@ -156,7 +156,9 @@ public void Save(ILogger log, PackageSaveParameters saveParameters = null)
                         }
 
                         //check if the item is already there, this is possible when saving the first time when creating from a template
-                        if (project.Items.All(x => x.EvaluatedInclude != projectInclude))
+                        // Note: if project has auto items, no need to add it
+                        if (project.Items.All(x => x.EvaluatedInclude != projectInclude)
+                            && (string.Compare(project.GetPropertyValue("EnableDefaultCompileItems"), "true", true, CultureInfo.InvariantCulture) != 0))
                         {
                             var generatorAsset = projectAsset as IProjectFileGeneratorAsset;
                             if (generatorAsset != null)
@@ -181,9 +183,7 @@ public void Save(ILogger log, PackageSaveParameters saveParameters = null)
                             }
                             else
                             {
-                                // Note: if project has auto items, no need to add it
-                                if (string.Compare(project.GetPropertyValue("EnableDefaultCompileItems"), "true", true, CultureInfo.InvariantCulture) != 0)
-                                    project.AddItem("Compile", projectInclude);
+                                project.AddItem("Compile", projectInclude);
                             }
                         }
                     }
@@ -365,7 +365,9 @@ private void DirectDependencies_CollectionChanged(object sender, NotifyCollectio
                     switch (dependency.Type)
                     {
                         case DependencyType.Package:
-                            msbuildProject.AddItem("PackageReference", dependency.Name, new[] { new KeyValuePair<string, string>("Version", dependency.VersionRange.ToString()) });
+                            msbuildProject.AddItem("PackageReference", dependency.Name, new[] { new KeyValuePair<string, string>("Version", dependency.VersionRange.ToString()) })
+                                // Make sure Version is a XML attribute rather than a XML child.
+                                .ForEach(packageReference => packageReference.Metadata.ForEach(metadata => metadata.Xml.ExpressedAsAttribute = true));
                             isProjectDirty = true;
                             break;
                         case DependencyType.Project:
@@ -385,6 +387,11 @@ private void DirectDependencies_CollectionChanged(object sender, NotifyCollectio
 
         protected override void SavePackage()
         {
+            // Check if our project is still implicit one
+            // Note: we only allow transition from implicit to explicit (otherwise we would have to delete file, etc.)
+            if (IsImplicitProject && Package.IsDirty && !Package.IsImplicitProject)
+                IsImplicitProject = false;
+
             if (!IsImplicitProject)
                 base.SavePackage();
         }
@@ -630,7 +637,7 @@ public PackageContainer AddExistingProject(UFile projectPath, ILogger logger, Pa
                 // Enable reference analysis caching during loading
                 AssetReferenceAnalysis.EnableCaching = true;
 
-                project = LoadProject(logger, projectPath.ToWindowsPath(), false, loadParametersArg);
+                project = LoadProject(logger, projectPath.ToWindowsPath(), loadParametersArg);
                 Projects.Add(project);
 
                 package = project.Package;
@@ -707,7 +714,7 @@ public AssetItem FindAssetFromProxyObject(object proxyObject)
             return reference != null ? (FindAsset(reference.Id) ?? FindAsset(reference.Url)) : null;
         }
 
-        private PackageContainer LoadProject(ILogger log, string filePath, bool isSystem, PackageLoadParameters loadParameters = null)
+        private PackageContainer LoadProject(ILogger log, string filePath, PackageLoadParameters loadParameters = null)
         {
             var project = Package.LoadProject(log, filePath);
 
@@ -729,7 +736,6 @@ private PackageContainer LoadProject(ILogger log, string filePath, bool isSystem
             }
 
             var package = project.Package;
-            package.IsSystem = isSystem;
 
             // If the package doesn't have a meta name, fix it here (This is supposed to be done in the above disabled analysis - but we still need to do it!)
             if (string.IsNullOrWhiteSpace(package.Meta.Name) && package.FullPath != null)
@@ -802,7 +808,7 @@ public static void Load(string filePath, PackageSessionResult sessionResult, Pac
                         {
                             if (vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharp || vsProject.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharpNewSystem)
                             {
-                                var project = (SolutionProject)session.LoadProject(sessionResult, vsProject.FullPath, false, loadParameters);
+                                var project = (SolutionProject)session.LoadProject(sessionResult, vsProject.FullPath, loadParameters);
                                 project.VSProject = vsProject;
                                 session.Projects.Add(project);
 
@@ -822,7 +828,7 @@ public static void Load(string filePath, PackageSessionResult sessionResult, Pac
                     else if (Path.GetExtension(filePath).ToLowerInvariant() == ".csproj"
                         || Path.GetExtension(filePath).ToLowerInvariant() == Package.PackageFileExtension)
                     {
-                        var project = session.LoadProject(sessionResult, filePath, false, loadParameters);
+                        var project = session.LoadProject(sessionResult, filePath, loadParameters);
                         session.Projects.Add(project);
                         firstProject = project as SolutionProject;
                     }
@@ -895,6 +901,13 @@ public static PackageSessionResult Load(string filePath, PackageLoadParameters l
         public void LoadMissingReferences(ILogger log, PackageLoadParameters loadParameters = null)
         {
             LoadMissingDependencies(log, loadParameters);
+            if (log != null && (loadParameters?.RegisterPackageAssemblies ?? false))
+            {
+                foreach (var package in Packages.ToList())
+                {
+                    package.LoadAssemblies(log, loadParameters);
+                }
+            }
             LoadMissingAssets(log, Packages.ToList(), loadParameters);
         }
 
@@ -997,7 +1010,7 @@ public void Save(ILogger log, PackageSaveParameters saveParameters = null)
                     // Return immediately if there is any error
                     if (loggerResult.HasErrors)
                         return;
-       
+
                     //batch projects
                     var vsProjs = new Dictionary<string, Microsoft.Build.Evaluation.Project>();
 
@@ -1037,7 +1050,7 @@ public void Save(ILogger log, PackageSaveParameters saveParameters = null)
                                     {
                                         var generatedAbsolutePath = assetItem.GetGeneratedAbsolutePath().ToWindowsPath();
 
-                                        File.Delete(generatedAbsolutePath);
+                                        Microsoft.VisualBasic.FileIO.FileSystem.DeleteFile(generatedAbsolutePath, Microsoft.VisualBasic.FileIO.UIOption.OnlyErrorDialogs, Microsoft.VisualBasic.FileIO.RecycleOption.SendToRecycleBin);
 
                                         var generatedInclude = assetItem.GetGeneratedInclude();
                                         var generatedItem = project.Items.FirstOrDefault(x => (x.ItemType == "Compile" || x.ItemType == "None") && x.EvaluatedInclude == generatedInclude);
@@ -1049,7 +1062,8 @@ public void Save(ILogger log, PackageSaveParameters saveParameters = null)
                                 }
                             }
 
-                            File.Delete(assetPath);
+                            if (File.Exists(assetPath))
+                                Microsoft.VisualBasic.FileIO.FileSystem.DeleteFile(assetPath, Microsoft.VisualBasic.FileIO.UIOption.OnlyErrorDialogs, Microsoft.VisualBasic.FileIO.RecycleOption.SendToRecycleBin);
                         }
                         catch (Exception ex)
                         {
@@ -1325,7 +1339,7 @@ private void OnAssetDirtyChanged(AssetItem asset, bool oldValue, bool newValue)
             AssetDirtyChanged?.Invoke(asset, oldValue, newValue);
         }
 
-        private Package PreLoadPackage(ILogger log, string filePath, bool isSystemPackage, PackageLoadParameters loadParameters)
+        private Package PreLoadPackage(ILogger log, string filePath, PackageLoadParameters loadParameters)
         {
             if (log == null) throw new ArgumentNullException(nameof(log));
             if (filePath == null) throw new ArgumentNullException(nameof(filePath));
@@ -1335,7 +1349,6 @@ private Package PreLoadPackage(ILogger log, string filePath, bool isSystemPackag
             {
                 // Load the package without loading any assets
                 var package = Package.LoadRaw(log, filePath);
-                package.IsSystem = isSystemPackage;
 
                 // Convert UPath to absolute (Package only)
                 // Removed for now because it is called again in PackageSession.LoadAssembliesAndAssets (and running it twice result in dirty package)
diff --git a/sources/assets/Xenko.Core.Assets/PackageSessionHelper.Solution.cs b/sources/assets/Xenko.Core.Assets/PackageSessionHelper.Solution.cs
index 2d021ef040..e083b9fc14 100644
--- a/sources/assets/Xenko.Core.Assets/PackageSessionHelper.Solution.cs
+++ b/sources/assets/Xenko.Core.Assets/PackageSessionHelper.Solution.cs
@@ -67,30 +67,23 @@ public static async Task<PackageVersion> GetPackageVersion(string fullPath)
                     if (project.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharp || project.TypeGuid == VisualStudio.KnownProjectTypeGuid.CSharpNewSystem)
                     {
                         var projectPath = project.FullPath;
-                        var packagePath = Path.ChangeExtension(projectPath, Package.PackageFileExtension);
-                        if (File.Exists(packagePath))
-                        {
-                            var projectAssetsJsonPath = Path.Combine(Path.GetDirectoryName(projectPath), @"obj", LockFileFormat.AssetsFileName);
+                        var projectAssetsJsonPath = Path.Combine(Path.GetDirectoryName(projectPath), @"obj", LockFileFormat.AssetsFileName);
 #if !XENKO_LAUNCHER
-                            if (!File.Exists(projectAssetsJsonPath))
-                            {
-                                var log = new LoggerResult();
-                                await VSProjectHelper.RestoreNugetPackages(log, projectPath);
-                            }
+                        if (!File.Exists(projectAssetsJsonPath))
+                        {
+                            var log = new LoggerResult();
+                            await VSProjectHelper.RestoreNugetPackages(log, projectPath);
+                        }
 #endif
-                            if (File.Exists(projectAssetsJsonPath))
+                        if (File.Exists(projectAssetsJsonPath))
+                        {
+                            var format = new LockFileFormat();
+                            var projectAssets = format.Read(projectAssetsJsonPath);
+                            foreach (var library in projectAssets.Libraries)
                             {
-                                if (File.Exists(projectAssetsJsonPath))
+                                if ((library.Type == "package" || library.Type == "project") && library.Name == "Xenko.Engine")
                                 {
-                                    var format = new LockFileFormat();
-                                    var projectAssets = format.Read(projectAssetsJsonPath);
-                                    foreach (var library in projectAssets.Libraries)
-                                    {
-                                        if (library.Type == "package" && library.Name == "Xenko.Engine")
-                                        {
-                                            return new PackageVersion((string)library.Version.ToString());
-                                        }
-                                    }
+                                    return new PackageVersion((string)library.Version.ToString());
                                 }
                             }
                         }
diff --git a/sources/assets/Xenko.Core.Assets/PackageStore.cs b/sources/assets/Xenko.Core.Assets/PackageStore.cs
index 2d9110c90a..9a82e1069e 100644
--- a/sources/assets/Xenko.Core.Assets/PackageStore.cs
+++ b/sources/assets/Xenko.Core.Assets/PackageStore.cs
@@ -4,13 +4,13 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 
 using Xenko.Core;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.IO;
 using System.Threading.Tasks;
 using Xenko.Core.Packages;
+using System.Reflection;
 
 namespace Xenko.Core.Assets
 {
@@ -86,27 +86,31 @@ public UFile GetPackageWithFileName(string packageName)
         /// <param name="allowUnlisted">if set to <c>true</c> [allow unlisted].</param>
         /// <returns>A location on the disk to the specified package or null if not found.</returns>
         /// <exception cref="System.ArgumentNullException">packageName</exception>
-        public UFile GetPackageFileName(string packageName, PackageVersionRange versionRange = null, ConstraintProvider constraintProvider = null, bool allowPreleaseVersion = true, bool allowUnlisted = false)
+        public UFile GetPackageFileName(string packageName, PackageVersionRange versionRange = null, ConstraintProvider constraintProvider = null, bool allowPreleaseVersion = true, bool allowUnlisted = false, bool searchXenko = false)
         {
             if (packageName == null) throw new ArgumentNullException(nameof(packageName));
 
             var package = store.FindLocalPackage(packageName, versionRange, constraintProvider, allowPreleaseVersion, allowUnlisted);
 
-            // If package was not found, 
-            if (package != null)
+            UDirectory packageRoot = package != null ? (UDirectory)store.GetRealPath(package) : (UDirectory)(store.InstallPath + "/" + packageName + "/" + versionRange.MinVersion.ToString());
+            var packageFilename = new UFile(packageName + Package.PackageFileExtension);
+
+            // First look for xkpkg at package root
+            var packageFile = UPath.Combine(packageRoot, packageFilename);
+            if (File.Exists(packageFile))
+                return packageFile;
+
+            // Then look for xkpkg inside xenko subfolder
+            packageFile = UPath.Combine(UPath.Combine(packageRoot, (UDirectory)"xenko"), packageFilename);
+            if (File.Exists(packageFile))
+                return packageFile;
+
+            if (searchXenko)
             {
-                var packageRoot = (UDirectory)store.GetRealPath(package);
-                var packageFilename = new UFile(packageName + Package.PackageFileExtension);
-
-                // First look for xkpkg at package root
-                var packageFile = UPath.Combine(packageRoot, packageFilename);
-                if (File.Exists(packageFile))
-                    return packageFile;
-
-                // Then look for xkpkg inside xenko subfolder
-                packageFile = UPath.Combine(UPath.Combine(packageRoot, (UDirectory)"xenko"), packageFilename);
-                if (File.Exists(packageFile))
-                    return packageFile;
+                // finally, look in executing assembly structure
+                var path = Path.GetFullPath(Path.Combine(Assembly.GetExecutingAssembly().Location, @"..\..\..\..\..\"));
+                var files = Directory.GetFiles(path, packageFilename.ToString(), SearchOption.AllDirectories);
+                if (files.Length > 0) return new UFile(files[0]);
             }
 
             return null;
diff --git a/sources/assets/Xenko.Core.Assets/Reflection/AbstractObjectInstantiator.cs b/sources/assets/Xenko.Core.Assets/Reflection/AbstractObjectInstantiator.cs
index 015a5f95b5..bd6931720c 100644
--- a/sources/assets/Xenko.Core.Assets/Reflection/AbstractObjectInstantiator.cs
+++ b/sources/assets/Xenko.Core.Assets/Reflection/AbstractObjectInstantiator.cs
@@ -38,7 +38,7 @@ public static object CreateConcreteInstance([NotNull] Type baseType)
                     var asmName = new AssemblyName($"ConcreteObject_{Guid.NewGuid():N}");
 
                     // Create assembly (in memory)
-                    var asmBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(asmName, AssemblyBuilderAccess.Run);
+                    var asmBuilder = AssemblyBuilder.DefineDynamicAssembly(asmName, AssemblyBuilderAccess.Run);
                     var moduleBuilder = asmBuilder.DefineDynamicModule("DynamicModule");
 
                     // Define type
@@ -46,7 +46,7 @@ public static object CreateConcreteInstance([NotNull] Type baseType)
                     InitializeTypeBuilderFromType(typeBuilder, baseType);
 
                     // Create type
-                    constructedType = typeBuilder.CreateType();
+                    constructedType = typeBuilder.CreateTypeInfo();
                     ConstructedTypes.Add(baseType, constructedType);
 
                 }
diff --git a/sources/assets/Xenko.Core.Assets/Reflection/CollectionItemIdentifiers.cs b/sources/assets/Xenko.Core.Assets/Reflection/CollectionItemIdentifiers.cs
index 74eba8a200..f6a37ae53a 100644
--- a/sources/assets/Xenko.Core.Assets/Reflection/CollectionItemIdentifiers.cs
+++ b/sources/assets/Xenko.Core.Assets/Reflection/CollectionItemIdentifiers.cs
@@ -134,7 +134,12 @@ public void Validate(bool isList)
         public object GetKey(ItemId itemId)
         {
             // TODO: add indexing by guid to avoid O(n)
-            return keyToIdMap.SingleOrDefault(x => x.Value == itemId).Key;
+            foreach (var kvp in keyToIdMap)
+            {
+                if (kvp.Value == itemId)
+                    return kvp.Key;
+            }
+            return null;
         }
 
         public void CloneInto(CollectionItemIdentifiers target, IReadOnlyDictionary<object, object> referenceTypeClonedKeys)
diff --git a/sources/assets/Xenko.Core.Assets/Serializers/UrlReferenceSerializer.cs b/sources/assets/Xenko.Core.Assets/Serializers/UrlReferenceSerializer.cs
new file mode 100644
index 0000000000..ee78bcb0cb
--- /dev/null
+++ b/sources/assets/Xenko.Core.Assets/Serializers/UrlReferenceSerializer.cs
@@ -0,0 +1,51 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core.Serialization;
+using Xenko.Core.Yaml;
+using Xenko.Core.Yaml.Events;
+using Xenko.Core.Yaml.Serialization;
+
+namespace Xenko.Core.Assets.Serializers
+{
+    /// <summary>
+    /// A Yaml serializer for <see cref="UrlReference"/>
+    /// </summary>
+    [YamlSerializerFactory(YamlAssetProfile.Name)]
+    internal class UrlReferenceSerializer : AssetScalarSerializerBase
+    {
+        public override bool CanVisit(Type type)
+        {
+            return UrlReferenceHelper.IsUrlReferenceType(type);
+        }
+
+        public override object ConvertFrom(ref ObjectContext context, Scalar fromScalar)
+        {
+            if (!AssetReference.TryParse(fromScalar.Value, out var guid, out var location))
+            {
+                throw new YamlException(fromScalar.Start, fromScalar.End, "Unable to decode url reference [{0}]. Expecting format GUID:LOCATION".ToFormat(fromScalar.Value));
+            }
+
+            var urlReference = UrlReferenceHelper.CreateReference(context.Descriptor.Type, guid, location.FullPath);
+
+            return urlReference;
+        }
+
+        public override string ConvertTo(ref ObjectContext objectContext)
+        {
+            if (objectContext.Instance is UrlReference urlReference)
+            {
+                var attachedReference = AttachedReferenceManager.GetAttachedReference(urlReference);
+
+                if (attachedReference != null)
+                {
+                    return $"{attachedReference.Id}:{urlReference.Url}";
+                }
+            }
+
+            throw new YamlException($"Unable to extract url reference from object [{objectContext.Instance}]");
+        }
+
+
+    }
+}
diff --git a/sources/assets/Xenko.Core.Assets/Templates/TemplateManager.cs b/sources/assets/Xenko.Core.Assets/Templates/TemplateManager.cs
index c9351b8d0e..baca81d969 100644
--- a/sources/assets/Xenko.Core.Assets/Templates/TemplateManager.cs
+++ b/sources/assets/Xenko.Core.Assets/Templates/TemplateManager.cs
@@ -59,7 +59,7 @@ public static void Unregister(ITemplateGenerator generator)
         /// <returns>A sequence containing all registered template descriptions.</returns>
         public static IEnumerable<TemplateDescription> FindTemplates(PackageSession session = null)
         {
-            var packages = session?.Packages.Concat(ExtraPackages) ?? ExtraPackages;
+            var packages = session?.Packages.Concat(ExtraPackages).Distinct(DistinctPackagePathComparer.Default) ?? ExtraPackages;
             // TODO this will not work if the same package has different versions
             return packages.SelectMany(package => package.Templates).OrderBy(tpl => tpl.Order).ThenBy(tpl => tpl.Name).ToList();
         }
@@ -118,5 +118,29 @@ public static ITemplateGenerator<TParameters> FindTemplateGenerator<TParameters>
             }
             return null;
         }
+
+        private class DistinctPackagePathComparer : IEqualityComparer<Package>
+        {
+            private static DistinctPackagePathComparer defaultInstance;
+            public static DistinctPackagePathComparer Default
+            {
+                get
+                {
+                    if (defaultInstance == null)
+                        defaultInstance = new DistinctPackagePathComparer();
+                    return defaultInstance;
+                }
+            }
+
+            public bool Equals(Package x, Package y)
+            {
+                return x.FullPath == y.FullPath;
+            }
+
+            public int GetHashCode(Package obj)
+            {
+                return obj.FullPath.GetHashCode();
+            }
+        }
     }
 }
diff --git a/sources/assets/Xenko.Core.Assets/Tracking/SourceFilesCollector.cs b/sources/assets/Xenko.Core.Assets/Tracking/SourceFilesCollector.cs
index 9da8d8297e..eb67ba4f07 100644
--- a/sources/assets/Xenko.Core.Assets/Tracking/SourceFilesCollector.cs
+++ b/sources/assets/Xenko.Core.Assets/Tracking/SourceFilesCollector.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Xenko.Core.Assets.Visitors;
@@ -41,6 +42,14 @@ public Dictionary<MemberPath, UFile> GetSourceMembers(Asset asset)
             return result;
         }
 
+        public override void VisitArray(Array array, ArrayDescriptor descriptor)
+        {
+            if (!IsArrayOfPrimitiveType(descriptor))
+            {
+                base.VisitArray(array, descriptor);
+            }
+        }
+
         public override void VisitObjectMember(object container, ObjectDescriptor containerDescriptor, IMemberDescriptor member, object value)
         {
             if (sourceFiles != null)
diff --git a/sources/assets/Xenko.Core.Assets/Tracking/SourceHashesHelper.cs b/sources/assets/Xenko.Core.Assets/Tracking/SourceHashesHelper.cs
index 0e95c58f66..90267173a7 100644
--- a/sources/assets/Xenko.Core.Assets/Tracking/SourceHashesHelper.cs
+++ b/sources/assets/Xenko.Core.Assets/Tracking/SourceHashesHelper.cs
@@ -112,7 +112,14 @@ internal class SourceHashesDynamicMember : DynamicMemberDescriptorBase
         {
             public const int DefaultOrder = int.MaxValue;
 
-            public static readonly SourceHashesDynamicMember Default = new SourceHashesDynamicMember { ShouldSerialize = x => { var asset = x as Asset; return asset != null && TryGet(asset, AbsoluteSourceHashesKey)?.Count > 0; } };
+            public static readonly SourceHashesDynamicMember Default = new SourceHashesDynamicMember
+            {
+                ShouldSerialize = (x, parentTypeMemberDesc) =>
+                {
+                    var asset = x as Asset;
+                    return asset != null && TryGet(asset, AbsoluteSourceHashesKey)?.Count > 0;
+                }
+            };
 
             static SourceHashesDynamicMember()
             {
diff --git a/sources/assets/Xenko.Core.Assets/UnloadableObjectRemover.cs b/sources/assets/Xenko.Core.Assets/UnloadableObjectRemover.cs
index 51858b7fa0..6364dbd289 100644
--- a/sources/assets/Xenko.Core.Assets/UnloadableObjectRemover.cs
+++ b/sources/assets/Xenko.Core.Assets/UnloadableObjectRemover.cs
@@ -89,6 +89,13 @@ public override void VisitDictionaryKeyValue(object dictionary, DictionaryDescri
             //base.VisitDictionaryKeyValue(dictionary, descriptor, key, keyDescriptor, value, valueDescriptor);
         }
 
+        public override void VisitSetItem(IEnumerable set, SetDescriptor descriptor, object item, ITypeDescriptor itemDescriptor)
+        {
+            if (ProcessObject(item, itemDescriptor.Type)) return;
+
+            Visit(item, itemDescriptor);
+        }
+
         private bool ProcessObject(object obj, Type expectedType)
         {
             var unloadable = obj as IUnloadable;
diff --git a/sources/assets/Xenko.Core.Assets/VSProjectHelper.cs b/sources/assets/Xenko.Core.Assets/VSProjectHelper.cs
index 2397353729..76ec0fdef0 100644
--- a/sources/assets/Xenko.Core.Assets/VSProjectHelper.cs
+++ b/sources/assets/Xenko.Core.Assets/VSProjectHelper.cs
@@ -162,25 +162,14 @@ public static async Task RestoreNugetPackages(ILogger logger, string projectPath
         {
             await Task.Run(() =>
             {
-                var pc = new Microsoft.Build.Evaluation.ProjectCollection();
-
-                try
-                {
-                    var parameters = new BuildParameters(pc)
-                    {
-                        Loggers = new[] { new LoggerRedirect(logger, true) } //Instance of ILogger instantiated earlier
-                    };
-
-                    // Run a MSBuild /t:Restore <projectfile>
-                    var request = new BuildRequestData(projectPath, new Dictionary<string, string>(), null, new[] { "Restore" }, null, BuildRequestDataFlags.None);
-
-                    mainBuildManager.Build(parameters, request);
-                }
-                finally
-                {
-                    pc.UnloadAllProjects();
-                    pc.Dispose();
-                }
+                System.Diagnostics.Process process = new System.Diagnostics.Process();
+                System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
+                startInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
+                startInfo.FileName = "dotnet";
+                startInfo.Arguments = "restore " + projectPath;
+                process.StartInfo = startInfo;
+                process.Start();
+                process.WaitForExit();
             });
         }
 
diff --git a/sources/assets/Xenko.Core.Assets/Visitors/AssetMemberVisitorBase.cs b/sources/assets/Xenko.Core.Assets/Visitors/AssetMemberVisitorBase.cs
index e3da4ce423..a4a6a43707 100644
--- a/sources/assets/Xenko.Core.Assets/Visitors/AssetMemberVisitorBase.cs
+++ b/sources/assets/Xenko.Core.Assets/Visitors/AssetMemberVisitorBase.cs
@@ -50,6 +50,14 @@ public override void VisitDictionaryKeyValue(object dictionary, DictionaryDescri
             }
         }
 
+        public override void VisitSetItem(IEnumerable set, SetDescriptor descriptor, object item, ITypeDescriptor itemDescriptor)
+        {
+            if (CurrentPath.Match(MemberPath))
+                VisitAssetMember(item, itemDescriptor);
+            else
+                base.VisitSetItem(set, descriptor, item, itemDescriptor);
+        }
+
         /// <inheritdoc />
         public override void VisitObject(object obj, ObjectDescriptor descriptor, bool visitMembers)
         {
diff --git a/sources/assets/Xenko.Core.Assets/Xenko.Core.Assets.csproj b/sources/assets/Xenko.Core.Assets/Xenko.Core.Assets.csproj
index 05e29a06e1..0ba891dc8c 100644
--- a/sources/assets/Xenko.Core.Assets/Xenko.Core.Assets.csproj
+++ b/sources/assets/Xenko.Core.Assets/Xenko.Core.Assets.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -13,11 +13,14 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="System.ServiceModel" />
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.8" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -50,5 +53,5 @@
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="..\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/assets/Xenko.Core.Assets/Yaml/AssetObjectSerializerBackend.cs b/sources/assets/Xenko.Core.Assets/Yaml/AssetObjectSerializerBackend.cs
index c391959436..8f97b05478 100644
--- a/sources/assets/Xenko.Core.Assets/Yaml/AssetObjectSerializerBackend.cs
+++ b/sources/assets/Xenko.Core.Assets/Yaml/AssetObjectSerializerBackend.cs
@@ -30,7 +30,7 @@ public AssetObjectSerializerBackend(ITypeDescriptorFactory typeDescriptorFactory
 
         public override object ReadMemberValue(ref ObjectContext objectContext, IMemberDescriptor memberDescriptor, object memberValue, Type memberType)
         {
-            var memberObjectContext = new ObjectContext(objectContext.SerializerContext, memberValue, objectContext.SerializerContext.FindTypeDescriptor(memberType));
+            var memberObjectContext = new ObjectContext(objectContext.SerializerContext, memberValue, objectContext.SerializerContext.FindTypeDescriptor(memberType), objectContext.Descriptor, memberDescriptor);
 
             var member = memberDescriptor as MemberDescriptorBase;
             if (member != null && objectContext.Settings.Attributes.GetAttribute<NonIdentifiableCollectionItemsAttribute>(member.MemberInfo) != null)
@@ -48,7 +48,7 @@ public override object ReadMemberValue(ref ObjectContext objectContext, IMemberD
 
         public override void WriteMemberValue(ref ObjectContext objectContext, IMemberDescriptor memberDescriptor, object memberValue, Type memberType)
         {
-            var memberObjectContext = new ObjectContext(objectContext.SerializerContext, memberValue, objectContext.SerializerContext.FindTypeDescriptor(memberType))
+            var memberObjectContext = new ObjectContext(objectContext.SerializerContext, memberValue, objectContext.SerializerContext.FindTypeDescriptor(memberType), objectContext.Descriptor, memberDescriptor)
             {
                 ScalarStyle = memberDescriptor.ScalarStyle,
             };
@@ -153,9 +153,9 @@ public override void WriteCollectionItem(ref ObjectContext objectContext, object
         {
             var path = GetCurrentPath(ref objectContext, true);
             path.PushIndex(index);
-            var itemObjectcontext = new ObjectContext(objectContext.SerializerContext, item, objectContext.SerializerContext.FindTypeDescriptor(itemType));
-            SetCurrentPath(ref itemObjectcontext, path);
-            WriteYaml(ref itemObjectcontext);
+            var itemObjectContext = new ObjectContext(objectContext.SerializerContext, item, objectContext.SerializerContext.FindTypeDescriptor(itemType));
+            SetCurrentPath(ref itemObjectContext, path);
+            WriteYaml(ref itemObjectContext);
         }
 
         public override object ReadDictionaryKey(ref ObjectContext objectContext, Type keyType)
@@ -285,9 +285,9 @@ public override void WriteDictionaryValue(ref ObjectContext objectContext, objec
             {
                 path.PushIndex(key);
             }
-            var itemObjectcontext = new ObjectContext(objectContext.SerializerContext, value, objectContext.SerializerContext.FindTypeDescriptor(valueType));
-            SetCurrentPath(ref itemObjectcontext, path);
-            WriteYaml(ref itemObjectcontext);
+            var itemObjectContext = new ObjectContext(objectContext.SerializerContext, value, objectContext.SerializerContext.FindTypeDescriptor(valueType));
+            SetCurrentPath(ref itemObjectContext, path);
+            WriteYaml(ref itemObjectContext);
         }
 
         public override bool ShouldSerialize(IMemberDescriptor member, ref ObjectContext objectContext)
diff --git a/sources/assets/Xenko.Core.Assets/Yaml/CollectionWithIdsSerializer.cs b/sources/assets/Xenko.Core.Assets/Yaml/CollectionWithIdsSerializer.cs
index 4d474d12a3..54994be83e 100644
--- a/sources/assets/Xenko.Core.Assets/Yaml/CollectionWithIdsSerializer.cs
+++ b/sources/assets/Xenko.Core.Assets/Yaml/CollectionWithIdsSerializer.cs
@@ -124,7 +124,14 @@ protected override void TransformAfterDeserialization(IDictionary container, ITy
             while (enumerator.MoveNext())
             {
                 collectionDescriptor.Add(targetCollection, enumerator.Value);
-                identifier.Add(i, (ItemId)enumerator.Key);
+                if (targetDescriptor.Category == DescriptorCategory.Set)
+                {
+                    identifier.Add(enumerator.Value, (ItemId)enumerator.Key);
+                }
+                else
+                {
+                    identifier.Add(i, (ItemId)enumerator.Key);
+                }
                 ++i;
             }
             if (deletedItems != null)
diff --git a/sources/assets/Xenko.Core.Assets/Yaml/UnloadableObjectInstantiator.cs b/sources/assets/Xenko.Core.Assets/Yaml/UnloadableObjectInstantiator.cs
index 7a3c9a21f4..ade3402f52 100644
--- a/sources/assets/Xenko.Core.Assets/Yaml/UnloadableObjectInstantiator.cs
+++ b/sources/assets/Xenko.Core.Assets/Yaml/UnloadableObjectInstantiator.cs
@@ -39,7 +39,7 @@ public static IUnloadable CreateUnloadableObject(Type baseType, string typeName,
                     var asmName = new AssemblyName($"YamlProxy_{Guid.NewGuid():N}");
 
                     // Create assembly (in memory)
-                    var asmBuilder = AppDomain.CurrentDomain.DefineDynamicAssembly(asmName, AssemblyBuilderAccess.Run);
+                    var asmBuilder = AssemblyBuilder.DefineDynamicAssembly(asmName, AssemblyBuilderAccess.Run);
                     var moduleBuilder = asmBuilder.DefineDynamicModule("DynamicModule");
 
                     // Create type
@@ -107,7 +107,7 @@ public static IUnloadable CreateUnloadableObject(Type baseType, string typeName,
                     // User-registered callbacks
                     ProcessProxyType?.Invoke(baseType, typeBuilder);
 
-                    proxyType = typeBuilder.CreateType();
+                    proxyType = typeBuilder.CreateTypeInfo();
                     proxyTypes.Add(baseType, proxyType);
                 }
             }
diff --git a/sources/assets/Xenko.Core.Assets/Yaml/YamlAssetPath.cs b/sources/assets/Xenko.Core.Assets/Yaml/YamlAssetPath.cs
index be17232b3d..121ade26a3 100644
--- a/sources/assets/Xenko.Core.Assets/Yaml/YamlAssetPath.cs
+++ b/sources/assets/Xenko.Core.Assets/Yaml/YamlAssetPath.cs
@@ -240,17 +240,40 @@ public MemberPath ToMemberPath(object root)
                         var typeDescriptor = TypeDescriptorFactory.Default.Find(currentObject.GetType());
                         if (typeDescriptor is ArrayDescriptor arrayDescriptor)
                         {
-                            if (!(item.Value is int)) throw new InvalidOperationException($"The path [{ToString()}] contains non-integer index on an array.");
-                            memberPath.Push(arrayDescriptor, (int)item.Value);
-                            currentObject = arrayDescriptor.GetValue(currentObject, (int)item.Value);
+                            if (!(item.Value is int))
+                            {
+                                throw new InvalidOperationException($"The path [{ToString()}] contains non-integer index on an array.");
+                            }
+                            int value = (int)item.Value;
+                            memberPath.Push(arrayDescriptor, value);
+                            currentObject = arrayDescriptor.GetValue(currentObject, value);
                         }
-                        if (typeDescriptor is CollectionDescriptor collectionDescriptor)
+                        else if (typeDescriptor is CollectionDescriptor collectionDescriptor)
                         {
-                            if (!(item.Value is int)) throw new InvalidOperationException($"The path [{ToString()}] contains non-integer index on a collection.");
-                            memberPath.Push(collectionDescriptor, (int)item.Value);
-                            currentObject = collectionDescriptor.GetValue(currentObject, (int)item.Value);
+                            if (collectionDescriptor is SetDescriptor setDescriptor)
+                            {
+                                if (item.Value == null && !collectionDescriptor.ElementType.IsNullable())
+                                {
+                                    throw new InvalidOperationException($"The path [{ToString()}] contains a null item on a set.");
+                                }
+                                if (!setDescriptor.Contains(currentObject, item.Value))
+                                {
+                                    throw new InvalidOperationException($"The path [{ToString()}] item doesn't exsit on a set.");
+                                }
+                                memberPath.Push(setDescriptor, item.Value);
+                                currentObject = item.Value;
+                            }
+                            else
+                            {
+                                if (!(item.Value is int))
+                                {
+                                    throw new InvalidOperationException($"The path [{ToString()}] contains non-integer index on a collection.");
+                                }
+                                memberPath.Push(collectionDescriptor, item.Value);
+                                currentObject = collectionDescriptor.GetValue(currentObject, item.Value);
+                            }
                         }
-                        if (typeDescriptor is DictionaryDescriptor dictionaryDescriptor)
+                        else if (typeDescriptor is DictionaryDescriptor dictionaryDescriptor)
                         {
                             if (item.Value == null) throw new InvalidOperationException($"The path [{ToString()}] contains a null key on an dictionary.");
                             memberPath.Push(dictionaryDescriptor, item.Value);
@@ -266,16 +289,30 @@ public MemberPath ToMemberPath(object root)
                         if (typeDescriptor is ArrayDescriptor arrayDescriptor)
                         {
                             if (!(key is int)) throw new InvalidOperationException($"The path [{ToString()}] contains a non-valid item id on an array.");
-                            memberPath.Push(arrayDescriptor, (int)key);
-                            currentObject = arrayDescriptor.GetValue(currentObject, (int)key);
+                            int keyInt = (int)key;
+                            memberPath.Push(arrayDescriptor, keyInt);
+                            currentObject = arrayDescriptor.GetValue(currentObject, keyInt);
                         }
-                        if (typeDescriptor is CollectionDescriptor collectionDescriptor)
+                        else if (typeDescriptor is CollectionDescriptor collectionDescriptor)
                         {
-                            if (!(key is int)) throw new InvalidOperationException($"The path [{ToString()}] contains a non-valid item id on a collection.");
-                            memberPath.Push(collectionDescriptor, (int)key);
-                            currentObject = collectionDescriptor.GetValue(currentObject, (int)key);
+                            if (collectionDescriptor.Category == DescriptorCategory.Set)
+                            {
+                                if (item.Value == null && !collectionDescriptor.ElementType.IsNullable())
+                                {
+                                    throw new InvalidOperationException($"The path [{ToString()}] contains a null item on a set.");
+                                }
+                            }
+                            else
+                            {
+                                if (!(key is int))
+                                {
+                                    throw new InvalidOperationException($"The path [{ToString()}] contains a non-valid item id on a collection.");
+                                }
+                            }
+                            memberPath.Push(collectionDescriptor, key);
+                            currentObject = collectionDescriptor.GetValue(currentObject, key);
                         }
-                        if (typeDescriptor is DictionaryDescriptor dictionaryDescriptor)
+                        else if (typeDescriptor is DictionaryDescriptor dictionaryDescriptor)
                         {
                             if (key == null) throw new InvalidOperationException($"The path [{ToString()}] contains a non-valid item id on an dictionary.");
                             memberPath.Push(dictionaryDescriptor, key);
@@ -319,16 +356,21 @@ public static YamlAssetPath FromMemberPath([NotNull] MemberPath path, object roo
                         clone.Push(arrayItem.Descriptor, arrayItem.Index);
                         index = arrayItem.Index;
                     }
-                    if (item is MemberPath.CollectionPathItem collectionItem)
+                    else if (item is MemberPath.CollectionPathItem collectionItem)
                     {
                         clone.Push(collectionItem.Descriptor, collectionItem.Index);
                         index = collectionItem.Index;
                     }
-                    if (item is MemberPath.DictionaryPathItem dictionaryItem)
+                    else if (item is MemberPath.DictionaryPathItem dictionaryItem)
                     {
                         clone.Push(dictionaryItem.Descriptor, dictionaryItem.Key);
                         index = dictionaryItem.Key;
                     }
+                    else if (item is MemberPath.SetPathItem setItem)
+                    {
+                        clone.Push(setItem.Descriptor, setItem.Index);
+                        index = setItem.Index;
+                    }
                     if (!CollectionItemIdHelper.TryGetCollectionItemIds(clone.GetValue(root), out CollectionItemIdentifiers ids))
                     {
                         result.PushIndex(index);
diff --git a/sources/assets/Xenko.Core.Packages/NugetStore.cs b/sources/assets/Xenko.Core.Packages/NugetStore.cs
index afa290b392..d3e462be83 100644
--- a/sources/assets/Xenko.Core.Packages/NugetStore.cs
+++ b/sources/assets/Xenko.Core.Packages/NugetStore.cs
@@ -41,7 +41,7 @@ namespace Xenko.Core.Packages
     /// </summary>
     public class NugetStore : INugetDownloadProgress
     {
-        public const string MainExecutables = @"lib\net472\Xenko.GameStudio.exe,Bin\Windows\Xenko.GameStudio.exe,Bin\Windows-Direct3D11\Xenko.GameStudio.exe";
+        public const string MainExecutables = @"lib\net48\Xenko.GameStudio.exe,Bin\Windows\Xenko.GameStudio.exe,Bin\Windows-Direct3D11\Xenko.GameStudio.exe";
         public const string PrerequisitesInstaller = @"Bin\Prerequisites\install-prerequisites.exe";
 
         public const string DefaultPackageSource = "https://packages.xenko.com/nuget";
@@ -339,16 +339,13 @@ public async Task<NugetLocalPackage> InstallPackage(string packageId, PackageVer
                             FilePath = projectPath,
                             Dependencies = new List<LibraryDependency>()
                             {
-                                new LibraryDependency
-                                {
-                                    LibraryRange = new LibraryRange(packageId, new VersionRange(version.ToNuGetVersion()), LibraryDependencyTarget.Package),
-                                }
+                                new LibraryDependency(new LibraryRange(packageId, new VersionRange(version.ToNuGetVersion()), LibraryDependencyTarget.Package))
                             },
                             TargetFrameworks =
                             {
                                 new TargetFrameworkInformation
                                 {
-                                    FrameworkName = NuGetFramework.Parse("net472"),
+                                    FrameworkName = NuGetFramework.Parse("net48"),
                                 }
                             },
                             RestoreMetadata = new ProjectRestoreMetadata
@@ -358,7 +355,7 @@ public async Task<NugetLocalPackage> InstallPackage(string packageId, PackageVer
                                 ProjectStyle = ProjectStyle.PackageReference,
                                 ProjectUniqueName = projectPath,
                                 OutputPath = Path.Combine(Path.GetTempPath(), $"XenkoLauncher-{packageId}-{version.ToString()}"),
-                                OriginalTargetFrameworks = new[] { "net472" },
+                                OriginalTargetFrameworks = new[] { "net48" },
                                 ConfigFilePaths = settings.GetConfigFilePaths(),
                                 PackagesPath = installPath,
                                 Sources = SettingsUtility.GetEnabledSources(settings).ToList(),
diff --git a/sources/assets/Xenko.Core.Packages/Xenko.Core.Packages.csproj b/sources/assets/Xenko.Core.Packages/Xenko.Core.Packages.csproj
index 1fe27715d5..81e7f42542 100644
--- a/sources/assets/Xenko.Core.Packages/Xenko.Core.Packages.csproj
+++ b/sources/assets/Xenko.Core.Packages/Xenko.Core.Packages.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -8,8 +8,8 @@
     <XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NuGet.Protocol" Version="5.0.0" />
-    <PackageReference Include="NuGet.PackageManagement" Version="5.0.0" />
+    <PackageReference Include="NuGet.Protocol" Version="6.14.0" />
+    <PackageReference Include="NuGet.PackageManagement" Version="6.14.0" />
     <PackageReference Include="System.IO.Compression" Version="4.3.0" />
     <Reference Include="System.Core" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -38,5 +38,5 @@
     </None>
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/Builder.cs b/sources/buildengine/Xenko.Core.BuildEngine.Common/Builder.cs
index 6412a2a8d5..f200a5be6a 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Common/Builder.cs
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Common/Builder.cs
@@ -117,7 +117,7 @@ public enum Mode
         private Scheduler scheduler;
 
         private readonly CommandIOMonitor ioMonitor;
-        private readonly List<BuildThreadMonitor> threadMonitors = new List<BuildThreadMonitor>();
+        private readonly List<IBuildThreadMonitor> currentThreadMonitors = new List<IBuildThreadMonitor>();
 
         /// <summary>
         /// A map containing results of each commands, indexed by command hashes. When the builder is running, this map if filled with the result of the commands of the current execution.
@@ -297,7 +297,7 @@ private void ScheduleBuildStep(BuilderContext builderContext, BuildStep instigat
 
                     buildStep.ExecutionId = microThread.Id;
 
-                    foreach (var threadMonitor in threadMonitors)
+                    foreach (var threadMonitor in currentThreadMonitors)
                     {
                         threadMonitor.RegisterBuildStep(buildStep, buildStepLogger.StepLogger);
                     }
@@ -422,7 +422,7 @@ public void CancelBuild()
 
         private void RunUntilEnd()
         {
-            foreach (var threadMonitor in threadMonitors)
+            foreach (var threadMonitor in currentThreadMonitors)
                 threadMonitor.RegisterThread(Thread.CurrentThread.ManagedThreadId);
 
             while (true)
@@ -479,7 +479,7 @@ public void WriteIndexFile(bool mergeWithCurrentIndexFile)
         /// <summary>
         /// Runs this instance.
         /// </summary>
-        public BuildResultCode Run(Mode mode, bool writeIndexFile = true, bool enableMonitor = false)
+        public BuildResultCode Run(Mode mode, bool writeIndexFile = true, List<IBuildThreadMonitor> threadMonitors = null)
         {
             // When we setup the database ourself we have to take responsibility to close it after
             var shouldCloseDatabase = ObjectDatabase == null;
@@ -497,7 +497,14 @@ public BuildResultCode Run(Mode mode, bool writeIndexFile = true, bool enableMon
             Cancelled = false;
             IsRunning = true;
             DisableCompressionIds.Clear();
-            
+
+            currentThreadMonitors.Clear();
+            if (threadMonitors != null)
+            {
+                foreach (var threadMonitor in threadMonitors)
+                    currentThreadMonitors.Add(threadMonitor);
+            }
+
             // Reseting result map
             var inputHashes = FileVersionTracker.GetDefault();
             {
@@ -506,15 +513,8 @@ public BuildResultCode Run(Mode mode, bool writeIndexFile = true, bool enableMon
                 resultMap = ObjectDatabase;
 
                 scheduler = new Scheduler();
-                if (enableMonitor)
-                {
-                    threadMonitors.Add(new BuildThreadMonitor(scheduler, BuilderId));
-                    foreach (var monitorPipeName in MonitorPipeNames)
-                        threadMonitors.Add(new BuildThreadMonitor(scheduler, BuilderId, monitorPipeName));
-
-                    foreach (var threadMonitor in threadMonitors)
-                        threadMonitor.Start();
-                }
+                foreach (var threadMonitor in currentThreadMonitors)
+                    threadMonitor.Start();
 
                 // Schedule the build
                 ScheduleBuildStep(builderContext, null, Root, InitialVariables);
@@ -536,14 +536,14 @@ public BuildResultCode Run(Mode mode, bool writeIndexFile = true, bool enableMon
                     thread.Join();
                 }
 
-                foreach (var threadMonitor in threadMonitors)
+                foreach (var threadMonitor in currentThreadMonitors)
                     threadMonitor.Finish();
 
-                foreach (var threadMonitor in threadMonitors)
+                foreach (var threadMonitor in currentThreadMonitors)
                     threadMonitor.Join();
             }
 
-            threadMonitors.Clear();
+            currentThreadMonitors.Clear();
             BuildResultCode result;
 
             if (runMode == Mode.Build)
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/DynamicBuilder.cs b/sources/buildengine/Xenko.Core.BuildEngine.Common/DynamicBuilder.cs
index cd6fdf5fbd..d16665076e 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Common/DynamicBuilder.cs
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Common/DynamicBuilder.cs
@@ -67,7 +67,7 @@ private void BuilderThread()
         {
             builder.Reset();
             builder.Root.Add(dynamicBuildStep);
-            builder.Run(Builder.Mode.Build, true, false);
+            builder.Run(Builder.Mode.Build, true);
         }
     }
 }
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildMonitorRemote.cs b/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildMonitorRemote.cs
index 1e4809a418..abb477bfe6 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildMonitorRemote.cs
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildMonitorRemote.cs
@@ -22,7 +22,7 @@ public enum NotificationType
 
         public MicrothreadNotification() { }
 
-        internal MicrothreadNotification(int threadId, long microthreadId, long microthreadJobId, long time, NotificationType type)
+        public MicrothreadNotification(int threadId, long microthreadId, long microthreadJobId, long time, NotificationType type)
         {
             ThreadId = threadId;
             MicrothreadId = microthreadId;
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildThreadMonitor.cs b/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildThreadMonitor.cs
new file mode 100644
index 0000000000..c963e5687c
--- /dev/null
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Common/IBuildThreadMonitor.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Core.Diagnostics;
+
+namespace Xenko.Core.BuildEngine
+{
+    public interface IBuildThreadMonitor
+    {
+        void Start();
+        void RegisterBuildStep(BuildStep buildStep, TimestampLocalLogger stepLogger);
+        void RegisterThread(int managedThreadId);
+        void Finish();
+        void Join();
+    }
+}
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/ListBuildStep.cs b/sources/buildengine/Xenko.Core.BuildEngine.Common/ListBuildStep.cs
index 4f026d6c89..b7767d5163 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Common/ListBuildStep.cs
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Common/ListBuildStep.cs
@@ -275,8 +275,10 @@ private OutputObject AddOutputObject(IExecuteContext executeContext, ObjectUrl o
                 if (outputObject.ObjectId != outputObjectId && outputObject.Counter == mergeCounter)
                 {
                     var error = $"Commands {command} and {outputObject.Command} are both writing {outputObjectUrl} at the same time";
-                    executeContext.Logger.Error(error);
-                    throw new InvalidOperationException(error);
+                    executeContext.Logger.Warning(error);
+                    // let's continue and allow the developer to determine if this is a big problem or not
+                    // outputs might actually be the same
+                    //throw new InvalidOperationException(error);
                 }
 
                 // Update new ObjectId
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Common/Xenko.Core.BuildEngine.Common.csproj b/sources/buildengine/Xenko.Core.BuildEngine.Common/Xenko.Core.BuildEngine.Common.csproj
index 12424fa6d3..f4b56d3ca6 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Common/Xenko.Core.BuildEngine.Common.csproj
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Common/Xenko.Core.BuildEngine.Common.csproj
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
-    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EnvDTE" Version="8.0.1" />
+    <PackageReference Include="EnvDTE" Version="8.0.2" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
@@ -26,5 +27,5 @@
     <ProjectReference Include="..\..\core\Xenko.Core.Design\Xenko.Core.Design.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/buildengine/Xenko.Core.BuildEngine.Tests/Xenko.Core.BuildEngine.Tests.csproj b/sources/buildengine/Xenko.Core.BuildEngine.Tests/Xenko.Core.BuildEngine.Tests.csproj
index 6b550273ca..e69973e9a4 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine.Tests/Xenko.Core.BuildEngine.Tests.csproj
+++ b/sources/buildengine/Xenko.Core.BuildEngine.Tests/Xenko.Core.BuildEngine.Tests.csproj
@@ -1,7 +1,7 @@
 <Project>
 
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -27,6 +27,6 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
 </Project>
\ No newline at end of file
diff --git a/sources/buildengine/Xenko.Core.BuildEngine/Xenko.Core.BuildEngine.csproj b/sources/buildengine/Xenko.Core.BuildEngine/Xenko.Core.BuildEngine.csproj
index d2ee401f46..5f21e0fdb6 100644
--- a/sources/buildengine/Xenko.Core.BuildEngine/Xenko.Core.BuildEngine.csproj
+++ b/sources/buildengine/Xenko.Core.BuildEngine/Xenko.Core.BuildEngine.csproj
@@ -3,7 +3,7 @@
     <XenkoPlatform>Windows</XenkoPlatform>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -29,5 +29,5 @@
     <ProjectReference Include="..\Xenko.Core.BuildEngine.Common\Xenko.Core.BuildEngine.Common.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.AssemblyProcessor.Tests/Xenko.Core.AssemblyProcessor.Tests.csproj b/sources/core/Xenko.Core.AssemblyProcessor.Tests/Xenko.Core.AssemblyProcessor.Tests.csproj
index febba8374c..1587a792a4 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor.Tests/Xenko.Core.AssemblyProcessor.Tests.csproj
+++ b/sources/core/Xenko.Core.AssemblyProcessor.Tests/Xenko.Core.AssemblyProcessor.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -20,9 +20,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Cecil">
-      <HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
     <Reference Include="nunit.core.interfaces">
       <HintPath>..\..\..\deps\NUnit\addins\nunit.core.interfaces.dll</HintPath>
     </Reference>
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/AssemblyProcessorApp.cs b/sources/core/Xenko.Core.AssemblyProcessor/AssemblyProcessorApp.cs
index 0a49e0653c..631c4d171b 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor/AssemblyProcessorApp.cs
+++ b/sources/core/Xenko.Core.AssemblyProcessor/AssemblyProcessorApp.cs
@@ -226,7 +226,6 @@ public bool Run(ref AssemblyDefinition assemblyDefinition, ref bool readWriteSym
 
                 processors.Add(new InitLocalsProcessor());
                 processors.Add(new DispatcherProcessor());
-                processors.Add(new OpenSourceSignProcessor());
 
                 // Check if there is already a AssemblyProcessedAttribute (in which case we can skip processing, it has already been done).
                 // Note that we should probably also match the command line as well so that we throw an error if processing is different (need to rebuild).
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/DispatcherProcessor.cs b/sources/core/Xenko.Core.AssemblyProcessor/DispatcherProcessor.cs
index 3cf2acf62b..61090602fc 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor/DispatcherProcessor.cs
+++ b/sources/core/Xenko.Core.AssemblyProcessor/DispatcherProcessor.cs
@@ -157,7 +157,7 @@ private bool ProcessDelegateAllocation(AssemblyProcessorContext context, MethodD
             // The previous instruction pushes the target onto the stack
             // If it's the this-parameter, we can create an instance field, and reuse the same delegate
             var loadClosureInstruction = functionPointerInstruction.Previous;
-            if (loadClosureInstruction.OpCode == OpCodes.Ldarg_0 && !method.IsStatic)
+            if ((loadClosureInstruction.OpCode == OpCodes.Ldarg_0 || loadClosureInstruction.OpCode == OpCodes.Ldnull) && !method.IsStatic)
             {
                 // TODO: Handle generic methods/delegates
                 // TODO: Handle multiple constructors propertly
@@ -173,7 +173,7 @@ private bool ProcessDelegateAllocation(AssemblyProcessorContext context, MethodD
                 // Create and store the delegate in constructor
                 var ilProcessor5 = constructor.Body.GetILProcessor();
                 ilProcessor5.InsertBefore(retInstruction3, ilProcessor5.Create(OpCodes.Ldarg_0));
-                ilProcessor5.InsertBefore(retInstruction3, ilProcessor5.Create(OpCodes.Ldarg_0));
+                ilProcessor5.InsertBefore(retInstruction3, ilProcessor5.Create(loadClosureInstruction.OpCode));
                 ilProcessor5.InsertBefore(retInstruction3, ilProcessor5.Create(OpCodes.Ldftn, delegateMethod));
                 ilProcessor5.InsertBefore(retInstruction3, ilProcessor5.Create(OpCodes.Newobj, delegateInstanceConstructor));
                 ilProcessor5.InsertBefore(retInstruction3, ilProcessor5.Create(OpCodes.Stfld, sharedDelegateField));
@@ -181,6 +181,7 @@ private bool ProcessDelegateAllocation(AssemblyProcessorContext context, MethodD
                 // Load from field instead of allocating
                 var ilProcessor4 = method.Body.GetILProcessor();
                 ilProcessor4.Remove(functionPointerInstruction);
+                loadClosureInstruction.OpCode = OpCodes.Ldarg_0; // In case it was a ldnull
                 ilProcessor4.Replace(delegateAllocationInstruction, ilProcessor4.Create(OpCodes.Ldfld, sharedDelegateField));
 
                 return true;
@@ -241,32 +242,39 @@ private bool ProcessDelegateAllocation(AssemblyProcessorContext context, MethodD
 
             var ilProcessor = method.Body.GetILProcessor();
 
+            Func<Instruction> generateClosureVariable = () => closureVarible == null ? ilProcessor.Create(loadClosureInstruction.OpCode) : ilProcessor.Create(loadClosureInstruction.OpCode, closureVarible.Resolve());
+
             // Retrieve from pool
             var closureGenericArguments = (closureInstanceType as GenericInstanceType)?.GenericArguments.ToArray() ?? new TypeReference[0];
             var closureAllocation = storeClosureInstruction.Previous;
             if (closureAllocation.OpCode == OpCodes.Newobj)
             {
                 // Retrieve closure from pool, instead of allocating
+                ilProcessor.Replace(storeClosureInstruction, ilProcessor.Create(OpCodes.Nop));
+
                 var acquireClosure = ilProcessor.Create(OpCodes.Callvirt, poolAcquireMethod.MakeGeneric(closureInstanceType));
-                ilProcessor.InsertAfter(closureAllocation, acquireClosure);
-                ilProcessor.InsertAfter(closureAllocation, ilProcessor.Create(OpCodes.Ldsfld, closure.PoolField.MakeGeneric(closureGenericArguments)));
+                var methodPreviousStart = ilProcessor.Body.Instructions.First();
+                ilProcessor.InsertBefore(methodPreviousStart, ilProcessor.Create(OpCodes.Nop));
+                ilProcessor.InsertBefore(methodPreviousStart, ilProcessor.Create(OpCodes.Ldsfld, closure.PoolField.MakeGeneric(closureGenericArguments)));
+                ilProcessor.InsertBefore(methodPreviousStart, acquireClosure);
+                ilProcessor.InsertBefore(methodPreviousStart, storeClosureInstruction);
                 closureAllocation.OpCode = OpCodes.Nop; // Change to Nop instead of removing it, as this instruction might be reference somewhere?
                 closureAllocation.Operand = null;
 
                 // Add a reference
-                ilProcessor.InsertAfter(storeClosureInstruction, ilProcessor.Create(OpCodes.Callvirt, closure.AddReferenceMethod.MakeGeneric(closureGenericArguments)));
-                ilProcessor.InsertAfter(storeClosureInstruction, closureVarible == null ? ilProcessor.Create(loadClosureInstruction.OpCode) : ilProcessor.Create(loadClosureInstruction.OpCode, closureVarible.Resolve()));
+                ilProcessor.InsertBefore(methodPreviousStart, generateClosureVariable());
+                ilProcessor.InsertBefore(methodPreviousStart, ilProcessor.Create(OpCodes.Callvirt, closure.AddReferenceMethod.MakeGeneric(closureGenericArguments)));
 
                 // TODO: Multiple returns + try/finally
                 // Release reference
                 var retInstructions = method.Body.Instructions.Where(x => x.OpCode == OpCodes.Ret).ToArray();
 
-                Instruction beforeReturn = closureVarible == null ? ilProcessor.Create(loadClosureInstruction.OpCode) : ilProcessor.Create(loadClosureInstruction.OpCode, closureVarible.Resolve());
+                Instruction beforeReturn = generateClosureVariable();
                 Instruction newReturnInstruction = ilProcessor.Create(OpCodes.Ret);
                 ilProcessor.Append(beforeReturn);
                 ilProcessor.Append(ilProcessor.Create(OpCodes.Ldnull));
                 ilProcessor.Append(ilProcessor.Create(OpCodes.Beq, newReturnInstruction));
-                ilProcessor.Append(closureVarible == null ? ilProcessor.Create(loadClosureInstruction.OpCode) : ilProcessor.Create(loadClosureInstruction.OpCode, closureVarible.Resolve()));
+                ilProcessor.Append(generateClosureVariable());
                 ilProcessor.Append(ilProcessor.Create(OpCodes.Callvirt, closure.ReleaseMethod.MakeGeneric(closureGenericArguments)));
                 ilProcessor.Append(newReturnInstruction);
 
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/OpenSourceSignProcessor.cs b/sources/core/Xenko.Core.AssemblyProcessor/OpenSourceSignProcessor.cs
deleted file mode 100644
index e5ed3c8d74..0000000000
--- a/sources/core/Xenko.Core.AssemblyProcessor/OpenSourceSignProcessor.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Mono.Cecil;
-
-namespace Xenko.Core.AssemblyProcessor
-{
-    internal class OpenSourceSignProcessor : IAssemblyDefinitionProcessor
-    {
-        public bool Process(AssemblyProcessorContext context)
-        {
-            var assembly = context.Assembly;
-
-            // Only process if there is a public key
-            if (!assembly.Name.HasPublicKey)
-                return false;
-
-            // Check if already strong signed
-            if ((assembly.MainModule.Attributes & ModuleAttributes.StrongNameSigned) == ModuleAttributes.StrongNameSigned)
-                return false;
-
-            // We have a delay signed assembly that is not strong name signed yet.
-            // Let's strong sign it now (a.k.a. OSS, OpenSourceSign)
-            // Note: Maybe we should make sure it's actually Xenko key?
-            assembly.MainModule.Attributes |= ModuleAttributes.StrongNameSigned;
-
-            return true;
-        }
-    }
-}
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.IL.cs b/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.IL.cs
index 0f33b159e6..b4b63ee190 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.IL.cs
+++ b/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.IL.cs
@@ -153,6 +153,8 @@ class UpdatablePropertyCodeGenerator : UpdatablePropertyBaseCodeGenerator
         {
             private readonly FieldDefinition updatablePropertyGetter;
             private readonly FieldDefinition updatablePropertySetter;
+            private readonly FieldDefinition updatablePropertyVirtualDispatchGetter;
+            private readonly FieldDefinition updatablePropertyVirtualDispatchSetter;
             protected TypeDefinition declaringTypeForObjectMethods;
 
             public UpdatablePropertyCodeGenerator(AssemblyDefinition assembly) : base(assembly)
@@ -163,6 +165,8 @@ public UpdatablePropertyCodeGenerator(AssemblyDefinition assembly) : base(assemb
 
                 updatablePropertyGetter = declaringTypeForObjectMethods.Fields.First(x => x.Name == "Getter");
                 updatablePropertySetter = declaringTypeForObjectMethods.Fields.First(x => x.Name == "Setter");
+                updatablePropertyVirtualDispatchGetter = declaringTypeForObjectMethods.Fields.First(x => x.Name == "VirtualDispatchGetter");
+                updatablePropertyVirtualDispatchSetter = declaringTypeForObjectMethods.Fields.First(x => x.Name == "VirtualDispatchSetter");
             }
 
             public override void GenerateUpdatablePropertyCode()
@@ -188,16 +192,42 @@ public override void GenerateUpdatablePropertyCode()
 
             public override void EmitGetCode(ILProcessor il, TypeReference type)
             {
+                var calliInstance = Instruction.Create(OpCodes.Calli, new CallSite(type) { HasThis = true });
+                var calliVirtualDispatch = Instruction.Create(OpCodes.Calli, new CallSite(type) { HasThis = false, Parameters = { new ParameterDefinition(assembly.MainModule.TypeSystem.Object) } });
+                var postCalli = Instruction.Create(OpCodes.Nop);
+
                 il.Emit(OpCodes.Ldarg_0);
                 il.Emit(OpCodes.Ldfld, updatablePropertyGetter);
-                il.Emit(OpCodes.Calli, new CallSite(type) { HasThis = true });
+                il.Emit(OpCodes.Ldarg_0);
+                // For normal calls, we use ldftn and an instance calls
+                // For virtual and interface calls, we generate a dispatch function that calls ldvirtftn on the actual object, then call the method on the object
+                // this dispatcher method is static, so the calli has a different signature
+                // Note: we could later optimize the bool check by having two variant of Get/SetObject
+                // and two different implementations of both UpdatableProperty<T> and UpdatablePropertyObject<T>
+                // (not sure if worth it)
+                il.Emit(OpCodes.Ldfld, updatablePropertyVirtualDispatchGetter);
+                il.Emit(OpCodes.Brfalse, calliInstance);
+                il.Append(calliVirtualDispatch);
+                il.Emit(OpCodes.Br, postCalli);
+                il.Append(calliInstance);
+                il.Append(postCalli);
             }
 
             public override void EmitSetCodeAfterValue(ILProcessor il, TypeReference type)
             {
+                var calliInstance = Instruction.Create(OpCodes.Calli, new CallSite(assembly.MainModule.TypeSystem.Void) { HasThis = true, Parameters = { new ParameterDefinition(type) } });
+                var calliVirtualDispatch = Instruction.Create(OpCodes.Calli, new CallSite(assembly.MainModule.TypeSystem.Void) { HasThis = false, Parameters = { new ParameterDefinition(assembly.MainModule.TypeSystem.Object), new ParameterDefinition(type) } });
+                var postCalli = Instruction.Create(OpCodes.Nop);
+
                 il.Emit(OpCodes.Ldarg_0);
                 il.Emit(OpCodes.Ldfld, updatablePropertySetter);
-                il.Emit(OpCodes.Calli, new CallSite(assembly.MainModule.TypeSystem.Void) { HasThis = true, Parameters = { new ParameterDefinition(type) } });
+                il.Emit(OpCodes.Ldarg_0);
+                il.Emit(OpCodes.Ldfld, updatablePropertyVirtualDispatchSetter);
+                il.Emit(OpCodes.Brfalse, calliInstance);
+                il.Append(calliVirtualDispatch);
+                il.Emit(OpCodes.Br, postCalli);
+                il.Append(calliInstance);
+                il.Append(postCalli);
             }
         }
 
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.cs b/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.cs
index 80aee09a54..6d111ba395 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.cs
+++ b/sources/core/Xenko.Core.AssemblyProcessor/UpdateEngineProcessor.cs
@@ -34,6 +34,54 @@ internal partial class UpdateEngineProcessor : ICecilSerializerProcessor
 
         private MethodReference getTypeFromHandleMethod;
 
+        int prepareMethodCount = 0;
+
+        private MethodDefinition CreateUpdateMethod(AssemblyDefinition assembly)
+        {
+            // Get or create method
+            var updateEngineType = GetOrCreateUpdateType(assembly, true);
+            var mainPrepareMethod = new MethodDefinition($"UpdateMain{prepareMethodCount++}", MethodAttributes.HideBySig | MethodAttributes.Assembly | MethodAttributes.Static, assembly.MainModule.TypeSystem.Void);
+            updateEngineType.Methods.Add(mainPrepareMethod);
+
+            // Make sure it is called at module startup
+            var xenkoCoreModule = assembly.GetXenkoCoreModule();
+            var moduleInitializerAttribute = xenkoCoreModule.GetType("Xenko.Core.ModuleInitializerAttribute");
+            var ctorMethod = moduleInitializerAttribute.GetConstructors().Single(x => !x.IsStatic && !x.HasParameters);
+            mainPrepareMethod.CustomAttributes.Add(new CustomAttribute(assembly.MainModule.ImportReference(ctorMethod)));
+
+            return mainPrepareMethod;
+        }
+
+        private MethodReference CreateDispatcher(AssemblyDefinition assembly, MethodReference method)
+        {
+            var updateEngineType = GetOrCreateUpdateType(assembly, true);
+
+            var dispatcherMethod = new MethodDefinition($"Dispatcher_{method.Name}", MethodAttributes.HideBySig | MethodAttributes.Assembly | MethodAttributes.Static, assembly.MainModule.ImportReference(method.ReturnType));
+            updateEngineType.Methods.Add(dispatcherMethod);
+
+            dispatcherMethod.Parameters.Add(new ParameterDefinition("this", Mono.Cecil.ParameterAttributes.None, method.DeclaringType));
+            foreach (var param in method.Parameters)
+            {
+                dispatcherMethod.Parameters.Add(new ParameterDefinition(param.Name, param.Attributes, param.ParameterType));
+            }
+
+            var il = dispatcherMethod.Body.GetILProcessor();
+            il.Emit(OpCodes.Ldarg_0);
+            foreach (var param in dispatcherMethod.Parameters.Skip(1)) // first parameter is "this"
+            {
+                il.Emit(OpCodes.Ldarg, param);
+            }
+            il.Emit(OpCodes.Ldarg_0);
+            il.Emit(OpCodes.Ldvirtftn, method);
+            var callsite = new Mono.Cecil.CallSite(method.ReturnType) { HasThis = true };
+            foreach (var param in method.Parameters)
+                callsite.Parameters.Add(param);
+            il.Emit(OpCodes.Calli, callsite);
+            il.Emit(OpCodes.Ret);
+
+            return dispatcherMethod;
+        }
+
         public void ProcessSerializers(CecilSerializerContext context)
         {
             var references = new HashSet<AssemblyDefinition>();
@@ -62,13 +110,7 @@ public void ProcessSerializers(CecilSerializerContext context)
                 return;
             }
 
-            // Get or create method
-            var updateEngineType = GetOrCreateUpdateType(context.Assembly, true);
-            var mainPrepareMethod = new MethodDefinition("UpdateMain", MethodAttributes.HideBySig | MethodAttributes.Assembly | MethodAttributes.Static, context.Assembly.MainModule.TypeSystem.Void);
-            updateEngineType.Methods.Add(mainPrepareMethod);
 
-            // Get some useful Cecil objects from Xenko.Core
-            var xenkoCoreModule = context.Assembly.GetXenkoCoreModule();
 
             var xenkoEngineAssembly = context.Assembly.Name.Name == "Xenko.Engine"
                     ? context.Assembly
@@ -109,10 +151,7 @@ public void ProcessSerializers(CecilSerializerContext context)
             var typeType = coreAssembly.MainModule.GetTypeResolved(typeof(Type).FullName);
             getTypeFromHandleMethod = context.Assembly.MainModule.ImportReference(typeType.Methods.First(x => x.Name == "GetTypeFromHandle"));
 
-            // Make sure it is called at module startup
-            var moduleInitializerAttribute = xenkoCoreModule.GetType("Xenko.Core.ModuleInitializerAttribute");
-            var ctorMethod = moduleInitializerAttribute.GetConstructors().Single(x => !x.IsStatic && !x.HasParameters);
-            mainPrepareMethod.CustomAttributes.Add(new CustomAttribute(context.Assembly.MainModule.ImportReference(ctorMethod)));
+            var mainPrepareMethod = CreateUpdateMethod(context.Assembly);
 
             // Emit serialization code for all the types we care about
             var processedTypes = new HashSet<TypeDefinition>(TypeReferenceEqualityComparer.Default);
@@ -245,7 +284,9 @@ public void ProcessType(CecilSerializerContext context, TypeReference type, Meth
             }
 
             var il = updateCurrentMethod.Body.GetILProcessor();
-            var emptyObjectField = updateMainMethod.DeclaringType.Fields.FirstOrDefault(x => x.Name == "emptyObject");
+            var typeIsValueType = type.IsResolvedValueType();
+            var emptyObjectField = typeIsValueType ? null : updateMainMethod.DeclaringType.Fields.FirstOrDefault(x => x.Name == "emptyObject");
+            VariableDefinition emptyStruct = null;
 
             // Note: forcing fields and properties to be processed in all cases
             foreach (var serializableItem in ComplexSerializerRegistry.GetSerializableItems(type, true, ComplexTypeSerializerFlags.SerializePublicFields | ComplexTypeSerializerFlags.SerializePublicProperties | ComplexTypeSerializerFlags.Updatable))
@@ -254,32 +295,50 @@ public void ProcessType(CecilSerializerContext context, TypeReference type, Meth
                 {
                     var field = fieldReference.Resolve();
 
-                    // First time it is needed, let's create empty object: var emptyObject = new object();
-                    if (emptyObjectField == null)
+                    // First time it is needed, let's create empty object in the class (var emptyObject = new object()) or empty local struct in the method
+                    if (typeIsValueType)
                     {
-                        emptyObjectField = new FieldDefinition("emptyObject", FieldAttributes.Static | FieldAttributes.Private, context.Assembly.MainModule.TypeSystem.Object);
-
-                        // Create static ctor that will initialize this object
-                        var staticConstructor = new MethodDefinition(".cctor",
-                                                MethodAttributes.Private | MethodAttributes.HideBySig | MethodAttributes.Static | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName,
-                                                context.Assembly.MainModule.TypeSystem.Void);
-                        var staticConstructorIL = staticConstructor.Body.GetILProcessor();
-                        staticConstructorIL.Emit(OpCodes.Newobj, context.Assembly.MainModule.ImportReference(emptyObjectField.FieldType.Resolve().GetConstructors().Single(x => !x.IsStatic && !x.HasParameters)));
-                        staticConstructorIL.Emit(OpCodes.Stsfld, emptyObjectField);
-                        staticConstructorIL.Emit(OpCodes.Ret);
-
-                        updateMainMethod.DeclaringType.Fields.Add(emptyObjectField);
-                        updateMainMethod.DeclaringType.Methods.Add(staticConstructor);
+                        if (emptyStruct == null)
+                        {
+                            emptyStruct = new VariableDefinition(type);
+                            updateMainMethod.Body.Variables.Add(emptyStruct);
+                        }
                     }
+                    else
+                    {
+                        if (emptyObjectField == null)
+                        {
+                            emptyObjectField = new FieldDefinition("emptyObject", FieldAttributes.Static | FieldAttributes.Private, context.Assembly.MainModule.TypeSystem.Object);
+
+                            // Create static ctor that will initialize this object
+                            var staticConstructor = new MethodDefinition(".cctor",
+                                                    MethodAttributes.Private | MethodAttributes.HideBySig | MethodAttributes.Static | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName,
+                                                    context.Assembly.MainModule.TypeSystem.Void);
+                            var staticConstructorIL = staticConstructor.Body.GetILProcessor();
+                            staticConstructorIL.Emit(OpCodes.Newobj, context.Assembly.MainModule.ImportReference(emptyObjectField.FieldType.Resolve().GetConstructors().Single(x => !x.IsStatic && !x.HasParameters)));
+                            staticConstructorIL.Emit(OpCodes.Stsfld, emptyObjectField);
+                            staticConstructorIL.Emit(OpCodes.Ret);
+
+                            updateMainMethod.DeclaringType.Fields.Add(emptyObjectField);
+                            updateMainMethod.DeclaringType.Methods.Add(staticConstructor);
+                        }
+                    }
+
 
                     il.Emit(OpCodes.Ldtoken, type);
                     il.Emit(OpCodes.Call, getTypeFromHandleMethod);
                     il.Emit(OpCodes.Ldstr, field.Name);
 
-                    il.Emit(OpCodes.Ldsfld, emptyObjectField);
+                    if (typeIsValueType)
+                        il.Emit(OpCodes.Ldloca, emptyStruct);
+                    else
+                        il.Emit(OpCodes.Ldsfld, emptyObjectField);
                     il.Emit(OpCodes.Ldflda, context.Assembly.MainModule.ImportReference(fieldReference));
                     il.Emit(OpCodes.Conv_I);
-                    il.Emit(OpCodes.Ldsfld, emptyObjectField);
+                    if (typeIsValueType)
+                        il.Emit(OpCodes.Ldloca, emptyStruct);
+                    else
+                        il.Emit(OpCodes.Ldsfld, emptyObjectField);
                     il.Emit(OpCodes.Conv_I);
                     il.Emit(OpCodes.Sub);
                     il.Emit(OpCodes.Conv_I4);
@@ -300,12 +359,21 @@ public void ProcessType(CecilSerializerContext context, TypeReference type, Meth
                     il.Emit(OpCodes.Call, getTypeFromHandleMethod);
                     il.Emit(OpCodes.Ldstr, property.Name);
 
+                    // If it's a virtual or interface call, we need to create a dispatcher using ldvirtftn
+                    if (property.GetMethod.IsVirtual)
+                        propertyGetMethod = CreateDispatcher(context.Assembly, propertyGetMethod);
+
                     il.Emit(OpCodes.Ldftn, propertyGetMethod);
 
-                    // Only get setter if it exists and it's public
+                    // Set whether getter method uses a VirtualDispatch (static call) or instance call
+                    il.Emit(property.GetMethod.IsVirtual ? OpCodes.Ldc_I4_1 : OpCodes.Ldc_I4_0);
+
+                    // Only uses setter if it exists and it's public
                     if (property.SetMethod != null && property.SetMethod.IsPublic)
                     {
                         var propertySetMethod = context.Assembly.MainModule.ImportReference(property.SetMethod).MakeGeneric(updateCurrentMethod.GenericParameters.ToArray());
+                        if (property.SetMethod.IsVirtual)
+                            propertySetMethod = CreateDispatcher(context.Assembly, propertySetMethod);
                         il.Emit(OpCodes.Ldftn, propertySetMethod);
                     }
                     else
@@ -315,6 +383,9 @@ public void ProcessType(CecilSerializerContext context, TypeReference type, Meth
                         il.Emit(OpCodes.Conv_I);
                     }
 
+                    // Set whether setter method uses a VirtualDispatch (static call) or instance call
+                    il.Emit((property.SetMethod?.IsVirtual ?? false) ? OpCodes.Ldc_I4_1 : OpCodes.Ldc_I4_0);
+
                     var propertyType = context.Assembly.MainModule.ImportReference(replaceGenericsVisitor != null ? replaceGenericsVisitor.VisitDynamic(property.PropertyType) : property.PropertyType);
 
                     var updatablePropertyInflatedCtor = GetOrCreateUpdatablePropertyCtor(context.Assembly, propertyType);
@@ -338,7 +409,6 @@ public void ProcessType(CecilSerializerContext context, TypeReference type, Meth
             }
         }
 
-
         private static string ComputeUpdateMethodName(TypeDefinition typeDefinition)
         {
             var typeName = ComputeTypeName(typeDefinition);
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/Utilities.cs b/sources/core/Xenko.Core.AssemblyProcessor/Utilities.cs
index 9b48127e72..544dd93f89 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor/Utilities.cs
+++ b/sources/core/Xenko.Core.AssemblyProcessor/Utilities.cs
@@ -37,6 +37,10 @@ public static string BuildValidClassName([NotNull] string originalName, char rep
         [NotNull]
         public static string BuildValidClassName([NotNull] string originalName, IEnumerable<string> additionalReservedWords, char replacementCharacter = '_')
         {
+            // C# identifiers must start with a letter or underscore
+            if (char.IsLetter(originalName[0]) == false && originalName[0] != '_')
+                originalName = "_" + originalName;
+            
             if (ReservedNames.Contains(originalName))
                 return originalName + replacementCharacter;
 
@@ -70,6 +74,10 @@ public static string BuildValidNamespaceName([NotNull] string originalName, char
         [NotNull]
         public static string BuildValidNamespaceName([NotNull] string originalName, IEnumerable<string> additionalReservedWords, char replacementCharacter = '_')
         {
+            // C# identifiers must start with a letter or underscore
+            if (char.IsLetter(originalName[0]) == false && originalName[0] != '_')
+                originalName = "_" + originalName;
+
             if (ReservedNames.Contains(originalName))
                 return originalName + replacementCharacter;
 
diff --git a/sources/core/Xenko.Core.AssemblyProcessor/Xenko.Core.AssemblyProcessor.csproj b/sources/core/Xenko.Core.AssemblyProcessor/Xenko.Core.AssemblyProcessor.csproj
index 8772ff8f55..bd7dec304b 100644
--- a/sources/core/Xenko.Core.AssemblyProcessor/Xenko.Core.AssemblyProcessor.csproj
+++ b/sources/core/Xenko.Core.AssemblyProcessor/Xenko.Core.AssemblyProcessor.csproj
@@ -3,7 +3,7 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -24,19 +24,8 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Mono.Cecil" Version="0.10.4" />
     <PackageReference Include="Mono.Options" Version="5.3.0.1" />
-    <Reference Include="Mono.Cecil">
-      <HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Pdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Mdb.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Cecil.Rocks">
-      <HintPath>..\..\..\deps\Mono.Cecil\Mono.Cecil.Rocks.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel.Composition" />
   </ItemGroup>
   <ItemGroup>
@@ -84,13 +73,13 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.15"/>
+    <PackageReference Include="ILRepack" Version="2.0.15" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
     <PackageReference Include="System.ValueTuple" Version="4.4.0" />
   </ItemGroup>
   <PropertyGroup>
     <PostBuildEvent>xcopy /d /y $(TargetDir)*.* $(SolutionDir)..\deps\AssemblyProcessor
 cd $(SolutionDir)..\deps\AssemblyProcessor
-$(ILRepack) Xenko.Core.AssemblyProcessor.exe Mono.Cecil.dll Mono.Cecil.Mdb.dll Mono.Cecil.Pdb.dll Mono.Cecil.Rocks.dll Mono.Options.dll System.ValueTuple.dll /out:Xenko.Core.AssemblyProcessor.Packed.exe</PostBuildEvent>
+$(ILRepack) Xenko.Core.AssemblyProcessor.exe Mono.Cecil.dll Mono.Cecil.Mdb.dll Mono.Cecil.Pdb.dll Mono.Cecil.Rocks.dll Mono.Options.dll System.ValueTuple.dll /out:Xenko.Core.AssemblyProcessor.Packed2.exe</PostBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/sources/core/Xenko.Core.Design.Tests/Xenko.Core.Design.Tests.csproj b/sources/core/Xenko.Core.Design.Tests/Xenko.Core.Design.Tests.csproj
index 08db046cbc..586287d4ff 100644
--- a/sources/core/Xenko.Core.Design.Tests/Xenko.Core.Design.Tests.csproj
+++ b/sources/core/Xenko.Core.Design.Tests/Xenko.Core.Design.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -24,5 +24,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Design/AbsoluteId.cs b/sources/core/Xenko.Core.Design/AbsoluteId.cs
index a9616ca855..c2e6d8b1e6 100644
--- a/sources/core/Xenko.Core.Design/AbsoluteId.cs
+++ b/sources/core/Xenko.Core.Design/AbsoluteId.cs
@@ -36,13 +36,11 @@ public AbsoluteId(AssetId assetId, Guid objectId)
         /// </summary>
         public Guid ObjectId { get; }
 
-        /// <inheritdoc />
         public static bool operator ==(AbsoluteId left, AbsoluteId right)
         {
             return left.Equals(right);
         }
 
-        /// <inheritdoc />
         public static bool operator !=(AbsoluteId left, AbsoluteId right)
         {
             return !left.Equals(right);
@@ -57,8 +55,7 @@ public bool Equals(AbsoluteId other)
         /// <inheritdoc />
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is AbsoluteId && Equals((AbsoluteId)obj);
+            return obj is AbsoluteId id && Equals(id);
         }
 
         /// <inheritdoc />
diff --git a/sources/core/Xenko.Core.Design/Extensions/TypeDescriptorExtensions.cs b/sources/core/Xenko.Core.Design/Extensions/TypeDescriptorExtensions.cs
index dedec5a422..2fa5230449 100644
--- a/sources/core/Xenko.Core.Design/Extensions/TypeDescriptorExtensions.cs
+++ b/sources/core/Xenko.Core.Design/Extensions/TypeDescriptorExtensions.cs
@@ -43,7 +43,24 @@ public static IEnumerable<Type> GetInheritedInstantiableTypes([NotNull] this Typ
                         {
                             AllAssemblies.AddRange(AssemblyRegistry.Find(AssemblyCommonCategories.Assets));
                         }
-                        AllInstantiableTypes.AddRange(AllAssemblies.SelectMany(x => x.GetTypes().Where(IsInstantiableType)));
+                        for (int i = 0; i < AllAssemblies.Count; i++)
+                        {
+                            var assembly = AllAssemblies[i];
+                            try
+                            {
+                                var types = assembly.GetExportedTypes();
+                                for (int j=0; j<types.Length; j++)
+                                {
+                                    try
+                                    {
+                                        if (IsInstantiableType(types[j]))
+                                            AllInstantiableTypes.Add(types[j]);
+                                    }
+                                    catch (Exception e) { }
+                                }
+                            } catch (Exception e) { }
+                        }
+                        //AllInstantiableTypes.AddRange(AllAssemblies.SelectMany(x => x.GetTypes().Where(IsInstantiableType)));
                     }
 
                     result = AllInstantiableTypes.Where(type.IsAssignableFrom).ToList();
diff --git a/sources/core/Xenko.Core.Design/IO/UPath.cs b/sources/core/Xenko.Core.Design/IO/UPath.cs
index e2a17d32cf..80e5fc8a53 100644
--- a/sources/core/Xenko.Core.Design/IO/UPath.cs
+++ b/sources/core/Xenko.Core.Design/IO/UPath.cs
@@ -363,7 +363,7 @@ public UPath MakeRelative([NotNull] UDirectory anchorDirectory)
 
             if (anchorDirectory.HasDrive != HasDrive)
             {
-                throw new InvalidOperationException("Path should have no drive information/or both drive information simultaneously");
+                throw new InvalidOperationException("Path '" + this.ToString() + "' with anchor '" + anchorDirectory.ToString() + "' should have no drive information/or both drive information simultaneously");
             }
 
             // Return a "." when the directory is the same
diff --git a/sources/core/Xenko.Core.Design/Module.cs b/sources/core/Xenko.Core.Design/Module.cs
index cf620f171e..4bdcd6932f 100644
--- a/sources/core/Xenko.Core.Design/Module.cs
+++ b/sources/core/Xenko.Core.Design/Module.cs
@@ -2,9 +2,9 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System.ComponentModel;
-
 using Xenko.Core.Mathematics;
 using Xenko.Core.Reflection;
+using Xenko.Core.Serialization;
 using Xenko.Core.TypeConverters;
 
 namespace Xenko.Core
@@ -16,6 +16,7 @@ public static void Initialize()
         {
             // Make sure that this assembly is registered
             AssemblyRegistry.Register(typeof(Module).Assembly, AssemblyCommonCategories.Assets);
+
             TypeDescriptor.AddAttributes(typeof(Color), new TypeConverterAttribute(typeof(ColorConverter)));
             TypeDescriptor.AddAttributes(typeof(Color3), new TypeConverterAttribute(typeof(Color3Converter)));
             TypeDescriptor.AddAttributes(typeof(Color4), new TypeConverterAttribute(typeof(Color4Converter)));
@@ -28,6 +29,7 @@ public static void Initialize()
             TypeDescriptor.AddAttributes(typeof(Vector2), new TypeConverterAttribute(typeof(Vector2Converter)));
             TypeDescriptor.AddAttributes(typeof(Vector3), new TypeConverterAttribute(typeof(Vector3Converter)));
             TypeDescriptor.AddAttributes(typeof(Vector4), new TypeConverterAttribute(typeof(Vector4Converter)));
+            TypeDescriptor.AddAttributes(typeof(IUrlReference), new TypeConverterAttribute(typeof(UrlReferenceConverter)));
         }
     }
 }
diff --git a/sources/core/Xenko.Core.Design/Reflection/AssemblyContainer.cs b/sources/core/Xenko.Core.Design/Reflection/AssemblyContainer.cs
index 9bd208dba3..1a4af6e46e 100644
--- a/sources/core/Xenko.Core.Design/Reflection/AssemblyContainer.cs
+++ b/sources/core/Xenko.Core.Design/Reflection/AssemblyContainer.cs
@@ -244,7 +244,7 @@ private Assembly LoadAssemblyFromPathInternal([NotNull] string assemblyFullPath)
                                 // - need to be fast (make sure to use NuGet caching mechanism)
                                 if (library.RuntimeAssemblyGroups.Count == 0)
                                 {
-                                    var runtimeFolder = new[] { "win-d3d11", "win", "any" }
+                                    var runtimeFolder = new[] { "win", "any" }
                                         .Select(runtime => Path.Combine(globalPackagesFolder, library.Path, "runtimes", runtime))
                                         .Where(Directory.Exists)
                                         .SelectMany(folder => Directory.EnumerateDirectories(Path.Combine(folder, "lib")))
diff --git a/sources/core/Xenko.Core.Design/Reflection/DataVisitorBase.cs b/sources/core/Xenko.Core.Design/Reflection/DataVisitorBase.cs
index 7dfa3294fb..e67fa8445b 100644
--- a/sources/core/Xenko.Core.Design/Reflection/DataVisitorBase.cs
+++ b/sources/core/Xenko.Core.Design/Reflection/DataVisitorBase.cs
@@ -191,12 +191,16 @@ public virtual void VisitObject(object obj, ObjectDescriptor descriptor, bool vi
                 case DescriptorCategory.Array:
                     VisitArray((Array)obj, (ArrayDescriptor)descriptor);
                     break;
+                case DescriptorCategory.List:
                 case DescriptorCategory.Collection:
                     VisitCollection((IEnumerable)obj, (CollectionDescriptor)descriptor);
                     break;
                 case DescriptorCategory.Dictionary:
                     VisitDictionary(obj, (DictionaryDescriptor)descriptor);
                     break;
+                case DescriptorCategory.Set:
+                    VisitSet((IEnumerable)obj, (SetDescriptor)descriptor);
+                    break;
             }
         }
 
@@ -227,6 +231,10 @@ public virtual void VisitArrayItem(Array array, ArrayDescriptor descriptor, int
         /// <inheritdoc />
         public virtual void VisitCollection(IEnumerable collection, CollectionDescriptor descriptor)
         {
+            if (descriptor.Category == DescriptorCategory.Set)
+            {
+                throw new ArgumentException("Shouldn't call VisitCollection() to visit a set");
+            }
             var i = 0;
 
             // Make a copy in case VisitCollectionItem mutates something
@@ -273,6 +281,26 @@ public virtual void VisitDictionaryKeyValue(object dictionary, DictionaryDescrip
             Visit(value, valueDescriptor);
         }
 
+        /// <inheritdoc />
+        public virtual void VisitSet(IEnumerable set, SetDescriptor descriptor)
+        {
+            // Make a copy in case VisitCollectionItem mutates something
+            IEnumerator enumerator = set.GetEnumerator();
+            while (enumerator.MoveNext())
+            {
+                object item = enumerator.Current;
+                CurrentPath.Push(descriptor, item);
+                VisitSetItem(set, descriptor, item, TypeDescriptorFactory.Find(item?.GetType() ?? descriptor.ElementType));
+                CurrentPath.Pop();
+            }
+        }
+
+        /// <inheritdoc />
+        public virtual void VisitSetItem(IEnumerable set, SetDescriptor descriptor, object item, ITypeDescriptor itemDescriptor)
+        {
+            Visit(item, itemDescriptor);
+        }
+
         protected virtual bool CanVisit([NotNull] object obj)
         {
             // Always visit valuetypes
@@ -284,5 +312,13 @@ protected virtual bool CanVisit([NotNull] object obj)
             // true if not visited yet; otherwise, false
             return visitedObjects.Add(obj);
         }
+
+        /// <summary>
+        /// Check if an array is of primtive types, these can be skipped in most processors
+        /// </summary>
+        /// <param name="descriptor"></param>
+        /// <returns></returns>
+        protected bool IsArrayOfPrimitiveType(ArrayDescriptor descriptor)
+            => BlittableHelper.IsBlittable(descriptor.ElementType);
     }
 }
diff --git a/sources/core/Xenko.Core.Design/Reflection/IDataVisitor.cs b/sources/core/Xenko.Core.Design/Reflection/IDataVisitor.cs
index f1c96814e3..7913b1bbe2 100644
--- a/sources/core/Xenko.Core.Design/Reflection/IDataVisitor.cs
+++ b/sources/core/Xenko.Core.Design/Reflection/IDataVisitor.cs
@@ -91,5 +91,21 @@ public interface IDataVisitor
         /// <param name="value">The value.</param>
         /// <param name="valueDescriptor">The value descriptor.</param>
         void VisitDictionaryKeyValue([NotNull] object dictionary, [NotNull] DictionaryDescriptor descriptor, object key, ITypeDescriptor keyDescriptor, object value, ITypeDescriptor valueDescriptor);
+
+        /// <summary>
+        /// Visits a set.
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="descriptor">The descriptor.</param>
+        void VisitSet([NotNull] IEnumerable set, [NotNull] SetDescriptor descriptor);
+
+        /// <summary>
+        /// Visits a set item.
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="descriptor">The descriptor.</param>
+        /// <param name="item">The item.</param>
+        /// <param name="itemDescriptor">The item descriptor.</param>
+        void VisitSetItem([NotNull] IEnumerable set, [NotNull] SetDescriptor descriptor, object item, ITypeDescriptor itemDescriptor);
     }
 }
diff --git a/sources/core/Xenko.Core.Design/TypeConverters/TypeConverterHelper.cs b/sources/core/Xenko.Core.Design/TypeConverters/TypeConverterHelper.cs
index 89ee11194e..a6c4edf32b 100644
--- a/sources/core/Xenko.Core.Design/TypeConverters/TypeConverterHelper.cs
+++ b/sources/core/Xenko.Core.Design/TypeConverters/TypeConverterHelper.cs
@@ -20,12 +20,13 @@ public static bool CanConvert([NotNull] Type sourceType, [NotNull] Type destinat
             if (sourceType == null) throw new ArgumentNullException(nameof(sourceType));
             if (destinationType == null) throw new ArgumentNullException(nameof(destinationType));
 
+            var context = new DestinationTypeDescriptorContext(destinationType);
             // already same type or inherited (also works with interface), or
             // implements IConvertible, or
             // can convert from source type to target type
             return destinationType.IsAssignableFrom(sourceType) ||
                    (typeof(IConvertible).IsAssignableFrom(sourceType) && Type.GetTypeCode(destinationType) != TypeCode.Object) ||
-                   TypeDescriptor.GetConverter(sourceType).CanConvertTo(destinationType) || TypeDescriptor.GetConverter(destinationType).CanConvertFrom(sourceType);
+                   TypeDescriptor.GetConverter(sourceType).CanConvertTo(destinationType) || TypeDescriptor.GetConverter(destinationType).CanConvertFrom(context, sourceType);
         }
 
         /// <summary>
@@ -69,10 +70,11 @@ public static bool TryConvert(object source, [NotNull] Type destinationType, out
                         return true;
                     }
                     // Try to convert using the target type converter
+                    var context = new DestinationTypeDescriptorContext(destinationType);
                     converter = TypeDescriptor.GetConverter(destinationType);
-                    if (converter.CanConvertFrom(sourceType))
+                    if (converter.CanConvertFrom(context, sourceType))
                     {
-                        target = converter.ConvertFrom(source);
+                        target = converter.ConvertFrom(context, System.Globalization.CultureInfo.CurrentCulture, source);
                         return true;
                     }
                 }
@@ -92,5 +94,43 @@ public static bool TryConvert(object source, [NotNull] Type destinationType, out
             target = null;
             return false;
         }
+
+        public static Type GetDestinationType(ITypeDescriptorContext context)
+        {
+            if (context is DestinationTypeDescriptorContext c) return c.DestinationType;
+
+            return null;
+        }
+
+        private class DestinationTypeDescriptorContext : ITypeDescriptorContext
+        {
+            public DestinationTypeDescriptorContext(Type destinationType)
+            {
+                DestinationType = destinationType;
+            }
+
+            public Type DestinationType { get; }
+
+            public IContainer Container => null;
+
+            public object Instance => null;
+
+            public PropertyDescriptor PropertyDescriptor => null;
+
+            public object GetService(Type serviceType)
+            {
+                return null;
+            }
+
+            public void OnComponentChanged()
+            {
+                
+            }
+
+            public bool OnComponentChanging()
+            {
+                return true;
+            }
+        }
     }
 }
diff --git a/sources/core/Xenko.Core.Design/TypeConverters/UrlReferenceConverter.cs b/sources/core/Xenko.Core.Design/TypeConverters/UrlReferenceConverter.cs
new file mode 100644
index 0000000000..8a9b518675
--- /dev/null
+++ b/sources/core/Xenko.Core.Design/TypeConverters/UrlReferenceConverter.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.ComponentModel;
+using System.Globalization;
+using Xenko.Core.Serialization;
+
+namespace Xenko.Core.TypeConverters
+{
+    /// <summary>
+    /// Defines a type converter for <see cref="IUrlReference"/>.
+    /// </summary>
+    public class UrlReferenceConverter : BaseConverter
+    {
+
+        public UrlReferenceConverter()
+        {
+            //TODO: PropertyDescriptor does not support Properties, only fields so can not currently Set Properties. Does not seem to impact usage.
+        }
+
+        /// <inheritdoc/>
+        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        {
+            return UrlReferenceHelper.IsUrlReferenceType(TypeConverterHelper.GetDestinationType(context));
+        }
+
+        /// <inheritdoc/>
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            var attachedReference = AttachedReferenceManager.GetAttachedReference(value);
+            var destinationType = TypeConverterHelper.GetDestinationType(context);
+            return UrlReferenceHelper.CreateReference(destinationType, attachedReference.Id, attachedReference.Url);
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Design/VisualStudio/VisualStudioVersions.cs b/sources/core/Xenko.Core.Design/VisualStudio/VisualStudioVersions.cs
index 5bb776023f..70af7c825c 100644
--- a/sources/core/Xenko.Core.Design/VisualStudio/VisualStudioVersions.cs
+++ b/sources/core/Xenko.Core.Design/VisualStudio/VisualStudioVersions.cs
@@ -148,6 +148,17 @@ private static List<IDEInfo> BuildIDEInfos()
                             var nickname = inst2.GetProperties().GetValue("nickname") as string;
                             if (!string.IsNullOrEmpty(nickname))
                                 displayName = $"{displayName} ({nickname})";
+                            else
+                            {
+                                var installationName = inst2.GetInstallationName();
+                                // In case of Preview, we have:
+                                // "installationName": "VisualStudioPreview/16.4.0-pre.6.0+29519.161"
+                                // "channelId": "VisualStudio.16.Preview"
+                                if (installationName.Contains("Preview"))
+                                {
+                                    displayName = displayName + " (Preview)";
+                                }
+                            }
                         }
                         catch (COMException)
                         {
diff --git a/sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj b/sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj
index 3d2af33d48..239d8510b1 100644
--- a/sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj
+++ b/sources/core/Xenko.Core.Design/Xenko.Core.Design.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -32,14 +32,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30" />
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="NuGet.Configuration" Version="5.0.0" />
-    <PackageReference Include="SharpDX" Version="4.0.1" />
-    <PackageReference Include="System.Management" Version="4.5.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
+    <PackageReference Include="NuGet.Configuration" Version="6.14.0" />
+    <PackageReference Include="SharpDX" Version="4.2.0" />
+    <PackageReference Include="System.Management" Version="7.0.0" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.IO/NativeLockFile.cs b/sources/core/Xenko.Core.IO/NativeLockFile.cs
index c0ab13299e..03e8aff0e2 100644
--- a/sources/core/Xenko.Core.IO/NativeLockFile.cs
+++ b/sources/core/Xenko.Core.IO/NativeLockFile.cs
@@ -48,6 +48,10 @@ public static void LockFile(FileStream fileStream, long offset, long count, bool
                 throw new IOException("Couldn't lock file.");
             }
 #else
+            // some OSes can't lock a file that can't be written too
+            // (looking at you, Linux)
+            if (fileStream.CanWrite == false) return;
+
             bool tryAgain;
             do
             {
@@ -89,6 +93,10 @@ public static void UnlockFile(FileStream fileStream, long offset, long count)
                 throw new IOException("Couldn't unlock file.");
             }
 #else
+            // some OSes can't (un)lock a file that can't be written too
+            // (looking at you, Linux)
+            if (fileStream.CanWrite == false) return;
+
             fileStream.Unlock(offset, count);
 #endif
         }
diff --git a/sources/core/Xenko.Core.IO/Xenko.Core.IO.csproj b/sources/core/Xenko.Core.IO/Xenko.Core.IO.csproj
index 5456ca2055..c8d732b828 100644
--- a/sources/core/Xenko.Core.IO/Xenko.Core.IO.csproj
+++ b/sources/core/Xenko.Core.IO/Xenko.Core.IO.csproj
@@ -3,7 +3,7 @@
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   
   <PropertyGroup>
     <Description>Xenko Core IO assembly.</Description>
@@ -12,32 +12,28 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>--auto-module-initializer</XenkoAssemblyProcessorOptions>
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
     <XenkoBuildTags>*</XenkoBuildTags>
   </PropertyGroup>
   
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Remove="System.IO.Compression.Zip\*.cs" Condition=" '$(XenkoPlatform)' != 'Android' " />
+    <Compile Remove="System.IO.Compression.Zip\*.cs" />
   </ItemGroup>
   
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Core\Xenko.Core.csproj">
 	  <PrivateAssets>contentfiles;analyzers</PrivateAssets>
 	</ProjectReference>
-    <PackageReference Include="SharpDX" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'UWP'" />
   </ItemGroup>
   
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Mathematics.Tests/Xenko.Core.Mathematics.Tests.csproj b/sources/core/Xenko.Core.Mathematics.Tests/Xenko.Core.Mathematics.Tests.csproj
index 0a70bce174..43446395e7 100644
--- a/sources/core/Xenko.Core.Mathematics.Tests/Xenko.Core.Mathematics.Tests.csproj
+++ b/sources/core/Xenko.Core.Mathematics.Tests/Xenko.Core.Mathematics.Tests.csproj
@@ -3,7 +3,7 @@
     <XenkoAssemblySign>true</XenkoAssemblySign>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -29,5 +29,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Mathematics/BoundingFrustum.cs b/sources/core/Xenko.Core.Mathematics/BoundingFrustum.cs
index b1f5ec19b5..8755b637f6 100644
--- a/sources/core/Xenko.Core.Mathematics/BoundingFrustum.cs
+++ b/sources/core/Xenko.Core.Mathematics/BoundingFrustum.cs
@@ -47,46 +47,52 @@ public struct BoundingFrustum
         public BoundingFrustum(ref Matrix matrix)
         {
             // Left
-            LeftPlane = Plane.Normalize(new Plane(
+            Plane.Normalize(
                 matrix.M14 + matrix.M11,
                 matrix.M24 + matrix.M21,
                 matrix.M34 + matrix.M31,
-                matrix.M44 + matrix.M41));
+                matrix.M44 + matrix.M41,
+                out LeftPlane);
 
             // Right
-            RightPlane = Plane.Normalize(new Plane(
+            Plane.Normalize(
                 matrix.M14 - matrix.M11,
                 matrix.M24 - matrix.M21,
                 matrix.M34 - matrix.M31,
-                matrix.M44 - matrix.M41));
+                matrix.M44 - matrix.M41,
+                out RightPlane);
 
             // Top
-            TopPlane = Plane.Normalize(new Plane(
+            Plane.Normalize(
                 matrix.M14 - matrix.M12,
                 matrix.M24 - matrix.M22,
                 matrix.M34 - matrix.M32,
-                matrix.M44 - matrix.M42));
+                matrix.M44 - matrix.M42,
+                out TopPlane);
 
             // Bottom
-            BottomPlane = Plane.Normalize(new Plane(
+            Plane.Normalize(
                 matrix.M14 + matrix.M12,
                 matrix.M24 + matrix.M22,
                 matrix.M34 + matrix.M32,
-                matrix.M44 + matrix.M42));
+                matrix.M44 + matrix.M42,
+                out BottomPlane);
 
             // Near
-            NearPlane = Plane.Normalize(new Plane(
-                matrix.M13,
-                matrix.M23,
-                matrix.M33,
-                matrix.M43));
+            Plane.Normalize(
+                matrix.M14 + matrix.M13,
+                matrix.M24 + matrix.M23,
+                matrix.M34 + matrix.M33,
+                matrix.M44 + matrix.M43,
+                out NearPlane);
 
             // Far
-            FarPlane = Plane.Normalize(new Plane(
+            Plane.Normalize(
                 matrix.M14 - matrix.M13,
                 matrix.M24 - matrix.M23,
                 matrix.M34 - matrix.M33,
-                matrix.M44 - matrix.M43));
+                matrix.M44 - matrix.M43,
+                out FarPlane);
         }
 
         /// <summary>
@@ -99,5 +105,16 @@ public bool Contains(ref BoundingBoxExt boundingBoxExt)
         {
             return CollisionHelper.FrustumContainsBox(ref this, ref boundingBoxExt);
         }
+
+        /// <summary>
+        /// Check whether this frustum contains the specified <see cref="BoundingBox"/>.
+        /// </summary>
+        /// <param name="boundingBox">The bounding box.</param>
+        /// <returns><c>true</c> if this frustum contains the specified bounding box.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public bool Contains(ref BoundingBox boundingBox)
+        {
+            return CollisionHelper.FrustumContainsBox(ref this, ref boundingBox);
+        }
     }
 }
diff --git a/sources/core/Xenko.Core.Mathematics/BoundingSphere.cs b/sources/core/Xenko.Core.Mathematics/BoundingSphere.cs
index ea38aed873..cad17a02f7 100644
--- a/sources/core/Xenko.Core.Mathematics/BoundingSphere.cs
+++ b/sources/core/Xenko.Core.Mathematics/BoundingSphere.cs
@@ -50,7 +50,7 @@ public struct BoundingSphere : IEquatable<BoundingSphere>, IFormattable
         public Vector3 Center;
 
         /// <summary>
-        /// The radious of the sphere.
+        /// The radius of the sphere.
         /// </summary>
         public float Radius;
 
diff --git a/sources/core/Xenko.Core.Mathematics/CollisionHelper.cs b/sources/core/Xenko.Core.Mathematics/CollisionHelper.cs
index 65ed64d160..eadca9a26e 100644
--- a/sources/core/Xenko.Core.Mathematics/CollisionHelper.cs
+++ b/sources/core/Xenko.Core.Mathematics/CollisionHelper.cs
@@ -1503,49 +1503,37 @@ public static bool FrustumContainsBox(ref BoundingFrustum frustum, ref BoundingB
 
                 return true;
             }
-/*
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="BoundingFrustum" /> intersects or contains an AABB determined by its center and extent.
+        /// Faster variant specific for frustum culling. Takes a BoundingBox instead of BoundingBoxExt
+        /// </summary>
+        /// <param name="frustum">Camera frustum</param>
+        /// <param name="boundingBox">Bounding box</param>
+        /// <returns></returns>
+        public static bool FrustumContainsBox(ref BoundingFrustum frustum, ref BoundingBox boundingBox)
+        {
             unsafe
             {
                 fixed (Plane* planeStart = &frustum.LeftPlane)
-                fixed (Vector3* pExtent = &boundingBoxExt.Extent)
                 {
                     var plane = planeStart;
                     for (int i = 0; i < 6; ++i)
                     {
                         // Previous code:
-                        //if (Vector3.Dot(boundingBoxExt.Center, plane->Normal)
-                        //    + boundingBoxExt.Extent.X * Math.Abs(plane->Normal.X)
-                        //    + boundingBoxExt.Extent.Y * Math.Abs(plane->Normal.Y)
-                        //    + boundingBoxExt.Extent.Z * Math.Abs(plane->Normal.Z)
-                        //    <= -plane->D)
-
-                        // Optimized version (only 1 dot and cheaper Math.Abs)
-                        // https://fgiesen.wordpress.com/2010/10/17/view-frustum-culling/
-                        // return dot3(center, plane) + dot3(extent, absPlane) <= -plane.w;
-                        // or
-                        // vector4 signFlip = componentwise_and(plane, 0x80000000);
-                        // vector3 centerOffset = xor(extent, signFlip)
-                        // dot3(center + centerOffset, plane) <= -plane.w;
-
-                        uint val = (((uint*)&plane->Normal)[0] & 0x80000000) ^ ((uint*)pExtent)[0];
-                        var dist = plane->Normal.X * ((*(float*)(&val)) + boundingBoxExt.Center.X);
-
-                        val = (((uint*)&plane->Normal)[1] & 0x80000000) ^ ((uint*)pExtent)[1];
-                        dist += plane->Normal.Y * ((*(float*)(&val)) + boundingBoxExt.Center.Y);
-
-                        val = (((uint*)&plane->Normal)[2] & 0x80000000) ^ ((uint*)pExtent)[2];
-                        dist += plane->Normal.Z * ((*(float*)(&val)) + boundingBoxExt.Center.Z);
-
-                        if (dist <= -plane->D)
+                        if (Vector3.Dot(boundingBox.Center, plane->Normal)
+                            + boundingBox.Extent.X * Math.Abs(plane->Normal.X)
+                            + boundingBox.Extent.Y * Math.Abs(plane->Normal.Y)
+                            + boundingBox.Extent.Z * Math.Abs(plane->Normal.Z)
+                            <= -plane->D)
                             return false;
-
                         plane++;
                     }
                 }
 
                 return true;
             }
- */
         }
     }
 }
diff --git a/sources/core/Xenko.Core.Mathematics/Color.cs b/sources/core/Xenko.Core.Mathematics/Color.cs
index 60c8b0f506..e80d3e5d7c 100644
--- a/sources/core/Xenko.Core.Mathematics/Color.cs
+++ b/sources/core/Xenko.Core.Mathematics/Color.cs
@@ -44,16 +44,18 @@ public partial struct Color : IEquatable<Color>
         /// <param name="value">The value that will be assigned to all components.</param>
         public Color(byte value)
         {
-            A = R = G = B = value;
+            R = value;
+            G = value;
+            B = value;
+            A = value;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Color"/> struct.
         /// </summary>
         /// <param name="value">The value that will be assigned to all components.</param>
-        public Color(float value)
+        public Color(float value) : this(ToByte(value))
         {
-            A = R = G = B = ToByte(value);
         }
 
         /// <summary>
diff --git a/sources/core/Xenko.Core.Mathematics/Color3.cs b/sources/core/Xenko.Core.Mathematics/Color3.cs
index ce04091e2f..38868e0ed4 100644
--- a/sources/core/Xenko.Core.Mathematics/Color3.cs
+++ b/sources/core/Xenko.Core.Mathematics/Color3.cs
@@ -28,6 +28,7 @@
 */
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace Xenko.Core.Mathematics
@@ -42,6 +43,16 @@ public struct Color3 : IEquatable<Color3>, IFormattable
     {
         private const string ToStringFormat = "R:{0} G:{1} B:{2}";
 
+        /// <summary>
+        /// The Black color (0, 0, 0).
+        /// </summary>
+        public static readonly Color3 Black = new Color3(0.0f);
+
+        /// <summary>
+        /// The White color (1, 1, 1).
+        /// </summary>
+        public static readonly Color3 White = new Color3(1.0f);
+
         /// <summary>
         /// The red component of the color.
         /// </summary>
@@ -66,7 +77,9 @@ public struct Color3 : IEquatable<Color3>, IFormattable
         /// <param name="value">The value that will be assigned to all components.</param>
         public Color3(float value)
         {
-            R = G = B = value;
+            R = value;
+            G = value;
+            B = value;
         }
 
         /// <summary>
@@ -168,6 +181,30 @@ public float this[int index]
             }
         }
 
+        /// <summary>
+        /// Normalizes the RGB channels.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Normalize()
+        {
+            float length = (float)Math.Sqrt((R * R) + (G * G) + (B * B));
+            if (length > MathUtil.ZeroTolerance)
+            {
+                float inverse = 1.0f / length;
+                R *= inverse;
+                G *= inverse;
+                B *= inverse;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicting whether this instance is normalized.
+        /// </summary>
+        public bool IsNormalized
+        {
+            get { return Math.Abs((R * R) + (G * G) + (B * B) - 1f) < MathUtil.ZeroTolerance; }
+        }
+
         /// <summary>
         /// Converts the color into a packed integer.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/Color4.cs b/sources/core/Xenko.Core.Mathematics/Color4.cs
index 1480b00000..2421c707fb 100644
--- a/sources/core/Xenko.Core.Mathematics/Color4.cs
+++ b/sources/core/Xenko.Core.Mathematics/Color4.cs
@@ -28,6 +28,7 @@
 */
 using System;
 using System.Globalization;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace Xenko.Core.Mathematics
@@ -82,7 +83,10 @@ public struct Color4 : IEquatable<Color4>, IFormattable
         /// <param name="value">The value that will be assigned to all components.</param>
         public Color4(float value)
         {
-            A = R = G = B = value;
+            R = value;
+            G = value;
+            B = value;
+            A = value;
         }
 
         /// <summary>
@@ -159,8 +163,8 @@ public Color4(float[] values)
         {
             if (values == null)
                 throw new ArgumentNullException(nameof(values));
-            if (values.Length != 3 && values.Length != 4)
-                throw new ArgumentOutOfRangeException(nameof(values), "There must be 3 or 4 float[] values for Color4.");
+            if (values.Length < 3)
+                throw new ArgumentOutOfRangeException(nameof(values), "There must be at least 3 float[] values for Color4.");
 
             R = values[0];
             G = values[1];
@@ -301,6 +305,44 @@ public int ToRgba()
             return (int)value;
         }
 
+        /// <summary>
+        /// Converts the color into a byte Color
+        /// </summary>
+        /// <returns>A Color object</returns>
+        public Color ToColor()
+        {
+            byte a = (byte)(A * 255.0f);
+            byte r = (byte)(R * 255.0f);
+            byte g = (byte)(G * 255.0f);
+            byte b = (byte)(B * 255.0f);
+
+            return new Color(r, g, b, a);
+        }
+
+        /// <summary>
+        /// Normalizes the RGB channels.
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Normalize()
+        {
+            float length = (float)Math.Sqrt((R * R) + (G * G) + (B * B));
+            if (length > MathUtil.ZeroTolerance)
+            {
+                float inverse = 1.0f / length;
+                R *= inverse;
+                G *= inverse;
+                B *= inverse;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicting whether this instance is normalized.
+        /// </summary>
+        public bool IsNormalized
+        {
+            get { return Math.Abs((R * R) + (G * G) + (B * B) - 1f) < MathUtil.ZeroTolerance; }
+        }
+
         /// <summary>
         /// Converts the color into a three component vector.
         /// </summary>
@@ -446,6 +488,17 @@ public static Color4 Scale(Color4 value, float scale)
             return new Color4(value.R * scale, value.G * scale, value.B * scale, value.A * scale);
         }
 
+        /// <summary>
+        /// Scales a color's RGB channels.
+        /// </summary>
+        /// <param name="value">The color to scale.</param>
+        /// <param name="scale">The amount by which to scale.</param>
+        /// <returns>The scaled color.</returns>
+        public static Color4 ScaleRGB(Color4 value, float scale)
+        {
+            return new Color4(value.R * scale, value.G * scale, value.B * scale, value.A);
+        }
+
         /// <summary>
         /// Negates a color.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/ColorBGRA.cs b/sources/core/Xenko.Core.Mathematics/ColorBGRA.cs
index 02ffd94d26..17a17d6b53 100644
--- a/sources/core/Xenko.Core.Mathematics/ColorBGRA.cs
+++ b/sources/core/Xenko.Core.Mathematics/ColorBGRA.cs
@@ -46,16 +46,18 @@ public partial struct ColorBGRA : IEquatable<ColorBGRA>, IFormattable
         /// <param name="value">The value that will be assigned to all components.</param>
         public ColorBGRA(byte value)
         {
-            A = R = G = B = value;
+            B = value;
+            G = value;
+            R = value;
+            A = value;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ColorBGRA"/> struct.
         /// </summary>
         /// <param name="value">The value that will be assigned to all components.</param>
-        public ColorBGRA(float value)
+        public ColorBGRA(float value) : this(ToByte(value))
         {
-            A = R = G = B = ToByte(value);
         }
 
         /// <summary>
diff --git a/sources/core/Xenko.Core.Mathematics/Half2.cs b/sources/core/Xenko.Core.Mathematics/Half2.cs
index ebb11a64f9..374e4b501c 100644
--- a/sources/core/Xenko.Core.Mathematics/Half2.cs
+++ b/sources/core/Xenko.Core.Mathematics/Half2.cs
@@ -35,6 +35,32 @@ namespace Xenko.Core.Mathematics
     [StructLayout(LayoutKind.Sequential, Pack = 2)]
     public struct Half2 : IEquatable<Half2>
     {
+        /// <summary>
+        /// The size of the <see cref="Xenko.Core.Mathematics.Half2"/> type, in bytes.
+        /// </summary>
+        public static readonly int SizeInBytes = Utilities.SizeOf<Half2>();
+
+
+        /// <summary>
+        /// A <see cref="Xenko.Core.Mathematics.Half2"/> with all of its components set to zero.
+        /// </summary>
+        public static readonly Half2 Zero = new Half2();
+
+        /// <summary>
+        /// The X unit <see cref="Xenko.Core.Mathematics.Half2"/> (1, 0).
+        /// </summary>
+        public static readonly Half2 UnitX = new Half2(1.0f, 0.0f);
+
+        /// <summary>
+        /// The Y unit <see cref="Xenko.Core.Mathematics.Half2"/> (0, 1).
+        /// </summary>
+        public static readonly Half2 UnitY = new Half2(0.0f, 1.0f);
+
+        /// <summary>
+        /// A <see cref="Xenko.Core.Mathematics.Half2"/> with all of its components set to one.
+        /// </summary>
+        public static readonly Half2 One = new Half2(1.0f, 1.0f);
+
         /// <summary>
         /// Gets or sets the X component of the vector.
         /// </summary>
@@ -68,6 +94,23 @@ public Half2(Half value)
             this.Y = value;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Xenko.Core.Mathematics.Half2"/> struct.
+        /// </summary>
+        /// <param name="values">The values to assign to the X and Y components of the vector. This must be an array with two elements.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="values"/> contains more or less than two elements.</exception>
+        public Half2(Half[] values)
+        {
+            if (values == null)
+                throw new ArgumentNullException("values");
+            if (values.Length != 2)
+                throw new ArgumentOutOfRangeException("values", "There must be two and only two input values for Half2.");
+
+            X = values[0];
+            Y = values[1];
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Half2"/> structure.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/Half3.cs b/sources/core/Xenko.Core.Mathematics/Half3.cs
index aa1f162563..df1eb2f269 100644
--- a/sources/core/Xenko.Core.Mathematics/Half3.cs
+++ b/sources/core/Xenko.Core.Mathematics/Half3.cs
@@ -35,6 +35,36 @@ namespace Xenko.Core.Mathematics
     [StructLayout(LayoutKind.Sequential, Pack = 2)]
     public struct Half3 : IEquatable<Half3>
     {
+        /// <summary>
+        /// The size of the <see cref="Stride.Core.Mathematics.Half3"/> type, in bytes.
+        /// </summary>
+        public static readonly int SizeInBytes = Utilities.SizeOf<Half3>();
+
+        /// <summary>
+        /// A <see cref="Stride.Core.Mathematics.Half3"/> with all of its components set to zero.
+        /// </summary>
+        public static readonly Half3 Zero = new Half3();
+
+        /// <summary>
+        /// The X unit <see cref="Stride.Core.Mathematics.Half3"/> (1, 0, 0).
+        /// </summary>
+        public static readonly Half3 UnitX = new Half3(1.0f, 0.0f, 0.0f);
+
+        /// <summary>
+        /// The Y unit <see cref="Stride.Core.Mathematics.Half3"/> (0, 1, 0).
+        /// </summary>
+        public static readonly Half3 UnitY = new Half3(0.0f, 1.0f, 0.0f);
+
+        /// <summary>
+        /// The Z unit <see cref="Stride.Core.Mathematics.Half3"/> (0, 0, 1).
+        /// </summary>
+        public static readonly Half3 UnitZ = new Half3(0.0f, 0.0f, 1.0f);
+
+        /// <summary>
+        /// A <see cref="Stride.Core.Mathematics.Half3"/> with all of its components set to one.
+        /// </summary>
+        public static readonly Half3 One = new Half3(1.0f, 1.0f, 1.0f);
+
         /// <summary>
         /// Gets or sets the X component of the vector.
         /// </summary>
@@ -77,6 +107,24 @@ public Half3(Half value)
             this.Z = value;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Stride.Core.Mathematics.Half3"/> struct.
+        /// </summary>
+        /// <param name="values">The values to assign to the X, Y, and Z components of the vector. This must be an array with three elements.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="values"/> contains more or less than three elements.</exception>
+        public Half3(Half[] values)
+        {
+            if (values == null)
+                throw new ArgumentNullException("values");
+            if (values.Length != 3)
+                throw new ArgumentOutOfRangeException("values", "There must be three and only three input values for Half3.");
+
+            X = values[0];
+            Y = values[1];
+            Z = values[2];
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Half3"/> structure.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/Half4.cs b/sources/core/Xenko.Core.Mathematics/Half4.cs
index ab8bca96ba..0fbf03c38e 100644
--- a/sources/core/Xenko.Core.Mathematics/Half4.cs
+++ b/sources/core/Xenko.Core.Mathematics/Half4.cs
@@ -35,6 +35,41 @@ namespace Xenko.Core.Mathematics
     [StructLayout(LayoutKind.Sequential, Pack = 2)]
     public struct Half4 : IEquatable<Half4>
     {
+        /// <summary>
+        /// The size of the <see cref="Stride.Core.Mathematics.Half4"/> type, in bytes.
+        /// </summary>
+        public static readonly int SizeInBytes = Utilities.SizeOf<Half4>();
+
+        /// <summary>
+        /// A <see cref="Stride.Core.Mathematics.Half4"/> with all of its components set to zero.
+        /// </summary>
+        public static readonly Half4 Zero = new Half4();
+
+        /// <summary>
+        /// The X unit <see cref="Stride.Core.Mathematics.Half4"/> (1, 0, 0, 0).
+        /// </summary>
+        public static readonly Half4 UnitX = new Half4(1.0f, 0.0f, 0.0f, 0.0f);
+
+        /// <summary>
+        /// The Y unit <see cref="Stride.Core.Mathematics.Half4"/> (0, 1, 0, 0).
+        /// </summary>
+        public static readonly Half4 UnitY = new Half4(0.0f, 1.0f, 0.0f, 0.0f);
+
+        /// <summary>
+        /// The Z unit <see cref="Stride.Core.Mathematics.Half4"/> (0, 0, 1, 0).
+        /// </summary>
+        public static readonly Half4 UnitZ = new Half4(0.0f, 0.0f, 1.0f, 0.0f);
+
+        /// <summary>
+        /// The W unit <see cref="Stride.Core.Mathematics.Half4"/> (0, 0, 0, 1).
+        /// </summary>
+        public static readonly Half4 UnitW = new Half4(0.0f, 0.0f, 0.0f, 1.0f);
+
+        /// <summary>
+        /// A <see cref="Stride.Core.Mathematics.Half4"/> with all of its components set to one.
+        /// </summary>
+        public static readonly Half4 One = new Half4(1.0f, 1.0f, 1.0f, 1.0f);
+
         /// <summary>
         /// Gets or sets the X component of the vector.
         /// </summary>
@@ -86,6 +121,52 @@ public Half4(Half value)
             this.W = value;
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Stride.Core.Mathematics.Half4"/> struct.
+        /// </summary>
+        /// <param name="values">The values to assign to the X, Y, Z, and W components of the vector. This must be an array with four elements.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="values"/> is <c>null</c>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">Thrown when <paramref name="values"/> contains more or less than four elements.</exception>
+        public Half4(Half[] values)
+        {
+            if (values == null)
+                throw new ArgumentNullException("values");
+            if (values.Length != 4)
+                throw new ArgumentOutOfRangeException("values", "There must be four and only four input values for Half4.");
+
+            X = values[0];
+            Y = values[1];
+            Z = values[2];
+            W = values[3];
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Half4"/> structure.
+        /// </summary>
+        /// <param name="x">The X component.</param>
+        /// <param name="y">The Y component.</param>
+        /// <param name="z">The Z component.</param>
+        /// <param name="w">The W component.</param>
+        public Half4(float x, float y, float z, float w)
+        {
+            this.X = (Half)x;
+            this.Y = (Half)y;
+            this.Z = (Half)z;
+            this.W = (Half)w;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Half4"/> structure.
+        /// </summary>
+        /// <param name="value">The value to set for the X, Y, Z, and W components.</param>
+        public Half4(float value)
+        {
+            this.X = (Half)value;
+            this.Y = (Half)value;
+            this.Z = (Half)value;
+            this.W = (Half)value;
+        }
+
         /// <summary>
         /// Tests for equality between two objects.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/MathUtil.cs b/sources/core/Xenko.Core.Mathematics/MathUtil.cs
index cd0e7ebfce..868000fafa 100644
--- a/sources/core/Xenko.Core.Mathematics/MathUtil.cs
+++ b/sources/core/Xenko.Core.Mathematics/MathUtil.cs
@@ -107,6 +107,7 @@ public static unsafe bool NearEqual(float a, float b)
         /// </summary>
         /// <param name="a">The floating value.</param>
         /// <returns><c>true</c> if the specified value is close to zero (0.0f); otherwise, <c>false</c>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsZero(float a)
         {
             return Math.Abs(a) < ZeroTolerance;
@@ -117,6 +118,7 @@ public static bool IsZero(float a)
         /// </summary>
         /// <param name="a">The floating value.</param>
         /// <returns><c>true</c> if the specified value is close to zero (0.0f); otherwise, <c>false</c>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsZero(double a)
         {
             return Math.Abs(a) < ZeroToleranceDouble;
@@ -127,6 +129,7 @@ public static bool IsZero(double a)
         /// </summary>
         /// <param name="a">The floating value.</param>
         /// <returns><c>true</c> if the specified value is close to one (1.0f); otherwise, <c>false</c>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsOne(float a)
         {
             return IsZero(a - 1.0f);
@@ -166,6 +169,7 @@ public static T[] Array<T>(T value, int length)
         /// </summary>
         /// <param name="revolution">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float RevolutionsToDegrees(float revolution)
         {
             return revolution * 360.0f;
@@ -176,6 +180,7 @@ public static float RevolutionsToDegrees(float revolution)
         /// </summary>
         /// <param name="revolution">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float RevolutionsToRadians(float revolution)
         {
             return revolution * TwoPi;
@@ -186,6 +191,7 @@ public static float RevolutionsToRadians(float revolution)
         /// </summary>
         /// <param name="revolution">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float RevolutionsToGradians(float revolution)
         {
             return revolution * 400.0f;
@@ -196,6 +202,7 @@ public static float RevolutionsToGradians(float revolution)
         /// </summary>
         /// <param name="degree">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float DegreesToRevolutions(float degree)
         {
             return degree / 360.0f;
@@ -206,6 +213,7 @@ public static float DegreesToRevolutions(float degree)
         /// </summary>
         /// <param name="degree">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float DegreesToRadians(float degree)
         {
             return degree * (Pi / 180.0f);
@@ -216,6 +224,7 @@ public static float DegreesToRadians(float degree)
         /// </summary>
         /// <param name="radian">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float RadiansToRevolutions(float radian)
         {
             return radian / TwoPi;
@@ -226,6 +235,7 @@ public static float RadiansToRevolutions(float radian)
         /// </summary>
         /// <param name="radian">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float RadiansToGradians(float radian)
         {
             return radian * (200.0f / Pi);
@@ -236,6 +246,7 @@ public static float RadiansToGradians(float radian)
         /// </summary>
         /// <param name="gradian">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float GradiansToRevolutions(float gradian)
         {
             return gradian / 400.0f;
@@ -246,6 +257,7 @@ public static float GradiansToRevolutions(float gradian)
         /// </summary>
         /// <param name="gradian">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float GradiansToDegrees(float gradian)
         {
             return gradian * (9.0f / 10.0f);
@@ -256,6 +268,7 @@ public static float GradiansToDegrees(float gradian)
         /// </summary>
         /// <param name="gradian">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float GradiansToRadians(float gradian)
         {
             return gradian * (Pi / 200.0f);
@@ -266,6 +279,7 @@ public static float GradiansToRadians(float gradian)
         /// </summary>
         /// <param name="radian">The value to convert.</param>
         /// <returns>The converted value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float RadiansToDegrees(float radian)
         {
             return radian * (180.0f / Pi);
@@ -278,6 +292,7 @@ public static float RadiansToDegrees(float radian)
         /// <param name="min">The min.</param>
         /// <param name="max">The max.</param>
         /// <returns>The result of clamping a value between min and max</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float Clamp(float value, float min, float max)
         {
             return value < min ? min : value > max ? max : value;
@@ -290,6 +305,7 @@ public static float Clamp(float value, float min, float max)
         /// <param name="min">The min.</param>
         /// <param name="max">The max.</param>
         /// <returns>The result of clamping a value between min and max</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double Clamp(double value, double min, double max)
         {
             return value < min ? min : value > max ? max : value;
@@ -302,6 +318,7 @@ public static double Clamp(double value, double min, double max)
         /// <param name="min">The min.</param>
         /// <param name="max">The max.</param>
         /// <returns>The result of clamping a value between min and max</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static int Clamp(int value, int min, int max)
         {
             return value < min ? min : value > max ? max : value;
@@ -314,6 +331,7 @@ public static int Clamp(int value, int min, int max)
         /// <param name="max">Maximum value that takes place in inverse-interpolation.</param>
         /// <param name="value">Value to get inverse interpolation.</param>
         /// <returns>Returns an inverse-linearly interpolated coeficient.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float InverseLerp(float min, float max, float value)
         {
             if (IsZero(Math.Abs(max - min)))
@@ -328,6 +346,7 @@ public static float InverseLerp(float min, float max, float value)
         /// <param name="max">Maximum value that takes place in inverse-interpolation.</param>
         /// <param name="value">Value to get inverse interpolation.</param>
         /// <returns>Returns an inverse-linearly interpolated coeficient.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double InverseLerp(double min, double max, double value)
         {
             if (IsZero(Math.Abs(max - min)))
@@ -346,6 +365,7 @@ public static double InverseLerp(double min, double max, double value)
         /// <param name="to">Value to interpolate to.</param>
         /// <param name="amount">Interpolation amount.</param>
         /// <returns>The result of linear interpolation of values based on the amount.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static double Lerp(double from, double to, double amount)
         {
             return (1 - amount) * from + amount * to;
@@ -362,6 +382,7 @@ public static double Lerp(double from, double to, double amount)
         /// <param name="to">Value to interpolate to.</param>
         /// <param name="amount">Interpolation amount.</param>
         /// <returns>The result of linear interpolation of values based on the amount.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float Lerp(float from, float to, float amount)
         {
             return (1 - amount) * from + amount * to;
@@ -378,6 +399,7 @@ public static float Lerp(float from, float to, float amount)
         /// <param name="to">Value to interpolate to.</param>
         /// <param name="amount">Interpolation amount.</param>
         /// <returns>The result of linear interpolation of values based on the amount.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static byte Lerp(byte from, byte to, float amount)
         {
             return (byte)Lerp((float)from, (float)to, amount);
@@ -390,6 +412,7 @@ public static byte Lerp(byte from, byte to, float amount)
         /// See https://en.wikipedia.org/wiki/Smoothstep
         /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float SmoothStep(float amount)
         {
             return (amount <= 0) ? 0
@@ -404,6 +427,7 @@ public static float SmoothStep(float amount)
         /// See https://en.wikipedia.org/wiki/Smoothstep
         /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float SmootherStep(float amount)
         {
             return (amount <= 0) ? 0
@@ -418,6 +442,7 @@ public static float SmootherStep(float amount)
         /// <param name="min">The minimum value of the range.</param>
         /// <param name="max">The maximum value of the range.</param>
         /// <returns><c>true</c> if value is inside the specified range; otherwise, <c>false</c>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsInRange(float value, float min, float max)
         {
             return min <= value && value <= max;
@@ -430,6 +455,7 @@ public static bool IsInRange(float value, float min, float max)
         /// <param name="min">The minimum value of the range.</param>
         /// <param name="max">The maximum value of the range.</param>
         /// <returns><c>true</c> if value is inside the specified range; otherwise, <c>false</c>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsInRange(int value, int min, int max)
         {
             return min <= value && value <= max;
@@ -440,6 +466,7 @@ public static bool IsInRange(int value, int min, int max)
         /// </summary>
         /// <param name="x">The x.</param>
         /// <returns><c>true</c> if the specified x is pow2; otherwise, <c>false</c>.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool IsPow2(int x)
         {
             return ((x != 0) && (x & (x - 1)) == 0);
@@ -450,6 +477,7 @@ public static bool IsPow2(int x)
         /// </summary>
         /// <param name="sRgbValue">The sRGB value.</param>
         /// <returns>A linear value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float SRgbToLinear(float sRgbValue)
         {
             if (sRgbValue < 0.04045f) return sRgbValue / 12.92f;
@@ -461,6 +489,7 @@ public static float SRgbToLinear(float sRgbValue)
         /// </summary>
         /// <param name="linearValue">The linear value.</param>
         /// <returns>The encoded sRGB value.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float LinearToSRgb(float linearValue)
         {
             if (linearValue < 0.0031308f) return linearValue * 12.92f;
@@ -472,6 +501,7 @@ public static float LinearToSRgb(float linearValue)
         /// </summary>
         /// <param name="x">The input float</param>
         /// <returns><value>Log2(x)</value></returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static float Log2(float x)
         {
             return (float)Math.Log(x) / 0.6931471805599453f;
@@ -651,5 +681,16 @@ public static Vector4 Snap(Vector4 value, float gap)
                 (float)Math.Round((value.Z / gap), MidpointRounding.AwayFromZero) * gap,
                 (float)Math.Round((value.W / gap), MidpointRounding.AwayFromZero) * gap);
         }
+
+        /// <summary>
+        /// Computes standard mathematical modulo (as opposed to remainder).
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <param name="divisor">The divisor.</param>
+        /// <returns>A value between 0 and divisor. The result will have the same sign as divisor.</returns>
+        public static float Mod(float value, float divisor)
+        {
+            return ((value % divisor) + divisor) % divisor;
+        }
     }
 }
diff --git a/sources/core/Xenko.Core.Mathematics/Matrix.cs b/sources/core/Xenko.Core.Mathematics/Matrix.cs
index acf461b9bb..390546d5d4 100644
--- a/sources/core/Xenko.Core.Mathematics/Matrix.cs
+++ b/sources/core/Xenko.Core.Mathematics/Matrix.cs
@@ -7,17 +7,17 @@
 // -----------------------------------------------------------------------------
 /*
 * Copyright (c) 2007-2011 SlimDX Group
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -77,7 +77,7 @@ public struct Matrix : IEquatable<Matrix>, IFormattable
         /// Value at row 4 column 1 of the matrix.
         /// </summary>
         public float M41;
-        
+
         /// <summary>
         /// Value at row 1 column 2 of the matrix.
         /// </summary>
@@ -102,7 +102,7 @@ public struct Matrix : IEquatable<Matrix>, IFormattable
         /// Value at row 1 column 3 of the matrix.
         /// </summary>
         public float M13;
-        
+
         /// <summary>
         /// Value at row 2 column 3 of the matrix.
         /// </summary>
@@ -117,7 +117,7 @@ public struct Matrix : IEquatable<Matrix>, IFormattable
         /// Value at row 4 column 3 of the matrix.
         /// </summary>
         public float M43;
-        
+
         /// <summary>
         /// Value at row 1 column 4 of the matrix.
         /// </summary>
@@ -598,14 +598,14 @@ public void DecomposeLQ(out Matrix L, out Matrix Q)
 
             L = new Matrix();
             L.M11 = Vector4.Dot(Q.Row1, Row1);
-            
+
             L.M21 = Vector4.Dot(Q.Row1, Row2);
             L.M22 = Vector4.Dot(Q.Row2, Row2);
-            
+
             L.M31 = Vector4.Dot(Q.Row1, Row3);
             L.M32 = Vector4.Dot(Q.Row2, Row3);
             L.M33 = Vector4.Dot(Q.Row3, Row3);
-            
+
             L.M41 = Vector4.Dot(Q.Row1, Row4);
             L.M42 = Vector4.Dot(Q.Row2, Row4);
             L.M43 = Vector4.Dot(Q.Row3, Row4);
@@ -622,7 +622,7 @@ public void Decompose(out float yaw, out float pitch, out float roll)
         {
             pitch = (float)Math.Asin(-M32);
             // Hardcoded constant - burn him, he's a witch
-            // double threshold = 0.001; 
+            // double threshold = 0.001;
             double test = Math.Cos(pitch);
             if (test > MathUtil.ZeroTolerance)
             {
@@ -694,7 +694,7 @@ public bool Decompose(out Vector3 scale, out Vector3 translation)
         /// Decomposes a matrix into a scale, rotation, and translation.
         /// </summary>
         /// <param name="scale">When the method completes, contains the scaling component of the decomposed matrix.</param>
-        /// <param name="rotation">When the method completes, contains the rtoation component of the decomposed matrix.</param>
+        /// <param name="rotation">When the method completes, contains the rotation component of the decomposed matrix.</param>
         /// <param name="translation">When the method completes, contains the translation component of the decomposed matrix.</param>
         /// <remarks>
         /// This method is designed to decompose an SRT transformation matrix only.
@@ -707,11 +707,98 @@ public bool Decompose(out Vector3 scale, out Quaternion rotation, out Vector3 tr
             return true;
         }
 
+        /// <summary>
+        /// Decomposes a matrix into a rotation.
+        /// </summary>
+        /// <param name="matrix">When the method completes, contains the rotation component of the decomposed matrix.</param>
+        /// <remarks>
+        /// This method is designed to decompose an SRT transformation matrix only.
+        /// </remarks>
+        public bool GetRotationMatrix(out Matrix matrix)
+        {
+            Vector3 scale;
+            
+            //Scaling is the length of the rows.
+            scale.X = (float)Math.Sqrt((M11 * M11) + (M12 * M12) + (M13 * M13));
+            scale.Y = (float)Math.Sqrt((M21 * M21) + (M22 * M22) + (M23 * M23));
+            scale.Z = (float)Math.Sqrt((M31 * M31) + (M32 * M32) + (M33 * M33));
+            
+            //If any of the scaling factors are zero, than the rotation matrix can not exist.
+            if (Math.Abs(scale.X) < MathUtil.ZeroTolerance ||
+                Math.Abs(scale.Y) < MathUtil.ZeroTolerance ||
+                Math.Abs(scale.Z) < MathUtil.ZeroTolerance)
+            {
+                matrix = Matrix.Identity;
+                return false;
+            }
+
+            // Calculate an perfect orthonormal matrix (no reflections)
+            var at = new Vector3(M31 / scale.Z, M32 / scale.Z, M33 / scale.Z);
+            var up = Vector3.Cross(at, new Vector3(M11 / scale.X, M12 / scale.X, M13 / scale.X));
+            var right = Vector3.Cross(up, at);
+
+            matrix = Identity;
+            matrix.Right = right;
+            matrix.Up = up;
+            matrix.Backward = at;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Decomposes a matrix into a scale.
+        /// </summary>
+        /// <param name="scale">When the method completes, contains the scale component of the decomposed matrix.</param>
+        public void GetScale(out Vector3 scale) {
+            //Scaling is the length of the rows.
+            scale.X = (float)Math.Sqrt((M11 * M11) + (M12 * M12) + (M13 * M13));
+            scale.Y = (float)Math.Sqrt((M21 * M21) + (M22 * M22) + (M23 * M23));
+            scale.Z = (float)Math.Sqrt((M31 * M31) + (M32 * M32) + (M33 * M33));
+        }
+
+        /// <summary>
+        /// Decomposes a matrix into a rotation.
+        /// </summary>
+        /// <param name="q">When the method completes, contains the rotation component of the decomposed matrix.</param>
+        /// <remarks>
+        /// This method is designed to decompose an SRT transformation matrix only.
+        /// </remarks>
+        public bool GetRotationQuaternion(out Quaternion q)
+        {
+            Vector3 scale;
+
+            //Scaling is the length of the rows.
+            scale.X = (float)Math.Sqrt((M11 * M11) + (M12 * M12) + (M13 * M13));
+            scale.Y = (float)Math.Sqrt((M21 * M21) + (M22 * M22) + (M23 * M23));
+            scale.Z = (float)Math.Sqrt((M31 * M31) + (M32 * M32) + (M33 * M33));
+
+            //If any of the scaling factors are zero, than the rotation matrix can not exist.
+            if (Math.Abs(scale.X) < MathUtil.ZeroTolerance ||
+                Math.Abs(scale.Y) < MathUtil.ZeroTolerance ||
+                Math.Abs(scale.Z) < MathUtil.ZeroTolerance) {
+                q = Quaternion.Identity;
+                return false;
+            }
+
+            // Calculate an perfect orthonormal matrix (no reflections)
+            var at = new Vector3(M31 / scale.Z, M32 / scale.Z, M33 / scale.Z);
+            var up = Vector3.Cross(at, new Vector3(M11 / scale.X, M12 / scale.X, M13 / scale.X));
+            var right = Vector3.Cross(up, at);
+
+            Matrix matrix = Identity;
+            matrix.Right = right;
+            matrix.Up = up;
+            matrix.Backward = at;
+            Quaternion.RotationMatrix(ref matrix, out q);
+
+            return true;
+        }
+
         /// <summary>
         /// Decomposes a matrix into a scale, rotation, and translation.
         /// </summary>
         /// <param name="scale">When the method completes, contains the scaling component of the decomposed matrix.</param>
-        /// <param name="rotation">When the method completes, contains the rtoation component of the decomposed matrix.</param>
+        /// <param name="rotation">When the method completes, contains the rotation component of the decomposed matrix.</param>
         /// <param name="translation">When the method completes, contains the translation component of the decomposed matrix.</param>
         /// <remarks>
         /// This method is designed to decompose an SRT transformation matrix only.
@@ -956,6 +1043,8 @@ public static Matrix Multiply(Matrix left, float right)
 
         /// <summary>
         /// Determines the product of two matrices.
+        /// Variables passed as <paramref name="left"/> or <paramref name="right"/> must not be used as the out parameter
+        /// <paramref name="result"/>, because <paramref name="result"/> is calculated in-place.
         /// </summary>
         /// <param name="left">The first matrix to multiply.</param>
         /// <param name="right">The second matrix to multiply.</param>
@@ -982,6 +1071,8 @@ public static void MultiplyTo(ref Matrix left, ref Matrix right, out Matrix resu
 
         /// <summary>
         /// Determines the product of two matrices.
+        /// Variables passed as <paramref name="left"/> or <paramref name="right"/> must not be used as the out parameter
+        /// <paramref name="result"/>, because <paramref name="result"/> is calculated in-place.
         /// </summary>
         /// <param name="left">The first matrix to multiply.</param>
         /// <param name="right">The second matrix to multiply.</param>
@@ -1008,6 +1099,8 @@ public static void Multiply(ref Matrix left, ref Matrix right, out Matrix result
 
         /// <summary>
         /// Determines the product of two matrices.
+        /// Variables passed as <paramref name="left"/> or <paramref name="right"/> must not be used as the out parameter
+        /// <paramref name="result"/>, because <paramref name="result"/> is calculated in-place.
         /// </summary>
         /// <param name="left">The first matrix to multiply.</param>
         /// <param name="right">The second matrix to multiply.</param>
@@ -1223,16 +1316,16 @@ public static Matrix Negate(Matrix value)
         }
 
         /// <summary>
-        /// Performs a linear interpolation between two matricies.
+        /// Performs a linear interpolation between two matrices.
         /// </summary>
         /// <param name="start">Start matrix.</param>
         /// <param name="end">End matrix.</param>
         /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
-        /// <param name="result">When the method completes, contains the linear interpolation of the two matricies.</param>
+        /// <param name="result">When the method completes, contains the linear interpolation of the two matrices.</param>
         /// <remarks>
         /// This method performs the linear interpolation based on the following formula.
         /// <code>start + (end - start) * amount</code>
-        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned.
         /// </remarks>
         public static void Lerp(ref Matrix start, ref Matrix end, float amount, out Matrix result)
         {
@@ -1255,7 +1348,7 @@ public static void Lerp(ref Matrix start, ref Matrix end, float amount, out Matr
         }
 
         /// <summary>
-        /// Performs a linear interpolation between two matricies.
+        /// Performs a linear interpolation between two matrices.
         /// </summary>
         /// <param name="start">Start matrix.</param>
         /// <param name="end">End matrix.</param>
@@ -1264,7 +1357,7 @@ public static void Lerp(ref Matrix start, ref Matrix end, float amount, out Matr
         /// <remarks>
         /// This method performs the linear interpolation based on the following formula.
         /// <code>start + (end - start) * amount</code>
-        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned.
         /// </remarks>
         public static Matrix Lerp(Matrix start, Matrix end, float amount)
         {
@@ -1274,7 +1367,7 @@ public static Matrix Lerp(Matrix start, Matrix end, float amount)
         }
 
         /// <summary>
-        /// Performs a cubic interpolation between two matricies.
+        /// Performs a cubic interpolation between two matrices.
         /// </summary>
         /// <param name="start">Start matrix.</param>
         /// <param name="end">End matrix.</param>
@@ -1448,14 +1541,23 @@ public static void Orthogonalize(ref Matrix value, out Matrix result)
             //By separating the above algorithm into multiple lines, we actually increase accuracy.
             result = value;
 
-            result.Row2 = result.Row2 - (Vector4.Dot(result.Row1, result.Row2) / Vector4.Dot(result.Row1, result.Row1)) * result.Row1;
+            var row1 = result.Row1;
+            var row2 = result.Row2;
+            var row3 = result.Row3;
+            var row4 = result.Row4;
 
-            result.Row3 = result.Row3 - (Vector4.Dot(result.Row1, result.Row3) / Vector4.Dot(result.Row1, result.Row1)) * result.Row1;
-            result.Row3 = result.Row3 - (Vector4.Dot(result.Row2, result.Row3) / Vector4.Dot(result.Row2, result.Row2)) * result.Row2;
+            row2 = row2 - (Vector4.Dot(row1, row2) / Vector4.Dot(row1, row1)) * row1;
 
-            result.Row4 = result.Row4 - (Vector4.Dot(result.Row1, result.Row4) / Vector4.Dot(result.Row1, result.Row1)) * result.Row1;
-            result.Row4 = result.Row4 - (Vector4.Dot(result.Row2, result.Row4) / Vector4.Dot(result.Row2, result.Row2)) * result.Row2;
-            result.Row4 = result.Row4 - (Vector4.Dot(result.Row3, result.Row4) / Vector4.Dot(result.Row3, result.Row3)) * result.Row3;
+            row3 = row3 - (Vector4.Dot(row1, row3) / Vector4.Dot(row1, row1)) * row1;
+            row3 = row3 - (Vector4.Dot(row2, row3) / Vector4.Dot(row2, row2)) * row2;
+
+            row4 = row4 - (Vector4.Dot(row1, row4) / Vector4.Dot(row1, row1)) * row1;
+            row4 = row4 - (Vector4.Dot(row2, row4) / Vector4.Dot(row2, row2)) * row2;
+            row4 = row4 - (Vector4.Dot(row3, row4) / Vector4.Dot(row3, row3)) * row3;
+
+            result.Row2 = row2;
+            result.Row3 = row3;
+            result.Row4 = row4;
         }
 
         /// <summary>
@@ -1510,21 +1612,30 @@ public static void Orthonormalize(ref Matrix value, out Matrix result)
             //q4 = (m4 - (q1 ⋅ m4) * q1 - (q2 ⋅ m4) * q2 - (q3 ⋅ m4) * q3) / |m4 - (q1 ⋅ m4) * q1 - (q2 ⋅ m4) * q2 - (q3 ⋅ m4) * q3|
 
             //By separating the above algorithm into multiple lines, we actually increase accuracy.
-            result = value;
+            var row1 = value.Row1;
+            var row2 = value.Row2;
+            var row3 = value.Row3;
+            var row4 = value.Row4;
+
+            row1.Normalize();
 
-            result.Row1 = Vector4.Normalize(result.Row1);
+            row2 = row2 - Vector4.Dot(row1, row2) * row1;
+            row2.Normalize();
 
-            result.Row2 = result.Row2 - Vector4.Dot(result.Row1, result.Row2) * result.Row1;
-            result.Row2 = Vector4.Normalize(result.Row2);
+            row3 = row3 - Vector4.Dot(row1, row3) * row1;
+            row3 = row3 - Vector4.Dot(row2, row3) * row2;
+            row3.Normalize();
 
-            result.Row3 = result.Row3 - Vector4.Dot(result.Row1, result.Row3) * result.Row1;
-            result.Row3 = result.Row3 - Vector4.Dot(result.Row2, result.Row3) * result.Row2;
-            result.Row3 = Vector4.Normalize(result.Row3);
+            row4 = row4 - Vector4.Dot(row1, row4) * row1;
+            row4 = row4 - Vector4.Dot(row2, row4) * row2;
+            row4 = row4 - Vector4.Dot(row3, row4) * row3;
+            row4.Normalize();
 
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row1, result.Row4) * result.Row1;
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row2, result.Row4) * result.Row2;
-            result.Row4 = result.Row4 - Vector4.Dot(result.Row3, result.Row4) * result.Row3;
-            result.Row4 = Vector4.Normalize(result.Row4);
+            result = default;
+            result.Row1 = row1;
+            result.Row2 = row2;
+            result.Row3 = row3;
+            result.Row4 = row4;
         }
 
         /// <summary>
@@ -2450,13 +2561,13 @@ public static Matrix Reflection(Plane plane)
         /// <param name="plane">The plane onto which to project the geometry as a shadow. This parameter is assumed to be normalized.</param>
         /// <param name="result">When the method completes, contains the shadow matrix.</param>
         public static void Shadow(ref Vector4 light, ref Plane plane, out Matrix result)
-        {        
+        {
             float dot = (plane.Normal.X * light.X) + (plane.Normal.Y * light.Y) + (plane.Normal.Z * light.Z) + (plane.D * light.W);
             float x = -plane.Normal.X;
             float y = -plane.Normal.Y;
             float z = -plane.Normal.Z;
             float d = -plane.D;
-        
+
             result.M11 = (x * light.X) + dot;
             result.M21 = y * light.X;
             result.M31 = z * light.X;
@@ -2474,7 +2585,7 @@ public static void Shadow(ref Vector4 light, ref Plane plane, out Matrix result)
             result.M34 = z * light.W;
             result.M44 = (d * light.W) + dot;
         }
-        
+
         /// <summary>
         /// Creates a matrix that flattens geometry into a shadow.
         /// </summary>
@@ -2724,6 +2835,78 @@ public static void RotationQuaternion(ref Quaternion rotation, out Matrix result
             result.M33 = 1.0f - (2.0f * (yy + xx));
         }
 
+        /// <summary>
+        /// Creates a matrix that contains both the X, Y and Z rotation, as well as scaling and translation. Note: This function is NOT thead safe.
+        /// </summary>
+        /// <param name="scaling">The scaling.</param>
+        /// <param name="rotation">Angle of rotation in radians. Angles are measured clockwise when looking along the rotation axis toward the origin.</param>
+        /// <param name="translation">The translation.</param>
+        /// <returns>Computed transformation matrix</returns>
+        public static Matrix Transformation(Vector3 scaling, Quaternion rotation, Vector3 translation)
+        {
+            // Equivalent to:
+            //result =
+            //    Matrix.Scaling(scaling)
+            //    *Matrix.RotationX(rotation.X)
+            //    *Matrix.RotationY(rotation.Y)
+            //    *Matrix.RotationZ(rotation.Z)
+            //    *Matrix.Position(translation);
+
+            // Rotation
+            float xx = rotation.X * rotation.X;
+            float yy = rotation.Y * rotation.Y;
+            float zz = rotation.Z * rotation.Z;
+            float xy = rotation.X * rotation.Y;
+            float zw = rotation.Z * rotation.W;
+            float zx = rotation.Z * rotation.X;
+            float yw = rotation.Y * rotation.W;
+            float yz = rotation.Y * rotation.Z;
+            float xw = rotation.X * rotation.W;
+
+            Matrix result;
+            result.M11 = 1.0f - (2.0f * (yy + zz));
+            result.M12 = 2.0f * (xy + zw);
+            result.M13 = 2.0f * (zx - yw);
+            result.M21 = 2.0f * (xy - zw);
+            result.M22 = 1.0f - (2.0f * (zz + xx));
+            result.M23 = 2.0f * (yz + xw);
+            result.M31 = 2.0f * (zx + yw);
+            result.M32 = 2.0f * (yz - xw);
+            result.M33 = 1.0f - (2.0f * (yy + xx));
+
+            // Position
+            result.M41 = translation.X;
+            result.M42 = translation.Y;
+            result.M43 = translation.Z;
+
+            // Scale
+            if (scaling.X != 1.0f)
+            {
+                result.M11 *= scaling.X;
+                result.M12 *= scaling.X;
+                result.M13 *= scaling.X;
+            }
+            if (scaling.Y != 1.0f)
+            {
+                result.M21 *= scaling.Y;
+                result.M22 *= scaling.Y;
+                result.M23 *= scaling.Y;
+            }
+            if (scaling.Z != 1.0f)
+            {
+                result.M31 *= scaling.Z;
+                result.M32 *= scaling.Z;
+                result.M33 *= scaling.Z;
+            }
+
+            result.M14 = 0.0f;
+            result.M24 = 0.0f;
+            result.M34 = 0.0f;
+            result.M44 = 1.0f;
+
+            return result;
+        }
+
         /// <summary>
         /// Creates a matrix that contains both the X, Y and Z rotation, as well as scaling and translation. Note: This function is NOT thead safe.
         /// </summary>
@@ -2814,7 +2997,7 @@ public static Matrix RotationQuaternion(Quaternion rotation)
         /// <param name="result">When the method completes, contains the created rotation matrix.</param>
         public static void RotationYawPitchRoll(float yaw, float pitch, float roll, out Matrix result)
         {
-            Quaternion quaternion = new Quaternion();
+            Quaternion quaternion;
             Quaternion.RotationYawPitchRoll(yaw, pitch, roll, out quaternion);
             RotationQuaternion(ref quaternion, out result);
         }
@@ -3009,7 +3192,7 @@ public static void Transformation(ref Vector3 scalingCenter, ref Quaternion scal
             Matrix sr = RotationQuaternion(scalingRotation);
 
             result = Translation(-scalingCenter) * Transpose(sr) * Scaling(scaling) * sr * Translation(scalingCenter) * Translation(-rotationCenter) *
-                RotationQuaternion(rotation) * Translation(rotationCenter) * Translation(translation);       
+                RotationQuaternion(rotation) * Translation(rotationCenter) * Translation(translation);
         }
 
         /// <summary>
@@ -3041,7 +3224,7 @@ public static Matrix Transformation(Vector3 scalingCenter, Quaternion scalingRot
         /// <param name="result">When the method completes, contains the created transformation matrix.</param>
         public static void Transformation2D(ref Vector2 scalingCenter, float scalingRotation, ref Vector2 scaling, ref Vector2 rotationCenter, float rotation, ref Vector2 translation, out Matrix result)
         {
-            result = Translation((Vector3)(-scalingCenter)) * RotationZ(-scalingRotation) * Scaling((Vector3)scaling) * RotationZ(scalingRotation) * Translation((Vector3)scalingCenter) * 
+            result = Translation((Vector3)(-scalingCenter)) * RotationZ(-scalingRotation) * Scaling((Vector3)scaling) * RotationZ(scalingRotation) * Translation((Vector3)scalingCenter) *
                 Translation((Vector3)(-rotationCenter)) * RotationZ(rotation) * Translation((Vector3)rotationCenter) * Translation((Vector3)translation);
 
             result.M33 = 1f;
@@ -3113,11 +3296,11 @@ public unsafe void TransposeMatrixFrom(float* src, int columns, int rows)
         }
 
         /// <summary>
-        /// Adds two matricies.
+        /// Adds two matrices.
         /// </summary>
         /// <param name="left">The first matrix to add.</param>
         /// <param name="right">The second matrix to add.</param>
-        /// <returns>The sum of the two matricies.</returns>
+        /// <returns>The sum of the two matrices.</returns>
         public static Matrix operator +(Matrix left, Matrix right)
         {
             Matrix result;
@@ -3136,11 +3319,11 @@ public unsafe void TransposeMatrixFrom(float* src, int columns, int rows)
         }
 
         /// <summary>
-        /// Subtracts two matricies.
+        /// Subtracts two matrices.
         /// </summary>
         /// <param name="left">The first matrix to subtract.</param>
         /// <param name="right">The second matrix to subtract.</param>
-        /// <returns>The difference between the two matricies.</returns>
+        /// <returns>The difference between the two matrices.</returns>
         public static Matrix operator -(Matrix left, Matrix right)
         {
             Matrix result;
@@ -3191,7 +3374,7 @@ public unsafe void TransposeMatrixFrom(float* src, int columns, int rows)
         /// </summary>
         /// <param name="left">The first matrix to multiply.</param>
         /// <param name="right">The second matrix to multiply.</param>
-        /// <returns>The product of the two matricies.</returns>
+        /// <returns>The product of the two matrices.</returns>
         public static Matrix operator *(Matrix left, Matrix right)
         {
             Matrix result;
@@ -3213,11 +3396,11 @@ public unsafe void TransposeMatrixFrom(float* src, int columns, int rows)
         }
 
         /// <summary>
-        /// Divides two matricies.
+        /// Divides two matrices.
         /// </summary>
         /// <param name="left">The first matrix to divide.</param>
         /// <param name="right">The second matrix to divide.</param>
-        /// <returns>The quotient of the two matricies.</returns>
+        /// <returns>The quotient of the two matrices.</returns>
         public static Matrix operator /(Matrix left, Matrix right)
         {
             Matrix result;
@@ -3318,7 +3501,7 @@ public string ToString(string format, IFormatProvider formatProvider)
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {
diff --git a/sources/core/Xenko.Core.Mathematics/OrientedBoundingBox.cs b/sources/core/Xenko.Core.Mathematics/OrientedBoundingBox.cs
new file mode 100644
index 0000000000..57d53004c8
--- /dev/null
+++ b/sources/core/Xenko.Core.Mathematics/OrientedBoundingBox.cs
@@ -0,0 +1,904 @@
+// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace Xenko.Core.Mathematics
+{
+    /// <summary>
+    /// OrientedBoundingBox (OBB) is a rectangular block, much like an AABB (BoundingBox) but with an arbitrary orientation.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    public struct OrientedBoundingBox : IEquatable<OrientedBoundingBox>, IFormattable
+    {
+        /// <summary>
+        /// Half lengths of the box along each axis.
+        /// </summary>
+        public Vector3 Extents;
+
+        /// <summary>
+        /// The matrix which aligns and scales the box, and its translation vector represents the center of the box.
+        /// </summary>
+        public Matrix Transformation;
+
+        /// <summary>
+        /// Creates an <see cref="OrientedBoundingBox"/> from a BoundingBox.
+        /// </summary>
+        /// <param name="bb">The BoundingBox to create from.</param>
+        /// <remarks>
+        /// Initially, the OBB is axis-aligned box, but it can be rotated and transformed later.
+        /// </remarks>
+        public OrientedBoundingBox(BoundingBox bb)
+        {
+            var Center = bb.Minimum + (bb.Maximum - bb.Minimum) / 2f;
+            Extents = bb.Maximum - Center;
+            Transformation = Matrix.Translation(Center);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="OrientedBoundingBox"/> which contained between two minimum and maximum points.
+        /// </summary>
+        /// <param name="minimum">The minimum vertex of the bounding box.</param>
+        /// <param name="maximum">The maximum vertex of the bounding box.</param>
+        /// <remarks>
+        /// Initially, the OrientedBoundingBox is axis-aligned box, but it can be rotated and transformed later.
+        /// </remarks>
+        public OrientedBoundingBox(Vector3 minimum, Vector3 maximum)
+        {
+            var Center = minimum + (maximum - minimum) / 2f;
+            Extents = maximum - Center;
+            Transformation = Matrix.Translation(Center);
+        }
+
+        /// <summary>
+        /// Creates an <see cref="OrientedBoundingBox"/> that fully contains the given points.
+        /// </summary>
+        /// <param name="points">The points that will be contained by the box.</param>
+        /// <remarks>
+        /// This method is not for computing the best tight-fitting OrientedBoundingBox.
+        /// And initially, the OrientedBoundingBox is axis-aligned box, but it can be rotated and transformed later.
+        /// </remarks>
+        public OrientedBoundingBox(Vector3[] points)
+        {
+            if (points == null || points.Length == 0)
+                throw new ArgumentNullException("points");
+
+            Vector3 minimum = new Vector3(float.MaxValue);
+            Vector3 maximum = new Vector3(float.MinValue);
+
+            for (int i = 0; i < points.Length; ++i)
+            {
+                Vector3.Min(ref minimum, ref points[i], out minimum);
+                Vector3.Max(ref maximum, ref points[i], out maximum);
+            }
+
+            var Center = minimum + (maximum - minimum) / 2f;
+            Extents = maximum - Center;
+            Transformation = Matrix.Translation(Center);
+        }
+
+        /// <summary>
+        /// Retrieves the eight corners of the bounding box.
+        /// </summary>
+        /// <returns>An array of points representing the eight corners of the bounding box.</returns>
+        public Vector3[] GetCorners()
+        {
+            var xv = new Vector3(Extents.X, 0, 0);
+            var yv = new Vector3(0, Extents.Y, 0);
+            var zv = new Vector3(0, 0, Extents.Z);
+            Vector3.TransformNormal(ref xv, ref Transformation, out xv);
+            Vector3.TransformNormal(ref yv, ref Transformation, out yv);
+            Vector3.TransformNormal(ref zv, ref Transformation, out zv);
+
+            var center = Transformation.TranslationVector;
+
+            var corners = new Vector3[8];
+            corners[0] = center + xv + yv + zv;
+            corners[1] = center + xv + yv - zv;
+            corners[2] = center - xv + yv - zv;
+            corners[3] = center - xv + yv + zv;
+            corners[4] = center + xv - yv + zv;
+            corners[5] = center + xv - yv - zv;
+            corners[6] = center - xv - yv - zv;
+            corners[7] = center - xv - yv + zv;
+
+            return corners;
+        }
+
+        /// <summary>
+        /// Transforms this box using a transformation matrix.
+        /// </summary>
+        /// <param name="mat">The transformation matrix.</param>
+        /// <remarks>
+        /// While any kind of transformation can be applied, it is recommended to apply scaling using scale method instead, which
+        /// scales the Extents and keeps the Transformation matrix for rotation only, and that preserves collision detection accuracy.
+        /// </remarks>
+        public void Transform(ref Matrix mat)
+        {
+            Transformation *= mat;
+        }
+
+        /// <summary>
+        /// Transforms this box using a transformation matrix.
+        /// </summary>
+        /// <param name="mat">The transformation matrix.</param>
+        /// <remarks>
+        /// While any kind of transformation can be applied, it is recommended to apply scaling using scale method instead, which
+        /// scales the Extents and keeps the Transformation matrix for rotation only, and that preserves collision detection accuracy.
+        /// </remarks>
+        public void Transform(Matrix mat)
+        {
+            Transformation *= mat;
+        }
+
+        /// <summary>
+        /// Scales the <see cref="OrientedBoundingBox"/> by scaling its Extents without affecting the Transformation matrix,
+        /// By keeping Transformation matrix scaling-free, the collision detection methods will be more accurate.
+        /// </summary>
+        /// <param name="scaling"></param>
+        public void Scale(ref Vector3 scaling)
+        {
+            Extents *= scaling;
+        }
+
+        /// <summary>
+        /// Scales the <see cref="OrientedBoundingBox"/> by scaling its Extents without affecting the Transformation matrix,
+        /// By keeping Transformation matrix scaling-free, the collision detection methods will be more accurate.
+        /// </summary>
+        /// <param name="scaling"></param>
+        public void Scale(Vector3 scaling)
+        {
+            Extents *= scaling;
+        }
+
+        /// <summary>
+        /// Scales the <see cref="OrientedBoundingBox"/> by scaling its Extents without affecting the Transformation matrix,
+        /// By keeping Transformation matrix scaling-free, the collision detection methods will be more accurate.
+        /// </summary>
+        /// <param name="scaling"></param>
+        public void Scale(float scaling)
+        {
+            Extents *= scaling;
+        }
+
+        /// <summary>
+        /// Translates the <see cref="OrientedBoundingBox"/> to a new position using a translation vector;
+        /// </summary>
+        /// <param name="translation">the translation vector.</param>
+        public void Translate(ref Vector3 translation)
+        {
+            Transformation.TranslationVector += translation;
+        }
+
+        /// <summary>
+        /// Translates the <see cref="OrientedBoundingBox"/> to a new position using a translation vector;
+        /// </summary>
+        /// <param name="translation">the translation vector.</param>
+        public void Translate(Vector3 translation)
+        {
+            Transformation.TranslationVector += translation;
+        }
+
+        /// <summary>
+        /// The size of the <see cref="OrientedBoundingBox"/> if no scaling is applied to the transformation matrix.
+        /// </summary>
+        /// <remarks>
+        /// The property will return the actual size even if the scaling is applied using Scale method, 
+        /// but if the scaling is applied to transformation matrix, use GetSize Function instead.
+        /// </remarks>
+        public Vector3 Size
+        {
+            get
+            {
+                return Extents * 2;
+            }
+        }
+
+        /// <summary>
+        /// Returns the size of the <see cref="OrientedBoundingBox"/> taking into consideration the scaling applied to the transformation matrix.
+        /// </summary>
+        /// <returns>The size of the consideration</returns>
+        /// <remarks>
+        /// This method is computationally expensive, so if no scale is applied to the transformation matrix
+        /// use <see cref="OrientedBoundingBox.Size"/> property instead.
+        /// </remarks>
+        public Vector3 GetSize()
+        {
+            var xv = new Vector3(Extents.X * 2, 0, 0);
+            var yv = new Vector3(0, Extents.Y * 2, 0);
+            var zv = new Vector3(0, 0, Extents.Z * 2);
+            Vector3.TransformNormal(ref xv, ref Transformation, out xv);
+            Vector3.TransformNormal(ref yv, ref Transformation, out yv);
+            Vector3.TransformNormal(ref zv, ref Transformation, out zv);
+
+            return new Vector3(xv.Length(), yv.Length(), zv.Length());
+        }
+
+        /// <summary>
+        /// Returns the square size of the <see cref="OrientedBoundingBox"/> taking into consideration the scaling applied to the transformation matrix.
+        /// </summary>
+        /// <returns>The size of the consideration</returns>
+        public Vector3 GetSizeSquared()
+        {
+            var xv = new Vector3(Extents.X * 2, 0, 0);
+            var yv = new Vector3(0, Extents.Y * 2, 0);
+            var zv = new Vector3(0, 0, Extents.Z * 2);
+            Vector3.TransformNormal(ref xv, ref Transformation, out xv);
+            Vector3.TransformNormal(ref yv, ref Transformation, out yv);
+            Vector3.TransformNormal(ref zv, ref Transformation, out zv);
+
+            return new Vector3(xv.LengthSquared(), yv.LengthSquared(), zv.LengthSquared());
+        }
+
+        /// <summary>
+        /// Returns the center of the <see cref="OrientedBoundingBox"/>.
+        /// </summary>
+        public Vector3 Center
+        {
+            get
+            {
+                return Transformation.TranslationVector;
+            }
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="OrientedBoundingBox"/> contains a point. 
+        /// </summary>
+        /// <param name="point">The point to test.</param>
+        /// <returns>The type of containment the two objects have.</returns>
+        public ContainmentType Contains(ref Vector3 point)
+        {
+            // Transform the point into the obb coordinates
+            Matrix invTrans;
+            Matrix.Invert(ref Transformation, out invTrans);
+
+            Vector3 locPoint;
+            Vector3.TransformCoordinate(ref point, ref invTrans, out locPoint);
+
+            locPoint.X = Math.Abs(locPoint.X);
+            locPoint.Y = Math.Abs(locPoint.Y);
+            locPoint.Z = Math.Abs(locPoint.Z);
+
+            //Simple axes-aligned BB check
+            if (MathUtil.NearEqual(locPoint.X, Extents.X) && MathUtil.NearEqual(locPoint.Y, Extents.Y) && MathUtil.NearEqual(locPoint.Z, Extents.Z))
+                return ContainmentType.Intersects;
+            if (locPoint.X < Extents.X && locPoint.Y < Extents.Y && locPoint.Z < Extents.Z)
+                return ContainmentType.Contains;
+            else
+                return ContainmentType.Disjoint;
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="OrientedBoundingBox"/> contains a point. 
+        /// </summary>
+        /// <param name="point">The point to test.</param>
+        /// <returns>The type of containment the two objects have.</returns>
+        public ContainmentType Contains(Vector3 point)
+        {
+            return Contains(ref point);
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="OrientedBoundingBox"/> contains an array of points>.
+        /// </summary>
+        /// <param name="points">The points array to test.</param>
+        /// <returns>The type of containment.</returns>
+        public ContainmentType Contains(Vector3[] points)
+        {
+            Matrix invTrans;
+            Matrix.Invert(ref Transformation, out invTrans);
+
+            var containsAll = true;
+            var containsAny = false;
+
+            for (int i = 0; i < points.Length; i++)
+            {
+                Vector3 locPoint;
+                Vector3.TransformCoordinate(ref points[i], ref invTrans, out locPoint);
+
+                locPoint.X = Math.Abs(locPoint.X);
+                locPoint.Y = Math.Abs(locPoint.Y);
+                locPoint.Z = Math.Abs(locPoint.Z);
+
+                //Simple axes-aligned BB check
+                if (MathUtil.NearEqual(locPoint.X, Extents.X) &&
+                    MathUtil.NearEqual(locPoint.Y, Extents.Y) &&
+                    MathUtil.NearEqual(locPoint.Z, Extents.Z))
+                    containsAny = true;
+                if (locPoint.X < Extents.X && locPoint.Y < Extents.Y && locPoint.Z < Extents.Z)
+                    containsAny = true;
+                else
+                    containsAll = false;
+            }
+
+            if (containsAll)
+                return ContainmentType.Contains;
+            else if (containsAny)
+                return ContainmentType.Intersects;
+            else
+                return ContainmentType.Disjoint;
+        }
+
+        /// <summary>
+        /// Determines whether a <see cref="OrientedBoundingBox"/> contains a <see cref="BoundingSphere"/>.
+        /// </summary>
+        /// <param name="sphere">The sphere to test.</param>
+        /// <param name="IgnoreScale">Optimize the check operation by assuming that <see cref="OrientedBoundingBox"/> has no scaling applied</param>
+        /// <returns>The type of containment the two objects have.</returns>
+        /// <remarks>
+        /// This method is not designed for <see cref="OrientedBoundingBox"/> which has a non-uniform scaling applied to its transformation matrix.
+        /// But any type of scaling applied using Scale method will keep this method accurate.
+        /// </remarks>
+        public ContainmentType Contains(BoundingSphere sphere, bool IgnoreScale = false)
+        {
+            Matrix invTrans;
+            Matrix.Invert(ref Transformation, out invTrans);
+
+            // Transform sphere center into the obb coordinates
+            Vector3 locCenter;
+            Vector3.TransformCoordinate(ref sphere.Center, ref invTrans, out locCenter);
+
+            float locRadius;
+            if (IgnoreScale)
+                locRadius = sphere.Radius;
+            else
+            {
+                // Transform sphere radius into the obb coordinates
+                Vector3 vRadius = Vector3.UnitX * sphere.Radius;
+                Vector3.TransformNormal(ref vRadius, ref invTrans, out vRadius);
+                locRadius = vRadius.Length();
+            }
+
+            //Perform regular BoundingBox to BoundingSphere containment check
+            Vector3 minusExtens = -Extents;
+            Vector3 vector;
+            Vector3.Clamp(ref locCenter, ref minusExtens, ref Extents, out vector);
+            float distance = Vector3.DistanceSquared(locCenter, vector);
+
+            if (distance > locRadius * locRadius)
+                return ContainmentType.Disjoint;
+
+            if ((((minusExtens.X + locRadius <= locCenter.X) && (locCenter.X <= Extents.X - locRadius)) && ((Extents.X - minusExtens.X > locRadius) &&
+                (minusExtens.Y + locRadius <= locCenter.Y))) && (((locCenter.Y <= Extents.Y - locRadius) && (Extents.Y - minusExtens.Y > locRadius)) &&
+                (((minusExtens.Z + locRadius <= locCenter.Z) && (locCenter.Z <= Extents.Z - locRadius)) && (Extents.Z - minusExtens.Z > locRadius))))
+            {
+                return ContainmentType.Contains;
+            }
+
+            return ContainmentType.Intersects;
+        }
+
+        private static Vector3[] GetRows(ref Matrix mat)
+        {
+            return new Vector3[] {
+                new Vector3(mat.M11,mat.M12,mat.M13),
+                new Vector3(mat.M21,mat.M22,mat.M23),
+                new Vector3(mat.M31,mat.M32,mat.M33)
+            };
+        }
+
+        /// <summary>
+        /// Check the intersection between two <see cref="OrientedBoundingBox"/>
+        /// </summary>
+        /// <param name="obb">The OrientedBoundingBoxs to test.</param>
+        /// <returns>The type of containment the two objects have.</returns>
+        /// <remarks>
+        /// For accuracy, The transformation matrix for both <see cref="OrientedBoundingBox"/> must not have any scaling applied to it.
+        /// Anyway, scaling using Scale method will keep this method accurate.
+        /// </remarks>
+        public ContainmentType Contains(ref OrientedBoundingBox obb)
+        {
+            var cornersCheck = Contains(obb.GetCorners());
+            if (cornersCheck != ContainmentType.Disjoint)
+                return cornersCheck;
+
+            //http://www.3dkingdoms.com/weekly/bbox.cpp
+            var SizeA = Extents;
+            var SizeB = obb.Extents;
+            var RotA = GetRows(ref Transformation);
+            var RotB = GetRows(ref obb.Transformation);
+
+            var R = new Matrix();       // Rotation from B to A
+            var AR = new Matrix();      // absolute values of R matrix, to use with box extents
+
+            float ExtentA, ExtentB, Separation;
+            int i, k;
+
+            // Calculate B to A rotation matrix
+            for (i = 0; i < 3; i++)
+                for (k = 0; k < 3; k++)
+                {
+                    R[i, k] = Vector3.Dot(RotA[i], RotB[k]);
+                    AR[i, k] = Math.Abs(R[i, k]);
+                }
+
+
+            // Vector separating the centers of Box B and of Box A	
+            var vSepWS = obb.Center - Center;
+            // Rotated into Box A's coordinates
+            var vSepA = new Vector3(Vector3.Dot(vSepWS, RotA[0]), Vector3.Dot(vSepWS, RotA[1]), Vector3.Dot(vSepWS, RotA[2]));
+
+            // Test if any of A's basis vectors separate the box
+            for (i = 0; i < 3; i++)
+            {
+                ExtentA = SizeA[i];
+                ExtentB = Vector3.Dot(SizeB, new Vector3(AR[i, 0], AR[i, 1], AR[i, 2]));
+                Separation = Math.Abs(vSepA[i]);
+
+                if (Separation > ExtentA + ExtentB)
+                    return ContainmentType.Disjoint;
+            }
+
+            // Test if any of B's basis vectors separate the box
+            for (k = 0; k < 3; k++)
+            {
+                ExtentA = Vector3.Dot(SizeA, new Vector3(AR[0, k], AR[1, k], AR[2, k]));
+                ExtentB = SizeB[k];
+                Separation = Math.Abs(Vector3.Dot(vSepA, new Vector3(R[0, k], R[1, k], R[2, k])));
+
+                if (Separation > ExtentA + ExtentB)
+                    return ContainmentType.Disjoint;
+            }
+
+            // Now test Cross Products of each basis vector combination ( A[i], B[k] )
+            for (i = 0; i < 3; i++)
+                for (k = 0; k < 3; k++)
+                {
+                    int i1 = (i + 1) % 3, i2 = (i + 2) % 3;
+                    int k1 = (k + 1) % 3, k2 = (k + 2) % 3;
+                    ExtentA = SizeA[i1] * AR[i2, k] + SizeA[i2] * AR[i1, k];
+                    ExtentB = SizeB[k1] * AR[i, k2] + SizeB[k2] * AR[i, k1];
+                    Separation = Math.Abs(vSepA[i2] * R[i1, k] - vSepA[i1] * R[i2, k]);
+                    if (Separation > ExtentA + ExtentB)
+                        return ContainmentType.Disjoint;
+                }
+
+            // No separating axis found, the boxes overlap	
+            return ContainmentType.Intersects;
+        }
+
+        /// <summary>
+        /// Check the intersection between an <see cref="OrientedBoundingBox"/> and a line defined by two points
+        /// </summary>
+        /// <param name="L1">The first point in the line.</param>
+        /// <param name="L2">The second point in the line.</param>
+        /// <returns>The type of containment the two objects have.</returns>
+        /// <remarks>
+        /// For accuracy, The transformation matrix for the <see cref="OrientedBoundingBox"/> must not have any scaling applied to it.
+        /// Anyway, scaling using Scale method will keep this method accurate.
+        /// </remarks>
+        public ContainmentType ContainsLine(ref Vector3 L1, ref Vector3 L2)
+        {
+            var cornersCheck = Contains(new Vector3[] { L1, L2 });
+            if (cornersCheck != ContainmentType.Disjoint)
+                return cornersCheck;
+
+            //http://www.3dkingdoms.com/weekly/bbox.cpp
+            // Put line in box space
+            Matrix invTrans;
+            Matrix.Invert(ref Transformation, out invTrans);
+
+            Vector3 LB1;
+            Vector3.TransformCoordinate(ref L1, ref invTrans, out LB1);
+            Vector3 LB2;
+            Vector3.TransformCoordinate(ref L1, ref invTrans, out LB2);
+
+            // Get line midpoint and extent
+            var LMid = (LB1 + LB2) * 0.5f;
+            var L = (LB1 - LMid);
+            var LExt = new Vector3(Math.Abs(L.X), Math.Abs(L.Y), Math.Abs(L.Z));
+
+            // Use Separating Axis Test
+            // Separation vector from box center to line center is LMid, since the line is in box space
+            if (Math.Abs(LMid.X) > Extents.X + LExt.X) return ContainmentType.Disjoint;
+            if (Math.Abs(LMid.Y) > Extents.Y + LExt.Y) return ContainmentType.Disjoint;
+            if (Math.Abs(LMid.Z) > Extents.Z + LExt.Z) return ContainmentType.Disjoint;
+            // Cross products of line and each axis
+            if (Math.Abs(LMid.Y * L.Z - LMid.Z * L.Y) > (Extents.Y * LExt.Z + Extents.Z * LExt.Y)) return ContainmentType.Disjoint;
+            if (Math.Abs(LMid.X * L.Z - LMid.Z * L.X) > (Extents.X * LExt.Z + Extents.Z * LExt.X)) return ContainmentType.Disjoint;
+            if (Math.Abs(LMid.X * L.Y - LMid.Y * L.X) > (Extents.X * LExt.Y + Extents.Y * LExt.X)) return ContainmentType.Disjoint;
+            // No separating axis, the line intersects
+            return ContainmentType.Intersects;
+        }
+
+        /// <summary>
+        /// Check the intersection between an <see cref="OrientedBoundingBox"/> and <see cref="BoundingBox"/>
+        /// </summary>
+        /// <param name="box">The BoundingBox to test.</param>
+        /// <returns>The type of containment the two objects have.</returns>
+        /// <remarks>
+        /// For accuracy, The transformation matrix for the <see cref="OrientedBoundingBox"/> must not have any scaling applied to it.
+        /// Anyway, scaling using Scale method will keep this method accurate.
+        /// </remarks>
+        public ContainmentType Contains(ref BoundingBox box)
+        {
+            var cornersCheck = Contains(box.GetCorners());
+            if (cornersCheck != ContainmentType.Disjoint)
+                return cornersCheck;
+
+            var boxCenter = box.Minimum + (box.Maximum - box.Minimum) / 2f;
+            var boxExtents = box.Maximum - boxCenter;
+
+            var SizeA = Extents;
+            var SizeB = boxExtents;
+            var RotA = GetRows(ref Transformation);
+
+            float ExtentA, ExtentB, Separation;
+            int i, k;
+
+            Matrix R;                   // Rotation from B to A
+            Matrix.Invert(ref Transformation, out R);
+            var AR = new Matrix();      // absolute values of R matrix, to use with box extents
+
+            for (i = 0; i < 3; i++)
+                for (k = 0; k < 3; k++)
+                {
+                    AR[i, k] = Math.Abs(R[i, k]);
+                }
+
+
+            // Vector separating the centers of Box B and of Box A	
+            var vSepWS = boxCenter - Center;
+            // Rotated into Box A's coordinates
+            var vSepA = new Vector3(Vector3.Dot(vSepWS, RotA[0]), Vector3.Dot(vSepWS, RotA[1]), Vector3.Dot(vSepWS, RotA[2]));
+
+            // Test if any of A's basis vectors separate the box
+            for (i = 0; i < 3; i++)
+            {
+                ExtentA = SizeA[i];
+                ExtentB = Vector3.Dot(SizeB, new Vector3(AR[i, 0], AR[i, 1], AR[i, 2]));
+                Separation = Math.Abs(vSepA[i]);
+
+                if (Separation > ExtentA + ExtentB)
+                    return ContainmentType.Disjoint;
+            }
+
+            // Test if any of B's basis vectors separate the box
+            for (k = 0; k < 3; k++)
+            {
+                ExtentA = Vector3.Dot(SizeA, new Vector3(AR[0, k], AR[1, k], AR[2, k]));
+                ExtentB = SizeB[k];
+                Separation = Math.Abs(Vector3.Dot(vSepA, new Vector3(R[0, k], R[1, k], R[2, k])));
+
+                if (Separation > ExtentA + ExtentB)
+                    return ContainmentType.Disjoint;
+            }
+
+            // Now test Cross Products of each basis vector combination ( A[i], B[k] )
+            for (i = 0; i < 3; i++)
+                for (k = 0; k < 3; k++)
+                {
+                    int i1 = (i + 1) % 3, i2 = (i + 2) % 3;
+                    int k1 = (k + 1) % 3, k2 = (k + 2) % 3;
+                    ExtentA = SizeA[i1] * AR[i2, k] + SizeA[i2] * AR[i1, k];
+                    ExtentB = SizeB[k1] * AR[i, k2] + SizeB[k2] * AR[i, k1];
+                    Separation = Math.Abs(vSepA[i2] * R[i1, k] - vSepA[i1] * R[i2, k]);
+                    if (Separation > ExtentA + ExtentB)
+                        return ContainmentType.Disjoint;
+                }
+
+            // No separating axis found, the boxes overlap	
+            return ContainmentType.Intersects;
+        }
+
+        /// <summary>
+        /// Determines whether there is an intersection between a <see cref="Ray"/> and a <see cref="OrientedBoundingBox"/>.
+        /// </summary>
+        /// <param name="ray">The ray to test.</param>
+        /// <param name="point">When the method completes, contains the point of intersection,
+        /// or <see cref="Vector3.Zero"/> if there was no intersection.</param>
+        /// <returns>Whether the two objects intersected.</returns>
+        public bool Intersects(ref Ray ray, out Vector3 point)
+        {
+            // Put ray in box space
+            Matrix invTrans;
+            Matrix.Invert(ref Transformation, out invTrans);
+
+            Ray bRay;
+            Vector3.TransformNormal(ref ray.Direction, ref invTrans, out bRay.Direction);
+            Vector3.TransformCoordinate(ref ray.Position, ref invTrans, out bRay.Position);
+
+            //Perform a regular ray to BoundingBox check
+            var bb = new BoundingBox(-Extents, Extents);
+            var intersects = CollisionHelper.RayIntersectsBox(ref bRay, ref bb, out point);
+
+            //Put the result intersection back to world
+            if (intersects)
+                Vector3.TransformCoordinate(ref point, ref Transformation, out point);
+
+            return intersects;
+        }
+
+        /// <summary>
+        /// Determines whether there is an intersection between a <see cref="Ray"/> and a <see cref="OrientedBoundingBox"/>.
+        /// </summary>
+        /// <param name="ray">The ray to test.</param>
+        /// <returns>Whether the two objects intersected.</returns>
+        public bool Intersects(ref Ray ray)
+        {
+            Vector3 point;
+            return Intersects(ref ray, out point);
+        }
+
+        private Vector3[] GetLocalCorners()
+        {
+            var xv = new Vector3(Extents.X, 0, 0);
+            var yv = new Vector3(0, Extents.Y, 0);
+            var zv = new Vector3(0, 0, Extents.Z);
+
+            var corners = new Vector3[8];
+            corners[0] = +xv + yv + zv;
+            corners[1] = +xv + yv - zv;
+            corners[2] = -xv + yv - zv;
+            corners[3] = -xv + yv + zv;
+            corners[4] = +xv - yv + zv;
+            corners[5] = +xv - yv - zv;
+            corners[6] = -xv - yv - zv;
+            corners[7] = -xv - yv + zv;
+
+            return corners;
+        }
+
+        /// <summary>
+        /// Get the axis-aligned <see cref="BoundingBox"/> which contains all <see cref="OrientedBoundingBox"/> corners.
+        /// </summary>
+        /// <returns>The axis-aligned BoundingBox of this OrientedBoundingBox.</returns>
+        public BoundingBox GetBoundingBox()
+        {
+            return BoundingBox.FromPoints(GetCorners());
+        }
+
+        /// <summary>
+        /// Calculates the matrix required to transfer any point from one <see cref="OrientedBoundingBox"/> local coordinates to another.
+        /// </summary>
+        /// <param name="A">The source OrientedBoundingBox.</param>
+        /// <param name="B">The target OrientedBoundingBox.</param>
+        /// <param name="NoMatrixScaleApplied">
+        /// If true, the method will use a fast algorithm which is inapplicable if a scale is applied to the transformation matrix of the OrientedBoundingBox.
+        /// </param>
+        /// <returns></returns>
+        public static Matrix GetBoxToBoxMatrix(ref OrientedBoundingBox A, ref OrientedBoundingBox B, bool NoMatrixScaleApplied = false)
+        {
+            Matrix AtoB_Matrix;
+
+            // Calculate B to A transformation matrix
+            if (NoMatrixScaleApplied)
+            {
+                var RotA = GetRows(ref A.Transformation);
+                var RotB = GetRows(ref B.Transformation);
+                AtoB_Matrix = new Matrix();
+                int i, k;
+                for (i = 0; i < 3; i++)
+                    for (k = 0; k < 3; k++)
+                        AtoB_Matrix[i, k] = Vector3.Dot(RotB[i], RotA[k]);
+                var v = B.Center - A.Center;
+                AtoB_Matrix.M41 = Vector3.Dot(v, RotA[0]);
+                AtoB_Matrix.M42 = Vector3.Dot(v, RotA[1]);
+                AtoB_Matrix.M43 = Vector3.Dot(v, RotA[2]);
+                AtoB_Matrix.M44 = 1;
+            }
+            else
+            {
+                Matrix AInvMat;
+                Matrix.Invert(ref A.Transformation, out AInvMat);
+                AtoB_Matrix = B.Transformation * AInvMat;
+            }
+
+            return AtoB_Matrix;
+        }
+
+        /// <summary>
+        /// Merge an OrientedBoundingBox B into another OrientedBoundingBox A, by expanding A to contain B and keeping A orientation.
+        /// </summary>
+        /// <param name="A">The <see cref="OrientedBoundingBox"/> to merge into it.</param>
+        /// <param name="B">The <see cref="OrientedBoundingBox"/> to be merged</param>
+        /// <param name="NoMatrixScaleApplied">
+        /// If true, the method will use a fast algorithm which is inapplicable if a scale is applied to the transformation matrix of the OrientedBoundingBox.
+        /// </param>
+        /// <remarks>
+        /// Unlike merging axis aligned boxes, The operation is not interchangeable, because it keeps A orientation and merge B into it.
+        /// </remarks>
+        public static void Merge(ref OrientedBoundingBox A, ref OrientedBoundingBox B, bool NoMatrixScaleApplied = false)
+        {
+            Matrix AtoB_Matrix = GetBoxToBoxMatrix(ref A, ref B, NoMatrixScaleApplied);
+
+            //Get B corners in A Space
+            var bCorners = B.GetLocalCorners();
+            Vector3.TransformCoordinate(bCorners, ref AtoB_Matrix, bCorners);
+
+            //Get A local Bounding Box
+            var A_LocalBB = new BoundingBox(-A.Extents, A.Extents);
+
+            //Find B BoundingBox in A Space
+            var B_LocalBB = BoundingBox.FromPoints(bCorners);
+
+            //Merger A and B local Bounding Boxes
+            BoundingBox mergedBB;
+            BoundingBox.Merge(ref B_LocalBB, ref A_LocalBB, out mergedBB);
+
+            //Find the new Extents and Center, Transform Center back to world
+            var newCenter = mergedBB.Minimum + (mergedBB.Maximum - mergedBB.Minimum) / 2f;
+            A.Extents = mergedBB.Maximum - newCenter;
+            Vector3.TransformCoordinate(ref newCenter, ref A.Transformation, out newCenter);
+            A.Transformation.TranslationVector = newCenter;
+        }
+
+        /// <summary>
+        /// Merge this OrientedBoundingBox into another OrientedBoundingBox, keeping the other OrientedBoundingBox orientation.
+        /// </summary>
+        /// <param name="OBB">The other <see cref="OrientedBoundingBox"/> to merge into.</param>
+        /// <param name="NoMatrixScaleApplied">
+        /// If true, the method will use a fast algorithm which is inapplicable if a scale is applied to the transformation matrix of the OrientedBoundingBox.
+        /// </param>
+        public void MergeInto(ref OrientedBoundingBox OBB, bool NoMatrixScaleApplied = false)
+        {
+            Merge(ref OBB, ref this, NoMatrixScaleApplied);
+        }
+
+        /// <summary>
+        /// Merge another OrientedBoundingBox into this OrientedBoundingBox.
+        /// </summary>
+        /// <param name="OBB">The other <see cref="OrientedBoundingBox"/> to merge into this OrientedBoundingBox.</param>
+        /// <param name="NoMatrixScaleApplied">
+        /// If true, the method will use a fast algorithm which is inapplicable if a scale is applied to the transformation matrix of the OrientedBoundingBox.
+        /// </param>
+        public void Add(ref OrientedBoundingBox OBB, bool NoMatrixScaleApplied = false)
+        {
+            Merge(ref this, ref OBB, NoMatrixScaleApplied);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="Vector4"/> is equal to this instance.
+        /// </summary>
+        /// <param name="value">The <see cref="Vector4"/> to compare with this instance.</param>
+        /// <returns>
+        /// <c>true</c> if the specified <see cref="Vector4"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        [MethodImpl((MethodImplOptions)0x100)] // MethodImplOptions.AggressiveInlining
+        public bool Equals(ref OrientedBoundingBox value)
+        {
+            return Extents == value.Extents && Transformation == value.Transformation;
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="Vector4"/> is equal to this instance.
+        /// </summary>
+        /// <param name="value">The <see cref="Vector4"/> to compare with this instance.</param>
+        /// <returns>
+        /// <c>true</c> if the specified <see cref="Vector4"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        [MethodImpl((MethodImplOptions)0x100)] // MethodImplOptions.AggressiveInlining
+        public bool Equals(OrientedBoundingBox value)
+        {
+            return Equals(ref value);
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="value">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// <c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object value)
+        {
+            if (!(value is OrientedBoundingBox))
+                return false;
+
+            var strongValue = (OrientedBoundingBox)value;
+            return Equals(ref strongValue);
+        }
+
+        /// <summary>
+        /// Tests for equality between two objects.
+        /// </summary>
+        /// <param name="left">The first value to compare.</param>
+        /// <param name="right">The second value to compare.</param>
+        /// <returns><c>true</c> if <paramref name="left"/> has the same value as <paramref name="right"/>; otherwise, <c>false</c>.</returns>
+        [MethodImpl((MethodImplOptions)0x100)] // MethodImplOptions.AggressiveInlining
+        public static bool operator ==(OrientedBoundingBox left, OrientedBoundingBox right)
+        {
+            return left.Equals(ref right);
+        }
+
+        /// <summary>
+        /// Tests for inequality between two objects.
+        /// </summary>
+        /// <param name="left">The first value to compare.</param>
+        /// <param name="right">The second value to compare.</param>
+        /// <returns><c>true</c> if <paramref name="left"/> has a different value than <paramref name="right"/>; otherwise, <c>false</c>.</returns>
+        [MethodImpl((MethodImplOptions)0x100)] // MethodImplOptions.AggressiveInlining
+        public static bool operator !=(OrientedBoundingBox left, OrientedBoundingBox right)
+        {
+            return !left.Equals(ref right);
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// </returns>
+        public override int GetHashCode()
+        {
+            return Extents.GetHashCode() + Transformation.GetHashCode();
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            return String.Format(CultureInfo.CurrentCulture, "Center: {0}, Extents: {1}", Center, Extents);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <param name="format">The format.</param>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public string ToString(string format)
+        {
+            if (format == null)
+                return ToString();
+
+            return string.Format(CultureInfo.CurrentCulture, "Center: {0}, Extents: {1}", Center.ToString(format, CultureInfo.CurrentCulture),
+                Extents.ToString(format, CultureInfo.CurrentCulture));
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <param name="formatProvider">The format provider.</param>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public string ToString(IFormatProvider formatProvider)
+        {
+            return string.Format(formatProvider, "Center: {0}, Extents: {1}", Center.ToString(), Extents.ToString());
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <param name="format">The format.</param>
+        /// <param name="formatProvider">The format provider.</param>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public string ToString(string format, IFormatProvider formatProvider)
+        {
+            if (format == null)
+                return ToString(formatProvider);
+
+            return string.Format(formatProvider, "Center: {0}, Extents: {1}", Center.ToString(format, formatProvider),
+                Extents.ToString(format, formatProvider));
+        }
+    }
+}
+
diff --git a/sources/core/Xenko.Core.Mathematics/Plane.cs b/sources/core/Xenko.Core.Mathematics/Plane.cs
index 9e6e27ec5c..e685dc34a2 100644
--- a/sources/core/Xenko.Core.Mathematics/Plane.cs
+++ b/sources/core/Xenko.Core.Mathematics/Plane.cs
@@ -80,8 +80,8 @@ public Plane(float a, float b, float c, float d)
         /// <param name="normal">The normal vector to the plane.</param>
         public Plane(Vector3 point, Vector3 normal)
         {
-            this.Normal = normal;
-            this.D = Vector3.Dot(normal, point);
+            Normal = normal;
+            Vector3.Dot(ref normal, ref point, out D);
         }
 
         /// <summary>
@@ -426,6 +426,24 @@ public static Vector3 Project(Plane plane, Vector3 point)
             return result;
         }
 
+        /// <summary>
+        /// Creates a plane of unit length.
+        /// </summary>
+        /// <param name="normalX">The X component of the normal.</param>
+        /// <param name="normalY">The Y component of the normal.</param>
+        /// <param name="normalZ">The Z component of the normal.</param>
+        /// <param name="planeD">The distance of the plane along its normal from the origin.</param>
+        /// <param name="result">When the method completes, contains the normalized plane.</param>
+        public static void Normalize(float normalX, float normalY, float normalZ, float planeD, out Plane result)
+        {
+            float magnitude = 1.0f / (float)(Math.Sqrt((normalX * normalX) + (normalY * normalY) + (normalZ * normalZ)));
+
+            result.Normal.X = normalX * magnitude;
+            result.Normal.Y = normalY * magnitude;
+            result.Normal.Z = normalZ * magnitude;
+            result.D = planeD * magnitude;
+        }
+
         /// <summary>
         /// Changes the coefficients of the normal vector of the plane to make it of unit length.
         /// </summary>
@@ -753,7 +771,7 @@ public string ToString(string format, IFormatProvider formatProvider)
         /// Returns a hash code for this instance.
         /// </summary>
         /// <returns>
-        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table.
         /// </returns>
         public override int GetHashCode()
         {
diff --git a/sources/core/Xenko.Core.Mathematics/Quaternion.cs b/sources/core/Xenko.Core.Mathematics/Quaternion.cs
index 864fe1f1e9..6e4855898e 100644
--- a/sources/core/Xenko.Core.Mathematics/Quaternion.cs
+++ b/sources/core/Xenko.Core.Mathematics/Quaternion.cs
@@ -749,7 +749,7 @@ public static Quaternion Normalize(Quaternion value)
         /// Rotates a Vector3 by the specified quaternion rotation.
         /// </summary>
         /// <param name="vector">The vector to rotate.</param>
-        public void Rotate(ref Vector3 vector)
+        public void RotateVector(ref Vector3 vector)
         {
             var pureQuaternion = new Quaternion(vector, 0);
             pureQuaternion = Conjugate(this) * pureQuaternion * this;
@@ -759,6 +759,59 @@ public void Rotate(ref Vector3 vector)
             vector.Z = pureQuaternion.Z;
         }
 
+        /// <summary>
+        /// Rotate myself by yaw, pitch, roll angles in radians
+        /// </summary>
+        /// <returns>Returns myself</returns>
+        public Quaternion Rotate(float yaw, float pitch, float roll)
+        {
+            MultiplyMyself(Quaternion.RotationYawPitchRoll(yaw, pitch, roll));
+            return this;
+        }
+
+        /// <summary>
+        /// Rotate myself by another quaternion with the option to scale the rotation. This is faster than rotating by individual yaw, pitch and roll values.
+        /// </summary>
+        /// <param name="other">Other quaternion to rotate by</param>
+        /// <param name="scale">Shortcut to scale how much of the rotation is applied</param>
+        /// <returns>Returns myself</returns>
+        public Quaternion Rotate(Quaternion other, float scale = 1f)
+        {
+            if (scale == 1f)
+                MultiplyMyself(other);
+            else
+                MultiplyMyself(Quaternion.Lerp(Quaternion.Identity, other, scale));
+
+            return this;
+        }
+
+        /// <summary>
+        /// Rotate myself by yaw, pitch, roll angles in degrees
+        /// </summary>
+        /// <returns>Returns myself</returns>
+        public Quaternion RotateDeg(float yaw, float pitch, float roll)
+        {
+            MultiplyMyself(Quaternion.RotationYawPitchRollDeg(yaw, pitch, roll));
+            return this;
+        }
+
+        private void MultiplyMyself(Quaternion left)
+        {
+            float lx = left.X;
+            float ly = left.Y;
+            float lz = left.Z;
+            float lw = left.W;
+            float rx = X;
+            float ry = Y;
+            float rz = Z;
+            float rw = W;
+
+            X = (rx * lw + lx * rw + ry * lz) - (rz * ly);
+            Y = (ry * lw + ly * rw + rz * lx) - (rx * lz);
+            Z = (rz * lw + lz * rw + rx * ly) - (ry * lx);
+            W = (rw * lw) - (rx * lx + ry * ly + rz * lz);
+        }
+
         /// <summary>
         /// Creates a quaternion given a rotation and an axis.
         /// </summary>
@@ -881,6 +934,27 @@ public static Quaternion RotationX(float angle)
             return result;
         }
 
+        /// <summary>
+        /// Creates a quaternion that rotates around the x-axis.
+        /// </summary>
+        /// <param name="angle">Angle of rotation in degrees.</param>
+        /// <returns>The created rotation quaternion.</returns>
+        public static Quaternion RotationXDeg(float angle) {
+            Quaternion result;
+            RotationX(MathUtil.DegreesToRadians(angle), out result);
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a quaternion that rotates around the x-axis.
+        /// </summary>
+        /// <param name="angle">Angle of rotation in degrees.</param>
+        /// <returns>The created rotation quaternion.</returns>
+        public static Quaternion RotationXDeg(float angle, out Quaternion result) {
+            RotationX(MathUtil.DegreesToRadians(angle), out result);
+            return result;
+        }
+
         /// <summary>
         /// Creates a quaternion that rotates around the y-axis.
         /// </summary>
@@ -904,6 +978,27 @@ public static Quaternion RotationY(float angle)
             return result;
         }
 
+        /// <summary>
+        /// Creates a quaternion that rotates around the y-axis.
+        /// </summary>
+        /// <param name="angle">Angle of rotation in degrees.</param>
+        /// <returns>The created rotation quaternion.</returns>
+        public static Quaternion RotationYDeg(float angle) {
+            Quaternion result;
+            RotationY(MathUtil.DegreesToRadians(angle), out result);
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a quaternion that rotates around the y-axis.
+        /// </summary>
+        /// <param name="angle">Angle of rotation in degrees.</param>
+        /// <returns>The created rotation quaternion.</returns>
+        public static Quaternion RotationYDeg(float angle, out Quaternion result) {
+            RotationY(MathUtil.DegreesToRadians(angle), out result);
+            return result;
+        }
+
         /// <summary>
         /// Creates a quaternion that rotates around the z-axis.
         /// </summary>
@@ -927,6 +1022,27 @@ public static Quaternion RotationZ(float angle)
             return result;
         }
 
+        /// <summary>
+        /// Creates a quaternion that rotates around the z-axis.
+        /// </summary>
+        /// <param name="angle">Angle of rotation in degrees.</param>
+        /// <returns>The created rotation quaternion.</returns>
+        public static Quaternion RotationZDeg(float angle) {
+            Quaternion result;
+            RotationZ(MathUtil.DegreesToRadians(angle), out result);
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a quaternion that rotates around the z-axis.
+        /// </summary>
+        /// <param name="angle">Angle of rotation in degrees.</param>
+        /// <returns>The created rotation quaternion.</returns>
+        public static Quaternion RotationZDeg(float angle, out Quaternion result) {
+            RotationZ(MathUtil.DegreesToRadians(angle), out result);
+            return result;
+        }
+        
         /// <summary>
         /// Calculate the yaw/pitch/roll rotation equivalent to the provided quaternion.
         /// </summary>
@@ -1008,6 +1124,152 @@ public static Quaternion RotationYawPitchRoll(float yaw, float pitch, float roll
             return result;
         }
 
+        /// <summary>
+        /// Creates a quaternion given a yaw, pitch, and roll value.
+        /// </summary>
+        /// <param name="yaw">The yaw of rotation.</param>
+        /// <param name="pitch">The pitch of rotation.</param>
+        /// <param name="roll">The roll of rotation.</param>
+        /// <returns>The newly created quaternion.</returns>
+        public static Quaternion RotationYawPitchRollDeg(float yaw, float pitch, float roll) {
+            Quaternion result;
+            RotationYawPitchRoll(MathUtil.DegreesToRadians(yaw),
+                                 MathUtil.DegreesToRadians(pitch),
+                                 MathUtil.DegreesToRadians(roll), out result);
+            return result;
+        }
+
+        /// <summary>
+        /// Creates a quaternion given a yaw, pitch, and roll value.
+        /// </summary>
+        /// <param name="yaw">The yaw of rotation.</param>
+        /// <param name="pitch">The pitch of rotation.</param>
+        /// <param name="roll">The roll of rotation.</param>
+        /// <returns>The newly created quaternion.</returns>
+        public static Quaternion RotationYawPitchRollDeg(float yaw, float pitch, float roll, out Quaternion result) {
+            RotationYawPitchRoll(MathUtil.DegreesToRadians(yaw),
+                                 MathUtil.DegreesToRadians(pitch),
+                                 MathUtil.DegreesToRadians(roll), out result);
+            return result;
+        }
+
+        /// <summary>
+        /// Generates a Quaternion that "looks at" the direction. Uses (0,1,0) as up.
+        /// </summary>
+        /// <param name="use">Quaternion to store the result</param>
+        /// <param name="direction">Direction to look in</param>
+        /// <returns>Returns the referenced use quaternion</returns>
+        public static Quaternion LookAt(ref Quaternion use, Vector3 direction)
+        {
+            // inline normalize (also flip for handedness)
+            float length = direction.X * direction.X + direction.Y * direction.Y + direction.Z * direction.Z;
+            if (length != 1f && length != 0f)
+            {
+                length = 1.0f / (float)Math.Sqrt(length);
+                direction.X *= -length;
+                direction.Y *= -length;
+                direction.Z *= -length;
+            }
+            else
+            {
+                direction.X = -direction.X;
+                direction.Y = -direction.Y;
+                direction.Z = -direction.Z;
+            }
+            Vector3 fla_vect1;
+            fla_vect1.X = 0;
+            fla_vect1.Y = 1;
+            fla_vect1.Z = 0;
+            float tempx = (fla_vect1.Y * direction.Z) - (fla_vect1.Z * direction.Y);
+            float tempy = (fla_vect1.Z * direction.X) - (fla_vect1.X * direction.Z);
+            fla_vect1.Z = (fla_vect1.X * direction.Y) - (fla_vect1.Y * direction.X);
+            fla_vect1.X = tempx;
+            fla_vect1.Y = tempy;
+            // inline normalize
+            length = fla_vect1.X * fla_vect1.X + fla_vect1.Y * fla_vect1.Y + fla_vect1.Z * fla_vect1.Z;
+            if (length != 1f && length != 0f)
+            {
+                length = 1.0f / (float)Math.Sqrt(length);
+                fla_vect1.X *= length;
+                fla_vect1.Y *= length;
+                fla_vect1.Z *= length;
+            }
+            Vector3 fla_vect2;
+            fla_vect2.X = direction.X;
+            fla_vect2.Y = direction.Y;
+            fla_vect2.Z = direction.Z;
+            //vect2.crossLocal(vect1);
+            tempx = (fla_vect2.Y * fla_vect1.Z) - (fla_vect2.Z * fla_vect1.Y);
+            tempy = (fla_vect2.Z * fla_vect1.X) - (fla_vect2.X * fla_vect1.Z);
+            fla_vect2.Z = (fla_vect2.X * fla_vect1.Y) - (fla_vect2.Y * fla_vect1.X);
+            fla_vect2.X = tempx;
+            fla_vect2.Y = tempy;
+            // inline normalize
+            length = fla_vect2.X * fla_vect2.X + fla_vect2.Y * fla_vect2.Y + fla_vect2.Z * fla_vect2.Z;
+            if (length != 1f && length != 0f)
+            {
+                length = 1.0f / (float)Math.Sqrt(length);
+                fla_vect2.X *= length;
+                fla_vect2.Y *= length;
+                fla_vect2.Z *= length;
+            }
+            //use.fromRotationMatrix(vect1.X, vect2.X, vect3.X, vect1.Y, vect2.Y,
+            //        vect3.Y, vect1.Z, vect2.Z, vect3.Z).normalizeLocal();
+            //float m00, float m01, float m02,
+            //    float m10, float m11, float m12,
+            //    float m20, float m21, float m22
+
+            float t = fla_vect1.X + fla_vect2.Y + direction.Z, w, x, y, z;
+            // we protect the division by s by ensuring that s>=1
+            if (t >= 0)
+            { // |w| >= .5
+                float s = (float)Math.Sqrt(t + 1); // |s|>=1 ...
+                w = 0.5f * s;
+                s = 0.5f / s;                 // so this division isn't bad
+                x = (fla_vect2.Z - direction.Y) * s;
+                y = (direction.X - fla_vect1.Z) * s;
+                z = (fla_vect1.Y - fla_vect2.X) * s;
+            }
+            else if ((fla_vect1.X > fla_vect2.Y) && (fla_vect1.X > direction.Z))
+            {
+                float s = (float)Math.Sqrt(1.0f + fla_vect1.X - fla_vect2.Y - direction.Z); // |s|>=1
+                x = s * 0.5f; // |x| >= .5
+                s = 0.5f / s;
+                y = (fla_vect1.Y + fla_vect2.X) * s;
+                z = (direction.X + fla_vect1.Z) * s;
+                w = (fla_vect2.Z - direction.Y) * s;
+            }
+            else if (fla_vect2.Y > direction.Z)
+            {
+                float s = (float)Math.Sqrt(1.0f + fla_vect2.Y - fla_vect1.X - direction.Z); // |s|>=1
+                y = s * 0.5f; // |y| >= .5
+                s = 0.5f / s;
+                x = (fla_vect1.Y + fla_vect2.X) * s;
+                z = (fla_vect2.Z + direction.Y) * s;
+                w = (direction.X - fla_vect1.Z) * s;
+            }
+            else
+            {
+                float s = (float)Math.Sqrt(1.0f + direction.Z - fla_vect1.X - fla_vect2.Y); // |s|>=1
+                z = s * 0.5f; // |z| >= .5
+                s = 0.5f / s;
+                x = (direction.X + fla_vect1.Z) * s;
+                y = (fla_vect2.Z + direction.Y) * s;
+                w = (fla_vect1.Y - fla_vect2.X) * s;
+            }
+            float norm = w * w + x * x + y * y + z * z;
+            float n = (float)(1.0f / Math.Sqrt(norm));
+            w *= n;
+            x *= n;
+            y *= n;
+            z *= n;
+            use.X = x;
+            use.Y = y;
+            use.Z = z;
+            use.W = w;
+            return use;
+        }
+
         /// <summary>
         /// Computes a quaternion corresponding to the rotation transforming the vector <paramref name="source"/> to the vector <paramref name="target"/>.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/RandomSeed.cs b/sources/core/Xenko.Core.Mathematics/RandomSeed.cs
index 3f3f8a3249..fdd7b9f362 100644
--- a/sources/core/Xenko.Core.Mathematics/RandomSeed.cs
+++ b/sources/core/Xenko.Core.Mathematics/RandomSeed.cs
@@ -25,7 +25,7 @@ public struct RandomSeed
         // We want to limit the maximum settable value to prevent such errors.
         private const uint UnderflowGuard = 0xFFFF;
 
-        private readonly uint seed;
+        public readonly uint seed;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="RandomSeed"/> struct from a target uint.
diff --git a/sources/core/Xenko.Core.Mathematics/RectangleF.cs b/sources/core/Xenko.Core.Mathematics/RectangleF.cs
index efe87f72e1..2b8b4c27a5 100644
--- a/sources/core/Xenko.Core.Mathematics/RectangleF.cs
+++ b/sources/core/Xenko.Core.Mathematics/RectangleF.cs
@@ -269,7 +269,7 @@ public void Inflate(float horizontalAmount, float verticalAmount)
         /// <param name="result">[OutAttribute] true if the specified Point is contained within this rectangle; false otherwise.</param>
         public void Contains(ref Vector2 value, out bool result)
         {
-            result = (X <= value.X) && (value.X < Right) && (Y <= value.Y) && (value.Y < Bottom);
+            result = value.X >= this.X && value.X <= Right && value.Y >= this.Y && value.Y <= Bottom;
         }
 
         /// <summary>Determines whether this rectangle entirely contains a specified rectangle.</summary>
@@ -295,7 +295,7 @@ public void Contains(ref RectangleF value, out bool result)
         /// <returns><c>true</c> if point is inside <see cref="RectangleF"/>, otherwise <c>false</c>.</returns>
         public bool Contains(float x, float y)
         {
-            return (x >= this.X && x <= Right && y >= this.Y && y <= Bottom);
+            return x >= this.X && x <= Right && y >= this.Y && y <= Bottom;
         }
 
         /// <summary>
diff --git a/sources/core/Xenko.Core.Mathematics/SimpleSaver.cs b/sources/core/Xenko.Core.Mathematics/SimpleSaver.cs
new file mode 100644
index 0000000000..4b4c9c5b21
--- /dev/null
+++ b/sources/core/Xenko.Core.Mathematics/SimpleSaver.cs
@@ -0,0 +1,327 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Text;
+
+namespace Xenko.Core.Mathematics
+{
+    /// <summary>
+    /// Simple helper class to handle saving and loading simple data to a file. Automatically compresses data and handles basic C# signed datatypes (long, int, string, bool etc.).
+    /// Also supports basic Focus Engine types, like Vector3, Quaternions and Color4s (and arrays of them)
+    /// </summary>
+    public class SimpleSaver
+    {
+        public Dictionary<string, object> Data = new Dictionary<string, object>();
+
+        /// <summary>
+        /// Gets a simple path to use from ApplicationData, includes '/' at the end
+        /// </summary>
+        /// <param name="tag">subfolder to use (game name etc.)</param>
+        public static string GetGoodPath(string tag)
+        {
+            string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "/" + tag + "/";
+            if (Directory.Exists(path) == false) Directory.CreateDirectory(path);
+            return path;
+        }
+
+        public string Filename;
+
+        private static BinaryWriter CompressedStream(Stream output)
+        {
+            GZipStream cmp = new GZipStream(output, CompressionMode.Compress);
+            BufferedStream buffStrm = new BufferedStream(cmp, 65536);
+            return new BinaryWriter(buffStrm);
+        }
+
+        private static BinaryReader UncompressedStream(Stream input)
+        {
+            GZipStream cmp = new GZipStream(input, CompressionMode.Decompress);
+            return new BinaryReader(cmp);
+        }
+        
+        /// <summary>
+        /// Returns what the boolean was toggled to
+        /// </summary>
+        public bool ToggleBoolean(string name, bool defaultIfNew = true)
+        {
+            if (Data.TryGetValue(name, out object o) && o is bool b)
+            {
+                Data[name] = !b;
+                return !b;
+            }
+
+            Data[name] = defaultIfNew;
+            return defaultIfNew;
+        }
+
+        public T Get<T>(string name, T defaultValue = default)
+        {
+            if (Data.TryGetValue(name, out object o) && o is T t)
+                return t;
+
+            return defaultValue;
+        }
+
+        public void Set(string name, object value)
+        {
+            Data[name] = value;
+        }
+
+        public SimpleSaver(string filename = null, bool tryLoading = true)
+        {
+            if (filename != null)
+            {
+                Filename = filename;
+                if (tryLoading) LoadFromFile();
+            }
+        }
+
+        public void SaveToFile()
+        {
+            if (Filename == null) throw new InvalidOperationException("Can't save to file if Filename is not set!");
+            using (BinaryWriter bw = CompressedStream(File.Open(Filename, FileMode.Create)))
+            {
+                Write(bw);
+            }
+        }
+
+        public bool LoadFromFile()
+        {
+            if (Filename == null) throw new InvalidOperationException("Can't load from a file if Filename is not set!");
+            if (!File.Exists(Filename)) return false;
+            Data.Clear();
+            using (BinaryReader br = UncompressedStream(File.Open(Filename, FileMode.Open)))
+            {
+                Read(br);
+            }
+            return true;
+        }
+
+        public void Read(BinaryReader reader)
+        {
+            int cnt = reader.ReadInt32();
+            int len, i;
+            for (int j=0; j<cnt; j++)
+            {
+                string k = reader.ReadString();
+                string key = k.Substring(1);
+                switch (k[0])
+                {
+                    case 'S':
+                        Data[key] = reader.ReadString();
+                        break;
+                    case 'F':
+                        Data[key] = reader.ReadSingle();
+                        break;
+                    case 'I':
+                        Data[key] = reader.ReadInt32();
+                        break;
+                    case 's':
+                        Data[key] = reader.ReadInt16();
+                        break;
+                    case 'b':
+                        Data[key] = reader.ReadByte();
+                        break;
+                    case 'B':
+                        Data[key] = reader.ReadBoolean();
+                        break;
+                    case 'D':
+                        Data[key] = reader.ReadDouble();
+                        break;
+                    case 'L':
+                        Data[key] = reader.ReadInt64();
+                        break;
+                    case '1':
+                        int[] arr = new int[reader.ReadInt32()];
+                        for (i=0; i<arr.Length; i++)
+                            arr[i] = reader.ReadInt32();
+                        Data[key] = arr;
+                        break;
+                    case '2':
+                        float[] farr = new float[reader.ReadInt32()];
+                        for (i = 0; i < farr.Length; i++)
+                            farr[i] = reader.ReadSingle();
+                        Data[key] = farr;
+                        break;
+                    case '3':
+                        string[] sarr = new string[reader.ReadInt32()];
+                        for (i = 0; i < sarr.Length; i++)
+                            sarr[i] = reader.ReadString();
+                        Data[key] = sarr;
+                        break;
+                    case '4':
+                        bool[] barr = new bool[reader.ReadInt32()];
+                        for (i = 0; i < barr.Length; i++)
+                            barr[i] = reader.ReadBoolean();
+                        Data[key] = barr;
+                        break;
+                    case '5':
+                        Data[key] = new Vector3(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+                        break;
+                    case 'Q':
+                        Data[key] = new Quaternion(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+                        break;
+                    case 'C':
+                        Data[key] = new Color4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+                        break;
+                    case '6':
+                        Vector3[] varr = new Vector3[reader.ReadInt32()];
+                        for (i = 0; i < varr.Length; i++)
+                            varr[i] = new Vector3(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+                        Data[key] = varr;
+                        break;
+                    case '7':
+                        Quaternion[] qarr = new Quaternion[reader.ReadInt32()];
+                        for (i = 0; i < qarr.Length; i++)
+                            qarr[i] = new Quaternion(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+                        Data[key] = qarr;
+                        break;
+                    case '8':
+                        Color4[] carr = new Color4[reader.ReadInt32()];
+                        for (i = 0; i < carr.Length; i++)
+                            carr[i] = new Color4(reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle(), reader.ReadSingle());
+                        Data[key] = carr;
+                        break;
+                    default:
+                        throw new InvalidDataException("I don't understand '" + k + "' type to read!");
+                }
+            }
+        }
+
+        public void Write(BinaryWriter output)
+        {
+            output.Write(Data.Count);
+            foreach (KeyValuePair<string, object> kvp in Data)
+            {
+                if (kvp.Value is string s)
+                {
+                    output.Write("S" + kvp.Key);
+                    output.Write(s);
+                } 
+                else if (kvp.Value is int[] ia)
+                {
+                    output.Write("1" + kvp.Key);
+                    output.Write(ia.Length);
+                    for (int i = 0; i < ia.Length; i++)
+                        output.Write(ia[i]);
+                }
+                else if (kvp.Value is float[] fa)
+                {
+                    output.Write("2" + kvp.Key);
+                    output.Write(fa.Length);
+                    for (int i = 0; i < fa.Length; i++)
+                        output.Write(fa[i]);
+                }
+                else if (kvp.Value is string[] sa)
+                {
+                    output.Write("3" + kvp.Key);
+                    output.Write(sa.Length);
+                    for (int i = 0; i < sa.Length; i++)
+                        output.Write(sa[i]);
+                }
+                else if (kvp.Value is bool[] ba)
+                {
+                    output.Write("4" + kvp.Key);
+                    output.Write(ba.Length);
+                    for (int i = 0; i < ba.Length; i++)
+                        output.Write(ba[i]);
+                }
+                else if (kvp.Value is Vector3 v3)
+                {
+                    output.Write("5" + kvp.Key);
+                    output.Write(v3.X);
+                    output.Write(v3.Y);
+                    output.Write(v3.Z);
+                }
+                else if (kvp.Value is Vector3[] v3a)
+                {
+                    output.Write("6" + kvp.Key);
+                    output.Write(v3a.Length);
+                    for (int i = 0; i < v3a.Length; i++)
+                    {
+                        output.Write(v3a[i].X);
+                        output.Write(v3a[i].Y);
+                        output.Write(v3a[i].Z);
+                    }
+                }
+                else if (kvp.Value is Quaternion q)
+                {
+                    output.Write("Q" + kvp.Key);
+                    output.Write(q.X);
+                    output.Write(q.Y);
+                    output.Write(q.Z);
+                    output.Write(q.W);
+                }
+                else if (kvp.Value is Quaternion[] qa)
+                {
+                    output.Write("7" + kvp.Key);
+                    output.Write(qa.Length);
+                    for (int i = 0; i < qa.Length; i++)
+                    {
+                        output.Write(qa[i].X);
+                        output.Write(qa[i].Y);
+                        output.Write(qa[i].Z);
+                        output.Write(qa[i].W);
+                    }
+                }
+                else if (kvp.Value is Color4 c)
+                {
+                    output.Write("C" + kvp.Key);
+                    output.Write(c.R);
+                    output.Write(c.G);
+                    output.Write(c.B);
+                    output.Write(c.A);
+                }
+                else if (kvp.Value is Color4[] ca)
+                {
+                    output.Write("8" + kvp.Key);
+                    output.Write(ca.Length);
+                    for (int i = 0; i < ca.Length; i++)
+                    {
+                        output.Write(ca[i].R);
+                        output.Write(ca[i].G);
+                        output.Write(ca[i].B);
+                        output.Write(ca[i].A);
+                    }
+                }
+                else if (kvp.Value is float f)
+                {
+                    output.Write("F" + kvp.Key);
+                    output.Write(f);
+                }
+                else if (kvp.Value is int i)
+                {
+                    output.Write("I" + kvp.Key);
+                    output.Write(i);
+                }
+                else if (kvp.Value is short ss)
+                {
+                    output.Write("s" + kvp.Key);
+                    output.Write(ss);
+                }
+                else if (kvp.Value is byte b)
+                {
+                    output.Write("b" + kvp.Key);
+                    output.Write(b);
+                }
+                else if (kvp.Value is bool bb)
+                {
+                    output.Write("B" + kvp.Key);
+                    output.Write(bb);
+                }
+                else if (kvp.Value is double d)
+                {
+                    output.Write("D" + kvp.Key);
+                    output.Write(d);
+                }
+                else if (kvp.Value is long l)
+                {
+                    output.Write("L" + kvp.Key);
+                    output.Write(l);
+                }
+                else throw new InvalidDataException("Can't process type: " + (kvp.Value?.GetType()?.Name ?? "null"));
+            }
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Mathematics/Vector2.cs b/sources/core/Xenko.Core.Mathematics/Vector2.cs
index c14dd60c23..308a72db2a 100644
--- a/sources/core/Xenko.Core.Mathematics/Vector2.cs
+++ b/sources/core/Xenko.Core.Mathematics/Vector2.cs
@@ -169,6 +169,16 @@ public float Length()
             return (float)Math.Sqrt((X * X) + (Y * Y));
         }
 
+        /// <summary>
+        /// Calculates the area of the Vector2
+        /// </summary>
+        /// <returns>X * Y</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public float Area()
+        {
+            return X * Y;
+        }
+
         /// <summary>
         /// Calculates the squared length of the vector.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Mathematics/Vector3.cs b/sources/core/Xenko.Core.Mathematics/Vector3.cs
index d4eca4943f..fed8175de9 100644
--- a/sources/core/Xenko.Core.Mathematics/Vector3.cs
+++ b/sources/core/Xenko.Core.Mathematics/Vector3.cs
@@ -27,7 +27,6 @@
 * THE SOFTWARE.
 */
 using System;
-using System.ComponentModel;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
@@ -199,6 +198,16 @@ public float Length()
             return (float)Math.Sqrt((X * X) + (Y * Y) + (Z * Z));
         }
 
+        /// <summary>
+        /// Returns the volume of the Vector3
+        /// </summary>
+        /// <returns>X * Y * Z</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public float Volume()
+        {
+            return X * Y * Z;
+        }
+
         /// <summary>
         /// Calculates the squared length of the vector.
         /// </summary>
@@ -217,7 +226,7 @@ public float LengthSquared()
         /// Converts the vector into a unit vector.
         /// </summary>
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public void Normalize()
+        public Vector3 Normalize()
         {
             float length = Length();
             if (length > MathUtil.ZeroTolerance)
@@ -227,6 +236,22 @@ public void Normalize()
                 Y *= inv;
                 Z *= inv;
             }
+            return this;
+        }
+
+        /// <summary>
+        /// Generates a new Vector3 with the normalized value
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public Vector3 Normalized()
+        {
+            float length = Length();
+            if (length > MathUtil.ZeroTolerance)
+            {
+                float inv = 1.0f / length;
+                return new Vector3(X * inv, Y * inv, Z * inv);
+            }
+            return Vector3.Zero;
         }
 
         /// <summary>
@@ -240,6 +265,48 @@ public void Pow(float exponent)
             Z = (float)Math.Pow(Z, exponent);
         }
 
+        /// <summary>
+        /// Rotates the vector around the origin by the angle using the given axis of rotation.
+        /// </summary>
+        /// <param name="axis">The axis of rotation.</param>
+        /// <param name="angle">The angle of rotation.</param>
+        public void RotateAround(Vector3 axis, float angle)
+        {
+            RotateAround(Zero, axis, angle);
+        }
+
+        /// <summary>
+        /// Rotates the vector around the target by the angle using the given axis of rotation.
+        /// </summary>
+        /// <param name="target">The position vector of the target to rotate around.</param>
+        /// <param name="axis">The axis of rotation.</param>
+        /// <param name="angle">The angle of rotation.</param>
+        public void RotateAround(Vector3 target, Vector3 axis, float angle)
+        {
+            Vector3 local = this - target;
+            Quaternion q = Quaternion.RotationAxis(axis, angle);
+            q.RotateVector(ref local);
+            var result = target + local;
+
+            X = result.X;
+            Y = result.Y;
+            Z = result.Z;
+        }
+
+        /// <summary>
+        /// Rotates around a 3D point with the given Quaternion
+        /// </summary>
+        public void RotateAround(Vector3 target, Quaternion q)
+        {
+            Vector3 local = this - target;
+            Transform(ref local, ref q, out local);
+            var result = target + local;
+
+            X = result.X;
+            Y = result.Y;
+            Z = result.Z;
+        }
+
         /// <summary>
         /// Creates an array containing the elements of the vector.
         /// </summary>
@@ -320,7 +387,7 @@ public static Vector3 Multiply(Vector3 value, float scale)
         {
             return new Vector3(value.X * scale, value.Y * scale, value.Z * scale);
         }
-        
+
         /// <summary>
         /// Modulates a vector with another by performing component-wise multiplication.
         /// </summary>
@@ -368,7 +435,7 @@ public static Vector3 Divide(Vector3 value, float scale)
         {
             return new Vector3(value.X / scale, value.Y / scale, value.Z / scale);
         }
-        
+
         /// <summary>
         /// Demodulates a vector with another by performing component-wise division.
         /// </summary>
@@ -794,6 +861,34 @@ public static Vector3 CatmullRom(Vector3 value1, Vector3 value2, Vector3 value3,
             return result;
         }
 
+        /// <summary>
+        /// Performs mathematical modulo component-wise (see MathUtil.Mod).
+        /// </summary>
+        /// <param name="left">The first source vector.</param>
+        /// <param name="right">The second source vector.</param>
+        /// <param name="result">When the method completes, contains an new vector composed of each component's modulo.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Mod(ref Vector3 left, ref Vector3 right, out Vector3 result)
+        {
+            result.X = MathUtil.Mod(left.X, right.X);
+            result.Y = MathUtil.Mod(left.Y, right.Y);
+            result.Z = MathUtil.Mod(left.Z, right.Z);
+        }
+
+        /// <summary>
+        /// Performs mathematical modulo component-wise (see MathUtil.Mod).
+        /// </summary>
+        /// <param name="left">The first source vector.</param>
+        /// <param name="right">The second source vector.</param>
+        /// <returns>When the method completes, contains an new vector composed of each component's modulo.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector3 Mod(Vector3 left, Vector3 right)
+        {
+            Vector3 result;
+            Mod(ref left, ref right, out result);
+            return result;
+        }
+
         /// <summary>
         /// Returns a vector containing the smallest components of the specified vectors.
         /// </summary>
@@ -1380,6 +1475,23 @@ public static void RotationYawPitchRoll(ref Quaternion quaternion, out Vector3 y
             Quaternion.RotationYawPitchRoll(ref quaternion, out yawPitchRoll.X, out yawPitchRoll.Y, out yawPitchRoll.Z);
         }
 
+
+        /// <summary>
+        /// Rotates the source around the target by the rotation angle around the supplied axis. 
+        /// </summary>
+        /// <param name="source">The position to rotate.</param>
+        /// <param name="target">The point to rotate around.</param>
+        /// <param name="axis">The axis of rotation.</param>
+        /// <param name="angle">The angle to rotate by in radians.</param>
+        /// <returns>The rotated vector.</returns>
+        public static Vector3 RotateAround(in Vector3 source, in Vector3 target, in Vector3 axis, float angle)
+        {
+            Vector3 local = source - target;
+            Quaternion q = Quaternion.RotationAxis(axis, angle);
+            q.RotateVector(ref local);
+            return target + local;
+        }
+
         /// <summary>
         /// Adds two vectors.
         /// </summary>
@@ -1462,6 +1574,19 @@ public static void RotationYawPitchRoll(ref Quaternion quaternion, out Vector3 y
             return new Vector3(left.X * right.X, left.Y * right.Y, left.Z * right.Z);
         }
 
+        /// <summary>
+        /// Return the vector rotated by the quaternion.
+        /// </summary>
+        /// <remarks>
+        /// Shorthand for <see cref="Quaternion.RotateVector(ref Vector3)"/>
+        /// </remarks>
+        public static Vector3 operator *(in Vector3 left, in Quaternion right)
+        {
+            var pureQuaternion = new Quaternion(left, 0);
+            pureQuaternion = Quaternion.Conjugate(right) * pureQuaternion * right;
+            return new Vector3(pureQuaternion.X, pureQuaternion.Y, pureQuaternion.Z);
+        }
+
         /// <summary>
         /// Adds a vector with the given value.
         /// </summary>
@@ -1564,6 +1689,16 @@ public static explicit operator Vector4(Vector3 value)
             return new Vector4(value, 0.0f);
         }
 
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="Vector3"/> to <see cref="Int3"/>.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Int3(Vector3 value)
+        {
+            return new Int3((int)value.X, (int)value.Y, (int)value.Z);
+        }
+
         /// <summary>
         /// Tests whether one 3D vector is near another 3D vector.
         /// </summary>
@@ -1613,7 +1748,7 @@ public string ToString(string format)
             if (format == null)
                 return ToString();
 
-            return string.Format(CultureInfo.CurrentCulture, "X:{0} Y:{1} Z:{2}", X.ToString(format, CultureInfo.CurrentCulture), 
+            return string.Format(CultureInfo.CurrentCulture, "X:{0} Y:{1} Z:{2}", X.ToString(format, CultureInfo.CurrentCulture),
                 Y.ToString(format, CultureInfo.CurrentCulture), Z.ToString(format, CultureInfo.CurrentCulture));
         }
 
diff --git a/sources/core/Xenko.Core.Mathematics/Xenko.Core.Mathematics.csproj b/sources/core/Xenko.Core.Mathematics/Xenko.Core.Mathematics.csproj
index 63fecc3627..778a20e94c 100644
--- a/sources/core/Xenko.Core.Mathematics/Xenko.Core.Mathematics.csproj
+++ b/sources/core/Xenko.Core.Mathematics/Xenko.Core.Mathematics.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -16,10 +15,6 @@
     <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -30,4 +25,7 @@
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.MicroThreading/ChannelMicroThreadAwaiter.cs b/sources/core/Xenko.Core.MicroThreading/ChannelMicroThreadAwaiter.cs
index 68d792c5be..eb06203dc0 100644
--- a/sources/core/Xenko.Core.MicroThreading/ChannelMicroThreadAwaiter.cs
+++ b/sources/core/Xenko.Core.MicroThreading/ChannelMicroThreadAwaiter.cs
@@ -16,6 +16,8 @@ public class ChannelMicroThreadAwaiter<T> : ICriticalNotifyCompletion
         internal Action Continuation;
         internal T Result;
 
+        public bool SuppressCancellationExceptions = false;
+
         public static ChannelMicroThreadAwaiter<T> New(MicroThread microThread)
         {
             lock (pool)
@@ -58,7 +60,8 @@ public void UnsafeOnCompleted(Action continuation)
         public T GetResult()
         {
             // Check Task Result (exception, etc...)
-            MicroThread.CancellationToken.ThrowIfCancellationRequested();
+            if (SuppressCancellationExceptions == false)
+                MicroThread.CancellationToken.ThrowIfCancellationRequested();
 
             var result = Result;
 
@@ -69,6 +72,7 @@ public T GetResult()
                 if (pool.Count < 4096)
                 {
                     isCompleted = false;
+                    SuppressCancellationExceptions = false;
                     MicroThread = null;
                     Continuation = null;
                     Result = default(T);
diff --git a/sources/core/Xenko.Core.MicroThreading/Xenko.Core.MicroThreading.csproj b/sources/core/Xenko.Core.MicroThreading/Xenko.Core.MicroThreading.csproj
index e749ea3934..b79e2fedee 100644
--- a/sources/core/Xenko.Core.MicroThreading/Xenko.Core.MicroThreading.csproj
+++ b/sources/core/Xenko.Core.MicroThreading/Xenko.Core.MicroThreading.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -15,10 +14,6 @@
     <XenkoAssemblyProcessorOptions>--auto-module-initializer</XenkoAssemblyProcessorOptions>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -29,4 +24,7 @@
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Reflection/MemberDescriptors/IMemberDescriptor.cs b/sources/core/Xenko.Core.Reflection/MemberDescriptors/IMemberDescriptor.cs
index 64af374e62..d9ff06ca4f 100644
--- a/sources/core/Xenko.Core.Reflection/MemberDescriptors/IMemberDescriptor.cs
+++ b/sources/core/Xenko.Core.Reflection/MemberDescriptors/IMemberDescriptor.cs
@@ -6,6 +6,8 @@
 
 namespace Xenko.Core.Reflection
 {
+    public delegate bool ShouldSerializePredicate(object value, IMemberDescriptor parentTypeMemberDescriptor);
+
     /// <summary>
     /// Describe a member of an object.
     /// </summary>
@@ -47,8 +49,8 @@ public interface IMemberDescriptor
         ITypeDescriptor TypeDescriptor { get; }
 
         /// <summary>
-        /// Gets the order of this member. 
-        /// Default is -1, meaning that it is using the alphabetical order 
+        /// Gets the order of this member.
+        /// Default is -1, meaning that it is using the alphabetical order
         /// based on the name of this property.
         /// </summary>
         /// <value>The order.</value>
@@ -75,7 +77,10 @@ public interface IMemberDescriptor
         /// <summary>
         /// Gets a value indicating whether this member should be serialized.
         /// </summary>
-        Func<object, bool> ShouldSerialize { get; }
+        ShouldSerializePredicate ShouldSerialize { get; }
+
+        bool HasDefaultValue { get; }
+        object DefaultValue { get; }
 
         /// <summary>
         /// Gets the alternative names that will map back to this member (may be null).
diff --git a/sources/core/Xenko.Core.Reflection/MemberDescriptors/MemberDescriptorBase.cs b/sources/core/Xenko.Core.Reflection/MemberDescriptors/MemberDescriptorBase.cs
index 8cce17194a..e6671cfad8 100644
--- a/sources/core/Xenko.Core.Reflection/MemberDescriptors/MemberDescriptorBase.cs
+++ b/sources/core/Xenko.Core.Reflection/MemberDescriptors/MemberDescriptorBase.cs
@@ -77,7 +77,11 @@ protected MemberDescriptorBase(MemberInfo memberInfo, StringComparer defaultName
         /// <value>The member information.</value>
         public MemberInfo MemberInfo { get; }
 
-        public Func<object, bool> ShouldSerialize { get; set; }
+        public ShouldSerializePredicate ShouldSerialize { get; set; }
+
+        public System.ComponentModel.DefaultValueAttribute DefaultValueAttribute { get; set; }
+        public bool HasDefaultValue => DefaultValueAttribute != null;
+        public object DefaultValue => DefaultValueAttribute.Value;
 
         public List<string> AlternativeNames { get; set; }
 
diff --git a/sources/core/Xenko.Core.Reflection/MemberPath.cs b/sources/core/Xenko.Core.Reflection/MemberPath.cs
index f291307844..c847e31408 100644
--- a/sources/core/Xenko.Core.Reflection/MemberPath.cs
+++ b/sources/core/Xenko.Core.Reflection/MemberPath.cs
@@ -142,18 +142,22 @@ public void Push(IMemberDescriptor descriptor)
 
         public void Push(ITypeDescriptor descriptor, object key)
         {
-            var arrayDescriptor = descriptor as ArrayDescriptor;
-            var collectionDescriptor = descriptor as CollectionDescriptor;
-            var dictionaryDescriptor = descriptor as DictionaryDescriptor;
-            if (arrayDescriptor != null)
+            if (descriptor is ArrayDescriptor arrayDescriptor)
             {
                 Push(arrayDescriptor, (int)key);
             }
-            if (collectionDescriptor != null)
+            else if (descriptor is CollectionDescriptor collectionDescriptor)
             {
-                Push(collectionDescriptor, (int)key);
+                if (descriptor.Category == DescriptorCategory.Set)
+                {
+                    Push(collectionDescriptor as SetDescriptor, key);
+                }
+                else
+                {
+                    Push(collectionDescriptor, (int)key);
+                }
             }
-            if (dictionaryDescriptor != null)
+            else if (descriptor is DictionaryDescriptor dictionaryDescriptor)
             {
                 Push(dictionaryDescriptor, key);
             }
@@ -195,6 +199,18 @@ public void Push(DictionaryDescriptor descriptor, object key)
             AddItem(new DictionaryPathItem(descriptor, key));
         }
 
+        /// <summary>
+        /// Pushes an collection access on the path.
+        /// </summary>
+        /// <param name="descriptor">The descriptor of the set.</param>
+        /// <param name="index">The index in the set.</param>
+        /// <exception cref="System.ArgumentNullException">descriptor</exception>
+        public void Push(SetDescriptor descriptor, object index)
+        {
+            if (descriptor == null) throw new ArgumentNullException(nameof(descriptor));
+            AddItem(new SetPathItem(descriptor, index));
+        }
+
         /// <summary>
         /// Pops the last item from the current path.
         /// </summary>
@@ -230,7 +246,7 @@ public bool Apply([NotNull] object rootObject, MemberPathAction actionType, obje
                     }
                     break;
                 case MemberPathAction.CollectionRemove:
-                    if (!(lastItem is CollectionPathItem) && !(lastItem is ArrayPathItem))
+                    if (!(lastItem is CollectionPathItem || lastItem is ArrayPathItem))
                     {
                         throw new ArgumentException("Invalid path [{0}] for action [{1}]. Expecting last path to be a collection/array item".ToFormat(this, actionType));
                     }
@@ -270,7 +286,11 @@ public bool Apply([NotNull] object rootObject, MemberPathAction actionType, obje
                 if (actionType == MemberPathAction.ValueClear)
                 {
                     if (lastItem is CollectionPathItem)
-                        actionType = MemberPathAction.CollectionRemove;
+                    {
+                        actionType = lastItem.TypeDescriptor.Category == DescriptorCategory.Set
+                            ? MemberPathAction.ValueSet
+                            : MemberPathAction.CollectionRemove;
+                    }
                     else if (lastItem is DictionaryPathItem)
                         actionType = MemberPathAction.DictionaryRemove;
                     else
@@ -292,7 +312,7 @@ public bool Apply([NotNull] object rootObject, MemberPathAction actionType, obje
                         break;
 
                     case MemberPathAction.CollectionRemove:
-                        ((CollectionPathItem)lastItem).Descriptor.RemoveAt(nextObject, ((CollectionPathItem)lastItem).Index);
+                        ((CollectionPathItem)lastItem).Descriptor.RemoveAt(nextObject, (int)((CollectionPathItem)lastItem).Index);
                         break;
                 }
             }
@@ -712,7 +732,7 @@ public override int GetHashCode()
             {
                 unchecked
                 {
-                    return (Descriptor.GetHashCode()*397) ^ Index;
+                    return (Descriptor.GetHashCode() * 397) ^ ((int)Index);
                 }
             }
         }
@@ -781,5 +801,65 @@ public override int GetHashCode()
                 }
             }
         }
+
+        public sealed class SetPathItem : SpecialMemberPathItemBase, IEquatable<SetPathItem>
+        {
+            public readonly SetDescriptor Descriptor;
+            public readonly object Index;
+
+            public SetPathItem(SetDescriptor descriptor, object index)
+            {
+                if (descriptor == null) throw new ArgumentNullException(nameof(descriptor));
+                Descriptor = descriptor;
+                Index = index;
+            }
+
+            public override ITypeDescriptor TypeDescriptor => Descriptor;
+
+            public override object GetValue(object thisObj)
+            {
+                return Descriptor.GetValue(thisObj, Index);
+            }
+
+            public override void SetValue(List<object> stack, int objectIndex, object thisObject, object value)
+            {
+                Descriptor.SetValue(thisObject, Index, value);
+            }
+
+            public override string GetName(bool isFirst)
+            {
+                return "[" + Index + "]";
+            }
+
+            public override object GetIndex()
+            {
+                return Index;
+            }
+
+            public override MemberPathItem Clone(MemberPathItem parent)
+            {
+                return new SetPathItem(Descriptor, Index) { Parent = parent };
+            }
+
+            public bool Equals(SetPathItem other)
+            {
+                if (ReferenceEquals(null, other)) return false;
+                if (ReferenceEquals(this, other)) return true;
+                return Equals(Descriptor, other.Descriptor) && Index == other.Index;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is SetPathItem spi && Equals(spi);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    return (Descriptor.GetHashCode() * 397) ^ (Index?.GetHashCode() ?? 0);
+                }
+            }
+        }
     }
 }
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptorFactory.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptorFactory.cs
index 2df4828ab3..713ea14942 100644
--- a/sources/core/Xenko.Core.Reflection/TypeDescriptorFactory.cs
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptorFactory.cs
@@ -59,6 +59,9 @@ public ITypeDescriptor Find(Type type)
                 {
                     descriptor = Create(type);
 
+                    // if this descriptor failed for some reason, just return null
+                    if (descriptor == null) return null;
+
                     // Register this descriptor (before initializing!)
                     registeredDescriptors.Add(type, descriptor);
 
@@ -77,7 +80,7 @@ public ITypeDescriptor Find(Type type)
         /// <returns>An instance of type descriptor.</returns>
         protected virtual ITypeDescriptor Create(Type type)
         {
-            ITypeDescriptor descriptor;
+            ITypeDescriptor descriptor = null;
             // The order of the descriptors here is important
 
             if (PrimitiveDescriptor.IsPrimitive(type))
@@ -89,15 +92,33 @@ protected virtual ITypeDescriptor Create(Type type)
                 // IDictionary
                 descriptor = new DictionaryDescriptor(this, type, emitDefaultValues, namingConvention);
             }
-            else if (CollectionDescriptor.IsCollection(type))
+            else if (ListDescriptor.IsList(type))
+            {
+                // IList
+                descriptor = new ListDescriptor(this, type, emitDefaultValues, namingConvention);
+            }
+            else if (SetDescriptor.IsSet(type))
+            {
+                // ISet
+                descriptor = new SetDescriptor(this, type, emitDefaultValues, namingConvention);
+            }
+            else if (OldCollectionDescriptor.IsCollection(type))
             {
                 // ICollection
-                descriptor = new CollectionDescriptor(this, type, emitDefaultValues, namingConvention);
+                descriptor = new OldCollectionDescriptor(this, type, emitDefaultValues, namingConvention);
             }
             else if (type.IsArray)
             {
-                // array[]
-                descriptor = new ArrayDescriptor(this, type, emitDefaultValues, namingConvention);
+                if (type.GetArrayRank() == 1 && !type.GetElementType().IsArray)
+                {
+                    // array[] - only single dimension array is supported
+                    descriptor = new ArrayDescriptor(this, type, emitDefaultValues, namingConvention);
+                }
+                else
+                {
+                    // multi-dimension array to be treated as a 'standard' object
+                    descriptor = new NotSupportedObjectDescriptor(this, type, emitDefaultValues, namingConvention);
+                }
             }
             else if (NullableDescriptor.IsNullable(type))
             {
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/ArrayDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/ArrayDescriptor.cs
index a8569d69b1..b2c64aee4b 100644
--- a/sources/core/Xenko.Core.Reflection/TypeDescriptors/ArrayDescriptor.cs
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/ArrayDescriptor.cs
@@ -50,5 +50,20 @@ public object GetValue(object array, int index)
         {
             return ((Array)array).GetValue(index);
         }
+
+        public void SetValue(object array, int index, object value)
+        {
+            ((Array)array).SetValue(value, index);
+        }
+
+        /// <summary>
+        /// Determines the number of elements of an array, -1 if it cannot determine the number of elements.
+        /// </summary>
+        /// <param name="array">The array.</param>
+        /// <returns>The number of elements of an array, -1 if it cannot determine the number of elements.</returns>
+        public int GetLength(object array)
+        {
+            return ((Array)array).Length;
+        }
     }
 }
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/CollectionDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/CollectionDescriptor.cs
index a96be73afc..bb5a76f144 100644
--- a/sources/core/Xenko.Core.Reflection/TypeDescriptors/CollectionDescriptor.cs
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/CollectionDescriptor.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using Xenko.Core.Yaml.Serialization;
 
 namespace Xenko.Core.Reflection
@@ -10,224 +11,94 @@ namespace Xenko.Core.Reflection
     /// <summary>
     /// Provides a descriptor for a <see cref="System.Collections.ICollection"/>.
     /// </summary>
-    public class CollectionDescriptor : ObjectDescriptor
+    public abstract class CollectionDescriptor : ObjectDescriptor
     {
-        private static readonly object[] EmptyObjects = new object[0];
-        private static readonly List<string> ListOfMembersToRemove = new List<string> { "Capacity", "Count", "IsReadOnly", "IsFixedSize", "IsSynchronized", "SyncRoot", "Comparer" };
-
-        private readonly Func<object, bool> IsReadOnlyFunction;
-        private readonly Func<object, int> GetCollectionCountFunction;
-        private readonly Func<object, int, object> GetIndexedItem;
-        private readonly Action<object, int, object> SetIndexedItem;
-        private readonly Action<object, object> CollectionAddFunction;
-        private readonly Action<object, int, object> CollectionInsertFunction;
-        private readonly Action<object, int> CollectionRemoveAtFunction;
-        private readonly Action<object, object> CollectionRemoveFunction;
-        private readonly Action<object> CollectionClearFunction;
+        public CollectionDescriptor(ITypeDescriptorFactory factory, Type type, bool emitDefaultValues, IMemberNamingConvention namingConvention)
+            : base(factory, type, emitDefaultValues, namingConvention)
+        { }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="CollectionDescriptor" /> class.
+        /// Determines whether the specified type is collection.
         /// </summary>
-        /// <param name="factory">The factory.</param>
         /// <param name="type">The type.</param>
-        /// <exception cref="System.ArgumentException">Expecting a type inheriting from System.Collections.ICollection;type</exception>
-        public CollectionDescriptor(ITypeDescriptorFactory factory, Type type, bool emitDefaultValues, IMemberNamingConvention namingConvention)
-            : base(factory, type, emitDefaultValues, namingConvention)
-        {
-            if (!IsCollection(type))
-                throw new ArgumentException(@"Expecting a type inheriting from System.Collections.ICollection", nameof(type));
-
-            // Gets the element type
-            var collectionType = type.GetInterface(typeof(IEnumerable<>));
-            ElementType = (collectionType != null) ? collectionType.GetGenericArguments()[0] : typeof(object);
-            var typeSupported = false;
-
-            // implements IList
-            if (typeof(IList).IsAssignableFrom(type))
-            {
-                CollectionAddFunction = (obj, value) => ((IList)obj).Add(value);
-                CollectionClearFunction = obj => ((IList)obj).Clear();
-                CollectionInsertFunction = (obj, index, value) => ((IList)obj).Insert(index, value);
-                CollectionRemoveAtFunction = (obj, index) => ((IList)obj).RemoveAt(index);
-                GetCollectionCountFunction = o => ((IList)o).Count;
-                GetIndexedItem = (obj, index) => ((IList)obj)[index];
-                SetIndexedItem = (obj, index, value) => ((IList)obj)[index] = value;
-                IsReadOnlyFunction = obj => ((IList)obj).IsReadOnly;
-                HasIndexerAccessors = true;
-                typeSupported = true;
-                IsList = true;
-            }
-            var itype = type.GetInterface(typeof(ICollection<>));
-
-            // implements ICollection<T> 
-            if (!typeSupported && itype != null)
-            {
-                var remove = itype.GetMethod(nameof(ICollection<object>.Remove), new[] { ElementType });
-                CollectionRemoveFunction = (obj, value) => remove.Invoke(obj, new[] { value });
-                var add = itype.GetMethod(nameof(ICollection<object>.Add), new[] {ElementType});
-                CollectionAddFunction = (obj, value) => add.Invoke(obj, new[] {value});
-                var clear = itype.GetMethod(nameof(ICollection<object>.Clear), Type.EmptyTypes);
-                CollectionClearFunction = obj => clear.Invoke(obj, EmptyObjects);
-                var countMethod = itype.GetProperty(nameof(ICollection<object>.Count)).GetGetMethod();
-                GetCollectionCountFunction = o => (int)countMethod.Invoke(o, null);
-                var isReadOnly = itype.GetProperty(nameof(ICollection<object>.IsReadOnly)).GetGetMethod();
-                IsReadOnlyFunction = obj => (bool)isReadOnly.Invoke(obj, null);
-                typeSupported = true;
-                // implements IList<T>
-                itype = type.GetInterface(typeof(IList<>));
-                if (itype != null)
-                {
-                    var insert = itype.GetMethod(nameof(IList<object>.Insert), new[] { typeof(int), ElementType });
-                    CollectionInsertFunction = (obj, index, value) => insert.Invoke(obj, new[] { index, value });
-                    var removeAt = itype.GetMethod(nameof(IList<object>.RemoveAt), new[] { typeof(int) });
-                    CollectionRemoveAtFunction = (obj, index) => removeAt.Invoke(obj, new object[] { index });
-                    var getItem = itype.GetMethod("get_Item", new[] { typeof(int) });
-                    GetIndexedItem = (obj, index) => getItem.Invoke(obj, new object[] { index });
-                    var setItem = itype.GetMethod("set_Item", new[] { typeof(int), ElementType });
-                    SetIndexedItem = (obj, index, value) => setItem.Invoke(obj, new[] { index, value });
-                    HasIndexerAccessors = true;
-                    IsList = true;
-                }
-                else
-                {
-                    // Attempt to retrieve IList<> accessors from ICollection.
-                    var insert = type.GetMethod(nameof(IList<object>.Insert), new[] { typeof(int), ElementType });
-                    if (insert != null)
-                        CollectionInsertFunction = (obj, index, value) => insert.Invoke(obj, new[] { index, value });
-
-                    var removeAt = type.GetMethod(nameof(IList<object>.RemoveAt), new[] { typeof(int) });
-                    if (removeAt != null)
-                    CollectionRemoveAtFunction = (obj, index) => removeAt.Invoke(obj, new object[] { index });
-
-                    var getItem = type.GetMethod("get_Item", new[] { typeof(int) });
-                    if (getItem != null)
-                        GetIndexedItem = (obj, index) => getItem.Invoke(obj, new object[] { index });
-
-                    var setItem = type.GetMethod("set_Item", new[] { typeof(int), ElementType });
-                    if (setItem != null)
-                        SetIndexedItem = (obj, index, value) => setItem.Invoke(obj, new[] { index, value });
-
-                    HasIndexerAccessors = getItem != null && setItem != null;
-                }
-            }
-
-            if (!typeSupported)
-            {
-                throw new ArgumentException($"Type [{(type)}] is not supported as a modifiable collection");
-            }
-        }
-
-        public override void Initialize(IComparer<object> keyComparer)
+        /// <returns><c>true</c> if the specified type is collection; otherwise, <c>false</c>.</returns>
+        public static bool IsCollection(Type type)
         {
-            base.Initialize(keyComparer);
-
-            IsPureCollection = Count == 0;
+            return TypeHelper.IsCollection(type);
         }
 
-        public override DescriptorCategory Category => DescriptorCategory.Collection;
-
         /// <summary>
         /// Gets or sets the type of the element.
         /// </summary>
         /// <value>The type of the element.</value>
-        public Type ElementType { get; }
+        public Type ElementType { get; protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this instance is a pure collection (no public property/field)
         /// </summary>
         /// <value><c>true</c> if this instance is pure collection; otherwise, <c>false</c>.</value>
-        public bool IsPureCollection { get; private set; }
+        public bool IsPureCollection { get; protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this collection type has add method.
         /// </summary>
         /// <value><c>true</c> if this instance has add; otherwise, <c>false</c>.</value>
-        public bool HasAdd => CollectionAddFunction != null;
+        public bool HasAdd { get; protected set; }
+
+        /// <summary>
+        /// Gets a value indicating whether this collection type has Remove method.
+        /// </summary>
+        /// <value><c>true</c> if this instance has Remove; otherwise, <c>false</c>.</value>
+        public bool HasRemove { get; protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this collection type has insert method.
         /// </summary>
         /// <value><c>true</c> if this instance has insert; otherwise, <c>false</c>.</value>
-        public bool HasInsert => CollectionInsertFunction != null;
+        public bool HasInsert { get; protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this collection type has RemoveAt method.
         /// </summary>
         /// <value><c>true</c> if this instance has RemoveAt; otherwise, <c>false</c>.</value>
-        public bool HasRemoveAt => CollectionRemoveAtFunction != null;
-
-        /// <summary>
-        /// Gets a value indicating whether this collection type has Remove method.
-        /// </summary>
-        /// <value><c>true</c> if this instance has Remove; otherwise, <c>false</c>.</value>
-        public bool HasRemove => CollectionRemoveFunction != null;
+        public bool HasRemoveAt { get; protected set; }
 
         /// <summary>
         /// Gets a value indicating whether this collection type has valid indexer accessors.
         /// If so, <see cref="SetValue(object, object, object)"/> and <see cref="GetValue(object, object)"/> can be invoked.
         /// </summary>
         /// <value><c>true</c> if this instance has a valid indexer setter; otherwise, <c>false</c>.</value>
-        public bool HasIndexerAccessors { get; }
+        public virtual bool HasIndexerAccessors { get; protected set; }
 
         /// <summary>
-        /// Gets a value indicating whether this collection implements <see cref="IList"/> or <see cref="IList{T}"/>.
+        /// Determines whether the specified collection is read only.
         /// </summary>
-        public bool IsList { get; }
+        /// <param name="collection">The collection.</param>
+        /// <returns><c>true</c> if the specified collection is read only; otherwise, <c>false</c>.</returns>
+        public abstract bool IsReadOnly(object collection);
 
         /// <summary>
         /// Returns the value matching the given index in the collection.
         /// </summary>
-        /// <param name="list">The list.</param>
+        /// <param name="collection">The collection.</param>
         /// <param name="index">The index.</param>
-        public object GetValue(object list, object index)
-        {
-            if (list == null) throw new ArgumentNullException(nameof(list));
-            if (!(index is int)) throw new ArgumentException("The index must be an int.");
-            return GetValue(list, (int)index);
-        }
+        public abstract object GetValue(object collection, object index);
 
         /// <summary>
         /// Returns the value matching the given index in the collection.
         /// </summary>
-        /// <param name="list">The list.</param>
+        /// <param name="collection">The collection.</param>
         /// <param name="index">The index.</param>
-        public object GetValue(object list, int index)
-        {
-            if (list == null) throw new ArgumentNullException(nameof(list));
-            return GetIndexedItem(list, index);
-        }
-
-        public void SetValue(object list, object index, object value)
-        {
-            if (list == null) throw new ArgumentNullException(nameof(list));
-            if (!(index is int)) throw new ArgumentException("The index must be an int.");
-            SetValue(list, (int)index, value);
-        }
-
-        public void SetValue(object list, int index, object value)
-        {
-            if (list == null) throw new ArgumentNullException(nameof(list));
-            SetIndexedItem(list, index, value);
-        }
+        public abstract object GetValue(object collection, int index);
 
-        /// <summary>
-        /// Clears the specified collection.
-        /// </summary>
-        /// <param name="collection">The collection.</param>
-        public void Clear(object collection)
-        {
-            CollectionClearFunction(collection);
-        }
+        public abstract void SetValue(object list, object index, object value);
 
         /// <summary>
         /// Add to the collections of the same type than this descriptor.
         /// </summary>
         /// <param name="collection">The collection.</param>
         /// <param name="value">The value to add to this collection.</param>
-        public void Add(object collection, object value)
-        {
-            CollectionAddFunction(collection, value);
-        }
+        public abstract void Add(object collection, object value);
 
         /// <summary>
         /// Insert to the collections of the same type than this descriptor.
@@ -235,71 +106,33 @@ public void Add(object collection, object value)
         /// <param name="collection">The collection.</param>
         /// <param name="index">The index of the insertion.</param>
         /// <param name="value">The value to insert to this collection.</param>
-        public void Insert(object collection, int index, object value)
-        {
-            CollectionInsertFunction(collection, index, value);
-        }
+        public abstract void Insert(object collection, int index, object value);
 
         /// <summary>
-        /// Remove item at the given index from the collections of the same type.
+        /// Removes the item from the collections of the same type.
         /// </summary>
         /// <param name="collection">The collection.</param>
-        /// <param name="index">The index of the item to remove from this collection.</param>
-        public void RemoveAt(object collection, int index)
-        {
-            CollectionRemoveAtFunction(collection, index);
-        }
+        /// <param name="item"></param>
+        public abstract void Remove(object collection, object item);
 
         /// <summary>
-        /// Removes the item from the collections of the same type.
+        /// Remove item at the given index from the collections of the same type.
         /// </summary>
         /// <param name="collection">The collection.</param>
-        /// <param name="item"></param>
-        public void Remove(object collection, object item)
-        {
-            CollectionRemoveFunction(collection, item);
-        }
+        /// <param name="index">The index of the item to remove from this collection.</param>
+        public abstract void RemoveAt(object collection, int index);
 
         /// <summary>
-        /// Determines whether the specified collection is read only.
+        /// Clears the specified collection.
         /// </summary>
         /// <param name="collection">The collection.</param>
-        /// <returns><c>true</c> if the specified collection is read only; otherwise, <c>false</c>.</returns>
-        public bool IsReadOnly(object collection)
-        {
-            return collection == null || IsReadOnlyFunction == null || IsReadOnlyFunction(collection);
-        }
+        public abstract void Clear(object collection);
 
         /// <summary>
         /// Determines the number of elements of a collection, -1 if it cannot determine the number of elements.
         /// </summary>
         /// <param name="collection">The collection.</param>
         /// <returns>The number of elements of a collection, -1 if it cannot determine the number of elements.</returns>
-        public int GetCollectionCount(object collection)
-        {
-            return collection == null || GetCollectionCountFunction == null ? -1 : GetCollectionCountFunction(collection);
-        }
-
-        /// <summary>
-        /// Determines whether the specified type is collection.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns><c>true</c> if the specified type is collection; otherwise, <c>false</c>.</returns>
-        public static bool IsCollection(Type type)
-        {
-            return TypeHelper.IsCollection(type);
-        }
-
-        protected override bool PrepareMember(MemberDescriptorBase member)
-        {
-            // Filter members
-            if (member is PropertyDescriptor && ListOfMembersToRemove.Contains(member.OriginalName))
-            //if (member is PropertyDescriptor && (member.DeclaringType.Namespace ?? string.Empty).StartsWith(SystemCollectionsNamespace) && ListOfMembersToRemove.Contains(member.Name))
-            {
-                return false;
-            }
-
-            return !IsCompilerGenerated && base.PrepareMember(member);
-        }
+        public abstract int GetCollectionCount(object collection);
     }
 }
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/DescriptorCategory.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/DescriptorCategory.cs
index 8a5a27f25b..1590b7b58f 100644
--- a/sources/core/Xenko.Core.Reflection/TypeDescriptors/DescriptorCategory.cs
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/DescriptorCategory.cs
@@ -22,11 +22,21 @@ public enum DescriptorCategory
         /// </summary>
         Array,
 
+        /// <summary>
+        /// A list
+        /// </summary>
+        List,
+
         /// <summary>
         /// A dictionary
         /// </summary>
         Dictionary,
 
+        /// <summary>
+        /// A set
+        /// </summary>
+        Set,
+
         /// <summary>
         /// An object
         /// </summary>
@@ -37,6 +47,11 @@ public enum DescriptorCategory
         /// </summary>
         Nullable,
 
+        /// <summary>
+        /// A nullable value
+        /// </summary>
+        NotSupportedObject,
+
         /// <summary>
         /// A custom descriptor.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/DictionaryDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/DictionaryDescriptor.cs
index 4a109cded0..acf4bd17cf 100644
--- a/sources/core/Xenko.Core.Reflection/TypeDescriptors/DictionaryDescriptor.cs
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/DictionaryDescriptor.cs
@@ -211,6 +211,18 @@ public void Remove(object dictionary, object key)
 
         }
 
+        /// <summary>
+        /// clear the dictionary
+        /// </summary>
+        public bool Clear(object dictionary) {
+            if (dictionary == null) throw new ArgumentNullException(nameof(dictionary));
+            var simpleDictionary = dictionary as IDictionary;
+            if (simpleDictionary != null) {
+                simpleDictionary.Clear();
+                return true;
+            } else return false;
+        }
+
         /// <summary>
         /// Indicate whether the dictionary contains the given key
         /// </summary>
@@ -280,7 +292,7 @@ public static IEnumerable<KeyValuePair<object, object>> GetGenericEnumerable<TKe
             return dictionary.Select(keyValue => new KeyValuePair<object, object>(keyValue.Key, keyValue.Value));
         }
 
-        protected override bool PrepareMember(MemberDescriptorBase member)
+        protected override bool PrepareMember(MemberDescriptorBase member, MemberInfo metadataClassMemberInfo)
         {
             // Filter members
             if (member is PropertyDescriptor && ListOfMembersToRemove.Contains(member.OriginalName))
@@ -289,7 +301,7 @@ protected override bool PrepareMember(MemberDescriptorBase member)
                 return false;
             }
 
-            return base.PrepareMember(member);
+            return base.PrepareMember(member, metadataClassMemberInfo);
         }
     }
 }
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/ListDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/ListDescriptor.cs
new file mode 100644
index 0000000000..1a024f95a0
--- /dev/null
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/ListDescriptor.cs
@@ -0,0 +1,256 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Xenko.Core.Yaml.Serialization;
+
+namespace Xenko.Core.Reflection
+{
+    /// <summary>
+    /// Provides a descriptor for a <see cref="System.Collections.IList"/>.
+    /// </summary>
+    public class ListDescriptor : CollectionDescriptor
+    {
+        private static readonly object[] EmptyObjects = new object[0];
+        private static readonly List<string> ListOfMembersToRemove = new List<string> { "Capacity", "Count", "IsReadOnly", "IsFixedSize", "IsSynchronized", "SyncRoot", "Comparer" };
+
+        private readonly Func<object, bool> IsReadOnlyFunction;
+        private readonly Func<object, int> GetListCountFunction;
+        private readonly Func<object, int, object> GetIndexedItem;
+        private readonly Action<object, int, object> SetIndexedItem;
+        private readonly Action<object, object> ListAddFunction;
+        private readonly Action<object, int, object> ListInsertFunction;
+        private readonly Action<object, int> ListRemoveAtFunction;
+        private readonly Action<object, object> ListRemoveFunction;
+        private readonly Action<object> ListClearFunction;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ListDescriptor" /> class.
+        /// </summary>
+        /// <param name="factory">The factory.</param>
+        /// <param name="type">The type.</param>
+        /// <exception cref="System.ArgumentException">Expecting a type inheriting from System.Collections.IList;type</exception>
+        public ListDescriptor(ITypeDescriptorFactory factory, Type type, bool emitDefaultValues, IMemberNamingConvention namingConvention)
+            : base(factory, type, emitDefaultValues, namingConvention)
+        {
+            if (!IsList(type))
+                throw new ArgumentException(@"Expecting a type inheriting from System.Collections.IList", nameof(type));
+
+            // Gets the element type
+            ElementType = type.GetInterface(typeof(IEnumerable<>))?.GetGenericArguments()[0] ?? typeof(object);
+
+            // implements IList
+            if (typeof(IList).IsAssignableFrom(type))
+            {
+                // implements IList
+                ListAddFunction = (obj, value) => ((IList)obj).Add(value);
+                ListClearFunction = obj => ((IList)obj).Clear();
+                ListInsertFunction = (obj, index, value) => ((IList)obj).Insert(index, value);
+                ListRemoveAtFunction = (obj, index) => ((IList)obj).RemoveAt(index);
+                GetListCountFunction = o => ((IList)o).Count;
+                GetIndexedItem = (obj, index) => ((IList)obj)[index];
+                SetIndexedItem = (obj, index, value) => ((IList)obj)[index] = value;
+                IsReadOnlyFunction = obj => ((IList)obj).IsReadOnly;
+            }
+            else // implements IList<T>
+            {
+                var add = type.GetMethod(nameof(IList<object>.Add), new[] { ElementType });
+                ListAddFunction = (obj, value) => add.Invoke(obj, new[] { value });
+                var remove = type.GetMethod(nameof(IList<object>.Remove), new[] { ElementType });
+                ListRemoveFunction = (obj, value) => remove.Invoke(obj, new[] { value });
+                var clear = type.GetMethod(nameof(IList<object>.Clear), Type.EmptyTypes);
+                ListClearFunction = obj => clear.Invoke(obj, EmptyObjects);
+                var countMethod = type.GetProperty(nameof(IList<object>.Count)).GetGetMethod();
+                GetListCountFunction = o => (int)countMethod.Invoke(o, null);
+                var isReadOnly = type.GetInterface(typeof(ICollection<>)).GetProperty(nameof(IList<object>.IsReadOnly)).GetGetMethod();
+                IsReadOnlyFunction = obj => (bool)isReadOnly.Invoke(obj, null);
+                var insert = type.GetMethod(nameof(IList<object>.Insert), new[] { typeof(int), ElementType });
+                ListInsertFunction = (obj, index, value) => insert.Invoke(obj, new[] { index, value });
+                var removeAt = type.GetMethod(nameof(IList<object>.RemoveAt), new[] { typeof(int) });
+                ListRemoveAtFunction = (obj, index) => removeAt.Invoke(obj, new object[] { index });
+                var getItem = type.GetMethod("get_Item", new[] { typeof(int) });
+                GetIndexedItem = (obj, index) => getItem.Invoke(obj, new object[] { index });
+                var setItem = type.GetMethod("set_Item", new[] { typeof(int), ElementType });
+                SetIndexedItem = (obj, index, value) => setItem.Invoke(obj, new[] { index, value });
+            }
+
+            HasAdd = true;
+            HasRemove = true;
+            HasInsert = true;
+            HasRemoveAt = true;
+            HasIndexerAccessors = true;
+        }
+
+        public override void Initialize(IComparer<object> keyComparer)
+        {
+            base.Initialize(keyComparer);
+
+            IsPureCollection = Count == 0;
+        }
+
+        public override DescriptorCategory Category => DescriptorCategory.List;
+
+        /// <summary>
+        /// Determines whether the specified list is read only.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <returns><c>true</c> if the specified list is read only; otherwise, <c>false</c>.</returns>
+        public override bool IsReadOnly(object list)
+        {
+            return list == null || IsReadOnlyFunction == null || IsReadOnlyFunction(list);
+        }
+
+        /// <summary>
+        /// Gets a generic enumerator for a list.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <returns>A generic enumerator.</returns>
+        /// <exception cref="System.ArgumentNullException">dictionary</exception>
+        public IEnumerable<object> GetEnumerator(object list)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            return ((IEnumerable)list).Cast<object>();
+        }
+
+        /// <summary>
+        /// Returns the value matching the given index in the list.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="index">The index.</param>
+        public override object GetValue(object list, object index)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            if (!(index is int)) throw new ArgumentException("The index must be an int.");
+            return GetValue(list, (int)index);
+        }
+
+        /// <summary>
+        /// Returns the value matching the given index in the list.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="index">The index.</param>
+        public override object GetValue(object list, int index)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            return GetIndexedItem(list, index);
+        }
+
+        public override void SetValue(object list, object index, object value)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            if (!(index is int)) throw new ArgumentException("The index must be an int.");
+            SetValue(list, (int)index, value);
+        }
+
+        public void SetValue(object list, int index, object value)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            SetIndexedItem(list, index, value);
+        }
+
+        /// <summary>
+        /// Clears the specified list.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        public override void Clear(object list)
+        {
+            ListClearFunction(list);
+        }
+
+        /// <summary>
+        /// Add to the lists of the same type than this descriptor.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="value">The value to add to this list.</param>
+        public override void Add(object list, object value)
+        {
+            ListAddFunction(list, value);
+        }
+
+        /// <summary>
+        /// Insert to the list of the same type than this descriptor.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="index">The index of the insertion.</param>
+        /// <param name="value">The value to insert to this list.</param>
+        public override void Insert(object list, int index, object value)
+        {
+            ListInsertFunction(list, index, value);
+        }
+
+        /// <summary>
+        /// Removes the item from the lists of the same type.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="item"></param>
+        public override void Remove(object list, object item)
+        {
+            ListRemoveFunction(list, item);
+        }
+
+        /// <summary>
+        /// Remove item at the given index from the lists of the same type.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="index">The index of the item to remove from this list.</param>
+        public override void RemoveAt(object list, int index)
+        {
+            ListRemoveAtFunction(list, index);
+        }
+
+        /// <summary>
+        /// Determines the number of elements of a list, -1 if it cannot determine the number of elements.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <returns>The number of elements of a list, -1 if it cannot determine the number of elements.</returns>
+        public override int GetCollectionCount(object List)
+        {
+            return List == null || GetListCountFunction == null ? -1 : GetListCountFunction(List);
+        }
+
+        /// <summary>
+        /// Determines whether the specified type is a .NET list.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns><c>true</c> if the specified type is list; otherwise, <c>false</c>.</returns>
+        public static bool IsList(Type type)
+        {
+            if (type == null) throw new ArgumentNullException(nameof(type));
+            var typeInfo = type.GetTypeInfo();
+            if (typeInfo.IsArray)
+            {
+                return false;
+            }
+
+            if (typeof(IList).GetTypeInfo().IsAssignableFrom(typeInfo))
+            {
+                return true;
+            }
+
+            foreach (var iType in typeInfo.ImplementedInterfaces)
+            {
+                var iTypeInfo = iType.GetTypeInfo();
+                if (iTypeInfo.IsGenericType && iTypeInfo.GetGenericTypeDefinition() == typeof(IList<>))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        protected override bool PrepareMember(MemberDescriptorBase member, MemberInfo metadataClassMemberInfo)
+        {
+            // Filter members
+            if (member is PropertyDescriptor && ListOfMembersToRemove.Contains(member.OriginalName))
+            {
+                return false;
+            }
+
+            return !IsCompilerGenerated && base.PrepareMember(member, metadataClassMemberInfo);
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/NotSupportedObjectDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/NotSupportedObjectDescriptor.cs
new file mode 100644
index 0000000000..b8b6cd3746
--- /dev/null
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/NotSupportedObjectDescriptor.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core.Yaml.Serialization;
+
+namespace Xenko.Core.Reflection
+{
+    /// <summary>
+    /// Describes a descriptor for an unsupported object type.
+    /// This will be treated as an <see cref="ObjectDescriptor"/>
+    /// </summary>
+    public class NotSupportedObjectDescriptor : ObjectDescriptor
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NotSupportedObjectDescriptor" /> class.
+        /// </summary>
+        /// <param name="factory">The factory.</param>
+        /// <param name="type">The type.</param>
+        /// <exception cref="System.ArgumentException">Type [{0}] is not a primitive</exception>
+        public NotSupportedObjectDescriptor(ITypeDescriptorFactory factory, Type type, bool emitDefaultValues, IMemberNamingConvention namingConvention)
+            : base(factory, type, emitDefaultValues, namingConvention)
+        {
+        }
+
+        public override DescriptorCategory Category => DescriptorCategory.NotSupportedObject;
+    }
+}
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/ObjectDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/ObjectDescriptor.cs
index bfe246378b..b688a6c133 100644
--- a/sources/core/Xenko.Core.Reflection/TypeDescriptors/ObjectDescriptor.cs
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/ObjectDescriptor.cs
@@ -17,7 +17,7 @@ namespace Xenko.Core.Reflection
     public class ObjectDescriptor : ITypeDescriptor
     {
         protected static readonly string SystemCollectionsNamespace = typeof(int).Namespace;
-        public static readonly Func<object, bool> ShouldSerializeDefault = o => true;
+        public static readonly ShouldSerializePredicate ShouldSerializeDefault = (obj, parentTypeMemberDesc) => true;
         private static readonly List<IMemberDescriptor> EmptyMembers = new List<IMemberDescriptor>();
 
         private readonly ITypeDescriptorFactory factory;
@@ -136,7 +136,7 @@ public virtual void Initialize(IComparer<object> keyComparer)
             var memberList = PrepareMembers();
 
             // Sort members by name
-            // This is to make sure that properties/fields for an object 
+            // This is to make sure that properties/fields for an object
             // are always displayed in the same order
             if (keyComparer != null)
             {
@@ -196,6 +196,22 @@ protected virtual List<IMemberDescriptor> PrepareMembers()
             }
 
             var bindingFlags = BindingFlags.Instance | BindingFlags.Public;
+
+            var metadataTypeAttributes = Type.GetCustomAttributes<DataContractMetadataTypeAttribute>(inherit: true);
+            var metadataClassMemberInfos = metadataTypeAttributes.Any() ? new List<(MemberInfo MemberInfo, Type MemberType)>() : null;
+            foreach (var metadataTypeAttr in metadataTypeAttributes)
+            {
+                var metadataType = metadataTypeAttr.MetadataClassType;
+                metadataClassMemberInfos.AddRange(from propertyInfo in metadataType.GetProperties(bindingFlags)
+                                                  where propertyInfo.CanRead && propertyInfo.GetIndexParameters().Length == 0 && IsMemberToVisit(propertyInfo)
+                                                  select (propertyInfo as MemberInfo, propertyInfo.PropertyType));
+
+                // Add all public fields
+                metadataClassMemberInfos.AddRange(from fieldInfo in metadataType.GetFields(bindingFlags)
+                                                  where fieldInfo.IsPublic && IsMemberToVisit(fieldInfo)
+                                                  select (fieldInfo as MemberInfo, fieldInfo.FieldType));
+            }
+
             // TODO: we might want an option to disable non-public.
             if (Category == DescriptorCategory.Object)
                 bindingFlags |= BindingFlags.NonPublic;
@@ -204,15 +220,15 @@ protected virtual List<IMemberDescriptor> PrepareMembers()
                               where propertyInfo.CanRead && propertyInfo.GetIndexParameters().Length == 0 && IsMemberToVisit(propertyInfo)
                               select new PropertyDescriptor(factory.Find(propertyInfo.PropertyType), propertyInfo, NamingConvention.Comparer)
                               into member
-                              where PrepareMember(member)
-                              select member).Cast<IMemberDescriptor>().ToList();
+                              where PrepareMember(member, metadataClassMemberInfos?.FirstOrDefault(x => x.MemberInfo.Name == member.OriginalName && x.MemberType == member.Type).MemberInfo)
+                              select member as IMemberDescriptor).ToList();
 
             // Add all public fields
             memberList.AddRange(from fieldInfo in Type.GetFields(bindingFlags)
                                 where fieldInfo.IsPublic && IsMemberToVisit(fieldInfo)
                                 select new FieldDescriptor(factory.Find(fieldInfo.FieldType), fieldInfo, NamingConvention.Comparer)
                                 into member
-                                where PrepareMember(member)
+                                where PrepareMember(member, metadataClassMemberInfos?.FirstOrDefault(x => x.MemberInfo.Name == member.OriginalName && x.MemberType == member.Type).MemberInfo)
                                 select member);
 
             // Allows adding dynamic members per type
@@ -221,7 +237,7 @@ where PrepareMember(member)
             return memberList;
         }
 
-        protected virtual bool PrepareMember(MemberDescriptorBase member)
+        protected virtual bool PrepareMember(MemberDescriptorBase member, MemberInfo metadataClassMemberInfo)
         {
             var memberType = member.Type;
 
@@ -229,9 +245,15 @@ protected virtual bool PrepareMember(MemberDescriptorBase member)
             member.Mode = DefaultMemberMode;
             member.Mask = 1;
 
+            var attributes = AttributeRegistry.GetAttributes(member.MemberInfo);
+            if (metadataClassMemberInfo != null)
+            {
+                var metadataAttributes = AttributeRegistry.GetAttributes(metadataClassMemberInfo);
+                attributes.InsertRange(0, metadataAttributes);
+            }
 
             // Gets the style
-            var styleAttribute = AttributeRegistry.GetAttribute<DataStyleAttribute>(member.MemberInfo);
+            var styleAttribute = attributes.FirstOrDefault(x => x is DataStyleAttribute) as DataStyleAttribute;
             if (styleAttribute != null)
             {
                 member.Style = styleAttribute.Style;
@@ -239,7 +261,7 @@ protected virtual bool PrepareMember(MemberDescriptorBase member)
             }
 
             // Handle member attribute
-            var memberAttribute = AttributeRegistry.GetAttribute<DataMemberAttribute>(member.MemberInfo);
+            var memberAttribute = attributes.FirstOrDefault(x => x is DataMemberAttribute) as DataMemberAttribute;
             if (memberAttribute != null)
             {
                 ((IMemberDescriptor)member).Mask = memberAttribute.Mask;
@@ -267,14 +289,14 @@ protected virtual bool PrepareMember(MemberDescriptorBase member)
             }
 
             // Process all attributes just once instead of getting them one by one
-            var attributes = AttributeRegistry.GetAttributes(member.MemberInfo);
             DefaultValueAttribute defaultValueAttribute = null;
             foreach (var attribute in attributes)
             {
                 var valueAttribute = attribute as DefaultValueAttribute;
                 if (valueAttribute != null)
                 {
-                    defaultValueAttribute = valueAttribute;
+                    // If we've already found one, don't overwrite it
+                    defaultValueAttribute = defaultValueAttribute ?? valueAttribute;
                     continue;
                 }
 
@@ -292,7 +314,6 @@ protected virtual bool PrepareMember(MemberDescriptorBase member)
                 }
             }
 
-
             // If it's a private member, check it has a YamlMemberAttribute on it
             if (!member.IsPublic)
             {
@@ -321,10 +342,11 @@ protected virtual bool PrepareMember(MemberDescriptorBase member)
             //	  otherwise => true
             var shouldSerialize = Type.GetMethod("ShouldSerialize" + member.OriginalName, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
             if (shouldSerialize != null && shouldSerialize.ReturnType == typeof(bool) && member.ShouldSerialize == null)
-                member.ShouldSerialize = obj => (bool)shouldSerialize.Invoke(obj, EmptyObjectArray);
+                member.ShouldSerialize = (obj, parentTypeMemberDesc) => (bool)shouldSerialize.Invoke(obj, EmptyObjectArray);
 
             if (defaultValueAttribute != null && member.ShouldSerialize == null && !emitDefaultValues)
             {
+                member.DefaultValueAttribute = defaultValueAttribute;
                 object defaultValue = defaultValueAttribute.Value;
                 Type defaultType = defaultValue?.GetType();
                 if (defaultType != null && defaultType.IsNumeric() && defaultType != memberType)
@@ -337,7 +359,20 @@ protected virtual bool PrepareMember(MemberDescriptorBase member)
                     {
                     }
                 }
-                member.ShouldSerialize = obj => !Equals(defaultValue, member.Get(obj));
+                member.ShouldSerialize = (obj, parentTypeMemberDesc) =>
+                {
+                    if (parentTypeMemberDesc?.HasDefaultValue ?? false)
+                    {
+                        var parentDefaultValue = parentTypeMemberDesc.DefaultValue;
+                        if (parentDefaultValue != null)
+                        {
+                                // The parent class holding this object type has defined it's own default value for this type
+                                var parentDefaultValueMemberValue = member.Get(parentDefaultValue); // This is the real default value for this object
+                                return !Equals(parentDefaultValueMemberValue, member.Get(obj));
+                        }
+                    }
+                    return !Equals(defaultValue, member.Get(obj));
+                };
             }
 
             if (member.ShouldSerialize == null)
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/OldCollectionDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/OldCollectionDescriptor.cs
new file mode 100644
index 0000000000..80e0318a6b
--- /dev/null
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/OldCollectionDescriptor.cs
@@ -0,0 +1,268 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using Xenko.Core.Yaml.Serialization;
+
+namespace Xenko.Core.Reflection
+{
+    /// <summary>
+    /// The old descriptor, kept here to avoid compatibility error.
+    /// Provides a descriptor for a <see cref="System.Collections.ICollection"/>.
+    /// </summary>
+    [Obsolete("This class is kept for compatibility, shouldn't be used in new feathers")]
+    public class OldCollectionDescriptor : CollectionDescriptor
+    {
+        private static readonly object[] EmptyObjects = new object[0];
+        private static readonly List<string> ListOfMembersToRemove = new List<string> { "Capacity", "Count", "IsReadOnly", "IsFixedSize", "IsSynchronized", "SyncRoot", "Comparer" };
+
+        private readonly Func<object, bool> IsReadOnlyFunction;
+        private readonly Func<object, int> GetCollectionCountFunction;
+        private readonly Func<object, int, object> GetIndexedItem;
+        private readonly Action<object, int, object> SetIndexedItem;
+        private readonly Action<object, object> CollectionAddFunction;
+        private readonly Action<object, int, object> CollectionInsertFunction;
+        private readonly Action<object, int> CollectionRemoveAtFunction;
+        private readonly Action<object, object> CollectionRemoveFunction;
+        private readonly Action<object> CollectionClearFunction;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CollectionDescriptor" /> class.
+        /// </summary>
+        /// <param name="factory">The factory.</param>
+        /// <param name="type">The type.</param>
+        /// <exception cref="System.ArgumentException">Expecting a type inheriting from System.Collections.ICollection;type</exception>
+        public OldCollectionDescriptor(ITypeDescriptorFactory factory, Type type, bool emitDefaultValues, IMemberNamingConvention namingConvention)
+            : base(factory, type, emitDefaultValues, namingConvention)
+        {
+            // Gets the element type
+            ElementType = type.GetInterface(typeof(IEnumerable<>))?.GetGenericArguments()[0] ?? typeof(object);
+
+            // implements IList
+            if (typeof(IList).IsAssignableFrom(type))
+            {
+                CollectionAddFunction = (obj, value) => ((IList)obj).Add(value);
+                CollectionClearFunction = obj => ((IList)obj).Clear();
+                CollectionInsertFunction = (obj, index, value) => ((IList)obj).Insert(index, value);
+                CollectionRemoveAtFunction = (obj, index) => ((IList)obj).RemoveAt(index);
+                GetCollectionCountFunction = o => ((IList)o).Count;
+                GetIndexedItem = (obj, index) => ((IList)obj)[index];
+                SetIndexedItem = (obj, index, value) => ((IList)obj)[index] = value;
+                IsReadOnlyFunction = obj => ((IList)obj).IsReadOnly;
+                HasIndexerAccessors = true;
+                IsList = true;
+            }
+            else if (type.GetInterface(typeof(ICollection<>)) is Type itype)// implements ICollection<T>
+            {
+                var add = itype.GetMethod(nameof(ICollection<object>.Add), new[] { ElementType });
+                CollectionAddFunction = (obj, value) => add.Invoke(obj, new[] { value });
+                var remove = itype.GetMethod(nameof(ICollection<object>.Remove), new[] { ElementType });
+                CollectionRemoveFunction = (obj, value) => remove.Invoke(obj, new[] { value });
+                if (typeof(IDictionary).IsAssignableFrom(type))
+                {
+                    CollectionClearFunction = obj => ((IDictionary)obj).Clear();
+                    GetCollectionCountFunction = o => ((IDictionary)o).Count;
+                    IsReadOnlyFunction = obj => ((IDictionary)obj).IsReadOnly;
+                }
+                else
+                {
+                    var clear = itype.GetMethod(nameof(ICollection<object>.Clear), Type.EmptyTypes);
+                    CollectionClearFunction = obj => clear.Invoke(obj, EmptyObjects);
+                    var countMethod = itype.GetProperty(nameof(ICollection<object>.Count)).GetGetMethod();
+                    GetCollectionCountFunction = o => (int)countMethod.Invoke(o, null);
+                    var isReadOnly = itype.GetProperty(nameof(ICollection<object>.IsReadOnly)).GetGetMethod();
+                    IsReadOnlyFunction = obj => (bool)isReadOnly.Invoke(obj, null);
+                }
+                // implements IList<T>
+                itype = type.GetInterface(typeof(IList<>));
+                if (itype != null)
+                {
+                    var insert = itype.GetMethod(nameof(IList<object>.Insert), new[] { typeof(int), ElementType });
+                    CollectionInsertFunction = (obj, index, value) => insert.Invoke(obj, new[] { index, value });
+                    var removeAt = itype.GetMethod(nameof(IList<object>.RemoveAt), new[] { typeof(int) });
+                    CollectionRemoveAtFunction = (obj, index) => removeAt.Invoke(obj, new object[] { index });
+                    var getItem = itype.GetMethod("get_Item", new[] { typeof(int) });
+                    GetIndexedItem = (obj, index) => getItem.Invoke(obj, new object[] { index });
+                    var setItem = itype.GetMethod("set_Item", new[] { typeof(int), ElementType });
+                    SetIndexedItem = (obj, index, value) => setItem.Invoke(obj, new[] { index, value });
+                    HasIndexerAccessors = true;
+                    IsList = true;
+                }
+                else
+                {
+                    // Attempt to retrieve IList<> accessors from ICollection.
+                    var insert = type.GetMethod(nameof(IList<object>.Insert), new[] { typeof(int), ElementType });
+                    if (insert != null)
+                        CollectionInsertFunction = (obj, index, value) => insert.Invoke(obj, new[] { index, value });
+
+                    var removeAt = type.GetMethod(nameof(IList<object>.RemoveAt), new[] { typeof(int) });
+                    if (removeAt != null)
+                        CollectionRemoveAtFunction = (obj, index) => removeAt.Invoke(obj, new object[] { index });
+
+                    var getItem = type.GetMethod("get_Item", new[] { typeof(int) });
+                    if (getItem != null)
+                        GetIndexedItem = (obj, index) => getItem.Invoke(obj, new object[] { index });
+
+                    var setItem = type.GetMethod("set_Item", new[] { typeof(int), ElementType });
+                    if (setItem != null)
+                        SetIndexedItem = (obj, index, value) => setItem.Invoke(obj, new[] { index, value });
+
+                    HasIndexerAccessors = getItem != null && setItem != null;
+                }
+            }
+            else
+            {
+                throw new ArgumentException($"Type [{(type)}] is not supported as a modifiable collection");
+            }
+
+            HasAdd = CollectionAddFunction != null;
+            HasRemove = CollectionRemoveFunction != null;
+            HasInsert = CollectionInsertFunction != null;
+            HasRemoveAt = CollectionRemoveAtFunction != null;
+        }
+
+        public override void Initialize(IComparer<object> keyComparer)
+        {
+            base.Initialize(keyComparer);
+
+            IsPureCollection = Count == 0;
+        }
+
+        public override DescriptorCategory Category => DescriptorCategory.Collection;
+
+        /// <summary>
+        /// Gets a value indicating whether this collection implements <see cref="IList"/> or <see cref="IList{T}"/>.
+        /// </summary>
+        public bool IsList { get; }
+
+        /// <summary>
+        /// Returns the value matching the given index in the collection.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="index">The index.</param>
+        public override object GetValue(object list, object index)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            if (!(index is int)) throw new ArgumentException("The index must be an int.");
+            return GetValue(list, (int)index);
+        }
+
+        /// <summary>
+        /// Returns the value matching the given index in the collection.
+        /// </summary>
+        /// <param name="list">The list.</param>
+        /// <param name="index">The index.</param>
+        public override object GetValue(object list, int index)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            return GetIndexedItem(list, index);
+        }
+
+        public override void SetValue(object list, object index, object value)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            if (!(index is int)) throw new ArgumentException("The index must be an int.");
+            SetValue(list, (int)index, value);
+        }
+
+        public void SetValue(object list, int index, object value)
+        {
+            if (list == null) throw new ArgumentNullException(nameof(list));
+            SetIndexedItem(list, index, value);
+        }
+
+        /// <summary>
+        /// Clears the specified collection.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        public override void Clear(object collection)
+        {
+            CollectionClearFunction(collection);
+        }
+
+        /// <summary>
+        /// Add to the collections of the same type than this descriptor.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <param name="value">The value to add to this collection.</param>
+        public override void Add(object collection, object value)
+        {
+            CollectionAddFunction(collection, value);
+        }
+
+        /// <summary>
+        /// Insert to the collections of the same type than this descriptor.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <param name="index">The index of the insertion.</param>
+        /// <param name="value">The value to insert to this collection.</param>
+        public override void Insert(object collection, int index, object value)
+        {
+            CollectionInsertFunction(collection, index, value);
+        }
+
+        /// <summary>
+        /// Remove item at the given index from the collections of the same type.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <param name="index">The index of the item to remove from this collection.</param>
+        public override void RemoveAt(object collection, int index)
+        {
+            CollectionRemoveAtFunction(collection, index);
+        }
+
+        /// <summary>
+        /// Removes the item from the collections of the same type.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <param name="item"></param>
+        public override void Remove(object collection, object item)
+        {
+            CollectionRemoveFunction(collection, item);
+        }
+
+        /// <summary>
+        /// Determines whether the specified collection is read only.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <returns><c>true</c> if the specified collection is read only; otherwise, <c>false</c>.</returns>
+        public override bool IsReadOnly(object collection)
+        {
+            return collection == null || IsReadOnlyFunction == null || IsReadOnlyFunction(collection);
+        }
+
+        /// <summary>
+        /// Determines the number of elements of a collection, -1 if it cannot determine the number of elements.
+        /// </summary>
+        /// <param name="collection">The collection.</param>
+        /// <returns>The number of elements of a collection, -1 if it cannot determine the number of elements.</returns>
+        public override int GetCollectionCount(object collection)
+        {
+            return collection == null || GetCollectionCountFunction == null ? -1 : GetCollectionCountFunction(collection);
+        }
+
+        /// <summary>
+        /// Determines whether the specified type is collection.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns><c>true</c> if the specified type is collection; otherwise, <c>false</c>.</returns>
+        public static bool IsCollection(Type type)
+        {
+            return TypeHelper.IsCollection(type);
+        }
+
+        protected override bool PrepareMember(MemberDescriptorBase member, MemberInfo metadataClassMemberInfo)
+        {
+            // Filter members
+            if (member is PropertyDescriptor && ListOfMembersToRemove.Contains(member.OriginalName))
+            //if (member is PropertyDescriptor && (member.DeclaringType.Namespace ?? string.Empty).StartsWith(SystemCollectionsNamespace) && ListOfMembersToRemove.Contains(member.Name))
+            {
+                return false;
+            }
+
+            return !IsCompilerGenerated && base.PrepareMember(member, metadataClassMemberInfo);
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Reflection/TypeDescriptors/SetDescriptor.cs b/sources/core/Xenko.Core.Reflection/TypeDescriptors/SetDescriptor.cs
new file mode 100644
index 0000000000..75c38a32c1
--- /dev/null
+++ b/sources/core/Xenko.Core.Reflection/TypeDescriptors/SetDescriptor.cs
@@ -0,0 +1,265 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using Xenko.Core.Yaml.Serialization;
+
+namespace Xenko.Core.Reflection
+{
+    public class SetDescriptor : CollectionDescriptor
+    {
+        private static readonly List<string> ListOfMembersToRemove = new List<string> { "Comparer", "Capacity" };
+
+        private readonly MethodInfo addMethod;
+        private readonly MethodInfo removeMethod;
+        private readonly MethodInfo clearMethod;
+        private readonly MethodInfo containsMethod;
+        private readonly MethodInfo countMethod;
+        private readonly MethodInfo isReadOnlyMethod;
+
+        public SetDescriptor(ITypeDescriptorFactory factory, Type type, bool emitDefaultValues, IMemberNamingConvention namingConvention)
+            : base(factory, type, emitDefaultValues, namingConvention)
+        {
+            if (!IsSet(type))
+                throw new ArgumentException(@"Expecting a type inheriting from System.Collections.ISet", nameof(type));
+
+            // extract Key, Value types from ISet<??>
+            var interfaceType = type.GetInterface(typeof(ISet<>));
+
+            // Gets the element type
+            ElementType = interfaceType.GetGenericArguments()[0] ?? typeof(object);
+
+            Type[] ArgTypes = { ElementType };
+            addMethod = interfaceType.GetMethod("Add", ArgTypes);
+            removeMethod = type.GetMethod("Remove", ArgTypes);
+            clearMethod = interfaceType.GetMethod("Clear");
+            containsMethod = type.GetMethod("Contains", ArgTypes);
+            countMethod = type.GetProperty("Count").GetGetMethod();
+            isReadOnlyMethod = type.GetInterface(typeof(ICollection<>)).GetProperty("IsReadOnly").GetGetMethod();
+
+            HasAdd = true;
+            HasRemove = true;
+            HasIndexerAccessors = true;
+            HasInsert = false;
+            HasRemoveAt = false;
+        }
+
+        public override void Initialize(IComparer<object> keyComparer)
+        {
+            base.Initialize(keyComparer);
+
+            // Only Keys and Values
+            IsPureCollection = Count == 0;
+        }
+
+        public override DescriptorCategory Category => DescriptorCategory.Set;
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is generic set.
+        /// </summary>
+        /// <value><c>true</c> if this instance is generic set; otherwise, <c>false</c>.</value>
+        public bool IsGenericSet { get; }
+
+        /// <summary>
+        /// Determines whether the value passed is readonly.
+        /// </summary>
+        /// <param name="thisObject">The this object.</param>
+        /// <returns><c>true</c> if [is read only] [the specified this object]; otherwise, <c>false</c>.</returns>
+        public override bool IsReadOnly(object thisObject)
+        {
+            return thisObject == null || isReadOnlyMethod == null || (bool)isReadOnlyMethod.Invoke(thisObject, null);
+        }
+
+        /// <summary>
+        /// Adds a value to a set.
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="item">The item.</param>
+        /// <exception cref="System.InvalidOperationException">No Add() method found on set [{0}].ToFormat(Type)</exception>
+        public override void Add(object set, object item)
+        {
+            if (set == null) throw new ArgumentNullException(nameof(set));
+            var simpleSet = set as ISet<object>;
+            if (simpleSet != null)
+            {
+                simpleSet.Add(item);
+            }
+            else
+            {
+                // Only throw an exception if the addMethod is not accessible when adding to a set
+                if (addMethod == null)
+                {
+                    throw new InvalidOperationException("No Add() method found on set [{0}]".ToFormat(Type));
+                }
+                addMethod.Invoke(set, new[] { item });
+            }
+        }
+
+        public override void Insert(object set, int index, object value)
+        {
+            throw new InvalidOperationException("SetDescriptor should not call function 'Insert'.");
+        }
+
+        /// <summary>
+        /// Remove a value from a set
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="key">The key.</param>
+        public override void Remove(object set, object key)
+        {
+            if (set == null) throw new ArgumentNullException(nameof(set));
+            var simpleSet = set as ISet<object>;
+            if (simpleSet != null)
+            {
+                simpleSet.Remove(key);
+            }
+            else
+            {
+                // Only throw an exception if the addMethod is not accessible when adding to a set
+                if (removeMethod == null)
+                {
+                    throw new InvalidOperationException("No Remove() method found on set [{0}]".ToFormat(Type));
+                }
+                removeMethod.Invoke(set, new[] { key });
+            }
+
+        }
+
+        public override void RemoveAt(object set, int index)
+        {
+            throw new InvalidOperationException("SetDescriptor should not call function 'RemoveAt'.");
+        }
+
+        /// <summary>
+        /// Clears the specified set.
+        /// </summary>
+        /// <param name="set">The set.</param>
+        public override void Clear(object set)
+        {
+            clearMethod.Invoke(set, null);
+        }
+
+        /// <summary>
+        /// Indicate whether the set contains the given value
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="value">The value.</param>
+        public bool Contains(object set, object value)
+        {
+            if (set == null) throw new ArgumentNullException(nameof(set));
+            var simpleSet = set as ISet<object>;
+            if (simpleSet != null)
+            {
+                return simpleSet.Contains(value);
+            }
+            if (containsMethod == null)
+            {
+                throw new InvalidOperationException("No Contains() method found on set [{0}]".ToFormat(Type));
+            }
+            return (bool)containsMethod.Invoke(set, new[] { value });
+        }
+
+        /// <summary>
+        /// Determines the number of elements of a count, -1 if it cannot determine the number of elements.
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <returns>The number of elements of a set, -1 if it cannot determine the number of elements.</returns>
+        public override int GetCollectionCount(object set)
+        {
+            return set == null || countMethod == null ? -1 : (int)countMethod.Invoke(set, null);
+        }
+
+        /// <summary>
+        /// Get set value by index
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="index">Index of value.</param>
+        /// <returns></returns>
+        public override object GetValue(object set, object index)
+        {
+            return Contains(set, index) ? index : null;
+        }
+
+        /// <summary>
+        /// Returns the value matching the given index in the set.
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="index">The index.</param>
+        public override object GetValue(object set, int index)
+        {
+            throw new InvalidOperationException("SetDescriptor should not call function 'GetValue' with int index parameter.");
+        }
+
+        /// <summary>
+        /// Set the set value by index
+        /// </summary>
+        /// <param name="set">The set.</param>
+        /// <param name="index">Index of value.</param>
+        /// <returns></returns>
+        public override void SetValue(object set, object index, object value)
+        {
+            if (set == null) throw new ArgumentNullException(nameof(set));
+            var simpleSet = set as ISet<object>;
+            if (simpleSet != null)
+            {
+                if (simpleSet.Contains(index))
+                {
+                    simpleSet.Remove(index);
+                }
+                if (!simpleSet.Contains(value))
+                {
+                    simpleSet.Add(value);
+                }
+            }
+            else if (containsMethod != null && addMethod != null && removeMethod != null)
+            {
+                object[] indexParam = new[] { index };
+                object[] valueParam = new[] { value };
+                if ((bool)containsMethod.Invoke(set, indexParam))
+                {
+                    removeMethod.Invoke(set, indexParam);
+                }
+                if (!(bool)containsMethod.Invoke(set, valueParam))
+                {
+                    addMethod.Invoke(set, valueParam);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the specified type is a .NET set.
+        /// </summary>
+        /// <param name="type">The type.</param>
+        /// <returns><c>true</c> if the specified type is set; otherwise, <c>false</c>.</returns>
+        public static bool IsSet(Type type)
+        {
+            if (type == null) throw new ArgumentNullException(nameof(type));
+            var typeInfo = type.GetTypeInfo();
+
+            foreach (var iType in typeInfo.ImplementedInterfaces)
+            {
+                var iTypeInfo = iType.GetTypeInfo();
+                if (iTypeInfo.IsGenericType && iTypeInfo.GetGenericTypeDefinition() == typeof(ISet<>))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        protected override bool PrepareMember(MemberDescriptorBase member, MemberInfo metadataClassMemberInfo)
+        {
+            // Filter members
+            if (member is PropertyDescriptor && ListOfMembersToRemove.Contains(member.OriginalName))
+            {
+                return false;
+            }
+
+            return base.PrepareMember(member, metadataClassMemberInfo);
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Reflection/Xenko.Core.Reflection.csproj b/sources/core/Xenko.Core.Reflection/Xenko.Core.Reflection.csproj
index 65e4aa0b80..9aad5f71df 100644
--- a/sources/core/Xenko.Core.Reflection/Xenko.Core.Reflection.csproj
+++ b/sources/core/Xenko.Core.Reflection/Xenko.Core.Reflection.csproj
@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
diff --git a/sources/core/Xenko.Core.Serialization/Assets/AssetId.cs b/sources/core/Xenko.Core.Serialization/Assets/AssetId.cs
index 5fab5b80fd..f71c23b092 100644
--- a/sources/core/Xenko.Core.Serialization/Assets/AssetId.cs
+++ b/sources/core/Xenko.Core.Serialization/Assets/AssetId.cs
@@ -71,8 +71,7 @@ public bool Equals(AssetId other)
         /// <inheritdoc/>
         public override bool Equals(object obj)
         {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is AssetId && Equals((AssetId)obj);
+            return obj is AssetId id && Equals(id);
         }
 
         /// <inheritdoc/>
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/AttachedReferenceManager.cs b/sources/core/Xenko.Core.Serialization/Serialization/AttachedReferenceManager.cs
index 157a13c722..4f588d766f 100644
--- a/sources/core/Xenko.Core.Serialization/Serialization/AttachedReferenceManager.cs
+++ b/sources/core/Xenko.Core.Serialization/Serialization/AttachedReferenceManager.cs
@@ -85,10 +85,8 @@ public static AttachedReference GetOrCreateAttachedReference(object obj)
         public static T CreateProxyObject<T>(AssetId id, string location) where T : class, new()
         {
             var result = new T();
-            var attachedReference = GetOrCreateAttachedReference(result);
-            attachedReference.Id = id;
-            attachedReference.Url = location;
-            attachedReference.IsProxy = true;
+            InitializeProxyObject(result, id, location);
+
             return result;
         }
 
@@ -121,11 +119,15 @@ public static object CreateProxyObject(Type type, AssetId id, string location)
                 }
             }
             var result = emptyCtor.Invoke(EmptyObjectArray);
-            var attachedReference = GetOrCreateAttachedReference(result);
+            InitializeProxyObject(result, id, location);
+            return result;
+        }
+        private static void InitializeProxyObject(object proxyObject, AssetId id, string location)
+        {
+            var attachedReference = GetOrCreateAttachedReference(proxyObject);
             attachedReference.Id = id;
             attachedReference.Url = location;
             attachedReference.IsProxy = true;
-            return result;
         }
     }
 }
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/Contents/ContentManager.cs b/sources/core/Xenko.Core.Serialization/Serialization/Contents/ContentManager.cs
index c8b15dc925..f68c58c24f 100644
--- a/sources/core/Xenko.Core.Serialization/Serialization/Contents/ContentManager.cs
+++ b/sources/core/Xenko.Core.Serialization/Serialization/Contents/ContentManager.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Xenko.Core.Diagnostics;
@@ -15,6 +16,8 @@
 using Xenko.Core.Storage;
 using Xenko.Core.Streaming;
 
+[assembly: InternalsVisibleToAttribute("Xenko.Graphics")]
+
 namespace Xenko.Core.Serialization.Contents
 {
     /// <summary>
@@ -26,6 +29,9 @@ public sealed partial class ContentManager : IContentManager
 
         public DatabaseFileProvider FileProvider => databaseFileProvider.FileProvider;
 
+        internal static readonly HashSet<string> _captureModelBuffers = new HashSet<string>();
+        internal static bool _captureThisModel;
+
         private readonly IDatabaseFileProviderService databaseFileProvider;
 
         private readonly IServiceRegistry services;
@@ -113,6 +119,21 @@ public T Load<T>(string url, ContentManagerLoaderSettings settings = null) where
             return (T)Load(typeof(T), url, settings);
         }
 
+        private Dictionary<string, object> QuickLoadedAssets = new Dictionary<string, object>();
+
+        /// <summary>
+        /// Loads an asset, but also caches the object for quick reuse.
+        /// </summary>
+        public T QuickLoad<T>(string url)
+        {
+            if (QuickLoadedAssets.TryGetValue(url, out var a))
+                return (T)a;
+
+            T asset = (T)Load(typeof(T), url, null);
+            QuickLoadedAssets[url] = asset;
+            return asset;
+        }
+
         /// <summary>
         /// Loads content from the specified URL.
         /// </summary>
@@ -232,7 +253,7 @@ private static Task<T> ScheduleAsync<T>(Func<T> action)
         /// <param name="url">The URL of the asset to retrieve.</param>
         /// <returns>The loaded asset, or <c>null</c> if the asset has not been loaded.</returns>
         /// <remarks>This function does not increase the reference count on the asset.</remarks>
-        public T Get<T>(string url)
+        public T Get<T>(string url) where T : class
         {
             return (T)Get(typeof(T), url);
         }
@@ -250,7 +271,7 @@ public object Get(Type type, string url)
         }
 
         /// <summary>
-        /// Gets or sets whether an asset with the given URL is currently loaded.
+        /// Gets whether an asset with the given URL is currently loaded.
         /// </summary>
         /// <param name="url">The URL to check.</param>
         /// <param name="loadedManuallyOnly">If <c>true</c>, this method will return true only if an asset with the given URL has been manually loaded via <see cref="Load"/>, and not if the asset has been only loaded indirectly from another asset.</param>
@@ -324,6 +345,25 @@ public ContentManagerStats GetStats()
             return new ContentManagerStats(LoadedAssetUrls.Values);
         }
 
+        /// <summary>
+        /// Request the ref counts for a specific asset url.
+        /// </summary>
+        public void GetReferenceCounts(string url, out bool exists, out int publicRefCount, out int privateRefCount)
+        {
+            if (LoadedAssetUrls.TryGetValue(url, out var reference))
+            {
+                exists = true;
+                publicRefCount = reference.PublicReferenceCount;
+                privateRefCount = reference.PrivateReferenceCount;
+            }
+            else
+            {
+                exists = false;
+                publicRefCount = 0;
+                privateRefCount = 0;
+            }
+        }
+
         private void PrepareSerializerContext(ContentSerializerContext contentSerializerContext, SerializerContext context)
         {
             context.Set(ContentSerializerContext.ContentSerializerContextProperty, contentSerializerContext);
@@ -452,6 +492,42 @@ internal ChunkHeader ReadChunkHeader(string url)
             }
         }
 
+        /// <summary>
+        /// Get all of the asset URLs
+        /// </summary>
+        /// <param name="baseURL">Base URL to search, defaults to root</param>
+        /// <param name="searchString">Search string to search, defaults to wildcard *</param>
+        /// <param name="searchOption">Search all directiories or just the base one?</param>
+        /// <param name="excludeShaders">Shaders usually fill up a bunch of these urls. This defaults to skipping them in result</param>
+        /// <param name="excludeData">Exclude the auto-generated _Data entries?</param>
+        /// <returns>Array of strings containing all URLs found in the content manager</returns>
+        public string[] AllURLs(string baseURL = "", string searchString = "*", VirtualSearchOption searchOption = VirtualSearchOption.AllDirectories, bool excludeShaders = true, bool excludeData = true)
+        {
+            var files = FileProvider.ListFiles(baseURL, searchString, searchOption);
+
+            if (excludeShaders == false && excludeData == false) return files;
+
+            int entriesRemoved = 0;
+            for (int i=0; i<files.Length - entriesRemoved; i++)
+            {
+                string s = files[i];
+                if (excludeShaders && (s.StartsWith("__shaders_bytecode__/") ||
+                                       s.StartsWith("shaders/")) ||
+                    excludeData && s.EndsWith("_Data"))
+                {
+                    // clean this shader entry
+                    files[i] = files[files.Length - 1 - entriesRemoved];
+                    entriesRemoved++;
+                    i--;
+                }
+            }
+
+            if (entriesRemoved > 0)
+                Array.Resize(ref files, files.Length - entriesRemoved);
+
+            return files;
+        }
+
         private object DeserializeObject(Queue<DeserializeOperation> serializeOperations, Reference parentReference, string url, Type objType, object obj, ContentManagerLoaderSettings settings)
         {
             // Try to find already loaded object
@@ -539,8 +615,12 @@ private object DeserializeObject(Queue<DeserializeOperation> serializeOperations
 
                     PrepareSerializerContext(contentSerializerContext, streamReader.Context);
 
+                    _captureThisModel = _captureModelBuffers?.Contains(url) ?? false;
+
                     contentSerializerContext.SerializeContent(streamReader, serializer, result);
 
+                    _captureThisModel = false;
+
                     // Add reference
                     parentReference?.References.Add(reference);
                 }
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/Contents/IContentManager.cs b/sources/core/Xenko.Core.Serialization/Serialization/Contents/IContentManager.cs
index d8c854d5c3..bc3686348d 100644
--- a/sources/core/Xenko.Core.Serialization/Serialization/Contents/IContentManager.cs
+++ b/sources/core/Xenko.Core.Serialization/Serialization/Contents/IContentManager.cs
@@ -45,12 +45,35 @@ public interface IContentManager
         /// <returns></returns>
         Task<T> LoadAsync<T>(string url, ContentManagerLoaderSettings settings = null) where T : class;
 
+        /// <summary>
+        /// Gets a previously loaded asset from its URL.
+        /// </summary>
+        /// <typeparam name="T">The type of asset to retrieve.</typeparam>
+        /// <param name="url">The URL of the asset to retrieve.</param>
+        /// <returns>The loaded asset, or <c>null</c> if the asset has not been loaded.</returns>
+        /// <remarks>This function does not increase the reference count on the asset.</remarks>
+        T Get<T>(string url) where T : class;
+
+        /// <summary>
+        /// Gets whether an asset with the given URL is currently loaded.
+        /// </summary>
+        /// <param name="url">The URL to check.</param>
+        /// <param name="loadedManuallyOnly">If <c>true</c>, this method will return true only if an asset with the given URL has been manually loaded via <see cref="Load"/>, and not if the asset has been only loaded indirectly from another asset.</param>
+        /// <returns><c>True</c> if an asset with the given URL is currently loaded, <c>false</c> otherwise.</returns>
+        bool IsLoaded(string url, bool loadedManuallyOnly = false);
+
         /// <summary>
         /// Unloads the specified object.
         /// </summary>
         /// <param name="obj">The object to unload.</param>
         void Unload(object obj);
 
+        /// <summary>
+        /// Unloads the asset at the specified URL.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        void Unload(string url);
+
         /// <summary>
         /// Gets the serializer.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/Contents/ReferenceSerializer.cs b/sources/core/Xenko.Core.Serialization/Serialization/Contents/ReferenceSerializer.cs
index 55d803064f..10309a4512 100644
--- a/sources/core/Xenko.Core.Serialization/Serialization/Contents/ReferenceSerializer.cs
+++ b/sources/core/Xenko.Core.Serialization/Serialization/Contents/ReferenceSerializer.cs
@@ -129,7 +129,7 @@ public override void Serialize(ref T obj, ArchiveMode mode, SerializationStream
                 else
                 {
                     // No real case yet
-                    throw new NotSupportedException();
+                    //throw new NotSupportedException();
                 }
             }
         }
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/IUrlReference.cs b/sources/core/Xenko.Core.Serialization/Serialization/IUrlReference.cs
new file mode 100644
index 0000000000..ca7042180c
--- /dev/null
+++ b/sources/core/Xenko.Core.Serialization/Serialization/IUrlReference.cs
@@ -0,0 +1,18 @@
+namespace Xenko.Core.Serialization
+{
+    /// <summary>
+    /// Represents a Url to an asset.
+    /// </summary>
+    public interface IUrlReference
+    {
+        // <summary>
+        /// Gets the Url of the referenced asset.
+        /// </summary>
+        string Url { get; }
+
+        /// <summary>
+        /// Gets whether the is <c>null</c> or empty.
+        /// </summary>
+        bool IsEmpty { get; }
+    }
+}
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/Serializers/UrlReferenceDataSerializer.cs b/sources/core/Xenko.Core.Serialization/Serialization/Serializers/UrlReferenceDataSerializer.cs
new file mode 100644
index 0000000000..ec5a73616d
--- /dev/null
+++ b/sources/core/Xenko.Core.Serialization/Serialization/Serializers/UrlReferenceDataSerializer.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core.Annotations;
+using Xenko.Core.Assets;
+
+namespace Xenko.Core.Serialization.Serializers
+{
+    /// <summary>
+    /// Serializer base class for for <see cref="UrlReference"/>.
+    /// </summary>
+    public abstract class UrlReferenceDataSerializerBase<T> : DataSerializer<T>
+        where T: IUrlReference
+    {
+        /// <inheritdoc/>
+        public override void Serialize(ref T urlReference, ArchiveMode mode, [NotNull] SerializationStream stream)
+        {
+            if (mode == ArchiveMode.Serialize)
+            {
+                var attachedReference = AttachedReferenceManager.GetAttachedReference(urlReference);
+                if(attachedReference == null)
+                {
+                    throw new InvalidOperationException("UrlReference does not have an AttachedReference.");
+                }
+
+                stream.Write(attachedReference.Id);
+                stream.Write(attachedReference.Url);
+            }
+            else
+            {
+                var id = stream.Read<AssetId>();
+                var url = stream.ReadString();
+
+                urlReference = (T)UrlReferenceHelper.CreateReference(typeof(T), id, url);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Serializer for <see cref="UrlReference"/>.
+    /// </summary>
+    public sealed class UrlReferenceDataSerializer : UrlReferenceDataSerializerBase<UrlReference>
+    {
+ 
+    }
+
+    /// <summary>
+    /// Serializer for <see cref="UrlReference{T}"/>.
+    /// </summary>
+    /// <typeparam name="T">The type of asset.</typeparam>
+    public sealed class UrlReferenceDataSerializer<T> : UrlReferenceDataSerializerBase<UrlReference<T>>
+        where T : class
+    {
+       
+    }
+}
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/UrlReference.cs b/sources/core/Xenko.Core.Serialization/Serialization/UrlReference.cs
new file mode 100644
index 0000000000..ba5383cc8e
--- /dev/null
+++ b/sources/core/Xenko.Core.Serialization/Serialization/UrlReference.cs
@@ -0,0 +1,57 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core.Serialization.Serializers;
+
+namespace Xenko.Core.Serialization
+{
+    /// <summary>
+    /// Represents a Url to an asset.
+    /// </summary>
+    [DataSerializer(typeof(UrlReferenceDataSerializer))]
+    public sealed class UrlReference : UrlReferenceBase
+    {
+        /// <summary>
+        /// Create a new <see cref="UrlReference"/> instance.
+        /// </summary>
+        public UrlReference()
+        {
+
+        }
+
+        /// <summary>
+        /// Create a new <see cref="UrlReference"/> instance.
+        /// </summary>
+        /// <param name="url"></param>
+        /// <exception cref="ArgumentNullException">If <paramref name="url"/> is <c>null</c> or empty.</exception>
+        public UrlReference(string url) : base(url)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Represents a Url to an asset of type <see cref="T"/>.
+    /// </summary>
+    /// <typeparam name="T">The type off asset.</typeparam>
+    [DataSerializer(typeof(UrlReferenceDataSerializer<>), Mode = DataSerializerGenericMode.GenericArguments)]
+    public sealed class UrlReference<T> : UrlReferenceBase
+        where T : class
+    {
+        /// <summary>
+        /// Create a new <see cref="UrlReference{T}"/> instance.
+        /// </summary>
+        public UrlReference()
+        {
+
+        }
+
+        /// <summary>
+        /// Create a new <see cref="UrlReference{T}"/> instance.
+        /// </summary>
+        /// <param name="url"></param>
+        /// <exception cref="ArgumentNullException">If <paramref name="url"/> is <c>null</c> or empty.</exception>
+        public UrlReference(string url) : base(url)
+        {
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceBase.cs b/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceBase.cs
new file mode 100644
index 0000000000..e3b362c8a1
--- /dev/null
+++ b/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceBase.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core.Serialization.Contents;
+
+namespace Xenko.Core.Serialization
+{
+    /// <summary>
+    /// Base class for <see cref="IUrlReference" /> implementations
+    /// </summary>
+    [DataContract("urlref", Inherited = true)]
+    [DataStyle(DataStyle.Compact)]
+    [ReferenceSerializer]
+    public abstract class UrlReferenceBase : IUrlReference
+    {
+        private string url;
+
+        /// <summary>
+        /// Create a new <see cref="UrlReferenceBase"/> instance.
+        /// </summary>
+        protected UrlReferenceBase()
+        {
+
+        }
+
+        /// <summary>
+        /// Create a new <see cref="UrlReferenceBase"/> instance.
+        /// </summary>
+        /// <param name="url"></param>
+        /// <exception cref="ArgumentNullException">If <paramref name="url"/> is <c>null</c> or empty.</exception>
+        protected UrlReferenceBase(string url)
+        {
+            if (string.IsNullOrWhiteSpace(url))
+            {
+                throw new ArgumentNullException(nameof(url), $"{nameof(url)} cannot be null or empty.");
+            }
+
+            this.url = url;
+        }
+
+        // <summary>
+        /// Gets the Url of the referenced asset.
+        /// </summary>
+        [DataMember(10)]
+        public string Url
+        {
+            get => url;
+            internal set
+            {
+                if (string.IsNullOrEmpty(value))
+                {
+                    throw new ArgumentNullException(nameof(value), $"{nameof(Url)} cannot be null or empty.");
+                }
+                url = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets whether the url is <c>null</c> or empty.
+        /// </summary>
+        [DataMemberIgnore]
+        public bool IsEmpty => string.IsNullOrEmpty(url);
+
+        /// <inheritdoc/>
+        public override string ToString()
+        {
+            return $"{Url}";
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceContentManagerExtenstions.cs b/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceContentManagerExtenstions.cs
new file mode 100644
index 0000000000..3ce51318e8
--- /dev/null
+++ b/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceContentManagerExtenstions.cs
@@ -0,0 +1,134 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Xenko.Core.IO;
+using Xenko.Core.Serialization.Contents;
+
+namespace Xenko.Core.Serialization
+{
+    /// <summary>
+    /// Extension methods of <see cref="IContentManager"/> to allow usage of <see cref="UrlReference"/> and <see cref="UrlReference{T}"/>.
+    /// </summary>
+    public static class UrlReferenceContentManagerExtenstions
+    {
+        /// <summary>
+        /// Check if the specified asset url exists.
+        /// </summary>
+        /// <param name="content">The <see cref="IContentManager"/>.</param>
+        /// <param name="urlReference">The URL.</param>
+        /// <returns><c>true</c> if the specified asset url exists, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        public static bool Exists(this IContentManager content, IUrlReference urlReference)
+        {
+            CheckArguments(content, urlReference);
+
+            return content.Exists(urlReference.Url);
+        }
+
+        /// <summary>
+        /// Opens the specified URL as a stream used for custom raw asset loading.
+        /// </summary>
+        /// <param name="content">The <see cref="IContentManager"/>.</param>
+        /// <param name="urlReference">The URL to the raw asset.</param>
+        /// <param name="streamFlags">The type of stream needed</param>
+        /// <returns>A stream to the raw asset.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        public static Stream OpenAsStream(this IContentManager content, UrlReference urlReference, StreamFlags streamFlags = StreamFlags.None)
+        {
+            CheckArguments(content, urlReference);
+
+            return content.OpenAsStream(urlReference.Url, streamFlags);
+        }
+
+        /// <summary>
+        /// Loads content from the specified URL.
+        /// </summary>
+        /// <typeparam name="T">The content type.</typeparam>
+        /// <param name="content">The <see cref="IContentManager"/>.</param>
+        /// <param name="urlReference">The URL to load from.</param>
+        /// <param name="settings">The settings. If null, fallback to <see cref="ContentManagerLoaderSettings.Default"/>.</param>
+        /// <returns>The loaded content.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        public static T Load<T>(this IContentManager content, UrlReference<T> urlReference, ContentManagerLoaderSettings settings = null)
+            where T : class
+        {
+            CheckArguments(content, urlReference);
+
+            return content.Load<T>(urlReference.Url, settings);
+        }
+
+        /// <summary>
+        /// Loads content from the specified URL asynchronously.
+        /// </summary>
+        /// <typeparam name="T">The content type.</typeparam>
+        /// <param name="content">The <see cref="IContentManager"/>.</param>
+        /// <param name="urlReference">The URL to load from.</param>
+        /// <param name="settings">The settings. If null, fallback to <see cref="ContentManagerLoaderSettings.Default"/>.</param>
+        /// <returns>The loaded content.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        public static Task<T> LoadAsync<T>(this IContentManager content, UrlReference<T> urlReference, ContentManagerLoaderSettings settings = null)
+            where T : class
+        {
+            CheckArguments(content, urlReference);
+
+            return content.LoadAsync<T>(urlReference.Url, settings);
+        }
+
+        /// <summary>
+        /// Gets a previously loaded asset from its URL.
+        /// </summary>
+        /// <typeparam name="T">The type of asset to retrieve.</typeparam>
+        /// <param name="urlReference">The URL of the asset to retrieve.</param>
+        /// <returns>The loaded asset, or <c>null</c> if the asset has not been loaded.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        /// <remarks>This function does not increase the reference count on the asset.</remarks>
+        public static T Get<T>(this IContentManager content, UrlReference<T> urlReference)
+            where T : class
+        {
+            CheckArguments(content, urlReference);
+
+            return content.Get<T>(urlReference.Url);
+        }
+
+        /// <summary>
+        /// Gets whether an asset with the given URL is currently loaded.
+        /// </summary>
+        /// <param name="urlReference">The URL to check.</param>
+        /// <param name="loadedManuallyOnly">If <c>true</c>, this method will return true only if an asset with the given URL has been manually loaded via <see cref="Load"/>, and not if the asset has been only loaded indirectly from another asset.</param>
+        /// <returns><c>True</c> if an asset with the given URL is currently loaded, <c>false</c> otherwise.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        public static bool IsLoaded(this IContentManager content, IUrlReference urlReference, bool loadedManuallyOnly = false)
+        {
+            CheckArguments(content, urlReference);
+
+            return content.IsLoaded(urlReference.Url, loadedManuallyOnly);
+        }
+
+        /// <summary>
+        /// Unloads the asset at the specified URL.
+        /// </summary>
+        /// <param name="urlReference">The URL.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="urlReference"/> is <c>null</c> or <c>empty</c>. Or <paramref name="content"/> is <c>null</c>.</exception>
+        public static void Unload(this IContentManager content, IUrlReference urlReference)
+        {
+            CheckArguments(content, urlReference);
+
+            content.Unload(urlReference.Url);
+        }
+
+        private static void CheckArguments(IContentManager content, IUrlReference urlReference)
+        {
+            if (content == null)
+            {
+                throw new ArgumentNullException(nameof(content));
+            }
+
+            if (urlReference == null || urlReference.IsEmpty)
+            {
+                throw new ArgumentNullException(nameof(urlReference));
+            }
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceHelper.cs b/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceHelper.cs
new file mode 100644
index 0000000000..c4dae40af7
--- /dev/null
+++ b/sources/core/Xenko.Core.Serialization/Serialization/UrlReferenceHelper.cs
@@ -0,0 +1,85 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core.Assets;
+
+namespace Xenko.Core.Serialization
+{
+    /// <summary>
+    /// A Helper class for <see cref="UrlReference"/> and <see cref="UrlReference{T}"/>.
+    /// </summary>
+    public static class UrlReferenceHelper
+    {
+        /// <summary>
+        /// Creates a url reference to the given asset that matches the given reference type.
+        /// </summary>
+        /// <param name="referenceType">The type of reference to create.</param>
+        /// <param name="assetId">The target asset id to create.</param>
+        /// <param name="assetUrl">The target asset url to create.</param>
+        /// <returns>A url reference to the given asset if it's not null and <paramref name="referenceType"/> is a valid reference url type, null otherwise.</returns>
+        /// <remarks>A reference type is either an <see cref="UrlReference"/> or a <see cref="UrlReference{T}"/>.</remarks>
+        public static object CreateReference(Type referenceType, AssetId assetId, string assetUrl)
+        {
+            if (assetId != null && assetUrl != null && IsUrlReferenceType(referenceType))
+            {
+                var urlReference = (UrlReferenceBase)AttachedReferenceManager.CreateProxyObject(referenceType, assetId, assetUrl);
+
+                urlReference.Url = assetUrl;
+                
+                return urlReference;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Checks if the given type is either an <see cref="UrlReference"/> or a <see cref="UrlReference{T}"/>
+        /// </summary>
+        /// <param name="type">The type to test.</param>
+        /// <returns></returns>
+        public static bool IsUrlReferenceType(Type type)
+            => type != null && typeof(UrlReference).IsAssignableFrom(type) || IsGenericUrlReferenceType(type);
+
+        /// <summary>
+        /// Checks if the given type is a <see cref="UrlReference{T}"/>
+        /// </summary>
+        /// <param name="type">The type to test.</param>
+        /// <returns></returns>
+        public static bool IsGenericUrlReferenceType(Type type)
+            => type != null && IsSubclassOfRawGeneric(GenericType, type);
+
+        /// <summary>
+        /// Gets the asset content type for a given url reference type.
+        /// </summary>
+        /// <param name="type">The type is an url reference type, either an <see cref="UrlReference"/> or a <see cref="UrlReference{T}"/></param>
+        /// <returns>The target content type or null.</returns>
+        public static Type GetTargetContentType(Type type)
+        {
+            if (!IsUrlReferenceType(type)) return null;
+
+            if (IsSubclassOfRawGeneric(GenericType, type))
+            {
+                return type.GetGenericArguments()[0];
+            }
+
+            return null;
+        }
+
+        private static readonly Type GenericType = typeof(UrlReference<>);
+
+        //TODO: this should probably be put in one of the Reflection helper classes.
+        static bool IsSubclassOfRawGeneric(Type type, Type c)
+        {
+            while (c != null && c != typeof(object))
+            {
+                var cur = c.IsGenericType ? c.GetGenericTypeDefinition() : c;
+                if (type == cur)
+                {
+                    return true;
+                }
+                c = c.BaseType;
+            }
+            return false;
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core.Serialization/Storage/ObjectDatabase.cs b/sources/core/Xenko.Core.Serialization/Storage/ObjectDatabase.cs
index 0e55176065..08dbfd80e8 100644
--- a/sources/core/Xenko.Core.Serialization/Storage/ObjectDatabase.cs
+++ b/sources/core/Xenko.Core.Serialization/Storage/ObjectDatabase.cs
@@ -112,6 +112,28 @@ public void CreateBundle(ObjectId[] objectIds, string bundleName, BundleOdbBacke
             BundleOdbBackend.CreateBundle(packUrl, backendRead1, objectIds, disableCompressionIds, indexMap, dependencies, useIncrementalBundle);
         }
 
+        public bool TryGetObjectLocation(ObjectId objectId, out string filePath, out long start, out long end)
+        {
+            if (BundleBackend != null && BundleBackend.TryGetObjectLocation(objectId, out filePath, out start, out end))
+                return true;
+
+            foreach (var backend in new[] { backendRead1, backendRead2 })
+            {
+                if (backend != null && backend.Exists(objectId))
+                {
+                    filePath = backend.GetFilePath(objectId);
+                    start = 0;
+                    end = backend.GetSize(objectId);
+                    return true;
+                }
+            }
+
+            filePath = null;
+            start = 0;
+            end = 0;
+            return false;
+        }
+
         /// <summary>
         /// Loads the specified bundle.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Serialization/Xenko.Core.Serialization.csproj b/sources/core/Xenko.Core.Serialization/Xenko.Core.Serialization.csproj
index 2176c38540..df0516294c 100644
--- a/sources/core/Xenko.Core.Serialization/Xenko.Core.Serialization.csproj
+++ b/sources/core/Xenko.Core.Serialization/Xenko.Core.Serialization.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -15,10 +14,6 @@
     <XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -36,4 +31,7 @@
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj b/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj
index bebe1bb296..a4028c514c 100644
--- a/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj
+++ b/sources/core/Xenko.Core.Tasks/Xenko.Core.Tasks.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -26,16 +26,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\deps\libgit2\LibGit2Sharp.dll</HintPath>
     </Reference>
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30">
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.6.10" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" ExcludeAssets="runtime" />
+	<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </PackageReference>
-    <PackageReference Include="Mono.Options" Version="5.3.0.1" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <Reference Include="System.ComponentModel.Composition" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
   </ItemGroup>
@@ -55,5 +55,5 @@
     <ProjectReference Include="..\..\assets\Xenko.Core.Assets\Xenko.Core.Assets.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.Android.csproj b/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.Android.csproj
index a4b1124b0f..9b224a3a9c 100644
--- a/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.Android.csproj
+++ b/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.Android.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <AndroidApplication>true</AndroidApplication>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
diff --git a/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.csproj b/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.csproj
index 84f53bd6c0..a027e64aa5 100644
--- a/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.csproj
+++ b/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.csproj
@@ -1,11 +1,11 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <AssemblyName>Xenko.Core.Tests</AssemblyName>
     <RootNamespace>Xenko.Core.Tests</RootNamespace>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableDefaultItems>false</EnableDefaultItems>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -57,5 +57,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.iOS.csproj b/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.iOS.csproj
index d49b17fcdc..b0ed59c652 100644
--- a/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.iOS.csproj
+++ b/sources/core/Xenko.Core.Tests/Xenko.Core.Tests.iOS.csproj
@@ -2,7 +2,6 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'iPhone' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/sources/core/Xenko.Core.Translation/Xenko.Core.Translation.csproj b/sources/core/Xenko.Core.Translation/Xenko.Core.Translation.csproj
index fe9194b747..4b280d84fa 100644
--- a/sources/core/Xenko.Core.Translation/Xenko.Core.Translation.csproj
+++ b/sources/core/Xenko.Core.Translation/Xenko.Core.Translation.csproj
@@ -1,9 +1,6 @@
 <Project>
-  <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-  </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -30,7 +27,7 @@
     <ProjectReference Include="..\Xenko.Core\Xenko.Core.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
diff --git a/sources/core/Xenko.Core.Yaml.Tests/DescriptorTests.cs b/sources/core/Xenko.Core.Yaml.Tests/DescriptorTests.cs
index 37757c34d1..d90024d52a 100644
--- a/sources/core/Xenko.Core.Yaml.Tests/DescriptorTests.cs
+++ b/sources/core/Xenko.Core.Yaml.Tests/DescriptorTests.cs
@@ -138,15 +138,15 @@ public void TestObjectDescriptor()
             Assert.Equal("property1", instance.Property);
 
             // Check ShouldSerialize
-            Assert.True(descriptor[nameof(TestObject.Name)].ShouldSerialize(instance));
+            Assert.True(descriptor[nameof(TestObject.Name)].ShouldSerialize(instance, null));
 
-            Assert.False(descriptor[nameof(TestObject.Value)].ShouldSerialize(instance));
+            Assert.False(descriptor[nameof(TestObject.Value)].ShouldSerialize(instance, null));
             instance.Value = 1;
-            Assert.True(descriptor[nameof(TestObject.Value)].ShouldSerialize(instance));
+            Assert.True(descriptor[nameof(TestObject.Value)].ShouldSerialize(instance, null));
 
-            Assert.False(descriptor[nameof(TestObject.DefaultValue)].ShouldSerialize(instance));
+            Assert.False(descriptor[nameof(TestObject.DefaultValue)].ShouldSerialize(instance, null));
             instance.DefaultValue++;
-            Assert.True(descriptor[nameof(TestObject.DefaultValue)].ShouldSerialize(instance));
+            Assert.True(descriptor[nameof(TestObject.DefaultValue)].ShouldSerialize(instance, null));
 
             // Check HasSet
             Assert.True(descriptor[nameof(TestObject.Collection)].HasSet);
diff --git a/sources/core/Xenko.Core.Yaml.Tests/Xenko.Core.Yaml.Tests.csproj b/sources/core/Xenko.Core.Yaml.Tests/Xenko.Core.Yaml.Tests.csproj
index 5708b37296..89bb6d9b5f 100644
--- a/sources/core/Xenko.Core.Yaml.Tests/Xenko.Core.Yaml.Tests.csproj
+++ b/sources/core/Xenko.Core.Yaml.Tests/Xenko.Core.Yaml.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -28,5 +28,5 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core.Yaml/Serialization/DynamicMemberDescriptorBase.cs b/sources/core/Xenko.Core.Yaml/Serialization/DynamicMemberDescriptorBase.cs
index d82a609d4c..5cb846cbb6 100644
--- a/sources/core/Xenko.Core.Yaml/Serialization/DynamicMemberDescriptorBase.cs
+++ b/sources/core/Xenko.Core.Yaml/Serialization/DynamicMemberDescriptorBase.cs
@@ -76,7 +76,10 @@ protected DynamicMemberDescriptorBase(string name, Type type, Type declaringType
 
         public ScalarStyle ScalarStyle { get; set; }
 
-        public Func<object, bool> ShouldSerialize { get; set; }
+        public ShouldSerializePredicate ShouldSerialize { get; set; }
+
+        public bool HasDefaultValue => false;
+        public object DefaultValue => throw new InvalidOperationException();
 
         public List<string> AlternativeNames { get; set; }
 
diff --git a/sources/core/Xenko.Core.Yaml/Serialization/ObjectContext.cs b/sources/core/Xenko.Core.Yaml/Serialization/ObjectContext.cs
index e0c6bb3197..b3de0b1b13 100644
--- a/sources/core/Xenko.Core.Yaml/Serialization/ObjectContext.cs
+++ b/sources/core/Xenko.Core.Yaml/Serialization/ObjectContext.cs
@@ -39,11 +39,14 @@ public struct ObjectContext
         /// <param name="serializerContext">The serializer context.</param>
         /// <param name="instance">The instance.</param>
         /// <param name="descriptor">The descriptor.</param>
-        public ObjectContext(SerializerContext serializerContext, object instance, ITypeDescriptor descriptor) : this()
+        public ObjectContext(SerializerContext serializerContext, object instance, ITypeDescriptor descriptor,
+            ITypeDescriptor parentTypeDescriptor = null, IMemberDescriptor parentTypeMemberDescriptor = null) : this()
         {
             SerializerContext = serializerContext;
             Instance = instance;
             Descriptor = descriptor;
+            ParentTypeDescriptor = parentTypeDescriptor;
+            ParentTypeMemberDescriptor = parentTypeMemberDescriptor;
             Properties = new PropertyContainer();
         }
 
@@ -86,6 +89,16 @@ public ObjectContext(SerializerContext serializerContext, object instance, IType
         /// </summary>
         public ITypeDescriptor Descriptor { get; set; }
 
+        /// <summary>
+        /// The type descriptor of the parent of the instance type.
+        /// </summary>
+        public ITypeDescriptor ParentTypeDescriptor { get; set; }
+
+        /// <summary>
+        /// The type descriptor of the parent's member that generates this type of instance.
+        /// </summary>
+        public IMemberDescriptor ParentTypeMemberDescriptor { get; set; }
+
         /// <summary>
         /// The tag used when serializing.
         /// </summary>
diff --git a/sources/core/Xenko.Core.Yaml/Serialization/Serializers/CollectionSerializer.cs b/sources/core/Xenko.Core.Yaml/Serialization/Serializers/CollectionSerializer.cs
index f86797f74b..ddc92c6bc7 100644
--- a/sources/core/Xenko.Core.Yaml/Serialization/Serializers/CollectionSerializer.cs
+++ b/sources/core/Xenko.Core.Yaml/Serialization/Serializers/CollectionSerializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2015 SharpYaml - Alexandre Mutel
+// Copyright (c) 2015 SharpYaml - Alexandre Mutel
 // 
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -141,11 +141,11 @@ protected virtual void ReadCollectionItems(ref ObjectContext objectContext)
 
             if (!collectionDescriptor.HasAdd)
             {
-                throw new InvalidOperationException($"Cannot deserialize list to type [{thisObject.GetType()}]. No Add method found");
+                throw new InvalidOperationException($"Cannot deserialize collection to type [{thisObject.GetType()}]. No Add method found");
             }
             if (collectionDescriptor.IsReadOnly(thisObject))
             {
-                throw new InvalidOperationException($"Cannot deserialize list to readonly collection type [{thisObject.GetType()}].");
+                throw new InvalidOperationException($"Cannot deserialize collection to readonly collection type [{thisObject.GetType()}].");
             }
 
             var reader = objectContext.Reader;
diff --git a/sources/core/Xenko.Core.Yaml/Serialization/Serializers/DefaultObjectSerializerBackend.cs b/sources/core/Xenko.Core.Yaml/Serialization/Serializers/DefaultObjectSerializerBackend.cs
index cb477c9ad5..28e22a3c6d 100644
--- a/sources/core/Xenko.Core.Yaml/Serialization/Serializers/DefaultObjectSerializerBackend.cs
+++ b/sources/core/Xenko.Core.Yaml/Serialization/Serializers/DefaultObjectSerializerBackend.cs
@@ -139,7 +139,7 @@ public virtual void WriteMemberName(ref ObjectContext objectContext, IMemberDesc
         public virtual void WriteMemberValue(ref ObjectContext objectContext, IMemberDescriptor memberDescriptor, object memberValue, Type memberType)
         {
             // Push the style of the current member
-            var memberObjectContext = new ObjectContext(objectContext.SerializerContext, memberValue, objectContext.SerializerContext.FindTypeDescriptor(memberType))
+            var memberObjectContext = new ObjectContext(objectContext.SerializerContext, memberValue, objectContext.SerializerContext.FindTypeDescriptor(memberType), objectContext.ParentTypeDescriptor, memberDescriptor)
             {
                 Style = memberDescriptor.Style,
                 ScalarStyle = memberDescriptor.ScalarStyle,
@@ -169,7 +169,7 @@ public virtual void WriteDictionaryValue(ref ObjectContext objectContext, object
         }
 
         /// <inheritdoc/>
-        public virtual bool ShouldSerialize(IMemberDescriptor member, ref ObjectContext objectContext) => member.ShouldSerialize(objectContext.Instance);
+        public virtual bool ShouldSerialize(IMemberDescriptor member, ref ObjectContext objectContext) => member.ShouldSerialize(objectContext.Instance, objectContext.ParentTypeMemberDescriptor);
 
         protected object ReadYaml(ref ObjectContext objectContext)
         {
diff --git a/sources/core/Xenko.Core.Yaml/Xenko.Core.Yaml.csproj b/sources/core/Xenko.Core.Yaml/Xenko.Core.Yaml.csproj
index e5b2df6d57..ce9aa2f097 100644
--- a/sources/core/Xenko.Core.Yaml/Xenko.Core.Yaml.csproj
+++ b/sources/core/Xenko.Core.Yaml/Xenko.Core.Yaml.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -23,5 +23,5 @@
     <ProjectReference Include="..\Xenko.Core.Reflection\Xenko.Core.Reflection.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/core/Xenko.Core/Annotations/MemberRequiredAttribute.cs b/sources/core/Xenko.Core/Annotations/MemberRequiredAttribute.cs
new file mode 100644
index 0000000000..903dbfcc64
--- /dev/null
+++ b/sources/core/Xenko.Core/Annotations/MemberRequiredAttribute.cs
@@ -0,0 +1,33 @@
+using System;
+
+namespace Xenko.Core.Annotations
+{
+    /// <summary>
+    /// This attribute signals the asset compiler that the field/property
+    /// is required to have a value (i.e. not null) when compiling assets.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class MemberRequiredAttribute : Attribute
+    {
+        /// <summary>
+        /// Gets or sets the reporting level (warning/error) of the notification that the field/property is null.
+        /// </summary>
+        public MemberRequiredReportType ReportAs { get; set; } = MemberRequiredReportType.Warning;
+    }
+
+    /// <summary>
+    /// Specifies the reporting level for a missing value of a field/property with a <see cref="MemberRequiredAttribute"/>.
+    /// </summary>
+    public enum MemberRequiredReportType
+    {
+        /// <summary>
+        /// Report missing required member as a warning.
+        /// </summary>
+        Warning,
+
+        /// <summary>
+        /// Report missing required member as an error.
+        /// </summary>
+        Error,
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Updater/BlittableHelper.cs b/sources/core/Xenko.Core/BlittableHelper.cs
similarity index 96%
rename from sources/engine/Xenko.Engine/Updater/BlittableHelper.cs
rename to sources/core/Xenko.Core/BlittableHelper.cs
index d4d8b5d8b7..26c87720b2 100644
--- a/sources/engine/Xenko.Engine/Updater/BlittableHelper.cs
+++ b/sources/core/Xenko.Core/BlittableHelper.cs
@@ -5,13 +5,13 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-namespace Xenko.Updater
+namespace Xenko.Core
 {
     /// <summary>
     /// Various helpers for blittable types.
     /// </summary>
     // TODO: We should switch to something determined at compile time with assembly processor?
-    internal static class BlittableHelper
+    public static class BlittableHelper
     {
         private static Dictionary<Type, bool> blittableTypesCache = new Dictionary<Type, bool>();
 
diff --git a/sources/core/Xenko.Core/Collections/ArrayHelper.cs b/sources/core/Xenko.Core/Collections/ArrayHelper.cs
index 79a3e4ed15..50e3b59863 100644
--- a/sources/core/Xenko.Core/Collections/ArrayHelper.cs
+++ b/sources/core/Xenko.Core/Collections/ArrayHelper.cs
@@ -1,16 +1,19 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+
 namespace Xenko.Core.Collections
 {
     /// <summary>
     /// Array helper for a particular type, useful to get an empty array.
     /// </summary>
     /// <typeparam name="T">Type of the array element</typeparam>
+    [Obsolete("This method is deprecated and may be removed in future versions. Please use Array.Empty<T>() instead. See https://docs.microsoft.com/en-us/dotnet/api/system.array.empty?view=net-5.0 for details.")]
     public struct ArrayHelper<T>
     {
         /// <summary>
         /// An empty array of the specified <see cref="T"/> element type.
         /// </summary>
-        public static readonly T[] Empty = new T[0];
+        public static readonly T[] Empty = Array.Empty<T>();
     }
 }
diff --git a/sources/core/Xenko.Core/Collections/CacheConcurrentDictionary.cs b/sources/core/Xenko.Core/Collections/CacheConcurrentDictionary.cs
new file mode 100644
index 0000000000..a054d5bb0d
--- /dev/null
+++ b/sources/core/Xenko.Core/Collections/CacheConcurrentDictionary.cs
@@ -0,0 +1,48 @@
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
+namespace Xenko.Core.Collections
+{
+    public class CacheConcurrentDictionary<TKey, TValue>
+    {
+
+        private ConcurrentDictionary<TKey, TValue> dictionary;
+        private ConcurrentQueue<TKey> keys;
+        private int capacity;
+
+        public CacheConcurrentDictionary(int capacity)
+        {
+            this.keys = new ConcurrentQueue<TKey>();
+            this.capacity = capacity;
+            this.dictionary = new ConcurrentDictionary<TKey, TValue>(4, capacity);
+        }
+
+        public void Add(TKey key, TValue value)
+        {
+            if (dictionary.Count == capacity)
+            {
+                if (keys.TryDequeue(out TKey oldestKey)) dictionary.TryRemove(oldestKey, out _);
+            }
+
+            if(dictionary.TryAdd(key, value))
+                keys.Enqueue(key);
+        }
+
+        public void Clear()
+        {
+            dictionary.Clear();
+            while (keys.TryDequeue(out _)) { }
+        }
+
+        public bool TryGet(TKey key, out TValue val)
+        {
+            return dictionary.TryGetValue(key, out val);
+        }
+
+        public TValue this[TKey key]
+        {
+            get { return dictionary[key]; }
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core/Collections/CacheDirectory.cs b/sources/core/Xenko.Core/Collections/CacheDirectory.cs
new file mode 100644
index 0000000000..d98cf745a4
--- /dev/null
+++ b/sources/core/Xenko.Core/Collections/CacheDirectory.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
+namespace Xenko.Core.Collections
+{
+    public class CacheDictionary<TKey, TValue>
+    {
+
+        private Dictionary<TKey, TValue> dictionary;
+        private Queue<TKey> keys;
+        private int capacity;
+
+        public CacheDictionary(int capacity)
+        {
+            this.keys = new Queue<TKey>();
+            this.capacity = capacity;
+            this.dictionary = new Dictionary<TKey, TValue>(capacity);
+        }
+
+        public Action<TValue> DisposeAction;
+
+        public void Add(TKey key, TValue value)
+        {
+            if (dictionary.Count == capacity)
+            {
+                if (DisposeAction == null)
+                {
+                    while (keys.Count > 0)
+                    {
+                        TKey oldestKey = keys.Dequeue();
+                        if (dictionary.Remove(oldestKey)) break;
+                    }
+                }
+                else
+                {
+                    while (keys.Count > 0)
+                    {
+                        TKey oldestKey = keys.Dequeue();
+                        if (dictionary.TryGetValue(oldestKey, out TValue val))
+                        {
+                            DisposeAction(val);
+                            dictionary.Remove(oldestKey);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            dictionary.Add(key, value);
+            keys.Enqueue(key);
+        }
+
+        public void Clear()
+        {
+            if (DisposeAction != null)
+            {
+                foreach (TValue t in dictionary.Values)
+                    DisposeAction(t);
+            }
+            dictionary.Clear();
+            keys.Clear();
+        }
+
+        public bool TryPull(TKey key, out TValue val)
+        {
+            if (dictionary.TryGetValue(key, out val))
+            {
+                dictionary.Remove(key);
+                return true;
+            }
+            return false;
+        }
+
+        public bool TryGet(TKey key, out TValue val)
+        {
+            return dictionary.TryGetValue(key, out val);
+        }
+
+        public TValue this[TKey key]
+        {
+            get { return dictionary[key]; }
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core/Collections/FastCollection.cs b/sources/core/Xenko.Core/Collections/FastCollection.cs
index 629b9be6af..5dbc05e745 100644
--- a/sources/core/Xenko.Core/Collections/FastCollection.cs
+++ b/sources/core/Xenko.Core/Collections/FastCollection.cs
@@ -28,7 +28,7 @@ public class FastCollection<T> : IList<T>, IReadOnlyList<T>
 
         public FastCollection()
         {
-            items = ArrayHelper<T>.Empty;
+            items = Array.Empty<T>();
         }
 
         public FastCollection([NotNull] IEnumerable<T> collection)
@@ -78,7 +78,7 @@ public int Capacity
                     }
                     else
                     {
-                        items = ArrayHelper<T>.Empty;
+                        items = Array.Empty<T>();
                     }
                 }
             }
diff --git a/sources/core/Xenko.Core/Collections/FastList.cs b/sources/core/Xenko.Core/Collections/FastList.cs
index a1dfb771f8..8a3165afd3 100644
--- a/sources/core/Xenko.Core/Collections/FastList.cs
+++ b/sources/core/Xenko.Core/Collections/FastList.cs
@@ -33,7 +33,7 @@ public class FastList<T> : IList<T>, IReadOnlyList<T>, ICollection<T>, IEnumerab
 
         public FastList()
         {
-            Items = ArrayHelper<T>.Empty;
+            Items = Array.Empty<T>();
         }
 
         public FastList([NotNull] IEnumerable<T> collection)
@@ -83,7 +83,7 @@ public int Capacity
                     }
                     else
                     {
-                        Items = ArrayHelper<T>.Empty;
+                        Items = Array.Empty<T>();
                     }
                 }
             }
diff --git a/sources/core/Xenko.Core/Collections/FastListStruct.cs b/sources/core/Xenko.Core/Collections/FastListStruct.cs
index 6027e69dcf..97c005c4fe 100644
--- a/sources/core/Xenko.Core/Collections/FastListStruct.cs
+++ b/sources/core/Xenko.Core/Collections/FastListStruct.cs
@@ -10,7 +10,7 @@ namespace Xenko.Core.Collections
 {
     public struct FastListStruct<T> : IEnumerable<T>
     {
-        private static readonly T[] EmptyArray = new T[0];
+        private static readonly T[] EmptyArray = Array.Empty<T>();
 
         public int Count;
 
@@ -109,7 +109,7 @@ public void Clear()
         public T[] ToArray()
         {
             var destinationArray = new T[Count];
-            Array.Copy(Items, 0, destinationArray, 0, Count);
+            Array.Copy(Items, 0, destinationArray, 0, Items.Length);
             return destinationArray;            
         }
 
@@ -122,7 +122,7 @@ public void EnsureCapacity(int newCapacity)
                     newSize = newCapacity;
 
                 var destinationArray = new T[newSize];
-                Array.Copy(Items, 0, destinationArray, 0, Count);
+                Array.Copy(Items, 0, destinationArray, 0, Items.Length);
                 Items = destinationArray;
             }
         }
diff --git a/sources/core/Xenko.Core/Collections/OrderedCollection.cs b/sources/core/Xenko.Core/Collections/OrderedCollection.cs
index 071c2d07f9..67b8a51aac 100644
--- a/sources/core/Xenko.Core/Collections/OrderedCollection.cs
+++ b/sources/core/Xenko.Core/Collections/OrderedCollection.cs
@@ -34,7 +34,7 @@ public OrderedCollection([NotNull] IComparer<T> comparer)
         {
             if (comparer == null) throw new ArgumentNullException(nameof(comparer));
             this.comparer = comparer;
-            items = ArrayHelper<T>.Empty;
+            items = Array.Empty<T>();
         }
 
         /// <summary>
@@ -65,7 +65,7 @@ public int Capacity
                     }
                     else
                     {
-                        items = ArrayHelper<T>.Empty;
+                        items = Array.Empty<T>();
                     }
                 }
             }
diff --git a/sources/core/Xenko.Core/Collections/SortedList.cs b/sources/core/Xenko.Core/Collections/SortedList.cs
index ba3108be5b..b1c2dfae52 100644
--- a/sources/core/Xenko.Core/Collections/SortedList.cs
+++ b/sources/core/Xenko.Core/Collections/SortedList.cs
@@ -48,7 +48,7 @@ namespace Xenko.Core.Collections
     ///  and by index.
     /// </summary>
     [DebuggerDisplay("Count = {" + nameof(Count) + "}")]
-    public class SortedList<TKey, TValue> : IDictionary<TKey, TValue>, IDictionary
+    public class SortedList<TKey, TValue> : IDictionary<TKey, TValue>, IDictionary, IEquatable<SortedList<TKey, TValue>>
     {
         private static readonly int INITIAL_SIZE = 16;
 
@@ -68,6 +68,50 @@ public SortedList()
         {
         }
 
+        public bool Equals(SortedList<TKey, TValue> other)
+        {
+            if (table.Length != other.table.Length)
+                return false;
+
+            if (comparer.Equals(other.comparer) == false)
+                return false;
+
+            for (int i=0; i<table.Length; i++)
+            {
+                if (object.Equals(table[i].Key, other.table[i].Key) == false ||
+                    object.Equals(table[i].Value, other.table[i].Value) == false)
+                    return false;
+            }
+
+            return true;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (obj is SortedList<TKey, TValue> sl)
+                return sl.Equals(this);
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            if (table == null) return 0;
+
+            int hash = 397;
+
+            unchecked
+            {
+                for (int i = 0; i < table.Length; i++)
+                {
+                    hash ^= hash * 17 ^ (table[i].Key?.GetHashCode() ?? 103);
+                    hash ^= hash * 13 ^ (table[i].Value?.GetHashCode() ?? 137);
+                }
+            }
+
+            return hash;
+        }
+
         public SortedList(int capacity)
             : this(capacity, null)
         {
diff --git a/sources/core/Xenko.Core/Collections/TrackingDictionary.cs b/sources/core/Xenko.Core/Collections/TrackingDictionary.cs
index c2772e2b87..1fedec44cb 100644
--- a/sources/core/Xenko.Core/Collections/TrackingDictionary.cs
+++ b/sources/core/Xenko.Core/Collections/TrackingDictionary.cs
@@ -74,8 +74,8 @@ public ICollection<TKey> Keys
         public bool Remove([NotNull] TKey key)
         {
             var collectionChanged = itemRemoved;
-            if (collectionChanged != null && innerDictionary.ContainsKey(key))
-                collectionChanged(this, new TrackingCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, key, innerDictionary[key], null, true));
+            if (collectionChanged != null && innerDictionary.TryGetValue(key, out var dictValue))
+                collectionChanged(this, new TrackingCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, key, dictValue, null, true));
 
             return innerDictionary.Remove(key);
         }
diff --git a/sources/core/Xenko.Core/DataContractMetadataTypeAttribute.cs b/sources/core/Xenko.Core/DataContractMetadataTypeAttribute.cs
new file mode 100644
index 0000000000..505e33c160
--- /dev/null
+++ b/sources/core/Xenko.Core/DataContractMetadataTypeAttribute.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+
+namespace Xenko.Core
+{
+    /// <summary>
+    /// Specifies the metadata class to associate with a serializable class.
+    /// The main usage of this class is to allow a sub-class to override property
+    /// attributes such as <see cref="System.ComponentModel.DefaultValueAttribute"/>.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = true)]
+    public class DataContractMetadataTypeAttribute : Attribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataContractMetadataTypeAttribute"/> class.
+        /// </summary>
+        /// <param name="metadataClassType">The type alias name when serializing to a textual format.</param>
+        /// <exception cref="ArgumentException"><paramref name="metadataClassType"/> is <c>null</c></exception>
+        public DataContractMetadataTypeAttribute(Type metadataClassType)
+        {
+            MetadataClassType = metadataClassType;
+        }
+
+        /// <summary>
+        /// Gets the metadata class that is associated with a serializable class.
+        /// </summary>
+        public Type MetadataClassType { get; }
+    }
+}
diff --git a/sources/core/Xenko.Core/Diagnostics/ConsoleLogListener.cs b/sources/core/Xenko.Core/Diagnostics/ConsoleLogListener.cs
index 62c289f7ab..603bb97f15 100644
--- a/sources/core/Xenko.Core/Diagnostics/ConsoleLogListener.cs
+++ b/sources/core/Xenko.Core/Diagnostics/ConsoleLogListener.cs
@@ -27,23 +27,13 @@ public class ConsoleLogListener : LogListener
         /// Gets or sets the minimum log level handled by this listener.
         /// </summary>
         /// <value>The minimum log level.</value>
-        public LogMessageType LogLevel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the log mode.
-        /// </summary>
-        /// <value>The log mode.</value>
-        public ConsoleLogMode LogMode { get; set; }
+        public static LogMessageType LogLevel { get; set; }
 
         protected override void OnLog([NotNull] ILogMessage logMessage)
         {
             // filter logs with lower level
-            if (!Debugger.IsAttached && // Always log when debugger is attached
-                (logMessage.Type < LogLevel || LogMode == ConsoleLogMode.None
-                || (!(LogMode == ConsoleLogMode.Auto && Platform.IsRunningDebugAssembly) && LogMode != ConsoleLogMode.Always)))
-            {
+            if (logMessage.Type < LogLevel)
                 return;
-            }
 
             // Make sure the console is opened when the debugger is not attached
             EnsureConsole();
diff --git a/sources/core/Xenko.Core/Diagnostics/ConsoleLogMode.cs b/sources/core/Xenko.Core/Diagnostics/ConsoleLogMode.cs
deleted file mode 100644
index 0bb1a759a7..0000000000
--- a/sources/core/Xenko.Core/Diagnostics/ConsoleLogMode.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-namespace Xenko.Core.Diagnostics
-{
-    /// <summary>
-    /// Defines how the console is opened.
-    /// </summary>
-    public enum ConsoleLogMode
-    {
-        /// <summary>
-        /// The console should be visible only in debug and if there is a message, otherwise it is not visible.
-        /// </summary>
-        Auto,
-
-        /// <summary>
-        /// Same as <see cref="Auto"/>
-        /// </summary>
-        Default = Auto,
-
-        /// <summary>
-        /// The console should not be visible.
-        /// </summary>
-        None,
-
-        /// <summary>
-        /// The console should be always visible
-        /// </summary>
-        Always,
-    }
-}
diff --git a/sources/core/Xenko.Core/Diagnostics/ExceptionInfo.cs b/sources/core/Xenko.Core/Diagnostics/ExceptionInfo.cs
index 43657ed26a..e5eecc8193 100644
--- a/sources/core/Xenko.Core/Diagnostics/ExceptionInfo.cs
+++ b/sources/core/Xenko.Core/Diagnostics/ExceptionInfo.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 using Xenko.Core.Annotations;
 
@@ -12,6 +14,8 @@ namespace Xenko.Core.Diagnostics
     [DataContract]
     public sealed class ExceptionInfo
     {
+        private static readonly ExceptionInfo[] EmptyExceptions = new ExceptionInfo[0];
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExceptionInfo"/> class with default values for its properties
         /// </summary>
@@ -30,7 +34,15 @@ public ExceptionInfo([NotNull] Exception exception)
             StackTrace = exception.StackTrace;
             TypeFullName = exception.GetType().FullName;
             TypeName = exception.GetType().Name;
-            InnerException = exception.InnerException != null ? new ExceptionInfo(exception.InnerException) : null;
+
+            if (exception.InnerException != null)
+            {
+                InnerExceptions = new ExceptionInfo[] { new ExceptionInfo(exception.InnerException) };
+            }
+            else if (exception is ReflectionTypeLoadException reflectionException)
+            {
+                InnerExceptions = reflectionException.LoaderExceptions.Select(x => new ExceptionInfo(x)).ToArray();
+            }
         }
 
         /// <summary>
@@ -56,7 +68,7 @@ public ExceptionInfo([NotNull] Exception exception)
         /// <summary>
         /// Gets or sets the <see cref="ExceptionInfo"/> of the inner exception.
         /// </summary>
-        public ExceptionInfo InnerException { get; set; }
+        public ExceptionInfo[] InnerExceptions { get; set; } = EmptyExceptions;
 
         /// <inheritdoc/>
         public override string ToString()
@@ -65,8 +77,10 @@ public override string ToString()
             sb.AppendLine(Message);
             if (StackTrace != null)
                 sb.AppendLine(StackTrace);
-            if (InnerException != null)
-                sb.AppendFormat("Inner exception: {0}{1}", InnerException, Environment.NewLine);
+            foreach (var innerException in InnerExceptions)
+            {
+                sb.AppendFormat("Inner/Loader Exception: {0}{1}", innerException, Environment.NewLine);
+            }
             return sb.ToString();
         }
     }
diff --git a/sources/core/Xenko.Core/Diagnostics/GlobalLogger.cs b/sources/core/Xenko.Core/Diagnostics/GlobalLogger.cs
index 2fad277169..cd4255c44d 100644
--- a/sources/core/Xenko.Core/Diagnostics/GlobalLogger.cs
+++ b/sources/core/Xenko.Core/Diagnostics/GlobalLogger.cs
@@ -15,9 +15,9 @@ public sealed class GlobalLogger : Logger
         #region Constants and Fields
 
         /// <summary>
-        /// By default, the minimum level for a GlobalLogger is info.
+        /// By default, the minimum level for a GlobalLogger is Warning.
         /// </summary>
-        public const LogMessageType MinimumLevel = LogMessageType.Info;
+        public const LogMessageType MinimumLevel = LogMessageType.Warning;
 
         /// <summary>
         /// Map for all instantiated loggers. Map a module name to a logger.
diff --git a/sources/core/Xenko.Core/Diagnostics/LogMessage.cs b/sources/core/Xenko.Core/Diagnostics/LogMessage.cs
index bedcce740f..dc9bc55b50 100644
--- a/sources/core/Xenko.Core/Diagnostics/LogMessage.cs
+++ b/sources/core/Xenko.Core/Diagnostics/LogMessage.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Diagnostics;
 
 namespace Xenko.Core.Diagnostics
 {
@@ -42,6 +43,12 @@ public LogMessage(string module, LogMessageType type, string text)
         /// <param name="callerInfo">The caller info.</param>
         public LogMessage(string module, LogMessageType type, string text, Exception exception, CallerInfo callerInfo)
         {
+            if (exception != null) {
+                // if file logging is enabled, write it here
+                ErrorFileLogger.WriteExceptionToFile(exception, type.ToString() + ", " + text + ", " + module + ", File: " +
+                                                     (callerInfo?.FilePath ?? "none") + ", Line: " + (callerInfo?.LineNumber.ToString() ?? "none"));
+            }
+
             Module = module;
             Type = type;
             Text = text;
diff --git a/sources/core/Xenko.Core/Diagnostics/Logger.Extensions.cs b/sources/core/Xenko.Core/Diagnostics/Logger.Extensions.cs
index 9c423606b4..6ae3cd6a90 100644
--- a/sources/core/Xenko.Core/Diagnostics/Logger.Extensions.cs
+++ b/sources/core/Xenko.Core/Diagnostics/Logger.Extensions.cs
@@ -16,6 +16,7 @@ public abstract partial class Logger
         /// <param name="callerInfo">Information about the caller. Default is null, otherwise use <see cref="CallerInfo.Get"/>.</param>
         public void Verbose(string message, Exception exception, CallerInfo callerInfo = null)
         {
+            if (ConsoleLogListener.LogLevel > LogMessageType.Verbose) return;
             Log(new LogMessage(Module, LogMessageType.Verbose, message, exception, callerInfo));
         }
 
@@ -36,6 +37,7 @@ public void Verbose(string message, CallerInfo callerInfo = null)
         /// <param name="callerInfo">Information about the caller. Default is null, otherwise use <see cref="CallerInfo.Get"/>.</param>
         public void Debug(string message, Exception exception, CallerInfo callerInfo = null)
         {
+            if (ConsoleLogListener.LogLevel > LogMessageType.Debug) return;
             Log(new LogMessage(Module, LogMessageType.Debug, message, exception, callerInfo));
         }
 
@@ -56,6 +58,7 @@ public void Debug(string message, CallerInfo callerInfo = null)
         /// <param name="callerInfo">Information about the caller. Default is null, otherwise use <see cref="CallerInfo.Get"/>.</param>
         public void Info(string message, Exception exception, CallerInfo callerInfo = null)
         {
+            if (ConsoleLogListener.LogLevel > LogMessageType.Info) return;
             Log(new LogMessage(Module, LogMessageType.Info, message, exception, callerInfo));
         }
 
@@ -76,6 +79,7 @@ public void Info(string message, CallerInfo callerInfo = null)
         /// <param name="callerInfo">Information about the caller. Default is null, otherwise use <see cref="CallerInfo.Get"/>.</param>
         public void Warning(string message, Exception exception, CallerInfo callerInfo = null)
         {
+            if (ConsoleLogListener.LogLevel > LogMessageType.Warning) return;
             Log(new LogMessage(Module, LogMessageType.Warning, message, exception, callerInfo));
         }
 
@@ -96,6 +100,7 @@ public void Warning(string message, CallerInfo callerInfo = null)
         /// <param name="callerInfo">Information about the caller. Default is null, otherwise use <see cref="CallerInfo.Get"/>.</param>
         public void Error(string message, Exception exception, CallerInfo callerInfo = null)
         {
+            if (ConsoleLogListener.LogLevel > LogMessageType.Error) return;
             Log(new LogMessage(Module, LogMessageType.Error, message, exception, callerInfo));
         }
 
diff --git a/sources/core/Xenko.Core/DisposeBase.cs b/sources/core/Xenko.Core/DisposeBase.cs
index c5791fbe8d..69f550b9a0 100644
--- a/sources/core/Xenko.Core/DisposeBase.cs
+++ b/sources/core/Xenko.Core/DisposeBase.cs
@@ -44,7 +44,6 @@ int IReferencable.AddReference()
             OnAddReference();
 
             var newCounter = Interlocked.Increment(ref counter);
-            if (newCounter <= 1) throw new InvalidOperationException(FrameworkResources.AddReferenceError);
             return newCounter;
         }
 
@@ -54,15 +53,12 @@ int IReferencable.Release()
             OnReleaseReference();
 
             var newCounter = Interlocked.Decrement(ref counter);
-            if (newCounter == 0)
+            if (newCounter <= 0)
             {
+                newCounter = 0;
                 Destroy();
                 IsDisposed = true;
             }
-            else if (newCounter < 0)
-            {
-                throw new InvalidOperationException(FrameworkResources.ReleaseReferenceError);
-            }
             return newCounter;
         }
 
diff --git a/sources/core/Xenko.Core/ErrorFileLogger.cs b/sources/core/Xenko.Core/ErrorFileLogger.cs
new file mode 100644
index 0000000000..8668479d1d
--- /dev/null
+++ b/sources/core/Xenko.Core/ErrorFileLogger.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+
+namespace Xenko.Core
+{
+    /// <summary>
+    /// Enables creating crash logs to file, so it is easier to report crashes
+    /// </summary>
+    public class ErrorFileLogger
+    {
+        private static string savePath = null, savePrefix = null, _version = "Default";
+
+        private static UnhandledExceptionEventHandler globalHandler = null;
+
+        private static object locker = new object();
+
+        /// <summary>
+        /// Turn on file reporting of all exceptions, or change settings
+        /// </summary>
+        /// <param name="prefix">What to prefix the files?</param>
+        /// <param name="path">Location to store the log files, null defaults to My Documents folder</param>
+        public static void EnableGlobalExceptionLogger(string prefix = "FocusEngineCrashLog", string path = null)
+        {
+            savePath = (path ?? Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments)) + "/";
+            savePrefix = prefix ?? "FocusEngineCrashLog";
+
+            if (globalHandler == null)
+                globalHandler = new UnhandledExceptionEventHandler(UnhandledException);
+
+            // Add the event handler for handling non-UI thread exceptions to the event. 
+            // remove it first, just to make sure we don't multiply it
+            AppDomain.CurrentDomain.UnhandledException -= globalHandler;
+            AppDomain.CurrentDomain.UnhandledException += globalHandler;
+        }
+
+        public static void SetVersionTag(string version)
+        {
+            _version = version;
+        }
+
+        public static void Disable()
+        {
+            if (globalHandler != null)
+                AppDomain.CurrentDomain.UnhandledException -= globalHandler;
+
+            savePath = null;
+            savePrefix = null;
+        }
+
+        public static void WriteLogToFile(string message)
+        {
+            if (savePrefix == null || savePath == null) return;
+
+            string time = DateTime.Now.ToString("dd-MMM-yyyy-hh.mm-tt");
+            string filename = savePath + savePrefix + time + ".txt";
+            message = "\n--------------------- NEW ENTRY ------------------------\n" +
+                      "Executable: " + System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName + "\n" +
+                      "Thread: " + Thread.CurrentThread.Name + "\n" +
+                      "Version: " + _version + "\n" +
+                      "Time: " + time + "\n" + 
+                      "Message: " + message + "\n------------------------ END ENTRY -------------------\n";
+
+            lock(locker)
+            {
+                System.IO.File.AppendAllText(filename, message);
+            }
+        }
+
+        public static void WriteExceptionToFile(Exception ex, string additionalContext = "")
+        {
+            if (savePrefix == null || savePath == null || ex == null) return;
+
+            try
+            {
+                // Get stack trace for the exception with source file information
+                StackTrace st = new StackTrace(ex, true);
+                // Get the top stack frame
+                StackFrame frame = st.GetFrame(0);
+                // Get the line number from the stack frame
+                int line = frame.GetFileLineNumber();
+                if (line != 0)
+                {
+                    // try to add it to the front of the text
+                    additionalContext += "{line #" + line.ToString() + "}";
+                }
+            }
+            catch (Exception e) { /* couldn't get line info */ }
+
+            string error = "Message: " + ex.Message + "\n" +
+                           "Context: " + additionalContext + "\n" +
+                           "Stack Trace: " + ex.StackTrace + "\n" +
+                           "Source: " + ex.Source + "\n" +
+                           "Inner Exception: " + (ex.InnerException?.Message ?? "None") + "\n" +
+                           "Inner Exception Trace: " + (ex.InnerException?.StackTrace ?? "None");
+
+            try
+            {
+                WriteLogToFile(error);
+            }
+            catch (Exception e)
+            {
+                // couldn't write the exception to file, throw it now
+                throw ex;
+            }
+        }
+
+        private static void UnhandledException(object sender, UnhandledExceptionEventArgs e)
+        {
+            WriteExceptionToFile(e.ExceptionObject as Exception);
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core/Native/CoreNative.c b/sources/core/Xenko.Core/Native/CoreNative.c
deleted file mode 100644
index eac0d8e011..0000000000
--- a/sources/core/Xenko.Core/Native/CoreNative.c
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#include "../../../../deps/NativePath/NativeThreading.h"
-#include "CoreNative.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-	DLL_EXPORT_API void cnSleep(int milliseconds)
-	{
-		npThreadSleep(milliseconds);
-	}
-
-	DLL_EXPORT_API void cnSetup(void* printDebugPtr)
-	{
-		cnDebugPrintLine = (CnPrintDebugFunc)printDebugPtr;
-	}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/sources/core/Xenko.Core/Native/CoreNative.h b/sources/core/Xenko.Core/Native/CoreNative.h
index dc753dab44..b26e204b68 100644
--- a/sources/core/Xenko.Core/Native/CoreNative.h
+++ b/sources/core/Xenko.Core/Native/CoreNative.h
@@ -19,9 +19,5 @@
 #define DLL_EXPORT_API
 #endif
 
-typedef void(*CnPrintDebugFunc)(const char* string);
-
-DLL_EXPORT_API CnPrintDebugFunc cnDebugPrintLine;
-
 #endif
 
diff --git a/sources/core/Xenko.Core/Native/NativeInvoke.cs b/sources/core/Xenko.Core/Native/NativeInvoke.cs
index 78a5721dee..575b93a8a2 100644
--- a/sources/core/Xenko.Core/Native/NativeInvoke.cs
+++ b/sources/core/Xenko.Core/Native/NativeInvoke.cs
@@ -29,49 +29,5 @@ static NativeInvoke()
         {
             NativeLibrary.PreloadLibrary(LibraryName, typeof(NativeInvoke));
         }
-
-        /// <summary>
-        /// Suspends current thread for <paramref name="ms"/> milliseconds.
-        /// </summary>
-        /// <param name="ms">Number of milliseconds to sleep.</param>
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(Library, EntryPoint = "cnSleep", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Sleep(int ms);
-
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate void ManagedLogDelegate(string log);
-
-        private static ManagedLogDelegate managedLogDelegateSingleton;
-
-#if XENKO_PLATFORM_IOS
-        [MonoPInvokeCallback(typeof(ManagedLogDelegate))]
-#endif
-        private static void ManagedLog(string log)
-        {
-            Debug.WriteLine(log);
-        }
-
-        public static void Setup()
-        {
-            managedLogDelegateSingleton = ManagedLog;
-
-#if !XENKO_PLATFORM_IOS
-            var ptr = Marshal.GetFunctionPointerForDelegate(managedLogDelegateSingleton);
-#else
-            var ptr = managedLogDelegateSingleton;
-#endif
-
-            CoreNativeSetup(ptr);
-        }
-
-#if !XENKO_PLATFORM_IOS
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(Library, EntryPoint = "cnSetup", CallingConvention = CallingConvention.Cdecl)]
-        private static extern void CoreNativeSetup(IntPtr logger);
-#else
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(Library, EntryPoint = "cnSetup", CallingConvention = CallingConvention.Cdecl)]
-        private static extern void CoreNativeSetup(ManagedLogDelegate logger);
-#endif
     }
 }
diff --git a/sources/core/Xenko.Core/Native/NativeLibrary.cs b/sources/core/Xenko.Core/Native/NativeLibrary.cs
index cc8f242e86..6b0b6f4c27 100644
--- a/sources/core/Xenko.Core/Native/NativeLibrary.cs
+++ b/sources/core/Xenko.Core/Native/NativeLibrary.cs
@@ -33,11 +33,11 @@ public static class NativeLibrary
         public static void PreloadLibrary(string libraryName, Type owner)
         {
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
+            NormalizeLibName(ref libraryName);
             lock (LoadedLibraries)
             {
                 // If already loaded, just exit as we want to load it just once
-                var libraryNameNormalized = libraryName.ToLowerInvariant();
-                if (LoadedLibraries.ContainsKey(libraryNameNormalized))
+                if (LoadedLibraries.ContainsKey(libraryName))
                 {
                     return;
                 }
@@ -52,20 +52,44 @@ public static void PreloadLibrary(string libraryName, Type owner)
                     cpu = IntPtr.Size == 8 ? "x64" : "x86";
 
                 // We are trying to load the dll from a shadow path if it is already registered, otherwise we use it directly from the folder
-                var dllFolder = NativeLibraryInternal.GetShadowPathForNativeDll(libraryName);
-                if (dllFolder == null)
-                    dllFolder = Path.Combine(Path.GetDirectoryName(owner.GetTypeInfo().Assembly.Location), cpu);
-                if (!Directory.Exists(dllFolder))
-                    dllFolder = Path.Combine(Environment.CurrentDirectory, cpu);
-                var libraryFilename = Path.Combine(dllFolder, libraryName);
-                var result = LoadLibrary(libraryFilename);
-
-                if (result == IntPtr.Zero)
+                string basePath;
                 {
-                    throw new InvalidOperationException($"Could not load native library {libraryName} from path [{libraryFilename}] using CPU architecture {cpu}.");
+                    var dllFolder = NativeLibraryInternal.GetShadowPathForNativeDll(libraryName);
+                    if (dllFolder == null)
+                        dllFolder = Path.Combine(Path.GetDirectoryName(owner.GetTypeInfo().Assembly.Location), cpu);
+                    if (!Directory.Exists(dllFolder))
+                        dllFolder = Path.Combine(Environment.CurrentDirectory, cpu);
+                    var libraryFilename = Path.Combine(dllFolder, libraryName);
+                    basePath = libraryFilename;
+
+                    if (File.Exists(libraryFilename))
+                    {
+                        var result = LoadLibrary(libraryFilename);
+                        if (result != IntPtr.Zero)
+                        {
+                            LoadedLibraries.Add(libraryName.ToLowerInvariant(), result);
+                            return;
+                        }
+                    }
                 }
 
-                LoadedLibraries.Add(libraryName.ToLowerInvariant(), result);
+                // Attempt to load it from PATH
+                foreach (var p in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))
+                {
+                    var libraryFilename = Path.Combine(p, libraryName);
+
+                    if (File.Exists(libraryFilename))
+                    {
+                        var result = LoadLibrary(libraryFilename);
+                        if (result != IntPtr.Zero)
+                        {
+                            LoadedLibraries.Add(libraryName.ToLowerInvariant(), result);
+                            return;
+                        }
+                    }
+                }
+
+                throw new InvalidOperationException($"Could not load native library {libraryName} from path [{basePath}] using CPU architecture {cpu}.");
             }
 #endif
         }
@@ -77,15 +101,14 @@ public static void PreloadLibrary(string libraryName, Type owner)
         public static void UnLoad(string libraryName)
         {
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
+            NormalizeLibName(ref libraryName);
             lock (LoadedLibraries)
             {
-                var libName = libraryName.ToLowerInvariant();
-
                 IntPtr libHandle;
-                if (LoadedLibraries.TryGetValue(libName, out libHandle))
+                if (LoadedLibraries.TryGetValue(libraryName, out libHandle))
                 {
                     FreeLibrary(libHandle);
-                    LoadedLibraries.Remove(libName);
+                    LoadedLibraries.Remove(libraryName);
                 }
             }
 #endif
@@ -108,6 +131,17 @@ public static void UnLoadAll()
 #endif
         }
 
+#if XENKO_PLATFORM_WINDOWS_DESKTOP
+        private static void NormalizeLibName(ref string libName)
+        {
+            libName = libName.ToLowerInvariant();
+            if (libName.EndsWith(".dll") == false)
+            {
+                libName += ".dll";
+            }
+        }
+#endif
+
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
         private const string SYSINFO_FILE = "kernel32.dll";
 
diff --git a/sources/core/Xenko.Core/PlatformFolders.cs b/sources/core/Xenko.Core/PlatformFolders.cs
index 364c769a8f..329bfbec78 100644
--- a/sources/core/Xenko.Core/PlatformFolders.cs
+++ b/sources/core/Xenko.Core/PlatformFolders.cs
@@ -94,58 +94,23 @@ internal set
         [NotNull]
         private static string GetApplicationLocalDirectory()
         {
-#if XENKO_PLATFORM_ANDROID
-            var directory = Path.Combine(PlatformAndroid.Context.FilesDir.AbsolutePath, "local");
-            Directory.CreateDirectory(directory);
-            return directory;
-#elif XENKO_PLATFORM_UWP
-            return Windows.Storage.ApplicationData.Current.LocalFolder.Path;
-#elif XENKO_PLATFORM_IOS
-            var directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "..", "Library", "Local");
-            Directory.CreateDirectory(directory);
-            return directory;
-#else
-            // TODO: Should we add "local" ?
             var directory = Path.Combine(GetApplicationBinaryDirectory(), "local");
             Directory.CreateDirectory(directory);
             return directory;
-#endif
         }
 
         [NotNull]
         private static string GetApplicationRoamingDirectory()
         {
-#if XENKO_PLATFORM_ANDROID
-            var directory = Path.Combine(PlatformAndroid.Context.FilesDir.AbsolutePath, "roaming");
-            Directory.CreateDirectory(directory);
-            return directory;
-#elif XENKO_PLATFORM_UWP
-            return Windows.Storage.ApplicationData.Current.RoamingFolder.Path;
-#elif XENKO_PLATFORM_IOS
-            var directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "..", "Library", "Roaming");
-            Directory.CreateDirectory(directory);
-            return directory;
-#else
-            // TODO: Should we add "local" ?
             var directory = Path.Combine(GetApplicationBinaryDirectory(), "roaming");
             Directory.CreateDirectory(directory);
             return directory;
-#endif
         }
 
         [NotNull]
         private static string GetApplicationCacheDirectory()
         {
-#if XENKO_PLATFORM_ANDROID
-            var directory = Path.Combine(PlatformAndroid.Context.FilesDir.AbsolutePath, "cache");
-#elif XENKO_PLATFORM_UWP
-            var directory = Path.Combine(Windows.Storage.ApplicationData.Current.LocalFolder.Path, "cache");
-#elif XENKO_PLATFORM_IOS
-            var directory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "..", "Library", "Caches");
-#else
-            // TODO: Should we add "local" ?
             var directory = Path.Combine(GetApplicationBinaryDirectory(), "cache");
-#endif
             Directory.CreateDirectory(directory);
             return directory;
         }
@@ -168,50 +133,57 @@ private static string GetTemporaryDirectory()
         [NotNull]
         private static string GetApplicationTemporaryDirectory()
         {
-#if XENKO_PLATFORM_ANDROID
-            return PlatformAndroid.Context.CacheDir.AbsolutePath;
-#elif XENKO_PLATFORM_UWP
-            return Windows.Storage.ApplicationData.Current.TemporaryFolder.Path;
-#elif XENKO_PLATFORM_IOS
-            return Path.Combine (Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "..", "tmp");
-#else
             return Path.GetTempPath();
-#endif
         }
 
         [NotNull]
         private static string GetApplicationBinaryDirectory()
         {
-#if XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_MONO_MOBILE || XENKO_PLATFORM_UNIX
+            return FindCoreAssemblyDirectory(GetApplicationExecutableDiretory());
+        }
+
+        private static string GetApplicationExecutableDiretory()
+        {
             var executableName = GetApplicationExecutablePath();
             if (!string.IsNullOrEmpty(executableName))
             {
                 return Path.GetDirectoryName(executableName);
             }
-    #if XENKO_RUNTIME_CORECLR
+#if XENKO_RUNTIME_CORECLR
             return AppContext.BaseDirectory;
-    #else
-            return AppDomain.CurrentDomain.BaseDirectory;
-    #endif
-#elif XENKO_PLATFORM_UWP
-            return Windows.ApplicationModel.Package.Current.InstalledLocation.Path;
 #else
-            throw new NotImplementedException();
+            return AppDomain.CurrentDomain.BaseDirectory;
 #endif
         }
 
+        static string FindCoreAssemblyDirectory(string entryDirectory)
+        {
+            //simple case
+            var corePath = Path.Combine(entryDirectory, "Xenko.Core.dll");
+            if (File.Exists(corePath))
+            {
+                return entryDirectory;
+            }
+            else //search one level down
+            {
+                foreach (var subfolder in Directory.GetDirectories(entryDirectory))
+                {
+                    corePath = Path.Combine(subfolder, "Xenko.Core.dll");
+                    if (File.Exists(corePath))
+                    {
+                        return subfolder;
+                    }
+                }
+            }
+
+            //if nothing found, return input
+            return entryDirectory;
+        }
+
         [NotNull]
         private static string GetApplicationDataDirectory()
         {
-#if XENKO_PLATFORM_ANDROID
-            return Android.OS.Environment.ExternalStorageDirectory.AbsolutePath + "/Android/data/" + PlatformAndroid.Context.PackageName + "/data";
-#elif XENKO_PLATFORM_IOS
-            return Foundation.NSBundle.MainBundle.BundlePath + "/data";
-#elif XENKO_PLATFORM_UWP
-            return Windows.ApplicationModel.Package.Current.InstalledLocation.Path + @"\data";
-#else
             return Path.Combine(GetApplicationBinaryDirectory(), "data");
-#endif
         }
     }
 }
diff --git a/sources/core/Xenko.Core/PropertyContainerClass.cs b/sources/core/Xenko.Core/PropertyContainerClass.cs
index 1a51fab848..5785391507 100644
--- a/sources/core/Xenko.Core/PropertyContainerClass.cs
+++ b/sources/core/Xenko.Core/PropertyContainerClass.cs
@@ -84,6 +84,11 @@ public void CopyTo(ref PropertyContainer destination)
             inner.CopyTo(ref destination);
         }
 
+        public void CopyTo(PropertyContainerClass destination)
+        {
+            inner.CopyTo(ref destination.inner);
+        }
+
         /// <inheritdoc />
         public object Get([NotNull] PropertyKey propertyKey)
         {
diff --git a/sources/core/Xenko.Core/ServiceRegistry.cs b/sources/core/Xenko.Core/ServiceRegistry.cs
index 58c0fc402b..17a5a237e8 100644
--- a/sources/core/Xenko.Core/ServiceRegistry.cs
+++ b/sources/core/Xenko.Core/ServiceRegistry.cs
@@ -22,6 +22,8 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using Xenko.Core.Threading;
 
 namespace Xenko.Core
 {
@@ -32,6 +34,8 @@ public class ServiceRegistry : IServiceRegistry
     {
         public static readonly PropertyKey<IServiceRegistry> ServiceRegistryKey = new PropertyKey<IServiceRegistry>(nameof(ServiceRegistryKey), typeof(IServiceRegistry));
 
+        private ReaderWriterLockSlim serviceLocker = new ReaderWriterLockSlim();
+
         private readonly Dictionary<Type, object> registeredService = new Dictionary<Type, object>();
 
         /// <inheritdoc />
@@ -40,15 +44,22 @@ public class ServiceRegistry : IServiceRegistry
         /// <inheritdoc />
         public event EventHandler<ServiceEventArgs> ServiceRemoved;
 
+        public static ServiceRegistry instance { get; private set; }
+
+        public ServiceRegistry(bool setMainInstance = false)
+        {
+            if (setMainInstance) instance = this;
+        }
+
         /// <inheritdoc />
         public T GetService<T>()
             where T : class
         {
             var type = typeof(T);
-            lock (registeredService)
+            using (serviceLocker.ReadLock())
             {
-                if (registeredService.ContainsKey(type))
-                    return (T)registeredService[type];
+                if (registeredService.TryGetValue(type, out var service))
+                    return (T)service;
             }
 
             return null;
@@ -61,7 +72,7 @@ public void AddService<T>(T service)
             if (service == null) throw new ArgumentNullException(nameof(service));
 
             var type = typeof(T);
-            lock (registeredService)
+            using (serviceLocker.WriteLock())
             {
                 if (registeredService.ContainsKey(type))
                     throw new ArgumentException("Service is already registered with this type", nameof(type));
@@ -76,7 +87,7 @@ public void RemoveService<T>()
         {
             var type = typeof(T);
             object oldService;
-            lock (registeredService)
+            using (serviceLocker.WriteLock())
             {
                 if (registeredService.TryGetValue(type, out oldService))
                     registeredService.Remove(type);
diff --git a/sources/core/Xenko.Core/Threading/ConcurrentCollector.cs b/sources/core/Xenko.Core/Threading/ConcurrentCollector.cs
index a828e84120..7196e0407c 100644
--- a/sources/core/Xenko.Core/Threading/ConcurrentCollector.cs
+++ b/sources/core/Xenko.Core/Threading/ConcurrentCollector.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using Xenko.Core.Annotations;
 
@@ -85,11 +86,9 @@ public ConcurrentCollector(int capacity = DefaultCapacity)
 
         public T[] Items
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
-                if (head != tail)
-                    throw new InvalidOperationException();
-
                 return head.Items;
             }
         }
@@ -117,6 +116,7 @@ public void Close()
             }
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int Add(T item)
         {
             var index = Interlocked.Increment(ref count) - 1;
@@ -208,6 +208,12 @@ public void Clear(bool fastClear)
             count = 0;
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void UnsafeClear()
+        {
+            count = 0;
+        }
+
         IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
@@ -227,10 +233,12 @@ public Enumerator GetEnumerator()
 
         public T this[int index]
         {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             get
             {
                 return Items[index];
             }
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
             set
             {
                 Items[index] = value;
diff --git a/sources/core/Xenko.Core/Threading/ConcurrentHashSet.cs b/sources/core/Xenko.Core/Threading/ConcurrentHashSet.cs
new file mode 100644
index 0000000000..c5b4bb84c0
--- /dev/null
+++ b/sources/core/Xenko.Core/Threading/ConcurrentHashSet.cs
@@ -0,0 +1,924 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+
+namespace Xenko.Core.Threading
+{
+
+#if !NETSTANDARD2_1
+     /// <summary>Specifies that when a method returns <see cref="ReturnValue"/>, the parameter may be null even if the corresponding type disallows it.</summary>
+    [AttributeUsage(AttributeTargets.Parameter)]
+    internal sealed class MaybeNullWhenAttribute : Attribute
+    {
+        /// <summary>Initializes the attribute with the specified return value condition.</summary>
+        /// <param name="returnValue">
+        /// The return value condition. If the method returns this value, the associated parameter may be null.
+        /// </param>
+        public MaybeNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+ 
+        /// <summary>Gets the return value condition.</summary>
+        public bool ReturnValue { get; }
+    }
+#endif
+
+    /// <summary>
+    /// Represents a thread-safe hash-based unique collection.
+    /// </summary>
+    /// <typeparam name="T">The type of the items in the collection.</typeparam>
+    /// <remarks>
+    /// All public members of <see cref="ConcurrentHashSet{T}"/> are thread-safe and may be used
+    /// concurrently from multiple threads.
+    /// </remarks>
+    [DebuggerDisplay("Count = {Count}")]
+    public class ConcurrentHashSet<T> : IReadOnlyCollection<T>, ICollection<T>
+    {
+        private const int DefaultCapacity = 31;
+        private const int MaxLockNumber = 1024;
+
+        private readonly IEqualityComparer<T> _comparer;
+        private readonly bool _growLockArray;
+
+        private int _budget;
+        private volatile Tables _tables;
+
+        private static int DefaultConcurrencyLevel => Environment.ProcessorCount;
+
+        /// <summary>
+        /// Gets the <see cref="IEqualityComparer{T}" />
+        /// that is used to determine equality for the values in the set.
+        /// </summary>
+        /// <value>
+        /// The <see cref="IEqualityComparer{T}" /> generic interface implementation that is used to 
+        /// provide hash values and determine equality for the values in the current <see cref="ConcurrentHashSet{T}" />.
+        /// </value>
+        /// <remarks>
+        /// <see cref="ConcurrentHashSet{T}" /> requires an equality implementation to determine
+        /// whether values are equal. You can specify an implementation of the <see cref="IEqualityComparer{T}" />
+        /// generic interface by using a constructor that accepts a comparer parameter;
+        /// if you do not specify one, the default generic equality comparer <see cref="EqualityComparer{T}.Default" /> is used.
+        /// </remarks>
+        public IEqualityComparer<T> Comparer => _comparer;
+
+        /// <summary>
+        /// Gets the number of items contained in the <see
+        /// cref="ConcurrentHashSet{T}"/>.
+        /// </summary>
+        /// <value>The number of items contained in the <see
+        /// cref="ConcurrentHashSet{T}"/>.</value>
+        /// <remarks>Count has snapshot semantics and represents the number of items in the <see
+        /// cref="ConcurrentHashSet{T}"/>
+        /// at the moment when Count was accessed.</remarks>
+        public int Count
+        {
+            get
+            {
+                var count = 0;
+                var acquiredLocks = 0;
+                try
+                {
+                    AcquireAllLocks(ref acquiredLocks);
+
+                    var countPerLocks = _tables.CountPerLock;
+                    for (var i = 0; i < countPerLocks.Length; i++)
+                    {
+                        count += countPerLocks[i];
+                    }
+                }
+                finally
+                {
+                    ReleaseLocks(0, acquiredLocks);
+                }
+
+                return count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value that indicates whether the <see cref="ConcurrentHashSet{T}"/> is empty.
+        /// </summary>
+        /// <value>true if the <see cref="ConcurrentHashSet{T}"/> is empty; otherwise,
+        /// false.</value>
+        public bool IsEmpty
+        {
+            get
+            {
+                if (!AreAllBucketsEmpty())
+                {
+                    return false;
+                }
+
+                var acquiredLocks = 0;
+                try
+                {
+                    AcquireAllLocks(ref acquiredLocks);
+
+                    return AreAllBucketsEmpty();
+                }
+                finally
+                {
+                    ReleaseLocks(0, acquiredLocks);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see
+        /// cref="ConcurrentHashSet{T}"/>
+        /// class that is empty, has the default concurrency level, has the default initial capacity, and
+        /// uses the default comparer for the item type.
+        /// </summary>
+        public ConcurrentHashSet()
+            : this(DefaultConcurrencyLevel, DefaultCapacity, true, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see
+        /// cref="ConcurrentHashSet{T}"/>
+        /// class that is empty, has the specified concurrency level and capacity, and uses the default
+        /// comparer for the item type.
+        /// </summary>
+        /// <param name="concurrencyLevel">The estimated number of threads that will update the
+        /// <see cref="ConcurrentHashSet{T}"/> concurrently.</param>
+        /// <param name="capacity">The initial number of elements that the <see
+        /// cref="ConcurrentHashSet{T}"/>
+        /// can contain.</param>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="concurrencyLevel"/> is
+        /// less than 1.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"> <paramref name="capacity"/> is less than
+        /// 0.</exception>
+        public ConcurrentHashSet(int concurrencyLevel, int capacity)
+            : this(concurrencyLevel, capacity, false, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurrentHashSet{T}"/>
+        /// class that contains elements copied from the specified <see
+        /// cref="IEnumerable{T}"/>, has the default concurrency
+        /// level, has the default initial capacity, and uses the default comparer for the item type.
+        /// </summary>
+        /// <param name="collection">The <see
+        /// cref="IEnumerable{T}"/> whose elements are copied to
+        /// the new
+        /// <see cref="ConcurrentHashSet{T}"/>.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="collection"/> is a null reference.</exception>
+        public ConcurrentHashSet(IEnumerable<T> collection)
+            : this(collection, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurrentHashSet{T}"/>
+        /// class that is empty, has the specified concurrency level and capacity, and uses the specified
+        /// <see cref="IEqualityComparer{T}"/>.
+        /// </summary>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/>
+        /// implementation to use when comparing items.</param>
+        public ConcurrentHashSet(IEqualityComparer<T>? comparer)
+            : this(DefaultConcurrencyLevel, DefaultCapacity, true, comparer)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurrentHashSet{T}"/>
+        /// class that contains elements copied from the specified <see
+        /// cref="IEnumerable"/>, has the default concurrency level, has the default
+        /// initial capacity, and uses the specified
+        /// <see cref="IEqualityComparer{T}"/>.
+        /// </summary>
+        /// <param name="collection">The <see
+        /// cref="IEnumerable{T}"/> whose elements are copied to
+        /// the new
+        /// <see cref="ConcurrentHashSet{T}"/>.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/>
+        /// implementation to use when comparing items.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="collection"/> is a null reference
+        /// (Nothing in Visual Basic).
+        /// </exception>
+        public ConcurrentHashSet(IEnumerable<T> collection, IEqualityComparer<T>? comparer)
+            : this(comparer)
+        {
+            if (collection == null) throw new ArgumentNullException(nameof(collection));
+
+            InitializeFromCollection(collection);
+        }
+
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurrentHashSet{T}"/> 
+        /// class that contains elements copied from the specified <see cref="IEnumerable"/>, 
+        /// has the specified concurrency level, has the specified initial capacity, and uses the specified 
+        /// <see cref="IEqualityComparer{T}"/>.
+        /// </summary>
+        /// <param name="concurrencyLevel">The estimated number of threads that will update the 
+        /// <see cref="ConcurrentHashSet{T}"/> concurrently.</param>
+        /// <param name="collection">The <see cref="IEnumerable{T}"/> whose elements are copied to the new 
+        /// <see cref="ConcurrentHashSet{T}"/>.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/> implementation to use 
+        /// when comparing items.</param>
+        /// <exception cref="ArgumentNullException">
+        /// <paramref name="collection"/> is a null reference.
+        /// </exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="concurrencyLevel"/> is less than 1.
+        /// </exception>
+        public ConcurrentHashSet(int concurrencyLevel, IEnumerable<T> collection, IEqualityComparer<T>? comparer)
+            : this(concurrencyLevel, DefaultCapacity, false, comparer)
+        {
+            if (collection == null) throw new ArgumentNullException(nameof(collection));
+
+            InitializeFromCollection(collection);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ConcurrentHashSet{T}"/>
+        /// class that is empty, has the specified concurrency level, has the specified initial capacity, and
+        /// uses the specified <see cref="IEqualityComparer{T}"/>.
+        /// </summary>
+        /// <param name="concurrencyLevel">The estimated number of threads that will update the
+        /// <see cref="ConcurrentHashSet{T}"/> concurrently.</param>
+        /// <param name="capacity">The initial number of elements that the <see
+        /// cref="ConcurrentHashSet{T}"/>
+        /// can contain.</param>
+        /// <param name="comparer">The <see cref="IEqualityComparer{T}"/>
+        /// implementation to use when comparing items.</param>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// <paramref name="concurrencyLevel"/> is less than 1. -or-
+        /// <paramref name="capacity"/> is less than 0.
+        /// </exception>
+        public ConcurrentHashSet(int concurrencyLevel, int capacity, IEqualityComparer<T>? comparer)
+            : this(concurrencyLevel, capacity, false, comparer)
+        {
+        }
+
+        private ConcurrentHashSet(int concurrencyLevel, int capacity, bool growLockArray, IEqualityComparer<T>? comparer)
+        {
+            if (concurrencyLevel < 1) throw new ArgumentOutOfRangeException(nameof(concurrencyLevel));
+            if (capacity < 0) throw new ArgumentOutOfRangeException(nameof(capacity));
+
+            // The capacity should be at least as large as the concurrency level. Otherwise, we would have locks that don't guard
+            // any buckets.
+            if (capacity < concurrencyLevel)
+            {
+                capacity = concurrencyLevel;
+            }
+
+            var locks = new object[concurrencyLevel];
+            for (var i = 0; i < locks.Length; i++)
+            {
+                locks[i] = new object();
+            }
+
+            var countPerLock = new int[locks.Length];
+            var buckets = new Node[capacity];
+            _tables = new Tables(buckets, locks, countPerLock);
+
+            _growLockArray = growLockArray;
+            _budget = buckets.Length / locks.Length;
+            _comparer = comparer ?? EqualityComparer<T>.Default;
+        }
+
+        /// <summary>
+        /// Adds the specified item to the <see cref="ConcurrentHashSet{T}"/>.
+        /// </summary>
+        /// <param name="item">The item to add.</param>
+        /// <returns>true if the items was added to the <see cref="ConcurrentHashSet{T}"/>
+        /// successfully; false if it already exists.</returns>
+        /// <exception cref="OverflowException">The <see cref="ConcurrentHashSet{T}"/>
+        /// contains too many items.</exception>
+        public bool Add(T item) =>
+            AddInternal(item, _comparer.GetHashCode(item), true);
+
+        /// <summary>
+        /// Removes all items from the <see cref="ConcurrentHashSet{T}"/>.
+        /// </summary>
+        public void Clear()
+        {
+            var locksAcquired = 0;
+            try
+            {
+                AcquireAllLocks(ref locksAcquired);
+
+                if (AreAllBucketsEmpty())
+                {
+                    return;
+                }
+
+                var tables = _tables;
+                var newTables = new Tables(new Node[DefaultCapacity], tables.Locks, new int[tables.CountPerLock.Length]);
+                _tables = newTables;
+                _budget = Math.Max(1, newTables.Buckets.Length / newTables.Locks.Length);
+            }
+            finally
+            {
+                ReleaseLocks(0, locksAcquired);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the <see cref="ConcurrentHashSet{T}"/> contains the specified
+        /// item.
+        /// </summary>
+        /// <param name="item">The item to locate in the <see cref="ConcurrentHashSet{T}"/>.</param>
+        /// <returns>true if the <see cref="ConcurrentHashSet{T}"/> contains the item; otherwise, false.</returns>
+        public bool Contains(T item) => TryGetValue(item, out _);
+
+        /// <summary>
+        /// Searches the <see cref="ConcurrentHashSet{T}"/> for a given value and returns the equal value it finds, if any.
+        /// </summary>
+        /// <param name="equalValue">The value to search for.</param>
+        /// <param name="actualValue">The value from the set that the search found, or the default value of <typeparamref name="T"/> when the search yielded no match.</param>
+        /// <returns>A value indicating whether the search was successful.</returns>
+        /// <remarks>
+        /// This can be useful when you want to reuse a previously stored reference instead of
+        /// a newly constructed one (so that more sharing of references can occur) or to look up
+        /// a value that has more complete data than the value you currently have, although their
+        /// comparer functions indicate they are equal.
+        /// </remarks>
+        public bool TryGetValue(T equalValue, [MaybeNullWhen(false)] out T actualValue)
+        {
+            var hashcode = _comparer.GetHashCode(equalValue);
+
+            // We must capture the _buckets field in a local variable. It is set to a new table on each table resize.
+            var tables = _tables;
+
+            var bucketNo = GetBucket(hashcode, tables.Buckets.Length);
+
+            // We can get away w/out a lock here.
+            // The Volatile.Read ensures that the load of the fields of 'n' doesn't move before the load from buckets[i].
+            var current = Volatile.Read(ref tables.Buckets[bucketNo]);
+
+            while (current != null)
+            {
+                if (hashcode == current.Hashcode && _comparer.Equals(current.Item, equalValue))
+                {
+                    actualValue = current.Item;
+                    return true;
+                }
+
+                current = current.Next;
+            }
+
+            actualValue = default;
+            return false;
+        }
+
+        /// <summary>
+        /// Attempts to remove the item from the <see cref="ConcurrentHashSet{T}"/>.
+        /// </summary>
+        /// <param name="item">The item to remove.</param>
+        /// <returns>true if an item was removed successfully; otherwise, false.</returns>
+        public bool TryRemove(T item)
+        {
+            var hashcode = _comparer.GetHashCode(item);
+            while (true)
+            {
+                var tables = _tables;
+
+                GetBucketAndLockNo(hashcode, out int bucketNo, out int lockNo, tables.Buckets.Length, tables.Locks.Length);
+
+                lock (tables.Locks[lockNo])
+                {
+                    // If the table just got resized, we may not be holding the right lock, and must retry.
+                    // This should be a rare occurrence.
+                    if (tables != _tables)
+                    {
+                        continue;
+                    }
+
+                    Node? previous = null;
+                    for (var current = tables.Buckets[bucketNo]; current != null; current = current.Next)
+                    {
+                        Debug.Assert((previous == null && current == tables.Buckets[bucketNo]) || previous!.Next == current);
+
+                        if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+                        {
+                            if (previous == null)
+                            {
+                                Volatile.Write(ref tables.Buckets[bucketNo], current.Next);
+                            }
+                            else
+                            {
+                                previous.Next = current.Next;
+                            }
+
+                            tables.CountPerLock[lockNo]--;
+                            return true;
+                        }
+                        previous = current;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => ((IEnumerable<T>)this).GetEnumerator();
+
+        /// <summary>Returns an enumerator that iterates through the <see
+        /// cref="ConcurrentHashSet{T}"/>.</summary>
+        /// <returns>An enumerator for the <see cref="ConcurrentHashSet{T}"/>.</returns>
+        /// <remarks>
+        /// The enumerator returned from the collection is safe to use concurrently with
+        /// reads and writes to the collection, however it does not represent a moment-in-time snapshot
+        /// of the collection.  The contents exposed through the enumerator may contain modifications
+        /// made to the collection after <see cref="IEnumerable{T}.GetEnumerator"/> was called.
+        /// </remarks>
+        IEnumerator<T> IEnumerable<T>.GetEnumerator() => new Enumerator(this);
+
+        /// <summary>Returns a value-type enumerator that iterates through the <see
+        /// cref="ConcurrentHashSet{T}"/>.</summary>
+        /// <returns>An enumerator for the <see cref="ConcurrentHashSet{T}"/>.</returns>
+        /// <remarks>
+        /// The enumerator returned from the collection is safe to use concurrently with
+        /// reads and writes to the collection, however it does not represent a moment-in-time snapshot
+        /// of the collection.  The contents exposed through the enumerator may contain modifications
+        /// made to the collection after <see cref="GetEnumerator"/> was called.
+        /// </remarks>
+        public Enumerator GetEnumerator() => new Enumerator(this);
+
+        /// <summary>
+        /// Represents an enumerator for <see cref="ConcurrentHashSet{T}" />.
+        /// </summary>
+        public struct Enumerator : IEnumerator<T>
+        {
+            // Provides a manually-implemented version of (approximately) this iterator:
+            //     Node?[] buckets = _tables.Buckets;
+            //     for (int i = 0; i < buckets.Length; i++)
+            //         for (Node? current = Volatile.Read(ref buckets[i]); current != null; current = current.Next)
+            //             yield return new current.Item;
+
+            private readonly ConcurrentHashSet<T> _set;
+
+            private Node?[]? _buckets;
+            private Node? _node;
+            private int _i;
+            private int _state;
+
+            private const int StateUninitialized = 0;
+            private const int StateOuterloop = 1;
+            private const int StateInnerLoop = 2;
+            private const int StateDone = 3;
+
+            /// <summary>
+            /// Constructs an enumerator for <see cref="ConcurrentHashSet{T}" />.
+            /// </summary>
+            public Enumerator(ConcurrentHashSet<T> set)
+            {
+                _set = set;
+                _buckets = null;
+                _node = null;
+                Current = default!;
+                _i = -1;
+                _state = StateUninitialized;
+            }
+
+            /// <summary>
+            /// Gets the element in the collection at the current position of the enumerator.
+            /// </summary>
+            /// <value>The element in the collection at the current position of the enumerator.</value>
+            public T Current { get; private set; }
+
+            object? IEnumerator.Current => Current;
+
+            /// <summary>
+            /// Sets the enumerator to its initial position, which is before the first element in the collection.
+            /// </summary>
+            public void Reset()
+            {
+                _buckets = null;
+                _node = null;
+                Current = default!;
+                _i = -1;
+                _state = StateUninitialized;
+            }
+
+            /// <summary>
+            /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+            /// </summary>
+            public void Dispose() { }
+
+            /// <summary>
+            /// Advances the enumerator to the next element of the collection.
+            /// </summary>
+            /// <returns>true if the enumerator was successfully advanced to the next element; false if the enumerator has passed the end of the collection.</returns>
+            public bool MoveNext()
+            {
+                switch (_state)
+                {
+                    case StateUninitialized:
+                        _buckets = _set._tables.Buckets;
+                        _i = -1;
+                        goto case StateOuterloop;
+
+                    case StateOuterloop:
+                        Node?[]? buckets = _buckets;
+                        Debug.Assert(buckets != null);
+
+                        int i = ++_i;
+                        if ((uint)i < (uint)buckets!.Length)
+                        {
+                            // The Volatile.Read ensures that we have a copy of the reference to buckets[i]:
+                            // this protects us from reading fields ('_key', '_value' and '_next') of different instances.
+                            _node = Volatile.Read(ref buckets[i]);
+                            _state = StateInnerLoop;
+                            goto case StateInnerLoop;
+                        }
+                        goto default;
+
+                    case StateInnerLoop:
+                        Node? node = _node;
+                        if (node != null)
+                        {
+                            Current = node.Item;
+                            _node = node.Next;
+                            return true;
+                        }
+                        goto case StateOuterloop;
+
+                    default:
+                        _state = StateDone;
+                        return false;
+                }
+            }
+        }
+
+        void ICollection<T>.Add(T item) => Add(item);
+
+        bool ICollection<T>.IsReadOnly => false;
+
+        void ICollection<T>.CopyTo(T[] array, int arrayIndex)
+        {
+            if (array == null) throw new ArgumentNullException(nameof(array));
+            if (arrayIndex < 0) throw new ArgumentOutOfRangeException(nameof(arrayIndex));
+
+            var locksAcquired = 0;
+            try
+            {
+                AcquireAllLocks(ref locksAcquired);
+
+                var count = 0;
+
+                var countPerLock = _tables.CountPerLock;
+                for (var i = 0; i < countPerLock.Length && count >= 0; i++)
+                {
+                    count += countPerLock[i];
+                }
+
+                if (array.Length - count < arrayIndex || count < 0) //"count" itself or "count + arrayIndex" can overflow
+                {
+                    throw new ArgumentException("The index is equal to or greater than the length of the array, or the number of elements in the set is greater than the available space from index to the end of the destination array.");
+                }
+
+                CopyToItems(array, arrayIndex);
+            }
+            finally
+            {
+                ReleaseLocks(0, locksAcquired);
+            }
+        }
+
+        bool ICollection<T>.Remove(T item) => TryRemove(item);
+
+        private void InitializeFromCollection(IEnumerable<T> collection)
+        {
+            foreach (var item in collection)
+            {
+                AddInternal(item, _comparer.GetHashCode(item), false);
+            }
+
+            if (_budget == 0)
+            {
+                var tables = _tables;
+                _budget = tables.Buckets.Length / tables.Locks.Length;
+            }
+        }
+
+        private bool AddInternal(T item, int hashcode, bool acquireLock)
+        {
+            while (true)
+            {
+                var tables = _tables;
+
+                GetBucketAndLockNo(hashcode, out int bucketNo, out int lockNo, tables.Buckets.Length, tables.Locks.Length);
+
+                var resizeDesired = false;
+                var lockTaken = false;
+                try
+                {
+                    if (acquireLock)
+                        Monitor.Enter(tables.Locks[lockNo], ref lockTaken);
+
+                    // If the table just got resized, we may not be holding the right lock, and must retry.
+                    // This should be a rare occurrence.
+                    if (tables != _tables)
+                    {
+                        continue;
+                    }
+
+                    // Try to find this item in the bucket
+                    Node? previous = null;
+                    for (var current = tables.Buckets[bucketNo]; current != null; current = current.Next)
+                    {
+                        Debug.Assert(previous == null && current == tables.Buckets[bucketNo] || previous!.Next == current);
+                        if (hashcode == current.Hashcode && _comparer.Equals(current.Item, item))
+                        {
+                            return false;
+                        }
+                        previous = current;
+                    }
+
+                    // The item was not found in the bucket. Insert the new item.
+                    Volatile.Write(ref tables.Buckets[bucketNo], new Node(item, hashcode, tables.Buckets[bucketNo]));
+                    checked
+                    {
+                        tables.CountPerLock[lockNo]++;
+                    }
+
+                    //
+                    // If the number of elements guarded by this lock has exceeded the budget, resize the bucket table.
+                    // It is also possible that GrowTable will increase the budget but won't resize the bucket table.
+                    // That happens if the bucket table is found to be poorly utilized due to a bad hash function.
+                    //
+                    if (tables.CountPerLock[lockNo] > _budget)
+                    {
+                        resizeDesired = true;
+                    }
+                }
+                finally
+                {
+                    if (lockTaken)
+                        Monitor.Exit(tables.Locks[lockNo]);
+                }
+
+                //
+                // The fact that we got here means that we just performed an insertion. If necessary, we will grow the table.
+                //
+                // Concurrency notes:
+                // - Notice that we are not holding any locks at when calling GrowTable. This is necessary to prevent deadlocks.
+                // - As a result, it is possible that GrowTable will be called unnecessarily. But, GrowTable will obtain lock 0
+                //   and then verify that the table we passed to it as the argument is still the current table.
+                //
+                if (resizeDesired)
+                {
+                    GrowTable(tables);
+                }
+
+                return true;
+            }
+        }
+
+        private static int GetBucket(int hashcode, int bucketCount)
+        {
+            var bucketNo = (hashcode & 0x7fffffff) % bucketCount;
+            Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount);
+            return bucketNo;
+        }
+
+        private static void GetBucketAndLockNo(int hashcode, out int bucketNo, out int lockNo, int bucketCount, int lockCount)
+        {
+            bucketNo = (hashcode & 0x7fffffff) % bucketCount;
+            lockNo = bucketNo % lockCount;
+
+            Debug.Assert(bucketNo >= 0 && bucketNo < bucketCount);
+            Debug.Assert(lockNo >= 0 && lockNo < lockCount);
+        }
+
+        private bool AreAllBucketsEmpty()
+        {
+            var countPerLock = _tables.CountPerLock;
+            for (var i = 0; i < countPerLock.Length; i++)
+            {
+                if (countPerLock[i] != 0)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private void GrowTable(Tables tables)
+        {
+            const int maxArrayLength = 0X7FEFFFFF;
+            var locksAcquired = 0;
+            try
+            {
+                // The thread that first obtains _locks[0] will be the one doing the resize operation
+                AcquireLocks(0, 1, ref locksAcquired);
+
+                // Make sure nobody resized the table while we were waiting for lock 0:
+                if (tables != _tables)
+                {
+                    // We assume that since the table reference is different, it was already resized (or the budget
+                    // was adjusted). If we ever decide to do table shrinking, or replace the table for other reasons,
+                    // we will have to revisit this logic.
+                    return;
+                }
+
+                // Compute the (approx.) total size. Use an Int64 accumulation variable to avoid an overflow.
+                long approxCount = 0;
+                for (var i = 0; i < tables.CountPerLock.Length; i++)
+                {
+                    approxCount += tables.CountPerLock[i];
+                }
+
+                //
+                // If the bucket array is too empty, double the budget instead of resizing the table
+                //
+                if (approxCount < tables.Buckets.Length / 4)
+                {
+                    _budget = 2 * _budget;
+                    if (_budget < 0)
+                    {
+                        _budget = int.MaxValue;
+                    }
+                    return;
+                }
+
+                // Compute the new table size. We find the smallest integer larger than twice the previous table size, and not divisible by
+                // 2,3,5 or 7. We can consider a different table-sizing policy in the future.
+                var newLength = 0;
+                var maximizeTableSize = false;
+                try
+                {
+                    checked
+                    {
+                        // Double the size of the buckets table and add one, so that we have an odd integer.
+                        newLength = tables.Buckets.Length * 2 + 1;
+
+                        // Now, we only need to check odd integers, and find the first that is not divisible
+                        // by 3, 5 or 7.
+                        while (newLength % 3 == 0 || newLength % 5 == 0 || newLength % 7 == 0)
+                        {
+                            newLength += 2;
+                        }
+
+                        Debug.Assert(newLength % 2 != 0);
+
+                        if (newLength > maxArrayLength)
+                        {
+                            maximizeTableSize = true;
+                        }
+                    }
+                }
+                catch (OverflowException)
+                {
+                    maximizeTableSize = true;
+                }
+
+                if (maximizeTableSize)
+                {
+                    newLength = maxArrayLength;
+
+                    // We want to make sure that GrowTable will not be called again, since table is at the maximum size.
+                    // To achieve that, we set the budget to int.MaxValue.
+                    //
+                    // (There is one special case that would allow GrowTable() to be called in the future: 
+                    // calling Clear() on the ConcurrentHashSet will shrink the table and lower the budget.)
+                    _budget = int.MaxValue;
+                }
+
+                // Now acquire all other locks for the table
+                AcquireLocks(1, tables.Locks.Length, ref locksAcquired);
+
+                var newLocks = tables.Locks;
+
+                // Add more locks
+                if (_growLockArray && tables.Locks.Length < MaxLockNumber)
+                {
+                    newLocks = new object[tables.Locks.Length * 2];
+                    Array.Copy(tables.Locks, newLocks, tables.Locks.Length);
+                    for (var i = tables.Locks.Length; i < newLocks.Length; i++)
+                    {
+                        newLocks[i] = new object();
+                    }
+                }
+
+                var newBuckets = new Node[newLength];
+                var newCountPerLock = new int[newLocks.Length];
+
+                // Copy all data into a new table, creating new nodes for all elements
+                for (var i = 0; i < tables.Buckets.Length; i++)
+                {
+                    var current = tables.Buckets[i];
+                    while (current != null)
+                    {
+                        var next = current.Next;
+                        GetBucketAndLockNo(current.Hashcode, out int newBucketNo, out int newLockNo, newBuckets.Length, newLocks.Length);
+
+                        newBuckets[newBucketNo] = new Node(current.Item, current.Hashcode, newBuckets[newBucketNo]);
+
+                        checked
+                        {
+                            newCountPerLock[newLockNo]++;
+                        }
+
+                        current = next;
+                    }
+                }
+
+                // Adjust the budget
+                _budget = Math.Max(1, newBuckets.Length / newLocks.Length);
+
+                // Replace tables with the new versions
+                _tables = new Tables(newBuckets, newLocks, newCountPerLock);
+            }
+            finally
+            {
+                // Release all locks that we took earlier
+                ReleaseLocks(0, locksAcquired);
+            }
+        }
+
+        private void AcquireAllLocks(ref int locksAcquired)
+        {
+            // First, acquire lock 0
+            AcquireLocks(0, 1, ref locksAcquired);
+
+            // Now that we have lock 0, the _locks array will not change (i.e., grow),
+            // and so we can safely read _locks.Length.
+            AcquireLocks(1, _tables.Locks.Length, ref locksAcquired);
+            Debug.Assert(locksAcquired == _tables.Locks.Length);
+        }
+
+        private void AcquireLocks(int fromInclusive, int toExclusive, ref int locksAcquired)
+        {
+            Debug.Assert(fromInclusive <= toExclusive);
+            var locks = _tables.Locks;
+
+            for (var i = fromInclusive; i < toExclusive; i++)
+            {
+                var lockTaken = false;
+                try
+                {
+                    Monitor.Enter(locks[i], ref lockTaken);
+                }
+                finally
+                {
+                    if (lockTaken)
+                    {
+                        locksAcquired++;
+                    }
+                }
+            }
+        }
+
+        private void ReleaseLocks(int fromInclusive, int toExclusive)
+        {
+            Debug.Assert(fromInclusive <= toExclusive);
+
+            for (var i = fromInclusive; i < toExclusive; i++)
+            {
+                Monitor.Exit(_tables.Locks[i]);
+            }
+        }
+
+        private void CopyToItems(T[] array, int index)
+        {
+            var buckets = _tables.Buckets;
+            for (var i = 0; i < buckets.Length; i++)
+            {
+                for (var current = buckets[i]; current != null; current = current.Next)
+                {
+                    array[index] = current.Item;
+                    index++; //this should never flow, CopyToItems is only called when there's no overflow risk
+                }
+            }
+        }
+
+        private class Tables
+        {
+            public readonly Node?[] Buckets;
+            public readonly object[] Locks;
+
+            public readonly int[] CountPerLock;
+
+            public Tables(Node?[] buckets, object[] locks, int[] countPerLock)
+            {
+                Buckets = buckets;
+                Locks = locks;
+                CountPerLock = countPerLock;
+            }
+        }
+
+        private class Node
+        {
+            public readonly T Item;
+            public readonly int Hashcode;
+
+            public volatile Node? Next;
+
+            public Node(T item, int hashcode, Node? next)
+            {
+                Item = item;
+                Hashcode = hashcode;
+                Next = next;
+            }
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core/Threading/Dispatcher.cs b/sources/core/Xenko.Core/Threading/Dispatcher.cs
index f2ca4e9e40..881da95aab 100644
--- a/sources/core/Xenko.Core/Threading/Dispatcher.cs
+++ b/sources/core/Xenko.Core/Threading/Dispatcher.cs
@@ -16,6 +16,7 @@ public class Dispatcher
         public static int MaxDegreeOfParallelism = 1;
 #else
         public static int MaxDegreeOfParallelism = Environment.ProcessorCount;
+        public static int MaxPhysicsParallelism = Math.Max(4, MaxDegreeOfParallelism / 3);
 #endif
 
         public delegate void ValueAction<T>(ref T obj);
diff --git a/sources/core/Xenko.Core/Threading/FastConcurrentCollector.cs b/sources/core/Xenko.Core/Threading/FastConcurrentCollector.cs
new file mode 100644
index 0000000000..c12575ed25
--- /dev/null
+++ b/sources/core/Xenko.Core/Threading/FastConcurrentCollector.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace Xenko.Core.Threading
+{
+    /// <summary>
+    /// Minimally protected collector designed for simplicity and speed. Only Add is really thread-safe.
+    /// </summary>
+    public class FastConcurrentCollector<T>
+    {
+        private int len;
+
+        public int Count => len;
+        public T[] Collected;
+
+        public int Capacity => Collected.Length;
+
+        public FastConcurrentCollector(int capacity) {
+            Collected = new T[capacity];
+        }
+
+        public void Resize(int newSize)
+        {
+            Array.Resize<T>(ref Collected, newSize);
+        }
+
+        public void Clear()
+        {
+            len = 0;
+        }
+
+        public void Add(T item)
+        {
+            int index = Interlocked.Increment(ref len) - 1;
+            Collected[index] = item;
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core/Threading/RWLSExtension.cs b/sources/core/Xenko.Core/Threading/RWLSExtension.cs
new file mode 100644
index 0000000000..dfc8e4c63f
--- /dev/null
+++ b/sources/core/Xenko.Core/Threading/RWLSExtension.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+
+namespace Xenko.Core.Threading
+{
+    public static class RWLSExtension
+    {
+        public static ReadLockHelper ReadLock(this ReaderWriterLockSlim readerWriterLock)
+        {
+            return new ReadLockHelper(readerWriterLock);
+        }
+
+        public static UpgradeableReadLockHelper UpgradableReadLock(this ReaderWriterLockSlim readerWriterLock)
+        {
+            return new UpgradeableReadLockHelper(readerWriterLock);
+        }
+
+        public static WriteLockHelper WriteLock(this ReaderWriterLockSlim readerWriterLock)
+        {
+            return new WriteLockHelper(readerWriterLock);
+        }
+
+        public struct ReadLockHelper : IDisposable
+        {
+            private readonly ReaderWriterLockSlim readerWriterLock;
+
+            public ReadLockHelper(ReaderWriterLockSlim readerWriterLock)
+            {
+                readerWriterLock.EnterReadLock();
+                this.readerWriterLock = readerWriterLock;
+            }
+
+            public void Dispose()
+            {
+                this.readerWriterLock.ExitReadLock();
+            }
+        }
+
+        public struct UpgradeableReadLockHelper : IDisposable
+        {
+            private readonly ReaderWriterLockSlim readerWriterLock;
+
+            public UpgradeableReadLockHelper(ReaderWriterLockSlim readerWriterLock)
+            {
+                readerWriterLock.EnterUpgradeableReadLock();
+                this.readerWriterLock = readerWriterLock;
+            }
+
+            public void Dispose()
+            {
+                this.readerWriterLock.ExitUpgradeableReadLock();
+            }
+        }
+
+        public struct WriteLockHelper : IDisposable
+        {
+            private readonly ReaderWriterLockSlim readerWriterLock;
+
+            public WriteLockHelper(ReaderWriterLockSlim readerWriterLock)
+            {
+                readerWriterLock.EnterWriteLock();
+                this.readerWriterLock = readerWriterLock;
+            }
+
+            public void Dispose()
+            {
+                this.readerWriterLock.ExitWriteLock();
+            }
+        }
+    }
+}
diff --git a/sources/core/Xenko.Core/Threading/ThreadPool.cs b/sources/core/Xenko.Core/Threading/ThreadPool.cs
index a371ff0397..299f90fd22 100644
--- a/sources/core/Xenko.Core/Threading/ThreadPool.cs
+++ b/sources/core/Xenko.Core/Threading/ThreadPool.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Xenko.Core.Annotations;
@@ -12,73 +13,59 @@ namespace Xenko.Core.Threading
     /// <summary>
     /// Thread pool for scheduling actions.
     /// </summary>
-    /// <remarks>
-    /// Base on Stephen Toub's ManagedThreadPool
-    /// </remarks>
-    internal class ThreadPool
+    public class ThreadPool
     {
-        private const long MaxIdleTimeInTicks = 5 * TimeSpan.TicksPerSecond;
-
         public static readonly ThreadPool Instance = new ThreadPool();
 
-        private readonly int maxThreadCount = Environment.ProcessorCount + 2;
         private readonly Queue<Action> workItems = new Queue<Action>();
-        private readonly ManualResetEvent workAvailable = new ManualResetEvent(false);
+        private readonly AutoResetEvent workAvailable = new AutoResetEvent(false);
 
         private SpinLock spinLock = new SpinLock();
-        private int workingCount;
-        /// <summary> Usage only within <see cref="spinLock"/> </summary>
-        private int aliveCount;
 
+        public ThreadPool()
+        {
+            // fire up worker threads
+            ThreadStart ts = new ThreadStart(ProcessWorkItems);
+            for (int i = 0; i < Dispatcher.MaxDegreeOfParallelism; i++)
+            {
+                Thread t = new Thread(ts);
+                t.Name = "ThreadPool #" + i;
+                t.IsBackground = true;
+                t.Start();
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public void QueueWorkItem([NotNull] [Pooled] Action workItem)
         {
-            var lockTaken = false;
+            PooledDelegateHelper.AddReference(workItem);
+            bool lockTaken = false;
             try
             {
                 spinLock.Enter(ref lockTaken);
-
-                PooledDelegateHelper.AddReference(workItem);
                 workItems.Enqueue(workItem);
-                workAvailable.Set();
-
-                var curWorkingCount = Interlocked.CompareExchange(ref workingCount, 0, 0);
-                if (curWorkingCount + 1 >= aliveCount && aliveCount < maxThreadCount)
-                {
-                    aliveCount++;
-                    Task.Factory.StartNew(ProcessWorkItems, TaskCreationOptions.LongRunning);
-                }
             }
             finally
             {
                 if (lockTaken)
                     spinLock.Exit(true);
             }
+
+            workAvailable.Set();
         }
 
-        private void ProcessWorkItems(object state)
+        private void ProcessWorkItems()
         {
-            long lastWork = Stopwatch.GetTimestamp();
-            TimeSpan maxIdleTime = TimeSpan.FromTicks(MaxIdleTimeInTicks);
-            while(true)
+            while (true)
             {
                 Action workItem = null;
                 var lockTaken = false;
-                bool idleForTooLong = Utilities.ConvertRawToTimestamp(Stopwatch.GetTimestamp() - lastWork) < maxIdleTime;
                 try
                 {
                     spinLock.Enter(ref lockTaken);
 
                     if (workItems.Count > 0)
-                    {
                         workItem = workItems.Dequeue();
-                        if (workItems.Count == 0)
-                            workAvailable.Reset();
-                    }
-                    else if (idleForTooLong)
-                    {
-                        aliveCount--;
-                        return;
-                    }
                 }
                 finally
                 {
@@ -86,9 +73,9 @@ private void ProcessWorkItems(object state)
                         spinLock.Exit(true);
                 }
 
+                // do we have a job to do?
                 if (workItem != null)
                 {
-                    Interlocked.Increment(ref workingCount);
                     try
                     {
                         workItem.Invoke();
@@ -97,13 +84,10 @@ private void ProcessWorkItems(object state)
                     {
                         // Ignoring Exception
                     }
-                    Interlocked.Decrement(ref workingCount);
                     PooledDelegateHelper.Release(workItem);
-                    lastWork = Stopwatch.GetTimestamp();
                 }
-
-                // Wait for another work item to be (potentially) available
-                workAvailable.WaitOne(maxIdleTime);
+                // couldn't find work, wait until some more is available
+                else workAvailable.WaitOne();
             }
         }
     }
diff --git a/sources/core/Xenko.Core/Utilities.cs b/sources/core/Xenko.Core/Utilities.cs
index b616987788..a95fccca33 100644
--- a/sources/core/Xenko.Core/Utilities.cs
+++ b/sources/core/Xenko.Core/Utilities.cs
@@ -29,8 +29,8 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Security;
 using System.Text;
+using System.Threading;
 using Xenko.Core.Annotations;
 using Xenko.Core.Native;
 
@@ -41,31 +41,23 @@ namespace Xenko.Core
     /// </summary>
     public static class Utilities
     {
-#if XENKO_PLATFORM_UWP
-        public static unsafe void CopyMemory(IntPtr dest, IntPtr src, int sizeInBytesToCopy)
-        {
-            Interop.memcpy((void*)dest, (void*)src, sizeInBytesToCopy);
-        }
-#else
-#if XENKO_PLATFORM_WINDOWS_DESKTOP
-        private const string MemcpyDll = "msvcrt.dll";
-#elif XENKO_PLATFORM_ANDROID
-        private const string MemcpyDll = "libc.so";
-#elif XENKO_PLATFORM_UNIX
-        // We do not specifiy the .so extension as libc.so on Linux
-        // is actually not a .so files but a script. Using just libc
-        // will automatically find the corresponding .so.
-        private const string MemcpyDll = "libc";
-#elif XENKO_PLATFORM_IOS
-        private const string MemcpyDll = ObjCRuntime.Constants.SystemLibrary;
-#else
-#   error Unsupported platform
-#endif
-        [DllImport(MemcpyDll, EntryPoint = "memcpy", CallingConvention = CallingConvention.Cdecl, SetLastError = false)]
-#if !XENKO_RUNTIME_CORECLR
-        [SuppressUnmanagedCodeSecurity]
-#endif
-        private static extern IntPtr CopyMemory(IntPtr dest, IntPtr src, ulong sizeInBytesToCopy);
+        /// <summary>
+        /// Creates a TimeSpan with precise tick count, normal "From" methods do weird rounding.
+        /// </summary>
+        public static TimeSpan FromMillisecondsPrecise(double milliSeconds)
+            => TimeSpan.FromTicks((long)(milliSeconds * TimeSpan.TicksPerMillisecond));
+
+        /// <summary>
+        /// Creates a TimeSpan with precise tick count, normal "From" methods do weird rounding.
+        /// </summary>
+        public static TimeSpan FromSecondsPrecise(double seconds)
+            => TimeSpan.FromTicks((long)(seconds * TimeSpan.TicksPerSecond));
+
+        /// <summary>
+        /// Creates a TimeSpan with precise tick count, normal "From" methods do weird rounding.
+        /// </summary>
+        public static TimeSpan FromMinutesPrecise(double minutes)
+            => TimeSpan.FromTicks((long)(minutes * TimeSpan.TicksPerMinute));
 
         /// <summary>
         /// Copy memory.
@@ -73,11 +65,14 @@ public static unsafe void CopyMemory(IntPtr dest, IntPtr src, int sizeInBytesToC
         /// <param name="dest">The destination memory location</param>
         /// <param name="src">The source memory location.</param>
         /// <param name="sizeInBytesToCopy">The count.</param>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static void CopyMemory(IntPtr dest, IntPtr src, int sizeInBytesToCopy)
         {
-            CopyMemory(dest, src, (ulong)sizeInBytesToCopy);
+            unsafe
+            {
+                Buffer.MemoryCopy((void*)src, (void*)dest, sizeInBytesToCopy, sizeInBytesToCopy);
+            }
         }
-#endif
 
         /// <summary>
         /// Compares two block of memory.
@@ -514,7 +509,7 @@ public static byte[] ReadStream([NotNull] Stream stream, ref int readLength)
 
             System.Diagnostics.Debug.Assert(num >= 0);
             if (num == 0)
-                return new byte[0];
+                return Array.Empty<byte>();
 
             var buffer = new byte[num];
             var bytesRead = 0;
@@ -657,6 +652,21 @@ public static bool Compare<TKey, TValue>(IDictionary<TKey, TValue> first, IDicti
             return second.Keys.All(first.ContainsKey);
         }
 
+        /// <summary>
+        /// Compares two collection, element by elements.
+        /// </summary>
+        /// <param name="first">The collection to compare from.</param>
+        /// <param name="second">The colllection to compare to.</param>
+        /// <returns>True if lists are identical (but not necessarily in the same order). False otherwise.</returns>
+        /// <remarks>Concrete SortedList is favored over interface to avoid enumerator object allocation.</remarks>
+        public static bool Compare<TKey, TValue>(Collections.SortedList<TKey, TValue> first, Collections.SortedList<TKey, TValue> second)
+        {
+            if (ReferenceEquals(first, second)) return true;
+            if (ReferenceEquals(first, null) || ReferenceEquals(second, null)) return false;
+
+            return first.Equals(second);
+        }
+
         public static bool Compare<T>(T[] left, T[] right)
         {
             if (ReferenceEquals(left, right))
@@ -712,6 +722,33 @@ public static bool Compare<T>(ICollection<T> left, ICollection<T> right)
             return true;
         }
 
+        /// <summary>
+        /// Compares two list, element by elements.
+        /// </summary>
+        /// <param name="left">The list to compare from.</param>
+        /// <param name="right">The colllection to compare to.</param>
+        /// <returns>True if lists are sequentially equal. False otherwise.</returns>
+        /// <remarks>Concrete List is favored over interface to avoid enumerator object allocation.</remarks>
+        public static bool Compare<T>(List<T> left, List<T> right)
+        {
+            if (ReferenceEquals(left, right))
+                return true;
+            if (ReferenceEquals(left, null) || ReferenceEquals(right, null))
+                return false;
+
+            if (left.Count != right.Count)
+                return false;
+
+            var comparer = EqualityComparer<T>.Default;
+            for (int i = 0; i < left.Count; i ++)
+            {
+                if (!comparer.Equals(left[i], right[i]))
+                    return false;
+            }
+
+            return true;
+        }
+
         /// <summary>
         /// Swaps the value between two references.
         /// </summary>
@@ -731,12 +768,7 @@ public static void Swap<T>(ref T left, ref T right)
         /// <param name="sleepTime">The duration of sleep.</param>
         public static void Sleep(TimeSpan sleepTime)
         {
-            var ms = (long)sleepTime.TotalMilliseconds;
-            if (ms < 0 || ms > int.MaxValue)
-            {
-                throw new ArgumentOutOfRangeException(nameof(sleepTime), "Sleep time must be a duration less than '2^31 - 1' milliseconds.");
-            }
-            NativeInvoke.Sleep((int)ms);
+            Thread.Sleep((int)sleepTime.TotalMilliseconds);
         }
 
         /// <summary>
@@ -745,7 +777,7 @@ public static void Sleep(TimeSpan sleepTime)
         /// <param name="sleepTimeInMillis">The duration of sleep in milliseconds.</param>
         public static void Sleep(int sleepTimeInMillis)
         {
-            NativeInvoke.Sleep(sleepTimeInMillis);
+            Thread.Sleep(sleepTimeInMillis);
         }
 
         /// <summary>
diff --git a/sources/core/Xenko.Core/Xenko.Core.csproj b/sources/core/Xenko.Core/Xenko.Core.csproj
index b17b6f6e2a..222c23ae15 100644
--- a/sources/core/Xenko.Core/Xenko.Core.csproj
+++ b/sources/core/Xenko.Core/Xenko.Core.csproj
@@ -3,7 +3,7 @@
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   
   <PropertyGroup>
     <Description>Core assembly for all Xenko assemblies.</Description>
@@ -12,7 +12,6 @@
   </PropertyGroup>
   
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoNativeOutputName>libcore</XenkoNativeOutputName>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
@@ -22,21 +21,7 @@
   </PropertyGroup>
   
   <Choose>
-    <When Condition=" '$(XenkoPlatform)' == 'Android' ">
-      <ItemGroup>
-        <Reference Include="Mono.Android" />
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition=" '$(XenkoPlatform)' == 'iOS' ">
-      <ItemGroup>
-        <Reference Include="Xamarin.iOS" />
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition=" '$(XenkoNETRuntime)' == 'CoreCLR' ">
+    <When Condition="'$(XenkoNETRuntime)' == 'CoreCLR'">
       <ItemGroup>
         <None Include="..\..\data\Linux\runtimeconfig.json">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -49,7 +34,9 @@
   </Choose>
   
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.8" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
   </ItemGroup>
   
   <ItemGroup>
@@ -111,7 +98,7 @@
       <LastGenOutput>TupleSerializer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  
+    
   <ItemGroup>
     <XenkoContent Condition="'$(XenkoPlatform)' == 'Linux'" Include="Xenko.Core.dll.config" />
   </ItemGroup>
@@ -121,5 +108,8 @@
   </ItemGroup>
   
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
diff --git a/sources/core/Xenko.Core/build/Xenko.Core.targets b/sources/core/Xenko.Core/build/Xenko.Core.targets
index 509bf8090d..0f1059b6f4 100644
--- a/sources/core/Xenko.Core/build/Xenko.Core.targets
+++ b/sources/core/Xenko.Core/build/Xenko.Core.targets
@@ -1,17 +1,4 @@
-<Project InitialTargets="XenkoCheckRequirements;_XenkoCheckVisualCRuntime2015" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--Check requirements when running this build file -->
-  <Target Name="XenkoCheckRequirements">
-    <Error Condition="'$(XenkoPlatform)' == ''" Text="The property %24(XenkoPlatform) must be defined by the project"/>
-
-    <!-- If we compile without Visual Studio, still properly resolve platform if SolutionPath is given -->
-    <MSBuild Projects="$(SolutionPath)"
-             Condition="'$(BuildingInsideVisualStudio)' != 'true' and '$(BuildingSolutionFile)' != 'true' and '$(SolutionPath)' != '' and '$(SolutionPath)' != '*Undefined*'"
-             Targets="GetSolutionConfigurationContents"
-             Properties="Configuration=$(Configuration);Platform=$(SolutionPlatform)"
-             ContinueOnError="$(ContinueOnError)">
-      <Output TaskParameter="TargetOutputs" PropertyName="CurrentSolutionConfigurationContents"/>
-    </MSBuild>
-  </Target>
+<Project InitialTargets="_XenkoCheckVisualCRuntime2015" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Check if Visual C++ Runtime 2015 is properly installed -->
   <Target Name="_XenkoCheckVisualCRuntime2015" Condition="'$(MSBuildRuntimeType)' == 'Full'">
     <ItemGroup>
@@ -63,8 +50,8 @@
   <PropertyGroup>
     <!--By default, turn on assembly processor-->
     <XenkoAssemblyProcessor Condition="'$(XenkoAssemblyProcessor)' == ''">true</XenkoAssemblyProcessor>
-    <XenkoAssemblyProcessorPath Condition="Exists('$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe')">$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe</XenkoAssemblyProcessorPath>
-    <XenkoAssemblyProcessorPath Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe')">$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed.exe</XenkoAssemblyProcessorPath>
+    <XenkoAssemblyProcessorPath Condition="Exists('$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed2.exe')">$(MSBuildThisFileDirectory)..\tools\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed2.exe</XenkoAssemblyProcessorPath>
+    <XenkoAssemblyProcessorPath Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed2.exe')">$(MSBuildThisFileDirectory)..\..\..\..\deps\AssemblyProcessor\Xenko.Core.AssemblyProcessor.Packed2.exe</XenkoAssemblyProcessorPath>
   </PropertyGroup>
   <UsingTask TaskName="AssemblyProcessorTask" AssemblyFile="$(XenkoAssemblyProcessorPath)" Condition=" '$(XenkoAssemblyProcessorPath)' != '' And '$(XenkoAssemblyProcessorDev)' != 'true' "/>
   <Target Name="XenkoRunAssemblyProcessor" DependsOnTargets="ResolveAssemblyReferences">
diff --git a/sources/data/images/focus-logo-small.png b/sources/data/images/focus-logo-small.png
new file mode 100644
index 0000000000..94cc23f633
--- /dev/null
+++ b/sources/data/images/focus-logo-small.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/sources/data/images/focus-logo.jpg b/sources/data/images/focus-logo.jpg
new file mode 100644
index 0000000000..24f3febbd6
--- /dev/null
+++ b/sources/data/images/focus-logo.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d2f41504f655cba81e521d07ba71c537ab1fc4fd5dc495cdb7033e5789cdefc5
+size 99696
diff --git a/sources/data/images/focus-logo.png b/sources/data/images/focus-logo.png
new file mode 100644
index 0000000000..5de3a0dfa3
--- /dev/null
+++ b/sources/data/images/focus-logo.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6e9d9d30235300eee58951379bc851900d0f07240a7053df94ac33a46cfa2099
+size 245632
diff --git a/sources/data/images/icon.ico b/sources/data/images/icon.ico
new file mode 100644
index 0000000000..cf8c0e9594
Binary files /dev/null and b/sources/data/images/icon.ico differ
diff --git a/sources/data/images/icon.png b/sources/data/images/icon.png
new file mode 100644
index 0000000000..4b5059507f
--- /dev/null
+++ b/sources/data/images/icon.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/AssemblyReloading/GameStudioAssemblyReloader.cs b/sources/editor/Xenko.Assets.Presentation/AssemblyReloading/GameStudioAssemblyReloader.cs
index 1126ff9d9d..966a61ba83 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssemblyReloading/GameStudioAssemblyReloader.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssemblyReloading/GameStudioAssemblyReloader.cs
@@ -134,7 +134,7 @@ private static void PostAssemblyReloading(IUndoRedoService actionService, Sessio
                     if (itemToReload.Overrides != null)
                     {
                         var extendedPath = itemToReload.GraphPath.Clone();
-                        if (itemToReload.GraphPathIndex != Index.Empty)
+                        if (itemToReload.GraphPathIndex != NodeIndex.Empty)
                             extendedPath.PushIndex(itemToReload.GraphPathIndex);
 
                         var pathToPrepend = AssetNodeMetadataCollectorBase.ConvertPath(extendedPath);
@@ -165,7 +165,7 @@ private static void ClearNode(IUndoRedoService actionService, AssetViewModel ass
             // TODO: Share this code with ContentValueChangeOperation?
             // TODO: How to better detect CollectionAdd vs ValueChange?
             ContentChangeType operationType;
-            if (index != Index.Empty)
+            if (index != NodeIndex.Empty)
             {
                 CollectionItemIdentifiers ids;
                 if (CollectionItemIdHelper.TryGetCollectionItemIds(node.Retrieve(), out ids))
@@ -199,7 +199,7 @@ private static void ReplaceNode(IUndoRedoService actionService, AssetViewModel a
             // TODO: Share this code with ContentValueChangeOperation?
             // TODO: How to better detect CollectionAdd vs ValueChange?
             ContentChangeType operationType;
-            if (index != Index.Empty)
+            if (index != NodeIndex.Empty)
             {
                 operationType = ContentChangeType.CollectionAdd;
                 ((IAssetObjectNode)node).Restore(itemToReload.UpdatedObject, index, itemToReload.ItemId);
@@ -263,6 +263,13 @@ public override void VisitDictionaryKeyValue(object dictionary, DictionaryDescri
                 //base.VisitDictionaryKeyValue(dictionary, descriptor, key, keyDescriptor, value, valueDescriptor);
             }
 
+            public override void VisitSetItem(IEnumerable set, SetDescriptor descriptor, object item, ITypeDescriptor itemDescriptor)
+            {
+                if (ProcessObject(item, itemDescriptor.Type)) return;
+
+                base.VisitSetItem(set, descriptor, item, itemDescriptor);
+            }
+
             protected abstract bool ProcessObject(object obj, Type expectedType);
         }
 
@@ -292,7 +299,7 @@ protected override bool ProcessObject(object obj, Type expectedType)
                 // TODO: More advanced checks if IUnloadable is supposed to be a type from the unloaded assembly (this would avoid processing unecessary IUnloadable)
                 if (obj != null && (UnloadedAssemblies.Contains(obj.GetType().Assembly) || obj is IUnloadable))
                 {
-                    Index index;
+                    NodeIndex index;
                     var settings = new SerializerContextSettings(Log);
                     var path = GraphNodePath.From(propertyGraph.RootNode, CurrentPath, out index);
 
@@ -321,12 +328,12 @@ protected override bool ProcessObject(object obj, Type expectedType)
                 return false;
             }
 
-            private static YamlAssetMetadata<T> RemoveFirstIndexInYamlPath<T>([CanBeNull] YamlAssetMetadata<T> metadata, Index index)
+            private static YamlAssetMetadata<T> RemoveFirstIndexInYamlPath<T>([CanBeNull] YamlAssetMetadata<T> metadata, NodeIndex index)
             {
                 if (metadata != null)
                 {
                     // If we had an index we need to remove it from our override paths
-                    if (index != Index.Empty)
+                    if (index != NodeIndex.Empty)
                     {
                         var fixedMetadata = new YamlAssetMetadata<T>();
                         foreach (var entry in metadata)
@@ -390,7 +397,7 @@ protected override bool ProcessObject(object obj, Type expectedType)
                             foreach (var reference in references)
                             {
                                 var basePathWithIndex = basePath.Clone();
-                                if (unloadedObject.GraphPathIndex != Index.Empty)
+                                if (unloadedObject.GraphPathIndex != NodeIndex.Empty)
                                 {
                                     if (unloadedObject.ItemId == ItemId.Empty)
                                         basePathWithIndex.PushIndex(unloadedObject.GraphPathIndex.Value);
@@ -440,7 +447,7 @@ private class ItemToReload
             /// <summary>
             /// The additional index to apply on the graph path to reach the item.
             /// </summary>
-            public Index GraphPathIndex;
+            public NodeIndex GraphPathIndex;
 
             /// <summary>
             /// The identifier of the item to reload, if relevant.
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/AssetCompositeGameEditor/ViewModels/AssetCompositeHierarchyEditorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/AssetCompositeGameEditor/ViewModels/AssetCompositeHierarchyEditorViewModel.cs
index 09d5f5523d..d1cb1eb3d4 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/AssetCompositeGameEditor/ViewModels/AssetCompositeHierarchyEditorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/AssetCompositeGameEditor/ViewModels/AssetCompositeHierarchyEditorViewModel.cs
@@ -137,11 +137,10 @@ public override void Destroy()
         [CanBeNull]
         public override IEditorGamePartViewModel FindPartViewModel(AbsoluteId id)
         {
-            var item = RootPart as IEditorGamePartViewModel;
-            if (item != null && id == item.Id)
+            if (RootPart is IEditorGamePartViewModel item && id == item.Id)
                 return item;
-
-            return RootPart?.EnumerateChildren().BreadthFirst(x => x.EnumerateChildren()).OfType<IEditorGamePartViewModel>().FirstOrDefault(part => part.Id == id);
+            
+            return RootPart?.EnumerateChildren().BreadthFirst(x => x.EnumerateChildren()).FirstOrDefault(part => part is IEditorGamePartViewModel viewModel && viewModel.Id == id) as IEditorGamePartViewModel;
         }
 
         /// <summary>
@@ -470,7 +469,7 @@ protected async Task PasteIntoItems([NotNull] [ItemNotNull]  IEnumerable<AssetCo
                 var targetContent = item.GetNodePath().GetNode();
                 var propertyContainer = new PropertyContainer();
                 AttachPropertiesForPaste(ref propertyContainer, item);
-                var nodeAccessor = new NodeAccessor(targetContent, Index.Empty);
+                var nodeAccessor = new NodeAccessor(targetContent, NodeIndex.Empty);
                 foreach (var pasteItem in pasteResult.Items)
                 {
                     await (pasteItem.Processor?.Paste(pasteItem, item.Asset.PropertyGraph, ref nodeAccessor, ref propertyContainer) ?? Task.CompletedTask);
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/AudioEntityFactory.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/AudioEntityFactory.cs
index f625e93d74..adbf8124d3 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/AudioEntityFactory.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/AudioEntityFactory.cs
@@ -7,23 +7,6 @@
 
 namespace Xenko.Assets.Presentation.AssetEditors.EntityHierarchyEditor.EntityFactories
 {
-    [Display(10, "Audio emitter", "Audio")]
-    public class AudioEmitterFactory : EntityFactory
-    {
-        [ModuleInitializer]
-        internal static void RegisterCategory()
-        {
-                EntityFactoryCategory.RegisterCategory(50, "Audio");
-        }
-
-        public override Task<Entity> CreateEntity(EntityHierarchyItemViewModel parent)
-        {
-            var name = ComputeNewName(parent, "AudioEmitter");
-            var component = new AudioEmitterComponent();
-            return CreateEntityWithComponent(name, component);
-        }
-    }
-
     [Display(20, "Audio listener", "Audio")]
     public class AudioListenerFactory : EntityFactory
     {
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/LightEntityFactory.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/LightEntityFactory.cs
index c8aa2bf2a4..db79015d16 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/LightEntityFactory.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/EntityFactories/LightEntityFactory.cs
@@ -9,6 +9,8 @@
 using Xenko.Engine;
 using Xenko.Rendering.Lights;
 using Xenko.Rendering.Skyboxes;
+using Xenko.Rendering.Voxels.VoxelGI;
+using Xenko.Rendering.Voxels;
 
 namespace Xenko.Assets.Presentation.AssetEditors.EntityHierarchyEditor.EntityFactories
 {
@@ -87,7 +89,29 @@ public override async Task<Entity> CreateEntity(EntityHierarchyItemViewModel par
         }
     }
 
-    [Display(60, "Light probe", "Light")]
+    [Display(60, "Voxel light", "Light")]
+    public class VoxelLightEntityFactory : EntityFactory
+    {
+        public override Task<Entity> CreateEntity(EntityHierarchyItemViewModel parent)
+        {
+            var name = ComputeNewName(parent, "Voxel light");
+            var component = new LightComponent { Type = new LightVoxel() };
+            return CreateEntityWithComponent(name, component);
+        }
+    }
+
+    [Display(65, "Voxel volume", "Light")]
+    public class VoxelVolumeEntityFactory : EntityFactory
+    {
+        public override Task<Entity> CreateEntity(EntityHierarchyItemViewModel parent)
+        {
+            var name = ComputeNewName(parent, "Voxel volume");
+            var component = new VoxelVolumeComponent { Attributes = { new VoxelAttributeEmissionOpacity() } };
+            return CreateEntityWithComponent(name, component);
+        }
+    }
+
+    [Display(70, "Light probe", "Light")]
     public class LightProbeEntityFactory : EntityFactory
     {
         public override async Task<Entity> CreateEntity(EntityHierarchyItemViewModel parent)
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameCameraPreviewService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameCameraPreviewService.cs
index 9ddaae53c2..aeb034a0ec 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameCameraPreviewService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameCameraPreviewService.cs
@@ -313,7 +313,12 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
 
                     // Allocate a RT for the incrust
                     GeneratedIncrust = drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(TextureDescription.New2D((int)Viewport.Width, (int)Viewport.Height, 1, drawContext.CommandList.RenderTarget.Format, TextureFlags.ShaderResource | TextureFlags.RenderTarget));
-                    var depthBuffer = drawContext.CommandList.DepthStencilBuffer != null ? drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(TextureDescription.New2D((int)Viewport.Width, (int)Viewport.Height, 1, drawContext.CommandList.DepthStencilBuffer.Format, TextureFlags.DepthStencil)) : null;
+
+                    var depthBufferTextureFlags = TextureFlags.DepthStencil;
+                    if (context.GraphicsDevice.Features.HasDepthAsSRV)
+                        depthBufferTextureFlags |= TextureFlags.ShaderResource;
+
+                    var depthBuffer = drawContext.CommandList.DepthStencilBuffer != null ? drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(TextureDescription.New2D((int)Viewport.Width, (int)Viewport.Height, 1, drawContext.CommandList.DepthStencilBuffer.Format, depthBufferTextureFlags)) : null;
 
                     // Push and set render target
                     using (drawContext.PushRenderTargetsAndRestore())
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentChangeWatcherService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentChangeWatcherService.cs
index f9c86a3b83..8fa1604bdb 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentChangeWatcherService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentChangeWatcherService.cs
@@ -68,9 +68,8 @@ private void RegisterComponent(EntityComponent component)
 
         private void UnregisterComponent(EntityComponent component)
         {
-            if (component != null && registeredListeners.ContainsKey(component))
+            if (component != null && registeredListeners.TryGetValue(component, out var listener))
             {
-                var listener = registeredListeners[component];
                 listener.ValueChanged -= ComponentPropertyChanged;
                 listener.ItemChanged -= ComponentPropertyChanged;
                 listener.Dispose();
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentGizmoService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentGizmoService.cs
index d8ef5c1ede..2715b3d9ac 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentGizmoService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameComponentGizmoService.cs
@@ -183,9 +183,9 @@ private void UpdateGizmoEntities(object sender, EntityComponentEventArgs e)
                     var attribute = gizmoType.GetCustomAttribute<GizmoComponentAttribute>(true);
                     isMainGizmo = attribute.IsMainGizmo;
                     // Remove the fallback gizmo if we got a new component.
-                    if (gizmoEntities != null && gizmoEntities.ContainsKey(entity.Transform))
+                    if (gizmoEntities != null && gizmoEntities.TryGetValue(entity.Transform, out var removeGizmo))
                     {
-                        RemoveGizmo(gizmoEntities, gizmoEntities[entity.Transform], entity.Transform);
+                        RemoveGizmo(gizmoEntities, removeGizmo, entity.Transform);
                     }
                 }
                 if (isMainGizmo)
@@ -219,14 +219,10 @@ private void UpdateMainGizmo(Entity entity)
             }
 
             // Creates the main gizmo if it does not exist
-            if (mainComponent != null && !gizmoEntities.TryGetValue(mainComponent, out gizmo))
-            {
-                CreateGizmoEntity(entity, mainComponent);
-            }
             if (gizmoEntities == null || gizmoEntities.Count == 0)
-            {
                 CreateGizmoEntity(entity, entity.Transform, typeof(FallbackGizmo));
-            }
+            else if (mainComponent != null && !gizmoEntities.TryGetValue(mainComponent, out gizmo))
+                CreateGizmoEntity(entity, mainComponent);
         }
 
         private EntityComponent GetMainGizmoComponent(Entity entity)
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameEntityCameraService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameEntityCameraService.cs
index 907647012e..d27446abd8 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameEntityCameraService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameEntityCameraService.cs
@@ -107,9 +107,9 @@ protected override void UpdateCamera()
             base.UpdateCamera();
 
             // Movement speed control
-            if (Game.Input.IsKeyPressed(Keys.OemPlus) || Game.Input.IsKeyPressed(Keys.Add))
+            if (Game.Input.IsKeyPressed(Keys.Plus) || Game.Input.IsKeyPressed(Keys.Add))
                 editor.Dispatcher.InvokeAsync(() => Camera.IncreaseMovementSpeed());
-            else if (Game.Input.IsKeyPressed(Keys.OemMinus) || Game.Input.IsKeyPressed(Keys.Subtract))
+            else if (Game.Input.IsKeyPressed(Keys.Minus) || Game.Input.IsKeyPressed(Keys.Subtract))
                 editor.Dispatcher.InvokeAsync(() => Camera.DecreaseMovementSpeed());
 
             var duplicating = Game.Input.IsKeyDown(Keys.LeftCtrl) || Game.Input.IsKeyDown(Keys.RightCtrl);
@@ -184,10 +184,19 @@ protected void UpdateCameraBase(ref float yaw, ref float pitch, ref Vector3 posi
             // Compute translation speed according to framerate and modifiers
             float baseSpeed = MoveSpeed * SceneUnit * (input.isShiftDown ? 10 : 1) * (1f/60f);
 
-            var rotation = Quaternion.RotationYawPitchRoll(yaw, pitch, 0);
-
             float zoomDelta = 0f;
 
+            // Update yaw and pitch first to keep dependencies on 'rotation' up to date with current frame changes
+            if (input.isMoving || input.isRotating || input.isOrbiting)
+            {
+                var rotationSpeed = RotationSpeed * (input.isOrbiting ? 2 : 1); // we want to rotate faster when rotating around an object.
+                yaw -= 1.333f * Game.Input.MouseDelta.X * rotationSpeed; // we want to rotate faster Horizontally and Vertically
+                if (input.isRotating || input.isOrbiting)
+                    pitch = MathUtil.Clamp(pitch - Game.Input.MouseDelta.Y * rotationSpeed, -MathUtil.PiOverTwo, MathUtil.PiOverTwo);
+            }
+
+            var rotation = Quaternion.RotationYawPitchRoll(yaw, pitch, 0);
+
             // If scene has changed since last time
             if (asOrthographic && Game?.ContentScene?.Entities != null)
             {
@@ -262,15 +271,6 @@ protected void UpdateCameraBase(ref float yaw, ref float pitch, ref Vector3 posi
                 }
             }
 
-            // Rotate
-            if (input.isMoving || input.isRotating || input.isOrbiting)
-            {
-                var rotationSpeed = RotationSpeed * (input.isOrbiting ? 2 : 1); // we want to rotate faster when rotating around an object.
-                yaw -= 1.333f * Game.Input.MouseDelta.X * rotationSpeed; // we want to rotate faster Horizontally and Vertically
-                if (input.isRotating || input.isOrbiting)
-                    pitch = MathUtil.Clamp(pitch - Game.Input.MouseDelta.Y * rotationSpeed, -MathUtil.PiOverTwo, MathUtil.PiOverTwo);
-            }
-
             // Forward/backward
             if (input.isZooming)
             {
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameLightProbeGizmoService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameLightProbeGizmoService.cs
index 35cf1740e6..2c80c34a17 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameLightProbeGizmoService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameLightProbeGizmoService.cs
@@ -330,7 +330,7 @@ private unsafe Mesh ConvertToMesh(GraphicsDevice graphicsDevice, PrimitiveType p
             var vertices = new VertexPositionNormalColor[lightProbeRuntimeData.LightProbes.Length];
             for (var i = 0; i < lightProbeRuntimeData.LightProbes.Length; i++)
             {
-                vertices[i] = new VertexPositionNormalColor(lightProbeRuntimeData.Vertices[i], Vector3.Zero, Color.White);
+                vertices[i] = new VertexPositionNormalColor(lightProbeRuntimeData.Vertices[i], Vector3.Zero, Color4.White);
             }
 
             // Generate data for index buffer
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameNavigationMeshService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameNavigationMeshService.cs
index d5c0b1092f..8440dd5d38 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameNavigationMeshService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameNavigationMeshService.cs
@@ -391,7 +391,7 @@ private void SetDynamicNavigationSystem(DynamicNavigationMeshSystem newDynamicNa
                 // Initialize dynamic navigation mesh system with game settings
                 if (gameSettingsProviderService.CurrentGameSettings != null)
                 {
-                    var navigationSettings = gameSettingsProviderService.CurrentGameSettings.GetOrCreate<NavigationSettings>();
+                    var navigationSettings = gameSettingsProviderService.CurrentGameSettings.GetOrDefault<NavigationSettings>();
                     sceneEditorController.InvokeAsync(() => newDynamicNavigationMeshSystem.InitializeSettingsFromNavigationSettings(navigationSettings));
                 }
 
@@ -410,7 +410,7 @@ private void GameSettingsProviderServiceOnGameSettingsChanged(object sender, Gam
             // Send game settings changes to dynamic navigation mesh system
             if (dynamicNavigationMeshSystem != null && gameSettingsChangedEventArgs.GameSettings != null)
             {
-                var navigationSettings = gameSettingsChangedEventArgs.GameSettings.GetOrCreate<NavigationSettings>();
+                var navigationSettings = gameSettingsChangedEventArgs.GameSettings.GetOrDefault<NavigationSettings>();
                 sceneEditorController.InvokeAsync(() => dynamicNavigationMeshSystem.InitializeSettingsFromNavigationSettings(navigationSettings));
             }
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameParticleComponentChangeWatcherService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameParticleComponentChangeWatcherService.cs
index 4fe99bfa99..efefcfc0c8 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameParticleComponentChangeWatcherService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EditorGameParticleComponentChangeWatcherService.cs
@@ -24,12 +24,11 @@ protected override void ComponentPropertyChanged(object sender, INodeChangeEvent
             if (memberNode == null)
                 return;
 
-            if (memberNode.Name == nameof(ParticleMaterialSimple.AlphaAdditive) ||
-                memberNode.Name == nameof(ParticleMaterialSimple.ZOffset) ||
+            if (memberNode.Name == nameof(ParticleMaterialSimple.AlphaCutoff) ||
                 memberNode.Name == nameof(ParticleMaterialSimple.SoftEdgeDistance))
             {
                 (memberNode.Parent.Retrieve() as ParticleMaterialSimple)?.ForceUpdate();
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EntityHierarchyEditorGame.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EntityHierarchyEditorGame.cs
index 72b9f91a13..cc18a8cd07 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EntityHierarchyEditorGame.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/EntityHierarchyEditorGame.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Collections.Generic;
@@ -47,12 +47,18 @@ public abstract class EntityHierarchyEditorGame : EditorServiceGame
         private readonly Vector3 upAxis = Vector3.UnitY;
         private Material fallbackColorMaterial;
         private Material fallbackTextureMaterial;
+        private bool skipPostProcessing = false;
 
-        protected EntityHierarchyEditorGame(TaskCompletionSource<bool> gameContentLoadedTaskSource, IEffectCompiler effectCompiler, string effectLogPath)
+        protected EntityHierarchyEditorGame(TaskCompletionSource<bool> gameContentLoadedTaskSource, IEffectCompiler effectCompiler, string effectLogPath, bool skipPostProcessing = false)
         {
             this.gameContentLoadedTaskSource = gameContentLoadedTaskSource;
             this.effectCompiler = effectCompiler;
             this.effectLogPath = effectLogPath;
+            this.TreatNotFocusedLikeMinimized = false;
+            this.GraphicsDeviceManager.SynchronizeWithVerticalRetrace = true;
+            this.WindowMinimumUpdateRate.MinimumElapsedTime = TimeSpan.Zero;
+            this.MinimizedMinimumUpdateRate.MinimumElapsedTime = TimeSpan.FromSeconds(1.0);
+            this.skipPostProcessing = skipPostProcessing;
             CreateScenePipeline();
         }
 
@@ -254,7 +260,7 @@ protected override void Initialize()
             }
 
             //init physics system
-            var physicsSystem = new Bullet2PhysicsSystem(Services);
+            var physicsSystem = new PhysicsSystem(Services);
             Services.AddService<IPhysicsSystem>(physicsSystem);
             GameSystems.Add(physicsSystem);
         }
@@ -311,7 +317,7 @@ protected override async Task LoadContent()
             }
 
             // TODO: Maybe define this scene default graphics compositor as an asset?
-            var defaultGraphicsCompositor = GraphicsCompositorHelper.CreateDefault(true, EditorGraphicsCompositorHelper.EditorForwardShadingEffect);
+            var defaultGraphicsCompositor = GraphicsCompositorHelper.CreateDefault(!skipPostProcessing, EditorGraphicsCompositorHelper.EditorForwardShadingEffect);
 
             // Add UI (engine doesn't depend on it)
             defaultGraphicsCompositor.RenderFeatures.Add(new UIRenderFeature
@@ -362,7 +368,7 @@ private void CreateScenePipeline()
             GameSystems.Add(EditorSceneSystem);
 
             EditorSceneSystem.DrawOrder = SceneSystem.DrawOrder + 1;
-            EditorSceneSystem.GraphicsCompositor = GraphicsCompositorHelper.CreateDefault(true, EditorGraphicsCompositorHelper.EditorForwardShadingEffect, groupMask: GizmoBase.DefaultGroupMask);
+            EditorSceneSystem.GraphicsCompositor = GraphicsCompositorHelper.CreateDefault(!skipPostProcessing, EditorGraphicsCompositorHelper.EditorForwardShadingEffect, groupMask: GizmoBase.DefaultGroupMask);
 
             // Do a few adjustments to the default compositor
             EditorSceneSystem.GraphicsCompositor.RenderFeatures.OfType<MeshRenderFeature>().FirstOrDefault()?.RenderFeatures.Add(new WireframeRenderFeature());
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/NavigationMeshManager.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/NavigationMeshManager.cs
index 249f8f9b76..4804688d63 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/NavigationMeshManager.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Game/NavigationMeshManager.cs
@@ -20,7 +20,7 @@ namespace Xenko.Assets.Presentation.AssetEditors.EntityHierarchyEditor.Game
     /// When a registed navigation mesh is reloaded, <see cref="Changed"/> will get called
     /// </summary>
     [DataContract]
-    public class NavigationMeshManager : IAsyncDisposable
+    public class NavigationMeshManager : Core.IAsyncDisposable
     {
         [DataMember]
         public readonly Dictionary<AssetId, NavigationMesh> Meshes = new Dictionary<AssetId, NavigationMesh>();
@@ -42,7 +42,7 @@ public async Task DisposeAsync()
         {
             foreach (var pair in Meshes)
             {
-                await loader.Manager.ClearContentReference(referencerId, pair.Key, meshesNode, new Index(pair.Key));
+                await loader.Manager.ClearContentReference(referencerId, pair.Key, meshesNode, new NodeIndex(pair.Key));
             }
             await loader.Manager.RemoveReferencer(referencerId);
         }
@@ -64,7 +64,7 @@ public Task AddUnique(AssetId assetId)
                 return Task.CompletedTask;
 
             Meshes.Add(assetId, new NavigationMesh());
-            return loader.Manager.PushContentReference(referencerId, assetId, meshesNode, new Index(assetId));
+            return loader.Manager.PushContentReference(referencerId, assetId, meshesNode, new NodeIndex(assetId));
         }
 
         /// <summary>
@@ -77,7 +77,7 @@ public Task Remove(AssetId assetId)
                 throw new InvalidOperationException();
 
             Meshes.Remove(assetId);
-            return loader.Manager.ClearContentReference(referencerId, assetId, meshesNode, new Index(assetId));
+            return loader.Manager.ClearContentReference(referencerId, assetId, meshesNode, new NodeIndex(assetId));
         }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EditorNavigationViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EditorNavigationViewModel.cs
index 48b813e74b..2eb959e7ae 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EditorNavigationViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EditorNavigationViewModel.cs
@@ -106,7 +106,7 @@ private void UpdateNavigationMeshLayers()
                 return;
 
             var asset = gameSettingsAsset.Asset as GameSettingsAsset;
-            var navigationSettings = asset.GetOrCreate<NavigationSettings>();
+            var navigationSettings = asset.GetOrDefault<NavigationSettings>();
 
             // Either use the initial visiblity state from the settings or from the previous visuals collection
             ILookup<Guid, bool> previousGroupActiveStates;
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyEditorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyEditorViewModel.cs
index 7842d196fd..0ae400e821 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyEditorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyEditorViewModel.cs
@@ -313,8 +313,7 @@ protected virtual void LoadSettings([NotNull] SceneSettingsData settings)
             Transform.LoadSettings(settings);
             EntityGizmos.LoadSettings(settings);
             DisplaySelectionMask = settings.SelectionMaskVisible;
-            Grid.IsVisible = settings.GridVisible;
-            Grid.Color = settings.GridColor;
+            Grid.LoadSettings(settings);
             Lighting.LightProbeWireframeVisible = settings.LightProbeWireframe;
             Lighting.LightProbeBounces = settings.LightProbeBounces;
             MaterialSelectionMode = false;
@@ -327,8 +326,7 @@ protected virtual void SaveSettings([NotNull] SceneSettingsData settings)
             Camera.SaveSettings(settings);
             Transform.SaveSettings(settings);
             settings.SelectionMaskVisible = DisplaySelectionMask;
-            settings.GridVisible = Grid.IsVisible;
-            settings.GridColor = Grid.Color;
+            Grid.SaveSettings(settings);
             settings.LightProbeWireframe = Lighting.LightProbeWireframeVisible;
             settings.LightProbeBounces = Lighting.LightProbeBounces;
             Navigation.SaveSettings(settings);
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementChangePropagator.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementChangePropagator.cs
index 7846bd7147..958ea1314b 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementChangePropagator.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementChangePropagator.cs
@@ -24,7 +24,7 @@ protected override async Task<bool> PropagatePartReference(IGraphNode gameSideNo
             var component = value as EntityComponent;
             // Don't propagate if we're updating the EntityComponentCollection (not a reference),
             // or if we're updating TransformComponent.Children (handled as a part addition/removal)
-            var nodeIndex = (e as ItemChangeEventArgs)?.Index ?? Index.Empty;
+            var nodeIndex = (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty;
             if (component != null && e.Node.Type != typeof(EntityComponentCollection) && !((EntityHierarchyPropertyGraph)Owner.Asset.PropertyGraph).IsChildPartReference(e.Node, nodeIndex))
             {
                 var index = component.Entity.Components.IndexOf(component);
@@ -46,7 +46,7 @@ protected override object CloneObjectForGameSide(object assetSideObject, IAssetN
             if (gameSideNode.Type == typeof(EntityComponentCollection) && assetSideObject is TransformComponent)
             {
                 // We never clone TransformComponent, we cannot replace them. Instead, return the existing one.
-                var transformComponent = (TransformComponent)gameSideNode.Retrieve(new Index(0));
+                var transformComponent = (TransformComponent)gameSideNode.Retrieve(new NodeIndex(0));
                 // We still reset the Entity to null to make sure it works nicely with reconcilation, etc.
                 transformComponent.Entity = null;
                 return transformComponent;
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementViewModel.cs
index da8855a928..ec150560ae 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyElementViewModel.cs
@@ -204,6 +204,6 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => ((IPropertyProviderViewModel)Asset).ShouldConstructMember(member);
 
         /// <inheritdoc/>
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => ((IPropertyProviderViewModel)Asset).ShouldConstructItem(collection, index);
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => ((IPropertyProviderViewModel)Asset).ShouldConstructItem(collection, index);
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyItemViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyItemViewModel.cs
index a61687682b..155de6c88b 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyItemViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityHierarchyItemViewModel.cs
@@ -558,12 +558,12 @@ protected virtual void MoveChildren([NotNull] IReadOnlyCollection<object> childr
                     .DepthFirst(x => x.Children).OfType<EntityViewModel>()
                     .SelectMany(e => e.Folders).DepthFirst(f => f.Folders)
                     .Where(f => !f.InnerSubEntities.Any())
-                    .Reverse().Select(f => KeyValuePair.Create(f.Owner.Id, Tuple.Create(f.Path, f.Asset))).ToList();
+                    .Reverse().Select(f => Core.KeyValuePair.Create(f.Owner.Id, Tuple.Create(f.Path, f.Asset))).ToList();
 
                 // Entities that are being directly moved with their folder path
                 var thisPath = (this as EntityFolderViewModel)?.Path ?? "";
                 // Note: cannot use a dictionary here since sibling entities would have the same path.
-                var entities = children.OfType<EntityViewModel>().Select(entity => KeyValuePair.Create(thisPath, entity)).ToList();
+                var entities = children.OfType<EntityViewModel>().Select(entity => Core.KeyValuePair.Create(thisPath, entity)).ToList();
 
                 // Move entities that are within folders being directly moved
                 foreach (var folder in children.OfType<EntityFolderViewModel>())
@@ -576,7 +576,7 @@ protected virtual void MoveChildren([NotNull] IReadOnlyCollection<object> childr
                         var detachedPath = e.EntityDesign.Folder.Substring(oldParentPath.Length);
                         // Prefix the new parent path
                         var newPath = EntityFolderViewModel.CombinePath(newParentPath, detachedPath);
-                        return KeyValuePair.Create(newPath, e);
+                        return Core.KeyValuePair.Create(newPath, e);
                     }));
                 }
 
@@ -634,7 +634,7 @@ protected virtual void MoveChildren([NotNull] IReadOnlyCollection<object> childr
                     node.Update(folderName);
                     // This is a bit hackish, but the entity should be currently disconnected from any asset (since we're going to add it), so we need to manually create an action item for the folder change.
                     // TODO: update the folder after insert, and subscribe to changes in EntityDesignData.Folder from EntityViewModel to propagate folder change at that level
-                    var actionItem = new ContentValueChangeOperation(node, ContentChangeType.ValueChange, Index.Empty, oldValue, folderName, Asset.Dirtiables);
+                    var actionItem = new ContentValueChangeOperation(node, ContentChangeType.ValueChange, NodeIndex.Empty, oldValue, folderName, Asset.Dirtiables);
                     Asset.ServiceProvider.Get<IUndoRedoService>().PushOperation(actionItem);
                     Asset.AssetHierarchyPropertyGraph.AddPartToAsset(hierarchy.Parts, movedEntity, (Owner as EntityViewModel)?.AssetSideEntity, index++);
                     moved = true;
@@ -657,7 +657,7 @@ protected virtual void MoveChildren([NotNull] IReadOnlyCollection<object> childr
                     visitor.Visit(asset.PropertyGraph.RootNode);
                     FixupObjectReferences.FixupReferences(asset.Asset, visitor.Result, referenceableObjects, true, (memberPath, _, value) =>
                     {
-                        var graphPath = GraphNodePath.From(asset.PropertyGraph.RootNode, memberPath, out Index i);
+                        var graphPath = GraphNodePath.From(asset.PropertyGraph.RootNode, memberPath, out NodeIndex i);
                         var node = graphPath.GetNode();
                         if (node is IMemberNode memberNode)
                         {
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityViewModel.cs
index f8c4b9d9d6..2698e223bb 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/ViewModels/EntityViewModel.cs
@@ -149,7 +149,7 @@ public override GraphNodePath GetNodePath()
             path.PushTarget();
             path.PushMember(nameof(EntityHierarchy.Hierarchy.Parts));
             path.PushTarget();
-            path.PushIndex(new Index(Id.ObjectId));
+            path.PushIndex(new NodeIndex(Id.ObjectId));
             path.PushMember(nameof(EntityDesign.Entity));
             path.PushTarget();
             return path;
@@ -436,7 +436,7 @@ void IAddChildrenPropertiesProviderViewModel.AddChildren(IReadOnlyCollection<obj
                         }
                         else
                         {
-                            componentsNode.Update(component, new Index(replaceIndex));
+                            componentsNode.Update(component, new NodeIndex(replaceIndex));
                             Editor.UndoRedoService.SetName(transaction, $"Replace component {component.GetType().Name}");
                         }
                     }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
index 9d13b82278..77d984fb52 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityHierarchyEditorView.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:p="clr-namespace:Xenko.Assets.Presentation"
              xmlns:strings="clr-namespace:Xenko.Assets.Presentation.Resources.Strings"
              xmlns:viewModel="clr-namespace:Xenko.Assets.Presentation.ViewModel"
@@ -468,6 +468,30 @@
         <Border Background="{StaticResource BackgroundBrush}" DockPanel.Dock="Top" Padding="8,2">
           <DockPanel>
             <WrapPanel HorizontalAlignment="Right" DockPanel.Dock="Right">
+              <!-- Grid -->
+              <ToggleButton x:Name="ToggleGrid" Content="{xk:Image {StaticResource ImageGrid}, 16, 16, NearestNeighbor}"
+                            ToolTip="{xk:Localize Viewport grid settings..., Context=ToolTip}" xk:ToolTipHelper.Status="{Binding Session.Editor.Status}" ToolTipService.ShowOnDisabled="True"
+                            Width="28" Height="28" Background="Transparent" >
+              </ToggleButton>
+              <Popup IsOpen="{Binding ElementName=ToggleGrid, Path=IsChecked}" StaysOpen="False" PlacementTarget="{Binding ElementName=ToggleGrid}">
+                <Grid Background="{StaticResource BackgroundBrush}" MinWidth="130" MinHeight="100">
+                  <StackPanel>
+                    <CheckBox Content="Show Grid" Margin="8" IsChecked="{Binding Grid.IsVisible}"/>
+                    <Border Padding="8,2" Background="{StaticResource NormalBrush}" HorizontalAlignment="Stretch">
+                      <TextBlock Text="{xk:Localize Grid axis}" FontWeight="Bold"/>
+                    </Border>
+                    <DockPanel Margin="8">
+                      <RadioButton Content="{xk:Localize X, Context=Button}" IsChecked="{Binding Grid.AxisIndex, Converter={xk:IntToBool}, ConverterParameter=0}" Margin="4"/>
+                      <RadioButton Content="{xk:Localize Y, Context=Button}" IsChecked="{Binding Grid.AxisIndex, Converter={xk:IntToBool}, ConverterParameter=1}" Margin="4"/>
+                      <RadioButton Content="{xk:Localize Z, Context=Button}" IsChecked="{Binding Grid.AxisIndex, Converter={xk:IntToBool}, ConverterParameter=2}" Margin="4"/>
+                    </DockPanel>
+                    <Border Padding="8,2" Background="{StaticResource NormalBrush}" HorizontalAlignment="Stretch">
+                      <TextBlock Text="{xk:Localize Grid opacity}" FontWeight="Bold"/>
+                    </Border>
+                    <xk:NumericTextBox Value="{Binding Grid.Alpha}" SmallChange="0.1"  Minimum="0" Maximum="1" DecimalPlaces="3" Margin="8"/>
+                  </StackPanel>
+                </Grid>
+              </Popup>
               <!-- Lighting -->
               <ToggleButton x:Name="ToggleLighting" Content="{xk:Image {StaticResource ImageLighting}, 16, 16, NearestNeighbor}"
                             ToolTip="{xk:Localize Light probes and cubemaps..., Context=ToolTip}" xk:ToolTipHelper.Status="{Binding Session.Editor.Status}" ToolTipService.ShowOnDisabled="True"
@@ -585,8 +609,6 @@
                               Maximum="{Binding Length, Source={x:Static xk:Utils.ZoomFactors}, Converter={xk:SumNum}, ConverterParameter=-1}"
                               Value="{Binding EntityGizmos.GizmoSize, Converter={xk:ItemToIndex}, ConverterParameter={x:Static xk:Utils.ZoomFactors}}"/>
                       <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
-                        <CheckBox Content="Grid" Margin="5" IsChecked="{Binding Grid.IsVisible}"/>
-                        <Separator Margin="5" Height="0" Width="5"/>
                         <CheckBox Content="{xk:Localize Camera preview, Context=Button}" Margin="5" IsChecked="{Binding DisplayCameraPreview}"/>
                         <CheckBox Content="{xk:Localize Light probe volumes, Context=Button}" Margin="5" IsChecked="{Binding Lighting.LightProbeWireframeVisible}"/>
                       </StackPanel>
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityPickerWindow.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityPickerWindow.xaml
index 766b096038..349efffe5b 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityPickerWindow.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/EntityHierarchyEditor/Views/EntityPickerWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:valueConverters="clr-namespace:Xenko.Assets.Presentation.ValueConverters"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:xk="http://schemas.xenko.com/xaml/presentation"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Game/EditorGameGridService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Game/EditorGameGridService.cs
index 295894f4ef..948e286e8e 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Game/EditorGameGridService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Game/EditorGameGridService.cs
@@ -27,6 +27,8 @@ public class EditorGameGridService<TGridGizmo> : EditorGameServiceBase, IEditorG
 
         public float Alpha { get; set; } = 0.35f;
 
+        public int AxisIndex { get; set; } = 1;
+
         public override IEnumerable<Type> Dependencies { get { yield return typeof(IEditorGameCameraService); } }
 
         protected override Task<bool> Initialize(EditorServiceGame editorGame)
@@ -61,7 +63,7 @@ private async Task UpdateGrid()
             while (!IsDisposed)
             {
                 grid.IsEnabled = IsActive;
-                grid.Update(Color, game.EditorServices.Get<IEditorGameCameraService>().SceneUnit);
+                grid.Update(Color, Alpha, AxisIndex, game.EditorServices.Get<IEditorGameCameraService>().SceneUnit);
                 await game.Script.NextFrame();
             }
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Services/IEditorGameGridViewModelService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Services/IEditorGameGridViewModelService.cs
index 139fd8193e..6d0e4de152 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Services/IEditorGameGridViewModelService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/Services/IEditorGameGridViewModelService.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Assets.Presentation.SceneEditor;
 using Xenko.Core.Mathematics;
 using Xenko.Editor.EditorGame.ViewModels;
 
@@ -24,5 +25,10 @@ public interface IEditorGameGridViewModelService : IEditorGameViewModelService
         /// Gets or sets the alpha level of the grid.
         /// </summary>
         float Alpha { get; set; }
+
+        /// <summary>
+        /// Gets or sets the axis of the grid.
+        /// </summary>
+        int AxisIndex { get; set; }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/ContentReferenceCollector.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/ContentReferenceCollector.cs
index b60d3a7710..277ab4a723 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/ContentReferenceCollector.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/ContentReferenceCollector.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Collections.Generic;
 using Xenko.Core.Assets;
@@ -17,9 +17,9 @@ public struct ContentReferenceAccessor
         {
             public readonly AssetId ContentId;
             public readonly IGraphNode Node;
-            public readonly Index Index;
+            public readonly NodeIndex Index;
 
-            public ContentReferenceAccessor(AssetId contentId, IGraphNode node, Index index)
+            public ContentReferenceAccessor(AssetId contentId, IGraphNode node, NodeIndex index)
             {
                 ContentId = contentId;
                 Node = node;
@@ -41,9 +41,9 @@ public void Reset()
             ContentReferences.Clear();
         }
 
-        public void Visit([NotNull] IAssetNode node, Index index)
+        public void Visit([NotNull] IAssetNode node, NodeIndex index)
         {
-            if (index == Index.Empty)
+            if (index == NodeIndex.Empty)
             {
                 // Normal case, no index
                 Visit(node);
@@ -79,11 +79,11 @@ protected override void VisitNode(IGraphNode node)
                     if (AssetRegistry.IsContentType(memberContent.Type))
                     {
                         var id = AttachedReferenceManager.GetAttachedReference(memberContent.Retrieve())?.Id ?? AssetId.Empty;
-                        CollectContentReference(id, gameContent, Index.Empty);
+                        CollectContentReference(id, gameContent, NodeIndex.Empty);
                     }
                 }
                 var objectNode = node as IObjectNode;
-                if (objectNode != null)
+                if (objectNode != null && objectNode.Indices != null)
                 {
                     if (AssetRegistry.IsContentType(objectNode.Descriptor.GetInnerCollectionType()))
                     {
@@ -98,7 +98,7 @@ protected override void VisitNode(IGraphNode node)
             base.VisitNode(node);
         }
 
-        protected virtual void CollectContentReference(AssetId contentId, IGraphNode content, Index index)
+        protected virtual void CollectContentReference(AssetId contentId, IGraphNode content, NodeIndex index)
         {
             if (contentId == AssetId.Empty)
                 return;
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/EditorGridViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/EditorGridViewModel.cs
index 73f1c9a45c..5bfb71fffe 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/EditorGridViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/EditorGridViewModel.cs
@@ -6,6 +6,7 @@
 using Xenko.Core.Presentation.Commands;
 using Xenko.Core.Presentation.ViewModel;
 using Xenko.Assets.Presentation.AssetEditors.GameEditor.Services;
+using Xenko.Assets.Presentation.SceneEditor;
 
 namespace Xenko.Assets.Presentation.AssetEditors.GameEditor.ViewModels
 {
@@ -44,11 +45,32 @@ public EditorGridViewModel([NotNull] IViewModelServiceProvider serviceProvider,
         /// </summary>
         public float Alpha { get { return Service.Alpha; } set { SetValue(Math.Abs(Alpha - value) > MathUtil.ZeroTolerance, () => Service.Alpha = value); } }
 
+        /// <summary>
+        /// Gets or sets the axis of the grid.
+        /// </summary>
+        public int AxisIndex { get { return Service.AxisIndex; } set { SetValue(AxisIndex != value, () => Service.AxisIndex = value); } }
+
         /// <summary>
         /// Gets a command that will toggle the visibility of the grid.
         /// </summary>
         public ICommandBase ToggleCommand { get; }
 
         private IEditorGameGridViewModelService Service => controller.GetService<IEditorGameGridViewModelService>();
+
+        public void LoadSettings([NotNull] SceneSettingsData sceneSettings)
+        {
+            IsVisible = sceneSettings.GridVisible;
+            Color = sceneSettings.GridColor;
+            Alpha = sceneSettings.GridOpacity;
+            AxisIndex = sceneSettings.GridAxisIndex;
+        }
+
+        public void SaveSettings([NotNull] SceneSettingsData sceneSettings)
+        {
+            sceneSettings.GridVisible = IsVisible;
+            sceneSettings.GridColor = Color;
+            sceneSettings.GridOpacity = Alpha;
+            sceneSettings.GridAxisIndex = AxisIndex;
+        }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/GameEditorChangePropagator.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/GameEditorChangePropagator.cs
index 4bd19a2948..84f6aabf60 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/GameEditorChangePropagator.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GameEditor/ViewModels/GameEditorChangePropagator.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Threading.Tasks;
@@ -13,6 +13,7 @@
 using Xenko.Assets.Presentation.AssetEditors.AssetCompositeGameEditor.ViewModels;
 using Xenko.Assets.Presentation.AssetEditors.GameEditor.Services;
 using Xenko.Particles.Materials;
+using Xenko.Core.Reflection;
 
 namespace Xenko.Assets.Presentation.AssetEditors.GameEditor.ViewModels
 {
@@ -96,7 +97,7 @@ private void AssetSideNodeChanged(object sender, INodeChangeEventArgs e)
         protected virtual async Task<bool> PropagatePartReference(IGraphNode gameSideNode, object value, INodeChangeEventArgs e)
         {
             // If the change is an addition or removal of a part in the asset, it shouldn't be handled by the propagator.
-            var index = (e as ItemChangeEventArgs)?.Index ?? Index.Empty;
+            var index = (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty;
             if (((AssetCompositeHierarchyPropertyGraph<TAssetPartDesign, TAssetPart>)Owner.Asset.PropertyGraph).IsChildPartReference(e.Node, index))
             {
                 // But we should still return that the change correspond to a part reference.
@@ -164,7 +165,7 @@ await Editor.Controller.InvokeTask(async () =>
                 if (gameSideNode == null)
                     throw new InvalidOperationException("Unable to retrieve the game-side node");
 
-                var index = (e as ItemChangeEventArgs)?.Index ?? Index.Empty;
+                var index = (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty;
                 if (!AssetRegistry.IsContentType(e.Node.Descriptor.GetInnerCollectionType()))
                 {
                     if (e.Node.Type.IsValueType)
@@ -175,6 +176,11 @@ await Editor.Controller.InvokeTask(async () =>
                     else
                     {
                         var value = RetrieveValue(assetNode, e.NewValue, e.ChangeType, index);
+
+                        if (value == null && assetNode.Descriptor.Category == DescriptorCategory.Set)
+                        {
+                            value = e.NewValue;
+                        }
                         var isReference = await PropagatePartReference(gameSideNode, value, e);
                         if (!isReference)
                         {
@@ -228,7 +234,7 @@ await Editor.Controller.InvokeTask(() =>
             });
         }
 
-        private static object RetrieveValue(IGraphNode node, object value, ContentChangeType changeType, Index index)
+        private static object RetrieveValue(IGraphNode node, object value, ContentChangeType changeType, NodeIndex index)
         {
             switch (changeType)
             {
@@ -244,7 +250,7 @@ private static object RetrieveValue(IGraphNode node, object value, ContentChange
             }
         }
 
-        protected static void UpdateGameSideContent(IGraphNode gameSideNode, object value, ContentChangeType changeType, Index index)
+        protected static void UpdateGameSideContent(IGraphNode gameSideNode, object value, ContentChangeType changeType, NodeIndex index)
         {
             switch (changeType)
             {
@@ -266,7 +272,7 @@ protected static void UpdateGameSideContent(IGraphNode gameSideNode, object valu
             }
         }
 
-        private async Task UpdateGameSideReference([NotNull] AssetCompositeEditorViewModel editor, [NotNull] IGraphNode gameSideNode, ContentChangeType changeType, object oldValue, object newValue, Index index)
+        private async Task UpdateGameSideReference([NotNull] AssetCompositeEditorViewModel editor, [NotNull] IGraphNode gameSideNode, ContentChangeType changeType, object oldValue, object newValue, NodeIndex index)
         {
             if (editor == null) throw new ArgumentNullException(nameof(editor));
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/AudioEmitterGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/AudioEmitterGizmo.cs
deleted file mode 100644
index cbdc08ec32..0000000000
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/AudioEmitterGizmo.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Engine;
-
-namespace Xenko.Assets.Presentation.AssetEditors.Gizmos
-{
-    [GizmoComponent(typeof(AudioEmitterComponent), true)]
-    public class AudioEmitterGizmo : BillboardingGizmo<AudioEmitterComponent>
-    {
-        public AudioEmitterGizmo(EntityComponent component)
-            : base(component, "AudioEmitter", GizmoResources.AudioEmitterGizmo)
-        {
-        }
-    }
-}
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/CameraOrientationGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/CameraOrientationGizmo.cs
index d2034a38d1..fc869667fb 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/CameraOrientationGizmo.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/CameraOrientationGizmo.cs
@@ -40,7 +40,7 @@ public class CameraOrientationGizmo : AxialGizmo
             new FaceData("Left", new Vector3(0, -MathUtil.PiOverTwo, 0)),
             new FaceData("Top", new Vector3(-MathUtil.PiOverTwo, 0, 0)),
             new FaceData("Bottom", new Vector3(MathUtil.PiOverTwo, 0, 0)),
-            new FaceData("Back", new Vector3(0, 0, 0)),
+            new FaceData("Back", Vector3.Zero),
             new FaceData("Front", new Vector3(0, MathUtil.Pi, 0))
         };
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GizmoResources.Designer.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GizmoResources.Designer.cs
index c6d3770100..a3c842804e 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GizmoResources.Designer.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GizmoResources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -70,16 +70,6 @@ internal static byte[] AmbientLightGizmo {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized resource of type System.Byte[].
-        /// </summary>
-        internal static byte[] AudioEmitterGizmo {
-            get {
-                object obj = ResourceManager.GetObject("AudioEmitterGizmo", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GridGizmoBase.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GridGizmoBase.cs
index 1d6091ca1e..3d89acd82e 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GridGizmoBase.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/GridGizmoBase.cs
@@ -33,14 +33,14 @@ protected GridGizmoBase()
         /// </summary>
         protected virtual int GridSize { get; } = 10;
 
-        public void Update(Color3 gridColor, float sceneUnit)
+        public void Update(Color3 gridColor, float alpha, int gridAxisIndex, float sceneUnit)
         {
             if (GraphicsDevice != null)
             {
                 gridColor = gridColor.ToColorSpace(GraphicsDevice.ColorSpace);
             }
 
-            UpdateBase(gridColor, sceneUnit);
+            UpdateBase(gridColor, alpha, gridAxisIndex, sceneUnit);
         }
 
         protected override Entity Create()
@@ -49,6 +49,6 @@ protected override Entity Create()
             return new Entity("Scene grid");
         }
 
-        protected abstract void UpdateBase(Color3 gridColor, float sceneUnit);
+        protected abstract void UpdateBase(Color3 gridColor, float alpha, int gridAxisIndex, float sceneUnit);
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/LightGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/LightGizmo.cs
index 4973aab749..3d7d23c241 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/LightGizmo.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/LightGizmo.cs
@@ -25,9 +25,9 @@ protected LightGizmo(EntityComponent component, string lightName, byte[] lightIm
         protected Color3 GetLightColor(GraphicsDevice graphicsDevice)
         {
             var component = LightComponent;
-            var colorLigth = component.Type as IColorLight;
+            var colorLight = component.Type as IColorLight;
 
-            return colorLigth?.ComputeColor(graphicsDevice.ColorSpace, 1f) ?? new Color3(); // don't want to include light intensity in gizmo color (post effects not applied on gizmos)
+            return colorLight?.ComputeColor(graphicsDevice.ColorSpace, 1f) ?? new Color3(); // don't want to include light intensity in gizmo color (post effects not applied on gizmos)
         }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ParticleSystemGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ParticleSystemGizmo.cs
index 3f1db36913..2e70f3bc71 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ParticleSystemGizmo.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ParticleSystemGizmo.cs
@@ -60,9 +60,9 @@ public override void Update()
                 return;
             }
 
-            var pos = new Vector3(0, 0, 0);
-            var rot = new Quaternion(0, 0, 0, 1);
-            var scl = new Vector3(1, 1, 1);
+            var pos = Vector3.Zero;
+            var rot = Quaternion.Identity;
+            var scl = Vector3.One;
             DebugDrawShape drawShape = DebugDrawShape.None;
 
             if (Component.ParticleSystem.TryGetDebugDrawShape(ref drawShape, ref pos, ref rot, ref scl))
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/PhysicsGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/PhysicsGizmo.cs
index 601f207288..cb444d15c8 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/PhysicsGizmo.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/PhysicsGizmo.cs
@@ -11,6 +11,7 @@
 using Xenko.Graphics;
 using Xenko.Physics;
 using Xenko.Rendering;
+using Xenko.Core.Assets;
 
 namespace Xenko.Assets.Presentation.AssetEditors.Gizmos
 {
@@ -53,7 +54,7 @@ public PhysicsElementInfo(PhysicsComponent component, SkeletonUpdater skeleton)
             {
                 shape = component.ColliderShape;
                 var rigidbodyComponent = component as RigidbodyComponent;
-                isKinematic = rigidbodyComponent != null && rigidbodyComponent.IsKinematic;
+                isKinematic = rigidbodyComponent != null && rigidbodyComponent.RigidBodyType == RigidBodyTypes.Kinematic;
                 colliderShapes = component.ColliderShapes != null ? CloneDescs(component.ColliderShapes) : null;
                 var componentBase = component as PhysicsSkinnedComponentBase;
                 boneName = componentBase?.NodeName;
@@ -76,7 +77,7 @@ public bool HasChanged(PhysicsComponent component, SkeletonUpdater skeletonUpdat
                 (colliderShapes != null && component.ColliderShapes == null) ||
                 DescsAreDifferent(colliderShapes, component.ColliderShapes) ||
                 component.ColliderShapeChanged ||
-                (rb != null && isKinematic != rb.IsKinematic) || 
+                (rb != null && isKinematic != (rb.RigidBodyType == RigidBodyTypes.Kinematic)) || 
                 skeleton != skeletonUpdater ||
                 boneIndex != newIndex ||
                 boneIndex == -1 && skeletonUpdater != null && !string.IsNullOrEmpty(boneName) || //force recreation if we have a skeleton?.. wrong name tho is also possible...
@@ -107,7 +108,7 @@ private static List<IInlineColliderShapeDesc> CloneDescs(IEnumerable<IInlineColl
                         }
                         else
                         {
-                            var cloned = desc.DeepClone();
+                            var cloned = AssetCloner.Clone(desc, AssetClonerFlags.KeepReferences);
                             res.Add(cloned);
                         }
                     }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/TransformationGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/TransformationGizmo.cs
index 73aa2e795a..f24b3b8963 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/TransformationGizmo.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/TransformationGizmo.cs
@@ -227,10 +227,18 @@ protected virtual void UpdateTransformation()
             float targetedScale = GetTargetedScale(cameraService);
 
             // Now scale the matrix so the gizmo always has the same on-screen size:
-            worldMatrix.Row1 *= targetedScale / worldMatrix.Row1.Length();    // Normalize the axes and scale them by "targetedScale".
-            worldMatrix.Row2 *= targetedScale / worldMatrix.Row2.Length();
-            worldMatrix.Row3 *= targetedScale / worldMatrix.Row3.Length();
-           
+            var worldMatrixRow1 = worldMatrix.Row1;
+            var worldMatrixRow2 = worldMatrix.Row2;
+            var worldMatrixRow3 = worldMatrix.Row3;
+
+            worldMatrixRow1 *= targetedScale / worldMatrixRow1.Length();    // Normalize the axes and scale them by "targetedScale".
+            worldMatrixRow2 *= targetedScale / worldMatrixRow2.Length();
+            worldMatrixRow3 *= targetedScale / worldMatrixRow3.Length();
+
+            worldMatrix.Row1 = worldMatrixRow1;
+            worldMatrix.Row2 = worldMatrixRow2;
+            worldMatrix.Row3 = worldMatrixRow3;
+
             GizmoRootEntity.Transform.UseTRS = false;
             GizmoRootEntity.Transform.LocalMatrix = worldMatrix;
             GizmoRootEntity.Transform.UpdateWorldMatrix();
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ViewportGridGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ViewportGridGizmo.cs
index 0b0aaf744e..0c52197648 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ViewportGridGizmo.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/ViewportGridGizmo.cs
@@ -20,7 +20,6 @@ namespace Xenko.Assets.Presentation.AssetEditors.Gizmos
     public class ViewportGridGizmo : GridGizmoBase
     {
         private const float MaximumViewAngle = 25f * MathUtil.Pi / 180f;
-        private static readonly Vector3 DefaultUpVector = Vector3.UnitY;
         private const float GridVerticalOffset = 0.0175f;
         private const int GridTextureTopSize = 256;
 
@@ -28,6 +27,10 @@ public class ViewportGridGizmo : GridGizmoBase
         private Entity grid;
         private Entity originAxis;
 
+        private readonly Color RedUniformColor = new Color(0xFC, 0x37, 0x37);
+        private readonly Color GreenUniformColor = new Color(0x32, 0xE3, 0x35);
+        private readonly Color BlueUniformColor = new Color(0x2F, 0x6A, 0xE1);
+
         private delegate Image ImageBuilder();
 
         /// <summary>
@@ -59,9 +62,9 @@ protected override Entity Create()
 
             // Create the grid origin
             originAxis = new Entity("The grid origin axes");
-            originAxes.Add(CreateOriginAxis(Color.Red, 0));
-            originAxes.Add(CreateOriginAxis(Color.Green, 1));
-            originAxes.Add(CreateOriginAxis(Color.Blue, 2));
+            originAxes.Add(CreateOriginAxis(RedUniformColor, 0));
+            originAxes.Add(CreateOriginAxis(GreenUniformColor, 1));
+            originAxes.Add(CreateOriginAxis(BlueUniformColor, 2));
             for (int i = 0; i < 3; i++)
                 originAxis.AddChild(originAxes[i]);
 
@@ -100,13 +103,32 @@ private Entity CreateOriginAxis(Color color, int axis)
             axisEntity.TransformValue.Scale = new Vector3(GridSize, 1f / GridBase, 1f / GridBase);
             if (axis != 0)
                 axisEntity.TransformValue.Rotation = Quaternion.RotationX(MathUtil.PiOverTwo) * Quaternion.RotationAxis(new Vector3 { [1 + (axis%2)] = 1f}, MathUtil.PiOverTwo);
-
             var axisEntityRoot = new Entity("Scene grid origin axis root");
             axisEntityRoot.AddChild(axisEntity);
 
             return axisEntityRoot;
         }
 
+        /// <summary>
+        /// Gets the default color associated to the provided axis index.
+        /// </summary>
+        /// <param name="axisIndex">The index of the axis</param>
+        /// <returns>The default color associated</returns>
+        protected Color3 GetAxisDefaultColor(int axisIndex)
+        {
+            switch (axisIndex)
+            {
+                case 0:
+                    return RedUniformColor.ToColor3();
+                case 1:
+                    return GreenUniformColor.ToColor3();
+                case 2:
+                    return BlueUniformColor.ToColor3();
+                default:
+                    throw new ArgumentOutOfRangeException("axisIndex");
+            }
+        }
+
         private Texture CreateTexture(ImageBuilder imageBuilder)
         {
             var gridImage = imageBuilder();
@@ -145,20 +167,20 @@ private Material CreateColoredTextureMaterial(Texture texture, float textureScal
             });
         }
 
-        protected override void UpdateBase(Color3 gridColor, float sceneUnit)
+        protected override void UpdateBase(Color3 gridColor, float alpha, int gridAxisIndex, float sceneUnit)
         {
             var cameraService = Game.EditorServices.Get<IEditorGameCameraService>();
             if (cameraService == null)
                 return;
 
             // update the grid color
-            GridMaterial.Passes[0].Parameters.Set(GridColorKey, Color4.PremultiplyAlpha(new Color4(gridColor, 0.35f)));
-            
+            GridMaterial.Passes[0].Parameters.Set(GridColorKey, Color4.PremultiplyAlpha(new Color4(gridColor, alpha)));
+
             // Determine the up vector depending on view matrix and projection mode
             // -> When orthographic, if we are looking along a coordinate axis, place the grid perpendicular to that axis.
-            // -> Fall back to the default plane otherwise.
-            var viewAxisIndex = 1;
-            var upVector = DefaultUpVector;
+            // -> Place the grid perpendicular to its default axis otherwise.
+            var viewAxisIndex = gridAxisIndex;
+            var upVector = new Vector3(0) { [gridAxisIndex] = 1 };
             var viewInvert = Matrix.Invert(cameraService.ViewMatrix);
             if (cameraService.IsOrthographic)
             {
@@ -192,15 +214,6 @@ protected override void UpdateBase(Color3 gridColor, float sceneUnit)
 
             // Move the grid origin in slightly in front the grid to have it in the foreground
             originPosition[viewAxisIndex] = snappedPosition[viewAxisIndex] + Math.Sign(viewInvert[3, viewAxisIndex]) * 0.001f * sceneUnit;
-
-            // In orthographic mode, put the grid and origin in the very background of scene
-            if (cameraService.IsOrthographic) 
-            {
-                var dotProduct = Vector3.Dot(viewInvert.Forward, upVector);
-                var cameraOffset = viewInvert.TranslationVector[viewAxisIndex];
-                originPosition[viewAxisIndex] = cameraOffset + Math.Sign(dotProduct) * cameraService.FarPlane * 0.90f;
-                snappedPosition[viewAxisIndex] = cameraOffset + Math.Sign(dotProduct) * cameraService.FarPlane * 0.95f;
-            }
             
             // Determine the intersection point of the center of the vieport with the grid plane
             var ray = EditorGameHelper.CalculateRayFromMousePosition(cameraService.Component, new Vector2(0.5f), viewInvert);
@@ -242,9 +255,16 @@ protected override void UpdateBase(Color3 gridColor, float sceneUnit)
             for (var axis = 0; axis < 3; axis++)
                 SetPlaneEntityRotation((axis + 2) % 3, upVector, originAxes[axis]);
 
-            // Hide the vertical axis of the origin 
+            // Update the color of the origin axes and hide the grid axis
             for (int axis = 0; axis < 3; axis++)
+            {
+                // Make the axes alpha higher than the grid alpha so they are visible
+                float axesAlpha = alpha * 4;
+                var color = Color4.PremultiplyAlpha(new Color4(GetAxisDefaultColor(axis), axesAlpha));
+                originAxes[axis].GetChild(0).Get<ModelComponent>().GetMaterial(0).Passes[0].Parameters.Set(GridColorKey, color);
+              
                 originAxes[axis].GetChild(0).Get<ModelComponent>().Enabled = axis != viewAxisIndex;
+            }
         }
 
         private static void SetPlaneEntityRotation(int modelUpAxis, Vector3 upVector, Entity entity)
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/VoxelVolumeGizmo.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/VoxelVolumeGizmo.cs
new file mode 100644
index 0000000000..b8f5ab9c58
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/Gizmos/VoxelVolumeGizmo.cs
@@ -0,0 +1,150 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Graphics;
+using Xenko.Rendering;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Voxels;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Assets.Presentation.AssetEditors.Gizmos
+{
+    /// <summary>
+    /// A gizmo to display the bounding boxes for voxel volumes inside the editor as a gizmo. 
+    /// this gizmo uses volume scale as the extent of the bounding box and is not affected by rotation
+    /// </summary>
+    [GizmoComponent(typeof(VoxelVolumeComponent), false)]
+    public class VoxelVolumeGizmo : EntityGizmo<VoxelVolumeComponent>
+    {
+        private BoxMesh box;
+        private Material material;
+        private Entity debugRootEntity;
+        private Entity debugEntity;
+
+        public VoxelVolumeGizmo(EntityComponent component) : base(component)
+        {
+        }
+
+        protected override Entity Create()
+        {
+            debugRootEntity = new Entity($"Voxel volume of {Component.Entity.Name}");
+
+            material = GizmoUniformColorMaterial.Create(GraphicsDevice, Color.CornflowerBlue);
+
+            box = new BoxMesh(GraphicsDevice);
+            box.Build();
+
+            debugEntity = new Entity($"Voxel volume mesh of {Component.Entity.Name}")
+            {
+                new ModelComponent
+                {
+                    Model = new Model
+                    {
+                        material,
+                        new Mesh { Draw = box.MeshDraw },
+                    },
+                    RenderGroup = RenderGroup,
+                }
+            };
+
+            return debugRootEntity;
+        }
+
+        public override void Update()
+        {
+            if (ContentEntity == null || GizmoRootEntity == null)
+                return;
+
+            // calculate the world matrix of the gizmo so that it is positioned exactly as the corresponding scene entity
+            // except the scale that is re-adjusted to the gizmo desired size (gizmo are insert at scene root so LocalMatrix = WorldMatrix)
+            Vector3 scale;
+            Quaternion rotation;
+            Vector3 translation;
+            ContentEntity.Transform.WorldMatrix.Decompose(out scale, out rotation, out translation);
+
+            // Translation and Scale but no rotation on bounding boxes
+            GizmoRootEntity.Transform.Position = translation;
+            GizmoRootEntity.Transform.Scale = new Vector3(Component.VoxelVolumeSize * 0.5f);
+            GizmoRootEntity.Transform.UpdateWorldMatrix();
+        }
+
+        public override bool IsSelected
+        {
+            set
+            {
+                bool hasChanged = IsSelected != value;
+                base.IsSelected = value;
+
+                if (hasChanged)
+                {
+                    if (IsSelected)
+                        GizmoRootEntity.AddChild(debugEntity);
+                    else
+                        GizmoRootEntity.RemoveChild(debugEntity);
+                }
+            }
+        }
+
+        class BoxMesh
+        {
+            public MeshDraw MeshDraw;
+
+            private Buffer vertexBuffer;
+
+            private readonly GraphicsDevice graphicsDevice;
+
+            public BoxMesh(GraphicsDevice graphicsDevice)
+            {
+                this.graphicsDevice = graphicsDevice;
+            }
+
+            public void Build()
+            {
+                var indices = new int[12 * 2];
+                var vertices = new VertexPositionNormalTexture[8];
+
+                vertices[0] = new VertexPositionNormalTexture(new Vector3(-1, 1, -1), Vector3.UnitY, Vector2.Zero);
+                vertices[1] = new VertexPositionNormalTexture(new Vector3(-1, 1, 1), Vector3.UnitY, Vector2.Zero);
+                vertices[2] = new VertexPositionNormalTexture(new Vector3(1, 1, 1), Vector3.UnitY, Vector2.Zero);
+                vertices[3] = new VertexPositionNormalTexture(new Vector3(1, 1, -1), Vector3.UnitY, Vector2.Zero);
+
+                int indexOffset = 0;
+                // Top sides
+                for (int i = 0; i < 4; i++)
+                {
+                    indices[indexOffset++] = i;
+                    indices[indexOffset++] = (i + 1) % 4;
+                }
+
+                // Duplicate vertices and indices to bottom part
+                for (int i = 0; i < 4; i++)
+                {
+                    vertices[i + 4] = vertices[i];
+                    vertices[i + 4].Position.Y = -vertices[i + 4].Position.Y;
+
+                    indices[indexOffset++] = indices[i * 2] + 4;
+                    indices[indexOffset++] = indices[i * 2 + 1] + 4;
+                }
+
+                // Sides
+                for (int i = 0; i < 4; i++)
+                {
+                    indices[indexOffset++] = i;
+                    indices[indexOffset++] = i + 4;
+                }
+
+                vertexBuffer = Buffer.Vertex.New(graphicsDevice, vertices);
+                MeshDraw = new MeshDraw
+                {
+                    PrimitiveType = PrimitiveType.LineList,
+                    DrawCount = indices.Length,
+                    IndexBuffer = new IndexBufferBinding(Buffer.Index.New(graphicsDevice, indices), true, indices.Length),
+                    VertexBuffers = new[] { new VertexBufferBinding(vertexBuffer, VertexPositionNormalTexture.Layout, vertexBuffer.ElementCount) },
+                };
+            }
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorCameraSlotsViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorCameraSlotsViewModel.cs
index c546ddb9a8..48f7cfbd87 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorCameraSlotsViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorCameraSlotsViewModel.cs
@@ -51,7 +51,7 @@ protected override GraphNodePath GetNodePath()
             var path = new GraphNodePath(Editor.Session.AssetNodeContainer.GetNode(Editor.Asset.Asset));
             path.PushMember(nameof(GraphicsCompositorAsset.Cameras));
             path.PushTarget();
-            path.PushIndex(new Index(Editor.Asset.Asset.Cameras.IndexOf(CameraSlot)));
+            path.PushIndex(new NodeIndex(Editor.Asset.Asset.Cameras.IndexOf(CameraSlot)));
             return path;
         }
     }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorEditorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorEditorViewModel.cs
index 345f1ad623..99ca5e13f4 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorEditorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorEditorViewModel.cs
@@ -290,7 +290,7 @@ private void RemoveSelectedSharedRenderers()
                         continue;
 
                     // Remove
-                    var itemIndex = new Index(index);
+                    var itemIndex = new NodeIndex(index);
                     sharedRenderersNode.Remove(viewModel.GetSharedRenderer(), itemIndex);
                 }
 
@@ -328,7 +328,7 @@ private void RemoveSelectedRenderStages()
                     Asset.PropertyGraph.ClearReferencesToObjects(renderStage.Id.Yield());
 
                     // Remove
-                    var itemIndex = new Index(index);
+                    var itemIndex = new NodeIndex(index);
                     renderStagesNode.Remove(renderStage, itemIndex);
                 }
 
@@ -365,7 +365,7 @@ private void RemoveSelectedCameraSlots()
                     // Do not clear references to this object - camera slots in the scene asset should not change automatically!
 
                     // Remove
-                    var itemIndex = new Index(index);
+                    var itemIndex = new NodeIndex(index);
                     cameraSlotsNode.Remove(viewModel, itemIndex);
                 }
 
@@ -405,7 +405,7 @@ private void RemoveSelectedRenderFeatures()
                         continue;
 
                     // Remove
-                    var itemIndex = new Index(index);
+                    var itemIndex = new NodeIndex(index);
                     renderFeaturesNode.Remove(renderFeature, itemIndex);
                 }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorItemViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorItemViewModel.cs
index 118fe8e789..e0916a54d3 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorItemViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/GraphicsCompositorItemViewModel.cs
@@ -38,7 +38,7 @@ protected GraphicsCompositorItemViewModel([NotNull] GraphicsCompositorEditorView
         public virtual bool ShouldConstructMember(IMemberNode member) => ((IPropertyProviderViewModel)Editor.Asset).ShouldConstructMember(member);
 
         /// <inheritdoc/>
-        public bool ShouldConstructItem(IObjectNode collection, Index index) => ((IPropertyProviderViewModel)Editor.Asset).ShouldConstructItem(collection, index);
+        public bool ShouldConstructItem(IObjectNode collection, NodeIndex index) => ((IPropertyProviderViewModel)Editor.Asset).ShouldConstructItem(collection, index);
 
         #endregion
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderFeatureViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderFeatureViewModel.cs
index 6cf464feb1..a805b6c3f2 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderFeatureViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderFeatureViewModel.cs
@@ -35,7 +35,7 @@ protected override GraphNodePath GetNodePath()
             var path = new GraphNodePath(Editor.Session.AssetNodeContainer.GetNode(Editor.Asset.Asset));
             path.PushMember(nameof(GraphicsCompositorAsset.RenderFeatures));
             path.PushTarget();
-            path.PushIndex(new Index(Editor.Asset.Asset.RenderFeatures.IndexOf((RootRenderFeature)RenderFeature)));
+            path.PushIndex(new NodeIndex(Editor.Asset.Asset.RenderFeatures.IndexOf((RootRenderFeature)RenderFeature)));
             return path;
         }
     }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderStageViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderStageViewModel.cs
index a029e35d06..234653472c 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderStageViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/RenderStageViewModel.cs
@@ -41,7 +41,7 @@ protected override GraphNodePath GetNodePath()
             var path = new GraphNodePath(Editor.Session.AssetNodeContainer.GetNode(Editor.Asset.Asset));
             path.PushMember(nameof(GraphicsCompositorAsset.RenderStages));
             path.PushTarget();
-            path.PushIndex(new Index(Editor.Asset.Asset.RenderStages.IndexOf(RenderStage)));
+            path.PushIndex(new NodeIndex(Editor.Asset.Asset.RenderStages.IndexOf(RenderStage)));
             return path;
         }
     }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockBaseViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockBaseViewModel.cs
index 55388ef146..1ec76b3ebd 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockBaseViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockBaseViewModel.cs
@@ -69,7 +69,7 @@ public static Dictionary<SharedRendererReferenceKey, ISharedRenderer> GetExterna
 
             protected override void VisitMemberTarget(IMemberNode node)
             {
-                ProcessReferences(node, Index.Empty, node.Type);
+                ProcessReferences(node, NodeIndex.Empty, node.Type);
                 base.VisitMemberTarget(node);
             }
 
@@ -79,7 +79,7 @@ protected override void VisitItemTargets(IObjectNode node)
                 base.VisitItemTargets(node);
             }
 
-            private void ProcessReferences(IGraphNode node, Index index, Type type)
+            private void ProcessReferences(IGraphNode node, NodeIndex index, Type type)
             {
                 if (node == null)
                     return;
@@ -90,14 +90,14 @@ private void ProcessReferences(IGraphNode node, Index index, Type type)
                     if (!((node as IMemberNode)?.MemberDescriptor.HasSet ?? true))
                         return;
 
-                    var value = index == Index.Empty ? node.Retrieve() : node.Retrieve(index);
+                    var value = index == NodeIndex.Empty ? node.Retrieve() : node.Retrieve(index);
 
                     // Hide inlined renderers which don't have nodes
                     if ((value != null) && ((value as ISharedRenderer) == null))
                         return;
 
                     var path = CurrentPath.Clone();
-                    if (index != Index.Empty)
+                    if (index != NodeIndex.Empty)
                         path.PushIndex(index);
                     externalReferences.Add(new SharedRendererReferenceKey(path, node.Type), value as ISharedRenderer);
                 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockViewModel.cs
index 5dbbd720ca..1886dc2fe2 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererBlockViewModel.cs
@@ -42,7 +42,7 @@ protected override GraphNodePath GetNodePath()
             var path = new GraphNodePath(Editor.Session.AssetNodeContainer.GetNode(Editor.Asset.Asset));
             path.PushMember(nameof(GraphicsCompositorAsset.SharedRenderers));
             path.PushTarget();
-            path.PushIndex(new Index(Editor.Asset.Asset.SharedRenderers.IndexOf(sharedRenderer)));
+            path.PushIndex(new NodeIndex(Editor.Asset.Asset.SharedRenderers.IndexOf(sharedRenderer)));
             return path;
         }
     }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererOutputSlotViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererOutputSlotViewModel.cs
index 928aa82d50..866866d2e6 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererOutputSlotViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/ViewModels/SharedRendererOutputSlotViewModel.cs
@@ -16,7 +16,7 @@ public SharedRendererOutputSlotViewModel(GraphicsCompositorBlockViewModel block,
         {
             this.slotKey = slotKey;
             Accessor = slotKey.Path.GetAccessor();
-            if (Accessor.Index != Index.Empty)
+            if (Accessor.Index != NodeIndex.Empty)
             {
                 ((IObjectNode)Accessor.Node).ItemChanged += ItemChanged;
             }
@@ -34,7 +34,7 @@ public SharedRendererOutputSlotViewModel(GraphicsCompositorBlockViewModel block,
         public override void Destroy()
         {
             base.Destroy();
-            if (Accessor.Index != Index.Empty)
+            if (Accessor.Index != NodeIndex.Empty)
             {
                 ((IObjectNode)Accessor.Node).ItemChanged -= ItemChanged;
             }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml
index 61412f45b0..cbcf853d47 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/GraphicsCompositorEditor/Views/GraphicsCompositorEditorView.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:graphx="clr-namespace:GraphX.Controls;assembly=GraphX.WPF.Controls"
              xmlns:xk="http://schemas.xenko.com/xaml/presentation"
              xmlns:sskkgraph="http://schemas.xenko.com/xaml/presentation/graph"
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorGame.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorGame.cs
index 2688b9e0ef..dc8e7b8245 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorGame.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorGame.cs
@@ -14,8 +14,8 @@ namespace Xenko.Assets.Presentation.AssetEditors.PrefabEditor.Game
 {
     public sealed class PrefabEditorGame : EntityHierarchyEditorGame
     {
-        public PrefabEditorGame(TaskCompletionSource<bool> gameContentLoadedTaskSource, IEffectCompiler effectCompiler, string effectLogPath)
-            : base(gameContentLoadedTaskSource, effectCompiler, effectLogPath)
+        public PrefabEditorGame(TaskCompletionSource<bool> gameContentLoadedTaskSource, IEffectCompiler effectCompiler, string effectLogPath, bool skipPostProcessing = false)
+            : base(gameContentLoadedTaskSource, effectCompiler, effectLogPath, skipPostProcessing)
         {
         }
 
@@ -36,6 +36,12 @@ public void LoadEntities([ItemNotNull, NotNull]  IEnumerable<Entity> entities)
             EnsureContentScene();
 
             ContentScene.Entities.AddRange(entities);
+
+            foreach (Entity e in entities)
+            {
+                ModelComponent mc = e.Get<ModelComponent>();
+                if (mc != null) mc.ForceModelUpdateCount = int.MaxValue;
+            }
         }
 
         /// <summary>
@@ -48,6 +54,9 @@ public void LoadEntity([NotNull] Entity entity)
             EnsureContentScene();
 
             ContentScene.Entities.Add(entity);
+
+            ModelComponent mc = entity.Get<ModelComponent>();
+            if (mc != null) mc.ForceModelUpdateCount = int.MaxValue;
         }
 
         /// <summary>
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorLightService.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorLightService.cs
index 5b4dbf0ddb..9124956d17 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorLightService.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Game/PrefabEditorLightService.cs
@@ -19,10 +19,10 @@ public override void RegisterScene(Scene scene)
 
             CreateLight("Prefab Editor Ambient Light", new LightAmbient(), 0.3f, scene);
 
-            var directionalLight1 = CreateLight("Prefab Editor Ambient Light1", new LightDirectional(), 2.5f, scene);
+            var directionalLight1 = CreateLight("Prefab Editor Directional Light1", new LightDirectional(), 0.8f, scene);
             directionalLight1.Transform.Rotation = Quaternion.RotationYawPitchRoll(MathUtil.Pi * 1.125f, MathUtil.Pi * -0.125f, 0.0f);
 
-            var directionalLight2 = CreateLight("Prefab Editor Ambient Light2", new LightDirectional(), 2.5f, scene);
+            var directionalLight2 = CreateLight("Prefab Editor Directional Light2", new LightDirectional(), 0.8f, scene);
             directionalLight2.Transform.Rotation = Quaternion.RotationYawPitchRoll(MathUtil.Pi * 0.125f, MathUtil.Pi * -0.25f, 0.0f);
         }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Services/PrefabEditorController.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Services/PrefabEditorController.cs
index 58e52cec1d..432610e296 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Services/PrefabEditorController.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/PrefabEditor/Services/PrefabEditorController.cs
@@ -81,7 +81,7 @@ public override Task RemovePart([NotNull] EntityHierarchyElementViewModel parent
                         throw new InvalidOperationException($"The given {nameof(parent.Id)} does not correspond to any existing part.");
 
                     var i = parentEntity.Transform.Children.IndexOf(part.Transform);
-                    GameSideNodeContainer.GetNode(parentEntity.Transform.Children).Remove(part.Transform, new Index(i));
+                    GameSideNodeContainer.GetNode(parentEntity.Transform.Children).Remove(part.Transform, new NodeIndex(i));
                 }
             });
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ProjectWatcher.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ProjectWatcher.cs
index 2cc48407a8..c7e1e8fa1f 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ProjectWatcher.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ProjectWatcher.cs
@@ -305,6 +305,9 @@ private async Task TrackPackage(PackageViewModel package)
                     directoryWatcher.Track(loadedAssembly.Path);
 
                 // Track the project file
+                if (loadedAssembly.ProjectReference == null)
+                    continue;
+
                 directoryWatcher.Track(loadedAssembly.ProjectReference.Location);
 
                 var trackedAssembly = new TrackedAssembly { Package = package, LoadedAssembly = loadedAssembly };
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Game/SceneEditorGame.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Game/SceneEditorGame.cs
index 0959ffdd24..7d72ac59d2 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Game/SceneEditorGame.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Game/SceneEditorGame.cs
@@ -136,6 +136,12 @@ public void LoadEntities([ItemNotNull, NotNull]  IEnumerable<Entity> entities, G
 
             var scene = GetScene(sceneId);
             scene.Entities.AddRange(entities);
+
+            foreach (Entity e in entities)
+            {
+                ModelComponent mc = e.Get<ModelComponent>();
+                if (mc != null) mc.ForceModelUpdateCount = int.MaxValue;
+            }
         }
 
         /// <summary>
@@ -156,6 +162,9 @@ public void LoadEntity([NotNull] Entity entity, Guid sceneId)
 
             var scene = GetScene(sceneId);
             scene.Entities.Add(entity);
+
+            ModelComponent mc = entity.Get<ModelComponent>();
+            if (mc != null) mc.ForceModelUpdateCount = int.MaxValue;
         }
 
         /// <summary>
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Services/SceneEditorController.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Services/SceneEditorController.cs
index 5f009c7508..d9b9dc9148 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Services/SceneEditorController.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SceneEditor/Services/SceneEditorController.cs
@@ -90,7 +90,7 @@ public override Task RemovePart([NotNull] EntityHierarchyElementViewModel parent
                         throw new InvalidOperationException($"The given {nameof(parent.Id)} does not correspond to any existing part.");
 
                     var i = parentEntity.Transform.Children.IndexOf(part.Transform);
-                    GameSideNodeContainer.GetNode(parentEntity.Transform.Children).Remove(part.Transform, new Index(i));
+                    GameSideNodeContainer.GetNode(parentEntity.Transform.Children).Remove(part.Transform, new NodeIndex(i));
                 }
             });
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ClassificationHighlightColorsDark.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ClassificationHighlightColorsDark.cs
index 69aea1d190..398cb8440e 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ClassificationHighlightColorsDark.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ClassificationHighlightColorsDark.cs
@@ -1,7 +1,10 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Windows.Media;
 using ICSharpCode.AvalonEdit.Highlighting;
+using Microsoft.CodeAnalysis.Classification;
 using RoslynPad.Editor;
 
 namespace Xenko.Assets.Presentation.AssetEditors.ScriptEditor
@@ -17,13 +20,14 @@ class ClassificationHighlightColorsDark : ClassificationHighlightColors
 
         public ClassificationHighlightColorsDark()
         {
-            this.DefaultBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Color.FromRgb(220, 220, 220)) };
-            this.TypeBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Color.FromRgb(78, 201, 176)) };
+            this.DefaultBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(DefaultColor) };
+            this.TypeBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(TypeColor) };
             this.CommentBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Color.FromRgb(87, 166, 74)) };
             this.XmlCommentBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Color.FromRgb(87, 166, 74)) };
             this.KeywordBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(KeywordColor) };
             this.PreprocessorKeywordBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Color.FromRgb(155, 155, 155)) };
             this.StringBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(Color.FromRgb(214, 157, 133)) };
+            this.MethodBrush = new HighlightingColor { Foreground = new SimpleHighlightingBrush(TypeColor) };
         }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs
index b831a41ffe..5e5e8cba0b 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/RoslynHost.cs
@@ -13,12 +13,14 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Composition.Convention;
 using System.Composition.Hosting;
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Host.Mef;
 using RoslynPad.Editor;
 using RoslynPad.Roslyn;
@@ -49,6 +51,8 @@ public RoslynHost()
             workspace.EnableDiagnostics(DiagnosticOptions.Semantic | DiagnosticOptions.Syntax);
 
             GetService<IDiagnosticService>().DiagnosticsUpdated += OnDiagnosticsUpdated;
+
+            ParseOptions = CreateDefaultParseOptions();
         }
 
         private static CompositionHost CreateCompositionContext()
@@ -74,6 +78,15 @@ private static CompositionHost CreateCompositionContext()
                 .CreateContainer();
         }
 
+        internal static readonly ImmutableArray<string> PreprocessorSymbols =
+            ImmutableArray.CreateRange(new[] { "TRACE", "DEBUG" });
+
+        protected virtual ParseOptions CreateDefaultParseOptions()
+        {
+            return new CSharpParseOptions(kind: SourceCodeKind.Regular,
+                preprocessorSymbols: PreprocessorSymbols, languageVersion: LanguageVersion.Latest);
+        }
+
         /// <summary>
         /// The roslyn workspace.
         /// </summary>
@@ -84,6 +97,8 @@ private static CompositionHost CreateCompositionContext()
         /// </summary>
         public MefHostServices HostServices => hostServices;
 
+        public ParseOptions ParseOptions { get; }
+
         /// <summary>
         /// Gets a specific service.
         /// </summary>
@@ -120,5 +135,10 @@ public void CloseDocument(DocumentId documentId)
         {
             workspace.CloseDocument(documentId);
         }
+
+        public MetadataReference CreateMetadataReference(string location)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ScriptEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ScriptEditorView.xaml
index 0f6ab572fc..436e74674d 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ScriptEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/ScriptEditorView.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Xenko.Assets.Presentation.AssetEditors.ScriptEditor"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:xk="http://schemas.xenko.com/xaml/presentation"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300" FocusManager.FocusedElement="{Binding ElementName=CodeEditor}">
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
index 8886461bd0..686885523e 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptEditor/SimpleCodeTextEditor.cs
@@ -7,7 +7,6 @@
 using System.Windows.Media;
 using Microsoft.CodeAnalysis;
 using RoslynPad.Editor;
-using RoslynPad.Roslyn.AutomaticCompletion;
 using RoslynPad.Roslyn.BraceMatching;
 using RoslynPad.Roslyn.Diagnostics;
 using RoslynPad.Roslyn.QuickInfo;
@@ -31,7 +30,6 @@ public class SimpleCodeTextEditor : CodeTextEditor
 
         private BraceMatcherHighlightRenderer braceMatcherHighlighter;
         private IBraceMatchingService braceMatchingService;
-        private IBraceCompletionProvider braceCompletionProvider;
         private CancellationTokenSource braceMatchingCts;
 
         public static readonly StyledProperty<ImageSource> ContextActionsIconProperty = CommonProperty.Register<SimpleCodeTextEditor, ImageSource>(
@@ -70,7 +68,6 @@ public void BindSourceTextContainer(RoslynWorkspace workspace, AvalonEditTextCon
             TextArea.TextView.BackgroundRenderers.Add(textMarkerService);
             TextArea.TextView.LineTransformers.Add(textMarkerService);
             TextArea.Caret.PositionChanged += CaretOnPositionChanged;
-            TextArea.TextEntered += OnTextEntered;
 
             // Syntax highlighting
             var classificationHighlightColors = new ClassificationHighlightColorsDark();
@@ -92,7 +89,6 @@ public void BindSourceTextContainer(RoslynWorkspace workspace, AvalonEditTextCon
             // Brace matching
             braceMatcherHighlighter = new BraceMatcherHighlightRenderer(TextArea.TextView, classificationHighlightColors);
             braceMatchingService = workspace.Host.GetService<IBraceMatchingService>();
-            braceCompletionProvider = workspace.Host.GetService<IBraceCompletionProvider>();
             AsyncToolTipRequest = ProcessAsyncToolTipRequest;
         }
 
@@ -103,7 +99,6 @@ public void Unbind()
         {
             // Caret/brace matching
             TextArea.Caret.PositionChanged -= CaretOnPositionChanged;
-            TextArea.TextEntered -= OnTextEntered;
 
             // Syntax highlighting
             TextArea.TextView.LineTransformers.Remove(syntaxHighlightingColorizer);
@@ -242,14 +237,6 @@ private bool TryJumpToPosition(BraceMatchingResult? position, int caret)
             return false;
         }
 
-        private void OnTextEntered(object sender, TextCompositionEventArgs e)
-        {
-            if (e.Text.Length == 1)
-            {
-                braceCompletionProvider.TryComplete(workspace.Host.GetDocument(documentId), CaretOffset);
-            }
-        }
-
         private static Color GetDiagnosticsColor(DiagnosticData diagnosticData)
         {
             switch (diagnosticData.Severity)
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptSourceCodeResolver.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptSourceCodeResolver.cs
index a54b7c0ee3..3364f4825f 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptSourceCodeResolver.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/ScriptSourceCodeResolver.cs
@@ -91,7 +91,7 @@ public async Task AnalyzeProject(SessionViewModel session, Project project, Canc
                 return;
             }
 
-            var types = assembly.GetTypes();
+            var types = assembly.GetExportedTypes();
 
             var typesDict = new Dictionary<string, List<Type>>();
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteInfoViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteInfoViewModel.cs
index 37b8624ed9..5f104734a0 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteInfoViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteInfoViewModel.cs
@@ -306,13 +306,13 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
         {
             var path = new GraphNodePath(Editor.Session.AssetNodeContainer.GetNode(Editor.Asset.Asset));
             path.PushMember(nameof(SpriteSheetAsset.Sprites));
-            path.PushIndex(new Index(Index));
+            path.PushIndex(new NodeIndex(Index));
             path.PushTarget();
             return path;
         }
 
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => ((IPropertyProviderViewModel)Editor.Asset).ShouldConstructMember(member);
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => ((IPropertyProviderViewModel)Editor.Asset).ShouldConstructItem(collection, index);
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => ((IPropertyProviderViewModel)Editor.Asset).ShouldConstructItem(collection, index);
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteSheetEditorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteSheetEditorViewModel.cs
index 6b2f028259..4c77da9a57 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteSheetEditorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/ViewModels/SpriteSheetEditorViewModel.cs
@@ -238,12 +238,12 @@ internal void ImportFiles(IEnumerable<UFile> children, int index = -1)
 
         internal void InsertImage(SpriteInfo spriteinfo, int index)
         {
-            spritesNode.Add(spriteinfo, new Index(index));
+            spritesNode.Add(spriteinfo, new NodeIndex(index));
         }
 
         internal void RemoveImage(SpriteInfo spriteInfo, int imageIndex)
         {
-            spritesNode.Remove(spriteInfo, new Index(imageIndex));
+            spritesNode.Remove(spriteInfo, new NodeIndex(imageIndex));
         }
 
         /// <inheritdoc />
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/Views/SpriteEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/Views/SpriteEditorView.xaml
index 39d5252dbe..675619dbb5 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/Views/SpriteEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/SpriteEditor/Views/SpriteEditorView.xaml
@@ -5,7 +5,7 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:vm="clr-namespace:Xenko.Assets.Presentation.ViewModel"
        xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-       xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+       xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
        xmlns:behaviors="clr-namespace:Xenko.Assets.Presentation.View.Behaviors"
        xmlns:valueConverters="clr-namespace:Xenko.Assets.Presentation.ValueConverters"
        xmlns:sprite="clr-namespace:Xenko.Assets.Sprite;assembly=Xenko.Assets"
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Game/UIEditorGameAdornerService.Events.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Game/UIEditorGameAdornerService.Events.cs
index edf4980b8c..163c463540 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Game/UIEditorGameAdornerService.Events.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Game/UIEditorGameAdornerService.Events.cs
@@ -13,6 +13,9 @@
 using Xenko.Input;
 using Xenko.Rendering.UI;
 using Xenko.UI;
+using Xenko.Assets.Presentation.AssetEditors.UIEditor.ViewModels;
+using Xenko.Core;
+using Xenko.UI.Controls;
 
 namespace Xenko.Assets.Presentation.AssetEditors.UIEditor.Game
 {
@@ -159,7 +162,7 @@ private void TouchMove(object sender, TouchEventArgs e)
                     }
                     // calculate delta
                     var delta = position - currentPosition;
-                    const float magnetDistance = 10; // FIXME: expose this value in settings
+                    float magnetDistance = Game.Input.IsKeyDown(Keys.LeftShift) || Game.Input.IsKeyDown(Keys.RightShift) ? 0 : 10;
                     if (delta.LengthSquared() > float.Epsilon)
                     {
                         var resolution = Controller.GetEntityByName(UIEditorController.UIEntityName).Get<UIComponent>().Resolution;
@@ -299,14 +302,50 @@ private static IAdornerBase<UIElement> GetAssociatedAdorner(UIElement visual)
 
         private bool TryGetElementIdAtPosition(ref Vector3 worldPosition, out Guid elementId)
         {
-            var hitResults = GetAdornerVisualsAtPosition(ref worldPosition);
-            var visual = hitResults?.OrderBy(r => -r.IntersectionPoint.Z).FirstOrDefault()?.Element;
-            if (visual == null || !visual.DependencyProperties.TryGetValue(AssociatedElementIdPropertyKey, out elementId))
+            var hitResults = GetAdornerVisualsAtPosition(ref worldPosition) as List<UIRenderFeature.HitTestResult>;
+            float smallestArea = float.MaxValue;
+            elementId = default;
+            var uiComponent = Controller.GetEntityByName(UIEditorController.AdornerEntityName).Get<UIComponent>();
+            for (int i=0; i<hitResults.Count; i++)
             {
-                elementId = Guid.Empty;
-                return false;
+                UIRenderFeature.HitTestResult hr = hitResults[i];
+                if (hr.Element.DependencyProperties.TryGetValue(AssociatedElementIdPropertyKey, out var thisElementId))
+                {
+                    var editor = Controller.Editor;
+                    var partId = new AbsoluteId(editor.Asset.Id, thisElementId);
+                    var element = editor.FindPartViewModel(partId);
+                    var uielement = (element as UIElementViewModel)?.AssetSideUIElement as UIElement;
+
+                    if (uielement?.IsVisibleInTree ?? false)
+                    {
+                        // make sure we get a size that isn't NaN
+                        float mysize;
+                        UIElement lookat = uielement;
+                        do {
+                            mysize = lookat.Width * lookat.Height;
+                            if (float.IsNaN(mysize) == false) break;
+                            if (uielement is TextBlock tb)
+                            {
+                                mysize = tb.CalculateTextSize().Area();
+                                break;
+                            }
+                            if (lookat.Parent == null)
+                            {
+                                mysize = uiComponent.Resolution.X * uiComponent.Resolution.Y;
+                                break;
+                            }
+                            lookat = lookat.Parent;
+                        } while (true);
+                        // ok, use this size info to select the smallest element
+                        if (mysize < smallestArea)
+                        {
+                            smallestArea = mysize;
+                            elementId = thisElementId;
+                        }
+                    }
+                }
             }
-            return true;
+            return smallestArea < float.MaxValue;
         }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Services/UIEditorController.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Services/UIEditorController.cs
index 9c5935e44e..5b86f7b4f6 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Services/UIEditorController.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Services/UIEditorController.cs
@@ -38,7 +38,7 @@ namespace Xenko.Assets.Presentation.AssetEditors.UIEditor.Services
     /// <seealso cref="UIEditorBaseViewModel"/>
     public abstract class UIEditorController : AssetCompositeHierarchyEditorController<PrefabEditorGame, UIElementDesign, UIElement, UIHierarchyItemViewModel>
     {
-        internal const float DesignDensity = 100.0f;
+        internal const float DesignDensity = 100f;
 
         internal const string AdornerEntityName = "AdornerEntity";
         internal const string AdornerRootElementName = "AdornerRoot";
@@ -75,24 +75,27 @@ private async void ResolutionChanged(object sender, MemberNodeChangeEventArgs e)
             resolution = Vector3.Max((Vector3)e.NewValue, Vector3.One);
             await InvokeAsync(() =>
             {
-                var size = resolution / DesignDensity;
-                var uiComponent = GetEntityByName(DesignAreaEntityName)?.Get<UIComponent>();
+                var entity = GetEntityByName(DesignAreaEntityName);
+                var scale = resolution / DesignDensity;
+                var uiComponent = entity?.Get<UIComponent>();
                 if (uiComponent != null)
                 {
+                    entity.Transform.Scale = scale;
                     uiComponent.Resolution = resolution;
-                    uiComponent.Size = size;
                 }
-                uiComponent = GetEntityByName(UIEntityName)?.Get<UIComponent>();
+                entity = GetEntityByName(UIEntityName);
+                uiComponent = entity?.Get<UIComponent>();
                 if (uiComponent != null)
                 {
+                    entity.Transform.Scale = scale;
                     uiComponent.Resolution = resolution;
-                    uiComponent.Size = size;
                 }
-                uiComponent = GetEntityByName(AdornerEntityName)?.Get<UIComponent>();
+                entity = GetEntityByName(AdornerEntityName);
+                uiComponent = entity?.Get<UIComponent>();
                 if (uiComponent != null)
                 {
-                    uiComponent.Resolution = resolution*2;
-                    uiComponent.Size = size*2;
+                    entity.Transform.Scale = scale * 2f;
+                    uiComponent.Resolution = resolution;
                 }
                 AdornerService.Refresh().Forget();
             });
@@ -118,7 +121,7 @@ public override async Task<bool> CreateScene()
             rootElements.ForEach(r => RootElements[r.Id] = r);
 
             var resolution = uiDesign.Resolution;
-            var size = resolution / DesignDensity;
+            var scale = resolution / DesignDensity;
             var rootEntity = new Entity(UIEntityName)
             {
                 new UIComponent
@@ -128,9 +131,9 @@ public override async Task<bool> CreateScene()
                     IsFullScreen = false,
                     Resolution = resolution,
                     ResolutionStretch = ResolutionStretch.FixedWidthFixedHeight,
-                    Size = size,
                 }
             };
+            rootEntity.Transform.Scale = scale;
             var designArea = new Entity(DesignAreaEntityName)
             {
                 new UIComponent
@@ -149,9 +152,9 @@ public override async Task<bool> CreateScene()
                     IsFullScreen = false,
                     Resolution = resolution,
                     ResolutionStretch = ResolutionStretch.FixedWidthFixedHeight,
-                    Size = size,
                 }
             };
+            designArea.Transform.Scale = scale;
             designArea.Transform.Position.Z = -10;
             var uiAdorners = new Entity(AdornerEntityName)
             {
@@ -168,11 +171,11 @@ public override async Task<bool> CreateScene()
                     },
                     IsBillboard = false,
                     IsFullScreen = false,
-                    Resolution = resolution*2,
+                    Resolution = resolution * 2f,
                     ResolutionStretch = ResolutionStretch.FixedWidthFixedHeight,
-                    Size = size*2,
                 }
             };
+            uiAdorners.Transform.Scale = scale * 2f;
             uiAdorners.Transform.Position.Z = 10;
 
             var entities = new[] { designArea, rootEntity, uiAdorners };
@@ -271,7 +274,7 @@ public override Task RemovePart([NotNull] UIHierarchyItemViewModel parent, UIEle
                     if (panel != null)
                     {
                         var i = panel.Children.IndexOf(part);
-                        GameSideNodeContainer.GetNode(panel.Children).Remove(part, new Index(i));
+                        GameSideNodeContainer.GetNode(panel.Children).Remove(part, new NodeIndex(i));
                     }
                     else if (contentControl != null)
                     {
@@ -399,7 +402,7 @@ public Vector3 GetMousePositionInUI()
 
             var uiEntity = GetEntityByName(AdornerEntityName);
             var uiComponent = uiEntity.Get<UIComponent>();
-            var worldMatrix = Matrix.Scaling(uiComponent.Size / uiComponent.Resolution) * uiEntity.Transform.WorldMatrix;
+            var worldMatrix = Matrix.Scaling(uiEntity.Transform.Scale / uiComponent.Resolution) * uiEntity.Transform.WorldMatrix;
             // Rotation of Pi along 0x to go from UI space to world space
             worldMatrix.Row2 = -worldMatrix.Row2;
             worldMatrix.Row3 = -worldMatrix.Row3;
@@ -415,7 +418,7 @@ public Vector3 GetMousePositionInUI()
         [NotNull]
         private static PrefabEditorGame CreateEditorGame(TaskCompletionSource<bool> gameContentLoadedTaskSource, IEffectCompiler effectCompiler, string effectLogPath)
         {
-            return new PrefabEditorGame(gameContentLoadedTaskSource, effectCompiler, effectLogPath);
+            return new PrefabEditorGame(gameContentLoadedTaskSource, effectCompiler, effectLogPath, true);
         }
 
         [CanBeNull]
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs
index c6952d3cf5..572b4400f5 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/PanelViewModel.cs
@@ -208,8 +208,8 @@ public void ChangeChildElementLayoutProperties([NotNull] UIElement child, PanelC
                     }
 
                     // FIXME: review if this is fine doing it that way or if we need to do it the same way as when moving elements around
-                    childrenNode.Remove(child, new Index(index));
-                    childrenNode.Add(child, new Index(newIndex));
+                    childrenNode.Remove(child, new NodeIndex(index));
+                    childrenNode.Add(child, new NodeIndex(newIndex));
                     Editor.UndoRedoService.SetName(transaction, $"Move {UIEditorBaseViewModel.GetDisplayName(child)}");
                 }
             }
@@ -540,7 +540,7 @@ private void CopySwapExchange([NotNull] PanelViewModel sourcePanel, [NotNull] UI
             CopyCommonProperties(Editor.NodeContainer, sourcePanel.AssetSidePanel, targetPanelElement);
 
             // Initialize the new hierarchy of elements that starts from the target and contains all the children
-            IEnumerable <UIElementViewModel> children = sourcePanel.Children.ToList();
+            IEnumerable<UIElementViewModel> children = sourcePanel.Children.ToList();
             var hierarchy = UIAssetPropertyGraph.CloneSubHierarchies(Asset.Session.AssetNodeContainer, Asset.Asset, children.Select(c => c.Id.ObjectId), SubHierarchyCloneFlags.None, out _);
             hierarchy.RootParts.Add(targetPanel.UIElement);
             hierarchy.Parts.Add(targetPanel);
@@ -631,7 +631,7 @@ private static void CopyCommonProperties([NotNull] INodeContainer nodeContainer,
             var sourceNode = nodeContainer.GetOrCreateNode(sourcePanel);
             var targetNode = nodeContainer.GetOrCreateNode(targetPanel);
 
-            foreach (var targetChild in targetNode.Members.Where(x => x.Name != nameof(Panel.Children) && x.Name != nameof(UIElement.Id)))
+            foreach (var targetChild in targetNode.Members.Where(x => x.Name != nameof(Panel.Children) && x.Name != nameof(UIElement.Id) && x.Name != nameof(UIElement.DependencyProperties)))
             {
                 var name = targetChild.Name;
                 var sourceChild = sourceNode.TryGetChild(name);
@@ -640,6 +640,9 @@ private static void CopyCommonProperties([NotNull] INodeContainer nodeContainer,
                     targetChild.Update(AssetCloner.Clone(sourceChild.Retrieve()));
                 }
             }
+
+            // Copy the dependency properties, eg. the source panel may be inside a grid and has set grid row/column
+            sourcePanel.DependencyProperties.CopyTo(targetPanel.DependencyProperties);
         }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/UIElementViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/UIElementViewModel.cs
index 6aa14c120a..7526609dfd 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/UIElementViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/ViewModels/UIElementViewModel.cs
@@ -170,7 +170,7 @@ public override GraphNodePath GetNodePath()
             node.PushTarget();
             node.PushMember(nameof(UIAsset.Hierarchy.Parts));
             node.PushTarget();
-            node.PushIndex(new Index(Id.ObjectId));
+            node.PushIndex(new NodeIndex(Id.ObjectId));
             node.PushMember(nameof(UIElementDesign.UIElement));
             node.PushTarget();
             return node;
@@ -248,13 +248,13 @@ protected override string GetDropLocationName()
         protected T GetDependencyPropertyValue<T>(UIElement element, PropertyKey<T> property)
         {
             var dependencyPropertiesNode = Editor.NodeContainer.GetOrCreateNode(element)[nameof(UIElement.DependencyProperties)];
-            return (T)dependencyPropertiesNode.Retrieve(new Index(property));
+            return (T)dependencyPropertiesNode.Retrieve(new NodeIndex(property));
         }
 
         protected bool RemoveDependencyProperty(UIElement element, PropertyKey property)
         {
             var dependencyPropertiesNode = Editor.NodeContainer.GetOrCreateNode(element)[nameof(UIElement.DependencyProperties)].Target;
-            var propertyIndex = new Index(property);
+            var propertyIndex = new NodeIndex(property);
             if (!dependencyPropertiesNode.Indices.Contains(propertyIndex))
                 return false;
 
@@ -266,7 +266,7 @@ protected bool RemoveDependencyProperty(UIElement element, PropertyKey property)
         protected void SetDependencyPropertyValue<T>(UIElement element, PropertyKey<T> property, T value)
         {
             var dependencyPropertiesNode = Editor.NodeContainer.GetOrCreateNode(element)[nameof(UIElement.DependencyProperties)].Target;
-            var propertyIndex = new Index(property);
+            var propertyIndex = new NodeIndex(property);
             if (!dependencyPropertiesNode.Indices.Contains(propertyIndex))
             {
                 // Note: update would probably work, but we want to remove the property when Undo
@@ -317,6 +317,6 @@ bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member)
             return assetPropertyProvider.ShouldConstructMember(member);
         }
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => ((IPropertyProviderViewModel)Asset).ShouldConstructItem(collection, index);
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => ((IPropertyProviderViewModel)Asset).ShouldConstructItem(collection, index);
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Views/UIEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Views/UIEditorView.xaml
index 39e2a3aa5c..4036d550c4 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Views/UIEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UIEditor/Views/UIEditorView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModel="clr-namespace:Xenko.Assets.Presentation.ViewModel"
              xmlns:uevm="clr-namespace:Xenko.Assets.Presentation.AssetEditors.UIEditor.ViewModels"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:cm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
              xmlns:panels="clr-namespace:Xenko.UI.Panels;assembly=Xenko.UI"
              xmlns:views="clr-namespace:Xenko.Assets.Presentation.AssetEditors.AssetCompositeGameEditor.Views"
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UILibraryEditor/ViewModels/UILibraryEditorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UILibraryEditor/ViewModels/UILibraryEditorViewModel.cs
index 677b8b174d..8fe9136e6a 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/UILibraryEditor/ViewModels/UILibraryEditorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/UILibraryEditor/ViewModels/UILibraryEditorViewModel.cs
@@ -19,6 +19,7 @@
 using Xenko.Assets.Presentation.AssetEditors.UILibraryEditor.Views;
 using Xenko.Assets.Presentation.ViewModel;
 using Xenko.Assets.UI;
+using System.Collections.Generic;
 
 namespace Xenko.Assets.Presentation.AssetEditors.UILibraryEditor.ViewModels
 {
@@ -74,6 +75,13 @@ protected override async Task<bool> InitializeEditor()
             UILibrary.Children.CollectionChanged += RootElementsCollectionChanged;
 
             ActiveRoot = UILibrary.Children.FirstOrDefault();
+
+            // repair public list, if needed (sometimes they get broken during copy/paste operations)
+            ClearPublicUIElements();
+            foreach (UIElementViewModel root in UILibrary.RootElements) {
+                UpdatePublicUIElementsEntry(root.Id.ObjectId, root.Name);
+            }
+
             return true;
         }
 
@@ -116,10 +124,15 @@ private void RootPropertyChanged(object sender, [NotNull] PropertyChangedEventAr
             }
         }
 
+        private void ClearPublicUIElements() {
+            var node = NodeContainer.GetNode((UILibraryAsset)Asset.Asset)[nameof(UILibraryAsset.PublicUIElements)].Target;
+            if (node is Xenko.Core.Assets.Quantum.IAssetObjectNode assetObjNode) assetObjNode.Clear();
+        }
+
         private void UpdatePublicUIElementsEntry(Guid rootId, [CanBeNull] string name)
         {
             var node = NodeContainer.GetNode((UILibraryAsset)Asset.Asset)[nameof(UILibraryAsset.PublicUIElements)].Target;
-            var index = new Index(rootId);
+            var index = new NodeIndex(rootId);
 
             using (var transaction = UndoRedoService.CreateTransaction())
             {
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/SinglePropertyProvider.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/SinglePropertyProvider.cs
index 31fda76048..052271e814 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/SinglePropertyProvider.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/SinglePropertyProvider.cs
@@ -27,6 +27,6 @@ public SinglePropertyProvider(IObjectNode rootNode)
         /// <inheritdoc/>
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/GraphTemplates.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/GraphTemplates.xaml
index 8d0c5524c5..6fdb89ff85 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/GraphTemplates.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/GraphTemplates.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
                     xmlns:tp="clr-namespace:Xenko.Assets.Presentation.TemplateProviders"
                     xmlns:scriptEditor="clr-namespace:Xenko.Assets.Presentation.AssetEditors.ScriptEditor">
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/VisualScriptEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/VisualScriptEditorView.xaml
index e8fccd3324..5a8d80f116 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/VisualScriptEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/Views/VisualScriptEditorView.xaml
@@ -6,7 +6,7 @@
              xmlns:local="clr-namespace:Xenko.Assets.Presentation.AssetEditors.VisualScriptEditor"
              xmlns:graphx="clr-namespace:GraphX.Controls;assembly=GraphX.WPF.Controls"
              xmlns:sskkgraph="http://schemas.xenko.com/xaml/presentation/graph"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:templateViews="clr-namespace:Xenko.Core.Assets.Editor.Components.TemplateDescriptions.Views;assembly=Xenko.Core.Assets.Editor"
              xmlns:converters="clr-namespace:Xenko.Assets.Presentation.AssetEditors.VisualScriptEditor.Converters"
              xmlns:graphX="http://schemas.panthernet.ru/graphx/"
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptBlockViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptBlockViewModel.cs
index b7b78b11c7..5ac6612ed8 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptBlockViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptBlockViewModel.cs
@@ -90,10 +90,10 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
             var path = new GraphNodePath(Method.Editor.Session.AssetNodeContainer.GetNode(asset));
             path.PushMember(nameof(VisualScriptAsset.Methods));
             path.PushTarget();
-            path.PushIndex(new Index(asset.Methods.IndexOf(Method.Method.Method)));
+            path.PushIndex(new NodeIndex(asset.Methods.IndexOf(Method.Method.Method)));
             path.PushMember(nameof(Scripts.Method.Blocks));
             path.PushTarget();
-            path.PushIndex(new Index(block.Id));
+            path.PushIndex(new NodeIndex(block.Id));
             path.PushTarget();
             return path;
         }
@@ -102,7 +102,7 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
 
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
 
         private void GraphNodeListener_Changing(object sender, MemberNodeChangeEventArgs e)
         {
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptEditorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptEditorViewModel.cs
index b17d929218..00619048c5 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptEditorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptEditorViewModel.cs
@@ -299,20 +299,20 @@ private void AddNewMethod(object methodSymbolObject)
                 switch (methodSymbol.DeclaredAccessibility)
                 {
                     case RoslynAccessibility.Protected:
-                        method.Accessibility = Accessibility.Protected;
+                        method.Accessibility = Scripts.Accessibility.Protected;
                         break;
                     case RoslynAccessibility.Internal:
-                        method.Accessibility = Accessibility.Internal;
+                        method.Accessibility = Scripts.Accessibility.Internal;
                         break;
                     case RoslynAccessibility.ProtectedOrInternal:
-                        method.Accessibility = Accessibility.ProtectedOrInternal;
+                        method.Accessibility = Scripts.Accessibility.ProtectedOrInternal;
                         break;
                     case RoslynAccessibility.Public:
-                        method.Accessibility = Accessibility.Public;
+                        method.Accessibility = Scripts.Accessibility.Public;
                         break;
                     default:
                         // Default to protected if we are not sure
-                        method.Accessibility = Accessibility.Protected;
+                        method.Accessibility = Scripts.Accessibility.Protected;
                         break;
                 }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptLinkViewModel.cs b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptLinkViewModel.cs
index 3286baa98f..02d6e2d29d 100644
--- a/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptLinkViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/AssetEditors/VisualScriptEditor/VisualScriptLinkViewModel.cs
@@ -55,10 +55,10 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
             var path = new GraphNodePath(Method.Editor.Session.AssetNodeContainer.GetNode(asset));
             path.PushMember(nameof(VisualScriptAsset.Methods));
             path.PushTarget();
-            path.PushIndex(new Index(asset.Methods.IndexOf(Method.Method.Method)));
+            path.PushIndex(new NodeIndex(asset.Methods.IndexOf(Method.Method.Method)));
             path.PushMember(nameof(Scripts.Method.Links));
             path.PushTarget();
-            path.PushIndex(new Index(link.Id));
+            path.PushIndex(new NodeIndex(link.Id));
             path.PushTarget();
             return path;
         }
@@ -66,6 +66,6 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
         IObjectNode IPropertyProviderViewModel.GetRootNode() => Editor.Session.AssetNodeContainer.GetNode(link);
 
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/CurveEditor/ViewModels/KeyFrameCurveViewModel.cs b/sources/editor/Xenko.Assets.Presentation/CurveEditor/ViewModels/KeyFrameCurveViewModel.cs
index 04e83fd926..717be45fae 100644
--- a/sources/editor/Xenko.Assets.Presentation/CurveEditor/ViewModels/KeyFrameCurveViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/CurveEditor/ViewModels/KeyFrameCurveViewModel.cs
@@ -55,7 +55,7 @@ public override bool RemovePoint(ControlPointViewModelBase point)
             var kfcp = point as KeyFrameControlPointViewModel<TValue>;
             if (kfcp == null)
                 return false;
-            var index = new Index(controlPoints.IndexOf(kfcp));
+            var index = new NodeIndex(controlPoints.IndexOf(kfcp));
             if (index.Int == -1)
                 return false;
 
@@ -74,11 +74,11 @@ protected virtual KeyFrameControlPointViewModel<TValue> CreateControlPoint([NotN
 
         protected abstract KeyFrameControlPointViewModel<TValue> CreateKeyFrameControlPoint([NotNull] IMemberNode keyNode, [NotNull] IMemberNode valueNode, [NotNull] IMemberNode tangentTypeNode);
 
-        protected Index GetInsertIndex(Vector2 point)
+        protected NodeIndex GetInsertIndex(Vector2 point)
         {
             // Assuming the key frames are ordered
             var index = controlPoints.FindIndex(kf => (kf.IsSynchronized ? kf.ActualKey : kf.Key) > point.X);
-            return new Index(index >= 0 ? index : controlPoints.Count);
+            return new NodeIndex(index >= 0 ? index : controlPoints.Count);
         }
 
         protected sealed override void InitializeOverride()
diff --git a/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/Behaviors/AxisBehavior.cs b/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/Behaviors/AxisBehavior.cs
index 0da83062fc..56f36f2ce3 100644
--- a/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/Behaviors/AxisBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/Behaviors/AxisBehavior.cs
@@ -3,7 +3,7 @@
 
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Drawing;
 
 namespace Xenko.Assets.Presentation.CurveEditor.Views.Behaviors
diff --git a/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/CurveEditorView.xaml b/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/CurveEditorView.xaml
index a8bf1a95ef..b1da540418 100644
--- a/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/CurveEditorView.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/CurveEditor/Views/CurveEditorView.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:behaviors="clr-namespace:Xenko.Assets.Presentation.View.Behaviors"
              xmlns:behaviors1="clr-namespace:Xenko.Assets.Presentation.CurveEditor.Views.Behaviors"
              xmlns:strings="clr-namespace:Xenko.Assets.Presentation.Resources.Strings"
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Gizmos.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Gizmos.xkeffectlog
index 2fb656d69a..0ce1fe65ef 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Gizmos.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Gizmos.xkeffectlog
@@ -14,7 +14,8 @@ UsedParameters:
                                     - GizmoUniformColorMaterial.GizmoColorKey
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -25,22 +26,27 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Compositions: {}
             Macros: []
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments:
                         - 8
     Lighting.EnvironmentLights:
@@ -48,7 +54,8 @@ UsedParameters:
             Compositions: {}
             Macros: []
             Mixins:
-                -   ClassName: LightSimpleAmbient
+                - !ShaderClassSource
+                    ClassName: LightSimpleAmbient
 ---
 !EffectCompileRequest
 EffectName: XenkoEditorForwardShadingEffect
@@ -65,7 +72,8 @@ UsedParameters:
                                     - Material.DiffuseValue
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -76,16 +84,20 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightSimpleAmbient
@@ -106,7 +118,8 @@ UsedParameters:
                                     - Material.DiffuseValue
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -117,16 +130,20 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightSimpleAmbient
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Grid.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Grid.xkeffectlog
index b45b11f424..d1cb33cb70 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Grid.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/Grid.xkeffectlog
@@ -25,10 +25,12 @@ UsedParameters:
                                             - Material.TextureOffset
                                 Macros: []
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments:
                                     - matEmissive
                                     - rgba
@@ -40,7 +42,8 @@ UsedParameters:
                                     - Material.EmissiveIntensity
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments:
                                     - matEmissiveIntensity
                                     - r
@@ -52,7 +55,8 @@ UsedParameters:
                                     - Material.DiffuseSpecularAlphaBlendValue
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments:
                                     - matDiffuseSpecularAlphaBlend
                                     - r
@@ -64,7 +68,8 @@ UsedParameters:
                                     - Material.AlphaBlendColorValue
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments:
                                     - matAlphaBlendColor
                                     - rgb
@@ -76,10 +81,13 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
\ No newline at end of file
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
\ No newline at end of file
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/HDRGamePack.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/HDRGamePack.xkeffectlog
index 39f3c85d2f..8bf61270a5 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/HDRGamePack.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/HDRGamePack.xkeffectlog
@@ -4,17 +4,20 @@ EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -24,7 +27,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -32,14 +36,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -48,7 +54,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -58,28 +65,33 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -87,14 +99,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -103,7 +117,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -113,8 +128,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -125,20 +142,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -146,14 +166,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -162,7 +184,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -172,8 +195,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -184,20 +209,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -205,14 +233,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -220,7 +250,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -228,7 +259,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -237,7 +269,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -250,25 +283,30 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -278,7 +316,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -286,14 +325,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -302,7 +343,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -312,21 +354,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -344,20 +392,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -365,14 +416,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -381,7 +434,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -391,21 +445,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -427,20 +487,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -448,14 +511,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -463,7 +528,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -471,7 +537,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -479,7 +546,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -487,7 +555,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -495,7 +564,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -504,7 +574,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -514,8 +585,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
@@ -526,20 +599,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -547,14 +623,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -563,7 +641,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -573,21 +652,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -609,20 +694,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -631,8 +719,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
@@ -643,20 +733,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -664,14 +757,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -679,7 +774,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -687,7 +783,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -696,7 +793,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -709,21 +807,27 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -745,20 +849,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -767,21 +874,27 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -803,20 +916,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -824,14 +940,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -839,7 +957,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -847,7 +966,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -855,7 +975,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -863,7 +984,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -871,7 +993,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -880,7 +1003,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -890,21 +1014,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -993,7 +1123,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1008,14 +1139,16 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
                 GenericArguments: [ParticleBase.EmissiveValue]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -1029,26 +1162,31 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.VertexStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDisplacement, r]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorSubtract
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorSubtract
                                         Compositions:
                                             color1: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorConstantFloatLink
@@ -1067,17 +1205,21 @@ UsedParameters:
                         GenericArguments: [Position, meshNormal, false]
     Material.VertexStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialDisplacementStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialDisplacementStream
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1085,7 +1227,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1093,7 +1236,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1101,7 +1245,8 @@ UsedParameters:
                                 GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -1114,8 +1259,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: AmbientOcclusionRawAOEffect
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingEffectLit.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingEffectLit.xkeffectlog
index 8afc7f1e61..887427e66e 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingEffectLit.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingEffectLit.xkeffectlog
@@ -12,8 +12,10 @@ UsedParameters:
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
         Name: null
     Material.PixelStageSurfaceFilter: null
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
@@ -33,7 +35,8 @@ UsedParameters:
                                     - Material.TextureOffset
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Name: null
                     - !ShaderMixinSource
                         Compositions:
@@ -45,11 +48,13 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Name: null
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Name: null
     Material.TessellationShader: null
     Material.VertexStageSurfaceShaders: null
@@ -70,8 +75,10 @@ UsedParameters:
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
         Name: null
     Material.PixelStageSurfaceFilter: null
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
@@ -91,7 +98,8 @@ UsedParameters:
                                     - Material.TextureOffset
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Name: null
                     - !ShaderMixinSource
                         Compositions:
@@ -103,11 +111,13 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Name: null
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Name: null
     Material.TessellationShader: null
     Material.VertexStageSurfaceShaders: null
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingHighlight.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingHighlight.xkeffectlog
index 190175923e..3e0ee1f00c 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingHighlight.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingHighlight.xkeffectlog
@@ -14,7 +14,8 @@ UsedParameters:
                                     - Material.DiffuseValue
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -25,16 +26,20 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightConstantWhite
@@ -59,7 +64,8 @@ UsedParameters:
                                     - Material.TextureOffset
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -70,23 +76,28 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderMixinSource
             Compositions: {}
             Macros: []
             Mixins:
-                -   ClassName: LightConstantWhite
+                - !ShaderClassSource
+                    ClassName: LightConstantWhite
 ---
 !EffectCompileRequest
 EffectName: XenkoEditorForwardShadingEffect.Highlight
@@ -111,7 +122,8 @@ UsedParameters:
                                     - Material.TextureScale
                                     - Material.TextureOffset
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -121,13 +133,17 @@ UsedParameters:
                                         GenericArguments:
                                             - false
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightConstantWhite
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingPicking.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingPicking.xkeffectlog
index d4f1454336..73d5eac51c 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingPicking.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingPicking.xkeffectlog
@@ -18,7 +18,8 @@ UsedParameters:
                                     - Material.DiffuseValue
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -29,16 +30,20 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightConstantWhite
@@ -63,7 +68,8 @@ UsedParameters:
                                     - Material.TextureOffset
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -74,20 +80,25 @@ UsedParameters:
                                             - false
                         Macros: []
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Macros: []
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Compositions: {}
         Macros: []
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderMixinSource
             Compositions: {}
             Macros: []
             Mixins:
-                -   ClassName: LightConstantWhite
+                - !ShaderClassSource
+                    ClassName: LightConstantWhite
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingWireframe.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingWireframe.xkeffectlog
index f9a16e3e02..8de5becbbe 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingWireframe.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/LoadingWireframe.xkeffectlog
@@ -13,7 +13,8 @@ UsedParameters:
                                 GenericArguments:
                                     - Material.DiffuseValue
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -23,13 +24,17 @@ UsedParameters:
                                         GenericArguments:
                                             - false
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightConstantWhite
@@ -53,7 +58,8 @@ UsedParameters:
                                     - Material.TextureScale
                                     - Material.TextureOffset
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -63,18 +69,23 @@ UsedParameters:
                                         GenericArguments:
                                             - false
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups: []
     Lighting.EnvironmentLights:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightConstantWhite
+                - !ShaderClassSource
+                    ClassName: LightConstantWhite
 ---
 !EffectCompileRequest
 EffectName: XenkoEditorForwardShadingEffect.Wireframe
@@ -99,7 +110,8 @@ UsedParameters:
                                     - Material.TextureScale
                                     - Material.TextureOffset
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                     - !ShaderMixinSource
                         Compositions:
                             surfaces: !ShaderArraySource
@@ -109,13 +121,17 @@ UsedParameters:
                                         GenericArguments:
                                             - false
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.EnvironmentLights:
         - !ShaderClassSource
             ClassName: LightConstantWhite
diff --git a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/PostEffects.xkeffectlog b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/PostEffects.xkeffectlog
index 14a63d3b07..8d868dcfc2 100644
--- a/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/PostEffects.xkeffectlog
+++ b/sources/editor/Xenko.Assets.Presentation/EditorPackage/Assets/PostEffects.xkeffectlog
@@ -4,17 +4,20 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorAdd3ds
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorAdd3ds
                                 Compositions:
                                     color1: !ShaderClassSource
                                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -24,7 +27,8 @@ UsedParameters:
                                         GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -32,14 +36,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -48,7 +54,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -58,21 +65,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -90,20 +103,23 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
                                 GenericArguments: [Material.DiffuseMap, TEXCOORD0, Material.Sampler.i0, rgba, Material.TextureScale, Material.TextureOffset]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -111,14 +127,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -127,7 +145,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -137,21 +156,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -173,20 +198,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -194,14 +222,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -209,7 +239,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -217,7 +248,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -225,7 +257,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -233,7 +266,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -241,7 +275,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -250,7 +285,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -260,8 +296,10 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
@@ -272,20 +310,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -293,14 +334,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -309,7 +352,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -319,21 +363,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -355,20 +405,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -377,8 +430,10 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: XenkoForwardShadingEffect
@@ -389,20 +444,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -410,14 +468,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -425,7 +485,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -433,7 +494,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -442,7 +504,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -455,21 +518,27 @@ UsedParameters:
                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -491,20 +560,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -513,21 +585,27 @@ UsedParameters:
                                         GenericArguments: [false]
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -549,20 +627,23 @@ UsedParameters:
     Material.SkinningMaxBones: 56
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceDiffuse
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceDiffuse
                         Compositions:
                             diffuseMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantColorLink
                                 GenericArguments: [Material.DiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceGlossinessMap
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceGlossinessMap
                                 GenericArguments: [false]
                         Compositions:
                             glossinessMap: !ShaderClassSource
@@ -570,14 +651,16 @@ UsedParameters:
                                 GenericArguments: [Material.GlossinessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceMetalness
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceMetalness
                         Compositions:
                             metalnessMap: !ShaderClassSource
                                 ClassName: ComputeColorConstantFloatLink
                                 GenericArguments: [Material.MetalnessValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusion, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -585,7 +668,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAmbientOcclusionDirectLightingFactor, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -593,7 +677,8 @@ UsedParameters:
                                 GenericArguments: [Material.AmbientOcclusionDirectLightingFactorValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -601,7 +686,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavityDiffuse, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -609,7 +695,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavityDiffuseValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matCavitySpecular, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -617,7 +704,8 @@ UsedParameters:
                                 GenericArguments: [Material.CavitySpecularValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceLightingAndShading
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceLightingAndShading
                         Compositions:
                             surfaces: !ShaderArraySource
                                 Values:
@@ -626,7 +714,8 @@ UsedParameters:
                                         GenericArguments: [false]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                         Compositions:
                                             fresnelFunction: !ShaderClassSource
                                                 ClassName: MaterialSpecularMicrofacetFresnelSchlick
@@ -636,21 +725,27 @@ UsedParameters:
                                                 ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
     Lighting.DirectLightGroups:
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightClusteredPointGroup
+                - !ShaderClassSource
+                    ClassName: LightClusteredPointGroup
         - !ShaderClassSource
             ClassName: LightClusteredSpotGroup
         - !ShaderMixinSource
             Mixins:
-                -   ClassName: LightDirectionalGroup
+                - !ShaderClassSource
+                    ClassName: LightDirectionalGroup
                     GenericArguments: [1]
-                -   ClassName: ShadowMapReceiverDirectional
+                - !ShaderClassSource
+                    ClassName: ShadowMapReceiverDirectional
                     GenericArguments: [4, 1, false, true, false]
-                -   ClassName: ShadowMapFilterPcf
+                - !ShaderClassSource
+                    ClassName: ShadowMapFilterPcf
                     GenericArguments: [PerView.Lighting, 5]
     Lighting.EnvironmentLights:
         - !ShaderClassSource
@@ -739,7 +834,8 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -754,14 +850,16 @@ UsedParameters:
     ParticleBase.UsesSoftEdge: 0
     ParticleBase.BaseColor: !ShaderMixinSource
         Mixins:
-            -   ClassName: ComputeColorMultiply
+            - !ShaderClassSource
+                ClassName: ComputeColorMultiply
         Compositions:
             color1: !ShaderClassSource
                 ClassName: ComputeColorConstantColorLink
                 GenericArguments: [ParticleBase.EmissiveValue]
             color2: !ShaderMixinSource
                 Mixins:
-                    -   ClassName: ComputeColorMultiply
+                    - !ShaderClassSource
+                        ClassName: ComputeColorMultiply
                 Compositions:
                     color1: !ShaderClassSource
                         ClassName: ComputeColorTextureScaledOffsetDynamicSampler
@@ -775,26 +873,31 @@ EffectName: XenkoForwardShadingEffect
 UsedParameters:
     Material.VertexStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDisplacement, r]
                         Compositions:
                             computeColorSource: !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: ComputeColorMultiply
+                                    - !ShaderClassSource
+                                        ClassName: ComputeColorMultiply
                                 Compositions:
                                     color1: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: ComputeColorSubtract
+                                            - !ShaderClassSource
+                                                ClassName: ComputeColorSubtract
                                         Compositions:
                                             color1: !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: ComputeColorMultiply
+                                                    - !ShaderClassSource
+                                                        ClassName: ComputeColorMultiply
                                                 Compositions:
                                                     color1: !ShaderClassSource
                                                         ClassName: ComputeColorConstantFloatLink
@@ -813,17 +916,21 @@ UsedParameters:
                         GenericArguments: [Position, meshNormal, false]
     Material.VertexStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialDisplacementStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialDisplacementStream
     Material.PixelStageSurfaceShaders: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialSurfaceArray
+            - !ShaderClassSource
+                ClassName: MaterialSurfaceArray
         Compositions:
             layers: !ShaderArraySource
                 Values:
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissive, rgba]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -831,7 +938,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matEmissiveIntensity, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -839,7 +947,8 @@ UsedParameters:
                                 GenericArguments: [Material.EmissiveIntensity]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matDiffuseSpecularAlphaBlend, r]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -847,7 +956,8 @@ UsedParameters:
                                 GenericArguments: [Material.DiffuseSpecularAlphaBlendValue]
                     - !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                 GenericArguments: [matAlphaBlendColor, rgb]
                         Compositions:
                             computeColorSource: !ShaderClassSource
@@ -860,8 +970,10 @@ UsedParameters:
                         ClassName: MaterialSurfaceDiffuseSpecularAlphaBlendColor
     Material.PixelStageStreamInitializer: !ShaderMixinSource
         Mixins:
-            -   ClassName: MaterialStream
-            -   ClassName: MaterialPixelShadingStream
+            - !ShaderClassSource
+                ClassName: MaterialStream
+            - !ShaderClassSource
+                ClassName: MaterialPixelShadingStream
 ---
 !EffectCompileRequest
 EffectName: AmbientOcclusionRawAOEffect
diff --git a/sources/editor/Xenko.Assets.Presentation/EffectCompilerServerSession.cs b/sources/editor/Xenko.Assets.Presentation/EffectCompilerServerSession.cs
deleted file mode 100644
index 2f429751a5..0000000000
--- a/sources/editor/Xenko.Assets.Presentation/EffectCompilerServerSession.cs
+++ /dev/null
@@ -1,305 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Xenko.Core.Assets;
-using Xenko.Core.Assets.Editor.Services;
-using Xenko.Core.Assets.Editor.ViewModel;
-using Xenko.Core.Serialization;
-using Xenko.Assets.Effect;
-using Xenko.Assets.Presentation.ViewModel;
-using Xenko.ConnectionRouter;
-using Xenko.Engine.Network;
-using Xenko.Shaders.Compiler;
-using Xenko.Core.Presentation.Commands;
-using Xenko.Core.Presentation.Dirtiables;
-using Xenko.Core.Presentation.Services;
-using Xenko.Core.Extensions;
-
-namespace Xenko.Assets.Presentation
-{
-    /// <summary>
-    /// Handle connection to EffectCompilerServer for a given <see cref="SessionViewModel"/>.
-    /// It will let user knows that some new effects were compiled and might need to be imported in your assets.
-    /// </summary>
-    class EffectCompilerServerSession : IDisposable
-    {
-        class TrackedPackage : IDisposable
-        {
-            private readonly CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-
-            public CancellationToken CancellationToken => cancellationTokenSource.Token;
-
-            public PackageViewModel Package { get; }
-
-            public TrackedPackage(PackageViewModel package)
-            {
-                Package = package;
-            }
-
-            public void Dispose()
-            {
-                cancellationTokenSource.Cancel();
-            }
-        }
-
-        private readonly SessionViewModel session;
-        private readonly IDispatcherService dispatcher;
-        private HashSet<EffectCompileRequest> pendingEffects = new HashSet<EffectCompileRequest>();
-        private readonly Task routerLaunchedTask;
-        private readonly List<TrackedPackage> trackedPackages = new List<TrackedPackage>();
-
-        // Updated by CheckEffectLogAsset()
-        private EffectLogViewModel effectLogViewModel;
-        private string effectLogText; // to test for change
-        private EffectLogStore effectLogStore;
-        private MemoryStream effectLogStream;
-        private bool isDisposed;
-
-        public EffectCompilerServerSession(SessionViewModel session)
-        {
-            if (session == null) throw new ArgumentNullException(nameof(session));
-
-            this.session = session;
-            this.dispatcher = session.ServiceProvider.Get<IDispatcherService>();
-
-            routerLaunchedTask = Task.Run(() =>
-            {
-                RouterHelper.EnsureRouterLaunched();
-            });
-
-            TrackPackages(session.LocalPackages);
-            session.LocalPackages.CollectionChanged += LocalPackages_CollectionChanged;
-
-            session.ImportEffectLogCommand = new AnonymousCommand(session.ServiceProvider, () =>
-            {
-                if (session.CurrentProject != null)
-                    ImportEffectLog(session.CurrentProject);
-            }, () => session.CurrentProject?.Package != null);
-        }
-
-        private async void Start(PackageViewModel package, CancellationToken cancellationToken)
-        {
-            // Load existing effect log
-            try
-            {
-                // Connect to effect compiler server
-                await routerLaunchedTask;
-                var effectCompilerServerSocket = await RouterClient.RequestServer($"/service/Xenko.EffectCompilerServer/{XenkoVersion.NuGetVersion}/Xenko.EffectCompilerServer.exe?mode=gamestudio&packagename={package.Package.Meta.Name}");
-
-                // Cancellation by closing the socket handle
-                cancellationToken.Register(effectCompilerServerSocket.Dispose);
-
-                var effectCompilerMessageLayer = new SocketMessageLayer(effectCompilerServerSocket, false);
-
-                // Load existing asset
-                dispatcher.Invoke(() => CheckEffectLogAsset(package));
-
-                effectCompilerMessageLayer.AddPacketHandler<RemoteEffectCompilerEffectRequested>(packet => HandleEffectCompilerRequestedPacket(packet, package));
-
-                // Run main socket loop
-                Task.Run(() => effectCompilerMessageLayer.MessageLoop());
-            }
-            catch
-            {
-                // TODO: Log error
-            }
-        }
-
-        public void Dispose()
-        {
-            if (!isDisposed)
-            {
-                isDisposed = true;
-
-                // Untrack packages
-                session.LocalPackages.CollectionChanged -= LocalPackages_CollectionChanged;
-                UntrackPackages(trackedPackages.Select(x => x.Package));
-
-                // Remove import effect log command
-                session.ImportEffectLogCommand = null;
-            }
-        }
-
-        private void LocalPackages_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            if (e.NewItems != null)
-            {
-                TrackPackages(e.NewItems.OfType<PackageViewModel>());
-            }
-
-            if (e.OldItems != null)
-            {
-                UntrackPackages(e.OldItems.OfType<PackageViewModel>());
-            }
-        }
-
-        private void TrackPackages(IEnumerable<PackageViewModel> packages)
-        {
-            foreach (var package in packages)
-            {
-                var trackedPackage = new TrackedPackage(package);
-                trackedPackages.Add(trackedPackage);
-
-                Task.Run(() => Start(package, trackedPackage.CancellationToken));
-            }
-        }
-
-        private void UntrackPackages(IEnumerable<PackageViewModel> packages)
-        {
-            var packagesCopy = packages.ToList();
-
-            trackedPackages.RemoveAll(trackedPackage =>
-            {
-                if (packagesCopy.Contains(trackedPackage.Package))
-                {
-                    trackedPackage.Dispose();
-                    return true;
-                }
-
-                return false;
-            });
-        }
-
-        /// <summary>
-        /// Checks if the effect log asset changed since last check.
-        /// </summary>
-        private void CheckEffectLogAsset(PackageViewModel package)
-        {
-            var newEffectLogViewModel = package.Assets.FirstOrDefault(x => x.Name == EffectLogAsset.DefaultFile) as EffectLogViewModel;
-            var newEffectLogText = newEffectLogViewModel?.Text;
-
-            if (newEffectLogText != effectLogText // Asset changed?
-                || effectLogStore == null) // First run?
-            {
-                effectLogText = newEffectLogText;
-                effectLogViewModel = newEffectLogViewModel;
-
-                // Asset changed, update with new data
-                effectLogStream = new MemoryStream();
-
-                if (effectLogText != null)
-                {
-                    var effectLogData = Encoding.UTF8.GetBytes(effectLogText);
-                    effectLogStream.Write(effectLogData, 0, effectLogData.Length);
-                    effectLogStream.Position = 0;
-                }
-
-                effectLogStore = new EffectLogStore(effectLogStream);
-                effectLogStore.LoadNewValues();
-
-                // Update pending effects count (against new asset)
-                int importEffectLogPendingCount = 0;
-                foreach (var effectCompilerResult in pendingEffects)
-                {
-                    if (!effectLogStore.Contains(effectCompilerResult))
-                    {
-                        importEffectLogPendingCount++;
-                    }
-                }
-
-                UpdateImportEffectLogPendingCount(importEffectLogPendingCount);
-            }
-        }
-
-        /// <summary>
-        /// Imports the effect log as an asset.
-        /// </summary>
-        private void ImportEffectLog(PackageViewModel package)
-        {
-            using (var transaction = session.UndoRedoService.CreateTransaction())
-            {
-                CheckEffectLogAsset(package);
-
-                // Create asset (on first time)
-                if (effectLogViewModel == null)
-                {
-                    var effectLogAsset = new EffectLogAsset();
-                    var assetItem = new AssetItem(EffectLogAsset.DefaultFile, effectLogAsset);
-
-                    // Add created asset to project
-                    effectLogViewModel = (EffectLogViewModel)package.CreateAsset(package.AssetMountPoint, assetItem, true, null);
-
-                    CheckEffectLogAsset(package);
-                }
-
-                // Import shaders
-                foreach (var effectCompilerResult in pendingEffects)
-                {
-                    if (!effectLogStore.Contains(effectCompilerResult))
-                        effectLogStore[effectCompilerResult] = true;
-                }
-
-                // Reset current list of shaders to import
-                var oldPendingEffects = pendingEffects;
-                session.UndoRedoService.PushOperation(new AnonymousDirtyingOperation(Enumerable.Empty<IDirtiable>(),
-                    () => { pendingEffects = oldPendingEffects; session.ImportEffectLogPendingCount = oldPendingEffects.Count; },
-                    () => { pendingEffects = new HashSet<EffectCompileRequest>(); session.ImportEffectLogPendingCount = 0; }));
-
-                pendingEffects = new HashSet<EffectCompileRequest>();
-                session.ImportEffectLogPendingCount = 0;
-
-                // Extract current asset data
-                var effectLogData = effectLogStream.ToArray();
-
-                // Update asset
-                effectLogViewModel.Text = Encoding.UTF8.GetString(effectLogData, 0, effectLogData.Length);
-                effectLogText = effectLogViewModel.Text;
-
-                // Select current asset
-                session.ActiveAssetView.SelectAssets(new[] { effectLogViewModel });
-
-                session.UndoRedoService.SetName(transaction, "Import effect log");
-            }
-        }
-
-        private void HandleEffectCompilerRequestedPacket(RemoteEffectCompilerEffectRequested packet, PackageViewModel package)
-        {
-            // Received a shader requested notification, add it to list of "pending shaders", and update count in UI
-
-            dispatcher.InvokeAsync(() =>
-            {
-                CheckEffectLogAsset(package);
-
-                // Try to decode request
-                try
-                {
-                    // Deserialize as an object
-                    var binaryReader = new BinarySerializationReader(new MemoryStream(packet.Request));
-                    EffectCompileRequest effectCompileRequest = null;
-                    binaryReader.Context.SerializerSelector = SerializerSelector.AssetWithReuse;
-                    binaryReader.SerializeExtended(ref effectCompileRequest, ArchiveMode.Deserialize, null);
-
-                    // Record in list of pending effects and check if it would result in a new shader
-                    // (it is still recorded in list of pending effect, in case EffectLog asset is deleted in the meantime)
-                    if (pendingEffects.Add(effectCompileRequest) && !effectLogStore.Contains(effectCompileRequest))
-                    {
-                        UpdateImportEffectLogPendingCount(session.ImportEffectLogPendingCount + 1);
-                    }
-                }
-                catch
-                {
-                    // TODO Log error
-                    //Log.Warning("Received an effect compilation request which could not be decoded. Make sure Windows project compiled successfully and is up to date.");
-                }
-            });
-        }
-
-        private void UpdateImportEffectLogPendingCount(int importEffectLogPendingCount)
-        {
-            bool displayNotification = session.ImportEffectLogPendingCount == 0 && importEffectLogPendingCount > 0;
-            session.ImportEffectLogPendingCount = importEffectLogPendingCount;
-            if (displayNotification)
-            {
-                var dialogService = session.ServiceProvider.Get<IEditorDialogService>();
-                dialogService.ShowNotificationWindow("New effects to import", "New effects have been compiled by the game runtime and can be imported in the effect library. Click here to import them.", session.ImportEffectLogCommand, null);
-            }
-        }
-    }
-}
diff --git a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Commands/AddNewScriptComponentCommand.cs b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Commands/AddNewScriptComponentCommand.cs
index a9df41b2a0..b0ce8bc50b 100644
--- a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Commands/AddNewScriptComponentCommand.cs
+++ b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Commands/AddNewScriptComponentCommand.cs
@@ -82,7 +82,7 @@ protected override async void ExecuteSync(INodePresenter nodePresenter, object p
                 using (var transaction = session.UndoRedoService.CreateTransaction())
                 {
                     object component = Activator.CreateInstance(componentType);
-                    var index = new Index(nodePresenter.Children.Count);
+                    var index = new NodeIndex(nodePresenter.Children.Count);
                     nodePresenter.AddItem(component);
                     session.UndoRedoService.PushOperation(
                         new AnonymousDirtyingOperation(
diff --git a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/NavigationNodeUpdater.cs b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/NavigationNodeUpdater.cs
index 8cc843e0a4..95062cdec1 100644
--- a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/NavigationNodeUpdater.cs
+++ b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/NavigationNodeUpdater.cs
@@ -40,7 +40,7 @@ protected override void UpdateNode(IAssetNodePresenter node)
                     return;
                 }
 
-                var navigationSettings = gameSettingsAsset.GetOrCreate<NavigationSettings>();
+                var navigationSettings = gameSettingsAsset.GetOrDefault<NavigationSettings>();
 
                 foreach (var child in node.Children)
                     child.IsVisible = false;
diff --git a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/SkeletonAssetNodeUpdater.cs b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/SkeletonAssetNodeUpdater.cs
index ad11723ce8..54ef451df2 100644
--- a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/SkeletonAssetNodeUpdater.cs
+++ b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/SkeletonAssetNodeUpdater.cs
@@ -28,7 +28,7 @@ protected override void UpdateNode(IAssetNodePresenter node)
                 // Set the display name to be the name of the node, indented using space.
                 node.DisplayName = $"{"".PadLeft(2 * depth)}{name}";
                 // Set the order to be the index, we don't want to sort alphabetically
-                var index = (node as AssetItemNodePresenter)?.Index ?? Index.Empty;
+                var index = (node as AssetItemNodePresenter)?.Index ?? NodeIndex.Empty;
                 if (index.IsInt)
                 {
                     node.Order = index.Int;
diff --git a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/UIAssetNodeUpdater.cs b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/UIAssetNodeUpdater.cs
index 3cad5e409a..93f8728dd4 100644
--- a/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/UIAssetNodeUpdater.cs
+++ b/sources/editor/Xenko.Assets.Presentation/NodePresenters/Updaters/UIAssetNodeUpdater.cs
@@ -135,7 +135,7 @@ private static void GetDisplayData([NotNull] PropertyKey property, out string di
         private AssetVirtualNodePresenter CreateDependencyPropertyNode(IAssetNodePresenter propertyNodeParent, [NotNull] IAssetNodePresenter node, [NotNull] PropertyKey property, int? order)
         {
             var propertyType = property.PropertyType;
-            var propertyIndex = new Index(property);
+            var propertyIndex = new NodeIndex(property);
             var accessor = node.GetNodeAccessor();
 
             var propertyContainerNode = ((IObjectNode)accessor.Node)[nameof(UIElement.DependencyProperties)].Target;
@@ -154,7 +154,7 @@ private AssetVirtualNodePresenter CreateDependencyPropertyNode(IAssetNodePresent
         /// <param name="propertyContainerNode">The node containing the property.</param>
         /// <param name="propertyIndex">The index of the property in the node.</param>
         /// <returns></returns>
-        private static object Getter([NotNull] IObjectNode propertyContainerNode, Index propertyIndex)
+        private static object Getter([NotNull] IObjectNode propertyContainerNode, NodeIndex propertyIndex)
         {
             return propertyContainerNode.Retrieve(propertyIndex);
         }
@@ -166,7 +166,7 @@ private static object Getter([NotNull] IObjectNode propertyContainerNode, Index
         /// <param name="propertyContainerNode">The node containing the property.</param>
         /// <param name="propertyIndex">The index of the property in the node.</param>
         /// <param name="value">The value to set.</param>
-        private static void Setter(IUndoRedoService undoRedoService, [NotNull] IObjectNode propertyContainerNode, Index propertyIndex, object value)
+        private static void Setter(IUndoRedoService undoRedoService, [NotNull] IObjectNode propertyContainerNode, NodeIndex propertyIndex, object value)
         {
             using (undoRedoService?.CreateTransaction())
             {
diff --git a/sources/editor/Xenko.Assets.Presentation/Preview/HeightmapPreview.cs b/sources/editor/Xenko.Assets.Presentation/Preview/HeightmapPreview.cs
new file mode 100644
index 0000000000..012a13e740
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Preview/HeightmapPreview.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Assets.Physics;
+using Xenko.Assets.Presentation.Preview.Views;
+using Xenko.Core.Mathematics;
+using Xenko.Editor.Preview;
+using Xenko.Graphics;
+using Xenko.Physics;
+
+namespace Xenko.Assets.Presentation.Preview
+{
+    [AssetPreview(typeof(HeightmapAsset), typeof(HeightmapPreviewView))]
+    public class HeightmapPreview : PreviewFromSpriteBatch<HeightmapAsset>
+    {
+        private Heightmap heightmap;
+        private Texture heightmapTexture;
+        private BlendStateDescription adequateBlendState;
+
+        public int Width => heightmap?.Size.X ?? 0;
+        public int Length => heightmap?.Size.Y ?? 0;
+
+        /// <summary>
+        /// Gets or sets a callback that will be invoked when the texture is loaded.
+        /// </summary>
+        public Action NotifyHeightmapLoaded { get; set; }
+
+        protected override Vector2 SpriteSize
+        {
+            get
+            {
+                if (heightmapTexture == null)
+                    return base.SpriteSize;
+
+                return new Vector2(heightmapTexture.Width, heightmapTexture.Height);
+            }
+        }
+
+        protected virtual Vector2 ImageCenter
+        {
+            get
+            {
+                if (heightmapTexture == null)
+                    return Vector2.Zero;
+
+                var imageSize = new Vector2(heightmapTexture.Width, heightmapTexture.Height);
+
+                return imageSize / 2f;
+            }
+        }
+
+        protected override void LoadContent()
+        {
+            heightmap = LoadAsset<Heightmap>(AssetItem.Location);
+
+            heightmapTexture = heightmap?.CreateTexture(Game.GraphicsDevice);
+
+            adequateBlendState = BlendStates.Opaque;
+
+            NotifyHeightmapLoaded?.Invoke();
+
+            // Always use LDR
+            RenderingMode = RenderingMode.LDR;
+        }
+
+        protected override void UnloadContent()
+        {
+            if (heightmapTexture != null)
+            {
+                heightmapTexture.Dispose();
+                heightmapTexture = null;
+            }
+
+            if (heightmap != null)
+            {
+                UnloadAsset(heightmap);
+                heightmap = null;
+            }
+        }
+
+        protected override void RenderSprite()
+        {
+            if (heightmapTexture == null)
+                return;
+
+            var origin = ImageCenter - SpriteOffsets;
+            var region = new RectangleF(0, 0, heightmapTexture.Width, heightmapTexture.Height);
+            var orientation = ImageOrientation.AsIs;
+
+            SpriteBatch.Begin(Game.GraphicsContext, SpriteSortMode.Texture, adequateBlendState);
+            SpriteBatch.Draw(heightmapTexture, WindowSize / 2, region, Color.White, 0, origin, SpriteScale, SpriteEffects.None, orientation, swizzle: SwizzleMode.RRR1);
+            SpriteBatch.End();
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/Preview/Views/AnimationPreviewView.cs b/sources/editor/Xenko.Assets.Presentation/Preview/Views/AnimationPreviewView.cs
index 15a71061c7..c1f6bbb41b 100644
--- a/sources/editor/Xenko.Assets.Presentation/Preview/Views/AnimationPreviewView.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Preview/Views/AnimationPreviewView.cs
@@ -4,7 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Controls;
 using Xenko.Core.Presentation.Core;
 using Xenko.Editor.Preview.View;
diff --git a/sources/editor/Xenko.Assets.Presentation/Preview/Views/HeightmapPreviewView.cs b/sources/editor/Xenko.Assets.Presentation/Preview/Views/HeightmapPreviewView.cs
new file mode 100644
index 0000000000..0360b49f93
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Preview/Views/HeightmapPreviewView.cs
@@ -0,0 +1,15 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Windows;
+using Xenko.Editor.Preview.View;
+
+namespace Xenko.Assets.Presentation.Preview.Views
+{
+    public class HeightmapPreviewView : XenkoPreviewView
+    {
+        static HeightmapPreviewView()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(HeightmapPreviewView), new FrameworkPropertyMetadata(typeof(HeightmapPreviewView)));
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/Properties/Resources.Designer.cs b/sources/editor/Xenko.Assets.Presentation/Properties/Resources.Designer.cs
new file mode 100644
index 0000000000..2541473e1e
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Xenko.Assets.Presentation.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xenko.Assets.Presentation.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraph.cs b/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraph.cs
index 2637dee04e..32d2f6e7d9 100644
--- a/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraph.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraph.cs
@@ -35,13 +35,13 @@ public override IGraphNode FindTarget(IGraphNode sourceNode, IGraphNode target)
         }
 
         /// <inheritdoc/>
-        public override bool IsChildPartReference(IGraphNode node, Index index)
+        public override bool IsChildPartReference(IGraphNode node, NodeIndex index)
         {
             return (node as IObjectNode)?.Type == typeof(TransformComponent.TransformChildrenCollection);
         }
 
         /// <inheritdoc/>
-        protected override bool CanUpdate(IAssetNode node, ContentChangeType changeType, Index index, object value)
+        protected override bool CanUpdate(IAssetNode node, ContentChangeType changeType, NodeIndex index, object value)
         {
             // Check if we are in the component collection of an entity (where we actually add new components)
             if (IsComponentForComponentCollection(node, value) && changeType == ContentChangeType.CollectionAdd)
@@ -76,7 +76,7 @@ protected override object CloneValueFromBase(object value, IAssetNode node)
             if (IsComponentForComponentCollection(node, value) && value is TransformComponent)
             {
                 // We never clone TransformComponent, we cannot replace them. Instead, return the existing one.
-                var transformComponent = (TransformComponent)node.Retrieve(new Index(0));
+                var transformComponent = (TransformComponent)node.Retrieve(new NodeIndex(0));
                 // We still reset the Entity to null to make sure it works nicely with reconcilation, etc.
                 transformComponent.Entity = null;
                 return transformComponent;
@@ -96,7 +96,7 @@ protected override object CloneValueFromBase(object value, IAssetNode node)
         protected override void AddChildPartToParentPart(Entity parentPart, Entity childPart, int index)
         {
             var node = Container.NodeContainer.GetNode(parentPart.Transform);
-            node[nameof(TransformComponent.Children)].Target.Add(childPart.Transform, new Index(index));
+            node[nameof(TransformComponent.Children)].Target.Add(childPart.Transform, new NodeIndex(index));
         }
 
         /// <inheritdoc />
@@ -105,7 +105,7 @@ protected override void RemoveChildPartFromParentPart(Entity parentPart, Entity
             var transformNode = Container.NodeContainer.GetNode(parentPart.Transform);
             var reference = parentPart.Transform.Children.Single(x => x.Entity.Id == childPart.Id);
             var childrenNode = transformNode[nameof(TransformComponent.Children)].Target;
-            var index = new Index(parentPart.Transform.Children.IndexOf(reference));
+            var index = new NodeIndex(parentPart.Transform.Children.IndexOf(reference));
             var item = childrenNode.Retrieve(index);
             childrenNode.Remove(item, index);
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraphDefinition.cs b/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraphDefinition.cs
index 1c98c58756..92027ddd38 100644
--- a/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraphDefinition.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Quantum/EntityHierarchyPropertyGraphDefinition.cs
@@ -13,7 +13,7 @@ public override bool IsMemberTargetObjectReference(IMemberNode member, object va
             return value is EntityComponent || base.IsMemberTargetObjectReference(member, value);
         }
 
-        public override bool IsTargetItemObjectReference(IObjectNode collection, Index itemIndex, object value)
+        public override bool IsTargetItemObjectReference(IObjectNode collection, NodeIndex itemIndex, object value)
         {
             if (value is EntityComponent)
             {
diff --git a/sources/editor/Xenko.Assets.Presentation/Quantum/GraphicsCompositorAssetPropertyGraphDefinition.cs b/sources/editor/Xenko.Assets.Presentation/Quantum/GraphicsCompositorAssetPropertyGraphDefinition.cs
index 90bf5e9a91..5bd13e043f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Quantum/GraphicsCompositorAssetPropertyGraphDefinition.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Quantum/GraphicsCompositorAssetPropertyGraphDefinition.cs
@@ -30,7 +30,7 @@ public override bool IsMemberTargetObjectReference(IMemberNode member, object va
             return base.IsMemberTargetObjectReference(member, value);
         }
 
-        public override bool IsTargetItemObjectReference(IObjectNode collection, Index itemIndex, object value)
+        public override bool IsTargetItemObjectReference(IObjectNode collection, NodeIndex itemIndex, object value)
         {
             if (value is SceneCameraSlot)
             {
diff --git a/sources/editor/Xenko.Assets.Presentation/Quantum/UIAssetPropertyGraph.cs b/sources/editor/Xenko.Assets.Presentation/Quantum/UIAssetPropertyGraph.cs
index d43da6ab08..b57a05b3ba 100644
--- a/sources/editor/Xenko.Assets.Presentation/Quantum/UIAssetPropertyGraph.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Quantum/UIAssetPropertyGraph.cs
@@ -38,7 +38,7 @@ public override IGraphNode FindTarget(IGraphNode sourceNode, IGraphNode target)
         }
 
         /// <inheritdoc/>
-        public override bool IsChildPartReference(IGraphNode node, Index index)
+        public override bool IsChildPartReference(IGraphNode node, NodeIndex index)
         {
             if (node is IMemberNode memberContent)
             {
@@ -72,7 +72,7 @@ protected override void AddChildPartToParentPart(UIElement parentPart, UIElement
                 if (index < 0)
                     node.Add(childPart);
                 else
-                    node.Add(childPart, new Index(index));
+                    node.Add(childPart, new NodeIndex(index));
                 return;
             }
             throw new NotSupportedException();
@@ -99,7 +99,7 @@ protected override void RemoveChildPartFromParentPart(UIElement parentPart, UIEl
                     throw new InvalidOperationException($"The given {childPart.GetType().Name} (Name={childPart.Name}) is not a child of {nameof(Panel)} (Name={panel.Name}).");
 
                 var node = Container.NodeContainer.GetOrCreateNode(panel)[nameof(Panel.Children)].Target;
-                node.Remove(childPart, new Index(index));
+                node.Remove(childPart, new NodeIndex(index));
                 return;
             }
             throw new NotSupportedException();
diff --git a/sources/editor/Xenko.Assets.Presentation/SceneEditor/HighlightRenderFeature.cs b/sources/editor/Xenko.Assets.Presentation/SceneEditor/HighlightRenderFeature.cs
index a7cfb8c441..f1e0d669e7 100644
--- a/sources/editor/Xenko.Assets.Presentation/SceneEditor/HighlightRenderFeature.cs
+++ b/sources/editor/Xenko.Assets.Presentation/SceneEditor/HighlightRenderFeature.cs
@@ -62,7 +62,7 @@ public override unsafe void Prepare(RenderDrawContext context)
 
             foreach (var renderNode in ((RootEffectRenderFeature)RootRenderFeature).RenderNodes)
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                 if (perDrawLayout == null)
                     continue;
 
@@ -83,7 +83,7 @@ public override void ProcessPipelineState(RenderContext context, RenderNodeRefer
             base.ProcessPipelineState(context, renderNodeReference, ref renderNode, renderObject, pipelineState);
 
             // Check if this is a highlight rendering
-            var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+            var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
             if (perDrawLayout == null)
                 return;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/SceneEditor/MaterialFilterRenderFeature.cs b/sources/editor/Xenko.Assets.Presentation/SceneEditor/MaterialFilterRenderFeature.cs
index 9c6f2d0638..c3db72b3b8 100644
--- a/sources/editor/Xenko.Assets.Presentation/SceneEditor/MaterialFilterRenderFeature.cs
+++ b/sources/editor/Xenko.Assets.Presentation/SceneEditor/MaterialFilterRenderFeature.cs
@@ -32,8 +32,9 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
             var renderEffects = RootRenderFeature.RenderData.GetData(renderEffectKey);
             int effectSlotCount = ((RootEffectRenderFeature)RootRenderFeature).EffectPermutationSlotCount;
 
-            foreach (var renderObject in RootRenderFeature.RenderObjects)
+            for (int j=0; j<RootRenderFeature.RenderObjects.Count; j++)
             {
+                var renderObject = RootRenderFeature.RenderObjects[j];
                 var staticObjectNode = renderObject.StaticObjectNode;
 
                 for (int i = 0; i < effectSlotCount; ++i)
diff --git a/sources/editor/Xenko.Assets.Presentation/SceneEditor/PackageSceneSettings.cs b/sources/editor/Xenko.Assets.Presentation/SceneEditor/PackageSceneSettings.cs
index 4d67ea0f2e..089155f711 100644
--- a/sources/editor/Xenko.Assets.Presentation/SceneEditor/PackageSceneSettings.cs
+++ b/sources/editor/Xenko.Assets.Presentation/SceneEditor/PackageSceneSettings.cs
@@ -44,6 +44,8 @@ public sealed class SceneSettingsData
         public bool SelectionMaskVisible = true;
         public bool GridVisible = true;
         public Color3 GridColor = (Color3)new Color(180, 180, 180);
+        public float GridOpacity = 0.35f;
+        public int GridAxisIndex = 1;
         public bool CameraPreviewVisible = true;
         public RenderMode RenderMode = RenderMode.SingleStream;
         public string ActiveStream = string.Empty;
diff --git a/sources/editor/Xenko.Assets.Presentation/SceneEditor/PickingRenderFeature.cs b/sources/editor/Xenko.Assets.Presentation/SceneEditor/PickingRenderFeature.cs
index 4bc4c35d82..aee5b2e7bc 100644
--- a/sources/editor/Xenko.Assets.Presentation/SceneEditor/PickingRenderFeature.cs
+++ b/sources/editor/Xenko.Assets.Presentation/SceneEditor/PickingRenderFeature.cs
@@ -60,7 +60,7 @@ public unsafe override void Prepare(RenderDrawContext context)
 
             foreach (var renderNode in ((RootEffectRenderFeature)RootRenderFeature).RenderNodes)
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                 if (perDrawLayout == null)
                     continue;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/SceneEditor/WireframeRenderFeature.cs b/sources/editor/Xenko.Assets.Presentation/SceneEditor/WireframeRenderFeature.cs
index d45b19d948..33a7ce9953 100644
--- a/sources/editor/Xenko.Assets.Presentation/SceneEditor/WireframeRenderFeature.cs
+++ b/sources/editor/Xenko.Assets.Presentation/SceneEditor/WireframeRenderFeature.cs
@@ -62,7 +62,7 @@ public override unsafe void Prepare(RenderDrawContext context)
 
             foreach (var renderNode in ((RootEffectRenderFeature)RootRenderFeature).RenderNodes)
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                 if (perDrawLayout == null)
                     continue;
 
@@ -81,7 +81,7 @@ public override void ProcessPipelineState(RenderContext context, RenderNodeRefer
             base.ProcessPipelineState(context, renderNodeReference, ref renderNode, renderObject, pipelineState);
 
             // Check if this is a wireframe rendering
-            var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+            var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
             if (perDrawLayout == null)
                 return;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/Shaders/PreviewTexture.cs b/sources/editor/Xenko.Assets.Presentation/Shaders/PreviewTexture.xkfx.cs
similarity index 100%
rename from sources/editor/Xenko.Assets.Presentation/Shaders/PreviewTexture.cs
rename to sources/editor/Xenko.Assets.Presentation/Shaders/PreviewTexture.xkfx.cs
diff --git a/sources/editor/Xenko.Assets.Presentation/Shaders/SceneEditorParameters.cs b/sources/editor/Xenko.Assets.Presentation/Shaders/SceneEditorParameters.xkfx.cs
similarity index 100%
rename from sources/editor/Xenko.Assets.Presentation/Shaders/SceneEditorParameters.cs
rename to sources/editor/Xenko.Assets.Presentation/Shaders/SceneEditorParameters.xkfx.cs
diff --git a/sources/editor/Xenko.Assets.Presentation/Shaders/SelectedSprite.cs b/sources/editor/Xenko.Assets.Presentation/Shaders/SelectedSprite.xkfx.cs
similarity index 100%
rename from sources/editor/Xenko.Assets.Presentation/Shaders/SelectedSprite.cs
rename to sources/editor/Xenko.Assets.Presentation/Shaders/SelectedSprite.xkfx.cs
diff --git a/sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorForwardShadingEffect.cs b/sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorForwardShadingEffect.xkfx.cs
similarity index 100%
rename from sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorForwardShadingEffect.cs
rename to sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorForwardShadingEffect.xkfx.cs
diff --git a/sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorHighlightingEffect.cs b/sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorHighlightingEffect.xkfx.cs
similarity index 100%
rename from sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorHighlightingEffect.cs
rename to sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorHighlightingEffect.xkfx.cs
diff --git a/sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorMaterialPreviewEffect.cs b/sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorMaterialPreviewEffect.xkfx.cs
similarity index 100%
rename from sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorMaterialPreviewEffect.cs
rename to sources/editor/Xenko.Assets.Presentation/Shaders/XenkoEditorMaterialPreviewEffect.xkfx.cs
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Misc/DefaultGraphicsCompositorVoxels.xktpl b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Misc/DefaultGraphicsCompositorVoxels.xktpl
new file mode 100644
index 0000000000..25a5d6df93
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Misc/DefaultGraphicsCompositorVoxels.xktpl
@@ -0,0 +1,10 @@
+!TemplateAssetFactory
+Id: 4BC182D7-69D5-4BE2-9AF3-1C82F67B629D
+AssetTypeName: GraphicsCompositorAsset
+Name: Graphics compositor (Voxel Cone Tracing)
+Scope: Asset
+Description: A graphics compositor specifically setup for Voxel Cone Tracing
+Group: Miscellaneous
+Order: -100
+Icon: ..\.xktpl\GraphicsCompositor.png
+DefaultOutputName: GraphicsCompositor
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/ColliderShapeHeightfield.xktpl b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/ColliderShapeHeightfield.xktpl
new file mode 100644
index 0000000000..7d205a0f58
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/ColliderShapeHeightfield.xktpl
@@ -0,0 +1,10 @@
+!TemplateAssetFactory
+Id: 1D3C9128-C94B-413B-9ABB-80ADDD372F61
+AssetTypeName: ColliderShapeAsset
+Name: Heightfield
+Scope: Asset
+Description: A heightfield collider
+Group: Physics
+Icon: ..\.xktpl\ColliderPlane.png
+DefaultOutputName: ColliderHeightfield
+FactoryTypeName: ColliderShapeHeightfieldFactory
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/Heightmap.xktpl b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/Heightmap.xktpl
new file mode 100644
index 0000000000..a9d7b17fe3
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Physics/Heightmap.xktpl
@@ -0,0 +1,12 @@
+!TemplateAssetFactory
+Id: 127EC64F-6E15-4964-98F4-DB735B39AE09
+AssetTypeName: HeightmapAsset
+Name: Heightmap
+Scope: Asset
+Description: A heightmap for heightfield
+Group: Physics
+Order: 100
+Icon: ..\.xktpl\TextureGray.png
+DefaultOutputName: Heightmap
+FactoryTypeName: HeightmapFactory
+ImportSource: true
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Physics/DebugShapesRender.cs b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Physics/DebugShapesRender.cs
index d375adc15c..174dba2831 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Physics/DebugShapesRender.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Physics/DebugShapesRender.cs
@@ -14,19 +14,18 @@ public class ##Scriptname## : AsyncScript
 
         public override async Task Execute()
         {
-        //setup rendering in the debug entry point if we have it
-        var compositor = SceneSystem.GraphicsCompositor;
-        var debugRenderer =
-            ((compositor.Game as SceneCameraRenderer)?.Child as SceneRendererCollection)?.Children.Where(
-                x => x is DebugRenderer).Cast<DebugRenderer>().FirstOrDefault();
-        if (debugRenderer == null)
-            return;
+            //setup rendering in the debug entry point if we have it
+            var compositor = SceneSystem.GraphicsCompositor;
+            var debugRenderer =
+                ((compositor.Game as SceneCameraRenderer)?.Child as SceneRendererCollection)?.Children.Where(
+                    x => x is DebugRenderer).Cast<DebugRenderer>().FirstOrDefault();
+            if (debugRenderer == null)
+                return;
 
-        var shapesRenderState = new RenderStage("PhysicsDebugShapes", "Main");
+            var shapesRenderState = new RenderStage("PhysicsDebugShapes", "Main");
             compositor.RenderStages.Add(shapesRenderState);
             var meshRenderFeature = compositor.RenderFeatures.OfType<MeshRenderFeature>().First();
-            meshRenderFeature.RenderStageSelectors.Add(new SimpleGroupToRenderStageSelector
-            {
+            meshRenderFeature.RenderStageSelectors.Add(new SimpleGroupToRenderStageSelector {
                 EffectName = "XenkoForwardShadingEffect",
                 RenderGroup = (RenderGroupMask)(1 << (int)RenderGroup),
                 RenderStage = shapesRenderState,
@@ -35,23 +34,23 @@ public override async Task Execute()
             debugRenderer.DebugRenderStages.Add(shapesRenderState);
 
             var simulation = this.GetSimulation();
-            if (simulation != null)
-                simulation.ColliderShapesRenderGroup = RenderGroup;
 
             var enabled = false;
-            while (Game.IsRunning)
-            {
-                if (Input.IsKeyDown(Keys.LeftShift) && Input.IsKeyDown(Keys.LeftCtrl) && Input.IsKeyReleased(Keys.P))
-                {
+            while (Game.IsRunning) {
+                // if we didn't get the simulation yet, try again each frame
+                if (simulation == null) {
+                    simulation = this.GetSimulation();
+
                     if (simulation != null)
-                    {
-                        if (enabled)
-                        {
+                        simulation.ColliderShapesRenderGroup = RenderGroup;
+                }
+
+                if (Input.IsKeyDown(Keys.LeftShift) && Input.IsKeyDown(Keys.LeftCtrl) && Input.IsKeyReleased(Keys.P)) {
+                    if (simulation != null) {
+                        if (enabled) {
                             simulation.ColliderShapesRendering = false;
                             enabled = false;
-                        }
-                        else
-                        {
+                        } else {
                             simulation.ColliderShapesRendering = true;
                             enabled = true;
                         }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/GameProfiler.cs b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/GameProfiler.cs
index 237550403b..305ea80989 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/GameProfiler.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/GameProfiler.cs
@@ -119,11 +119,11 @@ public override async Task Execute()
                     }
 
                     // update the refreshing speed
-                    if (Input.IsKeyPressed(Keys.Subtract) || Input.IsKeyPressed(Keys.OemMinus))
+                    if (Input.IsKeyPressed(Keys.Subtract) || Input.IsKeyPressed(Keys.Minus))
                     {
                         RefreshTime = Math.Min(RefreshTime * 2, 10000);
                     }
-                    else if (Input.IsKeyPressed(Keys.Add) || Input.IsKeyPressed(Keys.OemPlus))
+                    else if (Input.IsKeyPressed(Keys.Add) || Input.IsKeyPressed(Keys.Plus))
                     {
                         RefreshTime = Math.Max(RefreshTime / 2, 100);
                     }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/SceneStreaming.cs b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/SceneStreaming.cs
index 3319057fc3..68192d7ee5 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/SceneStreaming.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Assets/Scripts/Utility/SceneStreaming.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization;
 using Xenko.Engine;
 using Xenko.Physics;
 
@@ -27,7 +28,7 @@ public class ##Scriptname## : SyncScript
         /// <summary>
         /// The url of the scene to load
         /// </summary>
-        public string Url { get; set; }
+        public UrlReference<Scene> Url { get; set; }
 
         /// <summary>
         /// The trigger volume. This should be a static collider, set to be a trigger
@@ -97,14 +98,14 @@ public override void Update()
                     if (shouldLoad)
                     {
                         // If we should load syncrhonously, just create a completed task and load 
-                        Instance = Content.Load<Scene>(Url);
+                        Instance = Content.Load(Url);
                         loadingTask = Task.FromResult(Instance);
                     }
                     else if (shouldPreLoad)
                     {
                         loadCancellation = new CancellationTokenSource();
 
-                        var localLoadingTask = loadingTask = Content.LoadAsync<Scene>(Url);
+                        var localLoadingTask = loadingTask = Content.LoadAsync(Url);
                         Script.AddTask(async () =>
                         {
                             await loadingTask;
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Properties/AndroidManifest.xml.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Properties/AndroidManifest.xml.t4
index 4d724c2578..980f7bdc95 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Properties/AndroidManifest.xml.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Properties/AndroidManifest.xml.t4
@@ -1,7 +1,7 @@
 <#@ template inherits="ProjectTemplateTransformation" language="C#" #>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="<#= Properties.PackageGameName #>" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="27" />
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
   <uses-permission android:name="android.permission.INTERNET" />
   <application android:label="<#= Properties.PackageGameDisplayName #>" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>  
 </manifest>
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Resources/drawable/XenkoIcon.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Resources/drawable/XenkoIcon.png
index 8e73b8a253..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Resources/drawable/XenkoIcon.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Android/Resources/drawable/XenkoIcon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:292d75e08f432e0d3286e063c97c4da7b4b12484dc4787f5fbb96b42891944b6
-size 5072
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$PackageGameNameShort$App.cs.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$PackageGameNameShort$App.cs.t4
index 7c3f225eaf..75e0891e75 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$PackageGameNameShort$App.cs.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$PackageGameNameShort$App.cs.t4
@@ -9,6 +9,7 @@ namespace <#= Properties.Namespace #>
         {
             using (var game = new Game())
             {
+				game.OverrideDefaultSettings(1280, 720, false);
                 game.Run();
             }
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$ProjectName$.csproj.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$ProjectName$.csproj.t4
index a576c760db..a0038d421e 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$ProjectName$.csproj.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/$ProjectName$.csproj.t4
@@ -2,8 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <DepsFileGenerationMode>old</DepsFileGenerationMode>
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>
     <RootNamespace><#= Properties.Namespace #></RootNamespace>
@@ -13,12 +14,11 @@
 
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\<#= Properties.ProjectGameRelativePath #>" />
-    <!-- Needed for custom runtime.json -->
-    <PackageReference Include="Xenko" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 
 </Project>
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/Resources/XenkoIcon.ico b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/Resources/XenkoIcon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/Resources/XenkoIcon.ico and b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Linux/Resources/XenkoIcon.ico differ
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon100x100.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon100x100.png
index f23cce0fbe..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon100x100.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon100x100.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d7e80f2fe0de13abed6a22b057cc22655ade0120b62f0703b2ae5cd185261d4
-size 2002
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon150x150.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon150x150.png
index 0b0fb0491a..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon150x150.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon150x150.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ee603dbeee19b2e9fc4bddb97033ee153b6c0f4d3109baccb61e1ff0a846a667
-size 5496
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon300x300.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon300x300.png
index ffc8329370..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon300x300.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon300x300.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be46f6820ce95c6f8370d22756d08d92542904e732eae586dc82ecc0c669b231
-size 6035
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon44x44.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon44x44.png
index d6165c5348..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon44x44.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon44x44.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ffff9fd2c7f527c2826cf2b882c96ac6e4807c6ebb7cfc2894febead4a1210a
-size 969
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon50x50.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon50x50.png
index abb74a6249..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon50x50.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon50x50.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9342dba0c76e8d7aac8234b7f82f3852766853205f7489cee25e7bc3169117b
-size 2010
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon88x88.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon88x88.png
index 587e109ee9..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon88x88.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.UWP/Assets/XenkoIcon88x88.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c4ce9d287a5860999db910782847585f47158515fd1ba606318135414279cd5
-size 1694
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$PackageGameNameShort$App.cs.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$PackageGameNameShort$App.cs.t4
index 7c3f225eaf..75e0891e75 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$PackageGameNameShort$App.cs.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$PackageGameNameShort$App.cs.t4
@@ -9,6 +9,7 @@ namespace <#= Properties.Namespace #>
         {
             using (var game = new Game())
             {
+				game.OverrideDefaultSettings(1280, 720, false);
                 game.Run();
             }
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$ProjectName$.csproj.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$ProjectName$.csproj.t4
index 12d0e23916..ab9db967d0 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$ProjectName$.csproj.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/$ProjectName$.csproj.t4
@@ -2,7 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
+	<RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>
     <RootNamespace><#= Properties.Namespace #></RootNamespace>
@@ -12,6 +13,7 @@
 
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/Resources/XenkoIcon.ico b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/Resources/XenkoIcon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/Resources/XenkoIcon.ico and b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.Windows/Resources/XenkoIcon.ico differ
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon114.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon114.png
index f0718da3e3..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon114.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon114.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d1ff6633eb9fa5c604689513a59f436bae2a1fd266a8366f98bccdc2b4d03cb
-size 5002
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon120.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon120.png
index 9476abcd27..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon120.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon120.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:492fcb4de2fadbb0a605ba3b89a80929eea3703251719ac00d885d49b1e1b3b0
-size 5058
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon57.png b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon57.png
index 839245c1d5..4b5059507f 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon57.png
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.iOS/Resources/XenkoIcon57.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:53af998aceec75fd2f7f014616468144a6f1a8e62687fd50c52ad2feaee7f87f
-size 2374
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$PackageGameNameShort$App.cs.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$PackageGameNameShort$App.cs.t4
index 7c3f225eaf..75e0891e75 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$PackageGameNameShort$App.cs.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$PackageGameNameShort$App.cs.t4
@@ -9,6 +9,7 @@ namespace <#= Properties.Namespace #>
         {
             using (var game = new Game())
             {
+				game.OverrideDefaultSettings(1280, 720, false);
                 game.Run();
             }
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$ProjectName$.csproj.t4 b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$ProjectName$.csproj.t4
index 6e9051c80f..bc509dc91a 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$ProjectName$.csproj.t4
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/$ProjectName$.csproj.t4
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
     <OutputType>WinExe</OutputType>
@@ -13,12 +13,11 @@
 
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+	<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\<#= Properties.ProjectGameRelativePath #>" />
-    <!-- Needed for custom runtime.json -->
-    <PackageReference Include="Xenko" Version="<#= Xenko.Assets.XenkoConfig.GetLatestPackageDependency().Version #>" PrivateAssets="contentfiles;analyzers" />
   </ItemGroup>
 
 </Project>
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/Resources/XenkoIcon.ico b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/Resources/XenkoIcon.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/Resources/XenkoIcon.ico and b/sources/editor/Xenko.Assets.Presentation/Templates/Core/ProjectExecutable.macOS/Resources/XenkoIcon.ico differ
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateParameters.cs b/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateParameters.cs
index 2580f10081..df9872d251 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateParameters.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateParameters.cs
@@ -22,16 +22,11 @@ public XenkoTemplateParameters()
 
     public class GameTemplateParameters : XenkoTemplateParameters
     {
-        public GameTemplateParameters()
-        {
-            GraphicsProfile = GraphicsProfile.Level_10_0;
-        }
-
         public List<SolutionPlatform> Platforms { get; set; }
 
         public bool IsHDR { get; set; }
 
-        public GraphicsProfile GraphicsProfile { get; set; }
+        public GraphicsProfile GraphicsProfile => GraphicsProfile.Level_11_2;
 
         public bool ForcePlatformRegeneration { get; set; }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateWindow.xaml.cs b/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateWindow.xaml.cs
index 71b370f2e4..6ce4252736 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateWindow.xaml.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/GameTemplateWindow.xaml.cs
@@ -61,7 +61,7 @@ public GameTemplateWindow(IEnumerable<SolutionPlatform> availablePlatforms, stri
             Orientation = DisplayOrientation.LandscapeRight;
             InitializeComponent();
             DataContext = this;
-            SelectedGraphicsProfile = GraphicsProfile.Level_10_0;
+            SelectedGraphicsProfile = GraphicsProfile.Level_11_2;
             IsHDR = true;
         }
 
@@ -77,7 +77,7 @@ public GameTemplateWindow(IEnumerable<SolutionPlatform> availablePlatforms, stri
 
         public IEnumerable<UDirectory> SelectedPackages { get { return AssetPackages.Where(x => x.IsSelected).Select(x => x.PackageLocation); } }
 
-        public GraphicsProfile SelectedGraphicsProfile { get { return selectedGraphicsProfile; } set { selectedGraphicsProfile = value; if (value < GraphicsProfile.Level_10_0) IsHDR = false; OnPropertyChanged(); } }
+        public GraphicsProfile SelectedGraphicsProfile { get { return selectedGraphicsProfile; } set { selectedGraphicsProfile = GraphicsProfile.Level_11_2; if (value < GraphicsProfile.Level_10_0) IsHDR = false; OnPropertyChanged(); } }
 
         public bool IsHDR { get { return isHDR; } set { isHDR = value; OnPropertyChanged(); } }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/GraphicsCompositorTemplateGenerator.cs b/sources/editor/Xenko.Assets.Presentation/Templates/GraphicsCompositorTemplateGenerator.cs
index 88d2a8bd53..e0810286f6 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/GraphicsCompositorTemplateGenerator.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/GraphicsCompositorTemplateGenerator.cs
@@ -13,20 +13,23 @@ public class GraphicsCompositorTemplateGenerator : AssetFactoryTemplateGenerator
     {
         public new static readonly GraphicsCompositorTemplateGenerator Default = new GraphicsCompositorTemplateGenerator();
 
-        public static readonly Guid Level9TemplateId = new Guid("20947F4A-7B50-4716-AC85-D10EFF58CD33");
-        public static readonly Guid Level10TemplateId = new Guid("D4EE3BD3-9B06-460E-9175-D6AFB2459463");
+        public static readonly Dictionary<Guid, string> SupportedTemplatesToUrl = new Dictionary<Guid, string>
+        {
+            { new Guid("20947F4A-7B50-4716-AC85-D10EFF58CD33"), XenkoPackageUpgrader.DefaultGraphicsCompositorLevel9Url },
+            { new Guid("D4EE3BD3-9B06-460E-9175-D6AFB2459463"), XenkoPackageUpgrader.DefaultGraphicsCompositorLevel10Url },
+            { new Guid("4BC182D7-69D5-4BE2-9AF3-1C82F67B629D"), "GraphicsCompositor/DefaultGraphicsCompositorVoxels" },
+        };
 
         public override bool IsSupportingTemplate(TemplateDescription templateDescription)
         {
             if (templateDescription == null) throw new ArgumentNullException(nameof(templateDescription));
-            return templateDescription.Id == Level9TemplateId || templateDescription.Id == Level10TemplateId;
+            return SupportedTemplatesToUrl.ContainsKey(templateDescription.Id);
         }
 
         protected override IEnumerable<AssetItem> CreateAssets(AssetTemplateGeneratorParameters parameters)
         {
             // Find default graphics compositor to create a derived asset from
-            var graphicsCompositorUrl = parameters.Description.Id == Level9TemplateId ? XenkoPackageUpgrader.DefaultGraphicsCompositorLevel9Url : XenkoPackageUpgrader.DefaultGraphicsCompositorLevel10Url;
-            var graphicsCompositor = parameters.Package.FindAsset(graphicsCompositorUrl);
+            var graphicsCompositor = SupportedTemplatesToUrl.TryGetValue(parameters.Description.Id, out var graphicsCompositorUrl) ? parameters.Package.FindAsset(graphicsCompositorUrl) : null;
 
             // Something went wrong, create an empty asset
             if (graphicsCompositor == null)
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/HeightmapFactoryTemplateGenerator.cs b/sources/editor/Xenko.Assets.Presentation/Templates/HeightmapFactoryTemplateGenerator.cs
new file mode 100644
index 0000000000..37f27119d0
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/HeightmapFactoryTemplateGenerator.cs
@@ -0,0 +1,45 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Xenko.Assets.Textures;
+using Xenko.Core;
+using Xenko.Core.Assets.Editor.Settings;
+using Xenko.Core.Assets.IO;
+using Xenko.Core.Assets.Templates;
+using Xenko.Core.IO;
+using Xenko.Core.Reflection;
+
+namespace Xenko.Assets.Presentation.Templates
+{
+    public class HeightmapFactoryTemplateGenerator : AssetFromFileTemplateGenerator
+    {
+        public new static readonly HeightmapFactoryTemplateGenerator Default = new HeightmapFactoryTemplateGenerator();
+
+        public static readonly Guid TemplateId = new Guid("127EC64F-6E15-4964-98F4-DB735B39AE09");
+
+        public override bool IsSupportingTemplate(TemplateDescription templateDescription)
+        {
+            if (templateDescription == null) throw new ArgumentNullException(nameof(templateDescription));
+            return templateDescription.Id == TemplateId;
+        }
+
+        protected override async Task<IEnumerable<UFile>> BrowseForSourceFiles(TemplateAssetDescription description, bool allowMultiSelection)
+        {
+            var assetType = description.GetAssetType();
+            var assetTypeName = TypeDescriptorFactory.Default.AttributeRegistry.GetAttribute<DisplayAttribute>(assetType)?.Name ?? assetType.Name;
+            var extensions = new FileExtensionCollection($"Source files for {assetTypeName}", TextureImporter.FileExtensions);
+            var result = await BrowseForFiles(extensions, allowMultiSelection, true, InternalSettings.FileDialogLastImportDirectory.GetValue());
+            if (result != null)
+            {
+                var list = result.ToList();
+                InternalSettings.FileDialogLastImportDirectory.SetValue(list.First());
+                InternalSettings.Save();
+                return list;
+            }
+            return null;
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml b/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml
index 71281e618d..61e963a1c6 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml
@@ -5,7 +5,7 @@
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                   xmlns:xk="http://schemas.xenko.com/xaml/presentation"
                   xmlns:templates="clr-namespace:Xenko.Assets.Presentation.Templates"
-                  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                   mc:Ignorable="d" SizeToContent="Height" Width="480"
                   Style="{DynamicResource WindowChromeStyle}" Title="{xk:Localize Import from model}"
                   d:DataContext="{d:DesignInstance templates:ImportModelFromFileViewModel}">
@@ -24,6 +24,8 @@
     <Border Margin="20,10,20,20">
       <StackPanel>
         <CheckBox Content="{xk:Localize Import materials, Context=Button}" IsChecked="{Binding ImportMaterials}" Margin="5"/>
+        <CheckBox Content="{xk:Localize Deduplicate materials, Context=Button}" IsChecked="{Binding DeduplicateMaterials}" Margin="5" Visibility="{Binding ShowDeduplicateMaterialsCheckBox, Converter={xk:VisibleOrCollapsed}}"/>
+        <TextBlock Text="{xk:Localize Warning\: Deduplicate materials is currently not supported for FBX files}" Margin="5" Visibility="{Binding ShowFbxDedupeNotSupportedWarning, Converter={xk:VisibleOrCollapsed}}"/>
         <CheckBox Content="{xk:Localize Import textures, Context=Button}" IsChecked="{Binding ImportTextures}" Margin="5"/>
       </StackPanel>
     </Border>
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml.cs b/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml.cs
index 84b1782d60..2020b2ded7 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/ModelAssetTemplateWindow.xaml.cs
@@ -34,12 +34,15 @@ public DummyReferenceContainer()
 
             bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
 
-            bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+            bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
         }
 
         private readonly DummyReferenceContainer referenceContainer = new DummyReferenceContainer();
 
         private bool importMaterials = true;
+        private bool showDeduplicateMaterialsCheckBox = true;
+        private bool showFbxDedupeNotSupportedWarning = false;
+        private bool deduplicateMaterials = true;
         private bool importTextures = true;
         private bool importSkeleton = true;
         private bool dontImportSkeleton;
@@ -53,6 +56,10 @@ public ImportModelFromFileViewModel(IViewModelServiceProvider serviceProvider)
 
         public bool ImportMaterials { get { return importMaterials; } set { SetValue(ref importMaterials, value); } }
 
+        public bool ShowDeduplicateMaterialsCheckBox { get { return showDeduplicateMaterialsCheckBox; } set { SetValue(ref showDeduplicateMaterialsCheckBox, value); } }
+        public bool ShowFbxDedupeNotSupportedWarning { get { return showFbxDedupeNotSupportedWarning; } set { SetValue(ref showFbxDedupeNotSupportedWarning, value); } }
+        public bool DeduplicateMaterials { get { return deduplicateMaterials; } set { SetValue(ref deduplicateMaterials, value); } }
+
         public bool ImportTextures { get { return importTextures; } set { SetValue(ref importTextures, value); } }
 
         public bool ImportSkeleton { get { return importSkeleton; } set { SetValue(ref importSkeleton, value); } }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/ModelFromFileTemplateGenerator.cs b/sources/editor/Xenko.Assets.Presentation/Templates/ModelFromFileTemplateGenerator.cs
index 8f532fa9fe..306cc708eb 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/ModelFromFileTemplateGenerator.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/ModelFromFileTemplateGenerator.cs
@@ -24,6 +24,7 @@ namespace Xenko.Assets.Presentation.Templates
     public static class ModelFromFileTemplateSettings
     {
         public static SettingsKey<bool> ImportMaterials = new SettingsKey<bool>("Templates/ModelFromFile/ImportMaterials", PackageUserSettings.SettingsContainer, true);
+        public static SettingsKey<bool> DeduplicateMaterials = new SettingsKey<bool>("Templates/ModelFromFile/DeduplicateMaterials", PackageUserSettings.SettingsContainer, true);
         public static SettingsKey<bool> ImportTextures = new SettingsKey<bool>("Templates/ModelFromFile/ImportTextures", PackageUserSettings.SettingsContainer, true);
         public static SettingsKey<bool> ImportSkeleton = new SettingsKey<bool>("Templates/ModelFromFile/ImportSkeleton", PackageUserSettings.SettingsContainer, true);
         public static SettingsKey<AssetId> DefaultSkeleton = new SettingsKey<AssetId>("Templates/ModelFromFile/DefaultSkeleton", PackageUserSettings.SettingsContainer, AssetId.Empty);
@@ -36,6 +37,7 @@ public class ModelFromFileTemplateGenerator : AssetFromFileTemplateGenerator
         public static Guid Id = new Guid("3B778954-54C4-4FF3-97EF-4CD7AEA0B97D");
 
         protected static readonly PropertyKey<bool> ImportMaterialsKey = new PropertyKey<bool>("ImportMaterials", typeof(ModelFromFileTemplateGenerator));
+        protected static readonly PropertyKey<bool> DeduplicateMaterialsKey = new PropertyKey<bool>("DeduplicateMaterials", typeof(ModelFromFileTemplateGenerator));
         protected static readonly PropertyKey<bool> ImportTexturesKey = new PropertyKey<bool>("ImportTextures", typeof(ModelFromFileTemplateGenerator));
         protected static readonly PropertyKey<bool> ImportSkeletonKey = new PropertyKey<bool>("ImportSkeleton", typeof(ModelFromFileTemplateGenerator));
         protected static readonly PropertyKey<Skeleton> SkeletonToUseKey = new PropertyKey<Skeleton>("SkeletonToUse", typeof(ModelFromFileTemplateGenerator));
@@ -55,6 +57,8 @@ protected override async Task<bool> PrepareAssetCreation(AssetTemplateGeneratorP
             if (files == null)
                 return true;
 
+            var showDeduplicateMaterialsCheckBox = files.Any(x => ImportAssimpCommand.IsSupportingExtensions(x.GetFileExtension()));
+            var showFbxDedupeNotSupportedWarning = showDeduplicateMaterialsCheckBox && files.Any(x => ImportFbxCommand.IsSupportingExtensions(x.GetFileExtension()));
             // Load settings from the last time this template was used for this project
             var profile = parameters.Package.UserSettings.Profile;
             var window = new ModelAssetTemplateWindow
@@ -62,6 +66,9 @@ protected override async Task<bool> PrepareAssetCreation(AssetTemplateGeneratorP
                 Parameters =
                 {
                     ImportMaterials = ModelFromFileTemplateSettings.ImportMaterials.GetValue(profile, true),
+                    ShowDeduplicateMaterialsCheckBox = showDeduplicateMaterialsCheckBox,
+                    ShowFbxDedupeNotSupportedWarning = showFbxDedupeNotSupportedWarning,
+                    DeduplicateMaterials = ModelFromFileTemplateSettings.DeduplicateMaterials.GetValue(profile, true),
                     ImportTextures = ModelFromFileTemplateSettings.ImportTextures.GetValue(profile, true),
                     ImportSkeleton = ModelFromFileTemplateSettings.ImportSkeleton.GetValue(profile, true)
                 }
@@ -83,12 +90,14 @@ protected override async Task<bool> PrepareAssetCreation(AssetTemplateGeneratorP
             // Apply settings
             var skeletonToReuse = window.Parameters.ReuseSkeleton ? window.Parameters.SkeletonToReuse : null;
             parameters.Tags.Set(ImportMaterialsKey, window.Parameters.ImportMaterials);
+            parameters.Tags.Set(DeduplicateMaterialsKey, window.Parameters.DeduplicateMaterials);
             parameters.Tags.Set(ImportTexturesKey, window.Parameters.ImportTextures);
             parameters.Tags.Set(ImportSkeletonKey, window.Parameters.ImportSkeleton);
             parameters.Tags.Set(SkeletonToUseKey, skeletonToReuse);
 
             // Save settings
             ModelFromFileTemplateSettings.ImportMaterials.SetValue(window.Parameters.ImportMaterials, profile);
+            ModelFromFileTemplateSettings.DeduplicateMaterials.SetValue(window.Parameters.DeduplicateMaterials, profile);
             ModelFromFileTemplateSettings.ImportTextures.SetValue(window.Parameters.ImportTextures, profile);
             ModelFromFileTemplateSettings.ImportSkeleton.SetValue(window.Parameters.ImportSkeleton, profile);
             skeletonId = AttachedReferenceManager.GetAttachedReference(skeletonToReuse)?.Id ?? AssetId.Empty;
@@ -105,11 +114,13 @@ protected override IEnumerable<AssetItem> CreateAssets(AssetTemplateGeneratorPar
                 return base.CreateAssets(parameters);
 
             var importMaterials = parameters.Tags.Get(ImportMaterialsKey);
+            var deduplicateMaterials = parameters.Tags.Get(DeduplicateMaterialsKey);
             var importTextures = parameters.Tags.Get(ImportTexturesKey);
             var importSkeleton = parameters.Tags.Get(ImportSkeletonKey);
             var skeletonToReuse = parameters.Tags.Get(SkeletonToUseKey);
 
             var importParameters = new AssetImporterParameters { Logger = parameters.Logger };
+            importParameters.InputParameters.Set(ModelAssetImporter.DeduplicateMaterialsKey, deduplicateMaterials);
             importParameters.SelectedOutputTypes.Add(typeof(ModelAsset), true);
             importParameters.SelectedOutputTypes.Add(typeof(MaterialAsset), importMaterials);
             importParameters.SelectedOutputTypes.Add(typeof(TextureAsset), importTextures);
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/NewGameTemplateGenerator.cs b/sources/editor/Xenko.Assets.Presentation/Templates/NewGameTemplateGenerator.cs
index 5fdf614ef0..432068cca4 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/NewGameTemplateGenerator.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/NewGameTemplateGenerator.cs
@@ -156,6 +156,7 @@ protected override bool Generate(SessionTemplateGeneratorParameters parameters)
                 Description = parameters.Description,
                 Package = package,
                 Logger = parameters.Logger,
+                Namespace = parameters.Namespace
             };
 
             // Generate executable projects for each platform
@@ -207,7 +208,6 @@ protected override bool Generate(SessionTemplateGeneratorParameters parameters)
             gameSettingsAsset.GraphicsCompositor = AttachedReferenceManager.CreateProxyObject<GraphicsCompositor>(graphicsCompositor.ToReference());
 
             var renderingSettings = gameSettingsAsset.GetOrCreate<RenderingSettings>();
-            renderingSettings.DefaultGraphicsProfile = parameters.GetTag(GraphicsProfileKey);
             renderingSettings.DisplayOrientation = (RequiredDisplayOrientation)orientation;
 
             var gameSettingsAssetItem = new AssetItem(GameSettingsAsset.GameSettingsLocation, gameSettingsAsset);
@@ -326,39 +326,6 @@ private void CreateAndSetNewScene(SessionTemplateGeneratorParameters parameters,
             // Create the ground entity
             var groundEntity = new Entity("Ground") { new ModelComponent(AttachedReferenceManager.CreateProxyObject<Model>(groundModelAssetItem.Id, groundModelAssetItem.Location)) };
 
-            // Copy file in Resources
-            var skyboxFilename = (UFile)(isHDR ? "skybox_texture_hdr.dds" : "skybox_texture_ldr.dds");
-            try
-            {
-                var resources = UPath.Combine(package.RootDirectory, (UDirectory)"Resources");
-                Directory.CreateDirectory(resources.ToWindowsPath());
-
-                // TODO: Hardcoded due to the fact that part of the template is in another folder in dev build
-                // We might want to extend TemplateFolder to support those cases
-                var dataDirectory = ProjectTemplateGeneratorHelper.GetTemplateDataDirectory(parameters.Description);
-                var skyboxFullPath = UPath.Combine(dataDirectory, skyboxFilename).ToWindowsPath();
-                File.Copy(skyboxFullPath, UPath.Combine(resources, skyboxFilename).ToWindowsPath(), true);
-            }
-            catch (Exception ex)
-            {
-                logger.Error("Unexpected exception while copying cubemap", ex);
-            }
-
-            // Create the texture asset
-            var skyboxTextureAsset = new TextureAsset { Source = Path.Combine(@"../Resources", skyboxFilename), IsCompressed = isHDR, Type = new ColorTextureType { UseSRgbSampling = false } };
-            var skyboxTextureAssetItem = new AssetItem("Skybox texture", skyboxTextureAsset);
-            package.Assets.Add(skyboxTextureAssetItem);
-            skyboxTextureAssetItem.IsDirty = true;
-
-            // Create the skybox asset
-            var skyboxAsset = new SkyboxAsset
-            {
-                CubeMap = AttachedReferenceManager.CreateProxyObject<Texture>(skyboxTextureAssetItem.Id, skyboxTextureAssetItem.Location)
-            };
-            var skyboxAssetItem = new AssetItem("Skybox", skyboxAsset);
-            package.Assets.Add(skyboxAssetItem);
-            skyboxAssetItem.IsDirty = true;
-
             // Create the scene
             var defaultSceneAsset = isHDR ? SceneHDRFactory.Create() : SceneLDRFactory.Create();
 
@@ -380,16 +347,6 @@ private void CreateAndSetNewScene(SessionTemplateGeneratorParameters parameters,
                 gameSettingsAsset.IsDirty = true;
             }
 
-            var skyboxEntity = defaultSceneAsset.Hierarchy.Parts.Select(x => x.Value.Entity).Single(x => x.Name == SceneBaseFactory.SkyboxEntityName);
-            skyboxEntity.Get<BackgroundComponent>().Texture = skyboxAsset.CubeMap;
-            if (isHDR)
-            {
-                skyboxEntity.Get<LightComponent>().Type = new LightSkybox
-                {
-                    Skybox = AttachedReferenceManager.CreateProxyObject<Skybox>(skyboxAssetItem.Id, skyboxAssetItem.Location)
-                };
-            }
-
             var cameraEntity = defaultSceneAsset.Hierarchy.Parts.Select(x => x.Value.Entity).Single(x => x.Name == SceneBaseFactory.CameraEntityName);
             var graphicsCompositor = package.Assets.Select(x => x.Asset).OfType<GraphicsCompositorAsset>().Single();
             cameraEntity.Components.Get<CameraComponent>().Slot = graphicsCompositor.Cameras.Single().ToSlotId();
@@ -405,7 +362,8 @@ private static void CopyAssetPacks(SessionTemplateGeneratorParameters parameters
         {
             var logger = parameters.Logger;
 
-            var presentationPackageFile = PackageStore.Instance.GetPackageFileName("Xenko.Samples.Templates", new PackageVersionRange(new PackageVersion(XenkoVersion.NuGetVersionSuffix != string.Empty ? "3.1.0.1-beta02" : "3.1.0.1")));
+            var presentationPackageFile = PackageStore.Instance.GetPackageFileName("Xenko.Samples.Templates", new PackageVersionRange(new PackageVersion(Xenko.Samples.Templates.ThisPackageVersion.Current)));
+            if (presentationPackageFile == null) return;
             var assetPackagesDir = UDirectory.Combine(presentationPackageFile.GetFullDirectory(), @"Templates\Samples\Templates\Packs");
             var assetPacks = parameters.TryGetTag(AssetsKey);
             if (assetPacks == null)
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/SoundFromFileTemplateGenerator.cs b/sources/editor/Xenko.Assets.Presentation/Templates/SoundFromFileTemplateGenerator.cs
index c9b2f0453e..7dc5e37540 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/SoundFromFileTemplateGenerator.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/SoundFromFileTemplateGenerator.cs
@@ -39,20 +39,20 @@ public override bool IsSupportingTemplate(TemplateDescription templateDescriptio
         protected override IEnumerable<AssetItem> CreateAssets(AssetTemplateGeneratorParameters parameters)
         {
             var importedAssets = new List<AssetItem>();
-            using (var media = new FFmpegMedia())
+            foreach (var assetItem in base.CreateAssets(parameters))
             {
-                foreach (var assetItem in base.CreateAssets(parameters))
+                if (assetItem.Asset is SoundAsset soundAsset)
                 {
-                    if (assetItem.Asset is SoundAsset soundAsset)
+                    using (var media = new FFmpegMedia())
                     {
                         media.Open(soundAsset.Source.ToWindowsPath());
-                        foreach( var audioTrack in media.Streams.OfType<AudioStream>().ToList())
+                        foreach (var audioTrack in media.Streams.OfType<AudioStream>().ToList())
                         {
                             var assetCopy = AssetCloner.Clone(soundAsset);
                             assetCopy.Index = audioTrack.Index;
                             assetCopy.SampleRate = audioTrack.SampleRate;
 
-                            importedAssets.Add(new AssetItem(assetItem.Location + " track " + audioTrack.Index, assetCopy));
+                            importedAssets.Add(new AssetItem(assetItem.Location + (audioTrack.Index > 0 ? " track " + audioTrack.Index : ""), assetCopy));
                         }
                     }
                 }
diff --git a/sources/editor/Xenko.Assets.Presentation/Templates/XenkoTemplates.cs b/sources/editor/Xenko.Assets.Presentation/Templates/XenkoTemplates.cs
index 7da97da3e4..5c7919ce70 100644
--- a/sources/editor/Xenko.Assets.Presentation/Templates/XenkoTemplates.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Templates/XenkoTemplates.cs
@@ -16,6 +16,7 @@ public static void Register()
             TemplateManager.Register(AssetFactoryTemplateGenerator.Default);
             TemplateManager.Register(AssetFromFileTemplateGenerator.Default);
             // Specific asset templates must be registered after AssetFactoryTemplateGenerator
+            TemplateManager.Register(HeightmapFactoryTemplateGenerator.Default);
             TemplateManager.Register(ColliderShapeHullFactoryTemplateGenerator.Default);
             TemplateManager.Register(ProceduralModelFactoryTemplateGenerator.Default);
             TemplateManager.Register(SkyboxFactoryTemplateGenerator.Default);
diff --git a/sources/editor/Xenko.Assets.Presentation/Test/TestAsset.cs b/sources/editor/Xenko.Assets.Presentation/Test/TestAsset.cs
index 0dec43de22..d276f973d4 100644
--- a/sources/editor/Xenko.Assets.Presentation/Test/TestAsset.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Test/TestAsset.cs
@@ -195,43 +195,31 @@ public sealed class TestAsset : Asset
         public Vector4 Vector4 { get; set; }
 
         [DataMember(48)]
-        [Display("Int2", "Int types")]
-        public Int2 Int2 { get; set; }
-
-        [DataMember(49)]
-        [Display("Int3", "Int types")]
-        public Int3 Int3 { get; set; }
-
-        [DataMember(50)]
-        [Display("Int4", "Int types")]
-        public Int4 Int4 { get; set; }
-
-        [DataMember(51)]
         [Display("RectangleF", "Vector types")]
         public RectangleF RectangleF { get; set; }
 
-        [DataMember(52)]
+        [DataMember(49)]
         [Display("Rectangle", "Vector types")]
         public Rectangle Rectangle { get; set; }
 
-        [DataMember(53)]
+        [DataMember(50)]
         [Display("Angle", "Vector types")]
         public AngleSingle Angle { get; set; }
 
-        [DataMember(54)]
+        [DataMember(51)]
         [Display("Rotation", "Vector types")]
         public Quaternion Rotation { get; set; }
 
-        [DataMember(55)]
+        [DataMember(52)]
         [Display("Matrix", "Vector types")]
         public Matrix Matrix { get; set; }
 
         // TODO: Add ImageEnum and ImageFlagEnum
-        [DataMember(56)]
+        [DataMember(53)]
         [Display("Nullable Enum", "Class & Struct types")]
         public TestEnum? NullableEnum { get; set; }
 
-        [DataMember(57)]
+        [DataMember(55)]
         [Display("Nullable Rectangle", "Class & Struct types")]
         public Rectangle? NullableRectangle { get; set; }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/Themes/Generic.xaml b/sources/editor/Xenko.Assets.Presentation/Themes/Generic.xaml
index bc0125d76b..9558453c1e 100644
--- a/sources/editor/Xenko.Assets.Presentation/Themes/Generic.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/Themes/Generic.xaml
@@ -4,7 +4,7 @@
     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
     xmlns:views="clr-namespace:Xenko.Assets.Presentation.Preview.Views"
     xmlns:valueConverters="clr-namespace:Xenko.Core.Assets.Editor.View.ValueConverters;assembly=Xenko.Core.Assets.Editor"
-    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:behaviors="clr-namespace:Xenko.Assets.Presentation.View.Behaviors"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -397,4 +397,61 @@
       </Setter.Value>
     </Setter>
   </Style>
+
+  <Style TargetType="{x:Type views:HeightmapPreviewView}">
+    <Setter Property="Template">
+      <Setter.Value>
+        <ControlTemplate TargetType="{x:Type views:HeightmapPreviewView}">
+          <DockPanel d:DataContext="{d:DesignInstance viewModel:HeightmapPreviewViewModel}">
+            <Grid Background="{StaticResource NormalBrush}" DockPanel.Dock="Top">
+              <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+              </Grid.RowDefinitions>
+              <DockPanel Grid.Row="0">
+                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
+                  <Button Command="{Binding PreviewZoomOutCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageZoomOut}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                  <Button Command="{Binding PreviewZoomInCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageZoomIn}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                  <Button Command="{Binding PreviewScaleToRealSizeCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageScaleOnRealSize}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                  <Button Command="{Binding PreviewFitOnScreenCommand}" Background="Transparent" Margin="2">
+                    <Image Source="{StaticResource ImageFitOnScreen}" RenderOptions.BitmapScalingMode="NearestNeighbor" Width="16" Height="16" />
+                  </Button>
+                </StackPanel>
+              </DockPanel>
+            </Grid>
+            <StatusBar DockPanel.Dock="Bottom" Visibility="{Binding Session, Converter={xk:Chained {xk:ObjectToBool}, {xk:VisibleOrCollapsed}}}">
+              <StatusBar.ItemsPanel>
+                <ItemsPanelTemplate>
+                  <Grid>
+                    <Grid.ColumnDefinitions>
+                      <ColumnDefinition Width="*"/>
+                      <ColumnDefinition Width="Auto"/>
+                      <ColumnDefinition Width="2*"/>
+                    </Grid.ColumnDefinitions>
+                  </Grid>
+                </ItemsPanelTemplate>
+              </StatusBar.ItemsPanel>
+              <StatusBarItem Grid.Column="0">
+                <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding SpriteScale, StringFormat={}{0:P}}"/>
+              </StatusBarItem>
+              <Separator Grid.Column="1"/>
+              <StatusBarItem Grid.Column="2">
+                <StackPanel Orientation="Horizontal">
+                  <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding PreviewHeightmapWidth, StringFormat={xk:Localize W: {0}}}"/>
+                  <TextBlock Margin="5" VerticalAlignment="Center" Text="{Binding PreviewHeightmapLength, StringFormat={xk:Localize L: {0}}}"/>
+                </StackPanel>
+              </StatusBarItem>
+            </StatusBar>
+
+            <ContentPresenter x:Name="PART_XenkoView"/>
+          </DockPanel>
+        </ControlTemplate>
+      </Setter.Value>
+    </Setter>
+  </Style>
 </ResourceDictionary>
diff --git a/sources/editor/Xenko.Assets.Presentation/Thumbnails/HeightmapThumbnailCompiler.cs b/sources/editor/Xenko.Assets.Presentation/Thumbnails/HeightmapThumbnailCompiler.cs
new file mode 100644
index 0000000000..c9872d02a3
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/Thumbnails/HeightmapThumbnailCompiler.cs
@@ -0,0 +1,87 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Collections.Generic;
+using Xenko.Assets.Physics;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Editor.Thumbnails;
+using Xenko.Graphics;
+using Xenko.Physics;
+using Xenko.Rendering;
+
+namespace Xenko.Assets.Presentation.Thumbnails
+{
+    [AssetCompiler(typeof(HeightmapAsset), typeof(ThumbnailCompilationContext))]
+    public class HeightmapThumbnailCompiler : ThumbnailCompilerBase<HeightmapAsset>
+    {
+        public HeightmapThumbnailCompiler()
+        {
+            IsStatic = false;
+            Priority = 10050;
+        }
+
+        public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
+        {
+            var asset = (HeightmapAsset)assetItem.Asset;
+            var url = asset.Source.FullPath;
+            if (!string.IsNullOrEmpty(url))
+            {
+                yield return new ObjectUrl(UrlType.File, url);
+            }
+        }
+
+        protected override void CompileThumbnail(ThumbnailCompilerContext context, string thumbnailStorageUrl, AssetItem assetItem, Package originalPackage, AssetCompilerResult result)
+        {
+            result.BuildSteps.Add(new ThumbnailBuildStep(new HeightmapThumbnailCommand(context, assetItem, originalPackage, thumbnailStorageUrl,
+                new ThumbnailCommandParameters(assetItem.Asset, thumbnailStorageUrl, context.ThumbnailResolution))
+            { InputFilesGetter = () => GetInputFiles(assetItem) }));
+        }
+
+        /// <summary>
+        /// Command used to build the thumbnail of the texture in the storage
+        /// </summary>
+        public class HeightmapThumbnailCommand : ThumbnailFromSpriteBatchCommand<Heightmap>
+        {
+            private Texture texture;
+
+            public HeightmapThumbnailCommand(ThumbnailCompilerContext context, AssetItem assetItem, IAssetFinder assetFinder, string url, ThumbnailCommandParameters parameters)
+                : base(context, assetItem, assetFinder, url, parameters)
+            {
+                parameters.ColorSpace = ColorSpace.Linear;
+            }
+
+            protected override void PreloadAsset()
+            {
+                base.PreloadAsset();
+
+                texture = LoadedAsset?.CreateTexture(GraphicsDevice);
+            }
+
+            protected override void UnloadAsset()
+            {
+                if (texture != null)
+                {
+                    texture.Dispose();
+                    texture = null;
+                }
+
+                base.UnloadAsset();
+            }
+
+            protected override void RenderSprites(RenderDrawContext context)
+            {
+                if (LoadedAsset == null)
+                    return;
+
+                if (texture != null)
+                {
+                    var destinationRectangle = new RectangleF(0, 0, Parameters.ThumbnailSize.X, Parameters.ThumbnailSize.Y);
+
+                    SpriteBatch.Draw(texture, destinationRectangle, new RectangleF(0, 0, texture.Width, texture.Height), Color.White, 0f, new Vector2(0, 0), SpriteEffects.None, swizzle: SwizzleMode.RRR1);
+                }
+            }
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/Thumbnails/UIPageThumbnailCompiler.cs b/sources/editor/Xenko.Assets.Presentation/Thumbnails/UIPageThumbnailCompiler.cs
index caa97d1100..ec8350c01b 100644
--- a/sources/editor/Xenko.Assets.Presentation/Thumbnails/UIPageThumbnailCompiler.cs
+++ b/sources/editor/Xenko.Assets.Presentation/Thumbnails/UIPageThumbnailCompiler.cs
@@ -73,7 +73,6 @@ protected override Entity CreateEntity()
                 {
                     Page = LoadedAsset,
                     Resolution = designResolution,
-                    Size = designResolution / UIEditorController.DesignDensity,
                     IsFullScreen = false,
                 });
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/AddEntityComponentUserControl.xaml b/sources/editor/Xenko.Assets.Presentation/View/AddEntityComponentUserControl.xaml
index 7d1dc29b78..6168e32805 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/AddEntityComponentUserControl.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/AddEntityComponentUserControl.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:local="clr-namespace:Xenko.Assets.Presentation.View"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
diff --git a/sources/editor/Xenko.Assets.Presentation/View/AnimationPropertyTemplates.xaml b/sources/editor/Xenko.Assets.Presentation/View/AnimationPropertyTemplates.xaml
index fb1b7f8d2b..4da955c5f9 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/AnimationPropertyTemplates.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/AnimationPropertyTemplates.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
                     xmlns:tp="clr-namespace:Xenko.Assets.Presentation.TemplateProviders"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:s="clr-namespace:System;assembly=mscorlib"
                     xmlns:valueConverters="clr-namespace:Xenko.Assets.Presentation.ValueConverters"
                     xmlns:qvm="clr-namespace:Xenko.Core.Presentation.Quantum.ViewModels;assembly=Xenko.Core.Presentation.Quantum">
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindActualSizeBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindActualSizeBehavior.cs
index a41d1ef262..2e1566800f 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindActualSizeBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindActualSizeBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 using Xenko.Core.Presentation.Core;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindScrollOffsetBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindScrollOffsetBehavior.cs
index a7c5ace760..b23081685f 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindScrollOffsetBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/BindScrollOffsetBehavior.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 using Xenko.Core.Presentation.Core;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/SuspendAnimationDuringSliderDragBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/SuspendAnimationDuringSliderDragBehavior.cs
index ef1db19e3f..6a93afbb6c 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/SuspendAnimationDuringSliderDragBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/SuspendAnimationDuringSliderDragBehavior.cs
@@ -5,7 +5,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 using Xenko.Assets.Presentation.ViewModel;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbBehavior.cs
index 29a10cd721..c8bab1e2fd 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Controls.Primitives;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Assets.Presentation.ViewModel;
 
 namespace Xenko.Assets.Presentation.View.Behaviors
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbLikeBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbLikeBehavior.cs
index cf7bda1ae3..5006d664a3 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbLikeBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ThumbLikeBehavior.cs
@@ -39,7 +39,7 @@ public sealed class ThumbLikeBehavior : MouseMoveCaptureBehaviorBase<UIElement>
 
         /// <summary>
         /// The reference from which deltas are calculated.
-        /// When null, <see cref="System.Windows.Interactivity.Behavior.AssociatedObject"/> will be used instead.
+        /// When null, <see cref="Microsoft.Xaml.Behaviors.Behavior.AssociatedObject"/> will be used instead.
         /// </summary>
         public UIElement Reference { get { return (UIElement)GetValue(ReferenceProperty); } set { SetValue(ReferenceProperty, value); } }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportPaneBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportPaneBehavior.cs
index 6ef1dc6a27..a1f2a2a4f6 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportPaneBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportPaneBehavior.cs
@@ -3,7 +3,7 @@
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Assets.Presentation.AssetEditors.SpriteEditor.ViewModels;
 using Xenko.Assets.Presentation.ViewModel;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportZoomBehavior.cs b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportZoomBehavior.cs
index 5efd97c16a..17441ea52e 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportZoomBehavior.cs
+++ b/sources/editor/Xenko.Assets.Presentation/View/Behaviors/ViewportZoomBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Assets.Presentation.AssetEditors.SpriteEditor.ViewModels;
 using Xenko.Assets.Presentation.ViewModel;
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/DebuggerPickerWindow.xaml b/sources/editor/Xenko.Assets.Presentation/View/DebuggerPickerWindow.xaml
index f1bd41230d..03928f47e2 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/DebuggerPickerWindow.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/DebuggerPickerWindow.xaml
@@ -1,7 +1,7 @@
 <xk:ModalWindow x:Class="Xenko.Assets.Presentation.View.DebuggerPickerWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:xk="http://schemas.xenko.com/xaml/presentation"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/sources/editor/Xenko.Assets.Presentation/View/EntityPropertyTemplates.xaml b/sources/editor/Xenko.Assets.Presentation/View/EntityPropertyTemplates.xaml
index 8f1dbedb92..5e331dcd4f 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/EntityPropertyTemplates.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/EntityPropertyTemplates.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:tp="clr-namespace:Xenko.Assets.Presentation.TemplateProviders"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:view="clr-namespace:Xenko.Core.Presentation.Quantum.View;assembly=Xenko.Core.Presentation.Quantum"
                     xmlns:system="clr-namespace:System;assembly=mscorlib"
                     xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors;assembly=Xenko.Core.Assets.Editor"
diff --git a/sources/editor/Xenko.Assets.Presentation/View/GraphicsCompositorTemplates.xaml b/sources/editor/Xenko.Assets.Presentation/View/GraphicsCompositorTemplates.xaml
index 2ed6625f34..e1f4d2d48d 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/GraphicsCompositorTemplates.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/GraphicsCompositorTemplates.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:view="clr-namespace:Xenko.Core.Presentation.Quantum.View;assembly=Xenko.Core.Presentation.Quantum"
                     xmlns:rendering="clr-namespace:Xenko.Rendering;assembly=Xenko.Engine"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation">
diff --git a/sources/editor/Xenko.Assets.Presentation/View/ImageDictionary.xaml b/sources/editor/Xenko.Assets.Presentation/View/ImageDictionary.xaml
index c2bdd5539f..d441b95a93 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/ImageDictionary.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/ImageDictionary.xaml
@@ -676,6 +676,17 @@
     </DrawingImage.Drawing>
   </DrawingImage>
 
+  <DrawingImage x:Key="ImageGrid" >
+    <DrawingImage.Drawing>
+      <DrawingGroup>
+        <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+        <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M14,14L2,14 2,2 14,2z" />
+        <GeometryDrawing Brush="#FF424242" Geometry="F1M12,6L10,6 10,4 12,4z M12,9L10,9 10,7 12,7z M12,12L10,12 10,10 12,10z M9,6L7,6 7,4 9,4z M9,9L7,9 7,7 9,7z M9,12L7,12 7,10 9,10z M6,6L4,6 4,4 6,4z M6,9L4,9 4,7 6,7z M6,12L4,12 4,10 6,10z M3,13L13,13 13,3 3,3z" />
+        <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M6,10L4,10 4,12 6,12z M6,7L4,7 4,9 6,9z M6,4L4,4 4,6 6,6z M12,4L10,4 10,6 12,6z M12,10L10,10 10,12 12,12z M12,7L10,7 10,9 12,9z M9,4L7,4 7,6 9,6z M9,10L7,10 7,12 9,12z M9,9L7,9 7,7 9,7z" />
+      </DrawingGroup>
+    </DrawingImage.Drawing>
+  </DrawingImage>
+
   <DrawingImage x:Key="ImageLighting" >
     <DrawingImage.Drawing>
       <DrawingGroup>
@@ -888,16 +899,6 @@
     </DrawingImage.Drawing>
   </DrawingImage>
 
-  <DrawingImage x:Key="{x:Type engine:AudioEmitterComponent}" >
-    <DrawingImage.Drawing>
-      <DrawingGroup>
-        <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-        <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M7.5861,-0.000199999999999534L3.5851,4.0008 9.99999999997669E-05,4.0008 9.99999999997669E-05,10.9998 3.5851,10.9998 7.5861,14.9998 10.0001,14.9998 10.0001,9.9998 10.9291,9.9998 13.3011,12.3708 15.3701,10.3008 14.0701,8.9998 16.0001,8.9998 16.0001,5.9998 14.0701,5.9998 15.3701,4.6988 13.3011,2.6298 10.9291,4.9998 10.0001,4.9998 10.0001,-0.000199999999999534z" />
-        <GeometryDrawing Brush="#FF414141" Geometry="F1M13,7C13.032,7.162 13.05,7.329 13.05,7.5 13.05,7.671 13.032,7.838 13,8L15,8 15,7z M11.956,9.611L13.301,10.957 13.956,10.301 12.611,8.957C12.439,9.217,12.217,9.439,11.956,9.611 M12.611,6.043L13.956,4.699 13.301,4.043 11.956,5.388C12.217,5.561,12.439,5.783,12.611,6.043 M9,6L11,6 11,9 9,9 9,14 8,14 4,10 1,10 1,5 4,5 8,1 9,1z" />
-      </DrawingGroup>
-    </DrawingImage.Drawing>
-  </DrawingImage>
-
   <DrawingImage x:Key="{x:Type engine:AudioListenerComponent}" >
     <DrawingImage.Drawing>
       <DrawingGroup>
diff --git a/sources/editor/Xenko.Assets.Presentation/View/SkeletonPropertyTemplates.xaml b/sources/editor/Xenko.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
index c7ee6425ed..05d0659ad8 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/SkeletonPropertyTemplates.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:templateProviders="clr-namespace:Xenko.Assets.Presentation.TemplateProviders"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:qvm="clr-namespace:Xenko.Core.Presentation.Quantum.ViewModels;assembly=Xenko.Core.Presentation.Quantum"
                     xmlns:view="clr-namespace:Xenko.Core.Presentation.Quantum.View;assembly=Xenko.Core.Presentation.Quantum">
 
diff --git a/sources/editor/Xenko.Assets.Presentation/View/VisualScriptingTemplates.xaml b/sources/editor/Xenko.Assets.Presentation/View/VisualScriptingTemplates.xaml
index 1c5c5ad0b5..87fc2380be 100644
--- a/sources/editor/Xenko.Assets.Presentation/View/VisualScriptingTemplates.xaml
+++ b/sources/editor/Xenko.Assets.Presentation/View/VisualScriptingTemplates.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:converters="clr-namespace:Xenko.Assets.Presentation.AssetEditors.VisualScriptEditor.Converters"
                     xmlns:templateProviders="clr-namespace:Xenko.Assets.Presentation.TemplateProviders">
 
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/Commands/MoveItemCommand.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/Commands/MoveItemCommand.cs
index a8795faf0c..c8e8731d5c 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/Commands/MoveItemCommand.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/Commands/MoveItemCommand.cs
@@ -46,8 +46,8 @@ protected override void ExecuteSync(INodePresenter nodePresenter, object paramet
             var itemNode = (ItemNodePresenter)nodePresenter;
             var collectionNode = itemNode.OwnerCollection;
             var indices = (Tuple<int, int>)parameter;
-            var sourceIndex = new Index(indices.Item1);
-            var targetIndex = new Index(indices.Item2);
+            var sourceIndex = new NodeIndex(indices.Item1);
+            var targetIndex = new NodeIndex(indices.Item2);
             var value = itemNode.Value;
             collectionNode.RemoveItem(value, sourceIndex);
             collectionNode.AddItem(value, targetIndex);
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/CopyPasteProcessors/EntityComponentPasteProcessor.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/CopyPasteProcessors/EntityComponentPasteProcessor.cs
index c36de458ef..0711ea2e69 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/CopyPasteProcessors/EntityComponentPasteProcessor.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/CopyPasteProcessors/EntityComponentPasteProcessor.cs
@@ -21,7 +21,7 @@ public override bool Accept(Type targetRootType, Type targetMemberType, Type pas
         }
 
         /// <inheritdoc/>
-        protected override bool CanRemoveItem(IObjectNode collection, Index index)
+        protected override bool CanRemoveItem(IObjectNode collection, NodeIndex index)
         {
             if (collection.Type != typeof(EntityComponentCollection))
                 return base.CanRemoveItem(collection, index);
@@ -34,7 +34,7 @@ protected override bool CanRemoveItem(IObjectNode collection, Index index)
         }
 
         /// <inheritdoc/>
-        protected override bool CanInsertItem(IObjectNode collection, Index index, object newItem)
+        protected override bool CanInsertItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             if (collection.Type != typeof(EntityComponentCollection))
                 return base.CanInsertItem(collection, index, newItem);
@@ -54,7 +54,7 @@ protected override bool CanInsertItem(IObjectNode collection, Index index, objec
         }
 
         /// <inheritdoc/>
-        protected override bool CanReplaceItem(IObjectNode collection, Index index, object newItem)
+        protected override bool CanReplaceItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             if (collection.Type != typeof(EntityComponentCollection))
                 return base.CanReplaceItem(collection, index, newItem);
@@ -78,7 +78,7 @@ protected override bool CanReplaceItem(IObjectNode collection, Index index, obje
         }
 
         /// <inheritdoc/>
-        protected override void ReplaceItem(IObjectNode collection, Index index, object newItem)
+        protected override void ReplaceItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             // If we're replacing the transform component, only manually copy allowed properties to the existing one.
             if (collection.Type == typeof(EntityComponentCollection) && newItem is TransformComponent newTransform)
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/GraphicsCompositorViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/GraphicsCompositorViewModel.cs
index b75496b4f4..81521eb088 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/GraphicsCompositorViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/GraphicsCompositorViewModel.cs
@@ -21,7 +21,7 @@ public GraphicsCompositorViewModel(AssetViewModelConstructionParameters paramete
         }
 
         [Obsolete]
-        protected override void OnAssetPropertyChanged(string propertyName, IGraphNode node, Index index, object oldValue, object newValue)
+        protected override void OnAssetPropertyChanged(string propertyName, IGraphNode node, NodeIndex index, object oldValue, object newValue)
         {
             base.OnAssetPropertyChanged(propertyName, node, index, oldValue, newValue);
 
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/MaterialViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/MaterialViewModel.cs
index f87960b588..1f00dd89c8 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/MaterialViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/MaterialViewModel.cs
@@ -27,7 +27,7 @@ public MaterialViewModel(AssetViewModelConstructionParameters parameters)
         public static Type RootNodeType => typeof(MaterialAsset);
 
         [Obsolete]
-        protected override void OnAssetPropertyChanged(string propertyName, IGraphNode node, Index index, object oldValue, object newValue)
+        protected override void OnAssetPropertyChanged(string propertyName, IGraphNode node, NodeIndex index, object oldValue, object newValue)
         {
             base.OnAssetPropertyChanged(propertyName, node, index, oldValue, newValue);
             if (!PropertyGraph.UpdatingPropertyFromBase)
@@ -105,7 +105,7 @@ private void UpdateGenerics<T>(ShaderClassType shader, ComputeShaderClassBase<T>
                     if (parameterType == null)
                         continue;
 
-                    var index = new Index(generic.Name.Text);
+                    var index = new NodeIndex(generic.Name.Text);
                     if (genericsNode.Indices.Any(x => Equals(x, index)))
                     {
                         var value = genericsNode.Retrieve(index);
@@ -131,7 +131,7 @@ private void UpdateGenerics<T>(ShaderClassType shader, ComputeShaderClassBase<T>
             }
 
             // Remove all generics that we don't have anymore
-            keysToRemove.Select(x => new Index(x)).ForEach(x => genericsNode.Remove(genericsNode.Retrieve(x), x));
+            keysToRemove.Select(x => new NodeIndex(x)).ForEach(x => genericsNode.Remove(genericsNode.Retrieve(x), x));
         }
 
         private void UpdateCompositionNodes<T>(ShaderClassType shader, ComputeShaderClassBase<T> node, IObjectNode ownerNode)
@@ -147,7 +147,7 @@ private void UpdateCompositionNodes<T>(ShaderClassType shader, ComputeShaderClas
                     // ComputeColor only
                     if (member.Type.Name.Text == "ComputeColor")
                     {
-                        var index = new Index(member.Name.Text);
+                        var index = new NodeIndex(member.Name.Text);
                         if (compositionNodesNode.Indices.Any(x => Equals(x, index)))
                         {
                             // This composition node already exists, keep it in the list
@@ -163,7 +163,7 @@ private void UpdateCompositionNodes<T>(ShaderClassType shader, ComputeShaderClas
             }
 
             // Remove all composition nodes that we don't have anymore
-            keysToRemove.Select(x => new Index(x)).ForEach(x => compositionNodesNode.Remove(compositionNodesNode.Retrieve(x), x));
+            keysToRemove.Select(x => new NodeIndex(x)).ForEach(x => compositionNodesNode.Remove(compositionNodesNode.Retrieve(x), x));
         }
     }
 }
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelComponentViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelComponentViewModel.cs
index 959c8ff8c2..017419de85 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelComponentViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelComponentViewModel.cs
@@ -74,7 +74,7 @@ internal void UpdateNodePresenter(INodePresenter node)
                     {
                         var modelMaterial = model.Materials.Count > i ? model.Materials[i] : null;
                         var materialName = modelMaterial?.Name ?? $"(Material {i + 1})";
-                        var index = new Index(i);
+                        var index = new NodeIndex(i);
                         var virtualMaterial = factory.CreateVirtualNodePresenter(node, material.Name + "___Virtual", typeof(Material), i,
                                                    () => GetMaterial(materialsNode, index),
                                                    x => SetMaterial(materialsNode, index, (Material)x),
@@ -106,13 +106,13 @@ internal void UpdateNodePresenter(INodePresenter node)
             }
         }
 
-        private Task FetchMaterial(IObjectNode materialsNode, Index index)
+        private Task FetchMaterial(IObjectNode materialsNode, NodeIndex index)
         {
             var material = GetMaterial(materialsNode, index);
             return FetchAssetCommand.Fetch(entity.Editor.Session, material);
         }
 
-        private static void SetMaterial(IObjectNode materialNode, Index index, Material value)
+        private static void SetMaterial(IObjectNode materialNode, NodeIndex index, Material value)
         {
             if (materialNode.Indices.Contains(index))
             {
@@ -124,7 +124,7 @@ private static void SetMaterial(IObjectNode materialNode, Index index, Material
             }
         }
 
-        private object GetMaterial(IObjectNode materialNode, Index index)
+        private object GetMaterial(IObjectNode materialNode, NodeIndex index)
         {
             if (materialNode.Indices.Contains(index))
             {
@@ -143,7 +143,7 @@ private object GetMaterial(IObjectNode materialNode, Index index)
             return model?.Materials[index.Int].MaterialInstance.Material;
         }
 
-        private void SetMaterialEnabled(IObjectNode materialNode, Index index, bool value)
+        private void SetMaterialEnabled(IObjectNode materialNode, NodeIndex index, bool value)
         {
             if (value)
             {
@@ -157,7 +157,7 @@ private void SetMaterialEnabled(IObjectNode materialNode, Index index, bool valu
             }
         }
 
-        private static object IsMaterialEnabled(IObjectNode materialNode, Index index)
+        private static object IsMaterialEnabled(IObjectNode materialNode, NodeIndex index)
         {
             return materialNode.Indices.Contains(index);
         }
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelViewModel.cs
index c881b54bb9..c0f342935e 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/ModelViewModel.cs
@@ -47,6 +47,12 @@ protected override IAssetImporter GetImporter()
             return AssetRegistry.FindImporterForFile(Asset.Source).OfType<ModelAssetImporter>().FirstOrDefault();
         }
 
+        protected override void PrepareImporterInputParametersForUpdateFromSource(PropertyCollection importerInputParameters, ModelAsset asset)
+        {
+            // This setting will be ignored if it's the FBX importer
+            importerInputParameters.Set(ModelAssetImporter.DeduplicateMaterialsKey, asset.DeduplicateMaterials);
+        }
+
         protected override void UpdateAssetFromSource(ModelAsset assetToMerge)
         {
             // Create a dictionary containing all new and old materials, favoring old ones to maintain existing references
@@ -60,7 +66,7 @@ protected override void UpdateAssetFromSource(ModelAsset assetToMerge)
             var materialsNode = AssetRootNode[nameof(ModelAsset.Materials)].Target;
             while (Asset.Materials.Count > 0)
             {
-                materialsNode.Remove(Asset.Materials[0], new Index(0));
+                materialsNode.Remove(Asset.Materials[0], new NodeIndex(0));
             }
 
             // Repopulate the list of materials
@@ -72,7 +78,7 @@ protected override void UpdateAssetFromSource(ModelAsset assetToMerge)
                     id = ItemId.New();
 
                 // Use Restore to allow to set manually the id.
-                materialsNode.Restore(dictionary[assetToMerge.Materials[i].Name], new Index(i), id);
+                materialsNode.Restore(dictionary[assetToMerge.Materials[i].Name], new NodeIndex(i), id);
             }
         }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/Preview/HeightmapPreviewViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/Preview/HeightmapPreviewViewModel.cs
new file mode 100644
index 0000000000..6ed79b697d
--- /dev/null
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/Preview/HeightmapPreviewViewModel.cs
@@ -0,0 +1,40 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Assets.Presentation.Preview;
+using Xenko.Core.Assets.Editor.ViewModel;
+using Xenko.Editor.Preview;
+using Xenko.Editor.Preview.ViewModel;
+
+namespace Xenko.Assets.Presentation.ViewModel.Preview
+{
+    [AssetPreviewViewModel(typeof(HeightmapPreview))]
+    public class HeightmapPreviewViewModel : TextureBasePreviewViewModel
+    {
+        private HeightmapPreview heightmapPreview;
+        private int previewHeightmapLength;
+        private int previewHeightmapWidth;
+
+        public HeightmapPreviewViewModel(SessionViewModel session)
+            : base(session)
+        {
+        }
+
+        public int PreviewHeightmapLength { get { return previewHeightmapLength; } private set { SetValue(ref previewHeightmapLength, value); } }
+
+        public int PreviewHeightmapWidth { get { return previewHeightmapWidth; } private set { SetValue(ref previewHeightmapWidth, value); } }
+
+        public override void AttachPreview(IAssetPreview preview)
+        {
+            heightmapPreview = (HeightmapPreview)preview;
+            heightmapPreview.NotifyHeightmapLoaded += UpdateHeightmapInfo;
+            UpdateHeightmapInfo();
+            AttachPreviewTexture(preview);
+        }
+
+        private void UpdateHeightmapInfo()
+        {
+            PreviewHeightmapWidth = heightmapPreview.Width;
+            PreviewHeightmapLength = heightmapPreview.Length;
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/SceneViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/SceneViewModel.cs
index 6a539267bd..8d4ad58e0b 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/SceneViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/SceneViewModel.cs
@@ -171,7 +171,7 @@ protected override void Initialize()
             }
             foreach (var index in invalidIndices)
             {
-                childrenNode.Remove(Asset.ChildrenIds[index], new Index(index));
+                childrenNode.Remove(Asset.ChildrenIds[index], new NodeIndex(index));
             }
 
             if (Parent?.isInitialized == true)
@@ -251,7 +251,7 @@ private void ChildrenCollectionChanged(object sender, [NotNull] NotifyCollection
                             foreach (var scene in e.OldItems.Cast<SceneViewModel>())
                             {
                                 scene.Parent = null;
-                                childrenNode.Remove(scene.Id, new Index(e.OldStartingIndex));
+                                childrenNode.Remove(scene.Id, new NodeIndex(e.OldStartingIndex));
                             }
                         }
                         if (e.NewItems?.Count > 0)
@@ -265,7 +265,7 @@ private void ChildrenCollectionChanged(object sender, [NotNull] NotifyCollection
                                     scene.Parent?.Children.Remove(scene);
                                     scene.Parent = this;
                                 }
-                                childrenNode.Add(scene.Id, new Index(index++));
+                                childrenNode.Add(scene.Id, new NodeIndex(index++));
                             }
                         }
                         break;
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/SkeletonViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/SkeletonViewModel.cs
index 7166e6c3d3..d6802d7bb3 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/SkeletonViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/SkeletonViewModel.cs
@@ -36,7 +36,7 @@ protected override void UpdateAssetFromSource(SkeletonAsset assetToMerge)
             var skeletonNodes = AssetRootNode[nameof(SkeletonAsset.Nodes)].Target;
             while (Asset.Nodes.Count > 0)
             {
-                skeletonNodes.Remove(Asset.Nodes[0], new Index(0));
+                skeletonNodes.Remove(Asset.Nodes[0], new NodeIndex(0));
             }
 
             // Repopulate the list of nodes
@@ -52,7 +52,7 @@ protected override void UpdateAssetFromSource(SkeletonAsset assetToMerge)
                 if (!ids.TryGetValue(assetToMerge.Nodes[i].Name, out id))
                     id = ItemId.New();
 
-                skeletonNodes.Restore(newNode, new Index(i), id);
+                skeletonNodes.Restore(newNode, new NodeIndex(i), id);
             }
         }
     }
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptMethodViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptMethodViewModel.cs
index 7de4adc39e..f3fcab4f09 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptMethodViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptMethodViewModel.cs
@@ -24,7 +24,7 @@ public class VisualScriptMethodViewModel : DispatcherViewModel
         private readonly IObjectNode blocksContent;
         private readonly IObjectNode linksContent;
         private readonly IObjectNode parametersContent;
-        private readonly MemberGraphNodeBinding<Accessibility> accessibilityNodeBinding;
+        private readonly MemberGraphNodeBinding<Scripts.Accessibility> accessibilityNodeBinding;
         private readonly MemberGraphNodeBinding<VirtualModifier> virtualModifierNodeBinding;
         private readonly MemberGraphNodeBinding<bool> isStaticNodeBinding;
         private readonly MemberGraphNodeBinding<string> nameNodeBinding;
@@ -40,7 +40,7 @@ public VisualScriptMethodViewModel(VisualScriptViewModel visualScript, Method me
             parametersContent = methodNode[nameof(method.Parameters)].Target;
 
             // Create bindings
-            accessibilityNodeBinding = new MemberGraphNodeBinding<Accessibility>(methodNode[nameof(method.Accessibility)], nameof(Accessibility), OnPropertyChanging, OnPropertyChanged, visualScript.UndoRedoService);
+            accessibilityNodeBinding = new MemberGraphNodeBinding<Scripts.Accessibility>(methodNode[nameof(method.Accessibility)], nameof(Scripts.Accessibility), OnPropertyChanging, OnPropertyChanged, visualScript.UndoRedoService);
             virtualModifierNodeBinding = new MemberGraphNodeBinding<VirtualModifier>(methodNode[nameof(method.VirtualModifier)], nameof(VirtualModifier), OnPropertyChanging, OnPropertyChanged, visualScript.UndoRedoService);
             isStaticNodeBinding = new MemberGraphNodeBinding<bool>(methodNode[nameof(method.IsStatic)], nameof(IsStatic), OnPropertyChanging, OnPropertyChanged, visualScript.UndoRedoService);
             nameNodeBinding = new MemberGraphNodeBinding<string>(methodNode[nameof(method.Name)], nameof(Name), OnPropertyChanging, OnPropertyChanged, visualScript.UndoRedoService);
@@ -58,7 +58,7 @@ public override void Destroy()
             base.Destroy();
         }
 
-        public Accessibility Accessibility { get { return accessibilityNodeBinding.Value; } set { accessibilityNodeBinding.Value = value; } }
+        public Scripts.Accessibility Accessibility { get { return accessibilityNodeBinding.Value; } set { accessibilityNodeBinding.Value = value; } }
 
         public VirtualModifier VirtualModifier { get { return virtualModifierNodeBinding.Value; } set { virtualModifierNodeBinding.Value = value; } }
 
@@ -85,7 +85,7 @@ public void RemoveParameter(Parameter parameter)
             // TODO: Cleanup references to this parameter
 
             // Remove
-            var itemIndex = new Index(index);
+            var itemIndex = new NodeIndex(index);
             parametersContent.Remove(parameter, itemIndex);
         }
 
@@ -102,7 +102,7 @@ public void RemoveBlock(Block block)
             {
                 if (link.Source.Owner == block || link.Target.Owner == block)
                 {
-                    var linkItemIndex = new Index(i);
+                    var linkItemIndex = new NodeIndex(i);
                     linksContent.Remove(link, linkItemIndex);
 
                     // Since we removed an item, fix index of next check
@@ -111,7 +111,7 @@ public void RemoveBlock(Block block)
             }
 
             // Remove
-            var itemIndex = new Index(block.Id);
+            var itemIndex = new NodeIndex(block.Id);
             blocksContent.Remove(block, itemIndex);
         }
 
@@ -123,7 +123,7 @@ public void AddLink(Link link)
         public void RemoveLink(Link link)
         {
             // Remove
-            var itemIndex = new Index(link.Id);
+            var itemIndex = new NodeIndex(link.Id);
             linksContent.Remove(link, itemIndex);
         }
 
@@ -297,7 +297,7 @@ private void UpdateSlots(Block block, List<Slot> newSlots)
                 // TODO: we could use diff to minimize changes, but probably not worth the effort
                 // Note that we can't simply overwrite slots, since the Slot.Owner would become invalid if added before it is removed at another index
                 for (int i = block.Slots.Count - 1; i >= 0; --i)
-                    blockSlots.Remove(block.Slots[i], new Index(i));
+                    blockSlots.Remove(block.Slots[i], new NodeIndex(i));
 
                 // Add new slots (and try to reduce changes)
                 foreach (var slot in newSlots)
diff --git a/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptViewModel.cs b/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptViewModel.cs
index 59548c209a..bf44dad28d 100644
--- a/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptViewModel.cs
+++ b/sources/editor/Xenko.Assets.Presentation/ViewModel/VisualScriptViewModel.cs
@@ -45,7 +45,7 @@ public void RemoveProperty(Property property)
             // TODO: Cleanup references to this variable
 
             // Remove
-            var itemIndex = new Index(index);
+            var itemIndex = new NodeIndex(index);
             propertiesContent.Remove(property, itemIndex);
         }
 
@@ -64,7 +64,7 @@ public void RemoveMethod(Method method)
             // TODO: Cleanup references to this function
 
             // Remove
-            var itemIndex = new Index(index);
+            var itemIndex = new NodeIndex(index);
             methodsContent.Remove(method, itemIndex);
         }
 
diff --git a/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj b/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj
index 1a7b69abe7..83f17207ea 100644
--- a/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj
+++ b/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -18,34 +18,22 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="AvalonEdit" Version="5.0.4" />
-    <PackageReference Include="System.Reactive.Linq" Version="4.1.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="2.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.10.0" />
-    <Reference Include="QuickGraph">
-      <HintPath>$(XenkoCommonDependenciesDir)GraphX\QuickGraph.dll</HintPath>
-    </Reference>
-    <Reference Include="GraphX.PCL.Common">
-      <HintPath>$(XenkoCommonDependenciesDir)GraphX\GraphX.PCL.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="GraphX.WPF.Controls">
-      <HintPath>$(XenkoCommonDependenciesDir)GraphX\GraphX.WPF.Controls.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="AvalonEdit" Version="6.2.0.78" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.4.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="3.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.4.0" />
     <Reference Include="RoslynPad.Editor.Windows">
-      <HintPath>$(XenkoCommonDependenciesDir)RoslynPad\RoslynPad.Editor.Windows.dll</HintPath>
+      <HintPath>$(XenkoCommonDependenciesDir)RoslynPad\net462\RoslynPad.Editor.Windows.dll</HintPath>
     </Reference>
     <Reference Include="RoslynPad.Roslyn.Windows">
-      <HintPath>$(XenkoCommonDependenciesDir)RoslynPad\RoslynPad.Roslyn.Windows.dll</HintPath>
+      <HintPath>$(XenkoCommonDependenciesDir)RoslynPad\net462\RoslynPad.Roslyn.Windows.dll</HintPath>
     </Reference>
     <Reference Include="RoslynPad.Roslyn">
-      <HintPath>$(XenkoCommonDependenciesDir)RoslynPad\RoslynPad.Roslyn.dll</HintPath>
+      <HintPath>$(XenkoCommonDependenciesDir)RoslynPad\net462\RoslynPad.Roslyn.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
@@ -57,6 +45,7 @@
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="..\Xenko.Samples.Templates\ThisPackageVersion.cs" Link="ThisPackageVersion.cs" />
     <None Include="app.config" />
     <None Include="*.cd" />
     <Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
@@ -81,20 +70,18 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <AppDesigner Include="Properties\" />
-	  <None Remove="EditorPackage\buildpath\**" />
-	  <None Remove="EditorPackage\outputpath\**" />
+    <None Remove="EditorPackage\buildpath\**" />
+    <None Remove="EditorPackage\outputpath\**" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\assets\Xenko.Core.Assets.Quantum\Xenko.Core.Assets.Quantum.csproj" />
     <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation.Dialogs\Xenko.Core.Presentation.Dialogs.csproj" />
     <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation.Graph\Xenko.Core.Presentation.Graph.csproj" />
     <ProjectReference Include="..\..\presentation\Xenko.Core.Translation.Presentation\Xenko.Core.Translation.Presentation.csproj" />
-    <ProjectReference Include="..\..\tools\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj" />
     <ProjectReference Include="..\..\tools\Xenko.Graphics.RenderDocPlugin\Xenko.Graphics.RenderDocPlugin.csproj" />
     <ProjectReference Include="..\..\tools\Xenko.Core.ProjectTemplating\Xenko.Core.ProjectTemplating.csproj" />
     <ProjectReference Include="..\Xenko.Core.Assets.Editor\Xenko.Core.Assets.Editor.csproj" />
     <ProjectReference Include="..\Xenko.Editor\Xenko.Editor.csproj" />
-    <ProjectReference Include="..\Xenko.Samples.Templates\Xenko.Samples.Templates.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
@@ -126,19 +113,6 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\*.cur" />
   </ItemGroup>
-  <!-- Shaders -->
-  <ItemGroup>
-    <Compile Update="Shaders\*.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>%(Filename).xkfx</DependentUpon>
-    </Compile>
-    <None Include="Shaders\*.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>%(Filename).cs</LastGenOutput>
-    </None>
-  </ItemGroup>
   <!-- Templates -->
   <ItemGroup>
     <Compile Remove="Templates\Core\**" />
@@ -146,8 +120,13 @@
     <None Include="Templates\Core\**" />
     <None Include="Templates\Assets\**" />
   </ItemGroup>
+  <ItemGroup>
+    <None Update="View\AddEntityComponentUserControl.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </None>
+  </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
diff --git a/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.xkpkg b/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.xkpkg
index 9fbf279722..2c04441615 100644
--- a/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.xkpkg
+++ b/sources/editor/Xenko.Assets.Presentation/Xenko.Assets.Presentation.xkpkg
@@ -32,6 +32,7 @@ TemplateFolders:
         - !file Templates/Assets/Misc/DefaultGameSettings.xktpl
         - !file Templates/Assets/Misc/DefaultGraphicsCompositorLevel10.xktpl
         - !file Templates/Assets/Misc/DefaultGraphicsCompositorLevel9.xktpl
+        - !file Templates/Assets/Misc/DefaultGraphicsCompositorVoxels.xktpl
         - !file Templates/Assets/Misc/DefaultRawAsset.xktpl
         - !file Templates/Assets/Misc/DefaultSkybox.xktpl
         - !file Templates/Assets/Models/DefaultModel.xktpl
@@ -52,6 +53,8 @@ TemplateFolders:
         - !file Templates/Assets/Physics/ColliderShapePlane.xktpl
         - !file Templates/Assets/Physics/ColliderShapeSphere.xktpl
         - !file Templates/Assets/Physics/ColliderShapeCone.xktpl
+        - !file Templates/Assets/Physics/ColliderShapeHeightfield.xktpl
+        - !file Templates/Assets/Physics/Heightmap.xktpl
         - !file Templates/Assets/Scenes/DefaultPrefab.xktpl
         - !file Templates/Assets/Scenes/DefaultNavigationMesh.xktpl
         - !file Templates/Assets/Scenes/DefaultScene.xktpl
diff --git a/sources/editor/Xenko.Assets.Presentation/XenkoDefaultAssetsPlugin.cs b/sources/editor/Xenko.Assets.Presentation/XenkoDefaultAssetsPlugin.cs
index d81b68a187..108ec46de9 100644
--- a/sources/editor/Xenko.Assets.Presentation/XenkoDefaultAssetsPlugin.cs
+++ b/sources/editor/Xenko.Assets.Presentation/XenkoDefaultAssetsPlugin.cs
@@ -25,6 +25,7 @@
 using Xenko.Editor;
 using Xenko.Engine;
 using Xenko.Core.Assets.Templates;
+using Xenko.Core.Packages;
 
 namespace Xenko.Assets.Presentation
 {
@@ -53,8 +54,6 @@ public override int GetHashCode(Type obj)
             }
         }
 
-        private EffectCompilerServerSession effectCompilerServerSession;
-
         private static ResourceDictionary imageDictionary;
         private static ResourceDictionary animationPropertyTemplateDictionary;
         private static ResourceDictionary entityPropertyTemplateDictionary;
@@ -79,7 +78,6 @@ public override int GetHashCode(Type obj)
         public XenkoDefaultAssetsPlugin()
         {
             ProfileSettings.Add(new PackageSettingsEntry(GameUserSettings.Effect.EffectCompilation, TargetPackage.Executable));
-            ProfileSettings.Add(new PackageSettingsEntry(GameUserSettings.Effect.RecordUsedEffects, TargetPackage.Executable));
 
             LoadDefaultTemplates();
         }
@@ -88,13 +86,17 @@ public static void LoadDefaultTemplates()
         {
             // Load templates
             // Currently hardcoded, this will need to change with plugin system
-            foreach (var packageInfo in new[] { new { Name = "Xenko.Assets.Presentation", Version = XenkoVersion.NuGetVersion }, new { Name = "Xenko.SpriteStudio.Offline", Version = XenkoVersion.NuGetVersion }, new { Name = "Xenko.Samples.Templates", Version = XenkoVersion.NuGetVersionSuffix != string.Empty ? "3.1.0.1-beta02" : "3.1.0.1" } })
+            foreach (var packageInfo in new[] { new { Name = "Xenko.Assets.Presentation", Version = XenkoVersion.NuGetVersion }})
             {
                 var logger = new LoggerResult();
-                var packageFile = PackageStore.Instance.GetPackageFileName(packageInfo.Name, new PackageVersionRange(new PackageVersion(packageInfo.Version)));
-                var package = Package.Load(logger, packageFile.ToWindowsPath());
-                if (logger.HasErrors)
-                    throw new InvalidOperationException($"Could not load package {packageInfo.Name}:{Environment.NewLine}{logger.ToText()}");
+                var packageFile = PackageStore.Instance.GetPackageFileName(packageInfo.Name, new PackageVersionRange(new PackageVersion("9.9.1-nugt99")), null, true, true, true);
+                var package = Package.Load(logger, packageFile.ToWindowsPath(), new PackageLoadParameters()
+                {
+                    LoadAssemblyReferences = false,
+                    RegisterPackageAssemblies = false,
+                    AutoCompileProjects = false,
+                    AutoLoadTemporaryAssets = true,
+                });
 
                 TemplateManager.RegisterPackage(package);
             }
@@ -205,11 +207,15 @@ public override void InitializeSession(SessionViewModel session)
             session.AssetViewProperties.RegisterNodePresenterUpdater(new VisualScriptNodeUpdater());
             session.AssetViewProperties.RegisterNodePresenterUpdater(new NavigationNodeUpdater(session));
 
-            // Connects to effect compiler (to import new effect permutations discovered by running the game)
-            if (Xenko.Core.Assets.Editor.Settings.EditorSettings.UseEffectCompilerServer.GetValue())
-            {
-                effectCompilerServerSession = new EffectCompilerServerSession(session);
-            }
+            // Extra packages to display in "add reference" dialog
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.Engine.EntityComponent).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.UI.UIElement).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.Particles.Components.ParticleSystemComponent).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.Navigation.NavigationComponent).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.Physics.StaticColliderComponent).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.Video.VideoComponent).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.Voxels.Module).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
+            session.SuggestedPackages.Add(new PackageName(typeof(Xenko.SpriteStudio.Runtime.SpriteStudioNodeLinkComponent).Assembly.GetName().Name, new PackageVersion(XenkoVersion.NuGetVersion)));
         }
 
         /// <inheritdoc />
@@ -241,11 +247,6 @@ public override void RegisterPostPasteProcessors(ICollection<IAssetPostPasteProc
         /// <inheritdoc />
         protected override void SessionDisposed(SessionViewModel session)
         {
-            if (effectCompilerServerSession != null)
-            {
-                effectCompilerServerSession.Dispose();
-                effectCompilerServerSession = null;
-            }
             base.SessionDisposed(session);
         }
 
@@ -306,9 +307,23 @@ public static IEnumerable<Type> GetComponentsByOrder([ItemNotNull, NotNull] IEnu
             return (ascending ? filtered.OrderBy(t => t.order) : filtered.OrderByDescending(t => t.order)).Select(t => t.type);
         }
 
+        private static List<Type> GetCleanTypes()
+        {
+            List<Type> allTypes = new List<Type>();
+            foreach (var aa in AssetRegistry.AssetAssemblies)
+            {
+                try
+                {
+                    allTypes.AddRange(aa.GetExportedTypes());
+                }
+                catch (Exception e) { }
+            }
+            return allTypes;
+        }
+
         private static void RegisterGizmoTypes()
         {
-            var allTypes = AssetRegistry.AssetAssemblies.SelectMany(x => x.GetTypes());
+            var allTypes = GetCleanTypes();
             foreach (var type in allTypes)
             {
                 if (typeof(IGizmo).IsAssignableFrom(type))
@@ -324,7 +339,7 @@ private static void RegisterGizmoTypes()
 
         private static void RegisterAssetHighlighterTypes()
         {
-            var allTypes = AssetRegistry.AssetAssemblies.SelectMany(x => x.GetTypes());
+            var allTypes = GetCleanTypes();
             foreach (var type in allTypes)
             {
                 if (typeof(AssetHighlighter).IsAssignableFrom(type))
@@ -341,7 +356,7 @@ private static void RegisterComponentOrders(ILogger logger)
         {
             // TODO: iterate on plugin assembly or register component type in the plugin registry
             var hashSet = new HashSet<int>();
-            var componentTypes = AssetRegistry.AssetAssemblies.SelectMany(x => x.GetTypes().Where(y => typeof(EntityComponent).IsAssignableFrom(y)));
+            var componentTypes = GetCleanTypes().Where(y => typeof(EntityComponent).IsAssignableFrom(y));
             var orders = new List<(Type, int)>();
             foreach (var type in componentTypes)
             {
diff --git a/sources/editor/Xenko.Core.Assets.Editor.Tests/TestArchetypesBasicUndoRedo.cs b/sources/editor/Xenko.Core.Assets.Editor.Tests/TestArchetypesBasicUndoRedo.cs
index 1b5bf3c4ab..774fbadbf3 100644
--- a/sources/editor/Xenko.Core.Assets.Editor.Tests/TestArchetypesBasicUndoRedo.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor.Tests/TestArchetypesBasicUndoRedo.cs
@@ -36,7 +36,7 @@ public void AssetPropertyChanged(object sender, IAssetNodeChangeEventArgs e)
                     // Don't create action items if the change comes from the Base
                     if (!propertyGraph.UpdatingPropertyFromBase)
                     {
-                        var index = (e as ItemChangeEventArgs)?.Index ?? Index.Empty;
+                        var index = (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty;
                         var overrideChange = new AssetContentValueChangeOperation((IAssetNode)e.Node, e.ChangeType, index, e.OldValue, e.NewValue, e.PreviousOverride, e.NewOverride, e.ItemId, Enumerable.Empty<IDirtiable>());
                         undoRedoService.PushOperation(overrideChange);
                     }
diff --git a/sources/editor/Xenko.Core.Assets.Editor.Tests/TestCopyPasteProperties.cs b/sources/editor/Xenko.Core.Assets.Editor.Tests/TestCopyPasteProperties.cs
index 357f2a4cf4..b20e1a1816 100644
--- a/sources/editor/Xenko.Core.Assets.Editor.Tests/TestCopyPasteProperties.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor.Tests/TestCopyPasteProperties.cs
@@ -42,7 +42,7 @@ public void TestCopyPasteSingleProperty()
             var source = new MyClass { Float = 5.0f };
             var target = new MyClass { Float = 2.0f };
             var copiedText = Copy(source, source.Float);
-            Paste(target, copiedText, typeof(float), typeof(float), x => x[nameof(MyClass.Float)], Index.Empty, false);
+            Paste(target, copiedText, typeof(float), typeof(float), x => x[nameof(MyClass.Float)], NodeIndex.Empty, false);
             Assert.Equal(5.0f, target.Float);
         }
 
@@ -50,7 +50,7 @@ public void TestCopyPasteSingleProperty()
         public void TestPasteStringAsFloatProperty()
         {
             var target = new MyClass { Float = 2.0f };
-            Paste(target, "5", typeof(float), typeof(float), x => x[nameof(MyClass.Float)], Index.Empty, false);
+            Paste(target, "5", typeof(float), typeof(float), x => x[nameof(MyClass.Float)], NodeIndex.Empty, false);
             Assert.Equal(5.0f, target.Float);
         }
 
@@ -60,7 +60,7 @@ public void TestCopyPasteStructMemberProperty()
             var source = new MyClass { Struct = new MyStruct { Integer = 5 } };
             var target = new MyClass { Struct = new MyStruct { Integer = 2 } };
             var copiedText = Copy(source, source.Struct.Integer);
-            Paste(target, copiedText, typeof(int), typeof(int), x => x[nameof(MyClass.Struct)].Target[nameof(MyStruct.Integer)], Index.Empty, false);
+            Paste(target, copiedText, typeof(int), typeof(int), x => x[nameof(MyClass.Struct)].Target[nameof(MyStruct.Integer)], NodeIndex.Empty, false);
             Assert.Equal(5, target.Struct.Integer);
         }
 
@@ -70,7 +70,7 @@ public void TestCopyPasteStructProperty()
             var source = new MyClass { Struct = new MyStruct { Integer = 5 } };
             var target = new MyClass { Struct = new MyStruct { Integer = 2 } };
             var copiedText = Copy(source, source.Struct);
-            Paste(target, copiedText, typeof(MyStruct), typeof(MyStruct), x => x[nameof(MyClass.Struct)], Index.Empty, false);
+            Paste(target, copiedText, typeof(MyStruct), typeof(MyStruct), x => x[nameof(MyClass.Struct)], NodeIndex.Empty, false);
             Assert.Equal(5, target.Struct.Integer);
         }
 
@@ -80,7 +80,7 @@ public void TestCopyPasteClassMemberProperty()
             var source = new MyClass { Sub = new MyClass { Float = 5 } };
             var target = new MyClass { Sub = new MyClass { Float = 2 } };
             var copiedText = Copy(source, source.Sub.Float);
-            Paste(target, copiedText, typeof(int), typeof(int), x => x[nameof(MyClass.Sub)].Target[nameof(MyClass.Float)], Index.Empty, false);
+            Paste(target, copiedText, typeof(int), typeof(int), x => x[nameof(MyClass.Sub)].Target[nameof(MyClass.Float)], NodeIndex.Empty, false);
             Assert.Equal(5, target.Sub.Float);
         }
 
@@ -90,7 +90,7 @@ public void TestCopyPasteClassProperty()
             var source = new MyClass { Sub = new MyClass { Float = 5 } };
             var target = new MyClass { Sub = new MyClass { Float = 2 } };
             var copiedText = Copy(source, source.Sub);
-            Paste(target, copiedText, typeof(MyClass), typeof(MyClass), x => x[nameof(MyClass.Sub)], Index.Empty, false);
+            Paste(target, copiedText, typeof(MyClass), typeof(MyClass), x => x[nameof(MyClass.Sub)], NodeIndex.Empty, false);
             Assert.Equal(5, target.Sub.Float);
         }
 
@@ -100,7 +100,7 @@ public void TestCopyPasteListDouble()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
             var copiedText = Copy(source, source.DoubleList);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, false);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, false);
             Assert.Equal(6, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(5.0, target.DoubleList[1]);
@@ -116,7 +116,7 @@ public void TestCopyReplaceListDouble()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
             var copiedText = Copy(source, source.DoubleList);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, true);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, true);
             Assert.Equal(3, target.DoubleList.Count);
             Assert.Equal(1.0, target.DoubleList[0]);
             Assert.Equal(2.0, target.DoubleList[1]);
@@ -129,7 +129,7 @@ public void TestCopyPasteListStruct()
             var source = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 1 }, new MyStruct { Integer = 2 }, new MyStruct { Integer = 3 } } };
             var target = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 4 }, new MyStruct { Integer = 5 }, new MyStruct { Integer = 6 } } };
             var copiedText = Copy(source, source.StructList);
-            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)], Index.Empty, false);
+            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)], NodeIndex.Empty, false);
             Assert.Equal(6, target.StructList.Count);
             Assert.Equal(4.0, target.StructList[0].Integer);
             Assert.Equal(5.0, target.StructList[1].Integer);
@@ -145,7 +145,7 @@ public void TestCopyReplaceListStruct()
             var source = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 1 }, new MyStruct { Integer = 2 }, new MyStruct { Integer = 3 } } };
             var target = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 4 }, new MyStruct { Integer = 5 }, new MyStruct { Integer = 6 } } };
             var copiedText = Copy(source, source.StructList);
-            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)], Index.Empty, true);
+            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)], NodeIndex.Empty, true);
             Assert.Equal(3, target.StructList.Count);
             Assert.Equal(1.0, target.StructList[0].Integer);
             Assert.Equal(2.0, target.StructList[1].Integer);
@@ -158,7 +158,7 @@ public void TestCopyPasteListClass()
             var source = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 1 }, new MyClass { Float = 2 }, new MyClass { Float = 3 } } };
             var target = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 4 }, new MyClass { Float = 5 }, new MyClass { Float = 6 } } };
             var copiedText = Copy(source, source.SubList);
-            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)], Index.Empty, false);
+            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)], NodeIndex.Empty, false);
             Assert.Equal(6, target.SubList.Count);
             Assert.Equal(4.0, target.SubList[0].Float);
             Assert.Equal(5.0, target.SubList[1].Float);
@@ -174,7 +174,7 @@ public void TestCopyReplaceListClass()
             var source = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 1 }, new MyClass { Float = 2 }, new MyClass { Float = 3 } } };
             var target = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 4 }, new MyClass { Float = 5 }, new MyClass { Float = 6 } } };
             var copiedText = Copy(source, source.SubList);
-            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)], Index.Empty, true);
+            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)], NodeIndex.Empty, true);
             Assert.Equal(3, target.SubList.Count);
             Assert.Equal(1.0, target.SubList[0].Float);
             Assert.Equal(2.0, target.SubList[1].Float);
@@ -187,7 +187,7 @@ public void TestCopyPasteListDoubleIntoItem()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
             var copiedText = Copy(source, source.DoubleList);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new Index(1), false);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new NodeIndex(1), false);
             Assert.Equal(6, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(1.0, target.DoubleList[1]);
@@ -203,7 +203,7 @@ public void TestCopyReplaceListDoubleIntoItem()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
             var copiedText = Copy(source, source.DoubleList);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new Index(1), true);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new NodeIndex(1), true);
             Assert.Equal(5, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(1.0, target.DoubleList[1]);
@@ -218,7 +218,7 @@ public void TestCopyPasteListStructIntoItem()
             var source = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 1 }, new MyStruct { Integer = 2 }, new MyStruct { Integer = 3 } } };
             var target = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 4 }, new MyStruct { Integer = 5 }, new MyStruct { Integer = 6 } } };
             var copiedText = Copy(source, source.StructList);
-            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new Index(1), false);
+            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new NodeIndex(1), false);
             Assert.Equal(6, target.StructList.Count);
             Assert.Equal(4.0, target.StructList[0].Integer);
             Assert.Equal(1.0, target.StructList[1].Integer);
@@ -234,7 +234,7 @@ public void TestCopyReplaceListStructIntoItem()
             var source = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 1 }, new MyStruct { Integer = 2 }, new MyStruct { Integer = 3 } } };
             var target = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 4 }, new MyStruct { Integer = 5 }, new MyStruct { Integer = 6 } } };
             var copiedText = Copy(source, source.StructList);
-            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new Index(1), true);
+            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new NodeIndex(1), true);
             Assert.Equal(5, target.StructList.Count);
             Assert.Equal(4.0, target.StructList[0].Integer);
             Assert.Equal(1.0, target.StructList[1].Integer);
@@ -249,7 +249,7 @@ public void TestCopyPasteListClassIntoItem()
             var source = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 1 }, new MyClass { Float = 2 }, new MyClass { Float = 3 } } };
             var target = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 4 }, new MyClass { Float = 5 }, new MyClass { Float = 6 } } };
             var copiedText = Copy(source, source.SubList);
-            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new Index(1), false);
+            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new NodeIndex(1), false);
             Assert.Equal(6, target.SubList.Count);
             Assert.Equal(4.0, target.SubList[0].Float);
             Assert.Equal(1.0, target.SubList[1].Float);
@@ -265,7 +265,7 @@ public void TestCopyReplaceListClassIntoItem()
             var source = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 1 }, new MyClass { Float = 2 }, new MyClass { Float = 3 } } };
             var target = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 4 }, new MyClass { Float = 5 }, new MyClass { Float = 6 } } };
             var copiedText = Copy(source, source.SubList);
-            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new Index(1), true);
+            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new NodeIndex(1), true);
             Assert.Equal(5, target.SubList.Count);
             Assert.Equal(4.0, target.SubList[0].Float);
             Assert.Equal(1.0, target.SubList[1].Float);
@@ -280,7 +280,7 @@ public void TestCopyPasteDoubleIntoList()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
             var copiedText = Copy(source, source.DoubleList[2]);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new Index(1), false);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new NodeIndex(1), false);
             Assert.Equal(4, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(3.0, target.DoubleList[1]);
@@ -288,7 +288,7 @@ public void TestCopyPasteDoubleIntoList()
             Assert.Equal(6.0, target.DoubleList[3]);
 
             target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
-            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new Index(1), false);
+            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new NodeIndex(1), false);
             Assert.Equal(4, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(2.0, target.DoubleList[1]);
@@ -302,14 +302,14 @@ public void TestCopyReplaceDoubleIntoList()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
             var copiedText = Copy(source, source.DoubleList[2]);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new Index(1), true);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new NodeIndex(1), true);
             Assert.Equal(3, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(3.0, target.DoubleList[1]);
             Assert.Equal(6.0, target.DoubleList[2]);
 
             target = new MyClass { DoubleList = new List<double> { 4, 5, 6 } };
-            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new Index(1), true);
+            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)].Target, new NodeIndex(1), true);
             Assert.Equal(3, target.DoubleList.Count);
             Assert.Equal(4.0, target.DoubleList[0]);
             Assert.Equal(2.0, target.DoubleList[1]);
@@ -322,7 +322,7 @@ public void TestCopyPasteStructIntoList()
             var source = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 1 }, new MyStruct { Integer = 2 }, new MyStruct { Integer = 3 } } };
             var target = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 4 }, new MyStruct { Integer = 5 }, new MyStruct { Integer = 6 } } };
             var copiedText = Copy(source, source.StructList[2]);
-            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new Index(1), false);
+            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new NodeIndex(1), false);
             Assert.Equal(4, target.StructList.Count);
             Assert.Equal(4.0, target.StructList[0].Integer);
             Assert.Equal(3.0, target.StructList[1].Integer);
@@ -336,7 +336,7 @@ public void TestCopyReplaceStructIntoList()
             var source = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 1 }, new MyStruct { Integer = 2 }, new MyStruct { Integer = 3 } } };
             var target = new MyClass { StructList = new List<MyStruct> { new MyStruct { Integer = 4 }, new MyStruct { Integer = 5 }, new MyStruct { Integer = 6 } } };
             var copiedText = Copy(source, source.StructList[2]);
-            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new Index(1), true);
+            Paste(target, copiedText, typeof(List<MyStruct>), typeof(List<MyStruct>), x => x[nameof(MyClass.StructList)].Target, new NodeIndex(1), true);
             Assert.Equal(3, target.StructList.Count);
             Assert.Equal(4.0, target.StructList[0].Integer);
             Assert.Equal(3.0, target.StructList[1].Integer);
@@ -349,7 +349,7 @@ public void TestCopyPasteClassIntoList()
             var source = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 1 }, new MyClass { Float = 2 }, new MyClass { Float = 3 } } };
             var target = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 4 }, new MyClass { Float = 5 }, new MyClass { Float = 6 } } };
             var copiedText = Copy(source, source.SubList[2]);
-            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new Index(1), false);
+            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new NodeIndex(1), false);
             Assert.Equal(4, target.SubList.Count);
             Assert.Equal(4.0, target.SubList[0].Float);
             Assert.Equal(3.0, target.SubList[1].Float);
@@ -363,7 +363,7 @@ public void TestCopyReplaceClassIntoList()
             var source = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 1 }, new MyClass { Float = 2 }, new MyClass { Float = 3 } } };
             var target = new MyClass { SubList = new List<MyClass> { new MyClass { Float = 4 }, new MyClass { Float = 5 }, new MyClass { Float = 6 } } };
             var copiedText = Copy(source, source.SubList[2]);
-            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new Index(1), true);
+            Paste(target, copiedText, typeof(List<MyClass>), typeof(List<MyClass>), x => x[nameof(MyClass.SubList)].Target, new NodeIndex(1), true);
             Assert.Equal(3, target.SubList.Count);
             Assert.Equal(4.0, target.SubList[0].Float);
             Assert.Equal(3.0, target.SubList[1].Float);
@@ -376,14 +376,14 @@ public void TestCopyPasteIntoNullList()
             var source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             var target = new MyClass { DoubleList = null };
             var copiedText = Copy(source, source.DoubleList);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, false);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, false);
             Assert.Equal(3, target.DoubleList.Count);
             Assert.Equal(1.0, target.DoubleList[0]);
             Assert.Equal(2.0, target.DoubleList[1]);
             Assert.Equal(3.0, target.DoubleList[2]);
 
             target = new MyClass { DoubleList = null };
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, true);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, true);
             Assert.Equal(3, target.DoubleList.Count);
             Assert.Equal(1.0, target.DoubleList[0]);
             Assert.Equal(2.0, target.DoubleList[1]);
@@ -392,22 +392,22 @@ public void TestCopyPasteIntoNullList()
             source = new MyClass { DoubleList = new List<double> { 1, 2, 3 } };
             target = new MyClass { DoubleList = null };
             copiedText = Copy(source, source.DoubleList[2]);
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, false);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, false);
             Assert.Single(target.DoubleList);
             Assert.Equal(3.0, target.DoubleList[0]);
 
             target = new MyClass { DoubleList = null };
-            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, true);
+            Paste(target, copiedText, typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, true);
             Assert.Single(target.DoubleList);
             Assert.Equal(3.0, target.DoubleList[0]);
 
             target = new MyClass { DoubleList = null };
-            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, false);
+            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, false);
             Assert.Single(target.DoubleList);
             Assert.Equal(2.0, target.DoubleList[0]);
 
             target = new MyClass { DoubleList = null };
-            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], Index.Empty, true);
+            Paste(target, "2", typeof(List<double>), typeof(List<double>), x => x[nameof(MyClass.DoubleList)], NodeIndex.Empty, true);
             Assert.Single(target.DoubleList);
             Assert.Equal(2.0, target.DoubleList[0]);
         }
@@ -418,7 +418,7 @@ public void TestCopyPasteDictionaryDouble()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ddd", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, false);
             Assert.Equal(6, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
@@ -434,7 +434,7 @@ public void TestCopyReplaceDictionaryDouble()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ddd", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, true);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, true);
             Assert.Equal(3, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
@@ -447,7 +447,7 @@ public void TestCopyPasteDictionaryStruct()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ddd", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)], NodeIndex.Empty, false);
             Assert.Equal(6, target.StructDictionary.Count);
             Assert.Equal(1.0, target.StructDictionary["aaa"].Integer);
             Assert.Equal(2.0, target.StructDictionary["bbb"].Integer);
@@ -463,7 +463,7 @@ public void TestCopyReplaceDictionaryStruct()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ddd", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)], Index.Empty, true);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)], NodeIndex.Empty, true);
             Assert.Equal(3, target.StructDictionary.Count);
             Assert.Equal(1.0, target.StructDictionary["aaa"].Integer);
             Assert.Equal(2.0, target.StructDictionary["bbb"].Integer);
@@ -476,7 +476,7 @@ public void TestCopyPasteDictionaryClass()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ddd", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)], NodeIndex.Empty, false);
             Assert.Equal(6, target.SubDictionary.Count);
             Assert.Equal(1.0, target.SubDictionary["aaa"].Float);
             Assert.Equal(2.0, target.SubDictionary["bbb"].Float);
@@ -492,7 +492,7 @@ public void TestCopyReplaceDictionaryClass()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ddd", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)], Index.Empty, true);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)], NodeIndex.Empty, true);
             Assert.Equal(3, target.SubDictionary.Count);
             Assert.Equal(1.0, target.SubDictionary["aaa"].Float);
             Assert.Equal(2.0, target.SubDictionary["bbb"].Float);
@@ -505,7 +505,7 @@ public void TestCopyPasteDictionaryDoubleIntoItem()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ddd", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(6, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
@@ -521,7 +521,7 @@ public void TestCopyReplaceDictionaryDoubleIntoItem()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ddd", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new Index("eee"), true);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new NodeIndex("eee"), true);
             Assert.Equal(5, target.DoubleDictionary.Count);
             Assert.Equal(4.0, target.DoubleDictionary["ddd"]);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
@@ -536,7 +536,7 @@ public void TestCopyPasteDictionaryStructIntoItem()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ddd", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(6, target.StructDictionary.Count);
             Assert.Equal(1.0, target.StructDictionary["aaa"].Integer);
             Assert.Equal(2.0, target.StructDictionary["bbb"].Integer);
@@ -552,7 +552,7 @@ public void TestCopyReplaceDictionaryStructIntoItem()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ddd", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new Index("eee"), true);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new NodeIndex("eee"), true);
             Assert.Equal(5, target.StructDictionary.Count);
             Assert.Equal(4.0, target.StructDictionary["ddd"].Integer);
             Assert.Equal(1.0, target.StructDictionary["aaa"].Integer);
@@ -567,7 +567,7 @@ public void TestCopyPasteDictionaryClassIntoItem()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ddd", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(6, target.SubDictionary.Count);
             Assert.Equal(1.0, target.SubDictionary["aaa"].Float);
             Assert.Equal(2.0, target.SubDictionary["bbb"].Float);
@@ -583,7 +583,7 @@ public void TestCopyReplaceDictionaryClassIntoItem()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ddd", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new Index("eee"), true);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new NodeIndex("eee"), true);
             Assert.Equal(5, target.SubDictionary.Count);
             Assert.Equal(4.0, target.SubDictionary["ddd"].Float);
             Assert.Equal(1.0, target.SubDictionary["aaa"].Float);
@@ -598,7 +598,7 @@ public void TestCopyPasteDoubleIntoDictionary()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ddd", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(4, target.DoubleDictionary.Count);
             Assert.Equal(3.0, target.DoubleDictionary["ccc"]);
             Assert.Equal(4.0, target.DoubleDictionary["ddd"]);
@@ -612,7 +612,7 @@ public void TestCopyReplaceDoubleIntoDictionary()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ddd", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new Index("eee"), true);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new NodeIndex("eee"), true);
             Assert.Equal(3, target.DoubleDictionary.Count);
             Assert.Equal(4.0, target.DoubleDictionary["ddd"]);
             Assert.Equal(3.0, target.DoubleDictionary["ccc"]);
@@ -625,7 +625,7 @@ public void TestCopyPasteStructIntoDictionary()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ddd", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(4, target.StructDictionary.Count);
             Assert.Equal(3.0, target.StructDictionary["ccc"].Integer);
             Assert.Equal(4.0, target.StructDictionary["ddd"].Integer);
@@ -639,7 +639,7 @@ public void TestCopyReplaceStructIntoDictionary()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ddd", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new Index("eee"), true);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new NodeIndex("eee"), true);
             Assert.Equal(3, target.StructDictionary.Count);
             Assert.Equal(4.0, target.StructDictionary["ddd"].Integer);
             Assert.Equal(3.0, target.StructDictionary["ccc"].Integer);
@@ -652,7 +652,7 @@ public void TestCopyPasteClassIntoDictionary()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ddd", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(4, target.SubDictionary.Count);
             Assert.Equal(3.0, target.SubDictionary["ccc"].Float);
             Assert.Equal(4.0, target.SubDictionary["ddd"].Float);
@@ -666,7 +666,7 @@ public void TestCopyReplaceClassIntoDictionary()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ddd", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new Index("eee"), true);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new NodeIndex("eee"), true);
             Assert.Equal(3, target.SubDictionary.Count);
             Assert.Equal(4.0, target.SubDictionary["ddd"].Float);
             Assert.Equal(3.0, target.SubDictionary["ccc"].Float);
@@ -679,7 +679,7 @@ public void TestCopyPasteDictionaryDoubleWithCollision()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ccc", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, false);
             Assert.Equal(5, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
@@ -694,7 +694,7 @@ public void TestCopyPasteDictionaryStructWithCollision()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ccc", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)], NodeIndex.Empty, false);
             Assert.Equal(5, target.StructDictionary.Count);
             Assert.Equal(1.0, target.StructDictionary["aaa"].Integer);
             Assert.Equal(2.0, target.StructDictionary["bbb"].Integer);
@@ -709,7 +709,7 @@ public void TestCopyPasteDictionaryClassWithCollision()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ccc", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)], NodeIndex.Empty, false);
             Assert.Equal(5, target.SubDictionary.Count);
             Assert.Equal(1.0, target.SubDictionary["aaa"].Float);
             Assert.Equal(2.0, target.SubDictionary["bbb"].Float);
@@ -724,7 +724,7 @@ public void TestCopyPasteDictionaryDoubleIntoItemWithCollision()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ccc", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(5, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
@@ -739,7 +739,7 @@ public void TestCopyPasteDictionaryStructIntoItemWithCollision()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ccc", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(5, target.StructDictionary.Count);
             Assert.Equal(1.0, target.StructDictionary["aaa"].Integer);
             Assert.Equal(2.0, target.StructDictionary["bbb"].Integer);
@@ -754,7 +754,7 @@ public void TestCopyPasteDictionaryClassIntoItemWithCollision()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ccc", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(5, target.SubDictionary.Count);
             Assert.Equal(1.0, target.SubDictionary["aaa"].Float);
             Assert.Equal(2.0, target.SubDictionary["bbb"].Float);
@@ -769,7 +769,7 @@ public void TestCopyPasteDoubleIntoDictionaryWithCollision()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "ccc", 4 }, { "eee", 5 }, { "fff", 6 } } };
             var copiedText = Copy(source, source.DoubleDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(3, target.DoubleDictionary.Count);
             Assert.Equal(3.0, target.DoubleDictionary["ccc"]);
             Assert.Equal(5.0, target.DoubleDictionary["eee"]);
@@ -782,7 +782,7 @@ public void TestCopyPasteStructIntoDictionaryWithCollision()
             var source = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "aaa", new MyStruct { Integer = 1 } }, { "bbb", new MyStruct { Integer = 2 } }, { "ccc", new MyStruct { Integer = 3 } } } };
             var target = new MyClass { StructDictionary = new Dictionary<string, MyStruct> { { "ccc", new MyStruct { Integer = 4 } }, { "eee", new MyStruct { Integer = 5 } }, { "fff", new MyStruct { Integer = 6 } } } };
             var copiedText = Copy(source, source.StructDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyStruct>), typeof(Dictionary<string, MyStruct>), x => x[nameof(MyClass.StructDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(3, target.StructDictionary.Count);
             Assert.Equal(3.0, target.StructDictionary["ccc"].Integer);
             Assert.Equal(5.0, target.StructDictionary["eee"].Integer);
@@ -795,7 +795,7 @@ public void TestCopyPasteClassIntoDictionaryWithCollision()
             var source = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "aaa", new MyClass { Float = 1 } }, { "bbb", new MyClass { Float = 2 } }, { "ccc", new MyClass { Float = 3 } } } };
             var target = new MyClass { SubDictionary = new Dictionary<string, MyClass> { { "ccc", new MyClass { Float = 4 } }, { "eee", new MyClass { Float = 5 } }, { "fff", new MyClass { Float = 6 } } } };
             var copiedText = Copy(source, source.SubDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new Index("eee"), false);
+            Paste(target, copiedText, typeof(Dictionary<string, MyClass>), typeof(Dictionary<string, MyClass>), x => x[nameof(MyClass.SubDictionary)].Target, new NodeIndex("eee"), false);
             Assert.Equal(3, target.SubDictionary.Count);
             Assert.Equal(3.0, target.SubDictionary["ccc"].Float);
             Assert.Equal(5.0, target.SubDictionary["eee"].Float);
@@ -808,14 +808,14 @@ public void TestCopyPasteIntoNullDictionary()
             var source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             var target = new MyClass { DoubleDictionary = null };
             var copiedText = Copy(source, source.DoubleDictionary);
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, false);
             Assert.Equal(3, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
             Assert.Equal(3.0, target.DoubleDictionary["ccc"]);
 
             target = new MyClass { DoubleDictionary = null };
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, true);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, true);
             Assert.Equal(3, target.DoubleDictionary.Count);
             Assert.Equal(1.0, target.DoubleDictionary["aaa"]);
             Assert.Equal(2.0, target.DoubleDictionary["bbb"]);
@@ -824,12 +824,12 @@ public void TestCopyPasteIntoNullDictionary()
             source = new MyClass { DoubleDictionary = new Dictionary<string, double> { { "aaa", 1 }, { "bbb", 2 }, { "ccc", 3 } } };
             target = new MyClass { DoubleDictionary = null };
             copiedText = Copy(source, source.DoubleDictionary.Single(x => x.Key == "ccc"));
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, false);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, false);
             Assert.Single(target.DoubleDictionary);
             Assert.Equal(3.0, target.DoubleDictionary["ccc"]);
 
             target = new MyClass { DoubleDictionary = null };
-            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], Index.Empty, true);
+            Paste(target, copiedText, typeof(Dictionary<string, double>), typeof(Dictionary<string, double>), x => x[nameof(MyClass.DoubleDictionary)], NodeIndex.Empty, true);
             Assert.Single(target.DoubleDictionary);
             Assert.Equal(3.0, target.DoubleDictionary["ccc"]);
         }
@@ -873,7 +873,7 @@ private string Copy([NotNull] Asset asset, object assetValue)
             return copiedText;
         }
 
-        private void Paste([NotNull] Asset asset, string copiedText, Type deserializedType, [NotNull] Type expectedType, [NotNull] Func<IObjectNode, IGraphNode> targetNodeResolver, Index index, bool replace)
+        private void Paste([NotNull] Asset asset, string copiedText, Type deserializedType, [NotNull] Type expectedType, [NotNull] Func<IObjectNode, IGraphNode> targetNodeResolver, NodeIndex index, bool replace)
         {
             var propertyGraph = ConstructPropertyGraph(asset);
             Assert.True(service.CanPaste(copiedText, asset.GetType(), expectedType));
diff --git a/sources/editor/Xenko.Core.Assets.Editor.Tests/Xenko.Core.Assets.Editor.Tests.csproj b/sources/editor/Xenko.Core.Assets.Editor.Tests/Xenko.Core.Assets.Editor.Tests.csproj
index 1666a096c3..b16fe8262d 100644
--- a/sources/editor/Xenko.Core.Assets.Editor.Tests/Xenko.Core.Assets.Editor.Tests.csproj
+++ b/sources/editor/Xenko.Core.Assets.Editor.Tests/Xenko.Core.Assets.Editor.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -35,5 +35,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/editor/Xenko.Core.Assets.Editor.Tests/packages.config b/sources/editor/Xenko.Core.Assets.Editor.Tests/packages.config
index e03e889eac..b8f5797eed 100644
--- a/sources/editor/Xenko.Core.Assets.Editor.Tests/packages.config
+++ b/sources/editor/Xenko.Core.Assets.Editor.Tests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="System.Runtime" version="4.3.0" targetFramework="net472" />
+  <package id="System.Runtime" version="4.3.0" targetFramework="net48" />
 </packages>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/AssetReferenceReplacementViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/AssetReferenceReplacementViewModel.cs
index 5f3369f199..16a0eec590 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/AssetReferenceReplacementViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/AssetReferenceReplacementViewModel.cs
@@ -11,9 +11,9 @@ namespace Xenko.Core.Assets.Editor.Components.FixAssetReferences
     public class AssetReferenceReplacementViewModel : ReferenceReplacementViewModel<AssetViewModel>
     {
         private readonly IGraphNode node;
-        private readonly Index index;
+        private readonly NodeIndex index;
 
-        public AssetReferenceReplacementViewModel(FixAssetReferencesViewModel fixReferences, AssetViewModel objectToFix, AssetViewModel referencer, object referencedMember, IGraphNode node, Index index)
+        public AssetReferenceReplacementViewModel(FixAssetReferencesViewModel fixReferences, AssetViewModel objectToFix, AssetViewModel referencer, object referencedMember, IGraphNode node, NodeIndex index)
             : base(fixReferences, objectToFix, referencer, referencedMember)
         {
             this.node = node;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/FixAssetReferencesViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/FixAssetReferencesViewModel.cs
index 2d1b1e5143..c653f182f9 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/FixAssetReferencesViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/FixAssetReferencesViewModel.cs
@@ -79,7 +79,7 @@ protected override IEnumerable<ReferenceReplacementViewModel<AssetViewModel>> Ge
                             if (target == CurrentObjectToReplace)
                             {
                                 // If so, prepare a replacement for it.
-                                var viewModel = new AssetReferenceReplacementViewModel(this, CurrentObjectToReplace, referencer, referencedMember, memberNode, Index.Empty);
+                                var viewModel = new AssetReferenceReplacementViewModel(this, CurrentObjectToReplace, referencer, referencedMember, memberNode, NodeIndex.Empty);
                                 result.Add(viewModel);
                             }
                         }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/Views/FixAssetReferencesWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/Views/FixAssetReferencesWindow.xaml
index 610f2b54af..476d5d5c76 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/Views/FixAssetReferencesWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/FixAssetReferences/Views/FixAssetReferencesWindow.xaml
@@ -1,13 +1,12 @@
 <xk:ModalWindow x:Class="Xenko.Core.Assets.Editor.Components.FixAssetReferences.Views.FixAssetReferencesWindow"
                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                   xmlns:xk="http://schemas.xenko.com/xaml/presentation"
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View"
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                   xmlns:valueConverters="clr-namespace:Xenko.Core.Assets.Editor.View.ValueConverters"
-                  xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
-                  xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
                   xmlns:far="clr-namespace:Xenko.Core.Assets.Editor.Components.FixAssetReferences"
                   mc:Ignorable="d"
                   ShowInTaskbar="False"
@@ -45,37 +44,33 @@
         </Button>
       </UniformGrid>
     </StackPanel>
-
-    <RadioButton Grid.Row="3" Margin="20" Content="{xk:Localize Replace references individually:, Context=Button}" IsChecked="{Binding UseSingleReplace, Converter={xk:InvertBool}}"/>
-    <xcdg:DataGridControl Margin="20" Grid.Row="4" ItemsSource="{Binding CurrentReplacements}" AutoCreateColumns="False" ItemScrollingBehavior="Immediate" IsEnabled="{Binding UseSingleReplace, Converter={xk:InvertBool}}">
-      <xcdg:DataGridControl.Resources>
-        <DataTemplate x:Key="AssetPickupCellTemplate">
-          <DockPanel DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}}" d:DataContext="{d:DesignInstance far:AssetReferenceReplacementViewModel}">
-            <Button Command="{Binding PickupReplacementObjectCommand}"
+    <view:DataGridEx Margin="20" Grid.Row="4" ItemsSource="{Binding CurrentReplacements}" IsEnabled="{Binding UseSingleReplace, Converter={xk:InvertBool}}" AutoGenerateColumns="False" CanUserResizeRows="False"  CanUserReorderColumns="False" RowHeaderWidth="0" IsReadOnly="True">
+      <DataGrid.Columns>
+        <DataGridTemplateColumn Header="{xk:Localize Referencer}" Width="2*"  >
+          <DataGridTemplateColumn.CellTemplate>
+            <DataTemplate>
+              <TextBlock DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}}" d:DataContext="{d:DesignInstance far:AssetReferenceReplacementViewModel}" Text="{Binding Referencer.Url}"></TextBlock>
+            </DataTemplate>
+          </DataGridTemplateColumn.CellTemplate>
+        </DataGridTemplateColumn>
+        <DataGridTemplateColumn Header="{xk:Localize Replacement asset}" Width="3*"  >
+          <DataGridTemplateColumn.CellTemplate>
+            <DataTemplate>
+              <DockPanel DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}}" d:DataContext="{d:DesignInstance far:AssetReferenceReplacementViewModel}">
+                <Button Command="{Binding PickupReplacementObjectCommand}"
                     ToolTip="{xk:Localize Select asset, Context=ToolTip}" DockPanel.Dock="Right" Content="{xk:Image {StaticResource ImagePickup}, 16, 16, NearestNeighbor}"
                     Background="Transparent" IsEnabled="{Binding IsChecked, ElementName=ClearCheckBox, Converter={xk:InvertBool}}"/>
-            <CheckBox x:Name="ClearCheckBox" Content="{xk:Localize Clear this reference, Context=Button}" Margin="10,0" DockPanel.Dock="Left" VerticalAlignment="Center" VerticalContentAlignment="Center"
+                <CheckBox x:Name="ClearCheckBox" Content="{xk:Localize Clear this reference, Context=Button}" Margin="10,0" DockPanel.Dock="Left" VerticalAlignment="Center" VerticalContentAlignment="Center"
                       IsChecked="{Binding DontFixReference}"/>
-            <xk:TextBox Text="{Binding ReplacementObject, Converter={valueConverters:AssetViewModelToUrl}}"
+                <xk:TextBox Text="{Binding ReplacementObject, Converter={valueConverters:AssetViewModelToUrl}}"
                           Margin="10,0" MinWidth="200" WatermarkContent="{xk:Localize Select an asset}" IsEnabled="{Binding IsChecked, ElementName=ClearCheckBox, Converter={xk:InvertBool}}"/>
-          </DockPanel>
-        </DataTemplate>
-      </xcdg:DataGridControl.Resources>
-      <xcdg:DataGridControl.Columns>
-        <xcdg:Column Width="2*" FieldName="Referencer.Url" Title="{xk:Localize Referencer}" AllowSort="True" ReadOnly="True"/>
-        <xcdg:Column Width="3*" FieldName="MemberPath" Title="{xk:Localize Reference path}" AllowSort="True" ReadOnly="True"/>
-        <xcdg:Column Width="3*" FieldName="ReplacementObject" Title="{xk:Localize Replacement asset}" AllowSort="True" CellContentTemplate="{StaticResource AssetPickupCellTemplate}"/>
-      </xcdg:DataGridControl.Columns>
-      <xcdg:DataGridControl.View>
-        <!-- Don't forget to change TableflowViewItemsHost in TableflowView.GridElementTemplates.xaml -->
-        <!--<xcdg:TableflowView ContainerHeight="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}, Converter={xk:Chained {xk:SumNum}, {xk:MaxNum}, Parameter1={xk:Double 8}, Parameter2={xk:Double 26}}}"
-                                            ScrollingAnimationDuration="0" RowFadeInAnimationDuration="0" IsColumnVirtualizationEnabled="False"/>-->
-        <xcdg:TableView AllowRowResize="False" IsColumnVirtualizationEnabled="False"/>
-      </xcdg:DataGridControl.View>
-      <i:Interaction.Behaviors>
-        <behaviors:XceedDataGridResizableColumnsBehavior/>
-      </i:Interaction.Behaviors>
-    </xcdg:DataGridControl>
+              </DockPanel>
+            </DataTemplate>
+          </DataGridTemplateColumn.CellTemplate>
+        </DataGridTemplateColumn>
+      </DataGrid.Columns>
+    </view:DataGridEx>
+    <RadioButton Grid.Row="3" Margin="20" Content="{xk:Localize Replace references individually:, Context=Button}" IsChecked="{Binding UseSingleReplace, Converter={xk:InvertBool}}"/>
     <UniformGrid Grid.Row="5" Rows="1" DockPanel.Dock="Bottom" Margin="20">
       <Button Margin="10,0,0,0" Padding="10,4" Content="{xk:Localize Done, Context=Button}" Command="{Binding FixReferencesCommand}"/>
       <Button Margin="10,0,0,0" Padding="10,4" Content="{xk:Localize Clear references, Context=Button}" Command="{Binding ClearReferencesCommand}" ToolTip="{xk:Localize Clear the references of the current asset, Context=ToolTip}"/>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs
index c0712926fa..4a28a2b5e9 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/Properties/PropertiesViewModel.cs
@@ -67,6 +67,7 @@ protected PropertiesViewModel([NotNull] IViewModelServiceProvider serviceProvide
             RegisterNodePresenterUpdater(new MathematicsNodeUpdater());
             RegisterNodePresenterUpdater(new NumericValueNodeUpdater());
             RegisterNodePresenterUpdater(new UPathNodeUpdater());
+            RegisterNodePresenterUpdater(new DictionaryNodeUpdater());
 
             // Note: try to keep InlineMemberNodeUpdater last since it's transfering some metadata generated by previous updater between nodes
             RegisterNodePresenterUpdater(new InlineMemberNodeUpdater());
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs
index bf090a8865..2a91293834 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs
@@ -38,14 +38,14 @@ internal static async Task<bool> RunTemplateGeneratorSafe<TParameters>(ITemplate
             }
             catch (Exception e)
             {
-                parameters.Logger.Error(Tr._p("Log", "An exception occurred while generating the template."), e);
+                parameters.Logger.Error(Tr._p("Log", "An exception occurred while generating the template. Reopen it or just remove broken stuff."), e);
             }
 
-            if (parameters.Logger.HasErrors || !success)
+            /*if (parameters.Logger.HasErrors || !success)
             {
                 workProgress?.ServiceProvider.Get<IEditorDialogService>().ShowProgressWindow(workProgress, 0);
                 return false;
-            }
+            }*/
 
             workProgress?.ServiceProvider.Get<IEditorDialogService>().ShowProgressWindow(workProgress, 500);
 
@@ -57,12 +57,12 @@ internal static async Task<bool> RunTemplateGeneratorSafe<TParameters>(ITemplate
                 }
                 catch (Exception e)
                 {
-                    parameters.Logger.Error(Tr._p("Log", "An exception occurred while generating the template."), e);
-                    return false;
+                    parameters.Logger.Error(Tr._p("Log", "An exception occurred while generating the template. Reopen it or just remove broken stuff."), e);
+                    return true;
                 }
             });
 
-            return result && !parameters.Logger.HasErrors;
+            return true;
         }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/AddItemUserControl.xaml b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/AddItemUserControl.xaml
index 9fe034875e..5da6d2cbdf 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/AddItemUserControl.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/AddItemUserControl.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
              xmlns:xk="http://schemas.xenko.com/xaml/presentation"
              xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.Components.TemplateDescriptions.Views"
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/NewProjectWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/NewProjectWindow.xaml
index 5fa4b3a93d..2839fc7103 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/NewProjectWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/NewProjectWindow.xaml
@@ -1,7 +1,7 @@
 <xk:ModalWindow x:Class="Xenko.Core.Assets.Editor.Components.TemplateDescriptions.Views.NewProjectWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:xk="http://schemas.xenko.com/xaml/presentation"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml
index a67deb083c..87fc29e7a5 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml
@@ -1,7 +1,7 @@
 <xk:ModalWindow x:Class="Xenko.Core.Assets.Editor.Components.TemplateDescriptions.Views.ProjectSelectionWindow"
                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                   xmlns:xk="http://schemas.xenko.com/xaml/presentation"
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Properties/AssemblyInfo.cs b/sources/editor/Xenko.Core.Assets.Editor/Properties/AssemblyInfo.cs
index ca9d809309..29054891d5 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Properties/AssemblyInfo.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Properties/AssemblyInfo.cs
@@ -24,7 +24,7 @@
 //the line below to match the UICulture setting in the project file.
 
 //[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-[assembly: InternalsVisibleTo("Xenko.GameStudio")]
+[assembly: InternalsVisibleTo("Focus.GameStudio")]
 [assembly: InternalsVisibleTo("Xenko.Core.Assets.Editor.Tests")]
 
 [assembly: ThemeInfo(
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/AssetContentValueChangeOperation.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/AssetContentValueChangeOperation.cs
index 47ef91e7ad..84b7976b9d 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/AssetContentValueChangeOperation.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/AssetContentValueChangeOperation.cs
@@ -18,7 +18,7 @@ public class AssetContentValueChangeOperation : ContentValueChangeOperation
         private readonly OverrideType previousOverride;
         private readonly ItemId itemId;
 
-        public AssetContentValueChangeOperation(IAssetNode node, ContentChangeType changeType, Index index, object oldValue, object newValue, OverrideType previousOverride, OverrideType newOverride, ItemId itemId, IEnumerable<IDirtiable> dirtiables)
+        public AssetContentValueChangeOperation(IAssetNode node, ContentChangeType changeType, NodeIndex index, object oldValue, object newValue, OverrideType previousOverride, OverrideType newOverride, ItemId itemId, IEnumerable<IDirtiable> dirtiables)
             : base(node, changeType, index, oldValue, newValue, dirtiables)
         {
             this.previousOverride = previousOverride;
@@ -98,7 +98,7 @@ protected override void Undo()
                 if (ChangeType != ContentChangeType.CollectionAdd)
                 {
                     // For value change or remove, we just need to indicate that the value is not overridden anymore
-                    if (Index == Index.Empty)
+                    if (Index == NodeIndex.Empty)
                     {
                         ((IAssetMemberNode)Node).OverrideContent(false);
                     }
@@ -123,7 +123,7 @@ protected override void Redo()
             base.Redo();
             if (!newOverride.HasFlag(OverrideType.New) && Node.BaseNode != null)
             {
-                if (Index != Index.Empty)
+                if (Index != NodeIndex.Empty)
                 ((IAssetObjectNode)Node).ResetOverrideRecursively(Index);
                 else
                     Node.ResetOverrideRecursively();
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/ContentValueChangeOperation.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/ContentValueChangeOperation.cs
index a443f194a3..0515668ad1 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/ContentValueChangeOperation.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/ContentValueChangeOperation.cs
@@ -13,11 +13,11 @@ namespace Xenko.Core.Assets.Editor.Quantum
     public class ContentValueChangeOperation : DirtyingOperation, IMergeableOperation
     {
         protected readonly IGraphNode Node;
-        protected Index Index;
+        protected NodeIndex Index;
         protected object PreviousValue;
         protected object NewValue;
 
-        public ContentValueChangeOperation(IGraphNode node, ContentChangeType changeType, Index index, object previousValue, object newValue, IEnumerable<IDirtiable> dirtiables)
+        public ContentValueChangeOperation(IGraphNode node, ContentChangeType changeType, NodeIndex index, object previousValue, object newValue, IEnumerable<IDirtiable> dirtiables)
             : base(dirtiables)
         {
             Node = node;
@@ -106,7 +106,7 @@ public override string ToString()
         /// <inheritdoc/>
         protected override void FreezeContent()
         {
-            Index = Index.Empty;
+            Index = NodeIndex.Empty;
             PreviousValue = null;
             NewValue = null;
         }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetItemNodePresenter.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetItemNodePresenter.cs
index e7b2b97267..d19dfd4d7a 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetItemNodePresenter.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetItemNodePresenter.cs
@@ -13,7 +13,7 @@ namespace Xenko.Core.Assets.Editor.Quantum.NodePresenters
 {
     public class AssetItemNodePresenter : ItemNodePresenter, IAssetNodePresenter
     {
-        public AssetItemNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPropertyProviderViewModel propertyProvider, [NotNull] INodePresenter parent, [NotNull] IAssetObjectNode container, Index index)
+        public AssetItemNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPropertyProviderViewModel propertyProvider, [NotNull] INodePresenter parent, [NotNull] IAssetObjectNode container, NodeIndex index)
             : base(factory, propertyProvider, parent, container, index)
         {
         }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetNodePresenterFactory.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetNodePresenterFactory.cs
index 0889dd15be..da77ced462 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetNodePresenterFactory.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/AssetNodePresenterFactory.cs
@@ -51,7 +51,7 @@ protected override IInitializingNodePresenter CreateMember(IPropertyProviderView
             return new AssetMemberNodePresenter(this, propertyProvider, parentPresenter, assetNode);
         }
 
-        protected override IInitializingNodePresenter CreateItem(IPropertyProviderViewModel propertyProvider, INodePresenter containerPresenter, IObjectNode containerNode, Index index)
+        protected override IInitializingNodePresenter CreateItem(IPropertyProviderViewModel propertyProvider, INodePresenter containerPresenter, IObjectNode containerNode, NodeIndex index)
         {
             var assetNode = containerNode as IAssetObjectNode;
             if (assetNode == null) throw new ArgumentException($"Expected an {nameof(IAssetMemberNode)}.");
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/AddPrimitiveKeyCommand.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/AddPrimitiveKeyCommand.cs
index c25fbdc224..2b97f61134 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/AddPrimitiveKeyCommand.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/AddPrimitiveKeyCommand.cs
@@ -52,7 +52,14 @@ protected override void ExecuteSync(INodePresenter nodePresenter, object paramet
             var assetNodePresenter = nodePresenter as IAssetNodePresenter;
             var dictionaryDescriptor = (DictionaryDescriptor)nodePresenter.Descriptor;
             var value = nodePresenter.Value;
-            var newKey = dictionaryDescriptor.KeyType != typeof(string) ? new Index(Activator.CreateInstance(dictionaryDescriptor.KeyType)) : GenerateStringKey(value, dictionaryDescriptor, parameter as string);
+
+            NodeIndex newKey;
+            if(dictionaryDescriptor.KeyType == typeof(string))
+                newKey = GenerateStringKey(value, dictionaryDescriptor, parameter as string);
+            else if (dictionaryDescriptor.KeyType.IsEnum)
+                newKey = new NodeIndex(parameter);
+            else
+                newKey = new NodeIndex(Activator.CreateInstance(dictionaryDescriptor.KeyType));
 
             var newItem = dictionaryDescriptor.ValueType.Default();
             var instance = CreateInstance(dictionaryDescriptor.ValueType);
@@ -87,7 +94,7 @@ private static object CreateInstance(Type type)
             return ObjectFactoryRegistry.NewInstance(type);
         }
 
-        internal static Index GenerateStringKey(object dictionary, ITypeDescriptor descriptor, string baseValue)
+        internal static NodeIndex GenerateStringKey(object dictionary, ITypeDescriptor descriptor, string baseValue)
         {
             // TODO: use a dialog service and popup a message when the given key is invalid
             const string defaultKey = "Key";
@@ -103,7 +110,7 @@ internal static Index GenerateStringKey(object dictionary, ITypeDescriptor descr
                 baseValue = baseName + " " + ++i;
             }
 
-            return new Index(baseValue);
+            return new NodeIndex(baseValue);
         }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/MoveItemCommand.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/MoveItemCommand.cs
index fb4546e27d..8a8f9cf1fe 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/MoveItemCommand.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/MoveItemCommand.cs
@@ -48,8 +48,8 @@ protected override void ExecuteSync(INodePresenter nodePresenter, object paramet
             var itemNode = (ItemNodePresenter)nodePresenter;
             var collectionNode = itemNode.OwnerCollection;
             var indices = (Tuple<int, int>)parameter;
-            var sourceIndex = new Index(indices.Item1);
-            var targetIndex = new Index(indices.Item2);
+            var sourceIndex = new NodeIndex(indices.Item1);
+            var targetIndex = new NodeIndex(indices.Item2);
             var value = itemNode.Value;
             collectionNode.RemoveItem(value, sourceIndex);
             collectionNode.AddItem(value, targetIndex);
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/RemoveItemCommand.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/RemoveItemCommand.cs
index 9ddee7091e..d6fa4a8614 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/RemoveItemCommand.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Commands/RemoveItemCommand.cs
@@ -38,7 +38,8 @@ public override bool CanAttach(INodePresenter nodePresenter)
             {
                 var elementType = collectionDescriptor.ElementType;
                 // We also add the same conditions that for AddNewItem
-                return collectionDescriptor.HasRemoveAt && AddNewItemCommand.CanAdd(elementType);
+                return (collectionDescriptor.HasRemoveAt || collectionDescriptor.HasRemove)
+                    && AddNewItemCommand.CanAdd(elementType);
             }
             // TODO: add a HasRemove in the dictionary descriptor and test it!
             return true;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Updaters/DictionaryNodeUpdater.cs b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Updaters/DictionaryNodeUpdater.cs
new file mode 100644
index 0000000000..2667f7dae3
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/Quantum/NodePresenters/Updaters/DictionaryNodeUpdater.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Presentation.Quantum.Presenters;
+using Xenko.Core.Reflection;
+
+namespace Xenko.Core.Assets.Editor.Quantum.NodePresenters.Updaters
+{
+    /// <summary>
+    /// Updates nodes that hold dictionaries with the dictionary's key type.
+    /// </summary>
+    public sealed class DictionaryNodeUpdater : NodePresenterUpdaterBase
+    {
+        public static PropertyKey<Type> DictionaryNodeKeyType = new PropertyKey<Type>(nameof(DictionaryNodeKeyType), typeof(DictionaryNodeUpdater));
+        
+        public override void UpdateNode(INodePresenter node)
+        {
+            if (DictionaryDescriptor.IsDictionary(node.Type))
+            {
+                if (node.Type.IsGenericType)
+                {
+                    var genericArguments = node.Type.GetGenericArguments();
+                    node.AttachedProperties.Add(DictionaryNodeKeyType, genericArguments[0]);
+                }
+                else
+                {
+                    foreach (var typeInterface in node.Type.GetInterfaces())
+                    {
+                        if (!typeInterface.IsGenericType || typeInterface.GetGenericTypeDefinition() != typeof(IDictionary<,>))
+                            continue;
+
+                        var genericArguments = typeInterface.GetGenericArguments();
+                        node.AttachedProperties.Add(DictionaryNodeKeyType, genericArguments[0]);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Resources/Images/default-template-icon.png b/sources/editor/Xenko.Core.Assets.Editor/Resources/Images/default-template-icon.png
index df9cc7f5a1..4b5059507f 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Resources/Images/default-template-icon.png
+++ b/sources/editor/Xenko.Core.Assets.Editor/Resources/Images/default-template-icon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f5c028b343afb1efb9c4faba19b7cbeb4a09c60ea212c5ea6b5ccadc21fed03
-size 5484
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Services/ContentReferenceHelper.cs b/sources/editor/Xenko.Core.Assets.Editor/Services/ContentReferenceHelper.cs
index 3ba479724c..bfc54c39ab 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Services/ContentReferenceHelper.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Services/ContentReferenceHelper.cs
@@ -35,6 +35,11 @@ public static object CreateReference(AssetViewModel asset, Type referenceType)
         {
             if (asset != null)
             {
+                if (UrlReferenceHelper.IsUrlReferenceType(referenceType))
+                {
+                    return AttachedReferenceManager.CreateProxyObject(referenceType, asset.Id, asset.Url);
+                }
+
                 if (AssetRegistry.IsContentType(referenceType))
                 {
                     var assetType = asset.AssetItem.Asset.GetType();
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Services/IEditorDialogService.cs b/sources/editor/Xenko.Core.Assets.Editor/Services/IEditorDialogService.cs
index 6dd6b0b007..7489831d27 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Services/IEditorDialogService.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Services/IEditorDialogService.cs
@@ -143,8 +143,8 @@ public interface IPackagePickerDialog : IModalDialog
     {
         bool AllowMultiSelection { get; set; }
 
-        Func<PackageViewModel, bool> Filter { get; set; }
+        Func<PickablePackageViewModel, bool> Filter { get; set; }
 
-        IReadOnlyCollection<PackageViewModel> SelectedPackages { get; }
+        IReadOnlyCollection<PickablePackageViewModel> SelectedPackages { get; }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Settings/EditorSettings.cs b/sources/editor/Xenko.Core.Assets.Editor/Settings/EditorSettings.cs
index 3dee50b704..61a9b164b9 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Settings/EditorSettings.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Settings/EditorSettings.cs
@@ -83,10 +83,6 @@ static EditorSettings()
             };
             FallbackBuildCacheDirectory = new UDirectory(Path.Combine(EditorPath.DefaultTempPath, "BuildCache"));
 
-            UseEffectCompilerServer = new SettingsKey<bool>("Tools/UseEffectCompilerServer", SettingsContainer, true)
-            {
-                DisplayName = $"{Tools}/{Tr._p("Settings", "Use effect compiler server for mobile platforms")}",
-            };
             ReloadLastSession = new SettingsKey<bool>("Interface/ReloadLastSession", SettingsContainer, false)
             {
                 DisplayName = $"{Interface}/{Tr._p("Settings", "Automatically reload last session at startup")}",
@@ -115,8 +111,6 @@ static EditorSettings()
 
         public static UDirectory FallbackBuildCacheDirectory { get; }
 
-        public static SettingsKey<bool> UseEffectCompilerServer { get; }
-
         public static SettingsKey<bool> ReloadLastSession { get; }
 
         public static bool NeedRestart { get; set; }
@@ -124,10 +118,12 @@ static EditorSettings()
         public static void Initialize()
         {
             profile = SettingsContainer.LoadSettingsProfile(EditorPath.EditorConfigPath, true) ?? SettingsContainer.CreateSettingsProfile(true);
+            Presentation.Themes.ThemesSettings.Initialize();
 
             // Settings that requires a restart must register here:
-            UseEffectCompilerServer.ChangesValidated += (s, e) => NeedRestart = true;
             Language.ChangesValidated += (s, e) => NeedRestart = true;
+
+            Presentation.Themes.ThemesSettings.ThemeName.ChangesValidated += (s, e) => NeedRestart = true;
         }
 
         public static void Save()
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Settings/ThemesSettings.cs b/sources/editor/Xenko.Core.Assets.Editor/Settings/ThemesSettings.cs
new file mode 100644
index 0000000000..6081fc5c8d
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/Settings/ThemesSettings.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core.Assets.Editor.Settings;
+using Xenko.Core.Settings;
+using Xenko.Core.Translation;
+
+namespace Xenko.Core.Presentation.Themes
+{
+    public static class ThemesSettings
+    {
+        // Categories
+        public static readonly string Themes = Tr._p("Settings", "Themes");
+
+        static ThemesSettings()
+        {
+            ThemeName = new SettingsKey<ThemeType>("Themes/ThemeName", EditorSettings.SettingsContainer, ThemeType.ExpressionDark)
+            {
+                DisplayName = $"{Themes}/{Tr._p("Settings", "Theme Name")}"
+            };
+        }
+
+        public static SettingsKey<ThemeType> ThemeName { get; }
+
+        public static void Initialize()
+        {
+            ThemeController.CurrentTheme = ThemeName.GetValue();
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Settings/ViewModels/SettingsCategoryViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/Settings/ViewModels/SettingsCategoryViewModel.cs
index d863bde7f5..1bcebbc4a8 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Settings/ViewModels/SettingsCategoryViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/Settings/ViewModels/SettingsCategoryViewModel.cs
@@ -105,6 +105,6 @@ IObjectNode IPropertyProviderViewModel.GetRootNode()
 
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/Common.Resources.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/Common.Resources.xaml
index c7c7146d6d..0d4aa73828 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/Common.Resources.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/Common.Resources.xaml
@@ -15,8 +15,7 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <!-- Style applied to the Thumbs that are used to resize the columns and rows.
         The Thumb's template is an empty Grid with a Transparent background to
@@ -41,42 +40,8 @@
     </Setter>
   </Style>
 
-  <!-- ControlTemplated applied to the Button that is used in the DataRows
-        to expand/collapse Details. -->
-  <ControlTemplate x:Key="detailsExpanderButtonTemplate"
-                    TargetType="Button">
-    <ContentPresenter x:Name="expanderGlyphPresenter"
-                        Content="{x:Null}"
-                        ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).CollapseGroupGlyph}" />
-
-    <ControlTemplate.Triggers>
-      <Trigger Property="xcdg:DataGridControl.HasExpandedDetails"
-                  Value="False">
-        <Setter TargetName="expanderGlyphPresenter"
-                    Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ExpandGroupGlyph}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- ControlTemplated applied to the ToggleButton that is used in the GroupHeaders
-        to expand/collapse groups. -->
-  <ControlTemplate x:Key="groupExpanderToggleButtonTemplate"
-                    TargetType="ToggleButton">
-
-    <ContentPresenter x:Name="expanderGlyphPresenter"
-                        Content="{x:Null}"
-                        ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).CollapseGroupGlyph}" />
-
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsChecked"
-                  Value="False">
-        <Setter TargetName="expanderGlyphPresenter"
-                    Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ExpandGroupGlyph}" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
+  
+
 
   <DataTemplate x:Key="defaultGroupTemplate">
     <StackPanel Orientation="Horizontal"
@@ -118,109 +83,14 @@
     </DataTemplate.Triggers>
   </DataTemplate>
 
-  <DataTemplate x:Key="stickyGroupTemplate">
-    <DataTemplate.Resources>
-      <DataTemplate x:Key="detailedGroupItemContentTemplate">
-        <StackPanel Orientation="Horizontal"
-                        VerticalAlignment="Center">
-
-          <ContentControl Content="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:GroupNavigationControl.Group).Value}"
-                               ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:GroupNavigationControl.Group).ValueTemplate}"
-                               ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:GroupNavigationControl.Group).ValueTemplateSelector}"
-                               TextBlock.FontWeight="Bold"
-                               VerticalAlignment="Center" />
-
-          <TextBlock Text=" ("
-                          VerticalAlignment="Center" />
-          <TextBlock Text="{Binding ItemCount}"
-                          VerticalAlignment="Center" />
-          <TextBlock Text=" "
-                          VerticalAlignment="Center" />
-          <TextBlock x:Name="suffixRun"
-                          Text="items"
-                          VerticalAlignment="Center" />
-          <TextBlock Text=")"
-                          VerticalAlignment="Center" />
-
-        </StackPanel>
-
-        <DataTemplate.Triggers>
-          <DataTrigger Binding="{Binding ItemCount}"
-                            Value="1">
-            <Setter TargetName="suffixRun"
-                          Property="Text"
-                          Value="item" />
-          </DataTrigger>
-        </DataTemplate.Triggers>
-      </DataTemplate>
-
-      <DataTemplate x:Key="groupItemContentTemplate">
-        <ContentControl Content="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:GroupNavigationControl.Group).Value}"
-                            ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:GroupNavigationControl.Group).ValueTemplate}"
-                            ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:GroupNavigationControl.Group).ValueTemplateSelector}" />
-      </DataTemplate>
-
-      <DataTemplate x:Key="parentGroupTemplate">
-        <xcdg:GroupNavigationControl Group="{Binding}"
-                                          MainItemTemplate="{StaticResource groupItemContentTemplate}"
-                                          ItemTemplate="{StaticResource groupItemContentTemplate}" />
-      </DataTemplate>
-    </DataTemplate.Resources>
-
-    <StackPanel Orientation="Horizontal">
-      <ItemsControl ItemsSource="{Binding Path=ParentGroups}"
-                       ItemTemplate="{StaticResource parentGroupTemplate}"
-                       Focusable="False">
-        <ItemsControl.ItemsPanel>
-          <ItemsPanelTemplate>
-            <StackPanel Orientation="Horizontal"
-                              IsItemsHost="True" />
-          </ItemsPanelTemplate>
-        </ItemsControl.ItemsPanel>
-      </ItemsControl>
-
-      <xcdg:GroupNavigationControl Group="{Binding}"
-                                       MainItemTemplate="{StaticResource detailedGroupItemContentTemplate}"
-                                       ItemTemplate="{StaticResource groupItemContentTemplate}" />
-    </StackPanel>
-  </DataTemplate>
-
-  <DataTemplate DataType="{x:Type xcdg:Group}">
-    <!-- This ContentControl must be focusable false to avoid getting the focus 
-           when performing KeyboardNavigation -->
-    <ContentControl x:Name="groupContentPresenter"
-                      Focusable="False"
-                      Content="{Binding}"
-                      ContentTemplate="{StaticResource defaultGroupTemplate}" />
-
-    <DataTemplate.Triggers>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.View, Converter={x:Static xcdg:TypeToBooleanConverter.Singleton}, ConverterParameter={x:Type xcdg:TableflowView}}"
-                      Value="True">
-        <Setter Property="ContentTemplate"
-                    Value="{StaticResource stickyGroupTemplate}"
-                    TargetName="groupContentPresenter" />
-      </DataTrigger>
-    </DataTemplate.Triggers>
-  </DataTemplate>
-
-  <!-- Default DataTemplate for displaying a GroupLevelDescription (e.g. in a GroupByItem) -->
-  <DataTemplate DataType="{x:Type xcdg:GroupLevelDescription}">
+  
 
-    <ContentPresenter Content="{Binding Title}"
-                        ContentTemplate="{Binding RelativeSource={RelativeSource TemplatedParent},Path=DataContext.TitleTemplate}" />
+     
+  
 
-  </DataTemplate>
+  
 
-  <!-- ValueConverter that is used to do DataTriggers on Content properties to check if they are null. -->
-  <xcdg:NullToBooleanConverter x:Key="nullToBooleanConverter" />
-
-  <xcdg:IntAdditionConverter x:Key="intAdditionConverter" />
-
-  <!-- ValueConverter that is used to map GridLineThickness properties (of type double)
-        to Thickness structures that we can set to BorderThickness properties in the templates. -->
-  <xcdg:ThicknessConverter x:Key="thicknessConverter" />
-
-  <xcdg:EmptyStringToBooleanConverter x:Key="emptyStringToBooleanConverter" />
+ 
 
   <Thickness x:Key="cellPadding"
               Left="2"
@@ -372,136 +242,4 @@
     </DataTemplate.Triggers>
   </DataTemplate>
 
-  <DataTemplate x:Key="connectionStateErrorGlyph">
-    <DataTemplate.Resources>
-      <SolidColorBrush Color="Black"
-                          x:Key="backgroundBrushAdoners" />
-      <Storyboard x:Key="errorStoryboard"
-                     RepeatBehavior="Forever">
-        <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-          <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="#FF970000" />
-          <SplineColorKeyFrame KeyTime="00:00:00.5000000"
-                                    Value="Red" />
-          <SplineColorKeyFrame KeyTime="00:00:01"
-                                    Value="#FF970000" />
-          <SplineColorKeyFrame KeyTime="00:00:01.5000000"
-                                    Value="Red" />
-          <SplineColorKeyFrame KeyTime="00:00:02"
-                                    Value="#FF970000" />
-        </ColorAnimationUsingKeyFrames>
-        <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path2"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-          <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="#FF970000" />
-          <SplineColorKeyFrame KeyTime="00:00:00.5000000"
-                                    Value="Red" />
-          <SplineColorKeyFrame KeyTime="00:00:01"
-                                    Value="#FF970000" />
-          <SplineColorKeyFrame KeyTime="00:00:01.5000000"
-                                    Value="Red" />
-          <SplineColorKeyFrame KeyTime="00:00:02"
-                                    Value="#FF970000" />
-        </ColorAnimationUsingKeyFrames>
-        <ColorAnimationUsingKeyFrames BeginTime="00:00:00"
-                                          Storyboard.TargetName="path3"
-                                          Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-          <SplineColorKeyFrame KeyTime="00:00:00"
-                                    Value="#FF970000" />
-          <SplineColorKeyFrame KeyTime="00:00:00.5000000"
-                                    Value="Red" />
-          <SplineColorKeyFrame KeyTime="00:00:01"
-                                    Value="#FF970000" />
-          <SplineColorKeyFrame KeyTime="00:00:01.5000000"
-                                    Value="Red" />
-          <SplineColorKeyFrame KeyTime="00:00:02"
-                                    Value="#FF970000" />
-        </ColorAnimationUsingKeyFrames>
-      </Storyboard>
-
-    </DataTemplate.Resources>
-    <Grid x:Name="rootLayout"
-            Background="Transparent">
-      <Canvas Width="27.466"
-                 Height="24.066">
-
-        <Canvas>
-          <Path x:Name="path"
-                     Fill="Black"
-                     Data="F1 M 17.067,3.300 C 17.067,5.123 15.589,6.600 13.767,6.600 C 11.944,6.600 10.467,5.123 10.467,3.300 C 10.467,1.478 11.944,0.000 13.767,0.000 C 15.589,0.000 17.067,1.478 17.067,3.300 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <ScaleTransform />
-                <SkewTransform />
-                <RotateTransform />
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-          <Path x:Name="path2"
-                     Fill="Black"
-                     Data="F1 M 6.600,20.767 C 6.600,22.590 5.123,24.066 3.300,24.066 C 1.478,24.066 0.000,22.590 0.000,20.767 C 0.000,18.944 1.478,17.467 3.300,17.467 C 5.123,17.467 6.600,18.944 6.600,20.767 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <ScaleTransform />
-                <SkewTransform />
-                <RotateTransform />
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-          <Path x:Name="path3"
-                     Fill="Black"
-                     Data="F1 M 27.466,20.767 C 27.466,22.590 25.989,24.066 24.167,24.066 C 22.344,24.066 20.867,22.590 20.867,20.767 C 20.867,18.944 22.344,17.467 24.167,17.467 C 25.989,17.467 27.466,18.944 27.466,20.767 Z"
-                     RenderTransformOrigin="0.5,0.5"
-                     Opacity="0.8">
-            <Path.RenderTransform>
-              <TransformGroup>
-                <ScaleTransform />
-                <SkewTransform />
-                <RotateTransform />
-                <TranslateTransform />
-              </TransformGroup>
-            </Path.RenderTransform>
-          </Path>
-        </Canvas>
-      </Canvas>
-      <Grid.ToolTip>
-        <ToolTip x:Name="errorToolTip"
-                     Visibility="Collapsed">
-          <ContentPresenter />
-        </ToolTip>
-      </Grid.ToolTip>
-    </Grid>
-    <DataTemplate.Triggers>
-      <DataTrigger Binding="{Binding}"
-                      Value="Error">
-        <Setter TargetName="rootLayout"
-                    Property="Visibility"
-                    Value="Visible" />
-        <Setter Property="Visibility"
-                    TargetName="errorToolTip"
-                    Value="Visible" />
-        <Setter TargetName="errorToolTip"
-                    Property="Content"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.ConnectionError}" />
-        <DataTrigger.EnterActions>
-          <BeginStoryboard Storyboard="{StaticResource errorStoryboard}"
-                                Name="storyboard" />
-        </DataTrigger.EnterActions>
-        <DataTrigger.ExitActions>
-          <StopStoryboard BeginStoryboardName="storyboard" />
-          <RemoveStoryboard BeginStoryboardName="storyboard" />
-        </DataTrigger.ExitActions>
-      </DataTrigger>
-    </DataTemplate.Triggers>
-  </DataTemplate>
-
 </ResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/ExpressionDark.normalcolor.Resources.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/ExpressionDark.normalcolor.Resources.xaml
index 08b82eb6a8..d6478a4088 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/ExpressionDark.normalcolor.Resources.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/ExpressionDark.normalcolor.Resources.xaml
@@ -15,8 +15,7 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <SolidColorBrush x:Key="gridLineBrush"
                     Color="Gray" />
@@ -39,29 +38,4 @@
   <Pen x:Key="dropMarkPen"
         Brush="{StaticResource dropMarkBrush}"
         Thickness="7" />
-
-  <!--**************************
-    * TEMPLATE: ScrollTip
-    ************************** -->
-  <ControlTemplate x:Key="scrollTipTemplate"
-                    TargetType="{x:Type xcdg:ScrollTip}">
-
-    <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}"
-            HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
-
-      <Border BorderThickness="1,1,1,1"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 Background="{TemplateBinding Background}">
-
-        <ContentPresenter VerticalAlignment="Center"
-                              HorizontalAlignment="Right"
-                              Margin="5"
-                              TextElement.Foreground="{TemplateBinding TextElement.Foreground}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-      </Border>
-    </Grid>
-  </ControlTemplate>
-
 </ResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/TableView.ExpressionDark.normalcolor.Graphics.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/TableView.ExpressionDark.normalcolor.Graphics.xaml
index b00e5de8ad..307ab4f64b 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/TableView.ExpressionDark.normalcolor.Graphics.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/Resources/TableView.ExpressionDark.normalcolor.Graphics.xaml
@@ -15,18 +15,7 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:markup="clr-namespace:Xceed.Utils.Wpf.Markup;assembly=Xceed.Wpf.DataGrid">
-
-  <ResourceDictionary.MergedDictionaries>
-
-    <!-- Include the standard graphics -->
-    <markup:XceedResourceDictionary XceedSource="/Xceed.Wpf.DataGrid;component\themes/Common/Graphics.xaml" />
-
-    <!-- Needs Windows8 Resources -->
-    <ResourceDictionary Source="ExpressionDark.normalcolor.Resources.xaml" />
-
-  </ResourceDictionary.MergedDictionaries>
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <DataTemplate x:Key="AscendingSortGlyph">
     <Canvas Height="4"
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableViewScrollViewer.generic.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableViewScrollViewer.generic.xaml
deleted file mode 100644
index 428b84de09..0000000000
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableViewScrollViewer.generic.xaml
+++ /dev/null
@@ -1,171 +0,0 @@
-<!--***********************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2007-2013 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus Edition at http://xceed.com/wpf_toolkit
-
-   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
-
-  **********************************************************************************-->
-
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid">
-
-  <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
-    <ResourceDictionary Source="Resources/TableView.ExpressionDark.normalcolor.Graphics.xaml"/>
-  </ResourceDictionary.MergedDictionaries>
-
-  <Style TargetType="{x:Type xcdg:TableViewScrollViewer}">
-
-    <Setter Property="VerticalScrollBarVisibility"
-              Value="Visible" />
-
-    <Setter Property="HorizontalScrollBarVisibility"
-              Value="Auto" />
-
-    <Setter Property="CanContentScroll"
-              Value="True" />
-
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type xcdg:TableViewScrollViewer}">
-
-          <!-- Root Grid that layout the "content" and the Scrollbars -->
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <!-- Content -->
-              <ColumnDefinition />
-
-              <!-- Vertical ScrollBar -->
-              <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
-
-            <Grid.RowDefinitions>
-              <!-- Content -->
-              <RowDefinition />
-
-              <!-- Horizontal ScrollBar -->
-              <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <!-- Content -->
-
-            <Grid Margin="{TemplateBinding Padding}">
-              <Grid.ColumnDefinitions>
-                <!-- RowSelectorPane-->
-                <ColumnDefinition Width="Auto" />
-
-                <!-- ScrollContentPresenter -->
-                <ColumnDefinition />
-              </Grid.ColumnDefinitions>
-
-              <Grid.RowDefinitions>
-                <!-- Fixed Headers -->
-                <RowDefinition Height="Auto" />
-
-                <!-- ScrollContentPresenter -->
-                <RowDefinition />
-
-                <!-- Fixed Footers -->
-                <RowDefinition Height="Auto" />
-              </Grid.RowDefinitions>
-
-              <!-- RowSelectorPane -->
-
-              <xcdg:RowSelectorPane x:Name="PART_RowSelectorPane"
-                                            Grid.Column="0"
-                                            Grid.Row="0"
-                                            Grid.RowSpan="3"
-                                            Background="{StaticResource NormalBrush}"
-                                            Width="{TemplateBinding RowSelectorPaneWidth}" />
-
-              <!-- Fixed Headers -->
-
-              <xcdg:SynchronizedScrollViewer x:Name="fixedHeaderScrollViewer"
-                                                     Grid.Column="1"
-                                                     Grid.Row="0"
-                                                     xcdg:TableViewScrollViewer.SynchronizedScrollViewerPosition="Top"
-                                                     Focusable="False">
-                <!-- Using a TableViewHeaderFooterPanel will enable the columns 
-                             auto width feature. -->
-                <xcdg:TableViewHeaderFooterPanel xcdg:DataGridControl.IsFixedHeadersHost="True"
-                                                          Orientation="Vertical"
-                                                          HorizontalAlignment="Left" />
-
-              </xcdg:SynchronizedScrollViewer>
-
-              <!-- Fixed Footers -->
-
-              <xcdg:SynchronizedScrollViewer  x:Name="fixedFooterScrollViewer"
-                                                      Grid.Column="1"
-                                                      Grid.Row="2"
-                                                      xcdg:TableViewScrollViewer.SynchronizedScrollViewerPosition="Bottom"
-                                                      Focusable="False">
-                <!-- Using a TableViewHeaderFooterPanel will enable the columns 
-                             auto width feature. -->
-                <xcdg:TableViewHeaderFooterPanel xcdg:DataGridControl.IsFixedFootersHost="True"
-                                                          Orientation="Vertical"
-                                                          HorizontalAlignment="Left" />
-
-              </xcdg:SynchronizedScrollViewer>
-
-              <!-- ScrollContentPresenter (data rows) -->
-
-              <ScrollContentPresenter x:Name="PART_ScrollContentPresenter"
-                                             Grid.Column="1"
-                                             Grid.Row="1"
-                                             CanContentScroll="{TemplateBinding CanContentScroll}" />
-
-            </Grid>
-
-            <!-- ScrollBars -->
-
-            <ScrollBar x:Name="PART_HorizontalScrollBar"
-                             Grid.Column="0"
-                             Grid.Row="1"
-                             Orientation="Horizontal"
-                             Maximum="{TemplateBinding ScrollViewer.ScrollableWidth}"
-                             Value="{TemplateBinding ScrollViewer.HorizontalOffset}"
-                             ViewportSize="{TemplateBinding ScrollViewer.ViewportWidth}"
-                             Visibility="{TemplateBinding ScrollViewer.ComputedHorizontalScrollBarVisibility}" />
-
-            <ScrollBar x:Name="PART_VerticalScrollBar"
-                             Grid.Column="1"
-                             Grid.Row="0"
-                             Orientation="Vertical"
-                             Maximum="{TemplateBinding ScrollViewer.ScrollableHeight}"
-                             Value="{TemplateBinding ScrollViewer.VerticalOffset}"
-                             ViewportSize="{TemplateBinding ScrollViewer.ViewportHeight}"
-                             Visibility="{TemplateBinding ScrollViewer.ComputedVerticalScrollBarVisibility}" />
-
-            <!-- ScrollTip only displayed when scrolling -->
-            <xcdg:ScrollTip Visibility="Collapsed"
-                                   Content="{x:Null}"
-                                   ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ScrollTipContentTemplate}"
-                                   ContentTemplateSelector="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ScrollTipContentTemplateSelector}" />
-
-          </Grid>
-
-          <ControlTemplate.Triggers>
-            <Trigger Property="ShowRowSelectorPane"
-                           Value="False">
-
-              <Setter TargetName="PART_RowSelectorPane"
-                             Property="Visibility"
-                             Value="Collapsed" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-</ResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml
index 46f6779cbd..977a31040e 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml
@@ -16,15 +16,11 @@
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:s="clr-namespace:System;assembly=mscorlib"
-                    xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
-                    xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View">
+                    xmlns:s="clr-namespace:System;assembly=mscorlib">
 
   <ResourceDictionary.MergedDictionaries>
 
-    <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
-
-    <ResourceDictionary Source="TableViewScrollViewer.generic.xaml"/>
+    <ResourceDictionary Source="pack://application:,,,/Xenko.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
 
     <!-- Include the view independant, color-scheme independant, theme resources -->
     <ResourceDictionary Source="Resources/ExpressionDark.normalcolor.Resources.xaml" />
@@ -106,2040 +102,4 @@
   <!-- Templates specific to this View/Theme/ColorScheme                   -->
   <!-- =================================================================== -->
 
-  <!--**************************
-    * TEMPLATE: GroupNavigationControl
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
-                    TargetType="{x:Type xcdg:GroupNavigationControl}">
-
-    <Grid>
-      <Border x:Name="outlineBorder"
-                 Background="Transparent"
-                 BorderBrush="{StaticResource defaultForegroundBrush}"
-                 BorderThickness="1"
-                 CornerRadius="1"
-                 Opacity="0" />
-
-      <Grid>
-        <Grid.ColumnDefinitions>
-          <!-- Button part -->
-          <ColumnDefinition Width="*" />
-
-          <!-- Seperator part -->
-          <ColumnDefinition Width="Auto" />
-
-          <!-- Toggle button part -->
-          <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-
-        <Button x:Name="PART_Button"
-                    Command="xcdg:GroupNavigationButton.NavigateToGroup"
-                    CommandParameter="{TemplateBinding Group}"
-                    Content="{TemplateBinding Group}"
-                    ContentTemplate="{TemplateBinding MainItemTemplate}"
-                    ContentTemplateSelector="{TemplateBinding MainItemTemplateSelector}"
-                    Foreground="{TemplateBinding Foreground}"
-                    Focusable="False"
-                    Grid.Column="0">
-          <Button.Template>
-            <ControlTemplate TargetType="{x:Type Button}">
-              <Border Background="Transparent">
-                <ContentPresenter Margin="4,2,4,2" />
-              </Border>
-            </ControlTemplate>
-          </Button.Template>
-        </Button>
-
-        <Border x:Name="seperator"
-                    Grid.Column="1"
-                    BorderThickness="0,0,1,0"
-                    BorderBrush="{StaticResource defaultForegroundBrush}"
-                    Margin="0,4,0,4"
-                    Visibility="Hidden" />
-
-        <ToggleButton x:Name="PART_ToggleButton"
-                          Focusable="False"
-                          IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
-                          Grid.Column="2"
-                          Foreground="{TemplateBinding Foreground}">
-          <ToggleButton.Template>
-            <ControlTemplate>
-              <Border x:Name="toggleButtonBackground"
-                             CornerRadius="0,6,6,0"
-                             Background="Transparent">
-                <Path x:Name="Arrow"
-                              Fill="{TemplateBinding Foreground}"
-                              Margin="7,1,7,1"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Data="M 0 0 L 4 4 L 0 8 Z"
-                              Opacity="0.3" />
-              </Border>
-
-              <ControlTemplate.Triggers>
-                <Trigger Property="ToggleButton.IsMouseOver"
-                                 Value="True">
-                  <Setter TargetName="Arrow"
-                                   Property="Opacity"
-                                   Value="1" />
-                </Trigger>
-                <Trigger Property="ToggleButton.IsChecked"
-                                 Value="True">
-                  <Setter TargetName="Arrow"
-                                   Property="Opacity"
-                                   Value="1" />
-                  <Setter TargetName="Arrow"
-                                   Property="Margin"
-                                   Value="5,1,5,1" />
-                  <Setter TargetName="Arrow"
-                                   Property="Data"
-                                   Value="M 0 0 L 4 4 L 8 0 Z" />
-                </Trigger>
-              </ControlTemplate.Triggers>
-            </ControlTemplate>
-          </ToggleButton.Template>
-        </ToggleButton>
-      </Grid>
-
-      <Popup x:Name="PART_Popup"
-                Placement="Bottom"
-                IsOpen="{TemplateBinding IsDropDownOpen}"
-                AllowsTransparency="True"
-                Focusable="False"
-                PopupAnimation="Slide">
-        <Grid SnapsToDevicePixels="True"
-                  MinWidth="{TemplateBinding ActualWidth}"
-                  MaxHeight="{TemplateBinding MaxDropDownHeight}">
-          <Border Background="White"
-                       BorderBrush="Black"
-                       BorderThickness="1"
-                       TextElement.Foreground="Black">
-            <ScrollViewer CanContentScroll="True"
-                                HorizontalScrollBarVisibility="Hidden"
-                                VerticalScrollBarVisibility="Auto">
-              <!--<ItemsPresenter />-->
-              <VirtualizingStackPanel IsItemsHost="True" />
-            </ScrollViewer>
-          </Border>
-        </Grid>
-      </Popup>
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver"
-                  Value="True">
-        <Setter TargetName="outlineBorder"
-                    Property="Opacity"
-                    Value="1" />
-        <Setter TargetName="seperator"
-                    Property="Visibility"
-                    Value="Visible" />
-      </Trigger>
-
-      <Trigger Property="IsDropDownOpen"
-                  Value="True">
-        <Setter TargetName="outlineBorder"
-                    Property="Opacity"
-                    Value="1" />
-        <Setter TargetName="seperator"
-                    Property="Visibility"
-                    Value="Visible" />
-      </Trigger>
-      <Trigger Property="IsEnabled"
-                  Value="False">
-        <Setter Property="Opacity"
-                    TargetName="outlineBorder"
-                    Value="0" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupNavigationButton
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
-                    TargetType="{x:Type xcdg:GroupNavigationButton}">
-    <Grid>
-      <Border x:Name="outerBorder"
-                 BorderBrush="{StaticResource defaultForegroundBrush}"
-                 BorderThickness="1"
-                 CornerRadius="1"
-                 Opacity="0" />
-
-      <ContentPresenter Margin="4,2,4,2" />
-    </Grid>
-    <ControlTemplate.Triggers>
-      <Trigger Property="IsMouseOver"
-                  Value="True">
-        <Setter Property="Opacity"
-                    TargetName="outerBorder"
-                    Value="1" />
-      </Trigger>
-      <Trigger Property="IsEnabled"
-                  Value="False">
-        <Setter Property="Opacity"
-                    TargetName="outerBorder"
-                    Value="0" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewRowSelectorTemplate"
-                    TargetType="xcdg:RowSelector">
-
-    <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-    <Grid>
-
-      <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-        <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
-        <Grid>
-
-          <!-- This Border is used to apply the Padding around the ContentPresenter.
-                    We cannot use the ContentPresenter's Margin for this purpose because
-                    the Margin is used to represent the Pressed state. -->
-          <Border Padding="{TemplateBinding Padding}">
-
-            <!--<ContentPresenter x:Name="contentPresenter"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />-->
-
-          </Border>
-
-          <!-- Bottom Line -->
-          <!--<Rectangle Fill="{StaticResource defaultForegroundBrush}"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Top"
-                          Height="1"
-                          Margin="2,0,2,0" />-->
-
-          <!-- Top Line -->
-          <!--<Rectangle x:Name="bottomBorder"
-                          Fill="LightGray"
-                          HorizontalAlignment="Stretch"
-                          VerticalAlignment="Bottom"
-                          Height="1"
-                          Margin="2,0,2,0" />-->
-        </Grid>
-      </Border>
-
-      <!-- Thumb that is used to resize the Row. -->
-      <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-    </Grid>
-
-    <!--<ControlTemplate.Triggers>
-
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:ViewBase.IsLastItem)}"
-                      Value="True">
-
-                <Setter TargetName="bottomBorder"
-                    Property="Fill"
-                    Value="LightGray" />
-
-            </DataTrigger>
-
-        </ControlTemplate.Triggers>-->
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="xcdg:ColumnManagerCell">
-
-    <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-    <Grid>
-
-      <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-        <Grid>
-
-          <DockPanel>
-            <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-              <Grid>
-
-                <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{StaticResource defaultForegroundBrush}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                  <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="LightGray"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                  </Border>
-                </Border>
-
-                <Border x:Name="borderToggleBackground"
-                                Background="{TemplateBinding Background}"
-                                Margin="1,0,1,0" />
-
-                <ToggleButton x:Name="toggleButton"
-                                      Focusable="False"
-                                      VerticalAlignment="Stretch"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-
-              </Grid>
-            </Border>
-
-            <Border Background="{TemplateBinding Background}">
-
-              <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
-              <Grid>
-
-                <Border Padding="{TemplateBinding Padding}">
-
-                  <Grid x:Name="contentPanel"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                    <Grid.ColumnDefinitions>
-                      <ColumnDefinition Width="*" />
-                      <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-
-                    <!-- Same ContentPresenter as in the base Cell Template. -->
-                    <xcdg:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                                          Grid.Column="0" />
-
-                    <!-- ContentPresenter that is used to display the sort glyph.
-                                      We explicitely set its Content property to Null to prevent the XAML parser
-                                      from implicitely setting it to its TemplatedParent's Content. -->
-                    <ContentPresenter x:Name="sortGlyphPresenter"
-                                                Content="{x:Null}"
-                                                ContentTemplate="{x:Null}"
-                                                Grid.Column="1" />
-                  </Grid>
-                </Border>
-              </Grid>
-            </Border>
-          </DockPanel>
-        </Grid>
-      </Border>
-
-      <!-- Thumb that is used to resize the Column. -->
-      <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                Style="{StaticResource invisibleThumbStyle}"
-                Width="6"
-                HorizontalAlignment="Left" />
-
-      <!-- Thumb that is used to resize the Column. -->
-      <Thumb x:Name="PART_ColumnResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                Width="6"
-                HorizontalAlignment="Right" />
-
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <!-- The following triggers allows the content to correctly align to the center when the mouse is over the ColumnManagerCell and the HorizontalContentAlignment is Center -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Value="Visible"
-                          Binding="{Binding ElementName=toggleButton, Path=Visibility}" />
-          <Condition Value="Center"
-                          Binding="{Binding RelativeSource={RelativeSource Self},
-                        Path=HorizontalContentAlignment}" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="PART_CellContentPresenter"
-                    Property="Margin"
-                    Value="16,0,0,0" />
-      </MultiDataTrigger>
-
-      <Trigger Property="IsBeingDragged"
-                  Value="True">
-
-        <Setter TargetName="borderToggleBackground"
-                    Property="Margin"
-                    Value="0,0,1,0" />
-
-      </Trigger>
-
-      <Trigger Property="IsPressed"
-                  Value="True">
-
-        <!-- Change background color of cell when IsPressed -->
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-      </Trigger>
-
-      <!-- Change background color of cell when MouseOver -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                          Value="True" />
-          <Condition Property="IsPressed"
-                          Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
-      </MultiTrigger>
-
-      <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
-              depending on the ParentColumn's SortDirection. -->
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
-                      Value="Ascending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource AscendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
-                      Value="Descending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource DescendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.HasFixedWidth}"
-                          Value="True" />
-
-          <!-- Don't disable resizing if ColumnStretching can be disabled by an 
-                    end-user resize. -->
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
-                          Value="False" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="PART_ColumnResizerThumb"
-                    Property="IsEnabled"
-                    Value="False" />
-      </MultiDataTrigger>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.PreviousVisibleColumn.HasFixedWidth}"
-                          Value="True" />
-
-          <!-- Don't disable resizing if ColumnStretching can be disabled by an 
-                    end-user resize. -->
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
-                          Value="False" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="PART_ColumnResizerThumbLeft"
-                    Property="IsEnabled"
-                    Value="False" />
-      </MultiDataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentRow.AllowColumnResize}"
-                      Value="False">
-        <Setter TargetName="PART_ColumnResizerThumb"
-                    Property="IsEnabled"
-                    Value="False" />
-        <Setter TargetName="PART_ColumnResizerThumbLeft"
-                    Property="IsEnabled"
-                    Value="False" />
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-        <Setter Property="Visibility"
-                    Value="Collapsed" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="xcdg:GroupByItem">
-
-    <Border x:Name="mainBorder"
-              Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}">
-
-      <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-      <StackPanel Orientation="Horizontal">
-
-        <!-- Same ContentPresenter as in the base Cell Template. -->
-        <ContentPresenter Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-        <!-- ContentPresenter that is used to display the sort glyph.
-                 We explicitely set its Content property to Null to prevent the XAML parser
-                 from implicitely setting it to its TemplatedParent's Content. -->
-        <ContentPresenter x:Name="sortGlyphPresenter"
-                              Content="{x:Null}"
-                              ContentTemplate="{x:Null}"
-                              Margin="15,0,0,0"
-                              TextBlock.Foreground="{StaticResource defaultForegroundBrush}" />
-
-      </StackPanel>
-    </Border>
-
-    <ControlTemplate.Triggers>
-
-      <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              depending on the ParentColumn's SortDirection. -->
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Ascending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource AscendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource DescendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="xcdg:HierarchicalGroupByControlNode">
-
-    <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-      <Border BorderBrush="{StaticResource defaultForegroundBrush}"
-                 Background="#55FFFFFF"
-                 BorderThickness="1"
-                 VerticalAlignment="Top"
-                 HorizontalAlignment="Center">
-
-        <TextBlock x:Name="titleTextBlock"
-                       Text="{TemplateBinding Title}"
-                       Margin="3"
-                       FontFamily="{StaticResource defaultFontFamily}"
-                       FontSize="{StaticResource defaultFontSize}" />
-
-      </Border>
-
-      <ItemsPresenter Margin="0,0,0,0" />
-
-    </StackPanel>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="xcdg:HierarchicalGroupByItem">
-    <Grid>
-      <Border x:Name="mainBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}">
-
-        <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-        <StackPanel Orientation="Horizontal">
-
-          <!-- Same ContentPresenter as in the base Cell Template. -->
-          <ContentPresenter Content="{TemplateBinding Content}"
-                                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                                 ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-          <!-- ContentPresenter that is used to display the sort glyph.
-                 We explicitely set its Content property to Null to prevent the XAML parser
-                 from implicitely setting it to its TemplatedParent's Content. -->
-          <ContentPresenter x:Name="sortGlyphPresenter"
-                                 Content="{x:Null}"
-                                 ContentTemplate="{x:Null}"
-                                 Margin="15,0,0,0"
-                                 TextBlock.Foreground="{StaticResource defaultForegroundBrush}" />
-
-        </StackPanel>
-      </Border>
-    </Grid>
-    <ControlTemplate.Triggers>
-
-      <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              depending on the ParentColumn's SortDirection. -->
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Ascending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource AscendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource DescendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupHeaderControl (copied from Office2007Blue)
-    ************************** -->
-  <xcdg:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
-  <ControlTemplate x:Key="tableflowViewGroupHeaderControlTemplate"
-                    TargetType="xcdg:GroupHeaderControl">
-
-    <!-- Using this decorator will prevent the GroupHeaderControl of exceeding the width 
-           defined by the grid's column. -->
-    <xcdg:PassiveLayoutDecorator Axis="Horizontal">
-      <DockPanel>
-
-        <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this GroupHeaderControl is part of a group. -->
-        <!--<xcdg:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
-                <xcdg:GroupLevelIndicatorPane DockPanel.Dock="Left"
-                                           Indented="False"
-                                           xcdg:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xcdg:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />-->
-        <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
-        <Border x:Name="mainBorder"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Padding="{TemplateBinding Padding}"
-                    Focusable="True"
-                    FocusVisualStyle="{TemplateBinding FocusVisualStyle}">
-
-          <!-- Define all the standard InputBindings for a GroupHeaderControl. -->
-          <Border.InputBindings>
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.ToggleGroupExpansion}"
-                              Key="Space" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.ExpandGroup}"
-                              Key="Right" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.ExpandGroup}"
-                              Key="Add" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.CollapseGroup}"
-                              Key="Left" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.CollapseGroup}"
-                              Key="Subtract" />
-
-            <MouseBinding Command="{x:Static xcdg:DataGridCommands.ToggleGroupExpansion}"
-                                MouseAction="LeftDoubleClick" />
-
-          </Border.InputBindings>
-
-          <DockPanel>
-
-            <!-- ToggleButton that is used to expand/collapse the group. -->
-            <ToggleButton DockPanel.Dock="Left"
-                                OverridesDefaultStyle="True"
-                                Template="{StaticResource DarkExpanderToggleButton}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Focusable="False"
-                                IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
-
-            <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is a Group by default. -->
-            <ContentPresenter DockPanel.Dock="Left"
-                                    Margin="3,0,0,0"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-            <!-- Line that is traced across the GroupHeader, following the content -->
-            <Rectangle Fill="{StaticResource GlyphBrush}"
-                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                             HorizontalAlignment="Stretch"
-                             Height="1"
-                             Margin="7,0,0,0" />
-          </DockPanel>
-        </Border>
-      </DockPanel>
-    </xcdg:PassiveLayoutDecorator>
-
-    <ControlTemplate.Triggers>
-      <Trigger Property="xcdg:DataGridControl.NavigationBehavior"
-                  Value="None">
-        <Setter TargetName="mainBorder"
-                    Property="Focusable"
-                    Value="False" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupHeaderControl (When top level sticky)
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupHeaderTopLevelStickyControlTemplate"
-                    TargetType="xcdg:GroupHeaderControl">
-
-    <!-- Using this decorator will prevent the GroupHeaderControl of exceeding the width 
-           defined by the grid's column. -->
-    <xcdg:PassiveLayoutDecorator Axis="Horizontal">
-      <!-- This DockPanel is used to layout the GroupLevelIndicatorPane placeholder and the GroupHeaderControl Content. -->
-      <DockPanel>
-
-        <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this GroupHeaderControl is part of a group. -->
-        <!--<xcdg:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
-                <xcdg:GroupLevelIndicatorPane DockPanel.Dock="Left"
-                                           Indented="False"
-                                           xcdg:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xcdg:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />-->
-
-        <Grid>
-          <Border Background="{StaticResource groupHeaderBackgroundBrush}" />
-
-          <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
-          <Border x:Name="mainBorder"
-                       Background="Transparent"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}"
-                       Padding="{TemplateBinding Padding}"
-                       Focusable="True"
-                       FocusVisualStyle="{TemplateBinding FocusVisualStyle}">
-
-            <!-- Define all the standard InputBindings for a GroupHeaderControl. -->
-            <Border.InputBindings>
-              <KeyBinding Command="{x:Static xcdg:DataGridCommands.ToggleGroupExpansion}"
-                                 Key="Space" />
-
-              <KeyBinding Command="{x:Static xcdg:DataGridCommands.ExpandGroup}"
-                                 Key="Right" />
-
-              <KeyBinding Command="{x:Static xcdg:DataGridCommands.ExpandGroup}"
-                                 Key="Add" />
-
-              <KeyBinding Command="{x:Static xcdg:DataGridCommands.CollapseGroup}"
-                                 Key="Left" />
-
-              <KeyBinding Command="{x:Static xcdg:DataGridCommands.CollapseGroup}"
-                                 Key="Subtract" />
-
-              <MouseBinding Command="{x:Static xcdg:DataGridCommands.ToggleGroupExpansion}"
-                                   MouseAction="LeftDoubleClick" />
-
-            </Border.InputBindings>
-
-            <DockPanel>
-
-              <!-- ToggleButton that is used to expand/collapse the group. -->
-              <ToggleButton DockPanel.Dock="Left"
-                                   OverridesDefaultStyle="True"
-                                   Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                   Focusable="False"
-                                   IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
-
-              <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is
-                    a Group by default. -->
-              <ContentPresenter DockPanel.Dock="Left"
-                                       Margin="3,0,0,0"
-                                       Content="{TemplateBinding Content}"
-                                       ContentTemplate="{TemplateBinding ContentTemplate}"
-                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </DockPanel>
-          </Border>
-        </Grid>
-      </DockPanel>
-    </xcdg:PassiveLayoutDecorator>
-
-    <ControlTemplate.Triggers>
-      <Trigger Property="xcdg:DataGridControl.NavigationBehavior"
-                  Value="None">
-        <Setter TargetName="mainBorder"
-                    Property="Focusable"
-                    Value="False" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: ColumnManagerRow (copied from Common)
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
-                    TargetType="xcdg:ColumnManagerRow">
-
-    <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-    <ControlTemplate.Resources>
-      <xcdg:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-    </ControlTemplate.Resources>
-
-    <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
-    <Grid x:Name="rootGrid">
-      <Grid.ColumnDefinitions>
-        <!-- HierarchicalGroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <!-- GroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-
-        <!-- CellsHost panel -->
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
-      <Border x:Name="rootBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="3"
-                 xcdg:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-      <!--<xcdg:HierarchicalGroupLevelIndicatorPane xcdg:TableView.CanScrollHorizontally="False"
-                                                    Grid.Column="0"
-                                                    Background="{TemplateBinding Background}" />
-            <xcdg:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        xcdg:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1"
-                                        Background="{TemplateBinding Background}" />-->
-
-      <!-- ToggleButton that is used to expand/collapse the group. -->
-      <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static xcdg:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 xcdg:TableView.CanScrollHorizontally="False" />
-
-      <Decorator x:Name="indentationDecorator"
-                    Grid.Column="3">
-
-        <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-        <xcdg:FixedCellPanel x:Name="PART_CellsHost"
-                                  ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
-                                  ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ColumnStretchMode}"
-                                  FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
-                                  FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
-                                  Margin="{TemplateBinding BorderThickness}" />
-      </Decorator>
-
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-      </MultiDataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane (copied from common)
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupLevelIndicatorPaneTemplate"
-                    TargetType="xcdg:GroupLevelIndicatorPane">
-    <Grid>
-
-      <Border x:Name="horizontalBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-
-      <Border x:Name="verticalBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 Padding="{TemplateBinding Padding}"
-                 BorderThickness="0">
-        <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                        Orientation="Horizontal" />
-      </Border>
-
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-
-          <Condition Property="CurrentIndicatorCount"
-                          Value="0" />
-
-          <Condition Property="IsLeaf"
-                          Value="False" />
-        </MultiTrigger.Conditions>
-
-        <Setter TargetName="verticalBorder"
-                    Property="BorderThickness"
-                    Value="0" />
-      </MultiTrigger>
-
-      <Trigger Property="ShowVerticalBorder"
-                  Value="False">
-        <Setter TargetName="verticalBorder"
-                    Property="BorderThickness"
-                    Value="0" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!-- =================================================================== -->
-  <!-- Styles required by some grid elements                               -->
-  <!-- =================================================================== -->
-
-
-  <!--**************************
-    * STYLE: CellErrorStyle 
-    ************************** -->
-  <Style x:Key="cellErrorStyle"
-          TargetType="xcdg:Cell">
-
-    <Setter Property="Background"
-              Value="{StaticResource errorBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource errorForegroundBrush}" />
-
-    <Setter Property="ToolTip"
-              Value="{Binding RelativeSource={RelativeSource Self},Path=ValidationError.ErrorContent}" />
-
-    <Style.Triggers>
-      <Trigger Property="IsValidationErrorRestrictive"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource errorBackgroundBrush}" />
-
-      </Trigger>
-
-      <Trigger Property="IsValidationErrorRestrictive"
-                  Value="False">
-
-        <Setter Property="Foreground"
-                    Value="{StaticResource warningForegroundBrush}" />
-
-        <Setter Property="Background"
-                    Value="{StaticResource warningBackgroundBrush}" />
-
-      </Trigger>
-    </Style.Triggers>
-
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- Keyed Styles of grid elements                                       -->
-  <!-- =================================================================== -->
-
-  <!--**************************
-    * STYLE: DataGridControl 
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGridControlStyle"
-          TargetType="xcdg:DataGridControl">
-
-
-    <Setter Property="BorderBrush"
-              Value="{StaticResource gridBorderBrush}" />
-
-    <Setter Property="BorderThickness"
-              Value="0" />
-
-    <Setter Property="Background"
-              Value="{StaticResource defaultBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <!-- This is required to display gridlines of uniform thickness -->
-    <Setter Property="SnapsToDevicePixels"
-              Value="True" />
-
-    <Setter Property="CellErrorStyle"
-              Value="{StaticResource cellErrorStyle}" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewDataGridControlTemplate}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: RowSelectorPane
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorRowSelectorPaneStyle"
-          TargetType="xcdg:RowSelectorPane">
-
-    <!-- same background as the ColumnManagerCells -->
-    <Setter Property="Background"
-              Value="{StaticResource columnManagerCellBackgroundBrush}" />
-
-    <Setter Property="TextElement.Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: RowSelector 
-    ************************** -->
-  <xcdg:TypeToBooleanConverter x:Key="rowTypeConverter" />
-  <Style x:Key="tableflowViewAero2NormalColorRowSelectorStyle"
-          TargetType="xcdg:RowSelector">
-
-    <!-- Set the RowSelector's background to Transparent to make it hit-testable
-           while preserving the background drawn by the underlying RowSelectorPane. -->
-    <Setter Property="Background"
-              Value="Transparent" />
-
-    <Setter Property="BorderBrush" Value="{StaticResource NormalBorderBrush}"/>
-
-    <Setter Property="BorderThickness" Value="0,0,1,0"/>
-
-    <Setter Property="HorizontalContentAlignment"
-              Value="Center" />
-
-    <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-
-    <Setter Property="Padding"
-              Value="2" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowSelectorTemplate}" />
-
-    <Style.Triggers>
-
-      <!-- We have to use triggers on the type of the Row associated with this 
-              RowSelector instead of assigning a value to RowSelector.RowSelectorStyle 
-              on each row type. This is to avoid a custom RowSelector.RowSelectorStyle
-              set by a client of the DataGridControl to completely override the 
-              RowSelector style (DefaultStyleKey). -->
-
-      <!-- When the Row is Current, display the current glyph in the RowSelector -->
-      <!--<MultiDataTrigger>
-                <MultiDataTrigger.Conditions>
-                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsCurrent}"
-                          Value="True" />
-                </MultiDataTrigger.Conditions>
-                <Setter Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).CurrentItemGlyph}" />
-            </MultiDataTrigger>-->
-
-      <!-- When the Row is being edited, display the appropriate glyph in the RowSelector. -->
-      <Trigger Property="IsBeingEdited"
-                  Value="True">
-        <Setter Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).EditingRowGlyph}" />
-
-      </Trigger>
-
-      <!-- When the Row has a validation error, display the appropriate glyph in the RowSelector. -->
-      <Trigger Property="HasValidationError"
-                  Value="True">
-        <Setter Property="ContentTemplate"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ValidationErrorGlyph}" />
-      </Trigger>
-
-      <!-- Use default Button States colors on the RowSelector -->
-      <!--<Trigger Property="IsMouseOver"
-                  Value="True">
-                <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
-            </Trigger>-->
-      <Trigger Property="IsPressed"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-      </Trigger>
-
-    </Style.Triggers>
-  </Style>
-
-  <!--**************************
-    * STYLE: Row Style
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorRowStyle"
-          TargetType="xcdg:Row">
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="FocusVisualStyle"
-              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
-
-    <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-    <Setter Property="SelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-    <Setter Property="InactiveSelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="BorderThickness"
-              Value="0" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewRowTemplate}" />
-
-    <Setter Property="Background"
-              Value="{StaticResource rowBackgroundBrush}" />
-
-    <Style.Triggers>
-
-      <!-- Enabled/Disabled Odd datarow style alternation -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).IsAlternatingRowStyleEnabled}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridVirtualizingPanel.ItemIndex), Converter={x:Static xcdg:IndexToOddConverter.Singleton}}"
-                          Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Background"
-                    Value="{StaticResource rowAlternatingBackgroundBrush}" />
-      </MultiDataTrigger>
-
-    </Style.Triggers>
-  </Style>
-
-  <!--**************************
-    * STYLE: DataRow 
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorDataRowStyle"
-          TargetType="xcdg:DataRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}">
-
-    <Style.Triggers>
-      <!-- MouseOver + NotSelected -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="False" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Background"
-                    Value="{StaticResource rowMouseOverBackgroundBrush}" />
-      </MultiDataTrigger>
-
-      <!-- MouseOver + Selected -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Row" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="SelectionBackground"
-                    Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
-      </MultiDataTrigger>
-    </Style.Triggers>
-
-  </Style>
-
-  <!--**************************
-    * STYLE: ColumnManagerRow
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorColumnManagerRowStyle"
-          TargetType="xcdg:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}">
-
-    <!-- Use a different background and foreground than the base Row style. -->
-    <Setter Property="Background"
-              Value="{StaticResource columnManagerCellBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="BorderBrush"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="BorderThickness"
-              Value="0" />
-
-    <Setter Property="xcdg:RowSelector.Visible"
-              Value="False" />
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="Padding"
-              Value="12" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerRowTemplate}" />
-
-    <Style.Triggers>
-
-      <Trigger Property="xcdg:GroupLevelIndicatorPane.GroupLevel"
-                  Value="-1">
-        <!-- We don't want to display the Group Margins for the ColumnManagerRow. -->
-        <Setter Property="xcdg:GroupLevelIndicatorPane.ShowIndicators"
-                    Value="False" />
-      </Trigger>
-
-    </Style.Triggers>
-
-  </Style>
-
-  <!--**************************
-    * STYLE: Cell Style
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorCellStyle"
-          TargetType="xcdg:Cell">
-
-    <Setter Property="CurrentBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-    <Setter Property="CurrentForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="SelectionBackground"
-              Value="{StaticResource rowSelectionBackgroundBrush}" />
-
-    <Setter Property="SelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="InactiveSelectionBackground"
-              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
-
-    <Setter Property="InactiveSelectionForeground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <!-- Set the Cell's background to Transparent to make it hit-testable
-           while preserving the background drawn by the underlying Row. -->
-    <Setter Property="Background"
-              Value="Transparent" />
-
-    <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
-    <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
-
-    <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-    <!-- The Cell is responsible for drawing the vertical gridlines. It draws only its right gridline, 
-           assuming that the left gridline will have been drawn by its preceding cell -->
-
-    <Setter Property="BorderThickness"
-              Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-    <Setter Property="BorderBrush"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewCellTemplate}" />
-  </Style>
-
-  <!--**************************
-    * STYLE: DataCell
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorDataCellStyle"
-          TargetType="xcdg:DataCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorCellStyle}">
-
-    <Style.Triggers>
-      <!-- MouseOver + NotSelected -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Cell" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="False" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="Background"
-                    Value="{StaticResource rowMouseOverBackgroundBrush}" />
-      </MultiDataTrigger>
-
-      <!-- MouseOver + Selected -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
-                          Value="Cell" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
-                          Value="True" />
-        </MultiDataTrigger.Conditions>
-        <Setter Property="SelectionBackground"
-                    Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
-      </MultiDataTrigger>
-    </Style.Triggers>
-
-  </Style>
-
-  <!--**************************
-    * STYLE: ColumnManagerCell
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorColumnManagerCellStyle"
-          TargetType="xcdg:ColumnManagerCell">
-
-    <!-- Set the Cell's background to Transparent to make it hit-testable
-           while preserving the background drawn by the underlying Row. -->
-    <Setter Property="Background"
-              Value="Transparent" />
-
-    <Setter Property="BorderBrush" Value="{StaticResource NormalBorderBrush}"/>
-
-    <Setter Property="BorderThickness" Value="1,1,0,1"/>
-
-    <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
-    <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
-
-    <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-    <Setter Property="HorizontalContentAlignment"
-              Value="Left" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
-
-    <Style.Triggers>
-
-      <Trigger Property="IsBeingDragged"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-      </Trigger>
-
-    </Style.Triggers>
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupByControl
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupByControlStyle"
-          TargetType="xcdg:GroupByControl">
-
-    <!-- If we don't specify a MinHeight, the default "size-to-content" behavior will arrange 
-           the control with a Height of 0, which makes it invisible and unusable.
-           In a typical TableflowView, a height of at least 25 is appropriate for the GroupByControl. -->
-    <Setter Property="MinHeight"
-              Value="0" />
-
-    <!-- Disable grouping for the moment, it is not correctly themed. -->
-    <!--<Setter Property="MinHeight"
-              Value="25" />-->
-
-    <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="Padding"
-              Value="8" />
-
-    <Setter Property="BorderBrush"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-    <Setter Property="BorderThickness"
-              Value="1,1,1,0" />
-
-    <Setter Property="xcdg:RowSelector.Visible"
-              Value="False" />
-
-    <Setter Property="xcdg:TableView.CanScrollHorizontally"
-              Value="False" />
-
-    <!--<Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByControlTemplate}" />-->
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewCommonEmptyHierarchicalGroupByControlTemplate}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupByItem
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupByItemStyle"
-          TargetType="xcdg:GroupByItem">
-
-    <Setter Property="Background"
-              Value="{StaticResource columnManagerCellBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
-
-    <!-- Use default Button States colors on the GroupByItems -->
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-      </Trigger>
-    </Style.Triggers>
-
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupHeaderControl
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupHeaderControlStyle"
-          TargetType="xcdg:GroupHeaderControl">
-
-    <Setter Property="Background"
-              Value="{StaticResource BackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="xcdg:TableView.CanScrollHorizontally"
-              Value="False" />
-
-    <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-    <Setter Property="VerticalContentAlignment"
-              Value="Center" />
-
-    <!-- The GroupHeaderControl itself must not be focusable. The main Border inside its Template will
-           be made Focusable because it is holding the various InputBindings that make the
-           GroupHeaderControl work. -->
-    <Setter Property="Focusable"
-              Value="False" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupHeaderControlTemplate}" />
-
-    <Style.Triggers>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Content.IsBottomLevel}"
-                          Value="False" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Content.Level}"
-                          Value="0" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AreGroupHeadersSticky}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AreGroupsFlattened}"
-                          Value="True" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter Property="Template"
-                    Value="{StaticResource tableflowViewGroupHeaderTopLevelStickyControlTemplate}" />
-
-      </MultiDataTrigger>
-
-    </Style.Triggers>
-
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupLevelIndicator
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupLevelIndicatorStyle"
-          TargetType="xcdg:GroupLevelIndicator">
-
-    <Setter Property="Background"
-              Value="White" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="BorderThickness"
-              Value="0" />
-
-    <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorTemplate}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: DetailIndicator
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorDetailIndicatorStyle"
-          TargetType="xcdg:DetailIndicator">
-
-    <Setter Property="Background"
-              Value="{x:Null}" />
-
-    <Setter Property="Width"
-              Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DetailIndicatorWidth}" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewDetailIndicatorTemplate}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupLevelIndicatorPane
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupLevelIndicatorPaneStyle"
-          TargetType="xcdg:GroupLevelIndicatorPane">
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
-
-    <Setter Property="BorderBrush"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Style.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsLeaf"
-                          Value="False" />
-          <Condition Property="xcdg:ViewBase.IsLastItem"
-                          Value="True" />
-        </MultiTrigger.Conditions>
-
-        <Setter Property="Margin"
-                    Value="0,0,0,-5" />
-      </MultiTrigger>
-
-    </Style.Triggers>
-  </Style>
-
-  <!--**************************
-    * STYLE: HierarchicalGroupLevelIndicatorPane
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle"
-          TargetType="xcdg:HierarchicalGroupLevelIndicatorPane">
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
-
-    <Setter Property="xcdg:GroupLevelIndicatorPane.ShowIndicators"
-              Value="True" />
-
-    <Setter Property="xcdg:GroupLevelIndicatorPane.ShowVerticalBorder"
-              Value="True" />
-
-    <Style.Triggers>
-      <Trigger Property="xcdg:GroupLevelIndicatorPane.GroupLevel"
-                  Value="-1">
-
-        <!-- Stop the propagation of the value set by the default style trigger of
-                 the ColumnManagerRow -->
-        <Setter Property="xcdg:GroupLevelIndicatorPane.ShowIndicators"
-                    Value="True" />
-
-      </Trigger>
-    </Style.Triggers>
-  </Style>
-
-  <!--**************************
-    * STYLE: HierarchicalGroupByControlNode
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorHierarchicalGroupByControlNodeStyle"
-          TargetType="xcdg:HierarchicalGroupByControlNode">
-
-    <Setter Property="StairHeight"
-              Value="0" />
-
-    <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-    <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-    <Setter Property="Focusable"
-              Value="False" />
-
-    <Setter Property="Margin"
-              Value="4" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: HierarchicalGroupByControl
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorHierarchicalGroupByControlStyle"
-          TargetType="xcdg:HierarchicalGroupByControl">
-
-    <!-- If we don't specify a MinHeight, the default "size-to-content" behavior will arrange 
-           the control with a Height of 0, which makes it invisible and unusable.
-           In a typical TableflowView, a height of at least 25 is appropriate for the GroupByControl. -->
-    <Setter Property="MinHeight"
-              Value="0" />
-
-    <!-- Disable grouping for the moment, it is not correctly themed. -->
-    <!--<Setter Property="MinHeight"
-              Value="25" />-->
-
-    <Setter Property="Background"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="Padding"
-              Value="8" />
-
-    <Setter Property="BorderBrush"
-              Value="{StaticResource groupByControlBackgroundBrush}" />
-
-    <Setter Property="BorderThickness"
-              Value="1,1,1,0" />
-
-    <Setter Property="StairHeight"
-              Value="0" />
-
-    <Setter Property="ConnectionLineOffset"
-              Value="0" />
-
-    <Setter Property="ConnectionLineAlignment"
-              Value="CenterToCenter" />
-
-    <Setter Property="xcdg:RowSelector.Visible"
-              Value="False" />
-
-    <Setter Property="xcdg:TableView.CanScrollHorizontally"
-              Value="False" />
-
-    <!-- Disable grouping for the moment, it is not correctly themed. -->
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewCommonEmptyHierarchicalGroupByControlTemplate}" />
-
-    <Style.Triggers>
-
-      <!-- We use the old GroupByControl Template if there are no Details in the DataGridControl.ItemsSource -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HasDetails}"
-                          Value="False" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ParentDataGridContext, Converter={StaticResource nullToBooleanConverter}}"
-                          Value="True" />
-
-        </MultiDataTrigger.Conditions>
-
-        <!-- Disable grouping for the moment, it is not correctly themed. -->
-        <!--<Setter Property="Template"
-                    Value="{StaticResource tableflowViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />-->
-
-      </MultiDataTrigger>
-
-    </Style.Triggers>
-
-  </Style>
-
-  <!--**************************
-    * STYLE: HierarchicalGroupByItem
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorHierarchicalGroupByItemStyle"
-          TargetType="xcdg:HierarchicalGroupByItem">
-
-    <Setter Property="Background"
-              Value="{StaticResource columnManagerCellBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="FontFamily"
-              Value="{StaticResource defaultFontFamily}" />
-
-    <Setter Property="FontSize"
-              Value="{StaticResource defaultFontSize}" />
-
-    <Setter Property="Padding"
-              Value="{StaticResource cellPadding}" />
-
-    <Setter Property="Margin"
-              Value="4,0,4,0" />
-
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
-
-    <!-- Use default Button States colors on the HierarchicalGroupByItems -->
-    <Style.Triggers>
-      <Trigger Property="IsMouseOver"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
-      </Trigger>
-      <Trigger Property="IsPressed"
-                  Value="True">
-        <Setter Property="Background"
-                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
-      </Trigger>
-    </Style.Triggers>
-
-  </Style>
-
-
-  <!--**************************
-    * STYLE: ScrollTip
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorScrollTipStyle"
-          TargetType="xcdg:ScrollTip">
-
-    <Setter Property="Template"
-              Value="{StaticResource scrollTipTemplate}" />
-
-    <Setter Property="VerticalAlignment"
-              Value="Center" />
-
-    <Setter Property="HorizontalAlignment"
-              Value="Right" />
-
-    <Setter Property="Background"
-              Value="{StaticResource groupHeaderBackgroundBrush}" />
-
-    <Setter Property="Foreground"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-    <Setter Property="BorderBrush"
-              Value="{StaticResource defaultForegroundBrush}" />
-
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupNavigationControl
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupNavigationControlStyle"
-          TargetType="xcdg:GroupNavigationControl">
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupNavigationControlItem
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupNavigationControlItemStyle"
-          TargetType="{x:Type xcdg:GroupNavigationControlItem}">
-
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type xcdg:GroupNavigationControlItem}">
-          <Grid SnapsToDevicePixels="true">
-            <Border x:Name="Border"
-                          Background="Transparent" />
-            <Border Margin="2">
-              <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-            </Border>
-          </Grid>
-          <ControlTemplate.Triggers>
-
-            <!-- Change IsSelected SelectedBackgroundBrush to set the selection color for the items -->
-            <Trigger Property="IsMouseOver"
-                           Value="true">
-              <Setter Property="Background"
-                             TargetName="Border"
-                             Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
-
-              <Setter Property="Foreground"
-                             Value="Black" />
-            </Trigger>
-
-            <Trigger Property="IsEnabled"
-                           Value="false">
-              <Setter Property="Foreground"
-                             Value="Gray" />
-            </Trigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <!--**************************
-    * STYLE: GroupNavigationButton
-    ************************** -->
-  <Style x:Key="tableflowViewAero2NormalColorGroupNavigationButtonStyle"
-          TargetType="xcdg:GroupNavigationButton">
-    <Setter Property="Template"
-              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- Default values for the View                                         -->
-  <!-- =================================================================== -->
-
-  <Style x:Key="tableflowViewAero2NormalColorDefaultValues"
-          TargetType="xcdg:TableflowView">
-
-    <Setter Property="HorizontalGridLineThickness"
-              Value="1" />
-
-    <Setter Property="GroupLevelIndicatorWidth"
-              Value="17" />
-
-    <Setter Property="DetailIndicatorWidth"
-              Value="34" />
-
-    <Setter Property="ContainerHeight"
-              Value="30" />
-
-    <Setter Property="DefaultDropMarkPen"
-              Value="{StaticResource dropMarkPen}" />
-
-    <!-- Those glyphs are null by default on ViewBase, so every Theme should define
-           and set their own custom glyphs. -->
-
-    <!--<Setter Property="AscendingSortGlyph"
-              Value="{StaticResource ascendingSortGlyph}" />
-
-        <Setter Property="DescendingSortGlyph"
-              Value="{StaticResource descendingSortGlyph}" />-->
-
-    <Setter Property="ExpandGroupGlyph"
-              Value="{StaticResource expandGroupGlyph}" />
-
-    <Setter Property="CollapseGroupGlyph"
-              Value="{StaticResource collapseGroupGlyph}" />
-
-    <Setter Property="CurrentItemGlyph"
-              Value="{StaticResource currentItemGlyph}" />
-
-    <Setter Property="EditingRowGlyph"
-              Value="{StaticResource editingRowGlyph}" />
-
-    <Setter Property="ValidationErrorGlyph"
-              Value="{StaticResource validationErrorGlyph}" />
-
-    <Setter Property="ConnectionStateLoadingGlyph"
-              Value="{StaticResource connectionStateLoadingGlyph}" />
-
-    <Setter Property="ConnectionStateCommittingGlyph"
-              Value="{StaticResource connectionStateLoadingGlyph}" />
-
-    <Setter Property="ConnectionStateErrorGlyph"
-              Value="{StaticResource connectionStateErrorGlyph}" />
-
-  </Style>
-
-  <!-- =================================================================== -->
-  <!-- DefaultStyleKey declarations                                        -->
-  <!-- =================================================================== -->
-
-  <Style
-          TargetType="xcdg:TableflowView"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDefaultValues}" />
-
-  <Style
-          TargetType="xcdg:DataGridControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGridControlStyle}" />
-
-  <Style
-          TargetType="xcdg:RowSelectorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowSelectorPaneStyle}" />
-
-  <Style
-          TargetType="xcdg:RowSelector"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowSelectorStyle}" />
-
-  <Style
-          TargetType="xcdg:Row"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorRowStyle}" />
-
-  <Style
-          TargetType="xcdg:DataRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDataRowStyle}" />
-
-  <Style
-          TargetType="xcdg:ColumnManagerRow"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorColumnManagerRowStyle}" />
-
-  <Style
-          TargetType="xcdg:Cell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorCellStyle}" />
-
-  <Style
-          TargetType="xcdg:DataCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDataCellStyle}" />
-
-  <Style
-          TargetType="xcdg:ColumnManagerCell"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorColumnManagerCellStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupByControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupByControlStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupByItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupByItemStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupHeaderControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupHeaderControlStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupLevelIndicator"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupLevelIndicatorStyle}" />
-
-  <Style
-          TargetType="xcdg:DetailIndicator"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorDetailIndicatorStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupLevelIndicatorPaneStyle}" />
-
-  <Style
-          TargetType="xcdg:HierarchicalGroupLevelIndicatorPane"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupLevelIndicatorPaneStyle}" />
-
-  <Style
-          TargetType="xcdg:ScrollTip"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorScrollTipStyle}" />
-
-  <Style
-          TargetType="xcdg:HierarchicalGroupByControlNode"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByControlNodeStyle}" />
-
-  <Style
-          TargetType="xcdg:HierarchicalGroupByControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByControlStyle}" />
-
-  <Style
-          TargetType="xcdg:HierarchicalGroupByItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorHierarchicalGroupByItemStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupNavigationButton"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationButtonStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupNavigationControl"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlStyle}" />
-
-  <Style
-          TargetType="xcdg:GroupNavigationControlItem"
-          BasedOn="{StaticResource tableflowViewAero2NormalColorGroupNavigationControlItemStyle}" />
-
-  <Style
-          TargetType="view:DataGridEx"
-          BasedOn="{StaticResource {x:Type xcdg:DataGridControl}}" />
-
 </ResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.GridElementTemplates.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.GridElementTemplates.xaml
index ab411d66e7..040b474a10 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.GridElementTemplates.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/ExpressionDark/TableflowView.GridElementTemplates.xaml
@@ -15,1167 +15,12 @@
   **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid">
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
   <ResourceDictionary.MergedDictionaries>
     <ResourceDictionary Source="Resources/Common.Resources.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <Style x:Key="tableflowViewRowFocusVisualStyle"
-          TargetType="IFrameworkInputElement">
-    <Style.Resources>
-      <xcdg:ThicknessConverter x:Key="thicknessConverter" />
-    </Style.Resources>
-
-    <Setter Property="Control.Template">
-      <Setter.Value>
-        <ControlTemplate>
-          <Rectangle Stroke="#FF000000"
-                          StrokeThickness="1"
-                          StrokeDashArray="1 2"
-                          Margin="{Binding RelativeSource={RelativeSource AncestorType={x:Type ScrollViewer}}, Path=HorizontalOffset, Converter={StaticResource thicknessConverter}, ConverterParameter='Left'}"
-                          SnapsToDevicePixels="True" />
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
-  <xcdg:ThicknessConverter x:Key="inverseThicknessConverter"
-                            InverseValue="True" />
-
-  <!--**************************
-    * TEMPLATE: DataGridControl 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewDataGridControlTemplate"
-                    TargetType="xcdg:DataGridControl">
-    <Grid>
-      <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}">
-
-        <!-- The AdornerDecorator will allow visual cues for Drag & Drop operations. -->
-        <AdornerDecorator x:Name="PART_DragDropAdornerDecorator">
-          <!-- The TableViewScrollViewer takes care of laying out the various sections of
-                       a DataGrid in TableflowView: FixedHeaders, FixedFooters, RowSelectorPane, etc. -->
-          <xcdg:TableViewScrollViewer x:Name="PART_ScrollViewer"
-                                            ShowRowSelectorPane="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ShowRowSelectorPane}"
-                                            RowSelectorPaneWidth="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).RowSelectorPaneWidth}"
-                                            Padding="{TemplateBinding Padding}">
-
-            <!--<xcdg:TableflowViewItemsHost />-->
-            <xcdg:TableViewItemsHost />
-
-          </xcdg:TableViewScrollViewer>
-        </AdornerDecorator>
-      </Border>
-      <Grid x:Name="connectionStateGrid"
-               HorizontalAlignment="Right"
-               VerticalAlignment="Bottom"
-               Margin="0,0,25,25"
-               Height="30"
-               Width="30">
-        <ContentPresenter x:Name="connectionStateLoadingContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ConnectionStateLoadingGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-        <ContentPresenter x:Name="connectionStateCommittingContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ConnectionStateCommittingGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-        <ContentPresenter x:Name="connectionStateErrorContentPresenter"
-                              ContentTemplate="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ConnectionStateErrorGlyph}"
-                              Content="{TemplateBinding ConnectionState}"
-                              Visibility="Collapsed" />
-      </Grid>
-    </Grid>
-    <ControlTemplate.Triggers>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).IsConnectionStateGlyphEnabled}"
-                      Value="False">
-        <Setter TargetName="connectionStateGrid"
-                    Property="Visibility"
-                    Value="Collapsed" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Loading">
-        <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-        <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-        <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Committing">
-        <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-        <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-        <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-      </DataTrigger>
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.ConnectionState}"
-                      Value="Error">
-        <Setter TargetName="connectionStateLoadingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-        <Setter TargetName="connectionStateErrorContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-        <Setter TargetName="connectionStateCommittingContentPresenter"
-                    Property="Visibility"
-                    Value="Collapsed" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: RowSelector 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewRowSelectorTemplate"
-                    TargetType="xcdg:RowSelector">
-
-    <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
-    <Grid>
-
-      <Border Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}">
-
-        <ContentPresenter x:Name="contentPresenter"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-      </Border>
-
-      <!-- Thumb that is used to resize the Row. -->
-      <Thumb x:Name="PART_RowResizerThumb"
-                Style="{StaticResource invisibleThumbStyle}"
-                VerticalAlignment="Bottom" />
-
-    </Grid>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: Row 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewRowTemplate"
-                    TargetType="xcdg:Row">
-
-    <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-    <ControlTemplate.Resources>
-      <xcdg:TypeToBooleanConverter x:Key="typeToBooleanConverter" />
-    </ControlTemplate.Resources>
-
-    <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
-    <Grid x:Name="rootGrid">
-      <Grid.ColumnDefinitions>
-        <!-- HierarchicalGroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <!-- GroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <!-- MasterDetail ToggleButton -->
-        <ColumnDefinition Width="Auto" />
-
-        <!-- CellsHost panel -->
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
-      <Border x:Name="rootBorder"
-                 Grid.Column="2"
-                 Grid.ColumnSpan="2"
-                 xcdg:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-      <!--<xcdg:HierarchicalGroupLevelIndicatorPane Grid.Column="0"
-                                                    xcdg:TableView.CanScrollHorizontally="False" />-->
-
-      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-      <!--<xcdg:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        xcdg:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1" />-->
-
-      <!-- ToggleButton that is used to expand/collapse the group. -->
-      <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static xcdg:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 xcdg:TableView.CanScrollHorizontally="False" />
-
-      <!-- This TextBlock is used to ensure that the DesiredSize for 
-         the Row will never fall below the Height of a String using the inherited font size and face-->
-      <TextBlock Text=""
-                    Visibility="Hidden"
-                    Grid.Column="3"
-                    Margin="{TemplateBinding BorderThickness}" />
-
-      <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-      <xcdg:FixedCellPanel x:Name="PART_CellsHost"
-                               Grid.Column="3"
-                               ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
-                               ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ColumnStretchMode}"
-                               FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
-                               FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
-                               Margin="{TemplateBinding BorderThickness}" />
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <!-- When changing the appearance (e.g. background/foreground) of the Row to reflect specific
-              states (e.g. IsSelected), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-      <!-- When the Row is Selected, we want to change its background/foreground to the appropriate brushes. -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="True" />
-
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-        <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-      </MultiDataTrigger>
-
-      <!-- When the Row is Selected but the parent DataGridControl is not focused, we want to change
-              the Row's background/foreground to the appropriate brushes. -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.IsKeyboardFocusWithin}"
-                          Value="False" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).DataGridControl.HideSelection}"
-                          Value="False" />
-
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-        <Setter TargetName="rootGrid"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-      </MultiDataTrigger>
-
-      <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-          <Condition Value="True"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type xcdg:DataRow}}" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Visible" />
-
-      </MultiDataTrigger>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-          <Condition Value="False"
-                          Binding="{Binding RelativeSource={RelativeSource Self}, Path=., Mode=OneWay, Converter={StaticResource typeToBooleanConverter}, ConverterParameter={x:Type xcdg:DataRow}}" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-      </MultiDataTrigger>
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: ColumnManagerRow 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
-                    TargetType="xcdg:ColumnManagerRow">
-
-    <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
-           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-    <ControlTemplate.Resources>
-      <xcdg:ThicknessConverter x:Key="thicknessConverter"
-                                  InverseValue="True" />
-    </ControlTemplate.Resources>
-
-    <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
-    <Grid x:Name="rootGrid">
-      <Grid.ColumnDefinitions>
-        <!-- HierarchicalGroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <!-- GroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <ColumnDefinition Width="Auto" />
-
-        <!-- CellsHost panel -->
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <!-- The border responsible for the visual outline of the row (gridlines and background)
-                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
-      <Border x:Name="rootBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="3"
-                 xcdg:TableView.CanScrollHorizontally="False"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}" />
-
-      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-      <!--<xcdg:HierarchicalGroupLevelIndicatorPane xcdg:TableView.CanScrollHorizontally="False"
-                                                    Grid.Column="0"
-                                                    Background="{TemplateBinding Background}" />
-         <xcdg:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        xcdg:TableView.CanScrollHorizontally="False"
-                                        Grid.Column="1"
-                                        Background="{TemplateBinding Background}" />-->
-
-      <!-- ToggleButton that is used to expand/collapse the group. -->
-      <Button x:Name="detailsToggle"
-                 Template="{StaticResource detailsExpanderButtonTemplate}"
-                 VerticalAlignment="Top"
-                 Grid.Column="2"
-                 Margin="2,4,2,0"
-                 Command="{x:Static xcdg:DataGridCommands.ToggleDetailExpansion}"
-                 OverridesDefaultStyle="True"
-                 Focusable="False"
-                 Visibility="Collapsed"
-                 xcdg:TableView.CanScrollHorizontally="False" />
-
-      <Decorator x:Name="indentationDecorator"
-                    Grid.Column="3">
-
-        <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
-        <xcdg:FixedCellPanel x:Name="PART_CellsHost"
-                                  ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
-                                  ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).ColumnStretchMode}"
-                                  FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
-                                  FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
-                                  Margin="{TemplateBinding BorderThickness}" />
-      </Decorator>
-
-    </Grid>
-
-    <ControlTemplate.Triggers>
-      <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HasDetails}"
-                          Value="True" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AllowDetailToggle}"
-                          Value="True" />
-
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="detailsToggle"
-                    Property="Visibility"
-                    Value="Hidden" />
-
-      </MultiDataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: Cell 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewCellTemplate"
-                    TargetType="xcdg:Cell">
-
-    <!-- A basic Cell Template requires at least a ContentPresenter that is used to display the Cell's Content.
-           This ContentPresenter is usually placed inside a Border who is responsible for painting the gridlines. -->
-
-    <Grid>
-      <Border x:Name="gridLinesBorder" />
-
-      <Border x:Name="rootBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{TemplateBinding BorderThickness}"
-                 Padding="{TemplateBinding Padding}">
-
-        <xcdg:CellContentPresenter x:Name="PART_CellContentPresenter"
-                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-      </Border>
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <!-- When changing the appearance (e.g. background/foreground) of the Cell to reflect specific
-              states (e.g. IsCurrent), it is recommended to apply the changes directly to the template
-              elements because we want those modifications to be effective even when a value has been
-              explicitely set to these properties on the TemplatedParent. Also, when someone queries
-              the value of these properties on the TemplatedParent, we don't want to return the
-              intermediate, state-specific values. -->
-
-      <!-- When the Cell is Current, we want to change its background/foreground to the appropriate brushes.
-              We do this only when the cell does not have a validation error because we must give priority
-              to the CellErrorStyle (if present).-->
-
-      <!--<MultiTrigger>
-            <MultiTrigger.Conditions>
-
-               <Condition Property="IsCurrent"
-                          Value="True" />
-
-               <Condition Property="HasValidationError"
-                          Value="False" />
-
-            </MultiTrigger.Conditions>
-
-            <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-            <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-         </MultiTrigger>-->
-
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-
-          <Condition Property="IsCurrent"
-                          Value="True" />
-
-          <Condition Property="HasValidationError"
-                          Value="True" />
-
-          <Condition Property="CellErrorStyle"
-                          Value="{x:Null}" />
-
-        </MultiTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentBackground}" />
-
-        <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=CurrentForeground}" />
-
-      </MultiTrigger>
-
-      <!-- When the Cell is Selected, we want to change its background/foreground to the appropriate brushes. -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).(xcdg:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="True" />
-
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionBackground}" />
-
-        <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=SelectionForeground}" />
-
-      </MultiDataTrigger>
-
-      <!-- When the Cell is Selected but the parent DataGridControl is not focused, we want to change
-              the Cell's background/foreground to the appropriate brushes. -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=IsSelected}"
-                          Value="True" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).(xcdg:DataGridContext.DataGridControl).IsKeyboardFocusWithin}"
-                          Value="False" />
-
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).(xcdg:DataGridContext.DataGridControl).HideSelection}"
-                          Value="False" />
-
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="rootBorder"
-                    Property="Background"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionBackground}" />
-
-        <Setter TargetName="rootBorder"
-                    Property="TextElement.Foreground"
-                    Value="{Binding RelativeSource={RelativeSource TemplatedParent},Path=InactiveSelectionForeground}" />
-
-      </MultiDataTrigger>
-
-      <!-- When the Cell's content is Null and the row is not being edited, we want to ensure that the row/cell
-              will preserve a minimum height based on the current font size for the row/cell. To do this, we override
-              the ContentPresenter's content binding and replace it with an empty string (""), the textbox generated 
-              this way will then size to the default text's height. When trigger is not active anymore, default binding
-              is restored automatically. -->
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-        <Setter Property="Visibility"
-                    Value="Collapsed" />
-      </DataTrigger>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AreColumnsBeingReordered}"
-                          Value="True" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="gridLinesBorder"
-                    Property="BorderBrush"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
-
-        <Setter TargetName="gridLinesBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Left'}" />
-
-        <Setter TargetName="gridLinesBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource inverseThicknessConverter},ConverterParameter='Left'}" />
-
-      </MultiDataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: ColumnManagerCell 
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
-                    TargetType="xcdg:ColumnManagerCell">
-
-    <!-- We don't use the base Cell Template for the ColumnManagerCell because it need more elements
-           to function properly: a Thumb named "PART_ColumnResizerThumb" that is used to resize the
-           ColumnManagerCells's ParentColumn.Width and a glyph that represents the Column's SortDirection. -->
-    <Grid>
-
-      <Border x:Name="gridLinesBorder" />
-
-      <Border  BorderBrush="{TemplateBinding BorderBrush}"
-                  BorderThickness="{TemplateBinding BorderThickness}">
-
-        <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
-        <Grid>
-
-          <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                          HorizontalAlignment="Left"
-                          VerticalAlignment="Stretch"
-                          Width="1"
-                          Margin="0,2,0,2" />
-
-          <Rectangle Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                          HorizontalAlignment="Right"
-                          VerticalAlignment="Stretch"
-                          Width="1"
-                          Margin="0,2,0,2" />
-
-          <DockPanel>
-            <Border x:Name="thumbToggleBackgroundBorder"
-                          DockPanel.Dock="Right">
-
-              <Grid>
-
-                <Border x:Name="toggleDelimeterBorder"
-                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                                BorderThickness="1,0,0,0"
-                                Margin="0,4,0,4"
-                                Background="Transparent"
-                                Visibility="Collapsed">
-
-                  <Border x:Name="toggleDelimeterBorder2"
-                                   BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
-                                   BorderThickness="1,0,0,0"
-                                   Margin="0,0,0,0"
-                                   Background="Transparent"
-                                   Visibility="Collapsed">
-
-                  </Border>
-
-                </Border>
-
-                <ToggleButton x:Name="toggleButton"
-                                      Focusable="False"
-                                      VerticalAlignment="Stretch"
-                                      Visibility="Collapsed"
-                                      Margin="2,0,0,0"
-                                      Opacity="0.5" />
-
-              </Grid>
-
-            </Border>
-
-            <Border Background="{TemplateBinding Background}">
-
-              <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
-              <Grid>
-
-                <Border Padding="{TemplateBinding Padding}">
-
-                  <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-                  <StackPanel x:Name="contentPanel"
-                                       Orientation="Horizontal">
-
-                    <!-- Same ContentPresenter as in the base Cell Template. -->
-                    <xcdg:CellContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                    <!-- ContentPresenter that is used to display the sort glyph.
-                          We explicitly set its Content property to Null to prevent the XAML parser
-                          from implicitly setting it to its TemplatedParent's Content. -->
-                    <ContentPresenter x:Name="sortGlyphPresenter"
-                                                Content="{x:Null}"
-                                                ContentTemplate="{x:Null}" />
-
-                  </StackPanel>
-                </Border>
-
-              </Grid>
-
-            </Border>
-
-          </DockPanel>
-
-          <!-- Thumb that is used to resize the Column. -->
-          <Thumb x:Name="PART_ColumnResizerThumbLeft"
-                      Style="{StaticResource invisibleThumbStyle}"
-                      Width="6"
-                      HorizontalAlignment="Left" />
-
-          <!-- Thumb that is used to resize the Column. -->
-          <Thumb x:Name="PART_ColumnResizerThumb"
-                      Style="{StaticResource invisibleThumbStyle}"
-                      Width="6"
-                      HorizontalAlignment="Right" />
-
-        </Grid>
-
-      </Border>
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <!-- Trigger related to the filteringToggleButton-->
-      <Trigger SourceName="toggleButton"
-                  Property="IsMouseOver"
-                  Value="True">
-
-        <Setter TargetName="toggleButton"
-                    Property="Opacity"
-                    Value="1" />
-      </Trigger>
-
-      <Trigger Property="IsPressed"
-                  Value="True">
-
-        <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-      </Trigger>
-
-      <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
-              depending on the ParentColumn's SortDirection. -->
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
-                      Value="Ascending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource AscendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
-                      Value="Descending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource DescendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.HasFixedWidth}"
-                          Value="True" />
-
-          <!-- Don't disable resizing if ColumnStretching can be disabled by an 
-                    end-user resize. -->
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
-                          Value="False" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="PART_ColumnResizerThumb"
-                    Property="IsEnabled"
-                    Value="False" />
-      </MultiDataTrigger>
-
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.PreviousVisibleColumn.HasFixedWidth}"
-                          Value="True" />
-
-          <!-- Don't disable resizing if ColumnStretching can be disabled by an 
-                    end-user resize. -->
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
-                          Value="False" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="PART_ColumnResizerThumbLeft"
-                    Property="IsEnabled"
-                    Value="False" />
-      </MultiDataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentRow.AllowColumnResize}"
-                      Value="False">
-        <Setter TargetName="PART_ColumnResizerThumb"
-                    Property="IsEnabled"
-                    Value="False" />
-        <Setter TargetName="PART_ColumnResizerThumbLeft"
-                    Property="IsEnabled"
-                    Value="False" />
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
-                      Value="False">
-        <Setter Property="Visibility"
-                    Value="Collapsed" />
-      </DataTrigger>
-
-      <!-- To display the left vertical grid line when doing animated Column reordering -->
-      <MultiDataTrigger>
-        <MultiDataTrigger.Conditions>
-          <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).AreColumnsBeingReordered}"
-                          Value="True" />
-        </MultiDataTrigger.Conditions>
-
-        <Setter TargetName="gridLinesBorder"
-                    Property="BorderBrush"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
-
-        <Setter TargetName="gridLinesBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Left'}" />
-
-        <Setter TargetName="gridLinesBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource inverseThicknessConverter},ConverterParameter='Left'}" />
-
-      </MultiDataTrigger>
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupByControl
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupByControlTemplate"
-                    TargetType="xcdg:GroupByControl">
-
-    <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}">
-
-      <!-- This Grid is used to position the ItemsPresenter over the ContentPresenter in charge
-              of displaying the NoGroupContent. -->
-      <Grid>
-
-        <!-- This ContentPresenter displays the value of the NoGroupContent property
-                 of the GroupByControl. This content must only be displayed when there are
-                 no groups present, so we set its Visibility to Collapsed by default and
-                 it is made visible via a trigger. -->
-        <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed" />
-
-        <!-- The GroupByControl is an ItemsControl, so it must have an ItemsPresenter in its
-                 Template in order to layout and show its child items. The default ItemsPanel
-                 of the GroupByControl is a "StaircasePanel", which layout its items in a
-                 staircase-like pattern and draws connecting lines between the items. -->
-        <ItemsPresenter />
-
-      </Grid>
-    </Border>
-
-    <ControlTemplate.Triggers>
-
-      <!-- When there are no groups, make the NoGroupContent visible. -->
-      <Trigger Property="HasItems"
-                  Value="False">
-
-        <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-      </Trigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupByItem
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
-                    TargetType="xcdg:GroupByItem">
-
-    <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}">
-
-      <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-      <StackPanel Orientation="Horizontal">
-
-        <!-- Same ContentPresenter as in the base Cell Template. -->
-        <ContentPresenter Content="{TemplateBinding Content}"
-                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-        <!-- ContentPresenter that is used to display the sort glyph.
-                 We explicitely set its Content property to Null to prevent the XAML parser
-                 from implicitely setting it to its TemplatedParent's Content. -->
-        <ContentPresenter x:Name="sortGlyphPresenter"
-                              Content="{x:Null}"
-                              ContentTemplate="{x:Null}" />
-
-      </StackPanel>
-    </Border>
-
-    <ControlTemplate.Triggers>
-
-      <!-- The following 2 triggers allow to display the appropriate Sort Glyph
-              depending on the ParentColumn's SortDirection. -->
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Ascending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource AscendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource DescendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Margin"
-                    Value="6,0,0,0" />
-
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupHeaderControl
-    ************************** -->
-  <xcdg:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
-  <ControlTemplate x:Key="tableflowViewGroupHeaderControlTemplate"
-                    TargetType="xcdg:GroupHeaderControl">
-
-    <!-- Using this decorator will prevent the GroupHeaderControl of exceeding the width 
-           defined by the grid's column. -->
-    <xcdg:PassiveLayoutDecorator Axis="Horizontal">
-      <!-- This DockPanel is used to layout the GroupLevelIndicatorPane placeholder and the GroupHeaderControl Content. -->
-      <DockPanel>
-
-        <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-              whenever this GroupHeaderControl is part of a group. -->
-        <!--<xcdg:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
-            <xcdg:GroupLevelIndicatorPane DockPanel.Dock="Left"
-                                           Indented="False"
-                                           xcdg:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xcdg:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />-->
-
-        <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
-        <Border x:Name="mainBorder"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Padding="{TemplateBinding Padding}"
-                    Focusable="True"
-                    FocusVisualStyle="{TemplateBinding FocusVisualStyle}">
-
-          <!-- Define all the standard InputBindings for a GroupHeaderControl. -->
-          <Border.InputBindings>
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.ToggleGroupExpansion}"
-                              Key="Space" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.ExpandGroup}"
-                              Key="Right" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.ExpandGroup}"
-                              Key="Add" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.CollapseGroup}"
-                              Key="Left" />
-
-            <KeyBinding Command="{x:Static xcdg:DataGridCommands.CollapseGroup}"
-                              Key="Subtract" />
-
-            <MouseBinding Command="{x:Static xcdg:DataGridCommands.ToggleGroupExpansion}"
-                                MouseAction="LeftDoubleClick" />
-
-          </Border.InputBindings>
-
-          <!-- This StackPanel is used to layout the ToggleButton and the GroupHeaderControl. -->
-          <StackPanel Orientation="Horizontal">
-
-            <!-- ToggleButton that is used to expand/collapse the group. -->
-            <ToggleButton Template="{StaticResource groupExpanderToggleButtonTemplate}"
-                                OverridesDefaultStyle="True"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Focusable="False"
-                                IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
-
-            <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is
-                             a Group by default. -->
-            <ContentPresenter Margin="3,0,0,0"
-                                    Content="{TemplateBinding Content}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}"
-                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-          </StackPanel>
-        </Border>
-      </DockPanel>
-    </xcdg:PassiveLayoutDecorator>
-
-    <ControlTemplate.Triggers>
-      <Trigger Property="xcdg:DataGridControl.NavigationBehavior"
-                  Value="None">
-        <Setter TargetName="mainBorder"
-                    Property="Focusable"
-                    Value="False" />
-      </Trigger>
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupLevelIndicator
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupLevelIndicatorTemplate"
-                    TargetType="xcdg:GroupLevelIndicator">
-
-    <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: DetailIndicator
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewDetailIndicatorTemplate"
-                    TargetType="xcdg:DetailIndicator">
-
-    <Border Background="{TemplateBinding Background}"
-              BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}"
-              Padding="{TemplateBinding Padding}" />
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: GroupLevelIndicatorPane
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewGroupLevelIndicatorPaneTemplate"
-                    TargetType="xcdg:GroupLevelIndicatorPane">
-    <Grid>
-
-      <Border x:Name="horizontalBorder"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top'}" />
-
-      <Border x:Name="verticalBorder"
-                 BorderBrush="{TemplateBinding BorderBrush}"
-                 Padding="{TemplateBinding Padding}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Left'}">
-        <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                        Orientation="Horizontal" />
-      </Border>
-
-    </Grid>
-    <ControlTemplate.Triggers>
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsLeaf"
-                          Value="True" />
-          <Condition Property="xcdg:ViewBase.IsLastItem"
-                          Value="True" />
-          <Condition Property="xcdg:DataGridControl.HasExpandedDetails"
-                          Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter TargetName="horizontalBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
-        <Setter TargetName="verticalBorder"
-                    Property="Margin"
-                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Bottom'}" />
-      </MultiTrigger>
-
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-
-          <Condition Property="CurrentIndicatorCount"
-                          Value="0" />
-
-          <Condition Property="IsLeaf"
-                          Value="False" />
-
-        </MultiTrigger.Conditions>
-
-        <Setter TargetName="verticalBorder"
-                    Property="BorderThickness"
-                    Value="0" />
-
-      </MultiTrigger>
-
-      <Trigger Property="ShowVerticalBorder"
-                  Value="False">
-        <Setter TargetName="verticalBorder"
-                    Property="BorderThickness"
-                    Value="0" />
-      </Trigger>
-
-    </ControlTemplate.Triggers>
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: HierarchicalGroupLevelIndicatorPane
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewHierarchicalGroupLevelIndicatorPaneTemplate"
-                    TargetType="xcdg:HierarchicalGroupLevelIndicatorPane">
-    <Border BorderBrush="{TemplateBinding BorderBrush}"
-              BorderThickness="{TemplateBinding BorderThickness}">
-      <StackPanel x:Name="PART_GroupLevelIndicatorHost"
-                     Orientation="Horizontal" />
-    </Border>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: HierarchicalGroupByControl
-    ************************** -->
-
-  <!-- DataTemplate for DataGridContext displayed inside the HierarchicalGroupByControl -->
-  <HierarchicalDataTemplate x:Key="dataGridContextTemplate"
-                             DataType="{x:Type xcdg:DataGridContext}"
-                             ItemsSource="{Binding Path=DetailConfigurations}">
-
-    <xcdg:HierarchicalGroupByControlNode x:Name="groupByControlNode"
-                                            ItemsSource="{Binding Path=GroupLevelDescriptions}"
-                                            Title="{Binding Path=SourceDetailConfiguration.Title}" />
-
-    <!-- Trigger to bind Title to the DataGridContext.DataGridControl.ItemsSourceName if DataGridContext.ParentDataGridContext is null -->
-    <HierarchicalDataTemplate.Triggers>
-      <DataTrigger Binding="{Binding Path=SourceDetailConfiguration}"
-                      Value="{x:Null}">
-        <Setter TargetName="groupByControlNode"
-                    Property="Title">
-          <Setter.Value>
-            <Binding Path="DataGridControl.ItemsSourceName" />
-          </Setter.Value>
-        </Setter>
-      </DataTrigger>
-    </HierarchicalDataTemplate.Triggers>
-
-  </HierarchicalDataTemplate>
-
-  <!-- DataTemplate for DetailConfiguration displayed inside the HierarchicalGroupByControlNode -->
-  <HierarchicalDataTemplate x:Key="detailConfigurationTemplate"
-                             ItemsSource="{Binding Path=DetailConfigurations}">
-
-    <xcdg:HierarchicalGroupByControlNode ItemsSource="{Binding Path=GroupLevelDescriptions}"
-                                            Title="{Binding Title}" />
-  </HierarchicalDataTemplate>
-
-  <xcdg:TypeToVisibilityConverter x:Key="notDetailConfigConverter"
-                                   Visibility="Visible"
-                                   SetVisibilityWhenTrue="False" />
 
   <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
 
@@ -1192,10 +37,6 @@
     <Setter Property="Visibility">
       <Setter.Value>
         <PriorityBinding>
-          <!-- TODO: DetailConfiguration is internal. Do we need this? -->
-          <!--<Binding Path="."
-                        Converter="{StaticResource notDetailConfigConverter}"
-                        ConverterParameter="{x:Type xcdg:DetailConfiguration}" />-->
           <Binding Path="Visible"
                         Converter="{StaticResource booleanToVisibilityConverter}" />
         </PriorityBinding>
@@ -1246,308 +87,5 @@
       </Setter.Value>
     </Setter>
   </Style>
-  <ControlTemplate x:Key="tableflowViewCommonEmptyHierarchicalGroupByControlTemplate"
-                    TargetType="xcdg:HierarchicalGroupByControl">
-    <Border/>
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="tableflowViewCommonHierarchicalGroupByControlTemplate"
-                    TargetType="xcdg:HierarchicalGroupByControl">
-    <ControlTemplate.Resources>
-      <!--this style is set to avoid having implicit treeview style
-             overide the HierarchicalGroupByControl's TreeView-->
-      <Style TargetType="TreeView" />
-    </ControlTemplate.Resources>
-
-    <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-    <Grid x:Name="rootGrid">
-      <Grid.ColumnDefinitions>
-        <!-- HierarchicalGroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <!-- GroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-
-        <!-- HierarchicalGroupByControl -->
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <!-- The border responsible for the visual outline of the row (gridlines and background)
-              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
-      <Border x:Name="rootBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-      <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-      <xcdg:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-      <xcdg:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-      <StackPanel Grid.Column="2"
-                     Orientation="Horizontal">
-
-        <TreeView x:Name="PART_HierarchicalGroupByControlTreeView"
-                      ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                      Background="Transparent"
-                      BorderBrush="Transparent"
-                      Focusable="False">
-
-          <TreeViewItem Header="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext)}"
-                             HeaderTemplate="{StaticResource dataGridContextTemplate}"
-                             ItemsSource="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).DetailConfigurations}"
-                             ItemTemplate="{StaticResource detailConfigurationTemplate}"
-                             ItemContainerStyle="{StaticResource hierarchicalGroupByControlTreeViewItemStyle}"
-                             IsExpanded="True" />
-        </TreeView>
-
-        <ContentPresenter x:Name="noGroupContentPresenter"
-                              Content="{TemplateBinding NoGroupContent}"
-                              VerticalAlignment="Center"
-                              Visibility="Collapsed"
-                              Margin="5,0,0,0" />
-
-      </StackPanel>
-
-    </Grid>
-    <ControlTemplate.Triggers>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=HasGroups}"
-                      Value="True">
-
-        <Setter TargetName="noGroupContentPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xcdg:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-        <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-        <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <ControlTemplate x:Key="tableflowViewCommonHierarchicalGroupByControlOldGroupByControlTemplate"
-                    TargetType="xcdg:HierarchicalGroupByControl">
-
-    <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the HierarchicalGroupByControl -->
-    <Grid x:Name="rootGrid">
-      <Grid.ColumnDefinitions>
-        <!-- HierarchicalGroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-        <!-- GroupLevelIndicatorPane -->
-        <ColumnDefinition Width="Auto" />
-
-        <!-- HierarchicalGroupByControl -->
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <!-- The border responsible for the visual outline of the row (gridlines and background)
-              spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
-              the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
-      <Border x:Name="rootBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 Background="{TemplateBinding Background}"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).HorizontalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Top'}"
-                 Padding="{TemplateBinding Padding}" />
-
-      <Border x:Name="verticalGridLineBorder"
-                 Grid.Column="1"
-                 Grid.ColumnSpan="2"
-                 BorderBrush="{Binding RelativeSource={RelativeSource Self}, Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineBrush}"
-                 BorderThickness="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
-
-      <xcdg:HierarchicalGroupLevelIndicatorPane Grid.Column="0" />
-
-      <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
-                       whenever this Row is part of a group. -->
-      <xcdg:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
-                                        Grid.Column="1" />
-
-      <xcdg:GroupByControl Grid.Column="2"
-                               BorderBrush="{TemplateBinding BorderBrush}"
-                               Background="{TemplateBinding Background}"
-                               BorderThickness="{TemplateBinding BorderThickness}"
-                               AllowGroupingModification="{TemplateBinding AllowGroupingModification}"
-                               AllowSort="{TemplateBinding AllowSort}"
-                               ConnectionLinePen="{TemplateBinding ConnectionLinePen}"
-                               NoGroupContent="{TemplateBinding NoGroupContent}"
-                               xcdg:TableView.CanScrollHorizontally="True" />
-
-    </Grid>
-
-    <ControlTemplate.Triggers>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(xcdg:GroupLevelIndicatorPane.GroupLevel)}"
-                      Value="-1">
-        <Setter TargetName="groupLevelIndicatorPane"
-                    Property="Visibility"
-                    Value="Collapsed" />
-        <Setter TargetName="verticalGridLineBorder"
-                    Property="BorderThickness"
-                    Value="{Binding RelativeSource={RelativeSource Self},Path=(xcdg:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right, Left'}" />
-      </DataTrigger>
-
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: HierarchicalGroupByControlNode
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
-                    TargetType="xcdg:HierarchicalGroupByControlNode">
-
-    <StackPanel Orientation="Horizontal"
-                  Background="{TemplateBinding Background}">
-
-      <TextBlock x:Name="titleTextBlock"
-                    Text="{TemplateBinding Title}"
-                    Margin="0,0,10,0" />
-
-      <ItemsPresenter Margin="0,0,0,10" />
-    </StackPanel>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: HierarchicalGroupByItem
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
-                    TargetType="xcdg:HierarchicalGroupByItem">
-
-    <Border x:Name="outerBorder"
-              BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"
-              Background="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"
-              BorderThickness="0,0,1,1"
-              Padding="1,1,0,0">
-
-      <Border x:Name="innerBorder"
-                 BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
-                 BorderThickness="0,0,1,1"
-                 Margin="1,1,0,0"
-                 Background="{TemplateBinding Background}"
-                 Padding="{TemplateBinding Padding}">
-
-        <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
-        <StackPanel x:Name="contentPanel"
-                        Orientation="Horizontal">
-
-          <!-- Same ContentPresenter as in the base Cell Template. -->
-          <ContentPresenter Content="{TemplateBinding Content}"
-                                 ContentTemplate="{TemplateBinding ContentTemplate}"
-                                 ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-          <!-- ContentPresenter that is used to display the sort glyph.
-                    We explicitly set its Content property to Null to prevent the XAML parser
-                    from implicitly setting it to its TemplatedParent's Content. -->
-          <ContentPresenter x:Name="sortGlyphPresenter"
-                                 Content="{x:Null}"
-                                 ContentTemplate="{StaticResource AscendingSortGlyph}"
-                                 Margin="6,0,0,0"
-                                 Visibility="Hidden" />
-
-        </StackPanel>
-
-      </Border>
-
-    </Border>
-
-    <ControlTemplate.Triggers>
-
-      <Trigger Property="IsPressed"
-                  Value="True">
-
-        <Setter TargetName="outerBorder"
-                    Property="BorderBrush"
-                    Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" />
-
-        <Setter TargetName="outerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-        <Setter TargetName="outerBorder"
-                    Property="Padding"
-                    Value="0" />
-
-        <Setter TargetName="innerBorder"
-                    Property="BorderThickness"
-                    Value="1" />
-
-        <Setter TargetName="innerBorder"
-                    Property="Margin"
-                    Value="0" />
-
-        <Setter TargetName="contentPanel"
-                    Property="Margin"
-                    Value="1,1,-1,-1" />
-
-      </Trigger>
-
-      <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
-              depending on the ParentColumn's SortDirection. -->
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Ascending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource AscendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-      </DataTrigger>
-
-      <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
-                      Value="Descending">
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="ContentPresenter.ContentTemplate"
-                    Value="{StaticResource DescendingSortGlyph}" />
-
-        <Setter TargetName="sortGlyphPresenter"
-                    Property="Visibility"
-                    Value="Visible" />
-
-      </DataTrigger>
-    </ControlTemplate.Triggers>
-
-  </ControlTemplate>
-
-  <!--**************************
-    * TEMPLATE: ScrollTip
-    ************************** -->
-  <ControlTemplate x:Key="tableflowViewScrollTipTemplate"
-                    TargetType="{x:Type xcdg:ScrollTip}">
-    <ContentPresenter VerticalAlignment="Center"
-                        HorizontalAlignment="Right"
-                        Content="{TemplateBinding Content}"
-                        ContentTemplate="{TemplateBinding ContentTemplate}"
-                        ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-  </ControlTemplate>
-
+  
 </ResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/ThemeSelector.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/ThemeSelector.xaml
new file mode 100644
index 0000000000..184567adfa
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/ThemeSelector.xaml
@@ -0,0 +1,11 @@
+<!--
+// ExpressionDark is the default/fallback theme.
+// When adding a new theme, ensure all themes:ThemeResourceDictionary in every *.xaml files
+// are updated to ensure the theme is correctly applied.
+-->
+<themes:ThemeResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                xmlns:themes="clr-namespace:Xenko.Core.Presentation.Themes;assembly=Xenko.Core.Presentation"
+                                Source="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
+                                ExpressionDarkSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"
+                                DarkSteelSource="ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml">
+</themes:ThemeResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Themes/generic.xaml b/sources/editor/Xenko.Core.Assets.Editor/Themes/generic.xaml
index 7dac4c8112..8a56732956 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Themes/generic.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/Themes/generic.xaml
@@ -2,23 +2,19 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:Xenko.Core.Assets.Editor.View.Controls"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-                    xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-                    xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
+                    xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View"
                     xmlns:diagnostics="clr-namespace:Xenko.Core.Assets.Diagnostics;assembly=Xenko.Core.Assets">
 
   <ResourceDictionary.MergedDictionaries>
+    <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ThemeSelector.xaml" />
     <ResourceDictionary Source="/Xenko.Core.Assets.Editor;component/View/CommonResources.xaml" />
   </ResourceDictionary.MergedDictionaries>
-
+  
   <Style TargetType="controls:GridLogViewer">
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="controls:GridLogViewer">
           <DockPanel x:Name="PART_GridLogViewerCollectionSourceContainer">
-            <DockPanel.Resources>
-              <xcdg:DataGridCollectionViewSource x:Key="GridLogViewerCollectionSource" Source="{Binding LogMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
-            </DockPanel.Resources>
             <ToolBarTray DockPanel.Dock="Top" Visibility="{Binding IsToolBarVisible, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={xk:VisibleOrCollapsed}}">
               <ToolBar ToolBarTray.IsLocked="True" Header="Filters:" Visibility="{Binding CanFilterLog, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={xk:VisibleOrCollapsed}}">
                 <ToggleButton IsChecked="{Binding ShowDebugMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}">
@@ -43,45 +39,37 @@
                   <Label Content="..." Width="12" Height="12" HorizontalContentAlignment="Center" />
                 </ToggleButton>
               </ToolBar>
-              <ToolBar ToolBarTray.IsLocked="True" Header="Search:" Visibility="{Binding CanSearchLog, RelativeSource={RelativeSource Mode=TemplatedParent}, Converter={xk:VisibleOrCollapsed}}">
-                <xk:TextBox Width="150" UseTimedValidation="True" Text="{Binding SearchToken, RelativeSource={RelativeSource Mode=TemplatedParent}, Mode=OneWayToSource}" WatermarkContent="Search" />
-                <Button x:Name="PART_PreviousResult">
-                  <Path Width="8" Height="8" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryPrevious}" />
-                </Button>
-                <Button x:Name="PART_NextResult">
-                  <Path Width="8" Height="8" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryNext}" />
-                </Button>
-                <ToggleButton IsChecked="{Binding SearchMatchCase, RelativeSource={RelativeSource Mode=TemplatedParent}}">
-                  <Path Width="16" Height="16" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryMatchCase}" />
-                </ToggleButton>
-                <ToggleButton IsChecked="{Binding SearchMatchWord, RelativeSource={RelativeSource Mode=TemplatedParent}}">
-                  <Path Width="16" Height="16" Stretch="Uniform" Fill="{StaticResource TextBrush}" Data="{StaticResource GeometryMatchWord}" />
-                </ToggleButton>
-              </ToolBar>
             </ToolBarTray>
-            <xcdg:DataGridControl x:Name="PART_LogGridView" ItemsSource="{Binding Source={StaticResource GridLogViewerCollectionSource}}" AutoCreateColumns="False" ItemScrollingBehavior="Immediate">
-              <xcdg:DataGridControl.Resources>
+            <view:DataGridEx x:Name="PART_LogGridView" ItemsSource="{Binding FilteredLogMessages, RelativeSource={RelativeSource Mode=TemplatedParent}}" 
+                             AutoGenerateColumns="False" 
+                             CanUserResizeRows="False" 
+                             CanUserReorderColumns="False" 
+                             RowHeaderWidth="0" 
+                             IsReadOnly="True"
+                             CanUserAddRows="False" 
+                             CanUserDeleteRows="False">
+              <DataGrid.Resources>
                 <DataTemplate x:Key="LogMessageTypeCellTemplate" DataType="diagnostics:AssetSerializableLogMessage">
                   <Path x:Name="MessageTypePath" Width="12" Height="12" Stretch="Uniform" Fill="{DynamicResource TextBrush}">
                     <Path.Style>
                       <Style>
                         <Style.Triggers>
-                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}, Mode=OneWay}" Value="Debug">
+                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Mode=OneWay}" Value="Debug">
                             <Setter Property="Path.Data" Value="{DynamicResource GeometryDebugMessage}" />
                           </DataTrigger>
-                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}, Mode=OneWay}" Value="Verbose">
+                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Mode=OneWay}" Value="Verbose">
                             <Setter Property="Path.Data" Value="{DynamicResource GeometryVerboseMessage}" />
                           </DataTrigger>
-                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}, Mode=OneWay}" Value="Info">
+                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Mode=OneWay}" Value="Info">
                             <Setter Property="Path.Data" Value="{DynamicResource GeometryInfoMessage}" />
                           </DataTrigger>
-                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}, Mode=OneWay}" Value="Warning">
+                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Mode=OneWay}" Value="Warning">
                             <Setter Property="Path.Data" Value="{DynamicResource GeometryWarningMessage}" />
                           </DataTrigger>
-                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}, Mode=OneWay}" Value="Error">
+                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Mode=OneWay}" Value="Error">
                             <Setter Property="Path.Data" Value="{DynamicResource GeometryErrorMessage}" />
                           </DataTrigger>
-                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}, Mode=OneWay}" Value="Fatal">
+                          <DataTrigger Binding="{Binding DataContext.Type, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}, Mode=OneWay}" Value="Fatal">
                             <Setter Property="Path.Data" Value="{DynamicResource GeometryFatalMessage}" />
                           </DataTrigger>
                         </Style.Triggers>
@@ -90,43 +78,29 @@
                   </Path>
                 </DataTemplate>
                 <DataTemplate x:Key="LogMessageHasExceptionCellTemplate" DataType="compilerApp:AssetSerializableLogMessage">
-                  <Border />
-                  <!--<Image SnapsToDevicePixels="True" Width="16" Height="16" Stretch="None" VerticalAlignment="Center" Source="../Resources/exception.png" Visibility="{Binding ExceptionInfo, Mode=OneTime, Converter={xk:Chained {xk:ObjectToBool}, {xk:VisibleOrHidden}}}">
-                                        <ToolTipService.ToolTip>
-                                            <TextBlock Text="{Binding ExceptionInfo.TypeFullName, Mode=OneTime}" Foreground="#FF2B91AF" FontWeight="Bold"/>
-                                        </ToolTipService.ToolTip>
-                                    </Image>-->
+                  <Border>
+                    <Image SnapsToDevicePixels="True" Width="16" Height="16" Stretch="None" VerticalAlignment="Center" Source="../Resources/exception.png" Visibility="{Binding ExceptionInfo, Mode=OneTime, Converter={xk:Chained {xk:ObjectToBool}, {xk:VisibleOrHidden}}}">
+                      <ToolTipService.ToolTip>
+                        <TextBlock Text="{Binding ExceptionInfo.TypeFullName, Mode=OneTime}" Foreground="#FF2B91AF" FontWeight="Bold"/>
+                      </ToolTipService.ToolTip>
+                    </Image>
+                  </Border>
                 </DataTemplate>
                 <DataTemplate x:Key="LogMessageAssetUrlCellTemplate">
-                  <TextBlock Text="{xk:PriorityBinding {Binding DataContext.AssetUrl, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}}, {Binding DataContext.AssetReference.Location, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xcdg:DataRow}}}}" />
+                  <TextBlock Text="{xk:PriorityBinding {Binding DataContext.AssetUrl, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}}, {Binding DataContext.AssetReference.Location, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridRow}}}}" />
                 </DataTemplate>
                 <DataTemplate x:Key="LogMessageTextCellTemplate" DataType="compilerApp:AssetSerializableLogMessage">
                   <TextBlock Text="{Binding}" TextWrapping="Wrap" />
                 </DataTemplate>
-              </xcdg:DataGridControl.Resources>
-              <xcdg:DataGridControl.View>
-                <!-- Don't forget to change TableflowViewItemsHost in TableflowView.GridElementTemplates.xaml -->
-                <!--<xcdg:TableflowView ContainerHeight="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}, Converter={xk:Chained {xk:SumNum}, {xk:MaxNum}, Parameter1={xk:Double 8}, Parameter2={xk:Double 26}}}"
-                                            ScrollingAnimationDuration="0" RowFadeInAnimationDuration="0" IsColumnVirtualizationEnabled="False"/>-->
-                <xcdg:TableView AllowRowResize="False" IsColumnVirtualizationEnabled="False" FixedColumnCount="2" UseDefaultHeadersFooters="False">
-                  <xcdg:TableView.FixedHeaders>
-                    <DataTemplate>
-                      <xcdg:ColumnManagerRow AllowColumnReorder="False" />
-                    </DataTemplate>
-                  </xcdg:TableView.FixedHeaders>
-                </xcdg:TableView>
-              </xcdg:DataGridControl.View>
-              <i:Interaction.Behaviors>
-                <behaviors:XceedDataGridResizableColumnsBehavior />
-              </i:Interaction.Behaviors>
-              <xcdg:DataGridControl.Columns>
-                <xcdg:Column FieldName="Type" Title="" VisiblePosition="0" AllowSort="True" MinWidth="16" MaxWidth="16" CellContentTemplate="{StaticResource LogMessageTypeCellTemplate}" />
-                <xcdg:Column FieldName="HasException" Title="" VisiblePosition="1" AllowSort="True" MinWidth="16" MaxWidth="16" CellContentTemplate="{StaticResource LogMessageHasExceptionCellTemplate}" />
-                <xcdg:Column FieldName="Text" Title="Message" Width="*" AllowSort="True" CellContentTemplate="{StaticResource LogMessageTextCellTemplate}" />
-                <!-- Module is not actually used, we're just hacking an additional column here for asset url which requires a priority binding -->
-                <xcdg:Column FieldName="Module" Title="Asset" Width="200" AllowSort="True" CellContentTemplate="{StaticResource LogMessageAssetUrlCellTemplate}" />
-              </xcdg:DataGridControl.Columns>
-            </xcdg:DataGridControl>
+              </DataGrid.Resources>
+              <DataGrid.Columns>
+                <DataGridTemplateColumn Header="" MinWidth="16" MaxWidth="16" CellTemplate="{StaticResource LogMessageTypeCellTemplate}" >
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="" MinWidth="16" MaxWidth="16" CellTemplate="{StaticResource LogMessageHasExceptionCellTemplate}"  />
+                <DataGridTemplateColumn Header="Message" Width="*" CellTemplate="{StaticResource LogMessageTextCellTemplate}"  />
+                <DataGridTemplateColumn Header="Asset" Width="200" CellTemplate="{StaticResource LogMessageAssetUrlCellTemplate}"  />
+              </DataGrid.Columns>
+            </view:DataGridEx>
           </DockPanel>
         </ControlTemplate>
       </Setter.Value>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/AssetPickerWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/AssetPickerWindow.xaml
index 0557e6a6f2..252dde5da8 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/AssetPickerWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/AssetPickerWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:xk="http://schemas.xenko.com/xaml/presentation"
         xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View"
         xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml
index 404c0872eb..6c0f1c4498 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml
@@ -5,12 +5,11 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:viewModel="clr-namespace:Xenko.Core.Assets.Editor.ViewModel"
              xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View"
              xmlns:controls="clr-namespace:Xenko.Core.Assets.Editor.View.Controls"
              xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
              xmlns:cvt="clr-namespace:Xenko.Core.Assets.Editor.View.ValueConverters"
-             xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
              xmlns:system="clr-namespace:System;assembly=mscorlib"
              xmlns:status="clr-namespace:Xenko.Core.Assets.Editor.Components.Status.Views"
              xmlns:strings="clr-namespace:Xenko.Core.Assets.Editor.Resources.Strings"
@@ -181,74 +180,7 @@
             </i:Interaction.Behaviors>
           </controls:EditableContentListBox>
         </DataTemplate>
-
         <CollectionViewSource x:Key="FilteredContentView" Source="{Binding FilteredAssets}" />
-
-        <DataTemplate x:Key="AssetGridView">
-          <view:DataGridEx ItemsSource="{Binding Source={StaticResource FilteredContentView}}" AutoCreateColumns="False" ItemScrollingBehavior="Immediate" IsTextSearchEnabled="True" TextSearch.TextPath="Name">
-            <xcdg:DataGridControl.Resources>
-              <xk:BindingProxy x:Key="GridThumbnailSize" Data="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}}"/>
-            </xcdg:DataGridControl.Resources>
-            <xcdg:DataGridControl.Columns>
-              <xcdg:Column FieldName="ThumbnailData" ReadOnly="True" AllowSort="False"
-                         MinWidth="{Binding Data, Source={StaticResource GridThumbnailSize}, Converter={xk:SumNum}, ConverterParameter={xk:Double 8}}"
-                         MaxWidth="{Binding Data, Source={StaticResource GridThumbnailSize}, Converter={xk:SumNum}, ConverterParameter={xk:Double 8}}">
-                <xcdg:Column.CellContentTemplate>
-                  <DataTemplate DataType="{x:Type services:ThumbnailData}">
-                    <Image Margin="2" Source="{Binding Presenter, Mode=OneWay}" RenderOptions.BitmapScalingMode="Linear" SnapsToDevicePixels="True"
-                                                    Width="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}, Converter={xk:SumNum}}"
-                                                    Height="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}, Converter={xk:SumNum}}"/>
-                  </DataTemplate>
-                </xcdg:Column.CellContentTemplate>
-              </xcdg:Column>
-              <xcdg:Column Width="2*" FieldName="Name" Title="{xk:Localize Name}" AllowSort="True" CellEditorDisplayConditions="RowIsBeingEdited"/>
-              <xcdg:Column Width="2*" FieldName="TypeDisplayName" Title="{xk:Localize Type}" AllowSort="True" ReadOnly="True" />
-              <xcdg:Column Width="4*" FieldName="Url" Title="{xk:Localize URL}" AllowSort="True" ReadOnly="True" />
-              <xcdg:Column FieldName="Dependencies" Title="{xk:Localize Included}" AllowSort="False" ReadOnly="True" >
-                <xcdg:Column.CellContentTemplate>
-                  <DataTemplate DataType="viewModel:AssetDependenciesViewModel">
-                    <Grid Background="Transparent">
-                      <Image Source="{StaticResource ImageAssetIsRoot}" Width="16" Height="16" Visibility="{Binding IsRoot, Converter={xk:VisibleOrHidden}}"/>
-                      <Image Source="{StaticResource ImageAssetIsIndirectlyIncluded}" Width="16" Height="16" Visibility="{Binding IsIndirectlyIncluded, Converter={xk:VisibleOrHidden}}"/>
-                      <Image Source="{StaticResource ImageAssetIsExcluded}" Width="16" Height="16" Visibility="{Binding IsExcluded, Converter={xk:VisibleOrHidden}}"/>
-                    </Grid>
-                  </DataTemplate>
-                </xcdg:Column.CellContentTemplate>
-              </xcdg:Column>
-              <xcdg:Column FieldName="IsDirty" Title="Modified" AllowSort="True" ReadOnly="True" />
-            </xcdg:DataGridControl.Columns>
-            <xcdg:DataGridControl.ItemContainerStyle>
-              <Style TargetType="xcdg:DataRow" BasedOn="{StaticResource {x:Type xcdg:DataRow}}" d:DataContext="{d:DesignInstance viewModel:AssetViewModel}">
-                <Setter Property="Height" Value="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}, Converter={xk:SumNum}, ConverterParameter={xk:Double 8}}"/>
-                <Setter Property="MinHeight" Value="26"/>
-                <Setter Property="MaxHeight" Value="{x:Static system:Double.PositiveInfinity}"/>
-                <Setter Property="xk:Interaction.Behaviors">
-                  <Setter.Value>
-                    <xk:BehaviorCollection>
-                      <xk:OnEventCommandBehavior EventName="MouseDoubleClick"
-                                                   Command="{Binding AssetDoubleClick, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}}"
-                                                   CommandParameter="{Binding SelectedItem, RelativeSource={RelativeSource AncestorType=controls:EditableContentListBox}}"/>
-                    </xk:BehaviorCollection>
-                  </Setter.Value>
-                </Setter>
-              </Style>
-            </xcdg:DataGridControl.ItemContainerStyle>
-            <xcdg:DataGridControl.View>
-              <!-- Don't forget to change TableflowViewItemsHost in TableflowView.GridElementTemplates.xaml -->
-              <!--<xcdg:TableflowView ContainerHeight="{Binding GridThumbnailSize, RelativeSource={RelativeSource AncestorType=view:AssetViewUserControl}, Converter={xk:Chained {xk:SumNum}, {xk:MaxNum}, Parameter1={xk:Double 8}, Parameter2={xk:Double 26}}}"
-                                            ScrollingAnimationDuration="0" RowFadeInAnimationDuration="0" IsColumnVirtualizationEnabled="False"/>-->
-              <xcdg:TableView AllowRowResize="False" IsColumnVirtualizationEnabled="False"/>
-            </xcdg:DataGridControl.View>
-            <i:Interaction.Behaviors>
-              <behaviors:XceedDataGridBindableSelectedItemsBehavior SelectedItems="{Binding SelectedContent}"/>
-              <behaviors:XceedDataGridDragDropBehavior DragVisualTemplate="{StaticResource DragVisualTemplate}"/>
-              <behaviors:XceedDataGridThumbnailPrioritizationBehavior/>
-              <behaviors:XceedDataGridResizableColumnsBehavior/>
-              <xk:CommandBindingBehavior RoutedCommand="ApplicationCommands.Delete" Command="{Binding DeleteContentCommand}" IsEnabled="{Binding CanDeleteAssets, ElementName=AssetView}"/>
-            </i:Interaction.Behaviors>
-          </view:DataGridEx>
-        </DataTemplate>
-
       </ResourceDictionary>
     </FrameworkElement.Resources>
     <ToolBarTray DockPanel.Dock="Top">
@@ -394,14 +326,6 @@
                   </Button>
                 </DockPanel>
               </MenuItem.Header>
-              <MenuItem Header="{xk:Localize Grid, Context=Menu}" CommandParameter="{StaticResource AssetGridView}">
-                <MenuItem.Command>
-                  <view:SetContentTemplateCommand Target="{x:Reference AssetViewPresenter}"/>
-                </MenuItem.Command>
-                <MenuItem.Icon>
-                  <Image Grid.Column="0" Source="{StaticResource ImageShowGrid}"/>
-                </MenuItem.Icon>
-              </MenuItem>
               <MenuItem Header="{xk:Localize Tiles, Context=Menu}" CommandParameter="{StaticResource AssetTileView}">
                 <MenuItem.Command>
                   <view:SetContentTemplateCommand Target="{x:Reference AssetViewPresenter}"/>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml.cs b/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml.cs
index 8e11238e97..130c2c2f0d 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/AssetViewUserControl.xaml.cs
@@ -5,13 +5,12 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-
+using Xceed.Wpf.Toolkit.Core;
 using Xenko.Core.Assets.Editor.View.Controls;
 using Xenko.Core.Assets.Editor.ViewModel;
 using Xenko.Core.Presentation.Collections;
 using Xenko.Core.Presentation.Extensions;
 
-using Xceed.Wpf.DataGrid;
 
 namespace Xenko.Core.Assets.Editor.View
 {
@@ -126,8 +125,6 @@ public AssetViewUserControl()
         {
 
             InitializeComponent();
-            Loaded += (s, e) => AddHandler(Row.EditBeginningEvent, (CancelRoutedEventHandler)CanBeginEditEvent);
-            Unloaded += (s, e) => RemoveHandler(Row.EditBeginningEvent, (CancelRoutedEventHandler)CanBeginEditEvent);
         }
 
         /// <summary>
@@ -215,7 +212,7 @@ public void BeginEdit()
             var listBox = AssetViewPresenter.FindVisualChildOfType<EditableContentListBox>();
             listBox?.BeginEdit();
 
-            var gridView = AssetViewPresenter.FindVisualChildOfType<DataGridControl>();
+            var gridView = AssetViewPresenter.FindVisualChildOfType<DataGridEx>();
             gridView?.BeginEdit();
         }
 
@@ -231,7 +228,7 @@ private void ZoomIn()
                 }
             }
 
-            var gridView = AssetViewPresenter.FindVisualChildOfType<DataGridControl>();
+            var gridView = AssetViewPresenter.FindVisualChildOfType<DataGridEx>();
             if (gridView != null)
             {
                 GridThumbnailSize += ThumbnailZoomIncrement;
@@ -254,7 +251,7 @@ private void ZoomOut()
                 }
             }
 
-            var gridView = AssetViewPresenter.FindVisualChildOfType<DataGridControl>();
+            var gridView = AssetViewPresenter.FindVisualChildOfType<DataGridEx>();
             if (gridView != null)
             {
                 GridThumbnailSize -= ThumbnailZoomIncrement;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/BringSelectionToViewBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/BringSelectionToViewBehavior.cs
index b797238d77..61663ff2ac 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/BringSelectionToViewBehavior.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/BringSelectionToViewBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Linq;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Assets.Editor.View.Controls;
 using Xenko.Core.Presentation.Controls;
 using Xenko.Core.Presentation.Extensions;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropAdornerManager.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropAdornerManager.cs
index e88e822619..16895dcf32 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropAdornerManager.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropAdornerManager.cs
@@ -6,7 +6,7 @@
 using System.Reflection;
 using System.Windows;
 using System.Windows.Documents;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Media;
 using Xenko.Core.Annotations;
 using Xenko.Core.Extensions;
@@ -42,7 +42,7 @@ static DragDropAdornerManager()
             // There is no public way to get the BehaviorCollection only if it exists, without creating it if it does not.
             var behaviorsPropertyFieldInfo = typeof(Interaction).GetField("BehaviorsProperty", BindingFlags.NonPublic | BindingFlags.Static);
             if (behaviorsPropertyFieldInfo == null)
-                throw new MissingFieldException("The BehaviorsProperty static field is missing on the class System.Windows.Interactivity. This version of the assembly is not supported.");
+                throw new MissingFieldException("The BehaviorsProperty static field is missing on the class Microsoft.Xaml.Behaviors. This version of the assembly is not supported.");
 
             BehaviorsProperty = (DependencyProperty)behaviorsPropertyFieldInfo.GetValue(null);
         }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropBehavior.cs
index 9eada83460..f1412d6a13 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropBehavior.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/DragDropBehavior.cs
@@ -7,7 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Media;
 using Xenko.Core.Assets.Editor.ViewModel;
 using Xenko.Core.Annotations;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/XceedDataGridDragDropBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/XceedDataGridDragDropBehavior.cs
deleted file mode 100644
index 6d58dc1e52..0000000000
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/DragDrop/XceedDataGridDragDropBehavior.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Collections.Generic;
-using System.Linq;
-using Xenko.Core.Extensions;
-using Xceed.Wpf.DataGrid;
-
-namespace Xenko.Core.Assets.Editor.View.Behaviors
-{
-    public class XceedDataGridDragDropBehavior : DragDropBehavior<DataGridControl, DataRow>
-    {
-        protected override IEnumerable<object> GetItemsToDrag(DataRow container)
-        {
-            if (container != null)
-            {
-                var sourceItem = container.DataContext;
-                return AssociatedObject.SelectedItems.Contains(sourceItem) ? AssociatedObject.SelectedItems.Cast<object>() : sourceItem.ToEnumerable<object>();
-            }
-            return Enumerable.Empty<object>();
-        }
-    }
-}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ListBoxHighlightedItemBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ListBoxHighlightedItemBehavior.cs
index a6aefaa2d1..0efd26a573 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ListBoxHighlightedItemBehavior.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ListBoxHighlightedItemBehavior.cs
@@ -6,7 +6,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Extensions;
 
 namespace Xenko.Core.Assets.Editor.View.Behaviors
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs
index 47f3dfa729..bd74af4457 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/PropertyViewAutoExpandNodesBehavior.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Assets.Editor.Quantum.NodePresenters.Keys;
 using Xenko.Core;
 using Xenko.Core.Extensions;
@@ -21,14 +21,15 @@ namespace Xenko.Core.Assets.Editor.View.Behaviors
     public class PropertyViewAutoExpandNodesBehavior : Behavior<PropertyView>
     {
         private readonly List<PropertyViewItem> expandedItems = new List<PropertyViewItem>();
-        private readonly HashSet<string> expandedPropertyPaths = new HashSet<string>();
-        private readonly HashSet<string> collapsedPropertyPaths = new HashSet<string>();
+        // These are static so that we remember their state for the entire session.
+        private static readonly HashSet<string> expandedPropertyPaths = new HashSet<string>();
+        private static readonly HashSet<string> collapsedPropertyPaths = new HashSet<string>();
 
         /// <summary>
         /// Identifies the <see cref="ViewModel"/> dependency property.
         /// </summary>
         public static readonly DependencyProperty ViewModelProperty = DependencyProperty.Register(nameof(ViewModel), typeof(GraphViewModel), typeof(PropertyViewAutoExpandNodesBehavior), new PropertyMetadata(null, OnViewModelChanged));
-        
+
         /// <summary>
         /// Gets or sets the <see cref="GraphViewModel"/> associated to this behavior.
         /// </summary>
@@ -166,27 +167,37 @@ private void ExpandSingleProperties(PropertyViewItem item)
                         item.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, false);
                         break;
                     case ExpandRule.Once:
-                        // Expand nodes that have this rule only if they have never been collapsed previously
-                        var propertyPath = GetNode(item).DisplayPath;
-                        if (!collapsedPropertyPaths.Contains(propertyPath))
                         {
-                            item.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, true);
-                            break;
+                            // Expand nodes that have this rule only if they have never been collapsed previously
+                            var propertyPath = GetNode(item).DisplayPath;
+                            if (!collapsedPropertyPaths.Contains(propertyPath))
+                            {
+                                item.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, true);
+                                break;
+                            }
                         }
                         goto default;
                     default:
-                        // If the node is an only child, let's expand it
-                        if (node.Parent.Children.Count == 1)
-                        {
-                            item.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, true);
-                            // And keep a track of it, in case it has some siblings incoming
-                            expandedItems.Add(item);
-                        }
-                        else
                         {
-                            // If one of its siblings has been expanded because it was an only child at the time it was created, let's unexpand it.
-                            // This will prevent to always have the first item expanded since the property items are generated as soon as a child is added.
-                            expandedItems.Where(x => GetNode(x).Parent == node.Parent).ForEach(x => x.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, false));
+                            // If the node was saved as expanded, persist this behavior
+                            var propertyPath = GetNode(item).DisplayPath;
+                            if (expandedPropertyPaths.Contains(propertyPath))
+                            {
+                                item.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, true);
+                            }
+                            else if (node.Parent.Children.Count == 1)
+                            {
+                                // If the node is an only child, let's expand it
+                                item.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, true);
+                                // And keep a track of it, in case it has some siblings incoming
+                                expandedItems.Add(item);
+                            }
+                            else
+                            {
+                                // If one of its siblings has been expanded because it was an only child at the time it was created, let's unexpand it.
+                                // This will prevent to always have the first item expanded since the property items are generated as soon as a child is added.
+                                expandedItems.Where(x => GetNode(x).Parent == node.Parent).ForEach(x => x.SetCurrentValue(ExpandableItemsControl.IsExpandedProperty, false));
+                            }
                         }
                         break;
                 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/TreeViewAutoExpandBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/TreeViewAutoExpandBehavior.cs
index f64a57f225..0853b52a54 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/TreeViewAutoExpandBehavior.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/TreeViewAutoExpandBehavior.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Assets.Editor.ViewModel;
 using Xenko.Core.Extensions;
 using Xenko.Core.Presentation.Controls;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ValidateTextBoxAfterSlidingBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ValidateTextBoxAfterSlidingBehavior.cs
index 4e530e610b..5d41fba29a 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ValidateTextBoxAfterSlidingBehavior.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/ValidateTextBoxAfterSlidingBehavior.cs
@@ -5,7 +5,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 using Xenko.Core.Presentation.Extensions;
 
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridBindableSelectedItemsBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridBindableSelectedItemsBehavior.cs
deleted file mode 100644
index 49344c751a..0000000000
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridBindableSelectedItemsBehavior.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Core.Presentation.Behaviors;
-
-using Xceed.Wpf.DataGrid;
-
-namespace Xenko.Core.Assets.Editor.View.Behaviors
-{
-    public class XceedDataGridBindableSelectedItemsBehavior : BindableSelectedItemsBehavior<DataGridControl>
-    {
-        protected override void OnAttached()
-        {
-            SelectedItemsInAssociatedObject = AssociatedObject.SelectedItems;
-            AssociatedObject.SelectionChanged += XceedDataGridSelectionChanged;
-            base.OnAttached();
-        }
-
-        protected override void OnDetaching()
-        {
-            base.OnDetaching();
-            AssociatedObject.SelectionChanged -= XceedDataGridSelectionChanged;
-            SelectedItemsInAssociatedObject = AssociatedObject.SelectedItems;
-        }
-
-        protected override void ScrollIntoView(object dataItem)
-        {
-            AssociatedObject.BringItemIntoView(dataItem);
-        }
-
-        private void XceedDataGridSelectionChanged(object sender, DataGridSelectionChangedEventArgs e)
-        {
-            foreach (var selectionInfo in e.SelectionInfos)
-            {
-                ControlSelectionChanged(selectionInfo.AddedItems, selectionInfo.RemovedItems);
-            }
-        }
-    }
-}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridResizableColumnsBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridResizableColumnsBehavior.cs
deleted file mode 100644
index 625e8fb398..0000000000
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridResizableColumnsBehavior.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-
-using Xenko.Core.Extensions;
-using Xenko.Core.Presentation.Behaviors;
-using Xenko.Core.Presentation.Extensions;
-
-using Xceed.Wpf.DataGrid;
-
-namespace Xenko.Core.Assets.Editor.View.Behaviors
-{
-    /// <summary>
-    /// This behavior allows to have resizable columns in a <see cref="DataGridControl"/> while being able to define default widths using star notation.
-    /// It also prevent the columns do be resized below the viewport width
-    /// </summary>
-    public class XceedDataGridResizableColumnsBehavior : DeferredBehaviorBase<DataGridControl>
-    {
-        private ScrollContentPresenter scrollContentPresenter;
-        private bool updatingColumns;
-        private bool itemsSourceChanged;
-        private bool initialized;
-
-        protected override void OnAttachedAndLoaded()
-        {
-            base.OnAttachedAndLoaded();
-
-            AssociatedObject.Columns.ForEach(x => x.Width = x.ActualWidth);
-
-            scrollContentPresenter = AssociatedObject.FindVisualChildOfType<ScrollContentPresenter>();
-
-            // This occurs when closing a session - it is harmless to ignore it in this case
-            if (scrollContentPresenter == null)
-                return;
-
-            AssociatedObject.ItemsSourceChangeCompleted += ItemsSourceChanged;
-            AssociatedObject.LayoutUpdated += LayoutUpdated;
-            AssociatedObject.SizeChanged += SizeChanged;
-            itemsSourceChanged = true;
-            // Prevent the selection of the first item
-            AssociatedObject.SelectedItems.Clear();
-            initialized = true;
-        }
-
-        protected override void OnDetachingAndUnloaded()
-        {
-            if (initialized)
-            {
-                var columnManagerRow = AssociatedObject.FindVisualChildOfType<ColumnManagerRow>();
-                if (columnManagerRow != null)
-                {
-                    var cells = columnManagerRow.FindVisualChildrenOfType<ColumnManagerCell>();
-                    cells.ForEach(x => x.SizeChanged -= ColumnSizeChanged);
-                    AssociatedObject.SizeChanged -= SizeChanged;
-                }
-            }
-            base.OnDetachingAndUnloaded();
-        }
-
-        private void ItemsSourceChanged(object sender, EventArgs e)
-        {
-            // cells update is defered to after the next layout update
-            itemsSourceChanged = true;
-            // Prevent the selection of the first item
-            AssociatedObject.SelectedItems.Clear();
-        }
-
-        private void LayoutUpdated(object sender, EventArgs e)
-        {
-            if (itemsSourceChanged)
-            {
-                var columnManagerRow = AssociatedObject.FindVisualChildOfType<ColumnManagerRow>();
-                if (columnManagerRow != null)
-                {
-                    var cells = columnManagerRow.FindVisualChildrenOfType<ColumnManagerCell>();
-                    cells.ForEach(x => x.SizeChanged += ColumnSizeChanged);
-                }
-                itemsSourceChanged = false;
-            }
-        }
-
-        private void ColumnSizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (updatingColumns)
-                return;
-
-            updatingColumns = true;
-
-            double total = AssociatedObject.Columns.Sum(x => x.ActualWidth);
-            if (total < scrollContentPresenter.ActualWidth)
-            {
-                foreach (var column in AssociatedObject.Columns)
-                {
-                    column.Width = column.ActualWidth * scrollContentPresenter.ActualWidth / total;
-                }
-            }
-
-            updatingColumns = false;
-        }
-
-        private void SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            double total = AssociatedObject.Columns.Sum(x => x.ActualWidth);
-            var offset = e.NewSize.Width - e.PreviousSize.Width;
-            foreach (var column in AssociatedObject.Columns)
-            {
-                column.Width = column.ActualWidth * (total + offset) / total;
-            }
-        }
-    }
-}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridThumbnailPrioritizationBehavior.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridThumbnailPrioritizationBehavior.cs
deleted file mode 100644
index 1febb52b4a..0000000000
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Behaviors/XceedDataGridThumbnailPrioritizationBehavior.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Linq;
-using System.Windows.Controls;
-
-using Xenko.Core.Assets.Editor.ViewModel;
-using Xenko.Core.Extensions;
-using Xenko.Core.Presentation.Behaviors;
-using Xenko.Core.Presentation.Extensions;
-
-using Xceed.Wpf.DataGrid;
-using Xceed.Wpf.DataGrid.Views;
-
-namespace Xenko.Core.Assets.Editor.View.Behaviors
-{
-    public class XceedDataGridThumbnailPrioritizationBehavior : DeferredBehaviorBase<DataGridControl>
-    {
-        private TableViewScrollViewer scrollViewer;
-
-        protected override void OnAttachedAndLoaded()
-        {
-            scrollViewer = AssociatedObject.FindVisualChildOfType<TableViewScrollViewer>();
-            scrollViewer.ScrollChanged += ScrollChanged;
-            base.OnAttachedAndLoaded();
-        }
-
-        protected override void OnDetachingAndUnloaded()
-        {
-            scrollViewer.ScrollChanged -= ScrollChanged;
-            scrollViewer = null;
-            base.OnDetachingAndUnloaded();
-        }
-
-        private void ScrollChanged(object sender, ScrollChangedEventArgs e)
-        {
-            var session = AssociatedObject.ItemsSource?.Cast<ISessionObjectViewModel>().FirstOrDefault()?.Session;
-            if (session == null)
-                return;
-
-            var visibleAssets = AssociatedObject.FindVisualChildrenOfType<DataRow>().NotNull().Select(x => x.DataContext).OfType<AssetViewModel>().Where(x => x != null);
-            session.Thumbnails.IncreaseThumbnailPriority(visibleAssets);
-        }
-    }
-}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/CommonResources.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/CommonResources.xaml
index 36141887c3..601dd02f08 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/CommonResources.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/CommonResources.xaml
@@ -3,17 +3,31 @@
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
+                    xmlns:themes="clr-namespace:Xenko.Core.Presentation.Themes;assembly=Xenko.Core.Presentation"
                     xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View"
                     xmlns:viewModel="clr-namespace:Xenko.Core.Assets.Editor.ViewModel"
                     xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
                     mc:Ignorable="d">
 
   <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
-    <ResourceDictionary Source="ImageDictionary.xaml"/>
-    <ResourceDictionary Source="../Themes/ExpressionDark/TableflowView.ExpressionDark.normalcolor.xaml"/>
+    <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ThemeSelector.xaml" />
+    <ResourceDictionary Source="ImageDictionary.xaml" />
+    <ResourceDictionary Source="../Themes/ThemeSelector.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
+  <Style TargetType="view:DataGridEx">
+    <Setter Property="Background" Value="{StaticResource NormalBrush}" />
+  </Style>
+  <Style TargetType="DataGridRow">
+    <Setter Property="Background" Value="{StaticResource NormalBrush}" />
+  </Style>
+  <Style TargetType="DataGridCell">
+    <Setter Property="Background" Value="{StaticResource NormalBrush}" />
+  </Style>
+  <Style TargetType="DataGridColumnHeader">
+    <Setter Property="Background" Value="{StaticResource WindowBackgroundBrush}" />
+  </Style>
+
   <SolidColorBrush x:Key="EmphasisColorBrush" Color="#316B8F"/>
 
   <!-- STYLE USED FOR TOOLBAR BUTTONS -->
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/Controls/GridLogViewer.cs b/sources/editor/Xenko.Core.Assets.Editor/View/Controls/GridLogViewer.cs
index a1e8c6a66c..05f0d8e4d4 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/Controls/GridLogViewer.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/Controls/GridLogViewer.cs
@@ -2,6 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -12,36 +14,20 @@
 using Xenko.Core.Assets.Diagnostics;
 using Xenko.Core.Assets.Editor.ViewModel;
 using Xenko.Core.Diagnostics;
-
-using Xceed.Wpf.DataGrid;
+using Xenko.Core.Presentation.Collections;
 
 namespace Xenko.Core.Assets.Editor.View.Controls
 {
     /// <summary>
     /// This control displays a collection of <see cref="ILogMessage"/> in a grid.
     /// </summary>
-    [TemplatePart(Name = "PART_LogGridView", Type = typeof(DataGridControl))]
-    [TemplatePart(Name = "PART_PreviousResult", Type = typeof(ButtonBase))]
-    [TemplatePart(Name = "PART_NextResult", Type = typeof(ButtonBase))]
-    [TemplatePart(Name = "PART_GridLogViewerCollectionSourceContainer", Type = typeof(FrameworkElement))]   
+    [TemplatePart(Name = "PART_LogGridView", Type = typeof(DataGridEx))]
     public class GridLogViewer : Control
     {
-        private int currentResult;
-
         /// <summary>
         /// The <see cref="DataGridControl"/> used to display log messages.
         /// </summary>
-        private DataGridControl logGridView;
-
-        /// <summary>
-        /// The <see cref="ButtonBase"/> used to navigate to the previous search result.
-        /// </summary>
-        private ButtonBase previousResultButton;
-
-        /// <summary>
-        /// The <see cref="ButtonBase"/> used to navigate to the next search result.
-        /// </summary>
-        private ButtonBase nextResultButton;
+        private DataGridEx logGridView;
 
         static GridLogViewer()
         {
@@ -51,38 +37,13 @@ static GridLogViewer()
         /// <summary>
         /// Identifies the <see cref="LogMessages"/> dependency property.
         /// </summary>
-        public static readonly DependencyProperty LogMessagesProperty = DependencyProperty.Register("LogMessages", typeof(ICollection<ILogMessage>), typeof(GridLogViewer), new PropertyMetadata(null));
+        public static readonly DependencyProperty LogMessagesProperty = DependencyProperty.Register("LogMessages", typeof(ObservableList<ILogMessage>), typeof(GridLogViewer), new PropertyMetadata(null, LogMessagesPropertyChanged));
 
         /// <summary>
         /// Identifies the <see cref="IsToolBarVisible"/> dependency property.
         /// </summary>
         public static readonly DependencyProperty IsToolBarVisibleProperty = DependencyProperty.Register("IsToolBarVisible", typeof(bool), typeof(GridLogViewer), new PropertyMetadata(true));
 
-        /// <summary>
-        /// Identifies the <see cref="CanFilterLog"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty CanFilterLogProperty = DependencyProperty.Register("CanFilterLog", typeof(bool), typeof(GridLogViewer), new PropertyMetadata(true));
-
-        /// <summary>
-        /// Identifies the <see cref="CanSearchLog"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty CanSearchLogProperty = DependencyProperty.Register("CanSearchLog", typeof(bool), typeof(GridLogViewer), new PropertyMetadata(true));
-
-        /// <summary>
-        /// Identifies the <see cref="SearchToken"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty SearchTokenProperty = DependencyProperty.Register("SearchToken", typeof(string), typeof(GridLogViewer), new PropertyMetadata("", SearchTokenChanged));
-
-        /// <summary>
-        /// Identifies the <see cref="SearchMatchCase"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty SearchMatchCaseProperty = DependencyProperty.Register("SearchMatchCase", typeof(bool), typeof(GridLogViewer), new PropertyMetadata(false, SearchTokenChanged));
-
-        /// <summary>
-        /// Identifies the <see cref="SearchMatchWord"/> dependency property.
-        /// </summary>
-        public static readonly DependencyProperty SearchMatchWordProperty = DependencyProperty.Register("SearchMatchWord", typeof(bool), typeof(GridLogViewer), new PropertyMetadata(false, SearchTokenChanged));
-
         /// <summary>
         /// Identifies the <see cref="ShowDebugMessages"/> dependency property.
         /// </summary>
@@ -126,38 +87,31 @@ static GridLogViewer()
         /// <summary>
         /// Gets or sets the collection of <see cref="ILogMessage"/> to display.
         /// </summary>
-        public ICollection<ILogMessage> LogMessages { get { return (ICollection<ILogMessage>)GetValue(LogMessagesProperty); } set { SetValue(LogMessagesProperty, value); } }
+        public ObservableList<ILogMessage> LogMessages
+        {
+            get { return (ObservableList<ILogMessage>)GetValue(LogMessagesProperty); }
+            set
+            {
+                var prevList = LogMessages;
+                if (prevList != null)
+                {
+                    prevList.CollectionChanged -= OnLogMessagesCollectionChanged;
+                }
+                SetValue(LogMessagesProperty, value);
+                if (value != null)
+                {
+                    value.CollectionChanged += OnLogMessagesCollectionChanged;
+                }
+            }
+        }
+
+        public ObservableList<ILogMessage> FilteredLogMessages { get; set; } = new ObservableList<ILogMessage>();
 
         /// <summary>
         /// Gets or sets whether the tool bar should be visible.
         /// </summary>
         public bool IsToolBarVisible { get { return (bool)GetValue(IsToolBarVisibleProperty); } set { SetValue(IsToolBarVisibleProperty, value); } }
 
-        /// <summary>
-        /// Gets or sets whether it is possible to filter the log text.
-        /// </summary>
-        public bool CanFilterLog { get { return (bool)GetValue(CanFilterLogProperty); } set { SetValue(CanFilterLogProperty, value); } }
-
-        /// <summary>
-        /// Gets or sets whether it is possible to search the log text.
-        /// </summary>
-        public bool CanSearchLog { get { return (bool)GetValue(CanSearchLogProperty); } set { SetValue(CanSearchLogProperty, value); } }
-
-        /// <summary>
-        /// Gets or sets the current search token.
-        /// </summary>
-        public string SearchToken { get { return (string)GetValue(SearchTokenProperty); } set { SetValue(SearchTokenProperty, value); } }
-
-        /// <summary>
-        /// Gets or sets whether the search result should match the case.
-        /// </summary>
-        public bool SearchMatchCase { get { return (bool)GetValue(SearchMatchCaseProperty); } set { SetValue(SearchMatchCaseProperty, value); } }
-
-        /// <summary>
-        /// Gets or sets whether the search result should match whole words only.
-        /// </summary>
-        public bool SearchMatchWord { get { return (bool)GetValue(SearchMatchWordProperty); } set { SetValue(SearchMatchWordProperty, value); } }
-
         /// <summary>
         /// Gets or sets whether the log viewer should display debug messages.
         /// </summary>
@@ -203,35 +157,11 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
 
-            logGridView = GetTemplateChild("PART_LogGridView") as DataGridControl;
+            logGridView = GetTemplateChild("PART_LogGridView") as DataGridEx;
             if (logGridView == null)
                 throw new InvalidOperationException("A part named 'PART_LogGridView' must be present in the ControlTemplate, and must be of type 'DataGridControl'.");
 
-            previousResultButton = GetTemplateChild("PART_PreviousResult") as ButtonBase;
-            if (previousResultButton == null)
-                throw new InvalidOperationException("A part named 'PART_PreviousResult' must be present in the ControlTemplate, and must be of type 'ButtonBase'.");
-
-            nextResultButton = GetTemplateChild("PART_NextResult") as ButtonBase;
-            if (nextResultButton == null)
-                throw new InvalidOperationException("A part named 'PART_NextResult' must be present in the ControlTemplate, and must be of type 'ButtonBase'.");
-
-            var sourceContainer = GetTemplateChild("PART_GridLogViewerCollectionSourceContainer") as FrameworkElement;
-            if (sourceContainer == null)
-                throw new InvalidOperationException("A part named 'PART_GridLogViewerCollectionSourceContainer' must be present in the ControlTemplate, and must be of type 'FrameworkElement'.");
-
-            var source = sourceContainer.Resources["GridLogViewerCollectionSource"];
-            if (!(source is DataGridCollectionViewSourceBase))
-                throw new InvalidOperationException("The 'PART_GridLogViewerCollectionSourceContainer' must be contain a 'GridLogViewerCollectionSource' resource that is the source of the collection view for the DataGridControl.");
-
-            ((DataGridCollectionViewSourceBase)source).Filter += FilterHandler;
             logGridView.MouseDoubleClick += GridMouseDoubleClick;
-            previousResultButton.Click += PreviousResultClicked;
-            nextResultButton.Click += NextResultClicked;
-        }
-
-        private void FilterHandler(object value, FilterEventArgs e)
-        {
-            e.Accepted = FilterMethod(e.Item);
         }
 
         private void GridMouseDoubleClick(object sender, MouseButtonEventArgs e)
@@ -254,125 +184,45 @@ private void GridMouseDoubleClick(object sender, MouseButtonEventArgs e)
                 if (asset != null)
                     Session.ActiveAssetView.SelectAssetCommand.Execute(asset);
             }
-        }
 
-        private void SelectFirstOccurrence()
-        {
-            currentResult = 0;
-            var token = SearchToken;
-            if (!string.IsNullOrEmpty(token))
-            {
-                var message = LogMessages.FirstOrDefault(Match);
-                logGridView.SelectedItem = message;
-                if (message != null)
-                {
-                    logGridView.BringItemIntoView(message);
-                }
-            }
         }
 
-        private void SelectPreviousOccurrence()
+        private static void LogMessagesPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var token = SearchToken;
-            if (!string.IsNullOrEmpty(token))
-            {
-                var message = FindPreviousMessage();
-                logGridView.SelectedItem = message;
-                if (message != null)
-                {
-                    logGridView.BringItemIntoView(message);
-                }
-                else
-                    logGridView.SelectedItem = null;
-            }
-        }
+            var logViewer = (GridLogViewer)d;
 
-        private void SelectNextOccurrence()
-        {
-            var token = SearchToken;
-            if (!string.IsNullOrEmpty(token))
+            if (e.OldValue is ObservableList<ILogMessage> prevList)
             {
-                var message = FindNextMessage();
-                logGridView.SelectedItem = message;
-                if (message != null)
-                {
-                    logGridView.BringItemIntoView(message);
-                }
+                prevList.CollectionChanged -= logViewer.OnLogMessagesCollectionChanged;
             }
-        }
-
-        private ILogMessage FindPreviousMessage()
-        {
-            int count = 0;
-            ILogMessage lastMessage = null;
-            --currentResult;
-            foreach (var message in LogMessages.Where(Match))
+            if (e.NewValue is ObservableList<ILogMessage> newList)
             {
-                lastMessage = message;
-
-                if (count == currentResult)
-                {
-                    return message;
-                }
-                ++count;
+                newList.CollectionChanged += logViewer.OnLogMessagesCollectionChanged;
             }
-            currentResult = Math.Max(0, count - 1);
-            return lastMessage;
         }
 
-        private ILogMessage FindNextMessage()
+        private void OnLogMessagesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
-            int count = 0;
-            ILogMessage firstMessage = null;
-            ++currentResult;
-            foreach (var message in LogMessages.Where(Match))
-            {
-                if (firstMessage == null)
-                    firstMessage = message;
+            if (logGridView == null || logGridView.ItemsSource == null || LogMessages == null)
+                return;
 
-                if (count == currentResult)
-                {
-                    return message;
-                }
-                ++count;
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                FilteredLogMessages.Clear();
             }
-            currentResult = 0;
-            return firstMessage;
-        }
-
-        private bool Match(ILogMessage message)
-        {
-            if (Match(message.Text))
-                return true;
+            else
+            {
+                // Only apply filter if there's any new displayable messages
+                bool refreshFilter = false;
+                if (e.OldItems != null)
+                    refreshFilter = e.OldItems.OfType<ILogMessage>().Any(IsMessageVisible);
 
-            var assetMessage = message as AssetSerializableLogMessage;
-            return assetMessage != null && Match(assetMessage.AssetUrl.FullPath);
-        }
+                if (!refreshFilter && e.NewItems != null)
+                    refreshFilter = e.NewItems.OfType<ILogMessage>().Any(IsMessageVisible);
 
-        private bool Match(string text)
-        {
-            var token = SearchToken;
-            var stringComparison = SearchMatchCase ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase;
-            int index = text.IndexOf(token, stringComparison);
-            if (index < 0)
-                return false;
-
-            if (SearchMatchWord && text.Length > 1)
-            {
-                if (index > 0)
-                {
-                    char c = text[index - 1];
-                    if (char.IsLetterOrDigit(c))
-                        return false;
-                }
-                if (index + token.Length < text.Length)
-                {
-                    char c = text[index + token.Length];
-                    if (char.IsLetterOrDigit(c))
-                        return false;
-                }
+                if (refreshFilter)
+                    ApplyFilters();
             }
-            return true;
         }
 
         private static void FilterPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
@@ -381,46 +231,23 @@ private static void FilterPropertyChanged(DependencyObject d, DependencyProperty
             logViewer.ApplyFilters();
         }
 
-        /// <summary>
-        /// Raised when the <see cref="SearchToken"/> property is changed.
-        /// </summary>
-        private static void SearchTokenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var logViewer = (GridLogViewer)d;
-            logViewer.SelectFirstOccurrence();
-        }
-
-        private void PreviousResultClicked(object sender, RoutedEventArgs e)
-        {
-            SelectPreviousOccurrence();
-        }
-
-        private void NextResultClicked(object sender, RoutedEventArgs e)
-        {
-            SelectNextOccurrence();
-        }
-
         private void ApplyFilters()
         {
-            if (logGridView == null || logGridView.ItemsSource == null)
+            if (logGridView == null || logGridView.ItemsSource == null || LogMessages == null)
                 return;
 
-            if (!(logGridView.ItemsSource is DataGridCollectionView))
-                throw new InvalidOperationException("The item source of the part 'PART_LogGridView' must be a 'DataGridCollectionView'.");
-
-            var view = (DataGridCollectionView)logGridView.ItemsSource;
-            view.Refresh();
+            FilteredLogMessages.Clear();
+            FilteredLogMessages.AddRange(LogMessages.Where(IsMessageVisible));
         }
 
-        private bool FilterMethod(object msg)
+        private bool IsMessageVisible(ILogMessage x)
         {
-            var message = (ILogMessage)msg;
-            return (ShowDebugMessages && message.Type == LogMessageType.Debug)
-                 || (ShowVerboseMessages && message.Type == LogMessageType.Verbose)
-                 || (ShowInfoMessages && message.Type == LogMessageType.Info)
-                 || (ShowWarningMessages && message.Type == LogMessageType.Warning)
-                 || (ShowErrorMessages && message.Type == LogMessageType.Error)
-                 || (ShowFatalMessages && message.Type == LogMessageType.Fatal);
+            return x.IsDebug() && ShowDebugMessages
+                || x.IsError() && ShowErrorMessages
+                || x.IsFatal() && ShowFatalMessages
+                || x.IsInfo() && ShowInfoMessages
+                || x.IsVerbose() && ShowVerboseMessages
+                || x.IsWarning() && ShowWarningMessages;
         }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/DataGridEx.cs b/sources/editor/Xenko.Core.Assets.Editor/View/DataGridEx.cs
index 7b3f26f8f2..3ba586eb5e 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/DataGridEx.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/DataGridEx.cs
@@ -11,10 +11,16 @@
 using Xenko.Core.Extensions;
 using Xenko.Core.Presentation.Extensions;
 
-using Xceed.Wpf.DataGrid;
-
 namespace Xenko.Core.Assets.Editor.View
 {
+    /// <summary>
+    /// Xenko generic wpf data grid. Left empty for future development on a generic datagrid.
+    /// </summary>
+    public class DataGridEx : DataGrid
+    {
+
+    }
+
     /// <summary>
     /// This class wraps the <see cref="TextSearch"/> class, making accessible all members that are required to make the feature work.
     /// <see cref="TextSearch"/> is massively internal, making this feature impossible to implement by default on custom controls.
@@ -95,14 +101,6 @@ public static string GetPrimaryTextPath(ItemsControl itemsControl)
 
         }
 
-        public static int FindMatchingPrefix(DataGridEx dataGridEx, string primaryTextPath, string prefix, string nextChar, int startItemIndex, bool lookForFallbackMatchToo, ref bool wasNewCharUsed)
-        {
-            var parameters = new object[] { dataGridEx, primaryTextPath, prefix, nextChar, startItemIndex, lookForFallbackMatchToo, wasNewCharUsed };
-            var result = (int)FindMatchingPrefixMethod.Invoke(null, parameters);
-            wasNewCharUsed = (bool)parameters[6];
-            return result;
-        }
-
         public void AddCharToPrefix(string nextChar)
         {
             AddCharToPrefixMethod.Invoke(textSearch, new object[] { nextChar });
@@ -113,70 +111,4 @@ public void ResetTimeout()
             ResetTimeoutMethod.Invoke(textSearch, new object[] { });
         }
     }
-
-    /// <summary>
-    /// An implementation of DataGrid class that inherits from Xceed DataGridControl and add support for <see cref="TextSearch"/>.
-    /// </summary>
-    public class DataGridEx : DataGridControl
-    {
-        /// <inheritdoc/>
-        protected override void OnTextInput(TextCompositionEventArgs e)
-        {
-            base.OnTextInput(e);
-            if (string.IsNullOrEmpty(e.Text) || !IsTextSearchEnabled || !Equals(e.Source, this) && !Equals(ItemsControlFromItemContainer(e.Source as DependencyObject), this))
-                return;
-
-            var textSearch = TextSearchWrapper.EnsureInstance(this);
-            if (textSearch == null)
-                return;
-
-            DoSearch(textSearch, e.Text);
-            e.Handled = true;
-        }
-
-        /// <summary>
-        /// This method reimplements DoSearch from <see cref="TextSearch"/>.
-        /// </summary>
-        /// <param name="textSearch"></param>
-        /// <param name="nextChar"></param>
-        private void DoSearch(TextSearchWrapper textSearch, string nextChar)
-        {
-            bool lookForFallbackMatchToo = false;
-            int startItemIndex = 0;
-            ItemCollection items = Items;
-            if (textSearch.IsActive)
-                startItemIndex = textSearch.MatchedItemIndex;
-            if (textSearch._charsEntered.Count > 0 && string.Compare(textSearch._charsEntered[textSearch._charsEntered.Count - 1], nextChar, true, TextSearchWrapper.GetCulture(this)) == 0)
-                lookForFallbackMatchToo = true;
-            string primaryTextPath = TextSearchWrapper.GetPrimaryTextPath(this);
-            bool wasNewCharUsed = false;
-            int matchingPrefix = TextSearchWrapper.FindMatchingPrefix(this, primaryTextPath, textSearch.Prefix, nextChar, startItemIndex, lookForFallbackMatchToo, ref wasNewCharUsed);
-            if (matchingPrefix != -1)
-            {
-                if (!textSearch.IsActive || matchingPrefix != startItemIndex)
-                {
-                    if (SelectedItem != items[matchingPrefix])
-                    {
-                        SelectedItem = items[matchingPrefix];
-                        BringItemIntoView(SelectedItem);
-                        UpdateLayout();
-                        var container = GetContainerFromItem(SelectedItem) as DataRow;
-                        if (container != null)
-                        {
-                            var cellToFocus = container.FindVisualChildrenOfType<DataCell>().FirstOrDefault(x => x.Focusable);
-                            if (cellToFocus != null)
-                                Keyboard.Focus(cellToFocus);
-                        }
-                    }
-                    textSearch.MatchedItemIndex = matchingPrefix;
-                }
-                if (wasNewCharUsed)
-                    textSearch.AddCharToPrefix(nextChar);
-                if (!textSearch.IsActive)
-                    textSearch.IsActive = true;
-            }
-            if (textSearch.IsActive)
-                textSearch.ResetTimeout();
-        }
-    }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml
index d2b96e7abd..ebc48fe896 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml
@@ -60,7 +60,7 @@
           <DataTrigger Binding="{Binding Registered}" Value="False">
             <Setter Property="Foreground" TargetName="TextBlock" Value="Red"/>
           </DataTrigger>
-          <DataTrigger Binding="{Binding Index}" Value="{x:Static q:Index.Empty}">
+          <DataTrigger Binding="{Binding Index}" Value="{x:Static q:NodeIndex.Empty}">
             <Setter Property="Text" TargetName="IndexRun" Value=""/>
           </DataTrigger>
           <DataTrigger Binding="{Binding ItemId}" Value="{x:Null}">
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml.cs b/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml.cs
index cdddc89d9c..be7d117ff7 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugAssetNodesUserControl.xaml.cs
@@ -74,11 +74,11 @@ public class DebugAssetChildNodeViewModel : DebugAssetNodeViewModel
         private readonly HashSet<IGraphNode> registeredNodes;
 
         public DebugAssetChildNodeViewModel(IViewModelServiceProvider serviceProvider, IGraphNode node, HashSet<IGraphNode> registeredNodes)
-            : this(serviceProvider, node, Index.Empty, null, LinkRoot, registeredNodes)
+            : this(serviceProvider, node, NodeIndex.Empty, null, LinkRoot, registeredNodes)
         {
         }
 
-        private DebugAssetChildNodeViewModel(IViewModelServiceProvider serviceProvider, IGraphNode node, Index index, ItemId? itemId, string linkFromParent, HashSet<IGraphNode> registeredNodes)
+        private DebugAssetChildNodeViewModel(IViewModelServiceProvider serviceProvider, IGraphNode node, NodeIndex index, ItemId? itemId, string linkFromParent, HashSet<IGraphNode> registeredNodes)
             : base(serviceProvider, node)
         {
             this.registeredNodes = registeredNodes;
@@ -92,7 +92,7 @@ private DebugAssetChildNodeViewModel(IViewModelServiceProvider serviceProvider,
                 Base = new DebugAssetBaseNodeViewModel(serviceProvider, baseNode);
         }
 
-        public Index Index { get; }
+        public NodeIndex Index { get; }
 
         public ItemId? ItemId { get; }
 
@@ -114,7 +114,7 @@ protected List<DebugAssetNodeViewModel> UpdateChildren()
                 {
                     foreach (var child in objNode.Members)
                     {
-                        list.Add(new DebugAssetChildNodeViewModel(ServiceProvider, child, Index.Empty, null, LinkChild, registeredNodes));
+                        list.Add(new DebugAssetChildNodeViewModel(ServiceProvider, child, NodeIndex.Empty, null, LinkChild, registeredNodes));
                     }
                 }
                 if (Node.IsReference)
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml
index eff19bd487..556b7848f9 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/DebugTools/DebugWindow.xaml
@@ -9,7 +9,7 @@
   <Window.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+        <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
         <ResourceDictionary Source="../ImageDictionary.xaml"/>
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
index cdc47ffc50..16010adb37 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/DefaultPropertyTemplateProviders.xaml
@@ -5,7 +5,7 @@
                     xmlns:view="clr-namespace:Xenko.Core.Presentation.Quantum.View;assembly=Xenko.Core.Presentation.Quantum"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:s="clr-namespace:System;assembly=mscorlib"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:math="clr-namespace:Xenko.Core.Mathematics;assembly=Xenko.Core.Mathematics"
                     xmlns:pvdr="clr-namespace:Xenko.Core.Assets.Editor.View.TemplateProviders"
                     xmlns:cvt="clr-namespace:Xenko.Core.Assets.Editor.View.ValueConverters"
@@ -457,6 +457,112 @@
     </DataTemplate>
   </pvdr:ListTemplateProvider>
 
+  <!-- Provider for array items: a ContentControl for the item itself -->
+  <pvdr:ArrayItemTemplateProvider x:Key="ArrayItemPropertyTemplateProvider" OverrideRule="Most" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+    <DataTemplate>
+      <DockPanel>
+        <ContentControl Content="{Binding}" ContentTemplateSelector="{x:Static edvw:PropertyViewHelper.EditorProviders}"/>
+      </DockPanel>
+    </DataTemplate>
+  </pvdr:ArrayItemTemplateProvider>
+
+  <!-- Provider for array: Button to add an entry, TextBlock to describe the array -->
+  <pvdr:ArrayTemplateProvider x:Key="ArrayPropertyTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+    <DataTemplate DataType="qvm:NodeViewModel">
+      <DockPanel>
+        <TextBlock Margin="2">
+          <Run Text="{xk:Localize Array}"/> -
+          <Run Text="{xk:Localize {}{0} item, Plural={}{0} items, Count={Binding Children.Count, Mode=OneWay}, IsStringFormat=True}"/>
+        </TextBlock>
+      </DockPanel>
+    </DataTemplate>
+  </pvdr:ArrayTemplateProvider>
+
+  <!-- Provider for array -->
+  <pvdr:ArrayTemplateProvider x:Key="ArrayPropertyFooterTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyFooter">
+    <DataTemplate DataType="qvm:NodeViewModel">
+      <Grid x:Name="Grid" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="{StaticResource BackgroundBrush}"
+            Visibility="{xk:MultiBinding {Binding IsVisible}, {Binding VisibleChildrenCount, Converter={xk:IsGreater}, ConverterParameter={xk:Int 0}},
+                                           Converter={xk:MultiChained {xk:AndMultiConverter}, {xk:VisibleOrCollapsed}}, FallbackValue={xk:Collapsed}}">
+        <Grid.ColumnDefinitions>
+          <!-- Parameters of the SumNum converters used here must be the total width of fixed columns + MinWidths of sizable columns: 8+5+64=77 -->
+          <ColumnDefinition Width="8"/>
+          <ColumnDefinition Width="{Binding NameColumnSize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xk:PropertyView}}, Mode=TwoWay}"
+                            MaxWidth="{Binding ActualWidth, ElementName=Grid, Converter={xk:SumNum}, ConverterParameter={xk:Double -77}}" MinWidth="64"/>
+          <ColumnDefinition Width="5"/>
+          <ColumnDefinition Width="*" MaxWidth="{Binding ActualWidth, ElementName=Grid, Converter={xk:SumNum}, ConverterParameter={xk:Double -77}}" MinWidth="64"/>
+        </Grid.ColumnDefinitions>
+        <GridSplitter Grid.Column="2" ResizeBehavior="PreviousAndNext" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent"/>
+      </Grid>
+    </DataTemplate>
+  </pvdr:ArrayTemplateProvider>
+  
+  <!-- Provider for set: Button to add an entry, TextBlock to describe the collection -->
+  <pvdr:SetTemplateProvider x:Key="SetPropertyTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+    <DataTemplate DataType="qvm:NodeViewModel">
+      <DockPanel>
+        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" VerticalAlignment="Center">
+          <Button Style="{StaticResource AddNewItemButtonStyle}"/>
+          <ComboBox x:Name="InstanceTypeSelectionComboBox" Style="{StaticResource AddItemComboBox}" ItemsSource="{Binding AbstractNodeMatchingEntries}">
+            <i:Interaction.Behaviors>
+              <behaviors:OnComboBoxClosedWithSelectionBehavior Command="{Binding AddNewItem}" CommandParameter="{Binding SelectedItem, ElementName=InstanceTypeSelectionComboBox}"/>
+            </i:Interaction.Behaviors>
+          </ComboBox>
+        </StackPanel>
+        <TextBlock Margin="2">
+          <Run Text="{xk:Localize Set}"/> -
+          <Run Text="{xk:Localize {}{0} item, Plural={}{0} items, Count={Binding Children.Count, Mode=OneWay}, IsStringFormat=True}"/>
+        </TextBlock>
+      </DockPanel>
+    </DataTemplate>
+  </pvdr:SetTemplateProvider>
+
+  <!-- Provider for set: Button to add an entry, in the footer -->
+  <pvdr:SetTemplateProvider x:Key="SetPropertyFooterTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyFooter">
+    <DataTemplate DataType="qvm:NodeViewModel">
+      <Grid x:Name="Grid" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Background="{StaticResource BackgroundBrush}"
+            Visibility="{xk:MultiBinding {Binding IsVisible}, {Binding HasCommand_AddNewItem}, {Binding HasSet},
+                                           {Binding VisibleChildrenCount, Converter={xk:IsGreater}, ConverterParameter={xk:Int 0}},
+                                           Converter={xk:MultiChained {xk:AndMultiConverter}, {xk:VisibleOrCollapsed}}, FallbackValue={xk:Collapsed}}">
+        <Grid.ColumnDefinitions>
+          <!-- Parameters of the SumNum converters used here must be the total width of fixed columns + MinWidths of sizable columns: 8+5+64=77 -->
+          <ColumnDefinition Width="8"/>
+          <ColumnDefinition Width="{Binding NameColumnSize, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type xk:PropertyView}}, Mode=TwoWay}"
+                            MaxWidth="{Binding ActualWidth, ElementName=Grid, Converter={xk:SumNum}, ConverterParameter={xk:Double -77}}" MinWidth="64"/>
+          <ColumnDefinition Width="5"/>
+          <ColumnDefinition Width="*" MaxWidth="{Binding ActualWidth, ElementName=Grid, Converter={xk:SumNum}, ConverterParameter={xk:Double -77}}" MinWidth="64"/>
+        </Grid.ColumnDefinitions>
+
+        <Border Grid.Column="1" MinHeight="23" Margin="2">
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" MinWidth="{Binding Offset, RelativeSource={RelativeSource AncestorType=xk:PropertyViewItem}, Mode=OneWay}"/>
+              <ColumnDefinition Width="16"/>
+              <ColumnDefinition Width="*"/>
+              <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <Grid Grid.Column="2" Margin="0,2,5,2" VerticalAlignment="Center">
+              <DockPanel>
+                <!-- Concrete type -->
+                <Button DockPanel.Dock="Right" Style="{StaticResource AddNewItemButtonStyle}"/>
+                <!-- Abstract type -->
+                <ComboBox DockPanel.Dock="Right" x:Name="InstanceTypeSelectionComboBox" Style="{StaticResource AddItemComboBox}"
+                          ItemsSource="{Binding AbstractNodeMatchingEntries}" Margin="2,0">
+                  <i:Interaction.Behaviors>
+                    <behaviors:OnComboBoxClosedWithSelectionBehavior Command="{Binding AddNewItem}" CommandParameter="{Binding SelectedItem, ElementName=InstanceTypeSelectionComboBox}"/>
+                  </i:Interaction.Behaviors>
+                </ComboBox>
+                <TextBlock Text="{Binding DisplayName, StringFormat={xk:Localize Add to {0}}}" TextTrimming="CharacterEllipsis" FontStyle="Italic"/>
+              </DockPanel>
+            </Grid>
+          </Grid>
+        </Border>
+        <GridSplitter Grid.Column="2" ResizeBehavior="PreviousAndNext" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent"/>
+      </Grid>
+    </DataTemplate>
+  </pvdr:SetTemplateProvider>
+
   <!-- Provider for dictionary: Button to add an entry, TextBlock to describe the collection -->
   <pvdr:DictionaryTemplateProvider x:Key="DictionaryTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
     <DataTemplate DataType="qvm:NodeViewModel">
@@ -533,6 +639,65 @@
     </DataTemplate>
   </pvdr:DictionaryStringKeyTemplateProvider>
 
+  <!-- Provider for dictionary with an Enum key: Button to add an entry, TextBlock to describe the collection -->
+  <pvdr:DictionaryEnumKeyTemplateProvider x:Key="DictionaryEnumKeyTemplateProvider" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
+    <pvdr:DictionaryEnumKeyTemplateProvider.OverriddenProviderNames>
+      <s:String>Dictionary</s:String>
+    </pvdr:DictionaryEnumKeyTemplateProvider.OverriddenProviderNames>
+    <DataTemplate DataType="qvm:NodeViewModel">
+      <DockPanel>
+        <ComboBox DockPanel.Dock="Right" Margin="2,0"
+                  Visibility="{xk:MultiBinding {Binding HasCommand_AddPrimitiveKey}, {Binding HasAssociatedData_ReadOnlyCollection, Converter={xk:InvertBool}},
+                                                 Converter={xk:MultiChained {xk:AndMultiConverter}, {xk:VisibleOrCollapsed}}, FallbackValue={xk:Collapsed}}">
+          <ComboBox.Template>
+            <ControlTemplate TargetType="{x:Type ComboBox}">
+              <Grid x:Name="grid">
+                <ToggleButton x:Name="ToggleButton" Width="16" Height="16" Background="Transparent"
+                              Focusable="false" ClickMode="Press"
+                              ToolTip="{xk:Localize Add a new entry to the dictionary, Context=ToolTip}" SnapsToDevicePixels="True"
+                              IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+                  <Image Source="{StaticResource ImageAdd}" Width="16" Height="16" Margin="-1"/>
+                </ToggleButton>
+                <Popup x:Name="Popup" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Left" AllowsTransparency="True"
+                       VerticalOffset="{Binding ActualHeight, RelativeSource={RelativeSource TemplatedParent}}"
+                       HorizontalOffset="{Binding ActualWidth, RelativeSource={RelativeSource TemplatedParent}}"
+                       PlacementTarget="{Binding ElementName=ToggleButton}" PopupAnimation="Slide">
+                  <DockPanel MaxHeight="{TemplateBinding MaxDropDownHeight}" SnapsToDevicePixels="True"
+                             Background="{DynamicResource ControlBackgroundBrush}" Margin="10">
+                    <TextBlock DockPanel.Dock="Left" Margin="8,0,0,0" VerticalAlignment="Center"
+                               Text="{xk:Localize Key name:}"/>
+                    <ComboBox Name="EnumKeySelectionComboBox" xk:FocusManager.IsFocused="{Binding IsOpen, ElementName=Popup}" Style="{StaticResource EnumComboBox}" ItemsSource="{Binding DictionaryNodeKeyType, Converter={xk:EnumValues}, Mode=OneWay}" SelectedItem="" MinWidth="60">
+                      <i:Interaction.Behaviors>
+                        <!-- After selecting an option add it to the dictionary -->
+                        <behaviors:OnComboBoxClosedWithSelectionBehavior Command="{Binding AddPrimitiveKey}" CommandParameter="{Binding SelectedItem, ElementName=EnumKeySelectionComboBox}"/>
+                      </i:Interaction.Behaviors>
+                      <i:Interaction.Triggers>
+                        <!-- After closing the drop down close the Popup -->
+                        <i:EventTrigger EventName="DropDownClosed">
+                          <i:ChangePropertyAction TargetName="ToggleButton" PropertyName="IsChecked" Value="False" />
+                        </i:EventTrigger>
+                      </i:Interaction.Triggers>
+                    </ComboBox>
+                  </DockPanel>
+                </Popup>
+              </Grid>
+              <ControlTemplate.Triggers>
+                <Trigger Property="IsEnabled" Value="false">
+                  <Setter Property="Foreground" Value="{DynamicResource DisabledForegroundBrush}" />
+                  <Setter Property="Opacity" TargetName="grid" Value="0.5" />
+                </Trigger>
+              </ControlTemplate.Triggers>
+            </ControlTemplate>
+          </ComboBox.Template>
+        </ComboBox>
+        <TextBlock Margin="2" DockPanel.Dock="Left">
+          <Run Text="{xk:Localize Dictionary}"/> -
+          <Run Text="{xk:Localize {}{0} item, Plural={}{0} items, Count={Binding Children.Count, Mode=OneWay}, IsStringFormat=True}"/>
+        </TextBlock>
+      </DockPanel>
+    </DataTemplate>
+  </pvdr:DictionaryEnumKeyTemplateProvider>
+
   <!-- Provider for boolean editor -->
   <view:TypeMatchTemplateProvider x:Key="BoolPropertyTemplateProvider" Type="{x:Type s:Boolean}" edvw:PropertyViewHelper.TemplateCategory="PropertyEditor">
     <DataTemplate DataType="qvm:NodeViewModel">
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/NotificationWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/NotificationWindow.xaml
index 80b0319c42..ffc323a03c 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/NotificationWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/NotificationWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="Xenko.Core.Assets.Editor.View.NotificationWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:xk="http://schemas.xenko.com/xaml/presentation"
         Title="{xk:Localize Notification}" Width="300" SizeToContent="Height" ShowInTaskbar="False"
         WindowStyle="None" AllowsTransparency="True" Background="Transparent">
@@ -9,7 +9,7 @@
     <ResourceDictionary>
       <!-- MERGED DICTIONARIES: IMAGE DICTIONARY, PROPERTY GRID VIEWS -->
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml"/>
+        <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ThemeSelector.xaml"/>
       </ResourceDictionary.MergedDictionaries>
 
       <Style TargetType="Hyperlink">
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml
index 7beebf5e24..41051bbd59 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:view="clr-namespace:Xenko.Core.Assets.Editor.View"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:xk="http://schemas.xenko.com/xaml/presentation"
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml.cs b/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml.cs
index d424b1dd66..3e9225df80 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/PackagePickerWindow.xaml.cs
@@ -20,34 +20,29 @@ public partial class PackagePickerWindow : IPackagePickerDialog
     {
         private readonly SessionViewModel session;
 
-        private readonly List<PackageViewModel> selectedPackages = new List<PackageViewModel>();
+        private readonly List<PickablePackageViewModel> selectedPackages = new List<PickablePackageViewModel>();
 
         public PackagePickerWindow(SessionViewModel session)
         {
             this.session = session;
             InitializeComponent();
-            Packages = new List<PackageViewModel>();
+            Packages = new List<PickablePackageViewModel>();
             DataContext = this;
             Width = Math.Min(Width, SystemParameters.WorkArea.Width);
             Height = Math.Min(Height, SystemParameters.WorkArea.Height);
         }
 
-        public List<PackageViewModel> Packages { get; set; }
+        public List<PickablePackageViewModel> Packages { get; set; }
 
         public bool AllowMultiSelection { get; set; }
 
-        public Func<PackageViewModel, bool> Filter { get; set; }
+        public Func<PickablePackageViewModel, bool> Filter { get; set; }
         
-        IReadOnlyCollection<PackageViewModel> IPackagePickerDialog.SelectedPackages => selectedPackages;
+        IReadOnlyCollection<PickablePackageViewModel> IPackagePickerDialog.SelectedPackages => selectedPackages;
 
         public override async Task<DialogResult> ShowModal()
         {
-            foreach (var package in session.LocalPackages)
-            {
-                if (Filter == null || Filter(package))
-                    Packages.Add(package);
-            }
-            foreach (var package in session.StorePackages)
+            foreach (var package in await session.SuggestPackagesToAdd())
             {
                 if (Filter == null || Filter(package))
                     Packages.Add(package);
@@ -59,7 +54,7 @@ public override async Task<DialogResult> ShowModal()
 
             if (Result == Presentation.Services.DialogResult.Ok)
             {
-                selectedPackages.AddRange(PackageListBox.SelectedItems.Cast<PackageViewModel>());
+                selectedPackages.AddRange(PackageListBox.SelectedItems.Cast<PickablePackageViewModel>());
             }
             return Result;
         }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/SettingsWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/SettingsWindow.xaml
index c34dc473a3..e6f7792109 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/SettingsWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/SettingsWindow.xaml
@@ -2,7 +2,7 @@
                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                   xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-                  xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                  xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                   xmlns:behaviors="clr-namespace:Xenko.Core.Assets.Editor.View.Behaviors"
                   xmlns:valueConverters="clr-namespace:Xenko.Core.Assets.Editor.View.ValueConverters"
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -57,7 +57,7 @@
 
       <GridSplitter Grid.Column="1" Width="5" ResizeBehavior="PreviousAndNext" VerticalAlignment="Stretch" />
 
-      <xk:PropertyView NameColumnSize="310" Grid.Column="2" ItemsSource="{Binding ViewModel.RootNode.Children}" BorderThickness="1" Background="{DynamicResource HoverBrush}" Padding="5">
+      <xk:PropertyView NameColumnSize="310" Grid.Column="2" ItemsSource="{Binding ViewModel.RootNode.Children}" BorderThickness="1" Background="{DynamicResource BackgroundBrush}" Padding="5">
         <xk:PropertyView.ItemContainerStyle>
           <Style BasedOn="{StaticResource {x:Type xk:PropertyViewItem}}" TargetType="xk:PropertyViewItem">
             <Setter Property="Background" Value="Transparent"/>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ArrayItemTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ArrayItemTemplateProvider.cs
new file mode 100644
index 0000000000..eb64ad093e
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ArrayItemTemplateProvider.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core.Presentation.Quantum;
+using Xenko.Core.Presentation.Quantum.View;
+using Xenko.Core.Presentation.Quantum.ViewModels;
+
+namespace Xenko.Core.Assets.Editor.View.TemplateProviders
+{
+    public class ArrayItemTemplateProvider : TypeMatchTemplateProvider
+    {
+        public override string Name => "ArrayItem";
+
+        public override bool MatchNode(NodeViewModel node)
+        {
+            return base.MatchNode(node) && node.Parent != null && node.Parent.Type.IsArray;
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ArrayTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ArrayTemplateProvider.cs
new file mode 100644
index 0000000000..b89595ce21
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ArrayTemplateProvider.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+
+using Xenko.Core.Presentation.Quantum;
+using Xenko.Core.Presentation.Quantum.View;
+using Xenko.Core.Presentation.Quantum.ViewModels;
+
+namespace Xenko.Core.Assets.Editor.View.TemplateProviders
+{
+    public class ArrayTemplateProvider : NodeViewModelTemplateProvider
+    {
+        public override string Name => (ElementType?.Name ?? "") + "[]";
+
+        public Type ElementType { get; set; }
+
+        public override bool MatchNode(NodeViewModel node)
+        {
+            if (node.Type.IsArray)
+            {
+                return node.NodeValue != null;
+            }
+            return false;
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryEnumKeyTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryEnumKeyTemplateProvider.cs
new file mode 100644
index 0000000000..cee50e852a
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryEnumKeyTemplateProvider.cs
@@ -0,0 +1,42 @@
+// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Assets.Editor.Quantum.NodePresenters.Updaters;
+using Xenko.Core.Presentation.Quantum;
+using Xenko.Core.Presentation.Quantum.ViewModels;
+
+namespace Xenko.Core.Assets.Editor.View.TemplateProviders
+{
+    public class DictionaryEnumKeyTemplateProvider : DictionaryTemplateProvider
+    {
+        public override string Name => "DictionaryEnumKey";
+
+        /// <summary>
+        /// If set to true, this provider will accept nodes representing entries of a enum-keyed dictionary.
+        /// Otherwise, it will accept nodes representing the enum-keyed dictionary itself.
+        /// </summary>
+        public bool ApplyForItems { get; set; }
+
+        public override bool MatchNode(NodeViewModel node)
+        {
+            if (ApplyForItems)
+            {
+                node = node.Parent;
+                if (node == null)
+                    return false;
+            }
+
+            if (!base.MatchNode(node))
+                return false;
+
+            if(node.AssociatedData.TryGetValue(DictionaryNodeUpdater.DictionaryNodeKeyType.Name, out var value))
+            {
+                var type = (Type)value;
+                return type.IsEnum;
+            }
+
+            return false;
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryStringKeyTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryStringKeyTemplateProvider.cs
index cc1bc58329..f5c5e3f47b 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryStringKeyTemplateProvider.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/DictionaryStringKeyTemplateProvider.cs
@@ -1,7 +1,8 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
 using System.Collections.Generic;
-
+using Xenko.Core.Assets.Editor.Quantum.NodePresenters.Updaters;
 using Xenko.Core.Presentation.Quantum;
 using Xenko.Core.Presentation.Quantum.ViewModels;
 
@@ -29,19 +30,10 @@ public override bool MatchNode(NodeViewModel node)
             if (!base.MatchNode(node))
                 return false;
 
-            if (node.Type.IsGenericType)
+            if (node.AssociatedData.TryGetValue(DictionaryNodeUpdater.DictionaryNodeKeyType.Name, out var value))
             {
-                var genericArguments = node.Type.GetGenericArguments();
-                return genericArguments[0] == typeof(string);
-            }
-
-            foreach (var typeInterface in node.Type.GetInterfaces())
-            {
-                if (!typeInterface.IsGenericType || typeInterface.GetGenericTypeDefinition() != typeof(IDictionary<,>))
-                    continue;
-
-                var genericArguments = typeInterface.GetGenericArguments();
-                return genericArguments[0] == typeof(string);
+                var type = (Type)value;
+                return type == typeof(string);
             }
 
             return false;
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListItemTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListItemTemplateProvider.cs
index 4df9fac5e3..8453c0109e 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListItemTemplateProvider.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListItemTemplateProvider.cs
@@ -12,7 +12,7 @@ public class ListItemTemplateProvider : TypeMatchTemplateProvider
 
         public override bool MatchNode(NodeViewModel node)
         {
-            return base.MatchNode(node) && node.Parent != null && (node.Parent.HasCollection || node.Parent.HasDictionary);
+            return base.MatchNode(node) && node.Parent != null && (node.Parent.HasList || node.Parent.HasDictionary || node.Parent.HasSet || node.Parent.HasCollection);
         }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListTemplateProvider.cs
index a8f98b3309..5de2163256 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListTemplateProvider.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/ListTemplateProvider.cs
@@ -16,6 +16,11 @@ public class ListTemplateProvider : NodeViewModelTemplateProvider
 
         public override bool MatchNode(NodeViewModel node)
         {
+            if (node.HasList)
+            {
+                return node.NodeValue != null;
+            }
+
             var matchElementType = ElementType == null;
             if (!matchElementType)
             {
@@ -26,7 +31,7 @@ public override bool MatchNode(NodeViewModel node)
                     matchElementType = genParam.Length == 1 && genParam[0] == ElementType;
                 }
             }
-            return node.HasCollection && !node.HasDictionary && node.NodeValue != null && matchElementType;
+            return node.HasCollection && !node.HasSet && !node.HasDictionary && node.NodeValue != null && matchElementType;
         }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/SetTemplateProvider.cs b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/SetTemplateProvider.cs
new file mode 100644
index 0000000000..cffab54826
--- /dev/null
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/TemplateProviders/SetTemplateProvider.cs
@@ -0,0 +1,18 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core.Presentation.Quantum;
+using Xenko.Core.Presentation.Quantum.View;
+using Xenko.Core.Presentation.Quantum.ViewModels;
+
+namespace Xenko.Core.Assets.Editor.View.TemplateProviders
+{
+    public class SetTemplateProvider : TypeMatchTemplateProvider
+    {
+        public override string Name => "Set";
+
+        public override bool MatchNode(NodeViewModel node)
+        {
+            return node.HasSet && node.NodeValue != null;
+        }
+    }
+}
diff --git a/sources/editor/Xenko.Core.Assets.Editor/View/WorkProgressWindow.xaml b/sources/editor/Xenko.Core.Assets.Editor/View/WorkProgressWindow.xaml
index 1c5130ca3d..746e2a206f 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/View/WorkProgressWindow.xaml
+++ b/sources/editor/Xenko.Core.Assets.Editor/View/WorkProgressWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:progress="clr-namespace:Xenko.Core.Assets.Editor.ViewModel.Progress"
-        xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" mc:Ignorable="d"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors" mc:Ignorable="d"
         Style="{DynamicResource WindowChromeStyle}" ShowInTaskbar="False"
         Title="{Binding Title}" Height="480" Width="640" d:DataContext="{d:DesignInstance progress:WorkProgressViewModel}">
   <Grid>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCollectionViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCollectionViewModel.cs
index bf6407ee0d..a0d7259157 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCollectionViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCollectionViewModel.cs
@@ -1442,6 +1442,9 @@ async void IAddChildViewModel.AddChildren(IReadOnlyCollection<object> children,
             }
             // Compute the list of compatible templates per file extension
 
+            // no files? bail
+            if (files.Count == 0) return;
+
             var extensionsList = new Dictionary<string, int>();
             foreach (var file in files)
             {
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCompositeHierarchyViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCompositeHierarchyViewModel.cs
index b89c094a4d..e6d704195c 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCompositeHierarchyViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetCompositeHierarchyViewModel.cs
@@ -74,14 +74,14 @@ protected override bool ShouldConstructPropertyMember(IMemberNode member)
                 return false;
 
             // Don't construct properties for member referencing child parts.
-            if (AssetHierarchyPropertyGraph.IsChildPartReference(member, Index.Empty))
+            if (AssetHierarchyPropertyGraph.IsChildPartReference(member, NodeIndex.Empty))
                 return false;
 
             return base.ShouldConstructPropertyMember(member);
         }
 
         /// <inheritdoc />
-        protected override bool ShouldConstructPropertyItem(IObjectNode collection, Index index)
+        protected override bool ShouldConstructPropertyItem(IObjectNode collection, NodeIndex index)
         {
             // Don't construct properties for item referencing child parts.
             if (AssetHierarchyPropertyGraph.IsChildPartReference(collection, index))
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetViewModel.cs
index 715ee4dd98..f4589cc9da 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/AssetViewModel.cs
@@ -384,7 +384,7 @@ protected override void OnDirtyFlagSet()
         }
 
         [Obsolete]
-        protected virtual void OnAssetPropertyChanged(string propertyName, IGraphNode node, Index index, object oldValue, object newValue)
+        protected virtual void OnAssetPropertyChanged(string propertyName, IGraphNode node, NodeIndex index, object oldValue, object newValue)
         {
             clearArchetypeCommand.IsEnabled = Asset.Archetype != null;
         }
@@ -402,7 +402,7 @@ protected virtual GraphNodePath GetPathToPropertiesRootNode()
 
         protected virtual bool ShouldConstructPropertyMember([NotNull] IMemberNode member) => true;
 
-        protected virtual bool ShouldConstructPropertyItem([NotNull] IObjectNode collection, Index index) => true;
+        protected virtual bool ShouldConstructPropertyItem([NotNull] IObjectNode collection, NodeIndex index) => true;
 
         protected virtual bool ShouldListenToTargetNode(IMemberNode member, IGraphNode targetNode) => true;
 
@@ -441,7 +441,7 @@ private void AssetPropertyChanged(object sender, INodeChangeEventArgs e)
             if (Session.IsInFixupAssetContext)
                 return;
 
-            var index = (e as ItemChangeEventArgs)?.Index ?? Index.Empty;
+            var index = (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty;
             var assetNodeChange = (IAssetNodeChangeEventArgs)e;
             var node = (IAssetNode)e.Node;
             var memberName = (node as IMemberNode)?.Name;
@@ -707,7 +707,7 @@ GraphNodePath IAssetPropertyProviderViewModel.GetAbsolutePathToRootNode()
 
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => ShouldConstructPropertyMember(member);
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => ShouldConstructPropertyItem(collection, index);
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => ShouldConstructPropertyItem(collection, index);
 
         AssetViewModel IAssetPropertyProviderViewModel.RelatedAsset => this;
 
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/CopyPasteProcessors/AssetPropertyPasteProcessor.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/CopyPasteProcessors/AssetPropertyPasteProcessor.cs
index 8921b2c072..d742b7479f 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/CopyPasteProcessors/AssetPropertyPasteProcessor.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/CopyPasteProcessors/AssetPropertyPasteProcessor.cs
@@ -34,13 +34,20 @@ public override bool Accept(Type targetRootType, Type targetMemberType, Type pas
             var sourceTypeDescriptor = TypeDescriptorFactory.Default.Find(pastedDataType);
             var targetTypeDescriptor = TypeDescriptorFactory.Default.Find(targetMemberType);
 
+            var sourceCategory = sourceTypeDescriptor.Category;
+            var targetCategory = targetTypeDescriptor.Category;
             // Can only paste a collection into another collection, or a dictionary into a dictionary
-            if (sourceTypeDescriptor.Category == DescriptorCategory.Collection && targetTypeDescriptor.Category != DescriptorCategory.Collection ||
-                sourceTypeDescriptor.Category == DescriptorCategory.Dictionary && targetTypeDescriptor.Category != DescriptorCategory.Dictionary)
+            if (sourceCategory != targetCategory &&
+                (sourceCategory == DescriptorCategory.List ||
+                    sourceCategory == DescriptorCategory.Dictionary ||
+                    sourceCategory == DescriptorCategory.Set ||
+                    sourceCategory == DescriptorCategory.Collection))
+            {
                 return false;
+            }
 
             // Special case: KeyValuePair<,>
-            if (targetTypeDescriptor.Category == DescriptorCategory.Dictionary && sourceTypeDescriptor.Category != DescriptorCategory.Dictionary)
+            if (targetCategory == DescriptorCategory.Dictionary && sourceCategory != DescriptorCategory.Dictionary)
             {
                 // Key and Value types must be compatible
                 var sourceKeyType = sourceTypeDescriptor.Type.GetMember("Key").OfType<PropertyInfo>().FirstOrDefault()?.PropertyType;
@@ -85,12 +92,18 @@ public override bool ProcessDeserializedData(AssetPropertyGraphContainer graphCo
             bool result;
             switch (targetTypeDescriptor.Category)
             {
-                case DescriptorCategory.Collection:
-                    result = ConvertForCollection((CollectionDescriptor)targetTypeDescriptor, ref data);
+                case DescriptorCategory.List:
+                    result = ConvertForList((ListDescriptor)targetTypeDescriptor, ref data);
                     break;
                 case DescriptorCategory.Dictionary:
                     result = ConvertForDictionary((DictionaryDescriptor)targetTypeDescriptor, ref data);
                     break;
+                case DescriptorCategory.Set:
+                    result = ConvertForSet((SetDescriptor)targetTypeDescriptor, ref data);
+                    break;
+                case DescriptorCategory.Collection:
+                    result = ConvertForCollection((CollectionDescriptor)targetTypeDescriptor, ref data);
+                    break;
                 case DescriptorCategory.Primitive:
                 case DescriptorCategory.Object:
                 case DescriptorCategory.Nullable:
@@ -138,7 +151,7 @@ public override Task Paste(IPasteItem pasteResultItem, AssetPropertyGraph proper
         }
 
         // TODO: replace targetNode & index arguments by a NodeAccessor
-        private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode, Index index, bool replace)
+        private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode, NodeIndex index, bool replace)
         {
             if (pasteResultItem?.Data == null) throw new ArgumentNullException(nameof(pasteResultItem));
             if (targetNode == null) throw new ArgumentNullException(nameof(targetNode));
@@ -148,7 +161,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
             var copiedDataDescriptor = TypeDescriptorFactory.Default.Find(copiedDataType);
             var memberNode = targetNode as IMemberNode;
 
-            // We're pasting in a node that is not a collection (nor a dictionary), let's just do a member update
+            // We're pasting in a node that is not a collection (nor a list, a set or a dictionary), let's just do a member update
             if (!CollectionDescriptor.IsCollection(targetNode.Type))
             {
                 if (CanUpdateMember(memberNode, copiedData))
@@ -187,7 +200,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                         // If this operation is a replace of the whole dictionary, let's first clear it
                         foreach (var key in keys)
                         {
-                            var itemIndex = new Index(key);
+                            var itemIndex = new NodeIndex(key);
                             if (CanRemoveItem(collectionNode, itemIndex))
                             {
                                 var itemToRemove = targetNode.Retrieve(itemIndex);
@@ -207,7 +220,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                 }
                 foreach (var kv in copiedDataDictionaryDescriptor.GetEnumerator(copiedData))
                 {
-                    var itemIndex = new Index(kv.Key);
+                    var itemIndex = new NodeIndex(kv.Key);
                     if (existingKeys.Contains(itemIndex))
                     {
                         // Replace if the key already exists
@@ -226,6 +239,194 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                     }
                 }
             }
+            else if (targetNode.Descriptor.Category == DescriptorCategory.List)
+            {
+                var targetListDescriptor = (ListDescriptor)targetNode.Descriptor;
+                if (replace)
+                {
+                    // No index, we're replacing the whole collection
+                    if (index.IsEmpty)
+                    {
+                        // First clear the collection
+                        var count = targetListDescriptor.GetCollectionCount(targetNode.Retrieve());
+                        for (var j = count - 1; j >= 0; j--)
+                        {
+                            var itemIndex = new NodeIndex(j);
+                            if (CanRemoveItem(collectionNode, itemIndex))
+                            {
+                                var itemToRemove = targetNode.Retrieve(itemIndex);
+                                collectionNode.Remove(itemToRemove, itemIndex);
+                            }
+                        }
+
+                        // Then add the new items
+                        var i = 0;
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            var itemIndex = new NodeIndex(i);
+                            if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // We're replacing a single item with a given index...
+                        var startIndex = index.Int;
+                        var i = 0;
+                        bool firstItemReplaced = false;
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            var itemIndex = new NodeIndex(startIndex + i);
+                            if (!firstItemReplaced)
+                            {
+                                // We replace the first item.
+                                if (CanReplaceItem(collectionNode, itemIndex, item))
+                                {
+                                    ReplaceItem(collectionNode, itemIndex, item);
+                                    firstItemReplaced = true;
+                                    i++;
+                                }
+                            }
+                            else if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                // We insert the following items that have no pre-existing counter-part.
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // No index, we're replacing the whole collection
+                    if (index.IsEmpty)
+                    {
+                        // Add the new items
+                        var i = targetListDescriptor.GetCollectionCount(targetNode.Retrieve());
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            var itemIndex = new NodeIndex(i);
+                            if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Handling non-replacing paste
+                        var i = index.Int;
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            // We're pasting a collection into the collection, let's add all items at the given index if provided or at the end of the collection.
+                            var itemIndex = new NodeIndex(i);
+                            if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                }
+            }
+            else if (targetNode.Descriptor.Category == DescriptorCategory.Set)
+            {
+                var targetSetDescriptor = (SetDescriptor)targetNode.Descriptor;
+                if (replace)
+                {
+                    // No index, we're replacing the whole collection
+                    if (index.IsEmpty)
+                    {
+                        // First clear the collection
+                        var count = targetSetDescriptor.GetCollectionCount(targetNode.Retrieve());
+                        for (var j = count - 1; j >= 0; j--)
+                        {
+                            var itemIndex = new NodeIndex(j);
+                            if (CanRemoveItem(collectionNode, itemIndex))
+                            {
+                                var itemToRemove = targetNode.Retrieve(itemIndex);
+                                collectionNode.Remove(itemToRemove, itemIndex);
+                            }
+                        }
+
+                        // Then add the new items
+                        var i = 0;
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            var itemIndex = new NodeIndex(i);
+                            if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // We're replacing a single item with a given index...
+                        var startIndex = index.Int;
+                        var i = 0;
+                        bool firstItemReplaced = false;
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            var itemIndex = new NodeIndex(startIndex + i);
+                            if (!firstItemReplaced)
+                            {
+                                // We replace the first item.
+                                if (CanReplaceItem(collectionNode, itemIndex, item))
+                                {
+                                    ReplaceItem(collectionNode, itemIndex, item);
+                                    firstItemReplaced = true;
+                                    i++;
+                                }
+                            }
+                            else if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                // We insert the following items that have no pre-existing counter-part.
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    // No index, we're replacing the whole collection
+                    if (index.IsEmpty)
+                    {
+                        // Add the new items
+                        var i = targetSetDescriptor.GetCollectionCount(targetNode.Retrieve());
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            var itemIndex = new NodeIndex(i);
+                            if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Handling non-replacing paste
+                        var i = index.Int;
+                        foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
+                        {
+                            // We're pasting a collection into the collection, let's add all items at the given index if provided or at the end of the collection.
+                            var itemIndex = new NodeIndex(i);
+                            if (CanInsertItem(collectionNode, itemIndex, item))
+                            {
+                                InsertItem(collectionNode, itemIndex, item);
+                                i++;
+                            }
+                        }
+                    }
+                }
+            }
             else if (targetNode.Descriptor.Category == DescriptorCategory.Collection)
             {
                 var targetCollectionDescriptor = (CollectionDescriptor)targetNode.Descriptor;
@@ -238,7 +439,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                         var count = targetCollectionDescriptor.GetCollectionCount(targetNode.Retrieve());
                         for (var j = count - 1; j >= 0; j--)
                         {
-                            var itemIndex = new Index(j);
+                            var itemIndex = new NodeIndex(j);
                             if (CanRemoveItem(collectionNode, itemIndex))
                             {
                                 var itemToRemove = targetNode.Retrieve(itemIndex);
@@ -250,7 +451,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                         var i = 0;
                         foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
                         {
-                            var itemIndex = new Index(i);
+                            var itemIndex = new NodeIndex(i);
                             if (CanInsertItem(collectionNode, itemIndex, item))
                             {
                                 InsertItem(collectionNode, itemIndex, item);
@@ -266,7 +467,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                         bool firstItemReplaced = false;
                         foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
                         {
-                            var itemIndex = new Index(startIndex + i);
+                            var itemIndex = new NodeIndex(startIndex + i);
                             if (!firstItemReplaced)
                             {
                                 // We replace the first item.
@@ -295,7 +496,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                         var i = targetCollectionDescriptor.GetCollectionCount(targetNode.Retrieve());
                         foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
                         {
-                            var itemIndex = new Index(i);
+                            var itemIndex = new NodeIndex(i);
                             if (CanInsertItem(collectionNode, itemIndex, item))
                             {
                                 InsertItem(collectionNode, itemIndex, item);
@@ -310,7 +511,7 @@ private void Paste([NotNull] IPasteItem pasteResultItem, IGraphNode targetNode,
                         foreach (var item in EnumerateItems(copiedData, copiedDataDescriptor))
                         {
                             // We're pasting a collection into the collection, let's add all items at the given index if provided or at the end of the collection.
-                            var itemIndex = new Index(i);
+                            var itemIndex = new NodeIndex(i);
                             if (CanInsertItem(collectionNode, itemIndex, item))
                             {
                                 InsertItem(collectionNode, itemIndex, item);
@@ -327,17 +528,17 @@ protected virtual bool CanUpdateMember(IMemberNode member, object newValue)
             return member != null && member.MemberDescriptor.HasSet;
         }
 
-        protected virtual bool CanRemoveItem(IObjectNode collection, Index index)
+        protected virtual bool CanRemoveItem(IObjectNode collection, NodeIndex index)
         {
             return true;
         }
 
-        protected virtual bool CanReplaceItem(IObjectNode collection, Index index, object newItem)
+        protected virtual bool CanReplaceItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             return true;
         }
 
-        protected virtual bool CanInsertItem(IObjectNode collection, Index index, object newItem)
+        protected virtual bool CanInsertItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             return true;
         }
@@ -347,12 +548,12 @@ protected virtual void UpdateMember(IMemberNode member, object newValue)
             member.Update(newValue);
         }
 
-        protected virtual void ReplaceItem(IObjectNode collection, Index index, object newItem)
+        protected virtual void ReplaceItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             collection.Update(newItem, index);
         }
 
-        protected virtual void InsertItem(IObjectNode collection, Index index, object newItem)
+        protected virtual void InsertItem(IObjectNode collection, NodeIndex index, object newItem)
         {
             collection.Add(newItem, index);
         }
@@ -384,6 +585,46 @@ private static bool ConvertForCollection(CollectionDescriptor collectionDescript
             return true;
         }
 
+        private static bool ConvertForList(ListDescriptor listDescriptor, ref object data)
+        {
+            if (ListDescriptor.IsList(data.GetType()))
+            {
+                if (!TryConvertListData(data, listDescriptor, out data))
+                    return false;
+            }
+            else
+            {
+                object convertedData;
+                if (!TypeConverterHelper.TryConvert(data, listDescriptor.ElementType, out convertedData))
+                    return false;
+
+                var convertedCollection = Activator.CreateInstance(listDescriptor.Type, true);
+                listDescriptor.Add(convertedCollection, convertedData);
+                data = convertedCollection;
+            }
+            return true;
+        }
+
+        private static bool ConvertForSet(SetDescriptor setDescriptor, ref object data)
+        {
+            if (SetDescriptor.IsSet(data.GetType()))
+            {
+                if (!TryConvertSetData(data, setDescriptor, out data))
+                    return false;
+            }
+            else
+            {
+                object convertedData;
+                if (!TypeConverterHelper.TryConvert(data, setDescriptor.ElementType, out convertedData))
+                    return false;
+
+                var convertedCollection = Activator.CreateInstance(setDescriptor.Type, true);
+                setDescriptor.Add(convertedCollection, convertedData);
+                data = convertedCollection;
+            }
+            return true;
+        }
+
         private static bool ConvertForDictionary(DictionaryDescriptor dictionaryDescriptor, ref object data)
         {
             object convertedDictionary;
@@ -415,6 +656,15 @@ private static bool ConvertForProperty(Type targetType, ref object data)
             return TypeConverterHelper.TryConvert(data, targetType, out data);
         }
 
+        private static IEnumerable EnumerateList([NotNull] object list, [NotNull] ListDescriptor listDescriptor)
+        {
+            var count = listDescriptor.GetCollectionCount(list);
+            for (var i = 0; i < count; i++)
+            {
+                yield return listDescriptor.GetValue(list, i);
+            }
+        }
+
         private static IEnumerable EnumerateCollection([NotNull] object collection, [NotNull] CollectionDescriptor collectionDescriptor)
         {
             var count = collectionDescriptor.GetCollectionCount(collection);
@@ -488,6 +738,100 @@ private static bool TryConvertCollectionData([NotNull] object sourceCollection,
             return false;
         }
 
+        /// <summary>
+        /// Tries to convert the <paramref name="sourceList"/> to the type described by <paramref name="listDescriptor"/>.
+        /// </summary>
+        /// <param name="sourceList"></param>
+        /// <param name="listDescriptor"></param>
+        /// <param name="convertedList"></param>
+        /// <returns><c>true</c> if the <paramref name="sourceList"/> could be converted to the type described by <paramref name="listDescriptor"/>; otherwise, <c>false</c>.</returns>
+        private static bool TryConvertListData([NotNull] object sourceList, [NotNull] ListDescriptor listDescriptor, out object convertedList)
+        {
+            try
+            {
+                var sourceListType = sourceList.GetType();
+                // Already same type
+                if (listDescriptor.Type == sourceListType)
+                {
+                    convertedList = sourceList;
+                    return true;
+                }
+
+                convertedList = Activator.CreateInstance(listDescriptor.Type, true);
+                var sourceListDescriptor = (ListDescriptor)TypeDescriptorFactory.Default.Find(sourceListType);
+                foreach (var item in EnumerateList(sourceList, sourceListDescriptor))
+                {
+                    object obj;
+                    if (!TypeConverterHelper.TryConvert(item, listDescriptor.ElementType, out obj))
+                    {
+                        // (optimistic) try to convert the remaining items
+                        continue;
+                    }
+                    listDescriptor.Add(sourceList, obj);
+                }
+                return listDescriptor.GetCollectionCount(convertedList) > 0;
+            }
+            catch (InvalidCastException) { }
+            catch (InvalidOperationException) { }
+            catch (FormatException) { }
+            catch (NotSupportedException) { }
+            catch (Exception ex) when (ex.InnerException is InvalidCastException) { }
+            catch (Exception ex) when (ex.InnerException is InvalidOperationException) { }
+            catch (Exception ex) when (ex.InnerException is FormatException) { }
+            catch (Exception ex) when (ex.InnerException is NotSupportedException) { }
+
+            // Incompatible type and no conversion available
+            convertedList = null;
+            return false;
+        }
+
+        /// <summary>
+        /// Tries to convert the <paramref name="sourceSet"/> to the type described by <paramref name="setDescriptor"/>.
+        /// </summary>
+        /// <param name="sourceSet"></param>
+        /// <param name="setDescriptor"></param>
+        /// <param name="convertedSet"></param>
+        /// <returns><c>true</c> if the <paramref name="sourceSet"/> could be converted to the type described by <paramref name="setDescriptor"/>; otherwise, <c>false</c>.</returns>
+        private static bool TryConvertSetData([NotNull] object sourceSet, [NotNull] SetDescriptor setDescriptor, out object convertedSet)
+        {
+            try
+            {
+                var sourceSetType = sourceSet.GetType();
+                // Already same type
+                if (setDescriptor.Type == sourceSetType)
+                {
+                    convertedSet = sourceSet;
+                    return true;
+                }
+
+                convertedSet = Activator.CreateInstance(setDescriptor.Type, true);
+                var sourceSetDescriptor = (ListDescriptor)TypeDescriptorFactory.Default.Find(sourceSetType);
+                foreach (var item in EnumerateList(sourceSet, sourceSetDescriptor))
+                {
+                    object obj;
+                    if (!TypeConverterHelper.TryConvert(item, setDescriptor.ElementType, out obj))
+                    {
+                        // (optimistic) try to convert the remaining items
+                        continue;
+                    }
+                    setDescriptor.Add(sourceSet, obj);
+                }
+                return setDescriptor.GetCollectionCount(convertedSet) > 0;
+            }
+            catch (InvalidCastException) { }
+            catch (InvalidOperationException) { }
+            catch (FormatException) { }
+            catch (NotSupportedException) { }
+            catch (Exception ex) when (ex.InnerException is InvalidCastException) { }
+            catch (Exception ex) when (ex.InnerException is InvalidOperationException) { }
+            catch (Exception ex) when (ex.InnerException is FormatException) { }
+            catch (Exception ex) when (ex.InnerException is NotSupportedException) { }
+
+            // Incompatible type and no conversion available
+            convertedSet = null;
+            return false;
+        }
+
         /// <summary>
         /// Tries to convert the <paramref name="sourceDictionary"/> to the type described by <paramref name="dictionaryDescriptor"/>.
         /// </summary>
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/EditorViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/EditorViewModel.cs
index 1312acdb92..fa4f875cfb 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/EditorViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/EditorViewModel.cs
@@ -36,6 +36,7 @@ protected EditorViewModel(IViewModelServiceProvider serviceProvider, MostRecentl
             ClearMRUCommand = new AnonymousCommand(serviceProvider, () => ClearRecentFiles());
             OpenSettingsWindowCommand = new AnonymousCommand(serviceProvider, OpenSettingsWindow);
             OpenWebPageCommand = new AnonymousTaskCommand<string>(serviceProvider, OpenWebPage);
+            RestoreFromBackup = new AnonymousTaskCommand(serviceProvider, RestoreFromBackupFunction);
 #if DEBUG
             DebugCommand = new AnonymousCommand(serviceProvider, DebugFunction);
 #endif
@@ -94,14 +95,11 @@ private void MostRecentlyUsedFiles_CollectionChanged(object sender, System.Colle
 
         public ICommandBase OpenWebPageCommand { get; }
 
+        public ICommandBase RestoreFromBackup { get; }
+
 #if DEBUG
         public ICommandBase DebugCommand { get; }
-#endif
 
-        // Temporary, until we integrate a proper text editor in the studio
-        protected internal virtual IEnumerable<string> TextAssetTypes => Enumerable.Empty<string>();
-
-#if DEBUG
         public void DebugFunction()
         {
             Console.WriteLine(@"DebugFunction invoked");
@@ -221,6 +219,35 @@ public async Task OpenFile(string filePath, bool tryEdit)
 
         protected abstract Task RestartAndOpenSession(UFile sessionPath);
 
+        internal string projectPath;
+
+        private async Task RestoreFromBackupFunction()
+        {
+            if (projectPath == null || projectPath.Length == 0) return;
+
+            int restoreCount = 0;
+            string[] files = Directory.GetFiles(projectPath, "*.xk*", SearchOption.AllDirectories);
+            for (int i = 0; i < files.Length; i++)
+            {
+                string filename = files[i];
+                // if we are a scene file or prefab, back us up
+                if (filename.EndsWith("scene") || filename.EndsWith("prefab"))
+                {
+                    string backupfile = filename + ".backup";
+
+                    if (File.Exists(backupfile))
+                    {
+                        File.Copy(filename, filename + ".old", true);
+                        File.Copy(filename + ".backup", filename, true);
+                        restoreCount++;
+                    }
+                }
+            }
+
+            var message = "Restored " + restoreCount + " scene and prefab files from last run. Any files overwritten have an '.old' backup. Try reloading the project now.";
+            await ServiceProvider.Get<IDialogService>().MessageBox(message, MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
         private async Task OpenWebPage(string url)
         {
             try
@@ -238,7 +265,7 @@ private async Task OpenWebPage(string url)
         public void RemoveRecentFile(UFile filePath)
         {
             //Get all versions of showing on recent files
-            var xenkoVersions = RecentFiles?.Select(x => x.Version).ToList();
+            var xenkoVersions = RecentFiles?.Select(x => x.Version).Distinct().ToList();
             if (xenkoVersions != null)
             {
                 foreach (var item in xenkoVersions)
@@ -265,7 +292,7 @@ private void UpdateRecentFiles()
         {
             RecentFiles.Clear();
 
-            //Get only files that is current version or older
+            // Get only files that is current version or older
             foreach (var item in MRU.MostRecentlyUsedFiles.Where(x => string.Compare(x.Version, EditorVersionMajor, StringComparison.Ordinal) <= 0).Take(10))
             {
                 RecentFiles.Add(new MostRecentlyUsedFile() { FilePath = item.FilePath, Timestamp = item.Timestamp, Version = item.Version });
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ImportedAssetViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ImportedAssetViewModel.cs
index 6ef39b966e..42ebf53c4c 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ImportedAssetViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ImportedAssetViewModel.cs
@@ -18,6 +18,11 @@ protected virtual IAssetImporter GetImporter()
             return null;
         }
 
+        protected virtual void PrepareImporterInputParametersForUpdateFromSource(PropertyCollection importerInputParameters, TAsset asset)
+        {
+            // Do nothing by default
+        }
+
         protected virtual void UpdateAssetFromSource(TAsset assetToMerge)
         {
             // Do nothing by default
@@ -29,6 +34,7 @@ protected internal sealed override async Task UpdateAssetFromSource(Logger logge
             if (importer != null)
             {
                 var importParameters = new AssetImporterParameters { Logger = logger };
+                PrepareImporterInputParametersForUpdateFromSource(importParameters.InputParameters, Asset);
                 importParameters.SelectedOutputTypes.Add(AssetType, true);
                 try
                 {
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/PackageViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/PackageViewModel.cs
index 06fb2a4ab3..8b5c41aa42 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/PackageViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/PackageViewModel.cs
@@ -31,6 +31,8 @@
 using Xenko.Core.Quantum;
 using Xenko.Core.Quantum.References;
 using Xenko.Core.Translation;
+using System.IO;
+using Xenko.Core.Packages;
 
 namespace Xenko.Core.Assets.Editor.ViewModel
 {
@@ -509,24 +511,40 @@ await Task.Run(() =>
             }
         }
 
-        public void AddDependency(PackageViewModel packageViewModel)
+        public async Task AddDependency(PickablePackageViewModel pickablePackageViewModel)
         {
             using (var transaction = UndoRedoService.CreateTransaction())
             {
-                DependencyRange dependency;
-                if (packageViewModel.Package.Container is SolutionProject project)
+                var dependency = pickablePackageViewModel.DependencyRange;
+
+                // Check if package isn't a dependency yet
+                if (Package.Container.DirectDependencies.Any(x => x.Name == dependency.Name))
+                    return;
+
+                var reference = new DirectDependencyReferenceViewModel(dependency, this, Dependencies, true);
+                UndoRedoService.SetName(transaction, $"Add dependency to package '{reference.Name}'");
+
+                // Update dependencies with NuGet
+                if (Package.Container is SolutionProject project2)
                 {
-                    dependency = new DependencyRange(packageViewModel.Name, new PackageVersionRange(packageViewModel.Package.Meta.Version, true), DependencyType.Project)
+                    var log = new LoggerResult();
+                    await VSProjectHelper.RestoreNugetPackages(log, project2.FullPath);
+                    PackageSession.UpdateDependencies(project2, false, true);
+
+                    // If the package is not part of session yet, make sure it gets added at this point
+                    foreach (var projectDependency in project2.FlattenedDependencies)
                     {
-                        MSBuildProject = project.FullPath,
-                    };
-                }
-                else
-                {
-                    dependency = new DependencyRange(packageViewModel.Name, new PackageVersionRange(packageViewModel.Package.Meta.Version, true), DependencyType.Package);
+                        if (projectDependency.Package == null && projectDependency.Type == DependencyType.Package)
+                        {
+                            var packageFile = PackageStore.Instance.GetPackageFileName(projectDependency.Name, new PackageVersionRange(projectDependency.Version));
+                            if (packageFile != null && File.Exists(packageFile))
+                            {
+                                var dependencyPackageViewModel = await Session.AddExistingProject(packageFile);
+                                projectDependency.Package = dependencyPackageViewModel.Package;
+                            }
+                        }
+                    }
                 }
-                var reference = new DirectDependencyReferenceViewModel(dependency, this, Dependencies, true);
-                UndoRedoService.SetName(transaction, $"Add dependency to package '{reference.Name}'");
             }
         }
 
@@ -738,7 +756,7 @@ IObjectNode IPropertyProviderViewModel.GetRootNode()
 
         bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
 
-        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+        bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
 
         private static int ComparePackageContent(DirtiableEditableViewModel x, DirtiableEditableViewModel y)
         {
@@ -772,4 +790,52 @@ private static int ComparePackageContent(DirtiableEditableViewModel x, Dirtiable
             throw new InvalidOperationException("Unable to sort the given items for the Content collection of PackageViewModel");
         }
     }
+    public abstract class PickablePackageViewModel : DispatcherViewModel
+    {
+        protected PickablePackageViewModel([NotNull] IViewModelServiceProvider serviceProvider)
+            : base(serviceProvider)
+        {
+        }
+
+        public abstract string Name { get; }
+
+        public abstract DependencyRange DependencyRange { get; }
+    }
+
+    public class LoadedPickablePackageViewModel : PickablePackageViewModel
+    {
+        public LoadedPickablePackageViewModel(PackageViewModel package) : base(package.ServiceProvider)
+        {
+            Package = package;
+        }
+
+        public PackageViewModel Package { get; }
+
+        public override string Name => Package.Name;
+
+        public override DependencyRange DependencyRange =>
+            (Package.Package.Container is SolutionProject project)
+                ? new DependencyRange(Package.Name, new PackageVersionRange(Package.Package.Meta.Version, true), DependencyType.Project)
+                {
+                    MSBuildProject = project.FullPath,
+                }
+                : new DependencyRange(Package.Name, new PackageVersionRange(Package.Package.Meta.Version, true), DependencyType.Package);
+    }
+
+    public class UnloadedPickablePackageViewModel : PickablePackageViewModel
+    {
+        private readonly SessionViewModel session;
+        private readonly PackageName package;
+
+        public UnloadedPickablePackageViewModel(SessionViewModel session, PackageName package) : base(session.ServiceProvider)
+        {
+            this.session = session;
+            this.package = package;
+        }
+
+        public override string Name => package.Id;
+
+        public override DependencyRange DependencyRange =>
+            new DependencyRange(package.Id, new PackageVersionRange(package.Version, true), DependencyType.Package);
+    }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ProjectViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ProjectViewModel.cs
index 90a7b3e3d0..989780d060 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ProjectViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/ProjectViewModel.cs
@@ -109,7 +109,7 @@ public DirectoryBaseViewModel GetOrCreateProjectDirectory(string projectDirector
             DirectoryBaseViewModel result = Code;
             if (!string.IsNullOrEmpty(projectDirectory))
             {
-                var directories = projectDirectory.Split(new[] { DirectoryBaseViewModel.Separator }, StringSplitOptions.RemoveEmptyEntries).Skip(1);
+                var directories = projectDirectory.Split(new[] { DirectoryBaseViewModel.Separator }, StringSplitOptions.RemoveEmptyEntries);
                 result = directories.Aggregate(result, (current, next) => current.SubDirectories.FirstOrDefault(x => x.Name == next) ?? new DirectoryViewModel(next, current, canUndoRedoCreation));
             }
 
diff --git a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/SessionViewModel.cs b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/SessionViewModel.cs
index 2e11dc263b..933c48e125 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/ViewModel/SessionViewModel.cs
+++ b/sources/editor/Xenko.Core.Assets.Editor/ViewModel/SessionViewModel.cs
@@ -36,6 +36,7 @@
 using Xenko.Core.Presentation.ViewModel;
 using Xenko.Core.Presentation.Windows;
 using Xenko.Core.Translation;
+using Xenko.Core.Packages;
 
 namespace Xenko.Core.Assets.Editor.ViewModel
 {
@@ -172,6 +173,8 @@ public SessionObjectPropertiesViewModel ActiveProperties
 
         public ICommandBase ExploreCommand { get; }
 
+        public ICommandBase ExploreSourceFileCommand { get; }
+
         public ICommandBase OpenWithTextEditorCommand { get; }
 
         public ICommandBase OpenAssetFileCommand { get; }
@@ -243,6 +246,82 @@ internal set
         private int importEffectLogPendingCount;
         private bool selectionIsRoot;
         private bool isInFixupAssetContext;
+        private static FileSystemWatcher assetWatcher, resourceWatcher;
+
+        // Define the event handlers.
+        private static void OnChanged(object source, FileSystemEventArgs e)
+        {
+            string fullpath_small = e.FullPath.ToLower();
+
+            // ignore changes to source/internal files
+            if (fullpath_small.EndsWith(".cs") ||
+                fullpath_small.EndsWith(".old") ||
+                fullpath_small.EndsWith(".backup"))
+                return;
+
+            // make the change file!
+            try
+            {
+                string f = EditorViewModel.Instance.projectPath + "/files_changed";
+                File.WriteAllText(f, System.DateTime.Now.Ticks.ToString());
+            } catch(Exception) { }
+        }
+
+        private static void PrepareSystemWatcher()
+        {
+            string[] assetDirs = Directory.GetDirectories(EditorViewModel.Instance.projectPath, "Assets", SearchOption.AllDirectories);
+            string[] resouDirs = Directory.GetDirectories(EditorViewModel.Instance.projectPath, "Resources", SearchOption.AllDirectories);
+            string apath = assetDirs == null || assetDirs.Length == 0 ? null : assetDirs[0];
+            string rpath = resouDirs == null || resouDirs.Length == 0 ? null : resouDirs[0];
+
+            if (apath == null || Directory.Exists(apath) == false || rpath == null || Directory.Exists(rpath) == false)
+            {
+                if (assetWatcher != null)
+                {
+                    assetWatcher.EnableRaisingEvents = false;
+                    resourceWatcher.EnableRaisingEvents = false;
+                }
+
+                return;
+            }
+
+            if (assetWatcher == null)
+            {
+                assetWatcher = new FileSystemWatcher(apath);
+                resourceWatcher = new FileSystemWatcher(rpath);
+
+                assetWatcher.NotifyFilter = NotifyFilters.LastWrite |
+                                            NotifyFilters.FileName |
+                                            NotifyFilters.DirectoryName;
+
+                resourceWatcher.NotifyFilter = NotifyFilters.LastWrite |
+                                               NotifyFilters.FileName |
+                                               NotifyFilters.DirectoryName;
+
+                assetWatcher.Changed += OnChanged;
+                assetWatcher.Created += OnChanged;
+                assetWatcher.Deleted += OnChanged;
+                assetWatcher.Renamed += OnChanged;
+                resourceWatcher.Changed += OnChanged;
+                resourceWatcher.Created += OnChanged;
+                resourceWatcher.Deleted += OnChanged;
+                resourceWatcher.Renamed += OnChanged;
+
+                assetWatcher.IncludeSubdirectories = true;
+                resourceWatcher.IncludeSubdirectories = true;
+            }
+            else
+            {
+                assetWatcher.Path = apath;
+                resourceWatcher.Path = rpath;
+            }
+
+            // delete the changed file, since we don't know if changes happened while gamestudio was closed
+            File.Delete(EditorViewModel.Instance.projectPath + "/files_changed");
+
+            assetWatcher.EnableRaisingEvents = true;
+            resourceWatcher.EnableRaisingEvents = true;
+        }
 
         public static async Task<SessionViewModel> CreateNewSession(EditorViewModel editor, IViewModelServiceProvider serviceProvider, NewSessionParameters newSessionParameters)
         {
@@ -334,6 +413,12 @@ public static async Task<SessionViewModel> CreateNewSession(EditorViewModel edit
 
                 // And initialize the actions view model
                 sessionViewModel.ActionHistory.Initialize();
+
+                // grab path for backup/restore
+                EditorViewModel.Instance.projectPath = Path.GetDirectoryName(session.SolutionPath.FullPath);
+
+                // asset monitor
+                PrepareSystemWatcher();
             }
             finally
             {
@@ -343,6 +428,42 @@ public static async Task<SessionViewModel> CreateNewSession(EditorViewModel edit
             return sessionViewModel;
         }
 
+        private static void BackupProjectFiles()
+        {
+            var path = EditorViewModel.Instance.projectPath;
+            if (path == null || path.Length == 0) return;
+            string[] files = Directory.GetFiles(path, "*.xk*", SearchOption.AllDirectories);
+            for (int i=0; i<files.Length; i++)
+            {
+                string filename = files[i];
+                // if we are a scene file or prefab, back us up
+                if (filename.EndsWith("scene") || filename.EndsWith("prefab"))
+                {
+                    // make sure we are in a good position to overwrite backup
+                    string backupFile = filename + ".backup";
+                    if (File.Exists(backupFile) == false)
+                    {
+                        File.Copy(filename, backupFile, true);
+                    }
+                    else
+                    {
+                        // compare file info to see if we should overwrite backup
+                        FileInfo backupInfo = new FileInfo(backupFile);
+                        FileInfo currentInfo = new FileInfo(filename);
+
+                        long timeDiff = currentInfo.LastWriteTimeUtc.Ticks - backupInfo.LastWriteTimeUtc.Ticks;
+
+                        if (backupInfo.Length <= currentInfo.Length || timeDiff > TimeSpan.TicksPerDay * 3)
+                        {
+                            // either the backup is old (more than 3 days)
+                            // or the backup is smaller
+                            File.Copy(filename, backupFile, true);
+                        } 
+                    }
+                }
+            }
+        }
+
         public static async Task<SessionViewModel> OpenSession(string path, IViewModelServiceProvider serviceProvider, EditorViewModel editor, PackageSessionResult sessionResult)
         {
             if (path == null) throw new ArgumentNullException(nameof(path));
@@ -396,7 +517,7 @@ public static async Task<SessionViewModel> OpenSession(string path, IViewModelSe
                 }
                 catch (Exception e)
                 {
-                    sessionResult.Error(string.Format(Tr._p("Log", "There was a problem opening the solution.")), e);
+                    sessionResult.Error(string.Format(Tr._p("Log", "There was a problem opening the solution. Try clearing your nuget cache.")), e);
                     result = null;
                 }
                 return result;
@@ -409,6 +530,12 @@ public static async Task<SessionViewModel> OpenSession(string path, IViewModelSe
                 return null;
             }
 
+            // grab path for backup/restore
+            EditorViewModel.Instance.projectPath = Path.GetDirectoryName(path);
+
+            // asset monitor
+            PrepareSystemWatcher();
+
             // Register the node container to the copy/paste service.
             sessionViewModel.ServiceProvider.Get<CopyPasteService>().PropertyGraphContainer = sessionViewModel.GraphContainer;
 
@@ -492,7 +619,7 @@ public override void Destroy()
 
         private void AutoSelectCurrentProject()
         {
-            var currentProject = LocalPackages.OfType<ProjectViewModel>().FirstOrDefault(x => x.Type == ProjectType.Executable && x.Platform == PlatformType.Windows) ?? LocalPackages.FirstOrDefault();
+            var currentProject = LocalPackages.OfType<ProjectViewModel>().FirstOrDefault(x => x.Platform == PlatformType.Shared) ?? LocalPackages.FirstOrDefault();
             if (currentProject != null)
             {
                 SetCurrentProject(currentProject);
@@ -579,6 +706,7 @@ private SessionViewModel(IViewModelServiceProvider serviceProvider, ILogger logg
             RenameDirectoryOrPackageCommand = new AnonymousCommand<IEnumerable>(ServiceProvider, x => RenameDirectoryOrPackage(x.Cast<object>().LastOrDefault()));
             DeleteSelectedSolutionItemsCommand = new AnonymousTaskCommand(ServiceProvider, async () => await DeleteItems(ActiveAssetView.SelectedLocations));
             ExploreCommand = new AnonymousTaskCommand<object>(ServiceProvider, Explore);
+            ExploreSourceFileCommand = new AnonymousTaskCommand<AssetViewModel>(ServiceProvider, ExploreSourceFile);
             OpenWithTextEditorCommand = new AnonymousTaskCommand<AssetViewModel>(ServiceProvider, OpenWithTextEditor);
             OpenAssetFileCommand = new AnonymousTaskCommand<AssetViewModel>(ServiceProvider, OpenAssetFile);
             OpenSourceFileCommand = new AnonymousTaskCommand<AssetViewModel>(ServiceProvider, OpenSourceFile);
@@ -616,10 +744,12 @@ private void EditSelectedAsset()
             if (asset != null)
             {
                 // Temporary code while we don't have an integrated text editor.
-                if (Editor.TextAssetTypes.Contains(asset.AssetType.Name))
+                switch (asset.AssetType.Name)
                 {
-                    OpenWithTextEditor(asset, EditorSettings.ShaderEditor.GetValue());
-                    return;
+                    case "EffectShaderAsset":
+                    case "EffectCompositorAsset":
+                        OpenWithTextEditor(asset, EditorSettings.ShaderEditor.GetValue());
+                        return;
                 }
 
                 ServiceProvider.Get<IEditorDialogService>().AssetEditorsManager.OpenAssetEditorWindow(asset);
@@ -830,6 +960,42 @@ private async Task Explore(object param)
             }
         }
 
+        private async Task ExploreSourceFile(AssetViewModel asset)
+        {
+            var filePathToOpen = asset?.Asset?.MainSource;
+            if (filePathToOpen == null)
+            {
+                await Dialogs.MessageBox(Tr._p("Message", "This asset doesn't have a source file."), MessageBoxButton.OK, MessageBoxImage.Information);
+                return;
+            }
+
+            try
+            {
+                bool fileSelection = true;
+                var stringPath = filePathToOpen.ToString().Replace('/', '\\');
+                if (!File.Exists(stringPath))
+                {
+                    // If the file doesn't exist, we want to at least try to go to the directory it belonged to
+                    stringPath = Path.GetDirectoryName(stringPath);
+                    fileSelection = false;
+                    if (!Directory.Exists(stringPath))
+                    {
+                        await Dialogs.MessageBox(Tr._p("Message", "Source file and path no longer exists."), MessageBoxButton.OK, MessageBoxImage.Information);
+                        return;
+                    }
+                }
+
+                ProcessStartInfo startInfo = fileSelection ? new ProcessStartInfo("explorer.exe", "/select," + stringPath) : new ProcessStartInfo(stringPath);
+                startInfo.UseShellExecute = true;
+                var explorer = new Process { StartInfo = startInfo };
+                explorer.Start();
+            }
+            catch (Exception)
+            {
+                await Dialogs.MessageBox(Tr._p("Message", "There was a problem starting the file explorer."), MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
         public async Task<bool> SaveSession()
         {
             Dispatcher.EnsureAccess();
@@ -873,7 +1039,7 @@ await Task.Run(() =>
                 }
                 catch (Exception e)
                 {
-                    sessionResult.Error(string.Format(Tr._p("Log", "There was a problem saving the solution. {0}"), e.Message), e);
+                    sessionResult.Error(string.Format(Tr._p("Log", "There was a problem saving the solution. Try clearing your nuget cache. {0}"), e.Message), e);
                 }
             });
 
@@ -995,31 +1161,16 @@ public async Task<bool> Close()
             {
                 var buttons = DialogHelper.CreateButtons(new[]
                 {
-                    Tr._p("Button", "Save"),
-                    Tr._p("Button", "Don't save"),
+                    Tr._p("Button", "Close Anyway"),
                     Tr._p("Button", "Cancel")
-                }, 1, 3);
-                var result = await Dialogs.MessageBox(Tr._p("Message", "The project has unsaved changes. Do you want to save it?"), buttons, MessageBoxImage.Question);
-                switch (result)
-                {
-                    case 0:
-                    case 3:
-                        // Cancel
-                        return false;
-
-                    case 1:
-                        await SaveSession();
-                        // session saving has been cancelled, aborting
-                        if (HasUnsavedAssets())
-                        {
-                            ServiceProvider.Get<IEditorDialogService>().BlockingMessageBox(Tr._p("Message", "Some assets couldn't be saved. Check the assets and try again."), MessageBoxButton.OK,
-                                MessageBoxImage.Error);
-                            return false;
-                        }
-                        break;
-                }
+                }, 2, 2);
+                var result = await Dialogs.MessageBox(Tr._p("Message", "The project has unsaved changes. Closing now would lose these changes."), buttons, MessageBoxImage.Question);
+                if (result == 2) return false;
             }
 
+            // assume we were OK with our project, lets backup everything
+            BackupProjectFiles();
+
             return true;
         }
 
@@ -1164,55 +1315,63 @@ private async Task AddExistingProject()
             var projectPath = fileDialog.FilePaths.FirstOrDefault();
             if (result == DialogResult.Ok && projectPath != null)
             {
-                var loggerResult = new LoggerResult();
+                await AddExistingProject(projectPath);
+            }
+        }
 
-                var workProgress = new WorkProgressViewModel(ServiceProvider, loggerResult)
-                {
-                    Title = Tr._p("Title", "Importing project..."),
-                    KeepOpen = KeepOpen.OnWarningsOrErrors,
-                    IsIndeterminate = true,
-                    IsCancellable = false
-                };
-                workProgress.RegisterProgressStatus(loggerResult, true);
-                // Note: this task is note safely cancellable
-                // TODO: Remove the cancellation token if possible.
-                var cancellationSource = new CancellationTokenSource();
-
-                ServiceProvider.Get<IEditorDialogService>().ShowProgressWindow(workProgress, 500);
-
-                await Task.Run(() =>
-                {
-                    try
-                    {
-                        session.AddExistingProject(projectPath, loggerResult, CreatePackageLoadParameters(workProgress, cancellationSource));
-                    }
-                    catch (Exception e)
-                    {
-                        loggerResult.Error(Tr._p("Log", "There was a problem importing the package."), e);
-                    }
+        public async Task<PackageViewModel> AddExistingProject(string projectPath)
+        {
+            var loggerResult = new LoggerResult();
 
-                }, cancellationSource.Token);
+            var workProgress = new WorkProgressViewModel(ServiceProvider, loggerResult)
+            {
+                Title = Tr._p("Title", "Importing project..."),
+                KeepOpen = KeepOpen.OnWarningsOrErrors,
+                IsIndeterminate = true,
+                IsCancellable = false
+            };
+            workProgress.RegisterProgressStatus(loggerResult, true);
+            // Note: this task is note safely cancellable
+            // TODO: Remove the cancellation token if possible.
+            var cancellationSource = new CancellationTokenSource();
 
-                // Set the range of the work in progress according to the created assets
-                workProgress.Minimum = 0;
-                workProgress.ProgressValue = 0;
-                workProgress.Maximum = session.Projects.OfType<SolutionProject>().Where(x => !packageMap.ContainsValue(x)).Sum(x => x.Package.Assets.Count);
+            ServiceProvider.Get<IEditorDialogService>().ShowProgressWindow(workProgress, 500);
 
-                using (var transaction = UndoRedoService.CreateTransaction())
+            Package package = null;
+            await Task.Run(() =>
+            {
+                try
+                {
+                    package = session.AddExistingProject(projectPath, loggerResult, CreatePackageLoadParameters(workProgress, cancellationSource)).Package;
+                }
+                catch (Exception e)
                 {
-                    ProcessAddedProjects(loggerResult, workProgress, false);
-                    UndoRedoService.SetName(transaction, $"Import project '{new UFile(projectPath).GetFileNameWithoutExtension()}'");
+                    loggerResult.Error(Tr._p("Log", "There was a problem importing the package."), e);
                 }
 
-                // Notify that the task is finished
-                await workProgress.NotifyWorkFinished(cancellationSource.IsCancellationRequested, loggerResult.HasErrors);
+            }, cancellationSource.Token);
+
+            // Set the range of the work in progress according to the created assets
+            workProgress.Minimum = 0;
+            workProgress.ProgressValue = 0;
+            workProgress.Maximum = session.Projects.OfType<SolutionProject>().Where(x => !packageMap.ContainsValue(x)).Sum(x => x.Package.Assets.Count);
+
+            using (var transaction = UndoRedoService.CreateTransaction())
+            {
+                ProcessAddedProjects(loggerResult, workProgress, true);
+                UndoRedoService.SetName(transaction, $"Import project '{new UFile(projectPath).GetFileNameWithoutExtension()}'");
             }
+
+            // Notify that the task is finished
+            await workProgress.NotifyWorkFinished(cancellationSource.IsCancellationRequested, loggerResult.HasErrors);
+
+            return AllPackages.FirstOrDefault(x => x.Package == package);
         }
 
         internal void ProcessAddedProjects(LoggerResult loggerResult, WorkProgressViewModel workProgress, bool packageAlreadyInSession)
         {
             var newPackages = new List<PackageViewModel>();
-            foreach (var package in session.Projects.OfType<SolutionProject>().Where(x => !packageMap.ContainsValue(x)))
+            foreach (var package in session.Projects.Where(x => !packageMap.ContainsValue(x)))
             {
                 var viewModel = CreateProjectViewModel(package, packageAlreadyInSession);
                 viewModel.LoadPackageInformation(loggerResult, workProgress);
@@ -1276,11 +1435,14 @@ private async Task AddDependency()
             // and packages that are already referenced.
             packagePicker.Filter = x =>
             {
-                return !(x == selectedPackage || x.DependsOn(selectedPackage) ||
-                         selectedPackage.Dependencies.Content.Select(r => r.Target).Contains(x));
+                if (!(x is LoadedPickablePackageViewModel loadedPackage))
+                    return true;
+
+                return !(loadedPackage.Package == selectedPackage || loadedPackage.Package.DependsOn(selectedPackage) ||
+                         selectedPackage.Dependencies.Content.Select(r => r.Target).Contains(loadedPackage.Package));
             };
 
-            if (AllPackages.All(x => !packagePicker.Filter(x)))
+            if (AllPackages.All(x => !packagePicker.Filter(new LoadedPickablePackageViewModel(x))))
             {
                 await Dialogs.MessageBox(Tr._p("Message", "There are no packages that can be added as dependencies to this package."), MessageBoxButton.OK, MessageBoxImage.Information);
                 return;
@@ -1458,6 +1620,7 @@ private void DoUpdateSessionState()
             SetCurrentProjectCommand.IsEnabled = projectSelected;
             DeleteSelectedSolutionItemsCommand.IsEnabled = canDelete;
             ExploreCommand.IsEnabled = ActiveAssetView.SelectedContent.Count > 0 || ActiveAssetView.SelectedLocations.Count == 1;
+            ExploreSourceFileCommand.IsEnabled = asset?.Asset?.MainSource != null;
             RenameDirectoryOrPackageCommand.IsEnabled = canRename;
             NewDirectoryCommand.IsEnabled = packageSelected || directorySelected;
             ActivatePackagePropertiesCommand.IsEnabled = packageSelected || directorySelected;
@@ -1752,5 +1915,26 @@ public IEnumerable<TemplateDescription> FindTemplates(TemplateScope asset)
         {
             return TemplateManager.FindTemplates(asset, session);
         }
+
+        public List<PackageName> SuggestedPackages { get; } = new List<PackageName>();
+
+        public async Task<IEnumerable<PickablePackageViewModel>> SuggestPackagesToAdd()
+        {
+            var packages = new List<PickablePackageViewModel>();
+            packages.AddRange(LocalPackages.Select(x => new LoadedPickablePackageViewModel(x)));
+            packages.AddRange(StorePackages.Select(x => new LoadedPickablePackageViewModel(x)));
+
+            // Note: later, we could even go further and add a NuGet search UI rather than a hardcoded list
+            foreach (var packageInfo in SuggestedPackages)
+            {
+                // Make sure this package is not already in the list
+                if (packages.Any(x => x.Name == packageInfo.Id))
+                    continue;
+
+                packages.Add(new UnloadedPickablePackageViewModel(this, packageInfo));
+            }
+
+            return packages;
+        }
     }
 }
diff --git a/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj b/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj
index e4052974d4..f656a4fbd1 100644
--- a/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj
+++ b/sources/editor/Xenko.Core.Assets.Editor/Xenko.Core.Assets.Editor.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -10,24 +10,21 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Extended.Wpf.Toolkit" Version="3.4.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <Reference Include="System.ComponentModel.Composition" />
     <PackageReference Include="System.Diagnostics.Tracing" Version="4.3.0" />
     <Reference Include="System.Management" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\assets\Xenko.Core.Assets\PackageSessionHelper.Solution.cs">
@@ -48,6 +45,7 @@
     <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation.Dialogs\Xenko.Core.Presentation.Dialogs.csproj" />
     <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation.Quantum\Xenko.Core.Presentation.Quantum.csproj" />
     <ProjectReference Include="..\..\assets\Xenko.Core.Assets\Xenko.Core.Assets.csproj" />
+    <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation\Xenko.Core.Presentation.csproj" />
     <ProjectReference Include="..\..\presentation\Xenko.Core.Translation.Presentation\Xenko.Core.Translation.Presentation.csproj" />
   </ItemGroup>
   <!-- Resources -->
@@ -78,14 +76,13 @@
   </ItemGroup>
   <Import Project="..\..\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <Target Name="IncludeExtraAssemblies">
     <ItemGroup>
-      <BuildOutputInPackage Include="$(OutputPath)Xceed.Wpf.DataGrid.dll" />
       <BuildOutputInPackage Include="$(OutputPath)Xceed.Wpf.Toolkit.dll" />
     </ItemGroup>
   </Target>
diff --git a/sources/editor/Xenko.Editor.CrashReport/Xenko.Editor.CrashReport.projitems b/sources/editor/Xenko.Editor.CrashReport/Xenko.Editor.CrashReport.projitems
index 5cb8a9f672..1ddaf65b60 100644
--- a/sources/editor/Xenko.Editor.CrashReport/Xenko.Editor.CrashReport.projitems
+++ b/sources/editor/Xenko.Editor.CrashReport/Xenko.Editor.CrashReport.projitems
@@ -9,9 +9,7 @@
     <Import_RootNamespace>Xenko.Editor.CrashReport</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)CrashReportForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)CrashReportForm.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CrashReportForm.Designer.cs">
       <DependentUpon>CrashReportForm.cs</DependentUpon>
     </Compile>
diff --git a/sources/editor/Xenko.Editor/Build/GameStudioDatabase.cs b/sources/editor/Xenko.Editor/Build/GameStudioDatabase.cs
index c2e64f1783..a66a222101 100644
--- a/sources/editor/Xenko.Editor/Build/GameStudioDatabase.cs
+++ b/sources/editor/Xenko.Editor/Build/GameStudioDatabase.cs
@@ -136,8 +136,7 @@ private void UpdateGameSettings(GameSettingsAsset currentGameSettings)
         {
             databaseGameSettings.GetOrCreate<EditorSettings>().RenderingMode = currentGameSettings.GetOrCreate<EditorSettings>().RenderingMode;
             databaseGameSettings.GetOrCreate<RenderingSettings>().ColorSpace = currentGameSettings.GetOrCreate<RenderingSettings>().ColorSpace;
-            databaseGameSettings.GetOrCreate<Navigation.NavigationSettings>().Groups = currentGameSettings.GetOrCreate<Navigation.NavigationSettings>().Groups;
-            databaseGameSettings.GetOrCreate<RenderingSettings>().DefaultGraphicsProfile = currentGameSettings.GetOrCreate<RenderingSettings>().DefaultGraphicsProfile;
+            databaseGameSettings.GetOrCreate<Navigation.NavigationSettings>().Groups = currentGameSettings.GetOrDefault<Navigation.NavigationSettings>().Groups;
         }
     }
 }
diff --git a/sources/editor/Xenko.Editor/EditorGame/ContentLoader/EditorContentLoader.cs b/sources/editor/Xenko.Editor/EditorGame/ContentLoader/EditorContentLoader.cs
index 1738d35d6c..b906dc3ebf 100644
--- a/sources/editor/Xenko.Editor/EditorGame/ContentLoader/EditorContentLoader.cs
+++ b/sources/editor/Xenko.Editor/EditorGame/ContentLoader/EditorContentLoader.cs
@@ -87,7 +87,7 @@ public EditorContentLoader(IDispatcherService gameDispatcher, ILogger logger, As
             settingsProvider.GameSettingsChanged += GameSettingsChanged;
             currentRenderingMode = settingsProvider.CurrentGameSettings.GetOrCreate<EditorSettings>().RenderingMode;
             currentColorSpace = settingsProvider.CurrentGameSettings.GetOrCreate<RenderingSettings>().ColorSpace;
-            currentNavigationGroupsHash = settingsProvider.CurrentGameSettings.GetOrCreate<NavigationSettings>().ComputeGroupsHash();
+            currentNavigationGroupsHash = settingsProvider.CurrentGameSettings.GetOrDefault<NavigationSettings>().ComputeGroupsHash();
         }
 
         public LoaderReferenceManager Manager { get; }
@@ -148,7 +148,7 @@ public void BuildAndReloadAsset(AssetId assetId)
             Session.Dispatcher.InvokeAsync(() => BuildAndReloadAssets(assetToRebuild.Yield()));
         }
 
-        public T GetRuntimeObject<T>(AssetItem assetItem)
+        public T GetRuntimeObject<T>(AssetItem assetItem) where T : class
         {
             if (assetItem == null) throw new ArgumentNullException(nameof(assetItem));
 
@@ -546,7 +546,7 @@ private async void GameSettingsChanged(object sender, GameSettingsChangedEventAr
             }
 
             // Update navigation meshes that are previewed inside the current scene when the game settings's group settings for navigation meshes change
-            var navigationGroupsHash = e.GameSettings.GetOrCreate<NavigationSettings>().ComputeGroupsHash();
+            var navigationGroupsHash = e.GameSettings.GetOrDefault<NavigationSettings>().ComputeGroupsHash();
             if (navigationGroupsHash != currentNavigationGroupsHash)
             {
                 currentNavigationGroupsHash = navigationGroupsHash;
diff --git a/sources/editor/Xenko.Editor/EditorGame/ContentLoader/IEditorContentLoader.cs b/sources/editor/Xenko.Editor/EditorGame/ContentLoader/IEditorContentLoader.cs
index 3e2680819d..ae4f408e74 100644
--- a/sources/editor/Xenko.Editor/EditorGame/ContentLoader/IEditorContentLoader.cs
+++ b/sources/editor/Xenko.Editor/EditorGame/ContentLoader/IEditorContentLoader.cs
@@ -57,6 +57,6 @@ public interface IEditorContentLoader : IDisposable
         /// <typeparam name="T">The expected type of the run-time object.</typeparam>
         /// <param name="assetItem">The asset corresponding to the run-time object to retrieve.</param>
         /// <returns>The run-time object corresponding to the given asset item if it exists, null otherwise.</returns>
-        T GetRuntimeObject<T>(AssetItem assetItem);
+        T GetRuntimeObject<T>(AssetItem assetItem) where T : class;
     }
 }
diff --git a/sources/editor/Xenko.Editor/EditorGame/ContentLoader/LoaderReferenceManager.cs b/sources/editor/Xenko.Editor/EditorGame/ContentLoader/LoaderReferenceManager.cs
index f8c6ca7ae5..b222ee5622 100644
--- a/sources/editor/Xenko.Editor/EditorGame/ContentLoader/LoaderReferenceManager.cs
+++ b/sources/editor/Xenko.Editor/EditorGame/ContentLoader/LoaderReferenceManager.cs
@@ -17,9 +17,9 @@ public class LoaderReferenceManager
         private struct ReferenceAccessor
         {
             private readonly IGraphNode contentNode;
-            private readonly Index index;
+            private readonly NodeIndex index;
 
-            public ReferenceAccessor(IGraphNode contentNode, Index index)
+            public ReferenceAccessor(IGraphNode contentNode, NodeIndex index)
             {
                 this.contentNode = contentNode;
                 this.index = index;
@@ -27,7 +27,7 @@ public ReferenceAccessor(IGraphNode contentNode, Index index)
 
             public void Update(object newValue)
             {
-                if (index == Index.Empty)
+                if (index == NodeIndex.Empty)
                 {
                     ((IMemberNode)contentNode).Update(newValue);
                 }
@@ -89,7 +89,7 @@ public async Task RemoveReferencer(AbsoluteId referencerId)
             }
         }
 
-        public async Task PushContentReference(AbsoluteId referencerId, AssetId contentId, IGraphNode contentNode, Index index)
+        public async Task PushContentReference(AbsoluteId referencerId, AssetId contentId, IGraphNode contentNode, NodeIndex index)
         {
             gameDispatcher.EnsureAccess();
             using (await loader.LockDatabaseAsynchronously())
@@ -129,7 +129,7 @@ public async Task PushContentReference(AbsoluteId referencerId, AssetId contentI
             }
         }
 
-        public async Task ClearContentReference(AbsoluteId referencerId, AssetId contentId, IGraphNode contentNode, Index index)
+        public async Task ClearContentReference(AbsoluteId referencerId, AssetId contentId, IGraphNode contentNode, NodeIndex index)
         {
             gameDispatcher.EnsureAccess();
             using (await loader.LockDatabaseAsynchronously())
diff --git a/sources/editor/Xenko.Editor/EditorGame/Game/EditorGameServiceRegistry.cs b/sources/editor/Xenko.Editor/EditorGame/Game/EditorGameServiceRegistry.cs
index 81958e4a89..4ebd0c562d 100644
--- a/sources/editor/Xenko.Editor/EditorGame/Game/EditorGameServiceRegistry.cs
+++ b/sources/editor/Xenko.Editor/EditorGame/Game/EditorGameServiceRegistry.cs
@@ -11,7 +11,7 @@
 
 namespace Xenko.Editor.EditorGame.Game
 {
-    public sealed class EditorGameServiceRegistry : IAsyncDisposable
+    public sealed class EditorGameServiceRegistry : Core.IAsyncDisposable
     {
         public List<IEditorGameService> Services { get; } = new List<IEditorGameService>();
 
diff --git a/sources/editor/Xenko.Editor/EditorGame/Game/EditorServiceGame.cs b/sources/editor/Xenko.Editor/EditorGame/Game/EditorServiceGame.cs
index 2606f208c3..72d080c45f 100644
--- a/sources/editor/Xenko.Editor/EditorGame/Game/EditorServiceGame.cs
+++ b/sources/editor/Xenko.Editor/EditorGame/Game/EditorServiceGame.cs
@@ -93,7 +93,7 @@ public virtual void UpdateGraphicsCompositor(GraphicsCompositor graphicsComposit
             }
         }
 
-        protected override void PrepareContext()
+        protected override void PrepareContext(float overridefov = -1f)
         {
             Services.RemoveService<IDatabaseFileProviderService>();
             Services.AddService(MicrothreadLocalDatabases.ProviderService);
diff --git a/sources/editor/Xenko.Editor/EditorGame/Game/IEditorGameService.cs b/sources/editor/Xenko.Editor/EditorGame/Game/IEditorGameService.cs
index b16cb65bdf..789d506256 100644
--- a/sources/editor/Xenko.Editor/EditorGame/Game/IEditorGameService.cs
+++ b/sources/editor/Xenko.Editor/EditorGame/Game/IEditorGameService.cs
@@ -13,7 +13,7 @@ namespace Xenko.Editor.EditorGame.Game
     /// <summary>
     /// Base interface for services that handle specific features of a <see cref="Game"/> instantiated for an asset editor.
     /// </summary>
-    public interface IEditorGameService : IAsyncDisposable
+    public interface IEditorGameService : Core.IAsyncDisposable
     {
         /// <summary>
         /// Gets whether this service has been initialized.
diff --git a/sources/editor/Xenko.Editor/Engine/EntityExtensions.cs b/sources/editor/Xenko.Editor/Engine/EntityExtensions.cs
index e2de03c38e..96a90ef413 100644
--- a/sources/editor/Xenko.Editor/Engine/EntityExtensions.cs
+++ b/sources/editor/Xenko.Editor/Engine/EntityExtensions.cs
@@ -20,12 +20,41 @@ public static Entity FindSubEntity(this Entity entity, Guid subEntityId)
             if (entity.Id == subEntityId)
                 return entity;
 
-            return entity.GetChildren().DepthFirst(x => x.GetChildren()).FirstOrDefault(x => x.Id == subEntityId);
+            foreach (var child in entity.Transform.Children)
+            {
+                if (child.Entity.FindSubEntity(subEntityId) is Entity e)
+                    return e;
+            }
+
+            return null;
         }
 
         public static Entity FindSubEntity(this Scene scene, Guid subEntityId)
         {
-            return scene.Entities.DepthFirst(x => x.GetChildren()).FirstOrDefault(x => x.Id == subEntityId);
+            if (scene.Entities.Count == 0)
+                return null;
+            
+            if (scene.Entities[0].EntityManager is EntityManager manager)
+            {
+                // The entity manager contains all entities of all the scenes under the root scene,
+                // it should be faster in most cases to iterate over that instead of going through the entity tree
+                var e = manager.GetEnumerator();
+                while (e.MoveNext())
+                {
+                    if (e.Current.Id == subEntityId && ReferenceEquals(scene, e.Current.Scene))
+                        return e.Current;
+                }
+            }
+            else // Slow path, go through tree recursively
+            {
+                foreach (Entity entity in scene.Entities)
+                {
+                    if (entity.FindSubEntity(subEntityId) is Entity e)
+                        return e;
+                }
+            }
+            
+            return null;
         }
 
         /// <summary>
diff --git a/sources/editor/Xenko.Editor/Preview/GameStudioPreviewService.cs b/sources/editor/Xenko.Editor/Preview/GameStudioPreviewService.cs
index 4dc9fa0be5..61c7705bcf 100644
--- a/sources/editor/Xenko.Editor/Preview/GameStudioPreviewService.cs
+++ b/sources/editor/Xenko.Editor/Preview/GameStudioPreviewService.cs
@@ -66,7 +66,6 @@ public GameStudioPreviewService(SessionViewModel session)
             loggerDebugPage = EditorDebugTools.CreateLogDebugPage(Logger, "Preview");
 
             previewGameSettings = GameSettingsFactory.Create();
-            previewGameSettings.GetOrCreate<RenderingSettings>().DefaultGraphicsProfile = GraphicsProfile.Level_11_0;
             UpdateGameSettings(gameSettingsProvider.CurrentGameSettings);
             previewCompileContext.SetGameSettingsAsset(previewGameSettings);
             previewCompileContext.CompilationContext = typeof(PreviewCompilationContext);
@@ -179,10 +178,7 @@ private void OnAssetPropertyChanged(object sender, AssetChangedEventArgs e)
 
         private void GraphicsDeviceManagerDeviceCreated(object sender, EventArgs e)
         {
-            // Transmit actual GraphicsProfile to preview and thumbnail builder context
-            var graphicsProfile = PreviewGame.GraphicsDeviceManager.GraphicsDevice.Features.CurrentProfile;
-            //ThumbnailService.ThumbnailBuilderContext.GetGameSettingsAsset().Get<RenderingSettings>().DefaultGraphicsProfile = graphicsProfile;
-            previewCompileContext.GetGameSettingsAsset().GetOrCreate<RenderingSettings>().DefaultGraphicsProfile = graphicsProfile;
+
         }
 
         public void SetAssetToPreview(AssetViewModel asset)
diff --git a/sources/editor/Xenko.Editor/Properties/AssemblyInfo.cs b/sources/editor/Xenko.Editor/Properties/AssemblyInfo.cs
index ffe90ea6ff..6c54f69640 100644
--- a/sources/editor/Xenko.Editor/Properties/AssemblyInfo.cs
+++ b/sources/editor/Xenko.Editor/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("361bd08b-e0a3-44f3-839a-d10a7089f7d0")]
 
-[assembly: InternalsVisibleTo("Xenko.GameStudio" + Xenko.PublicKeys.Default)]
+[assembly: InternalsVisibleTo("Focus.GameStudio" + Xenko.PublicKeys.Default)]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
diff --git a/sources/editor/Xenko.Editor/Thumbnails/GameStudioThumbnailService.cs b/sources/editor/Xenko.Editor/Thumbnails/GameStudioThumbnailService.cs
index 197a75ca3e..0e5e843cf3 100644
--- a/sources/editor/Xenko.Editor/Thumbnails/GameStudioThumbnailService.cs
+++ b/sources/editor/Xenko.Editor/Thumbnails/GameStudioThumbnailService.cs
@@ -137,13 +137,13 @@ public ListBuildStep Compile(AssetItem asset, GameSettingsAsset gameSettings)
             lock (hashLock)
             {
                 thumbnailQueueHash.Remove(asset);
-                if (thumbnailsInProgressAndContinuation.ContainsKey(asset.Id) && System.Diagnostics.Debugger.IsAttached)
+                /*if (thumbnailsInProgressAndContinuation.ContainsKey(asset.Id) && System.Diagnostics.Debugger.IsAttached)
                 {
                     // Virgile: This case should not happen, but it happened to me once and could not reproduce.
                     // Please let me know if it happens to you.
                     // Note: this is likely not critical and should work fine even if it happens.
                     System.Diagnostics.Debugger.Break();
-                }
+                }*/
                 thumbnailsInProgressAndContinuation[asset.Id] = null;
             }
 
diff --git a/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromEntityCommand.cs b/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromEntityCommand.cs
index bcc04d3d3a..eb63a67985 100644
--- a/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromEntityCommand.cs
+++ b/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromEntityCommand.cs
@@ -136,7 +136,7 @@ protected virtual CameraComponent CreateCamera(GraphicsCompositor graphicsCompos
 
             // rotate a bit the camera to have a nice viewing angle.
             var rotationQuaternion = Quaternion.RotationX(-MathUtil.Pi / 6) * Quaternion.RotationY(-MathUtil.Pi / 4);
-            rotationQuaternion.Rotate(ref cameraEntity.Transform.Position);
+            rotationQuaternion.RotateVector(ref cameraEntity.Transform.Position);
             cameraEntity.Transform.Rotation = Quaternion.RotationX(-MathUtil.Pi / 6) * Quaternion.RotationY(-MathUtil.Pi / 4);
 
             cameraComponent.NearClipPlane = cameraDistanceFromCenter / 50f;
diff --git a/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromTextureCommand.cs b/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromTextureCommand.cs
index a06fc7e732..43b8eea6ad 100644
--- a/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromTextureCommand.cs
+++ b/sources/editor/Xenko.Editor/Thumbnails/ThumbnailFromTextureCommand.cs
@@ -29,7 +29,7 @@ public abstract class ThumbnailFromTextureCommand<TRuntimeAsset> : ThumbnailFrom
         /// <summary>
         /// The color added to the background when rendering the thumbnail.
         /// </summary>
-        protected Color AdditiveColor = new Color(0, 0, 0, 0);
+        protected Color AdditiveColor = Color.Zero;
 
         /// <summary>
         /// Swizzle mode for sampling (RGBA, RRRR, RRR1)
diff --git a/sources/editor/Xenko.Editor/Thumbnails/ThumbnailGenerator.cs b/sources/editor/Xenko.Editor/Thumbnails/ThumbnailGenerator.cs
index 1e771e3ab7..d9ceeee1c9 100644
--- a/sources/editor/Xenko.Editor/Thumbnails/ThumbnailGenerator.cs
+++ b/sources/editor/Xenko.Editor/Thumbnails/ThumbnailGenerator.cs
@@ -118,7 +118,7 @@ public ThumbnailGenerator(EffectCompilerBase effectCompiler)
             var uiSystem = new UISystem(Services);
             Services.AddService(uiSystem);
 
-            var physicsSystem = new Bullet2PhysicsSystem(Services);
+            var physicsSystem = new PhysicsSystem(Services);
             Services.AddService<IPhysicsSystem>(physicsSystem);
 
             gameSystems = new GameSystemCollection(Services) { fontSystem, uiSystem, physicsSystem };
@@ -153,7 +153,7 @@ public ThumbnailGenerator(EffectCompilerBase effectCompiler)
             // create utility members
             nullGameTime = new GameTime();
             SpriteBatch = new SpriteBatch(GraphicsDevice);
-            UIBatch = new UIBatch(GraphicsDevice);
+            UIBatch = new UIBatch(GraphicsDevice, null, null);
 
             // create the pipeline
             SetUpPipeline();
diff --git a/sources/editor/Xenko.Editor/Xenko.Editor.csproj b/sources/editor/Xenko.Editor/Xenko.Editor.csproj
index 31cfcb89d7..6f00e2dcb6 100644
--- a/sources/editor/Xenko.Editor/Xenko.Editor.csproj
+++ b/sources/editor/Xenko.Editor/Xenko.Editor.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -17,12 +17,12 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.ComponentModel.Composition" />
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <Reference Include="System.ServiceModel" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
@@ -35,6 +35,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\assets\Xenko.Core.Assets.CompilerApp\Xenko.Core.Assets.CompilerApp.csproj" />
+    <ProjectReference Include="..\..\engine\Xenko.Voxels\Xenko.Voxels.csproj" />
     <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation.Quantum\Xenko.Core.Presentation.Quantum.csproj" />
     <ProjectReference Include="..\..\engine\Xenko.Assets\Xenko.Assets.csproj" />
     <ProjectReference Include="..\..\engine\Xenko.Assets.Models\Xenko.Assets.Models.csproj" />
@@ -68,5 +69,5 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/editor/Xenko.Editor/XenkoAssetsPlugin.cs b/sources/editor/Xenko.Editor/XenkoAssetsPlugin.cs
index 9da05f5681..b86f3e2870 100644
--- a/sources/editor/Xenko.Editor/XenkoAssetsPlugin.cs
+++ b/sources/editor/Xenko.Editor/XenkoAssetsPlugin.cs
@@ -27,6 +27,19 @@ public abstract class XenkoAssetsPlugin : AssetsPlugin
         private readonly Dictionary<object, object> enumImagesDictionary = new Dictionary<object, object>();
         private readonly List<ITemplateProvider> templateProviderList = new List<ITemplateProvider>();
 
+        public static List<Type> GetCleanTypes(IEnumerable<Assembly> assemblies)
+        {
+            List<Type> types = new List<Type>();
+            foreach(var a in assemblies)
+            {
+                try
+                {
+                    types.AddRange(a.GetExportedTypes());
+                } catch(Exception e) { }
+            }
+            return types;
+        }
+
         protected virtual void RegisterResourceDictionary(ResourceDictionary dictionary)
         {
             foreach (object entry in dictionary.Keys)
@@ -62,7 +75,7 @@ public sealed override void InitializePlugin(ILogger logger)
         /// <inheritdoc />
         public override void RegisterPrimitiveTypes(ICollection<Type> primitiveTypes)
         {
-            foreach (var type in AssemblyRegistry.FindAll().SelectMany(x => x.GetTypes()))
+            foreach (var type in GetCleanTypes(AssemblyRegistry.FindAll()))
             {
                 var serializer = SerializerSelector.AssetWithReuse.GetSerializer(type);
                 if (serializer != null)
diff --git a/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteComponents.cs b/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteComponents.cs
index 7e372f4134..94e0cac537 100644
--- a/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteComponents.cs
+++ b/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteComponents.cs
@@ -33,19 +33,19 @@ public void TestCopyPasteNewComponent()
             var target = new Entity();
             var propertyGraph = CreateScene(source, target);
             var copiedText = Copy(propertyGraph, source.Get<ModelComponent>());
-            PasteIntoEntity(propertyGraph, copiedText, typeof(ModelComponent), target, Index.Empty, false);
+            PasteIntoEntity(propertyGraph, copiedText, typeof(ModelComponent), target, NodeIndex.Empty, false);
             Assert.Equal(2, target.Components.Count);
             Assert.True(target.Components[0] is TransformComponent);
             Assert.True(target.Components[1] is ModelComponent);
             Assert.False(target.Get<ModelComponent>().IsShadowCaster);
         }
 
-        private void PasteIntoEntity(AssetPropertyGraph propertyGraph, string copiedText, Type componentType, Entity entity, Index index, bool replace)
+        private void PasteIntoEntity(AssetPropertyGraph propertyGraph, string copiedText, Type componentType, Entity entity, NodeIndex index, bool replace)
         {
-            if (index == Index.Empty)
-                Paste(propertyGraph, copiedText, componentType, typeof(EntityComponent), x => x["Hierarchy"].Target["Parts"].Target.IndexedTarget(new Index(entity.Id))["Entity"].Target["Components"], index, replace);
+            if (index == NodeIndex.Empty)
+                Paste(propertyGraph, copiedText, componentType, typeof(EntityComponent), x => x["Hierarchy"].Target["Parts"].Target.IndexedTarget(new NodeIndex(entity.Id))["Entity"].Target["Components"], index, replace);
             else
-                Paste(propertyGraph, copiedText, componentType, typeof(EntityComponent), x => x["Hierarchy"].Target["Parts"].Target.IndexedTarget(new Index(entity.Id))["Entity"].Target["Components"].Target, index, replace);
+                Paste(propertyGraph, copiedText, componentType, typeof(EntityComponent), x => x["Hierarchy"].Target["Parts"].Target.IndexedTarget(new NodeIndex(entity.Id))["Entity"].Target["Components"].Target, index, replace);
         }
 
         private string Copy(AssetPropertyGraph propertyGraph, object assetValue)
@@ -55,7 +55,7 @@ private string Copy(AssetPropertyGraph propertyGraph, object assetValue)
             return copiedText;
         }
 
-        private void Paste(AssetPropertyGraph propertyGraph, string copiedText, Type deserializedType, Type expectedType, Func<IObjectNode, IGraphNode> targetNodeResolver, Index index, bool replace)
+        private void Paste(AssetPropertyGraph propertyGraph, string copiedText, Type deserializedType, Type expectedType, Func<IObjectNode, IGraphNode> targetNodeResolver, NodeIndex index, bool replace)
         {
             var asset = propertyGraph.RootNode.Retrieve();
             Assert.True(service.CanPaste(copiedText, asset.GetType(), expectedType));
diff --git a/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteWithEntities.cs b/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteWithEntities.cs
index e07211bb31..51dbfb0dc1 100644
--- a/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteWithEntities.cs
+++ b/sources/editor/Xenko.GameStudio.Tests/TestCopyPasteWithEntities.cs
@@ -143,7 +143,7 @@ private static void Paste([NotNull] ICopyPasteService service, string text, [Not
             Assert.NotNull(item.Processor);
 
             var targetNode = target != null ? assetGraph.Container.NodeContainer.GetNode(target.Entity) : assetGraph.RootNode;
-            var nodeAccessor = new NodeAccessor(targetNode, Index.Empty);
+            var nodeAccessor = new NodeAccessor(targetNode, NodeIndex.Empty);
             var propertyContainer = new PropertyContainer { { EntityHierarchyPasteProcessor.TargetFolderKey, folderName } };
             item.Processor.Paste(item, assetGraph, ref nodeAccessor, ref propertyContainer);
         }
diff --git a/sources/editor/Xenko.GameStudio.Tests/Xenko.GameStudio.Tests.csproj b/sources/editor/Xenko.GameStudio.Tests/Xenko.GameStudio.Tests.csproj
index e8cc9513b8..881ceba477 100644
--- a/sources/editor/Xenko.GameStudio.Tests/Xenko.GameStudio.Tests.csproj
+++ b/sources/editor/Xenko.GameStudio.Tests/Xenko.GameStudio.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -56,5 +56,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/editor/Xenko.GameStudio/ActivateParentPaneOnGotFocusBehavior.cs b/sources/editor/Xenko.GameStudio/ActivateParentPaneOnGotFocusBehavior.cs
index c04344a786..3970a73174 100644
--- a/sources/editor/Xenko.GameStudio/ActivateParentPaneOnGotFocusBehavior.cs
+++ b/sources/editor/Xenko.GameStudio/ActivateParentPaneOnGotFocusBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Extensions;
 using Xceed.Wpf.AvalonDock.Controls;
 
diff --git a/sources/editor/Xenko.GameStudio/App.xaml b/sources/editor/Xenko.GameStudio/App.xaml
index 3844895d77..3d2e90bcc5 100644
--- a/sources/editor/Xenko.GameStudio/App.xaml
+++ b/sources/editor/Xenko.GameStudio/App.xaml
@@ -8,18 +8,8 @@
         <ResourceDictionary Source="/Xenko.Core.Assets.Editor;component/View/CommonResources.xaml"/>
       </ResourceDictionary.MergedDictionaries>
 
-      <BitmapImage x:Key="EditorIcon" UriSource="Resources/EditorIcon.png" />
-
-      <DrawingImage x:Key="VectorEditorIcon">
-        <DrawingImage.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Transform>
-              <ScaleTransform ScaleX="1" ScaleY="0.9" />
-            </DrawingGroup.Transform>
-            <GeometryDrawing Brush="#101011" Geometry="F1 M0,6.5 L 1.5,6.5 3,4.5 6,4.5 7.5,6.5 9,6.5 7,3.5 2,3.5z M0,0 L 1.5,0 3,2 6,2 7.5,0 9,0 7,3 2,3z " />
-          </DrawingGroup>
-        </DrawingImage.Drawing>
-      </DrawingImage>
+      <BitmapImage x:Key="EditorIcon" UriSource="Resources/FocusIcon.png" />
+      <BitmapImage x:Key="VectorEditorIcon" UriSource="Resources/FocusIcon.png" />
 
     </ResourceDictionary>
   </Application.Resources>
diff --git a/sources/editor/Xenko.GameStudio/AssetEditorsManager.cs b/sources/editor/Xenko.GameStudio/AssetEditorsManager.cs
index de005b51cb..b7eb112228 100644
--- a/sources/editor/Xenko.GameStudio/AssetEditorsManager.cs
+++ b/sources/editor/Xenko.GameStudio/AssetEditorsManager.cs
@@ -165,10 +165,6 @@ private void RemoveCurveEditor(bool removePane)
 
         private void CurveEditorClosed(object sender, EventArgs eventArgs)
         {
-            var editorPane = (LayoutAnchorable)sender;
-            if (editorPane.IsVisible)
-                return;
-
             RemoveCurveEditor(true);
         }
 
@@ -520,8 +516,6 @@ private static void EditorPaneClosing(object sender, CancelEventArgs e)
         private void EditorPaneClosed(object sender, EventArgs eventArgs)
         {
             var editorPane = (LayoutAnchorable)sender;
-            if (editorPane.IsVisible)
-                return;
 
             var element = editorPane.Content as FrameworkElement;
             var asset = element?.DataContext as AssetViewModel;
diff --git a/sources/editor/Xenko.GameStudio/CrashReportHelper.cs b/sources/editor/Xenko.GameStudio/CrashReportHelper.cs
index b0ce4d45cb..eae436afdf 100644
--- a/sources/editor/Xenko.GameStudio/CrashReportHelper.cs
+++ b/sources/editor/Xenko.GameStudio/CrashReportHelper.cs
@@ -186,7 +186,6 @@ public static void SendReport(string exceptionMessage, int crashLocation, string
 
             var reporter = new CrashReportForm(crashReport, new ReportSettings());
             var result = reporter.ShowDialog();
-            XenkoGameStudio.MetricsClient?.CrashedSession(result == DialogResult.Yes);
         }
 
         private static void ExpandAction(TransactionViewModel actionItem, StringBuilder sb, int increment)
diff --git a/sources/editor/Xenko.GameStudio/Debugging/AssemblyRecompiler.cs b/sources/editor/Xenko.GameStudio/Debugging/AssemblyRecompiler.cs
index 99a8f01e12..380bce767b 100644
--- a/sources/editor/Xenko.GameStudio/Debugging/AssemblyRecompiler.cs
+++ b/sources/editor/Xenko.GameStudio/Debugging/AssemblyRecompiler.cs
@@ -305,19 +305,19 @@ public static IEnumerable<string> SplitCommandLine(string commandLine)
             bool inQuotes = false;
 
             return Split(commandLine, c =>
-                                        {
-                                            if (c == '\"')
-                                                inQuotes = !inQuotes;
+            {
+                if (c == '\"')
+                    inQuotes = !inQuotes;
 
-                                            return !inQuotes && c == ' ';
-                                        })
+                return !inQuotes && c == ' ';
+            })
                                 .Select(arg => TrimMatchingQuotes(arg.Trim(), '\"'))
                                 .Where(arg => !string.IsNullOrEmpty(arg));
         }
 
         public static string TrimMatchingQuotes(string input, char quote)
         {
-            if ((input.Length >= 2) && 
+            if ((input.Length >= 2) &&
                 (input[0] == quote) && (input[input.Length - 1] == quote))
                 return input.Substring(1, input.Length - 2);
 
diff --git a/sources/editor/Xenko.GameStudio/Debugging/DebugHost.cs b/sources/editor/Xenko.GameStudio/Debugging/DebugHost.cs
index 62e735f4aa..036e3e693d 100644
--- a/sources/editor/Xenko.GameStudio/Debugging/DebugHost.cs
+++ b/sources/editor/Xenko.GameStudio/Debugging/DebugHost.cs
@@ -16,62 +16,16 @@ namespace Xenko.GameStudio.Debugging
     /// </summary>
     class DebugHost : IDisposable
     {
-        private AttachedChildProcessJob attachedChildProcessJob;
         public ServiceHost ServiceHost { get; private set; }
         public GameDebuggerHost GameHost { get; private set; }
 
         public void Start(string workingDirectory, Process debuggerProcess, LoggerResult logger)
         {
             var gameHostAssembly = typeof(GameDebuggerTarget).Assembly.Location;
-
-            using (var debugger = debuggerProcess != null ? VisualStudioDebugger.GetByProcess(debuggerProcess.Id) : null)
-            {
-                var address = "net.pipe://localhost/" + Guid.NewGuid();
-                var arguments = $"--host=\"{address}\"";
-
-                // Child process should wait for a debugger to be attached
-                if (debugger != null)
-                    arguments += " --wait-debugger-attach";
-
-                var startInfo = new ProcessStartInfo
-                {
-                    FileName = gameHostAssembly,
-                    Arguments = arguments,
-                    WorkingDirectory = workingDirectory,
-                    CreateNoWindow = true,
-                    UseShellExecute = false,
-                    RedirectStandardOutput = true,
-                    RedirectStandardError = true,
-                };
-
-                // Start WCF pipe
-                var gameDebuggerHost = new GameDebuggerHost(logger);
-                ServiceHost = new ServiceHost(gameDebuggerHost);
-                ServiceHost.AddServiceEndpoint(typeof(IGameDebuggerHost), new NetNamedPipeBinding(NetNamedPipeSecurityMode.None) { MaxReceivedMessageSize = int.MaxValue }, address);
-                ServiceHost.Open();
-
-                var process = new Process { StartInfo = startInfo };
-                process.Start();
-                process.BeginOutputReadLine();
-                process.BeginErrorReadLine();
-
-                // Make sure proces will be killed if our process is finished unexpectedly
-                attachedChildProcessJob = new AttachedChildProcessJob(process);
-
-                // Attach debugger
-                debugger?.AttachToProcess(process.Id);
-
-                GameHost = gameDebuggerHost;
-            }
         }
 
         public void Stop()
         {
-            if (attachedChildProcessJob != null)
-            {
-                attachedChildProcessJob.Dispose();
-                attachedChildProcessJob = null;
-            }
             if (ServiceHost != null)
             {
                 ServiceHost.Abort();
diff --git a/sources/editor/Xenko.GameStudio/Debugging/XenkoDebugService.cs b/sources/editor/Xenko.GameStudio/Debugging/XenkoDebugService.cs
index cb09a82f53..10d03a8959 100644
--- a/sources/editor/Xenko.GameStudio/Debugging/XenkoDebugService.cs
+++ b/sources/editor/Xenko.GameStudio/Debugging/XenkoDebugService.cs
@@ -157,23 +157,7 @@ private static async Task StartDebugHost(string executableOutputPath, ProjectWat
 
         private static async Task<Process> GetDebuggerProcess(EditorViewModel editor)
         {
-            // Check if the current solution is opened in some IDE instance
-            var process = await VisualStudioService.GetVisualStudio(editor.Session, false);
-
-            if (process == null)
-            {
-                // If not, let the user pick an instance
-                var picker = new DebuggerPickerWindow(VisualStudioDTE.GetActiveInstances());
-
-                var result = await picker.ShowModal();
-
-                if (result == DialogResult.Ok)
-                {
-                    process = await picker.SelectedDebugger.Launch(editor.Session);
-                }
-            }
-
-            return process;
+            return null;
         }
 
         public void Dispose()
diff --git a/sources/editor/Xenko.GameStudio/DebuggingViewModel.cs b/sources/editor/Xenko.GameStudio/DebuggingViewModel.cs
index 24c0bda129..3e10aecce7 100644
--- a/sources/editor/Xenko.GameStudio/DebuggingViewModel.cs
+++ b/sources/editor/Xenko.GameStudio/DebuggingViewModel.cs
@@ -395,7 +395,8 @@ private async Task<bool> BuildProjectCore(bool startProject)
                     ["XenkoBuildEngineLogVerbose"] = "true",
                 };
 
-                var projectViewModel = Session.CurrentProject.Type == ProjectType.Executable ? Session.CurrentProject : null;
+                // pick a non-shared package to preview a build for
+                ProjectViewModel projectViewModel = Session.LocalPackages.OfType<ProjectViewModel>().FirstOrDefault(x => x.Platform != PlatformType.Shared) ?? Session.LocalPackages.FirstOrDefault() as ProjectViewModel;
 
                 if (Session.CurrentProject.Platform != PlatformType.Shared)
                 {
@@ -415,29 +416,6 @@ private async Task<bool> BuildProjectCore(bool startProject)
                         case PlatformType.Windows:
                             extraProperties.Add("SolutionPlatform", "Any CPU");
                             break;
-                        case PlatformType.Android:
-                            var androidDevices = AndroidDeviceEnumerator.ListAndroidDevices();
-                            if (androidDevices.Length == 0)
-                            {
-                                logger.Error(Tr._p("Message", "No Android device found for execution."));
-                                return false;
-                            }
-
-                            // On Android, directly install on device
-                            platformName = "Android";
-                            target = "GetAndroidPackage;Install";
-
-                            // For now, use first android device
-                            // TODO: Android device selector (together with platform selector)
-                            extraProperties.Add("AdbTarget", "-s " + androidDevices[0].Serial);
-
-                            extraProperties.Add("SolutionPlatform", "Android");
-                            break;
-                        case PlatformType.iOS:
-                            platformName = "iPhone";
-                            extraProperties.Add("SolutionPlatform", "iPhone");
-                            break;
-
                         case PlatformType.Linux:
                             platformName = "Linux";
                             extraProperties.Add("SolutionPlatform", "Linux");
@@ -501,32 +479,6 @@ private async Task<bool> BuildProjectCore(bool startProject)
                                 };
                                 process.Start();
                             }
-                            break;
-                        case PlatformType.Android:
-                            // Extract GetAndroidPackage result
-                            if (!buildTask.ResultsByTarget.TryGetValue("GetAndroidPackage", out TargetResult targetResult))
-                            {
-                                logger.Error(string.Format(Tr._p("Message", "Couldn't find Android package name for {0}."), Session.CurrentProject.Name));
-                                return false;
-                            }
-
-                            var packageName = targetResult.Items[0].ItemSpec;
-
-                            // Locate ADB
-                            var adbPath = await Task.Run(() => AndroidDeviceEnumerator.GetAdbPath());
-                            if (adbPath == null)
-                            {
-                                logger.Error(Tr._p("Message", @"Android tool ""adb"" couldn't found (no running process, in registry or on the PATH). Please add it to your PATH."));
-                                return false;
-                            }
-                            // Run
-                            var adbResult = await Task.Run(() => ShellHelper.RunProcessAndGetOutput(adbPath, $@"shell monkey -p {packageName} -c android.intent.category.LAUNCHER 1"));
-                            if (adbResult.ExitCode != 0)
-                            {
-                                logger.Error(string.Format(Tr._p("Message", "Can't run Android app with adb: {0}"), string.Join(Environment.NewLine, adbResult.OutputErrors)));
-                                return false;
-                            }
-
                             break;
                         case PlatformType.Linux:
                         case PlatformType.macOS:
diff --git a/sources/editor/Xenko.GameStudio/GameStudioViewModel.cs b/sources/editor/Xenko.GameStudio/GameStudioViewModel.cs
index 251cb45912..5363e12c88 100644
--- a/sources/editor/Xenko.GameStudio/GameStudioViewModel.cs
+++ b/sources/editor/Xenko.GameStudio/GameStudioViewModel.cs
@@ -69,15 +69,6 @@ public GameStudioViewModel([NotNull] IViewModelServiceProvider serviceProvider,
         [NotNull]
         public ICommandBase ReloadSessionCommand { get; }
 
-        protected internal override IEnumerable<string> TextAssetTypes
-        {
-            get
-            {
-                yield return nameof(EffectShaderAsset);
-                yield return nameof(EffectCompositorAsset);
-            }
-        }
-
         protected override void RestartAndCreateNewSession()
         {
             restartArguments = "/NewProject" + GetCommonArguments();
@@ -147,17 +138,7 @@ private void RestartOnClosed()
 
         private static string GetCommonArguments()
         {
-            var arguments = "";
-
-            using (var debugger = VisualStudioDebugger.GetAttached())
-            {
-                if (debugger != null)
-                {
-                    arguments += $" /Reattach {debugger.ProcessId}";
-                }
-            }
-
-            return arguments;
+            return "";
         }
     }
 }
diff --git a/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml b/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml
index f487ba072a..496068b479 100644
--- a/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml
+++ b/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml
@@ -3,7 +3,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:strings="clr-namespace:Xenko.GameStudio.Resources.Strings"
         xmlns:stringsEd="clr-namespace:Xenko.Core.Assets.Editor.Resources.Strings;assembly=Xenko.Core.Assets.Editor"
         xmlns:gs="clr-namespace:Xenko.GameStudio"
@@ -21,7 +21,6 @@
         <ResourceDictionary Source="Theme.AvalonDock.xaml"/>
         <ResourceDictionary Source="/Xenko.Core.Assets.Editor;component/View/CommonResources.xaml" />
       </ResourceDictionary.MergedDictionaries>
-
       <DataTemplate x:Key="AvalonDock_GameStudio_TitleTemplate">
         <DockPanel LastChildFill="False">
           <TextBlock Margin="3 0" Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
@@ -106,6 +105,7 @@
         <MenuItem Header="{xk:Localize Open asset file, Context=Menu}" Command="{Binding Session.OpenAssetFileCommand}" CommandParameter="{Binding SingleSelectedAsset}" Icon="{xk:Image {StaticResource ImageOpenAssetFile}}"/>
         <MenuItem Header="{xk:Localize Open source file, Context=Menu}" Command="{Binding Session.OpenSourceFileCommand}" CommandParameter="{Binding SingleSelectedAsset}" Icon="{xk:Image {StaticResource ImageOpenSourceFile}}"/>
         <MenuItem Header="{xk:Localize Show in Explorer, Context=Menu}" Command="{Binding Session.ExploreCommand}" CommandParameter="{Binding SelectedContent}" Icon="{xk:Image {StaticResource ImageExplore}}"/>
+        <MenuItem Header="{xk:Localize Show source file in Explorer, Context=Menu}" Command="{Binding Session.ExploreSourceFileCommand}" CommandParameter="{Binding SingleSelectedAsset}" Icon="{xk:Image {StaticResource ImageExplore}}"/>
       </ContextMenu>
 
     </ResourceDictionary>
@@ -201,8 +201,8 @@
       </MenuItem>
       <!-- Project Menu -->
       <MenuItem Header="{xk:Localize Project, Context=Menu}" IsEnabled="{Binding Session, Converter={xk:ObjectToBool}}">
-        <MenuItem Header="{xk:Localize Build project, Context=Menu}" Command="{Binding Debugging.BuildProjectCommand}" Icon="{xk:Image {StaticResource ImageBuildProject}}" InputGestureText="{x:Static strings:KeyGestures.BuildProject}"/>
-        <MenuItem Header="{xk:Localize Start project, Context=Menu}" Command="{Binding Debugging.StartProjectCommand}" Icon="{xk:Image {StaticResource ImageStartProject}}" InputGestureText="{x:Static strings:KeyGestures.StartProject}"/>
+        <MenuItem Header="{xk:Localize Preview build (use IDE for full build), Context=Menu}" Command="{Binding Debugging.BuildProjectCommand}" Icon="{xk:Image {StaticResource ImageBuildProject}}" InputGestureText="{x:Static strings:KeyGestures.BuildProject}"/>
+        <!--MenuItem Header="{xk:Localize Start project, Context=Menu}" Command="{Binding Debugging.StartProjectCommand}" Icon="{xk:Image {StaticResource ImageStartProject}}" InputGestureText="{x:Static strings:KeyGestures.StartProject}"/-->
         <!-- Disable live-scripting commands until it is working -->
         <MenuItem Header="{xk:Localize Start live-scripting, Context=Menu}" Command="{Binding Debugging.LivePlayProjectCommand}" Icon="{xk:Image {StaticResource ImageLiveScripting}}" Visibility="Collapsed"/>
         <MenuItem Header="{xk:Localize Cancel build, Context=Menu}" Command="{Binding Debugging.CancelBuildCommand}" Icon="{xk:Image {StaticResource ImageStopBuild}}" InputGestureText="{x:Static strings:KeyGestures.CancelBuild}"/>
@@ -273,6 +273,7 @@
         <MenuItem Header="{xk:Localize Questions and answers, Context=Menu}" Command="{Binding OpenWebPageCommand}" CommandParameter="{x:Static gs:XenkoGameStudio.AnswersUrl}"/>
         <MenuItem Header="{xk:Localize Report an issue..., Context=Menu}" Command="{Binding OpenWebPageCommand}" CommandParameter="{x:Static gs:XenkoGameStudio.ReportIssueUrl}"/>
         <MenuItem Header="{xk:Localize Community forums, Context=Menu}" Command="{Binding OpenWebPageCommand}" CommandParameter="{x:Static gs:XenkoGameStudio.ForumsUrl}"/>
+        <MenuItem Header="{xk:Localize Restore Scenes/Prefabs, Context=Menu}" Command="{Binding RestoreFromBackup}"/>
         <Separator/>
         <MenuItem Header="{xk:Localize Show debug window, Context=Menu}" Command="{Binding OpenDebugWindowCommand, RelativeSource={RelativeSource AncestorType=Window}}" InputGestureText="{x:Static strings:KeyGestures.OpenDebugWindow}"/>
         <Separator/>
@@ -392,13 +393,9 @@
           </Button>
           <Separator/>
           <Button Command="{Binding Debugging.BuildProjectCommand}"
-                  ToolTip="{xk:ToolTip {xk:Localize Build the project, Context=ToolTip}, {x:Static strings:KeyGestures.BuildProject}}" xk:ToolTipHelper.Status="{Binding Status}" ToolTipService.ShowOnDisabled="True">
+                  ToolTip="{xk:ToolTip {xk:Localize Preview build (use IDE for full build), Context=ToolTip}, {x:Static strings:KeyGestures.BuildProject}}" xk:ToolTipHelper.Status="{Binding Status}" ToolTipService.ShowOnDisabled="True">
             <Image Source="{StaticResource ImageBuildProject}"/>
           </Button>
-          <Button Command="{Binding Debugging.StartProjectCommand}"
-                  ToolTip="{xk:ToolTip {xk:Localize Build the project and start the game, Context=ToolTip}, {x:Static strings:KeyGestures.StartProject}}" xk:ToolTipHelper.Status="{Binding Status}" ToolTipService.ShowOnDisabled="True">
-            <Image Source="{StaticResource ImageStartProject}"/>
-          </Button>
           <!-- Live Scripting -->
           <!-- FIXME live scripting is disabled (XK-4309) -->
           <Button Command="{Binding Debugging.LivePlayProjectCommand}"
@@ -649,9 +646,9 @@
                     </i:Interaction.Behaviors>
                   </TabControl>
                   <i:Interaction.Behaviors>
-                    <xk:OnEventCommandBehavior Command="{Binding Debugging.ResetOutputTitleCommand}" EventName="IsActiveChanged"/>
-                    <gs:LayoutAnchorableActivateOnLogBehavior MinimumLevel="Error" Collection="{Binding Debugging.BuildLog.Messages}"/>
-                    <gs:LayoutAnchorableActivateOnLogBehavior MinimumLevel="Error" Collection="{Binding Debugging.LiveScriptingLog.Messages}"/>
+                    <xk:OnEventCommandBehavior Command="{Binding Debugging.ResetOutputTitleCommand, Source={x:Static gs:GameStudioViewModel.GameStudio}}" EventName="IsActiveChanged"/>
+                    <gs:LayoutAnchorableActivateOnLogBehavior MinimumLevel="Error" Collection="{Binding Debugging.BuildLog.Messages, Source={x:Static gs:GameStudioViewModel.GameStudio}}"/>
+                    <gs:LayoutAnchorableActivateOnLogBehavior MinimumLevel="Error" Collection="{Binding Debugging.LiveScriptingLog.Messages, Source={x:Static gs:GameStudioViewModel.GameStudio}}"/>
                   </i:Interaction.Behaviors>
                 </xcad:LayoutAnchorable>
               </xcad:LayoutAnchorablePane>
@@ -866,7 +863,17 @@
 
                     <Border Grid.Row="6" Background="{StaticResource ToolBarBackgroundBrush}">
                       <DockPanel>
-                        <TextBlock Margin="4" DockPanel.Dock="Top" FontWeight="Bold" Text="{Binding HoveredItem.DataContext.DisplayName, ElementName=AssetPropertyView}" TextTrimming="CharacterEllipsis"/>
+                        <Grid Margin="4" DockPanel.Dock="Top">
+                          <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="20px"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                          </Grid.ColumnDefinitions>
+                          <TextBlock Grid.Column="0" FontWeight="Bold" FontStyle="Normal" Text="{Binding HoveredItem.DataContext.DisplayName, ElementName=AssetPropertyView}" TextTrimming="CharacterEllipsis"/>
+                          <TextBlock Grid.Column="2" FontWeight="Thin" FontStyle="Italic" TextAlignment="Right" Text="{Binding HoveredItem.DataContext.Type, Converter={xk:TypeToNamespace}, ConverterParameter='$.', ElementName=AssetPropertyView}" TextTrimming="CharacterEllipsis"/>
+                          <TextBlock Grid.Column="3" FontWeight="Bold" FontStyle="Italic" TextAlignment="Left" Text="{Binding HoveredItem.DataContext.Type, Converter={xk:TypeToTypeName}, ElementName=AssetPropertyView}" TextTrimming="CharacterEllipsis"/>
+                        </Grid>
                         <TextBlock Margin="4" Text="{Binding HoveredItem.DataContext.Documentation, ElementName=AssetPropertyView}" TextWrapping="Wrap" TextTrimming="WordEllipsis"/>
                       </DockPanel>
                     </Border>
diff --git a/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml.cs b/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml.cs
index 6a56aeb082..b78770b6a7 100644
--- a/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml.cs
+++ b/sources/editor/Xenko.GameStudio/GameStudioWindow.xaml.cs
@@ -66,8 +66,6 @@ public GameStudioWindow(EditorViewModel editor)
             InitializeComponent();
             Application.Current.Activated += (s, e) => editor.ServiceProvider.Get<IEditorDialogService>().ShowDelayedNotifications();
             Loaded += GameStudioLoaded;
-
-            OpenMetricsProjectSession(editor);
         }
 
         private async Task ResetAllLayouts()
@@ -96,46 +94,9 @@ private async Task ResetAllLayouts()
             await ReopenAssetEditors(assets);
         }
 
-        private static void OpenMetricsProjectSession(EditorViewModel editor)
-        {
-            var projectUid = editor.Session.CurrentProject?.Project.Id ?? Guid.Empty;
-
-            var execProfiles = editor.Session.LocalPackages.OfType<ProjectViewModel>().Where(x => x.Type == ProjectType.Executable);
-            var sessionPlatforms = new HashSet<PlatformType>();
-            foreach (var execProfile in execProfiles)
-            {
-                if (execProfile.Platform != PlatformType.Shared)
-                {
-                    sessionPlatforms.Add(execProfile.Platform);
-                }
-            }
-            if (sessionPlatforms.Count > 0)
-            {
-                var metricData = new StringBuilder();
-                foreach (var sessionPlatform in sessionPlatforms)
-                {
-                    metricData.Append($"#platform:{sessionPlatform}|");
-                }
-                metricData.Remove(metricData.Length - 1, 1);
-
-                XenkoGameStudio.MetricsClient?.OpenProjectSession($"#projectUid:{projectUid}|{metricData}");
-            }
-            else
-            {
-                XenkoGameStudio.MetricsClient?.OpenProjectSession($"#projectUid:{projectUid}|#platform:None");
-            }
-        }
-
         protected override void OnClosed(EventArgs e)
         {
             base.OnClosed(e);
-
-            CloseMetricsProjectSession();
-        }
-
-        private static void CloseMetricsProjectSession()
-        {
-            XenkoGameStudio.MetricsClient?.CloseProjectSession();
         }
 
         public EditorViewModel Editor => (EditorViewModel)DataContext;
@@ -222,6 +183,9 @@ private void GameStudioLoaded(object sender, RoutedEventArgs e)
                 // Open assets that were being edited in the previous session
                 ReopenAssetEditors(dockingLayout.LoadOpenAssets().ToList()).Forget();
 
+                // Make room for an autohiding taskbar so it doesn't get covered
+                this.MaxHeight = System.Windows.Forms.Screen.PrimaryScreen.WorkingArea.Size.Height - 2.0;
+
                 // Listen to clipboard
                 ClipboardMonitor.RegisterListener(this);
                 // Notify start
diff --git a/sources/editor/Xenko.GameStudio/LayoutAnchorableActivateOnLogBehavior.cs b/sources/editor/Xenko.GameStudio/LayoutAnchorableActivateOnLogBehavior.cs
index fbbb8202ef..0ae6db6d3f 100644
--- a/sources/editor/Xenko.GameStudio/LayoutAnchorableActivateOnLogBehavior.cs
+++ b/sources/editor/Xenko.GameStudio/LayoutAnchorableActivateOnLogBehavior.cs
@@ -13,7 +13,11 @@ public class LayoutAnchorableActivateOnLogBehavior : ActivateOnLogBehavior<Layou
         protected override void Activate()
         {
             AssociatedObject.Show();
-            AssociatedObject.IsSelected = true;
+            try
+            {
+                AssociatedObject.IsSelected = true;
+            } catch { } // sometimes this crashes..?
+            AssociatedObject.IsActive = true;       // This ensures this 'tab' is the selected one in a tab group
         }
     }
 }
diff --git a/sources/editor/Xenko.GameStudio/Logs/BuildLogViewModel.cs b/sources/editor/Xenko.GameStudio/Logs/BuildLogViewModel.cs
index 7eb9d86f70..ce37fd87f7 100644
--- a/sources/editor/Xenko.GameStudio/Logs/BuildLogViewModel.cs
+++ b/sources/editor/Xenko.GameStudio/Logs/BuildLogViewModel.cs
@@ -29,6 +29,14 @@ public void ForwardSerializableLog(SerializableLogMessage message)
         {
             foreach (var logger in Loggers.Keys)
             {
+                // print out shader errors first
+                if (Xenko.Rendering.EffectSystem.ShaderCompilerErrors.Count > 0) {
+                    foreach (string err in Xenko.Rendering.EffectSystem.ShaderCompilerErrors) {
+                        logger.Error(err + "\n{{end of shader error history entry}}");
+                    }
+                    Xenko.Rendering.EffectSystem.ShaderCompilerErrors.Clear();
+                }
+
                 logger.Log(message);
             }
         }
diff --git a/sources/editor/Xenko.GameStudio/Program.cs b/sources/editor/Xenko.GameStudio/Program.cs
index 7e3dcf9f04..757cc220a7 100644
--- a/sources/editor/Xenko.GameStudio/Program.cs
+++ b/sources/editor/Xenko.GameStudio/Program.cs
@@ -42,17 +42,20 @@
 using Xenko.Editor.Preview;
 using Xenko.GameStudio.View;
 using Xenko.Graphics;
-using Xenko.Metrics;
 using Xenko.PrivacyPolicy;
 using EditorSettings = Xenko.Core.Assets.Editor.Settings.EditorSettings;
 using MessageBox = System.Windows.MessageBox;
 using MessageBoxButton = System.Windows.MessageBoxButton;
 using MessageBoxImage = System.Windows.MessageBoxImage;
+using Xenko.Engine;
 
 namespace Xenko.GameStudio
 {
     public static class Program
     {
+        public const string EngineName = "Focus";
+        public const string GameStudioName = "GameStudio";
+
         private static App app;
         private static IntPtr windowHandle;
         private static bool terminating;
@@ -63,12 +66,24 @@ public static class Program
         [STAThread]
         public static void Main()
         {
+            // wait, are we already running?
+            int waitToClose = 16;
+            while (Process.GetProcessesByName("Focus.GameStudio").Length > 1)
+            {
+                if (waitToClose-- <= 0)
+                {
+                    MessageBox.Show("Focus GameStudio is already running! Only one instance is possible at a time.", "Focus", MessageBoxButton.OK, MessageBoxImage.Error);
+                    Environment.Exit(1);
+                }
+                Thread.Sleep(250);
+            }
+
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             EditorPath.EditorTitle = XenkoGameStudio.EditorName;
 
             if (IntPtr.Size == 4)
             {
-                MessageBox.Show("Xenko GameStudio requires a 64bit OS to run.", "Xenko", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(EngineName + " " + GameStudioName + " requires a 64bit OS to run.", "Focus", MessageBoxButton.OK, MessageBoxImage.Error);
                 Environment.Exit(1);
             }
 
@@ -80,91 +95,71 @@ public static void Main()
             mru.LoadFromSettings();
 
             EditorSettings.Initialize();
-            Thread.CurrentThread.Name = "Main thread";
+            Thread.CurrentThread.Name = "EditorGameThread (GameStudio)";
+            EntityManager.EnforceThreads = false;
 
-            // Install Metrics for the editor
-            using (XenkoGameStudio.MetricsClient = new MetricsClient(CommonApps.XenkoEditorAppId))
+            try
             {
-                try
+                // Environment.GetCommandLineArgs correctly process arguments regarding the presence of '\' and '"'
+                var args = Environment.GetCommandLineArgs().Skip(1).ToList();
+                var startupSessionPath = XenkoEditorSettings.StartupSession.GetValue();
+                var lastSessionPath = EditorSettings.ReloadLastSession.GetValue() ? mru.MostRecentlyUsedFiles.FirstOrDefault() : null;
+                var initialSessionPath = !UPath.IsNullOrEmpty(startupSessionPath) ? startupSessionPath : lastSessionPath?.FilePath;
+
+                // Handle arguments
+                for (var i = 0; i < args.Count; i++)
                 {
-                    // Environment.GetCommandLineArgs correctly process arguments regarding the presence of '\' and '"'
-                    var args = Environment.GetCommandLineArgs().Skip(1).ToList();
-                    var startupSessionPath = XenkoEditorSettings.StartupSession.GetValue();
-                    var lastSessionPath = EditorSettings.ReloadLastSession.GetValue() ? mru.MostRecentlyUsedFiles.FirstOrDefault() : null;
-                    var initialSessionPath = !UPath.IsNullOrEmpty(startupSessionPath) ? startupSessionPath : lastSessionPath?.FilePath;
-
-                    // Handle arguments
-                    for (var i = 0; i < args.Count; i++)
+                    if (args[i] == "/LauncherWindowHandle")
                     {
-                        if (args[i] == "/LauncherWindowHandle")
-                        {
-                            windowHandle = new IntPtr(long.Parse(args[++i]));
-                        }
-                        else if (args[i] == "/NewProject")
-                        {
-                            initialSessionPath = null;
-                        }
-                        else if (args[i] == "/DebugEditorGraphics")
-                        {
-                            EmbeddedGame.DebugMode = true;
-                        }
-                        else if (args[i] == "/RenderDoc")
-                        {
-                            // TODO: RenderDoc is not working here (when not in debug)
-                            GameStudioPreviewService.DisablePreview = true;
-                            renderDocManager = new RenderDocManager();
-                        }
-                        else if (args[i] == "/Reattach")
-                        {
-                            var debuggerProcessId = int.Parse(args[++i]);
-
-                            if (!System.Diagnostics.Debugger.IsAttached)
-                            {
-                                using (var debugger = VisualStudioDebugger.GetByProcess(debuggerProcessId))
-                                {
-                                    debugger?.Attach();
-                                }
-                            }
-                        }
-                        else if (args[i] == "/RecordEffects")
-                        {
-                            GameStudioBuilderService.GlobalEffectLogPath = args[++i];
-                        }
-                        else
-                        {
-                            initialSessionPath = args[i];
-                        }
+                        windowHandle = new IntPtr(long.Parse(args[++i]));
                     }
-                    RuntimeHelpers.RunModuleConstructor(typeof(Asset).Module.ModuleHandle);
-
-                    //listen to logger for crash report
-                    GlobalLogger.GlobalMessageLogged += GlobalLoggerOnGlobalMessageLogged;
-
-                    mainDispatcher = Dispatcher.CurrentDispatcher;
-                    mainDispatcher.InvokeAsync(() => Startup(initialSessionPath));
-
-                    using (new WindowManager(mainDispatcher))
+                    else if (args[i] == "/NewProject")
                     {
-                        app = new App { ShutdownMode = ShutdownMode.OnExplicitShutdown };
-                        app.Activated += (sender, eventArgs) =>
-                        {
-                            XenkoGameStudio.MetricsClient?.SetActiveState(true);
-                        };
-                        app.Deactivated += (sender, eventArgs) =>
-                        {
-                            XenkoGameStudio.MetricsClient?.SetActiveState(false);
-                        };
-
-                        app.InitializeComponent();
-                        app.Run();
+                        initialSessionPath = null;
+                    }
+                    else if (args[i] == "/DebugEditorGraphics")
+                    {
+                        EmbeddedGame.DebugMode = true;
+                    }
+                    else if (args[i] == "/RenderDoc")
+                    {
+                        // TODO: RenderDoc is not working here (when not in debug)
+                        GameStudioPreviewService.DisablePreview = true;
+                        renderDocManager = new RenderDocManager();
+                    }
+                    else if (args[i] == "/Reattach")
+                    {
+                        // not supported
+                    }
+                    else if (args[i] == "/RecordEffects")
+                    {
+                        GameStudioBuilderService.GlobalEffectLogPath = args[++i];
+                    }
+                    else
+                    {
+                        initialSessionPath = args[i];
                     }
-
-                    renderDocManager?.Shutdown();
                 }
-                catch (Exception e)
+                RuntimeHelpers.RunModuleConstructor(typeof(Asset).Module.ModuleHandle);
+
+                //listen to logger for crash report
+                GlobalLogger.GlobalMessageLogged += GlobalLoggerOnGlobalMessageLogged;
+
+                mainDispatcher = Dispatcher.CurrentDispatcher;
+                mainDispatcher.InvokeAsync(() => Startup(initialSessionPath));
+
+                using (new WindowManager(mainDispatcher))
                 {
-                    HandleException(e, 0);
+                    app = new App { ShutdownMode = ShutdownMode.OnExplicitShutdown };
+                    app.InitializeComponent();
+                    app.Run();
                 }
+
+                renderDocManager?.Shutdown();
+            }
+            catch (Exception e)
+            {
+                HandleException(e, 0);
             }
         }
 
diff --git a/sources/editor/Xenko.GameStudio/Resources/CrashReportImage.png b/sources/editor/Xenko.GameStudio/Resources/CrashReportImage.png
index 37f3675feb..4b5059507f 100644
--- a/sources/editor/Xenko.GameStudio/Resources/CrashReportImage.png
+++ b/sources/editor/Xenko.GameStudio/Resources/CrashReportImage.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93c9a44652f144b0a28981e1f9373637d9e671f7a6e22620e659a162d09f62c3
-size 2993
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.GameStudio/Resources/EditorIcon.png b/sources/editor/Xenko.GameStudio/Resources/EditorIcon.png
deleted file mode 100644
index 75cd35bf1e..0000000000
--- a/sources/editor/Xenko.GameStudio/Resources/EditorIcon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:742c263d0eb2267168a1eb47ffcf278e9aafa16c8bab6a5758fad8e932e78310
-size 340
diff --git a/sources/editor/Xenko.GameStudio/Resources/FocusIcon.png b/sources/editor/Xenko.GameStudio/Resources/FocusIcon.png
new file mode 100644
index 0000000000..4b5059507f
--- /dev/null
+++ b/sources/editor/Xenko.GameStudio/Resources/FocusIcon.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/editor/Xenko.GameStudio/Resources/Logo.ico b/sources/editor/Xenko.GameStudio/Resources/Logo.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/editor/Xenko.GameStudio/Resources/Logo.ico and b/sources/editor/Xenko.GameStudio/Resources/Logo.ico differ
diff --git a/sources/editor/Xenko.GameStudio/Resources/XenkoLogoDefaultWhite.png b/sources/editor/Xenko.GameStudio/Resources/XenkoLogoDefaultWhite.png
index 72d1c26e07..94cc23f633 100644
--- a/sources/editor/Xenko.GameStudio/Resources/XenkoLogoDefaultWhite.png
+++ b/sources/editor/Xenko.GameStudio/Resources/XenkoLogoDefaultWhite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9cf9ba7b04dfac5dddb63b2b4e819d8c1a25b80daab079a22179d4e033845d7
-size 3848
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/sources/editor/Xenko.GameStudio/Theme.AvalonDock.xaml b/sources/editor/Xenko.GameStudio/Theme.AvalonDock.xaml
index cf1de96db3..c01f8da2dd 100644
--- a/sources/editor/Xenko.GameStudio/Theme.AvalonDock.xaml
+++ b/sources/editor/Xenko.GameStudio/Theme.AvalonDock.xaml
@@ -27,10 +27,6 @@
     <ResourceDictionary Source="/Xenko.Core.Assets.Editor;component/View/CommonResources.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#101011" />
-  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
-  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
-
   <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
   <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
   <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
diff --git a/sources/editor/Xenko.GameStudio/View/AboutPage.xaml b/sources/editor/Xenko.GameStudio/View/AboutPage.xaml
index 372b3e67c8..f012302e2a 100644
--- a/sources/editor/Xenko.GameStudio/View/AboutPage.xaml
+++ b/sources/editor/Xenko.GameStudio/View/AboutPage.xaml
@@ -7,7 +7,7 @@
         xmlns:gameStudio="clr-namespace:Xenko.GameStudio"
         xmlns:crashReport="clr-namespace:Xenko.Editor.CrashReport"
         mc:Ignorable="d" 
-        Title="{xk:Localize About Xenko, Context=About}"
+        Title="{xk:Localize About Focus Engine, Context=About}"
         SizeToContent="WidthAndHeight" ResizeMode="NoResize"
         Style="{DynamicResource WindowChromeStyle}" ShowInTaskbar="False"
         d:DesignHeight="300" d:DesignWidth="300">
@@ -42,7 +42,7 @@
       <!-- Copyright info -->
       <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Left" VerticalAlignment="Center">
-        <Run Text="{xk:Localize Xenko version, Context=About}" /> <Run Text="{x:Static gameStudio:XenkoGameStudio.EditorVersionWithMetadata}" /><LineBreak />
+        <Run Text="{xk:Localize Focus version, Context=About}" /> <Run Text="{x:Static gameStudio:XenkoGameStudio.EditorVersionWithMetadata}" /><LineBreak />
         <Run Text="{x:Static gameStudio:XenkoGameStudio.CopyrightText1}" /><LineBreak />
         <Run Text="{x:Static gameStudio:XenkoGameStudio.CopyrightText2}" /><LineBreak />
         <!-- License -->
@@ -53,7 +53,7 @@
       <TextBlock Grid.Row="0" Grid.Column="2"
                  HorizontalAlignment="Right" VerticalAlignment="Top" FlowDirection="RightToLeft" IsEnabled="True">
         <!-- Open-source notice -->
-        <Run Text="{xk:Localize Xenko uses open-source software, Context=About}" /><LineBreak />
+        <Run Text="{xk:Localize Focus uses open-source software, Context=About}" /><LineBreak />
         <Hyperlink TextDecorations="Underline" Click="ThirdParty_OnClick">
           <Run Text="{xk:Localize See the list, Context=About}" />
         </Hyperlink>
diff --git a/sources/editor/Xenko.GameStudio/Xenko.GameStudio.csproj b/sources/editor/Xenko.GameStudio/Xenko.GameStudio.csproj
index d9ee3e1ffb..95c090f227 100644
--- a/sources/editor/Xenko.GameStudio/Xenko.GameStudio.csproj
+++ b/sources/editor/Xenko.GameStudio/Xenko.GameStudio.csproj
@@ -1,11 +1,10 @@
 <Project>
   <Import Project="..\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems" Label="Shared" Condition="Exists('..\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems')" />
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
-  <Import Project="..\..\tools\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems" Label="Shared" />
   <Import Project="..\Xenko.Editor.CrashReport\Xenko.Editor.CrashReport.projitems" Label="Shared" />
   <Import Project="..\..\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -13,7 +12,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <AssemblyName>Xenko.GameStudio</AssemblyName>
+    <AssemblyName>Focus.GameStudio</AssemblyName>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>--auto-module-initializer</XenkoAssemblyProcessorOptions>
     <XenkoLocalized>true</XenkoLocalized>
@@ -39,15 +38,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SharpDX" Version="4.0.1" />
-    <PackageReference Include="EnvDTE" Version="8.0.1" />
-    <PackageReference Include="Xenko.Metrics" Version="1.0.0" />
+    <PackageReference Include="SharpDX" Version="4.2.0" />
+    <PackageReference Include="EnvDTE" Version="8.0.2" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
     <PackageReference Include="Xenko.CrashReport" Version="1.0.1" />
-    <Reference Include="Mono.Cecil">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>$(XenkoCommonDependenciesDir)Mono.Cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
-    <PackageReference Include="QuickGraph" Version="3.6.61119.7" />
+    <PackageReference Include="Mono.Cecil" Version="0.10.4" />
     <Reference Include="Renci.SshNet, Version=2016.0.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\deps\SSH.NET\Renci.SshNet.dll</HintPath>
@@ -62,9 +57,6 @@
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
@@ -93,9 +85,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\engine\Xenko.Debugger\Xenko.Debugger.csproj" />
-    <ProjectReference Include="..\..\tools\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj" />
     <ProjectReference Include="..\Xenko.Assets.Presentation\Xenko.Assets.Presentation.csproj" />
-    <ProjectReference Include="..\..\tools\Xenko.EffectCompilerServer\Xenko.EffectCompilerServer.csproj" IncludeAssets="Build" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="..\..\..\BACKERS.md" Link="BACKERS.md">
@@ -131,7 +121,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
diff --git a/sources/editor/Xenko.GameStudio/XenkoGameStudio.cs b/sources/editor/Xenko.GameStudio/XenkoGameStudio.cs
index 49165f8568..295d5f7638 100644
--- a/sources/editor/Xenko.GameStudio/XenkoGameStudio.cs
+++ b/sources/editor/Xenko.GameStudio/XenkoGameStudio.cs
@@ -3,7 +3,6 @@
 #pragma warning disable 436 // The type 'type' in 'assembly' conflicts with the imported type 'type2' in 'assembly' (due to XenkoVersion being duplicated)
 
 using Xenko.Core.Annotations;
-using Xenko.Metrics;
 
 namespace Xenko.GameStudio
 {
@@ -16,15 +15,15 @@ public static class XenkoGameStudio
         public static string CopyrightText2 => "© 2011-2018 Silicon Studio Corp.";
 
         [NotNull]
-        public static string EditorName => $"Xenko Game Studio {EditorVersion}";
+        public static string EditorName => Program.EngineName + " " + Program.GameStudioName + " " + EditorVersion;
 
         [NotNull]
-        public static string EditorVersion => XenkoVersion.NuGetVersion;
+        public static string EditorVersion => XenkoVersion.VersionToShowInEditor;
 
         [NotNull]
-        public static string EditorVersionWithMetadata => XenkoVersion.NuGetVersion + XenkoVersion.BuildMetadata;
+        public static string EditorVersionWithMetadata => EditorVersion;
 
-        public static string EditorVersionMajor => new System.Version(XenkoVersion.PublicVersion).ToString(2);
+        public static string EditorVersionMajor => new System.Version(EditorVersion).ToString(2);
 
         [NotNull]
         public static string AnswersUrl => "http://answers.xenko.com/";
@@ -37,7 +36,5 @@ public static class XenkoGameStudio
 
         [NotNull]
         public static string ReportIssueUrl => "https://github.com/xenko3d/xenko/issues/";
-
-        public static MetricsClient MetricsClient;
     }
 }
diff --git a/sources/editor/Xenko.PrivacyPolicy/PrivacyPolicyWindow.xaml b/sources/editor/Xenko.PrivacyPolicy/PrivacyPolicyWindow.xaml
index 977df035c2..9cca474aaa 100644
--- a/sources/editor/Xenko.PrivacyPolicy/PrivacyPolicyWindow.xaml
+++ b/sources/editor/Xenko.PrivacyPolicy/PrivacyPolicyWindow.xaml
@@ -9,7 +9,7 @@
   <Window.Resources>
     <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ExpressionDark/Theme.xaml" />
+        <ResourceDictionary Source="/Xenko.Core.Presentation;component/Themes/ThemeSelector.xaml" />
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </Window.Resources>
diff --git a/sources/editor/Xenko.Samples.Templates/ThisPackageVersion.cs b/sources/editor/Xenko.Samples.Templates/ThisPackageVersion.cs
new file mode 100644
index 0000000000..f7a68fb94c
--- /dev/null
+++ b/sources/editor/Xenko.Samples.Templates/ThisPackageVersion.cs
@@ -0,0 +1,8 @@
+namespace Xenko.Samples.Templates
+{
+    static class ThisPackageVersion
+    {
+        // we version this package manually because most of the time the samples are big and don't need to be updated
+        public static string Current = "3.2.0.1-beta03";
+    }
+}
diff --git a/sources/editor/Xenko.Samples.Templates/Xenko.Samples.Templates.csproj b/sources/editor/Xenko.Samples.Templates/Xenko.Samples.Templates.csproj
index c819ecd044..b5b22fcef8 100644
--- a/sources/editor/Xenko.Samples.Templates/Xenko.Samples.Templates.csproj
+++ b/sources/editor/Xenko.Samples.Templates/Xenko.Samples.Templates.csproj
@@ -5,11 +5,14 @@
     <XenkoPackAssets>true</XenkoPackAssets>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <!-- Note: we version this package manually because most of the time the samples are big and don't need to be updated.
-         PLEASE UPDATE XenkoDefaultAssetsPlugin.LoadDefaultTemplates() accordingly! -->
-    <PackageVersion>3.1.0.1</PackageVersion>
-    <PackageVersion Condition="'$(XenkoOfficialBuild)' != 'true'">$(PackageVersion)-beta02</PackageVersion>
+    <!-- Extract PackageVersion from ThisPackageVersion.cs -->
+    <_XenkoThisPackageVersionLines>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)ThisPackageVersion.cs'))</_XenkoThisPackageVersionLines>
+    <PackageVersion>$([System.Text.RegularExpressions.Regex]::Match($(_XenkoThisPackageVersionLines), `.*Current = \"(.*)\";.*`).Groups[1].Value)</PackageVersion>
   </PropertyGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
+
+  <ItemGroup>
+    <Compile Include="ThisPackageVersion.cs" />
+  </ItemGroup>
 </Project>
diff --git a/sources/engine/Xenko.Assets.Models/AssimpAssetImporter.cs b/sources/engine/Xenko.Assets.Models/AssimpAssetImporter.cs
index 2fbaf363ce..4d4c94d571 100644
--- a/sources/engine/Xenko.Assets.Models/AssimpAssetImporter.cs
+++ b/sources/engine/Xenko.Assets.Models/AssimpAssetImporter.cs
@@ -8,16 +8,12 @@
 using Xenko.Animations;
 using Xenko.Assets.Textures;
 using Xenko.Importer.Common;
+using System.Collections.Generic;
 
 namespace Xenko.Assets.Models
 {
     public class AssimpAssetImporter : ModelAssetImporter
     {
-        static AssimpAssetImporter()
-        {
-            NativeLibrary.PreloadLibrary("assimp-vc140-mt.dll", typeof(AssimpAssetImporter));
-        }
-
         // Supported file extensions for this importer
         internal const string FileExtensions = ".dae;.3ds;.gltf;.glb;.obj;.blend;.x;.md2;.md3;.dxf;.ply;.stl;.stp";
 
@@ -32,15 +28,19 @@ static AssimpAssetImporter()
         /// <inheritdoc/>
         public override EntityInfo GetEntityInfo(UFile localPath, Logger logger, AssetImporterParameters importParameters)
         {
-            var meshConverter = new Importer.AssimpNET.MeshConverter(logger);
-            var entityInfo = meshConverter.ExtractEntity(localPath.FullPath, null, importParameters.IsTypeSelectedForOutput(typeof(TextureAsset)));
+            var meshConverter = new Importer.Assimp.MeshConverter(logger);
+
+            if (!importParameters.InputParameters.TryGet(DeduplicateMaterialsKey, out var deduplicateMaterials))
+                deduplicateMaterials = true;    // Dedupe is the default value
+
+            var entityInfo = meshConverter.ExtractEntity(localPath.FullPath, null, importParameters.IsTypeSelectedForOutput(typeof(TextureAsset)), deduplicateMaterials);
             return entityInfo;
         }
 
         /// <inheritdoc/>
         public override void GetAnimationDuration(UFile localPath, Logger logger, AssetImporterParameters importParameters, out TimeSpan startTime, out TimeSpan endTime)
         {
-            var meshConverter = new Importer.AssimpNET.MeshConverter(logger);
+            var meshConverter = new Importer.Assimp.MeshConverter(logger);
             var sceneData = meshConverter.ConvertAnimation(localPath.FullPath, "");
 
             startTime = CompressedTimeSpan.MaxValue; // This will go down, so we start from positive infinity
@@ -65,5 +65,21 @@ public override void GetAnimationDuration(UFile localPath, Logger logger, AssetI
             if (endTime == CompressedTimeSpan.MinValue)
                 endTime = CompressedTimeSpan.Zero;
         }
+
+        public override IEnumerable<AssetItem> Import(UFile localPath, AssetImporterParameters importParameters)
+        {
+            var assetItems = base.Import(localPath, importParameters);
+            // Need to remember the DeduplicateMaterials setting per ModelAsset since the importer may be rerun on this asset
+            if (!importParameters.InputParameters.TryGet(DeduplicateMaterialsKey, out var deduplicateMaterials))
+                deduplicateMaterials = true;    // Dedupe is the default value
+            foreach (var item in assetItems)
+            {
+                if (item.Asset is ModelAsset modelAsset)
+                {
+                    modelAsset.DeduplicateMaterials = deduplicateMaterials;
+                }
+            }
+            return assetItems;
+        }
     }
 }
diff --git a/sources/engine/Xenko.Assets.Models/ImportAssimpCommand.cs b/sources/engine/Xenko.Assets.Models/ImportAssimpCommand.cs
index c4f87411bf..91d791dafb 100644
--- a/sources/engine/Xenko.Assets.Models/ImportAssimpCommand.cs
+++ b/sources/engine/Xenko.Assets.Models/ImportAssimpCommand.cs
@@ -32,9 +32,9 @@ public static bool IsSupportingExtensions(string ext)
             return supportedExtensions.Any(supExt => supExt.Equals(extToLower));
         }
 
-        private Xenko.Importer.AssimpNET.MeshConverter CreateMeshConverter(ICommandContext commandContext)
+        private Xenko.Importer.Assimp.MeshConverter CreateMeshConverter(ICommandContext commandContext)
         {
-            return new Xenko.Importer.AssimpNET.MeshConverter(commandContext.Logger)
+            return new Xenko.Importer.Assimp.MeshConverter(commandContext.Logger)
             {
                 AllowUnsignedBlendIndices = this.AllowUnsignedBlendIndices,
             };
@@ -47,7 +47,7 @@ protected override Model LoadModel(ICommandContext commandContext, ContentManage
             // Note: FBX exporter uses Materials for the mapping, but Assimp already uses indices so we can reuse them
             // We should still unify the behavior to be more consistent at some point (i.e. if model was changed on the HDD but not in the asset).
             // This should probably be better done during a large-scale FBX/Assimp refactoring.
-            var sceneData = converter.Convert(SourcePath, Location);
+            var sceneData = converter.Convert(SourcePath, Location, DeduplicateMaterials);
             return sceneData;
         }
 
diff --git a/sources/engine/Xenko.Assets.Models/ImportModelCommand.Model.cs b/sources/engine/Xenko.Assets.Models/ImportModelCommand.Model.cs
index 7db4584ff2..f6e5dfd95e 100644
--- a/sources/engine/Xenko.Assets.Models/ImportModelCommand.Model.cs
+++ b/sources/engine/Xenko.Assets.Models/ImportModelCommand.Model.cs
@@ -28,6 +28,7 @@ public partial class ImportModelCommand
         public bool Allow32BitIndex { get; set; }
         public int MaxInputSlots { get; set; }
         public bool AllowUnsignedBlendIndices { get; set; }
+        public bool DeduplicateMaterials { get; set; }
         public List<ModelMaterial> Materials { get; set; }
         public string EffectName { get; set; }
 
@@ -207,8 +208,7 @@ private object ExportModel(ICommandContext commandContext, ContentManager conten
                     new AnonymousEqualityComparer<Mesh>((x, y) =>
                     x.MaterialIndex == y.MaterialIndex // Same material
                     && ArrayExtensions.ArraysEqual(x.Skinning?.Bones, y.Skinning?.Bones) // Same bones
-                    && CompareParameters(model, x, y) // Same parameters
-                    && CompareShadowOptions(model, x, y), // Same shadow parameters
+                    && CompareParameters(model, x, y), // Same parameters
                     x => 0)).ToList())
                 {
                     if (meshesPerDrawCall.Count() == 1)
diff --git a/sources/engine/Xenko.Assets.Models/ImportModelCommand.cs b/sources/engine/Xenko.Assets.Models/ImportModelCommand.cs
index 4d1c0bb0ba..d8014d7b98 100644
--- a/sources/engine/Xenko.Assets.Models/ImportModelCommand.cs
+++ b/sources/engine/Xenko.Assets.Models/ImportModelCommand.cs
@@ -173,22 +173,6 @@ private static bool CompareParameters(Model model, Mesh baseMesh, Mesh newMesh)
             return IsSubsetOf(localParams, newMesh.Parameters) && IsSubsetOf(newMesh.Parameters, localParams);
         }
         
-        /// <summary>
-        /// Compares the shadow options between the two meshes.
-        /// </summary>
-        /// <param name="baseMesh">The base mesh.</param>
-        /// <param name="newMesh">The mesh to compare.</param>
-        /// <param name="extra">Unused parameter.</param>
-        /// <returns>True if the options are the same, false otherwise.</returns>
-        private static bool CompareShadowOptions(Model model, Mesh baseMesh, Mesh newMesh)
-        {
-            // TODO: Check is Model the same for the two mesh?
-            var material1 = model.Materials.GetItemOrNull(baseMesh.MaterialIndex);
-            var material2 = model.Materials.GetItemOrNull(newMesh.MaterialIndex);
-
-            return material1 == material2 || (material1 != null && material2 != null && material1.IsShadowCaster == material2.IsShadowCaster);
-        }
-
         /// <summary>
         /// Test if two ParameterCollection are equal
         /// </summary>
diff --git a/sources/engine/Xenko.Assets.Models/ModelAsset.cs b/sources/engine/Xenko.Assets.Models/ModelAsset.cs
index b3189c9639..05d65ba7fa 100644
--- a/sources/engine/Xenko.Assets.Models/ModelAsset.cs
+++ b/sources/engine/Xenko.Assets.Models/ModelAsset.cs
@@ -66,10 +66,10 @@ public sealed class ModelAsset : Asset, IAssetWithSource, IModelAsset
 
 
         /// <summary>
-        /// Gets or sets the model meshe merge property. When set to true to a model without skeleton, the meshes of the model are merged together by material.
+        /// Gets or sets the model meshes merge property. When set to true to a model without skeleton, the meshes of the model are merged together by material.
         /// </summary>
         /// <userdoc>
-        /// When checked and the model has no skeleton, the meshes of the model are merged together by material. 
+        /// When checked and the model has no skeleton, the meshes of the model are merged together by material.
         /// In most cases this improves the performances but prevents the meshes to be culled independently.
         /// </userdoc>
         [DataMember(35)]
@@ -82,6 +82,11 @@ public sealed class ModelAsset : Asset, IAssetWithSource, IModelAsset
         [Category]
         public List<ModelMaterial> Materials { get; } = new List<ModelMaterial>();
 
+        [DataMember(45)]
+        [DefaultValue(true)]
+        [Display(Browsable = false)]
+        public bool DeduplicateMaterials { get; set; } = true;
+
         [DataMember(50)]
         [Category]
         public List<IModelModifier> Modifiers { get; } = new List<IModelModifier>();
diff --git a/sources/engine/Xenko.Assets.Models/ModelAssetCompiler.cs b/sources/engine/Xenko.Assets.Models/ModelAssetCompiler.cs
index 51af0a3c10..6235829873 100644
--- a/sources/engine/Xenko.Assets.Models/ModelAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets.Models/ModelAssetCompiler.cs
@@ -41,7 +41,7 @@ protected override void Prepare(AssetCompilerContext context, AssetItem assetIte
             var renderingSettings = gameSettingsAsset.GetOrCreate<RenderingSettings>();
             var allow32BitIndex = renderingSettings.DefaultGraphicsProfile >= GraphicsProfile.Level_9_2;
             var maxInputSlots = renderingSettings.DefaultGraphicsProfile >= GraphicsProfile.Level_10_1 ? 32 : 16;
-            var allowUnsignedBlendIndices = context.GetGraphicsPlatform(assetItem.Package) != GraphicsPlatform.OpenGLES;
+            var allowUnsignedBlendIndices = true; //context.GetGraphicsPlatform(assetItem.Package) != GraphicsPlatform.OpenGLES;
             var extension = asset.Source.GetFileExtension();
 
             // Find skeleton asset, if any
@@ -67,6 +67,7 @@ protected override void Prepare(AssetCompilerContext context, AssetItem assetIte
             importModelCommand.ScaleImport = asset.ScaleImport;
             importModelCommand.PivotPosition = asset.PivotPosition;
             importModelCommand.MergeMeshes = asset.MergeMeshes;
+            importModelCommand.DeduplicateMaterials = asset.DeduplicateMaterials;
             importModelCommand.ModelModifiers = asset.Modifiers;
 
             if (skeleton != null)
diff --git a/sources/engine/Xenko.Assets.Models/ModelAssetImporter.cs b/sources/engine/Xenko.Assets.Models/ModelAssetImporter.cs
index 57f4c62983..48e956dce3 100644
--- a/sources/engine/Xenko.Assets.Models/ModelAssetImporter.cs
+++ b/sources/engine/Xenko.Assets.Models/ModelAssetImporter.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Linq;
 using System.Collections.Generic;
+using Xenko.Core;
 using Xenko.Core.Assets;
 using Xenko.Core.Assets.Analysis;
 using Xenko.Core.Diagnostics;
@@ -19,6 +20,8 @@ namespace Xenko.Assets.Models
 {
     public abstract class ModelAssetImporter : AssetImporterBase
     {
+        public static readonly PropertyKey<bool> DeduplicateMaterialsKey = new PropertyKey<bool>("DeduplicateMaterials", typeof(ModelAssetImporter));
+
         public override IEnumerable<Type> RootAssetTypes
         {
             get
diff --git a/sources/engine/Xenko.Assets.Models/PrefabModelAssetCompiler.cs b/sources/engine/Xenko.Assets.Models/PrefabModelAssetCompiler.cs
index fbff984ae7..72273421f1 100644
--- a/sources/engine/Xenko.Assets.Models/PrefabModelAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets.Models/PrefabModelAssetCompiler.cs
@@ -285,14 +285,8 @@ private static MaterialInstance ExtractMaterialInstance(MaterialInstance baseIns
                 var instance = new MaterialInstance
                 {
                     Material = modelComponent.Materials.SafeGet(index) ?? baseInstance.Material ?? fallbackMaterial,
-                    IsShadowCaster = modelComponent.IsShadowCaster,
                 };
 
-                if (baseInstance != null)
-                {
-                    instance.IsShadowCaster = instance.IsShadowCaster && baseInstance.IsShadowCaster;
-                }
-
                 return instance;
             }
 
diff --git a/sources/engine/Xenko.Assets.Models/Xenko.Assets.Models.csproj b/sources/engine/Xenko.Assets.Models/Xenko.Assets.Models.csproj
index f2517238aa..5eaa3bdf5e 100644
--- a/sources/engine/Xenko.Assets.Models/Xenko.Assets.Models.csproj
+++ b/sources/engine/Xenko.Assets.Models/Xenko.Assets.Models.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>$(XenkoAssemblyProcessorDefaultOptions)</XenkoAssemblyProcessorOptions>
@@ -12,6 +12,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Analysis\**" />
+    <EmbeddedResource Remove="Analysis\**" />
+    <None Remove="Analysis\**" />
+    <_SettingsFiles Remove="Analysis\**" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -19,29 +25,23 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\tools\Xenko.Importer.Assimp\Xenko.Importer.Assimp.vcxproj" PrivateAssets="All" />
-    <ProjectReference Include="..\..\tools\Xenko.Importer.Common\Xenko.Importer.Common.vcxproj" PrivateAssets="All" />
+    <ProjectReference Include="..\..\tools\Xenko.Importer.Assimp\Xenko.Importer.Assimp.csproj" />
+    <ProjectReference Include="..\..\tools\Xenko.Importer.Common\Xenko.Importer.Common.csproj" />
     <ProjectReference Include="..\..\tools\Xenko.Importer.FBX\Xenko.Importer.FBX.vcxproj" PrivateAssets="All" />
     <ProjectReference Include="..\Xenko.Assets\Xenko.Assets.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Analysis\" />
-  </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <Target Name="IncludeExtraAssemblies">
     <ItemGroup>
-      <BuildOutputInPackage Include="$(OutputPath)Xenko.Importer.Assimp.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)Xenko.Importer.Assimp.ssdeps" />
-      <BuildOutputInPackage Include="$(OutputPath)Xenko.Importer.FBX.dll" />
+     <!-- Needed by .NET Core runtime to be able to load C++/CLI assemblies -->
+      <BuildOutputInPackage Include="$(OutputPath)ijwhost.dll" Condition="Exists('$(OutputPath)ijwhost.dll')" />
       <BuildOutputInPackage Include="$(OutputPath)Xenko.Importer.FBX.ssdeps" />
-      <BuildOutputInPackage Include="$(OutputPath)Xenko.Importer.Common.dll" />
-      <TfmSpecificPackageFile Include="$(OutputPath)x64\assimp-vc140-mt.dll" PackagePath="lib\$(TargetFramework)\x64" />
-      <TfmSpecificPackageFile Include="$(OutputPath)x64\libfbxsdk.dll" PackagePath="lib\$(TargetFramework)\x64" />
-    </ItemGroup>
+      <BuildOutputInPackage Include="$(OutputPath)x64\libfbxsdk.dll" TargetPath="x64\libfbxsdk.dll" />
+	</ItemGroup>
   </Target>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Assets.Tests/TestMaterialGenerator.cs b/sources/engine/Xenko.Assets.Tests/TestMaterialGenerator.cs
index dbdcdaf442..dffc7cb437 100644
--- a/sources/engine/Xenko.Assets.Tests/TestMaterialGenerator.cs
+++ b/sources/engine/Xenko.Assets.Tests/TestMaterialGenerator.cs
@@ -60,7 +60,8 @@ public void TestSimpleNoLayer()
 
             var expected = @"!ShaderMixinSource
 Mixins:
-    -   ClassName: MaterialSurfaceArray
+    - !ShaderClassSource
+        ClassName: MaterialSurfaceArray
 Compositions:
     layers: !ShaderArraySource
         Values:"
@@ -68,7 +69,8 @@ public void TestSimpleNoLayer()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceDiffuse
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceDiffuse
                 Compositions:
                     diffuseMap: !ShaderClassSource
                         ClassName: ComputeColorConstantColorLink
@@ -77,7 +79,8 @@ public void TestSimpleNoLayer()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceLightingAndShading
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceLightingAndShading
                 Compositions:
                     surfaces: !ShaderArraySource
                         Values:
@@ -140,7 +143,8 @@ public void TestOneLayerSameShadingModel()
 
             var expected = @"!ShaderMixinSource
 Mixins:
-    -   ClassName: MaterialSurfaceArray
+    - !ShaderClassSource
+        ClassName: MaterialSurfaceArray
 Compositions:
     layers: !ShaderArraySource
         Values:"
@@ -148,7 +152,8 @@ public void TestOneLayerSameShadingModel()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceDiffuse
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceDiffuse
                 Compositions:
                     diffuseMap: !ShaderClassSource
                         ClassName: ComputeColorConstantColorLink
@@ -157,7 +162,8 @@ public void TestOneLayerSameShadingModel()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceStreamsBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceStreamsBlend
                 Compositions:"
 // These streams will be used to blend attributes (in the shader, after "layer" has been processed
 + @"
@@ -173,13 +179,15 @@ public void TestOneLayerSameShadingModel()
 + @"
                     layer: !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceArray
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceArray
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
@@ -188,7 +196,8 @@ public void TestOneLayerSameShadingModel()
 + @"
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matBlend, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -198,7 +207,8 @@ public void TestOneLayerSameShadingModel()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceLightingAndShading
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceLightingAndShading
                 Compositions:
                     surfaces: !ShaderArraySource
                         Values:
@@ -258,7 +268,8 @@ public void TestOneLayer2ShadingModels()
 
             var expected = @"!ShaderMixinSource
 Mixins:
-    -   ClassName: MaterialSurfaceArray
+    - !ShaderClassSource
+        ClassName: MaterialSurfaceArray
 Compositions:
     layers: !ShaderArraySource
         Values:"
@@ -266,7 +277,8 @@ public void TestOneLayer2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceDiffuse
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceDiffuse
                 Compositions:
                     diffuseMap: !ShaderClassSource
                         ClassName: ComputeColorConstantColorLink
@@ -275,7 +287,8 @@ public void TestOneLayer2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceLightingAndShading
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceLightingAndShading
                 Compositions:
                     surfaces: !ShaderArraySource
                         Values:
@@ -286,7 +299,8 @@ public void TestOneLayer2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                         GenericArguments: [matBlend, r]
                 Compositions:
                     computeColorSource: !ShaderClassSource
@@ -296,7 +310,8 @@ public void TestOneLayer2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceShadingBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceShadingBlend
                 Compositions:
                     layers: !ShaderArraySource
                         Values:"
@@ -304,7 +319,8 @@ public void TestOneLayer2ShadingModels()
 + @"
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceMetalness
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceMetalness
                                 Compositions:
                                     metalnessMap: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
@@ -313,13 +329,15 @@ public void TestOneLayer2ShadingModels()
 + @"
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceLightingAndShading
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceLightingAndShading
                                 Compositions:
                                     surfaces: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                 Compositions:
                                                     environmentFunction: !ShaderClassSource
                                                         ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -389,7 +407,8 @@ public void Test2Layers2ShadingModels()
 
             var expected = @"!ShaderMixinSource
 Mixins:
-    -   ClassName: MaterialSurfaceArray
+    - !ShaderClassSource
+        ClassName: MaterialSurfaceArray
 Compositions:
     layers: !ShaderArraySource
         Values:"
@@ -397,7 +416,8 @@ public void Test2Layers2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceStreamsBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceStreamsBlend
                 Compositions:
                     blends: !ShaderArraySource
                         Values:
@@ -409,20 +429,23 @@ public void Test2Layers2ShadingModels()
                                 GenericArguments: [matColorBase]
                     layer: !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceArray
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceArray
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matBlend, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -432,7 +455,8 @@ public void Test2Layers2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceLightingAndShading
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceLightingAndShading
                 Compositions:
                     surfaces: !ShaderArraySource
                         Values:
@@ -443,7 +467,8 @@ public void Test2Layers2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                         GenericArguments: [matBlend, r]
                 Compositions:
                     computeColorSource: !ShaderClassSource
@@ -451,13 +476,15 @@ public void Test2Layers2ShadingModels()
                         GenericArguments: [Material.BlendValue.i1]
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceShadingBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceShadingBlend
                 Compositions:
                     layers: !ShaderArraySource
                         Values:
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceMetalness
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceMetalness
                                 Compositions:
                                     metalnessMap: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
@@ -466,13 +493,15 @@ public void Test2Layers2ShadingModels()
 + @"
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceLightingAndShading
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceLightingAndShading
                                 Compositions:
                                     surfaces: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                 Compositions:
                                                     environmentFunction: !ShaderClassSource
                                                         ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -569,7 +598,8 @@ public void Test3Layers2ShadingModels()
 
             var expected = @"!ShaderMixinSource
 Mixins:
-    -   ClassName: MaterialSurfaceArray
+    - !ShaderClassSource
+        ClassName: MaterialSurfaceArray
 Compositions:
     layers: !ShaderArraySource
         Values:"
@@ -577,7 +607,8 @@ public void Test3Layers2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceStreamsBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceStreamsBlend
                 Compositions:
                     blends: !ShaderArraySource
                         Values:
@@ -589,20 +620,23 @@ public void Test3Layers2ShadingModels()
                                 GenericArguments: [matColorBase]
                     layer: !ShaderMixinSource
                         Mixins:
-                            -   ClassName: MaterialSurfaceArray
+                            - !ShaderClassSource
+                                ClassName: MaterialSurfaceArray
                         Compositions:
                             layers: !ShaderArraySource
                                 Values:
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceDiffuse
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceDiffuse
                                         Compositions:
                                             diffuseMap: !ShaderClassSource
                                                 ClassName: ComputeColorConstantColorLink
                                                 GenericArguments: [Material.DiffuseValue]
                                     - !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                 GenericArguments: [matBlend, r]
                                         Compositions:
                                             computeColorSource: !ShaderClassSource
@@ -612,7 +646,8 @@ public void Test3Layers2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceLightingAndShading
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceLightingAndShading
                 Compositions:
                     surfaces: !ShaderArraySource
                         Values:
@@ -623,7 +658,8 @@ public void Test3Layers2ShadingModels()
 + @"
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                         GenericArguments: [matBlend, r]
                 Compositions:
                     computeColorSource: !ShaderClassSource
@@ -631,7 +667,8 @@ public void Test3Layers2ShadingModels()
                         GenericArguments: [TestMaterialGenerator.BlendValueCustom1]
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceShadingBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceShadingBlend
                 Compositions:
                     layers: !ShaderArraySource
                         Values:"
@@ -639,7 +676,8 @@ public void Test3Layers2ShadingModels()
 + @"
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceMetalness
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceMetalness
                                 Compositions:
                                     metalnessMap: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
@@ -648,7 +686,8 @@ public void Test3Layers2ShadingModels()
 + @"
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceStreamsBlend
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceStreamsBlend
                                 Compositions:
                                     blends: !ShaderArraySource
                                         Values:
@@ -657,20 +696,23 @@ public void Test3Layers2ShadingModels()
                                                 GenericArguments: [matSpecular]
                                     layer: !ShaderMixinSource
                                         Mixins:
-                                            -   ClassName: MaterialSurfaceArray
+                                            - !ShaderClassSource
+                                                ClassName: MaterialSurfaceArray
                                         Compositions:
                                             layers: !ShaderArraySource
                                                 Values:
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceMetalness
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceMetalness
                                                         Compositions:
                                                             metalnessMap: !ShaderClassSource
                                                                 ClassName: ComputeColorConstantFloatLink
                                                                 GenericArguments: [TestMaterialGenerator.MetalnessValueCustom2]
                                                     - !ShaderMixinSource
                                                         Mixins:
-                                                            -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                                            - !ShaderClassSource
+                                                                ClassName: MaterialSurfaceSetStreamFromComputeColor
                                                                 GenericArguments: [matBlend, r]
                                                         Compositions:
                                                             computeColorSource: !ShaderClassSource
@@ -680,13 +722,15 @@ public void Test3Layers2ShadingModels()
 + @"
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceLightingAndShading
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceLightingAndShading
                                 Compositions:
                                     surfaces: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                 Compositions:
                                                     environmentFunction: !ShaderClassSource
                                                         ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -761,20 +805,23 @@ public void Test2Layers3ShadingModels()
 
             var expected = @"!ShaderMixinSource
 Mixins:
-    -   ClassName: MaterialSurfaceArray
+    - !ShaderClassSource
+        ClassName: MaterialSurfaceArray
 Compositions:
     layers: !ShaderArraySource
         Values:
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceDiffuse
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceDiffuse
                 Compositions:
                     diffuseMap: !ShaderClassSource
                         ClassName: ComputeColorConstantColorLink
                         GenericArguments: [Material.DiffuseValue]
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceLightingAndShading
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceLightingAndShading
                 Compositions:
                     surfaces: !ShaderArraySource
                         Values:
@@ -783,7 +830,8 @@ public void Test2Layers3ShadingModels()
                                 GenericArguments: [false]
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                         GenericArguments: [matBlend, r]
                 Compositions:
                     computeColorSource: !ShaderClassSource
@@ -791,26 +839,30 @@ public void Test2Layers3ShadingModels()
                         GenericArguments: [TestMaterialGenerator.BlendValueCustom1]
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceShadingBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceShadingBlend
                 Compositions:
                     layers: !ShaderArraySource
                         Values:
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceMetalness
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceMetalness
                                 Compositions:
                                     metalnessMap: !ShaderClassSource
                                         ClassName: ComputeColorConstantFloatLink
                                         GenericArguments: [Material.MetalnessValue]
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceLightingAndShading
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceLightingAndShading
                                 Compositions:
                                     surfaces: !ShaderArraySource
                                         Values:
                                             - !ShaderMixinSource
                                                 Mixins:
-                                                    -   ClassName: MaterialSurfaceShadingSpecularMicrofacet
+                                                    - !ShaderClassSource
+                                                        ClassName: MaterialSurfaceShadingSpecularMicrofacet
                                                 Compositions:
                                                     environmentFunction: !ShaderClassSource
                                                         ClassName: MaterialSpecularMicrofacetEnvironmentGGXLUT
@@ -822,7 +874,8 @@ public void Test2Layers3ShadingModels()
                                                         ClassName: MaterialSpecularMicrofacetNormalDistributionGGX
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                         GenericArguments: [matBlend, r]
                 Compositions:
                     computeColorSource: !ShaderClassSource
@@ -830,13 +883,15 @@ public void Test2Layers3ShadingModels()
                         GenericArguments: [TestMaterialGenerator.BlendValueCustom2]
             - !ShaderMixinSource
                 Mixins:
-                    -   ClassName: MaterialSurfaceShadingBlend
+                    - !ShaderClassSource
+                        ClassName: MaterialSurfaceShadingBlend
                 Compositions:
                     layers: !ShaderArraySource
                         Values:
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                         GenericArguments: [matEmissive, rgba]
                                 Compositions:
                                     computeColorSource: !ShaderClassSource
@@ -844,7 +899,8 @@ public void Test2Layers3ShadingModels()
                                         GenericArguments: [Material.EmissiveValue]
                             - !ShaderMixinSource
                                 Mixins:
-                                    -   ClassName: MaterialSurfaceSetStreamFromComputeColor
+                                    - !ShaderClassSource
+                                        ClassName: MaterialSurfaceSetStreamFromComputeColor
                                         GenericArguments: [matEmissiveIntensity, r]
                                 Compositions:
                                     computeColorSource: !ShaderClassSource
diff --git a/sources/engine/Xenko.Assets.Tests/Xenko.Assets.Tests.csproj b/sources/engine/Xenko.Assets.Tests/Xenko.Assets.Tests.csproj
index d83b6ebac7..3b11b79492 100644
--- a/sources/engine/Xenko.Assets.Tests/Xenko.Assets.Tests.csproj
+++ b/sources/engine/Xenko.Assets.Tests/Xenko.Assets.Tests.csproj
@@ -1,11 +1,11 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Assets.Tests</RootNamespace>
     <AssemblyName>Xenko.Assets.Tests</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableDefaultItems>false</EnableDefaultItems>
     <XenkoPlatform>Windows</XenkoPlatform>
@@ -132,6 +132,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.csproj b/sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.csproj
index 482f05f378..33d278fa26 100644
--- a/sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.csproj
+++ b/sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.csproj
@@ -1,11 +1,11 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Assets.Tests2</RootNamespace>
     <AssemblyName>Xenko.Assets.Tests2</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <EnableDefaultItems>false</EnableDefaultItems>
     <XenkoPlatform>Windows</XenkoPlatform>
@@ -51,6 +51,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Assets/AllAssets.Display.cs b/sources/engine/Xenko.Assets/AllAssets.Display.cs
index 817fc60638..e6ee3737d6 100644
--- a/sources/engine/Xenko.Assets/AllAssets.Display.cs
+++ b/sources/engine/Xenko.Assets/AllAssets.Display.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using Xenko.Core;
@@ -102,6 +102,11 @@ namespace Physics
         partial class ColliderShapeAsset
         {
         }
+
+        [Display((int)AssetDisplayPriority.Physics + 50, "Heightmap")]
+        partial class HeightmapAsset
+        {
+        }
     }
 
     namespace Rendering
diff --git a/sources/engine/Xenko.Assets/AssetCompilerContextExtensions.cs b/sources/engine/Xenko.Assets/AssetCompilerContextExtensions.cs
index c64fe72e76..41e3ef062d 100644
--- a/sources/engine/Xenko.Assets/AssetCompilerContextExtensions.cs
+++ b/sources/engine/Xenko.Assets/AssetCompilerContextExtensions.cs
@@ -40,13 +40,6 @@ public static GraphicsPlatform GetGraphicsPlatform(this AssetCompilerContext con
             {
                 if (runtimeIdentifier.Contains("-d3d11"))
                     return GraphicsPlatform.Direct3D11;
-                else if (runtimeIdentifier.Contains("-d3d12"))
-                    return GraphicsPlatform.Direct3D12;
-                // Note: testing opengles before opengl since one string contains another
-                else if (runtimeIdentifier.Contains("-opengles"))
-                    return GraphicsPlatform.OpenGLES;
-                else if (runtimeIdentifier.Contains("-opengl"))
-                    return GraphicsPlatform.OpenGL;
                 else if (runtimeIdentifier.Contains("-vulkan"))
                     return GraphicsPlatform.Vulkan;
             }
@@ -60,13 +53,9 @@ public static GraphicsPlatform GetDefaultGraphicsPlatform(this PlatformType plat
             switch (platformType)
             {
                 case PlatformType.Windows:
-                case PlatformType.UWP:
                     return GraphicsPlatform.Direct3D11;
-                case PlatformType.Android:
-                case PlatformType.iOS:
-                    return GraphicsPlatform.OpenGLES;
                 case PlatformType.Linux:
-                    return GraphicsPlatform.OpenGL;
+                    return GraphicsPlatform.Vulkan;
                 case PlatformType.macOS:
                     return GraphicsPlatform.Vulkan;
                 default:
diff --git a/sources/engine/Xenko.Assets/Effect/EffectByteCodeToSourceCodeWriter.cs b/sources/engine/Xenko.Assets/Effect/EffectByteCodeToSourceCodeWriter.cs
index d0bae8c459..740b6ebe22 100644
--- a/sources/engine/Xenko.Assets/Effect/EffectByteCodeToSourceCodeWriter.cs
+++ b/sources/engine/Xenko.Assets/Effect/EffectByteCodeToSourceCodeWriter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.IO;
@@ -67,15 +67,8 @@ namespace {1}
             switch (graphicsPlatform)
             {
                 case GraphicsPlatform.Direct3D11:
-                case GraphicsPlatform.Direct3D12:
                     xenkoDefine = "XENKO_GRAPHICS_API_DIRECT3D";
                     break;
-                case GraphicsPlatform.OpenGL:
-                    xenkoDefine = "XENKO_GRAPHICS_API_OPENGLCORE";
-                    break;
-                case GraphicsPlatform.OpenGLES:
-                    xenkoDefine = "XENKO_GRAPHICS_API_OPENGLES";
-                    break;
                 case GraphicsPlatform.Vulkan:
                     xenkoDefine = "XENKO_GRAPHICS_API_VULKAN";
                     break;
diff --git a/sources/engine/Xenko.Assets/Effect/EffectCompositorAsset.cs b/sources/engine/Xenko.Assets/Effect/EffectCompositorAsset.cs
index aff901becc..e68b3cf6f8 100644
--- a/sources/engine/Xenko.Assets/Effect/EffectCompositorAsset.cs
+++ b/sources/engine/Xenko.Assets/Effect/EffectCompositorAsset.cs
@@ -17,7 +17,7 @@ public sealed partial class EffectCompositorAsset : ProjectSourceCodeWithFileGen
         /// </summary>
         public const string FileExtension = ".xkfx";
 
-        public override string Generator => "XenkoShaderKeyGenerator";
+        public override string Generator => "XenkoEffectCodeGenerator";
 
         public override void SaveGeneratedAsset(AssetItem assetItem)
         {
diff --git a/sources/engine/Xenko.Assets/Entities/ComponentChecks/IEntityComponentCheck.cs b/sources/engine/Xenko.Assets/Entities/ComponentChecks/IEntityComponentCheck.cs
new file mode 100644
index 0000000000..12d3c209c3
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Entities/ComponentChecks/IEntityComponentCheck.cs
@@ -0,0 +1,30 @@
+using System;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Engine;
+
+namespace Xenko.Assets.Entities.ComponentChecks
+{
+    /// <summary>
+    /// Interface for component checks executed during asset compilation.
+    /// </summary>
+    public interface IEntityComponentCheck
+    {
+        /// <summary>
+        /// A predicate determining if a component can be passed to <see cref="Check(EntityComponent)"/>.
+        /// </summary>
+        /// <param name="componentType">Type of the component to be checked.</param>
+        /// <returns>Returns <c>true</c> if the component of <paramref name="componentType"/> can be passed to <see cref="Check(EntityComponent)"/>.</returns>
+        bool AppliesTo(Type componentType);
+
+        /// <summary>
+        /// Checks if the component state is valid and reports appropriate errors/warnings.
+        /// </summary>
+        /// <param name="component">Component to check.</param>
+        /// <param name="entity">Entity the <paramref name="component"/> is associated with.</param>
+        /// <param name="assetItem">Asset item the <paramref name="entity"/> belongs to.</param>
+        /// <param name="targetUrlInStorage">URL of the <paramref name="assetItem"/>.</param>
+        /// <param name="result">Logger result to write information to.</param>
+        void Check(EntityComponent component, Entity entity, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result);
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Entities/ComponentChecks/ModelComponentCheck.cs b/sources/engine/Xenko.Assets/Entities/ComponentChecks/ModelComponentCheck.cs
new file mode 100644
index 0000000000..fb981b8f3b
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Entities/ComponentChecks/ModelComponentCheck.cs
@@ -0,0 +1,42 @@
+using System;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Core.Serialization;
+using Xenko.Engine;
+
+namespace Xenko.Assets.Entities.ComponentChecks
+{
+    /// <summary>
+    /// Checks if the <see cref="ModelComponent"/> has a Model associated with it and that this Model has a reachable asset.
+    /// </summary>
+    public class ModelComponentCheck : IEntityComponentCheck
+    {
+        /// <inheritdoc/>
+        public bool AppliesTo(Type componentType)
+        {
+            return componentType == typeof(ModelComponent);
+        }
+
+        /// <inheritdoc/>
+        public void Check(EntityComponent component, Entity entity, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result)
+        {
+            var modelComponent = component as ModelComponent;
+            if (modelComponent.Model == null)
+            {
+                result.Warning($"The entity [{targetUrlInStorage}:{entity.Name}] has a model component that does not reference any model.");
+            }
+            else
+            {
+                var modelAttachedReference = AttachedReferenceManager.GetAttachedReference(modelComponent.Model);
+                var modelId = modelAttachedReference.Id;
+
+                // compute the full path to the source asset.
+                var modelAssetItem = assetItem.Package.Session.FindAsset(modelId);
+                if (modelAssetItem == null)
+                {
+                    result.Error($"The entity [{targetUrlInStorage}:{entity.Name}] is referencing an unreachable model.");
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Entities/ComponentChecks/ModelNodeLinkComponentCheck.cs b/sources/engine/Xenko.Assets/Entities/ComponentChecks/ModelNodeLinkComponentCheck.cs
new file mode 100644
index 0000000000..b274709ce2
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Entities/ComponentChecks/ModelNodeLinkComponentCheck.cs
@@ -0,0 +1,31 @@
+using System;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Engine;
+
+namespace Xenko.Assets.Entities.ComponentChecks
+{
+    /// <summary>
+    /// Checks the validity of a <see cref="ModelNodeLinkComponent"/>.
+    /// </summary>
+    public class ModelNodeLinkComponentCheck : IEntityComponentCheck
+    {
+        /// <inheritdoc/>
+        public bool AppliesTo(Type componentType)
+        {
+            return componentType == typeof(ModelNodeLinkComponent);
+        }
+
+        /// <inheritdoc/>
+        public void Check(EntityComponent component, Entity entity, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result)
+        {
+            var nodeLinkComponent = component as ModelNodeLinkComponent;
+            nodeLinkComponent.ValidityCheck();
+            if (!nodeLinkComponent.IsValid)
+            {
+                result.Warning($"The Model Node Link between {entity.Name} and {nodeLinkComponent.Target?.Entity.Name} is invalid.");
+                nodeLinkComponent.Target = null;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Entities/ComponentChecks/RequiredMembersCheck.cs b/sources/engine/Xenko.Assets/Entities/ComponentChecks/RequiredMembersCheck.cs
new file mode 100644
index 0000000000..4d1e4a427e
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Entities/ComponentChecks/RequiredMembersCheck.cs
@@ -0,0 +1,71 @@
+using System;
+using System.Reflection;
+using Xenko.Core.Annotations;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Engine;
+
+namespace Xenko.Assets.Entities.ComponentChecks
+{
+    /// <summary>
+    /// Checks if all members of a component with a <see cref="MemberRequiredAttribute"/> are assigned a value.
+    /// </summary>
+    public class RequiredMembersCheck : IEntityComponentCheck
+    {
+        /// <inheritdoc/>
+        public bool AppliesTo(Type componentType)
+        {
+            return true; // applies to any component
+        }
+
+        /// <inheritdoc/>
+        public void Check(EntityComponent component, Entity entity, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result)
+        {
+            var type = component.GetType();
+            var componentName = type.Name; // QUESTION: Should we check attributes for another name?
+
+            var fields = type.GetFields(); // public fields, only those can be serialized?
+            var properties = type.GetRuntimeProperties(); // all properties may have a DataMember attribute
+
+            foreach (var field in fields)
+            {
+                if (field.FieldType.IsValueType)
+                    continue; // value types cannot be null, and must always have a proper default value
+
+                MemberRequiredAttribute memberRequired;
+                if ((memberRequired = field.GetCustomAttribute<MemberRequiredAttribute>()) != null)
+                {
+                    if (field.GetValue(component) == null)
+                        WriteResult(result, componentName, targetUrlInStorage, entity.Name, field.Name, memberRequired.ReportAs);
+                }
+            }
+
+            foreach (var prop in properties)
+            {
+                if (prop.PropertyType.IsValueType)
+                    continue; // value types cannot be null, and must always have a proper default value
+
+                MemberRequiredAttribute memberRequired;
+                if ((memberRequired = prop.GetCustomAttribute<MemberRequiredAttribute>()) != null)
+                {
+                    if (prop.GetValue(component) == null)
+                        WriteResult(result, componentName, targetUrlInStorage, entity.Name, prop.Name, memberRequired.ReportAs);
+                }
+            }
+        }
+
+        private void WriteResult(AssetCompilerResult result, string componentName, string targetUrlInStorage, string entityName, string memberName, MemberRequiredReportType reportType)
+        {
+            var logMsg = $"The component {componentName} on entity [{targetUrlInStorage}:{entityName}] is missing a value on a required field '{memberName}'.";
+            switch (reportType)
+            {
+                case MemberRequiredReportType.Warning:
+                    result.Warning(logMsg);
+                    break;
+                case MemberRequiredReportType.Error:
+                    result.Error(logMsg);
+                    break;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Entities/EntityHierarchyCompilerBase.cs b/sources/engine/Xenko.Assets/Entities/EntityHierarchyCompilerBase.cs
index c7c81e7af0..fd4daf0931 100644
--- a/sources/engine/Xenko.Assets/Entities/EntityHierarchyCompilerBase.cs
+++ b/sources/engine/Xenko.Assets/Entities/EntityHierarchyCompilerBase.cs
@@ -3,6 +3,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using Xenko.Assets.Entities.ComponentChecks;
+using Xenko.Core.Annotations;
 using Xenko.Core.Assets;
 using Xenko.Core.Assets.Compiler;
 using Xenko.Core.Serialization;
@@ -22,36 +25,12 @@ protected override void Prepare(AssetCompilerContext context, AssetItem assetIte
             var asset = (T)assetItem.Asset;
             foreach (var entityData in asset.Hierarchy.Parts.Values)
             {
-                // TODO: How to make this code pluggable?
-                var modelComponent = entityData.Entity.Components.Get<ModelComponent>();                
-                if (modelComponent != null)
+                foreach (var component in entityData.Entity.Components)
                 {
-                    if (modelComponent.Model == null)
+                    foreach(var check in componentChecks)
                     {
-                        result.Warning($"The entity [{targetUrlInStorage}:{entityData.Entity.Name}] has a model component that does not reference any model.");
-                    }
-                    else
-                    {
-                        var modelAttachedReference = AttachedReferenceManager.GetAttachedReference(modelComponent.Model);
-                        var modelId = modelAttachedReference.Id;
-
-                        // compute the full path to the source asset.
-                        var modelAssetItem = assetItem.Package.Session.FindAsset(modelId);
-                        if (modelAssetItem == null)
-                        {
-                            result.Error($"The entity [{targetUrlInStorage}:{entityData.Entity.Name}] is referencing an unreachable model.");
-                        }
-                    }
-                }
-
-                var nodeLinkComponent = entityData.Entity.Components.Get<ModelNodeLinkComponent>();
-                if (nodeLinkComponent != null)
-                {
-                    nodeLinkComponent.ValidityCheck();
-                    if (!nodeLinkComponent.IsValid)
-                    {
-                        result.Warning($"The Model Node Link between {entityData.Entity.Name} and {nodeLinkComponent.Target?.Entity.Name} is invalid.");
-                        nodeLinkComponent.Target = null;
+                        if (check.AppliesTo(component.GetType()))
+                            check.Check(component, entityData.Entity, assetItem, targetUrlInStorage, result);
                     }
                 }
             }
@@ -60,6 +39,14 @@ protected override void Prepare(AssetCompilerContext context, AssetItem assetIte
             result.BuildSteps.Add(Create(targetUrlInStorage, asset, assetItem.Package));
         }
 
+        private static List<IEntityComponentCheck> componentChecks = new List<IEntityComponentCheck>
+        {
+            // TODO: How to make this code pluggable?
+            new ModelComponentCheck(),
+            new ModelNodeLinkComponentCheck(),
+            new RequiredMembersCheck(),
+        };
+
         protected abstract AssetCommand<T> Create(string url, T assetParameters, Package package);
     }
 }
diff --git a/sources/engine/Xenko.Assets/GameSettingsAsset.cs b/sources/engine/Xenko.Assets/GameSettingsAsset.cs
index c988115f1b..ec9662ef89 100644
--- a/sources/engine/Xenko.Assets/GameSettingsAsset.cs
+++ b/sources/engine/Xenko.Assets/GameSettingsAsset.cs
@@ -124,6 +124,11 @@ public T TryGet<T>() where T : Configuration
             return settings;
         }
 
+        public T GetOrDefault<T>() where T : Configuration, new()
+        {
+            return TryGet<T>() ?? ObjectFactoryRegistry.NewInstance<T>();
+        }
+
         public T GetOrCreate<T>(PlatformType platform) where T : Configuration, new()
         {
             ConfigPlatforms configPlatform;
diff --git a/sources/engine/Xenko.Assets/GameSettingsAssetCompiler.cs b/sources/engine/Xenko.Assets/GameSettingsAssetCompiler.cs
index 1426740c6f..cfd2706606 100644
--- a/sources/engine/Xenko.Assets/GameSettingsAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/GameSettingsAssetCompiler.cs
@@ -30,7 +30,7 @@ protected override void Prepare(AssetCompilerContext context, AssetItem assetIte
             var asset = (GameSettingsAsset)assetItem.Asset;
             // TODO: We should ignore game settings stored in dependencies
             result.BuildSteps = new AssetBuildStep(assetItem);
-            result.BuildSteps.Add(new GameSettingsCompileCommand(targetUrlInStorage, assetItem.Package, context.Platform, context.GetCompilationMode(), asset));
+            result.BuildSteps.Add(new GameSettingsCompileCommand(targetUrlInStorage, assetItem.Package, context.Package, context.Platform, context.GetCompilationMode(), asset));
         }
 
         public override IEnumerable<Type> GetRuntimeTypes(AssetItem assetItem)
@@ -45,10 +45,12 @@ private class GameSettingsCompileCommand : AssetCommand<GameSettingsAsset>
             private readonly PlatformType platform;
             private readonly CompilationMode compilationMode;
             private readonly Package package;
-            public GameSettingsCompileCommand(string url, Package package, PlatformType platform, CompilationMode compilationMode, GameSettingsAsset asset)
+            private readonly Package entryPackage;
+            public GameSettingsCompileCommand(string url, Package package, Package entryPackage, PlatformType platform, CompilationMode compilationMode, GameSettingsAsset asset)
                 : base(url, asset, package)
             {
                 this.package = package;
+                this.entryPackage = entryPackage ?? package;
                 this.platform = platform;
                 this.compilationMode = compilationMode;
             }
@@ -59,8 +61,7 @@ protected override void ComputeParameterHash(BinarySerializationWriter writer)
 
                 // Hash used parameters from package
                 writer.Write(package.Meta.Name);
-                writer.Write(package.UserSettings.GetValue(GameUserSettings.Effect.EffectCompilation));
-                writer.Write(package.UserSettings.GetValue(GameUserSettings.Effect.RecordUsedEffects));
+                writer.Write(entryPackage.UserSettings.GetValue(GameUserSettings.Effect.EffectCompilation));
                 writer.Write(compilationMode);
 
                 // Hash platform
@@ -77,8 +78,7 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                     SplashScreenUrl = Parameters.SplashScreenTexture != null && (compilationMode == CompilationMode.Release || compilationMode == CompilationMode.AppStore) ? AttachedReferenceManager.GetUrl(Parameters.SplashScreenTexture) : null,
                     SplashScreenColor = Parameters.SplashScreenColor,
                     DoubleViewSplashScreen = Parameters.DoubleViewSplashScreen,
-                    EffectCompilation = package.UserSettings.GetValue(GameUserSettings.Effect.EffectCompilation),
-                    RecordUsedEffects = package.UserSettings.GetValue(GameUserSettings.Effect.RecordUsedEffects),
+                    EffectCompilation = entryPackage.UserSettings.GetValue(GameUserSettings.Effect.EffectCompilation),
                     Configurations = new PlatformConfigurations(),
                     CompilationMode = compilationMode
                 };
@@ -104,7 +104,7 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
 
                 //make sure we modify platform specific files to set the wanted orientation
                 if (package.Container is SolutionProject solutionProject)
-                    SetPlatformOrientation(solutionProject, Parameters.GetOrCreate<RenderingSettings>().DisplayOrientation);
+                    SetPlatformOrientation(solutionProject, Parameters.GetOrDefault<RenderingSettings>().DisplayOrientation);
 
                 var assetManager = new ContentManager(MicrothreadLocalDatabases.ProviderService);
                 assetManager.Save(Url, result);
diff --git a/sources/engine/Xenko.Assets/GameSettingsFactory.cs b/sources/engine/Xenko.Assets/GameSettingsFactory.cs
index c28f89a191..c12a0c3413 100644
--- a/sources/engine/Xenko.Assets/GameSettingsFactory.cs
+++ b/sources/engine/Xenko.Assets/GameSettingsFactory.cs
@@ -37,8 +37,6 @@ public static GameSettingsAsset Create()
 
             asset.GetOrCreate<AudioEngineSettings>();
             asset.GetOrCreate<EditorSettings>();
-            asset.GetOrCreate<NavigationSettings>();
-            asset.GetOrCreate<PhysicsSettings>();
             asset.GetOrCreate<RenderingSettings>();
             asset.GetOrCreate<StreamingSettings>();
             asset.GetOrCreate<TextureSettings>();
diff --git a/sources/engine/Xenko.Assets/GameUserSettings.cs b/sources/engine/Xenko.Assets/GameUserSettings.cs
index dc6b1279f8..a4b3966cfd 100644
--- a/sources/engine/Xenko.Assets/GameUserSettings.cs
+++ b/sources/engine/Xenko.Assets/GameUserSettings.cs
@@ -11,14 +11,10 @@ public static class GameUserSettings
     {
         public static class Effect
         {
-            public static SettingsKey<EffectCompilationMode> EffectCompilation = new SettingsKey<EffectCompilationMode>("Package/Game/Effect/EffectCompilation", PackageUserSettings.SettingsContainer, EffectCompilationMode.LocalOrRemote)
+            public static SettingsKey<EffectCompilationMode> EffectCompilation = new SettingsKey<EffectCompilationMode>("Package/Game/Effect/EffectCompilation", PackageUserSettings.SettingsContainer, EffectCompilationMode.Local)
             {
                 DisplayName = "Effect Compiler"
             };
-            public static SettingsKey<bool> RecordUsedEffects = new SettingsKey<bool>("Package/Game/Effect/RecordUsedEffects", PackageUserSettings.SettingsContainer, true)
-            {
-                DisplayName = "Record used effects"
-            };
         }
     }
 }
diff --git a/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs b/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs
index dfa365a9ee..709a202884 100644
--- a/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Materials/MaterialAssetCompiler.cs
@@ -53,7 +53,7 @@ private class MaterialCompileCommand : AssetCommand<MaterialAsset>
             public MaterialCompileCommand(string url, AssetItem assetItem, MaterialAsset value, AssetCompilerContext context)
                 : base(url, value, assetItem.Package)
             {
-                Version = 4;
+                Version = 6;
                 this.assetItem = assetItem;
                 colorSpace = context.GetColorSpace();
                 assetUrl = new UFile(url);
diff --git a/sources/engine/Xenko.Assets/Media/VideoAssetCompiler.cs b/sources/engine/Xenko.Assets/Media/VideoAssetCompiler.cs
index 7cd4c0c89f..1fa1185cdf 100644
--- a/sources/engine/Xenko.Assets/Media/VideoAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Media/VideoAssetCompiler.cs
@@ -66,7 +66,7 @@ private class EncodeVideoFileCommand : AssetCommand<VideoConvertParameters>
             public EncodeVideoFileCommand(string url, VideoConvertParameters description, IAssetFinder assetFinder, AVCodecID[] listSupportedCodecNames)
                 : base(url, description, assetFinder)
             {
-                Version = 3;
+                Version = 4;
                 ListSupportedCodecNames = listSupportedCodecNames;
             }
 
diff --git a/sources/engine/Xenko.Assets/Navigation/NavigationMeshAssetCompiler.cs b/sources/engine/Xenko.Assets/Navigation/NavigationMeshAssetCompiler.cs
index 1df8b8813f..d095b4d7ca 100644
--- a/sources/engine/Xenko.Assets/Navigation/NavigationMeshAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Navigation/NavigationMeshAssetCompiler.cs
@@ -26,11 +26,12 @@ namespace Xenko.Assets.Navigation
 {
     [AssetCompiler(typeof(NavigationMeshAsset), typeof(AssetCompilationContext))]
     class NavigationMeshAssetCompiler : AssetCompilerBase
-    { 
+    {
         public override IEnumerable<BuildDependencyInfo> GetInputTypes(AssetItem assetItem)
         {
             yield return new BuildDependencyInfo(typeof(SceneAsset), typeof(AssetCompilationContext), BuildDependencyType.CompileAsset);
             yield return new BuildDependencyInfo(typeof(ColliderShapeAsset), typeof(AssetCompilationContext), BuildDependencyType.CompileContent);
+            yield return new BuildDependencyInfo(typeof(HeightmapAsset), typeof(AssetCompilationContext), BuildDependencyType.CompileContent);
         }
 
         public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
@@ -63,6 +64,21 @@ public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
                                     yield return new ObjectUrl(UrlType.Content, assetReference.Url);
                                 }
                             }
+                            else if (desc is HeightfieldColliderShapeDesc)
+                            {
+                                var heightfieldDesc = desc as HeightfieldColliderShapeDesc;
+                                var heightmapSource = heightfieldDesc?.HeightStickArraySource as HeightStickArraySourceFromHeightmap;
+
+                                if (heightmapSource?.Heightmap != null)
+                                {
+                                    var url = AttachedReferenceManager.GetUrl(heightmapSource.Heightmap);
+
+                                    if (!string.IsNullOrEmpty(url))
+                                    {
+                                        yield return new ObjectUrl(UrlType.Content, url);
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -82,6 +98,7 @@ private class NavmeshBuildCommand : AssetCommand<NavigationMeshAsset>
         {
             private readonly ContentManager contentManager = new ContentManager(MicrothreadLocalDatabases.ProviderService);
             private readonly Dictionary<string, PhysicsColliderShape> loadedColliderShapes = new Dictionary<string, PhysicsColliderShape>();
+            private readonly Dictionary<string, object> loadedHeightfieldInitialDatas = new Dictionary<string, object>();
 
             private NavigationMesh oldNavigationMesh;
 
@@ -103,7 +120,7 @@ public NavmeshBuildCommand(string url, AssetItem assetItem, NavigationMeshAsset
                 gameSettingsAsset = context.GetGameSettingsAsset();
                 asset = value;
                 assetUrl = url;
-                
+
                 Version = 1; // Removed separate debug model stored in the navigation mesh
             }
 
@@ -115,10 +132,10 @@ protected override void ComputeParameterHash(BinarySerializationWriter writer)
                 writer.Write(sceneHash);
                 writer.Write(asset.SelectedGroups);
                 
-                var navigationSettings = gameSettingsAsset.GetOrCreate<NavigationSettings>();
+                var navigationSettings = gameSettingsAsset.GetOrDefault<NavigationSettings>();
                 writer.Write(navigationSettings.Groups);
             }
-            
+
             protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandContext)
             {
                 var intermediateDataId = ComputeAssetIntermediateDataId();
@@ -130,7 +147,7 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                 foreach (var colliderData in staticColliderDatas)
                     navigationMeshBuilder.Add(colliderData);
                 
-                var navigationSettings = gameSettingsAsset.GetOrCreate<NavigationSettings>();
+                var navigationSettings = gameSettingsAsset.GetOrDefault<NavigationSettings>();
                 var groupsLookup = navigationSettings.Groups.ToDictionary(x => x.Id, x => x);
 
                 var groups = new List<NavigationMeshGroup>();
@@ -149,12 +166,16 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                 }
 
                 var result = navigationMeshBuilder.Build(asset.BuildSettings, groups, asset.IncludedCollisionGroups, boundingBoxes, CancellationToken.None);
-                
+
                 // Unload loaded collider shapes
                 foreach (var pair in loadedColliderShapes)
                 {
                     contentManager.Unload(pair.Key);
                 }
+                foreach (var pair in loadedHeightfieldInitialDatas)
+                {
+                    contentManager.Unload(pair.Key);
+                }
 
                 if (!result.Success)
                     return Task.FromResult(ResultStatus.Failed);
@@ -258,7 +279,7 @@ private void EnsureClonedSceneAndHash()
 
                             if (boundingBoxComponent == null && colliderComponent == null)
                                 continue;
-                            
+
                             // Update world transform
                             entity.Transform.UpdateWorldMatrix();
 
@@ -279,7 +300,7 @@ private void EnsureClonedSceneAndHash()
                             {
                                 staticColliderDatas.Add(new StaticColliderData
                                 {
-                                    Component = colliderComponent
+                                    Component = colliderComponent,
                                 });
 
                                 if (colliderComponent.Enabled && !colliderComponent.IsTrigger && ((int)asset.IncludedCollisionGroups & (int)colliderComponent.CollisionGroup) != 0)
@@ -299,6 +320,23 @@ private void EnsureClonedSceneAndHash()
                                             }
                                             shapeAssetDesc.Shape = loadedColliderShape;
                                         }
+                                        else if (desc is HeightfieldColliderShapeDesc)
+                                        {
+                                            var heightfieldDesc = desc as HeightfieldColliderShapeDesc;
+                                            var heightmapSource = heightfieldDesc?.HeightStickArraySource as HeightStickArraySourceFromHeightmap;
+
+                                            if (heightmapSource?.Heightmap != null)
+                                            {
+                                                var assetReference = AttachedReferenceManager.GetAttachedReference(heightmapSource.Heightmap);
+                                                object loadedHeightfieldInitialData;
+                                                if (!loadedHeightfieldInitialDatas.TryGetValue(assetReference.Url, out loadedHeightfieldInitialData))
+                                                {
+                                                    loadedHeightfieldInitialData = contentManager.Load(typeof(Heightmap), assetReference.Url);
+                                                    loadedHeightfieldInitialDatas.Add(assetReference.Url, loadedHeightfieldInitialData);
+                                                }
+                                                heightmapSource.Heightmap = loadedHeightfieldInitialData as Heightmap;
+                                            }
+                                        }
                                     }
                                 }
 
diff --git a/sources/engine/Xenko.Assets/Physics/ByteHeightmapHeightConversionParameters.cs b/sources/engine/Xenko.Assets/Physics/ByteHeightmapHeightConversionParameters.cs
new file mode 100644
index 0000000000..5dfcad26fd
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/ByteHeightmapHeightConversionParameters.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+using Xenko.Physics;
+
+namespace Xenko.Assets.Physics
+{
+    [DataContract]
+    [Display("Byte")]
+    public class ByteHeightmapHeightConversionParameters : IHeightmapHeightConversionParameters
+    {
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => HeightfieldTypes.Byte;
+
+        [DataMember(10)]
+        public Vector2 HeightRange { get; set; } = new Vector2(0, 10);
+
+        [DataMemberIgnore]
+        public float HeightScale => HeightScaleCalculator.Calculate(this);
+
+        /// <summary>
+        /// Select how to calculate HeightScale.
+        /// </summary>
+        [DataMember(20)]
+        [NotNull]
+        [Display("HeightScale", Expand = ExpandRule.Always)]
+        public IHeightScaleCalculator HeightScaleCalculator { get; set; } = new HeightScaleCalculator();
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/ColliderShapeAsset.cs b/sources/engine/Xenko.Assets/Physics/ColliderShapeAsset.cs
index fbe1192ce8..5ed0580ba0 100644
--- a/sources/engine/Xenko.Assets/Physics/ColliderShapeAsset.cs
+++ b/sources/engine/Xenko.Assets/Physics/ColliderShapeAsset.cs
@@ -12,15 +12,13 @@
 using Xenko.Core.Yaml;
 using Xenko.Core.Yaml.Serialization;
 
-namespace Xenko.Assets.Physics
-{
+namespace Xenko.Assets.Physics {
     [DataContract("ColliderShapeAsset")]
     [AssetDescription(FileExtension)]
     [AssetContentType(typeof(PhysicsColliderShape))]
     [AssetFormatVersion(XenkoConfig.PackageName, CurrentVersion, "2.0.0.0")]
     [AssetUpgrader(XenkoConfig.PackageName, "2.0.0.0", "3.0.0.0", typeof(ConvexHullDecompositionParametersUpgrader))]
-    public partial class ColliderShapeAsset : Asset
-    {
+    public partial class ColliderShapeAsset : Asset {
         private const string CurrentVersion = "3.0.0.0";
 
         public const string FileExtension = ".xkphy;pdxphy";
@@ -33,47 +31,35 @@ public partial class ColliderShapeAsset : Asset
         [MemberCollection(CanReorderItems = true, NotNullItems = true)]
         public List<IAssetColliderShapeDesc> ColliderShapes { get; } = new List<IAssetColliderShapeDesc>();
 
-        private class ConvexHullDecompositionParametersUpgrader : AssetUpgraderBase
-        {
-            protected override void UpgradeAsset(AssetMigrationContext context, PackageVersion currentVersion, PackageVersion targetVersion, dynamic asset, PackageLoadingAssetFile assetFile, OverrideUpgraderHint overrideHint)
-            {
-                foreach (dynamic item in asset.ColliderShapes)
-                {
+        private class ConvexHullDecompositionParametersUpgrader : AssetUpgraderBase {
+            protected override void UpgradeAsset(AssetMigrationContext context, PackageVersion currentVersion, PackageVersion targetVersion, dynamic asset, PackageLoadingAssetFile assetFile, OverrideUpgraderHint overrideHint) {
+                foreach (dynamic item in asset.ColliderShapes) {
                     dynamic shape = item.Value;
-                    if (shape.Node.Tag == "!ConvexHullColliderShapeDesc")
-                    {
+                    if (shape.Node.Tag == "!ConvexHullColliderShapeDesc") {
                         dynamic decomposition = shape.Decomposition = new DynamicYamlMapping(new YamlMappingNode());
 
-                        if (shape.ContainsChild("SimpleWrap"))
-                        {
+                        if (shape.ContainsChild("SimpleWrap")) {
                             decomposition.Enabled = shape.SimpleWrap.ToString().ToLowerInvariant().Equals("false");
                         }
-                        if (shape.ContainsChild("Depth"))
-                        {
+                        if (shape.ContainsChild("Depth")) {
                             decomposition.Depth = shape.Depth;
                         }
-                        if (shape.ContainsChild("PosSampling"))
-                        {
+                        if (shape.ContainsChild("PosSampling")) {
                             decomposition.PosSampling = shape.PosSampling;
                         }
-                        if (shape.ContainsChild("AngleSampling"))
-                        {
+                        if (shape.ContainsChild("AngleSampling")) {
                             decomposition.AngleSampling = shape.AngleSampling;
                         }
-                        if (shape.ContainsChild("PosRefine"))
-                        {
+                        if (shape.ContainsChild("PosRefine")) {
                             decomposition.PosRefine = shape.PosRefine;
                         }
-                        if (shape.ContainsChild("AngleRefine"))
-                        {
+                        if (shape.ContainsChild("AngleRefine")) {
                             decomposition.AngleRefine = shape.AngleRefine;
                         }
-                        if (shape.ContainsChild("Alpha"))
-                        {
+                        if (shape.ContainsChild("Alpha")) {
                             decomposition.Alpha = shape.Alpha;
                         }
-                        if (shape.ContainsChild("Threshold"))
-                        {
+                        if (shape.ContainsChild("Threshold")) {
                             decomposition.Threshold = shape.Threshold;
                         }
 
diff --git a/sources/engine/Xenko.Assets/Physics/ColliderShapeAssetCompiler.cs b/sources/engine/Xenko.Assets/Physics/ColliderShapeAssetCompiler.cs
index 7caea4f0df..a8b2b3d2df 100644
--- a/sources/engine/Xenko.Assets/Physics/ColliderShapeAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Physics/ColliderShapeAssetCompiler.cs
@@ -19,51 +19,58 @@
 using Xenko.Assets.Textures;
 using VHACDSharp;
 using Buffer = Xenko.Graphics.Buffer;
+using Xenko.Graphics;
 
-namespace Xenko.Assets.Physics
-{
+namespace Xenko.Assets.Physics {
     [AssetCompiler(typeof(ColliderShapeAsset), typeof(AssetCompilationContext))]
-    internal class ColliderShapeAssetCompiler : AssetCompilerBase
-    {
-        static ColliderShapeAssetCompiler()
-        {
+    internal class ColliderShapeAssetCompiler : AssetCompilerBase {
+        static ColliderShapeAssetCompiler() {
             NativeLibrary.PreloadLibrary("VHACD.dll", typeof(ColliderShapeAssetCompiler));
         }
 
-        public override IEnumerable<BuildDependencyInfo> GetInputTypes(AssetItem assetItem)
-        {
-            foreach (var type in AssetRegistry.GetAssetTypes(typeof(Model)))
-            {
+        public override IEnumerable<BuildDependencyInfo> GetInputTypes(AssetItem assetItem) {
+            foreach (var type in AssetRegistry.GetAssetTypes(typeof(Model))) {
+                yield return new BuildDependencyInfo(type, typeof(AssetCompilationContext), BuildDependencyType.CompileContent);
+            }
+            foreach (var type in AssetRegistry.GetAssetTypes(typeof(Skeleton))) {
                 yield return new BuildDependencyInfo(type, typeof(AssetCompilationContext), BuildDependencyType.CompileContent);
             }
-            foreach (var type in AssetRegistry.GetAssetTypes(typeof(Skeleton)))
+            foreach (var type in AssetRegistry.GetAssetTypes(typeof(Heightmap)))
             {
                 yield return new BuildDependencyInfo(type, typeof(AssetCompilationContext), BuildDependencyType.CompileContent);
             }
         }
 
-        public override IEnumerable<Type> GetInputTypesToExclude(AssetItem assetItem)
-        {
-            foreach(var type in AssetRegistry.GetAssetTypes(typeof(Material)))
-            {
+        public override IEnumerable<Type> GetInputTypesToExclude(AssetItem assetItem) {
+            foreach (var type in AssetRegistry.GetAssetTypes(typeof(Material))) {
                 yield return type;
             }
             yield return typeof(TextureAsset);
         }
 
-        public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
-        {
+        public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem) {
             var asset = (ColliderShapeAsset)assetItem.Asset;
-            foreach (var desc in asset.ColliderShapes)
-            {
-                if (desc is ConvexHullColliderShapeDesc)
-                {
+            foreach (var desc in asset.ColliderShapes) {
+                if (desc is ConvexHullColliderShapeDesc) {
                     var convexHullDesc = desc as ConvexHullColliderShapeDesc;
 
-                    if (convexHullDesc.Model != null)
-                    {
+                    if (convexHullDesc.Model != null) {
                         var url = AttachedReferenceManager.GetUrl(convexHullDesc.Model);
 
+                        if (!string.IsNullOrEmpty(url)) {
+                            yield return new ObjectUrl(UrlType.Content, url);
+                        }
+                    }
+                }
+                else if (desc is HeightfieldColliderShapeDesc)
+                {
+                    var heightfieldDesc = desc as HeightfieldColliderShapeDesc;
+                    var heightmapSource = heightfieldDesc?.HeightStickArraySource as HeightStickArraySourceFromHeightmap;
+
+                    if (heightmapSource?.Heightmap != null)
+                    {
+                        var url = AttachedReferenceManager.GetUrl(heightmapSource.Heightmap);
+
                         if (!string.IsNullOrEmpty(url))
                         {
                             yield return new ObjectUrl(UrlType.Content, url);
@@ -73,23 +80,19 @@ public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
             }
         }
 
-        protected override void Prepare(AssetCompilerContext context, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result)
-        {
+        protected override void Prepare(AssetCompilerContext context, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result) {
             var asset = (ColliderShapeAsset)assetItem.Asset;
 
             result.BuildSteps = new AssetBuildStep(assetItem);
             result.BuildSteps.Add(new ColliderShapeCombineCommand(targetUrlInStorage, asset, assetItem.Package) { InputFilesGetter = () => GetInputFiles(assetItem) });
         }
 
-        public class ColliderShapeCombineCommand : AssetCommand<ColliderShapeAsset>
-        {
+        public class ColliderShapeCombineCommand : AssetCommand<ColliderShapeAsset> {
             public ColliderShapeCombineCommand(string url, ColliderShapeAsset parameters, IAssetFinder assetFinder)
-                : base(url, parameters, assetFinder)
-            {
+                : base(url, parameters, assetFinder) {
             }
 
-            protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandContext)
-            {
+            protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandContext) {
                 var assetManager = new ContentManager(MicrothreadLocalDatabases.ProviderService);
 
                 // Cloned list of collider shapes
@@ -101,11 +104,9 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                 //pre process special types
                 foreach (var convexHullDesc in
                     (from shape in validShapes let type = shape.GetType() where type == typeof(ConvexHullColliderShapeDesc) select shape)
-                    .Cast<ConvexHullColliderShapeDesc>())
-                {
+                    .Cast<ConvexHullColliderShapeDesc>()) {
                     // Clone the convex hull shape description so the fields that should not be serialized can be cleared (Model in this case)
-                    ConvexHullColliderShapeDesc convexHullDescClone = new ConvexHullColliderShapeDesc
-                    {
+                    ConvexHullColliderShapeDesc convexHullDescClone = new ConvexHullColliderShapeDesc {
                         Scaling = convexHullDesc.Scaling,
                         LocalOffset = convexHullDesc.LocalOffset,
                         LocalRotation = convexHullDesc.LocalRotation,
@@ -116,11 +117,10 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                     int replaceIndex = descriptions.IndexOf(convexHullDesc);
                     descriptions[replaceIndex] = convexHullDescClone;
 
-                    var loadSettings = new ContentManagerLoaderSettings
-                    {
+                    var loadSettings = new ContentManagerLoaderSettings {
                         ContentFilter = ContentManagerLoaderSettings.NewContentFilterByType(typeof(Mesh), typeof(Skeleton))
                     };
-                    
+
                     var modelAsset = assetManager.Load<Model>(AttachedReferenceManager.GetUrl(convexHullDesc.Model), loadSettings);
                     if (modelAsset == null) continue;
 
@@ -132,18 +132,14 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                     var nodeTransforms = new List<Matrix>();
 
                     //pre-compute all node transforms, assuming nodes are ordered... see ModelViewHierarchyUpdater
-                    
-                    if (modelAsset.Skeleton == null)
-                    {
+
+                    if (modelAsset.Skeleton == null) {
                         Matrix baseMatrix;
                         Matrix.Transformation(ref convexHullDescClone.Scaling, ref convexHullDescClone.LocalRotation, ref convexHullDescClone.LocalOffset, out baseMatrix);
                         nodeTransforms.Add(baseMatrix);
-                    }
-                    else
-                    {
+                    } else {
                         var nodesLength = modelAsset.Skeleton.Nodes.Length;
-                        for (var i = 0; i < nodesLength; i++)
-                        {
+                        for (var i = 0; i < nodesLength; i++) {
                             Matrix localMatrix;
                             Matrix.Transformation(
                                 ref modelAsset.Skeleton.Nodes[i].Transform.Scale,
@@ -151,31 +147,24 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                                 ref modelAsset.Skeleton.Nodes[i].Transform.Position, out localMatrix);
 
                             Matrix worldMatrix;
-                            if (modelAsset.Skeleton.Nodes[i].ParentIndex != -1)
-                            {
+                            if (modelAsset.Skeleton.Nodes[i].ParentIndex != -1) {
                                 var nodeTransform = nodeTransforms[modelAsset.Skeleton.Nodes[i].ParentIndex];
                                 Matrix.Multiply(ref localMatrix, ref nodeTransform, out worldMatrix);
-                            }
-                            else
-                            {
+                            } else {
                                 worldMatrix = localMatrix;
                             }
 
-                            if (i == 0)
-                            {
+                            if (i == 0) {
                                 Matrix baseMatrix;
                                 Matrix.Transformation(ref convexHullDescClone.Scaling, ref convexHullDescClone.LocalRotation, ref convexHullDescClone.LocalOffset, out baseMatrix);
-                                nodeTransforms.Add(baseMatrix*worldMatrix);
+                                nodeTransforms.Add(baseMatrix * worldMatrix);
+                            } else {
+                                nodeTransforms.Add(worldMatrix);
                             }
-                            else
-                            {
-                                nodeTransforms.Add(worldMatrix); 
-                            }                           
                         }
                     }
 
-                    for (var i = 0; i < nodeTransforms.Count; i++)
-                    {
+                    for (var i = 0; i < nodeTransforms.Count; i++) {
                         var i1 = i;
                         if (modelAsset.Meshes.All(x => x.NodeIndex != i1)) continue; // no geometry in the node
 
@@ -188,31 +177,24 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                         var indicesList = new List<List<uint>>();
                         convexHullDescClone.ConvexHullsIndices.Add(indicesList);
 
-                        foreach (var meshData in modelAsset.Meshes.Where(x => x.NodeIndex == i1))
-                        {
+                        foreach (var meshData in modelAsset.Meshes.Where(x => x.NodeIndex == i1)) {
                             var indexOffset = (uint)combinedVerts.Count / 3;
 
                             var stride = meshData.Draw.VertexBuffers[0].Declaration.VertexStride;
 
                             var vertexBufferRef = AttachedReferenceManager.GetAttachedReference(meshData.Draw.VertexBuffers[0].Buffer);
                             byte[] vertexData;
-                            if (vertexBufferRef.Data != null)
-                            {
+                            if (vertexBufferRef.Data != null) {
                                 vertexData = ((BufferData)vertexBufferRef.Data).Content;
-                            }
-                            else if (!string.IsNullOrEmpty(vertexBufferRef.Url))
-                            {
+                            } else if (!string.IsNullOrEmpty(vertexBufferRef.Url)) {
                                 var dataAsset = assetManager.Load<Buffer>(vertexBufferRef.Url);
                                 vertexData = dataAsset.GetSerializationData().Content;
-                            }
-                            else
-                            {
+                            } else {
                                 continue;
                             }
 
                             var vertexIndex = meshData.Draw.VertexBuffers[0].Offset;
-                            for (var v = 0; v < meshData.Draw.VertexBuffers[0].Count; v++)
-                            {
+                            for (var v = 0; v < meshData.Draw.VertexBuffers[0].Count; v++) {
                                 var posMatrix = Matrix.Translation(new Vector3(BitConverter.ToSingle(vertexData, vertexIndex + 0), BitConverter.ToSingle(vertexData, vertexIndex + 4), BitConverter.ToSingle(vertexData, vertexIndex + 8)));
 
                                 Matrix rotatedMatrix;
@@ -228,38 +210,28 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
 
                             var indexBufferRef = AttachedReferenceManager.GetAttachedReference(meshData.Draw.IndexBuffer.Buffer);
                             byte[] indexData;
-                            if (indexBufferRef.Data != null)
-                            {
+                            if (indexBufferRef.Data != null) {
                                 indexData = ((BufferData)indexBufferRef.Data).Content;
-                            }
-                            else if (!string.IsNullOrEmpty(indexBufferRef.Url))
-                            {
+                            } else if (!string.IsNullOrEmpty(indexBufferRef.Url)) {
                                 var dataAsset = assetManager.Load<Buffer>(indexBufferRef.Url);
                                 indexData = dataAsset.GetSerializationData().Content;
-                            }
-                            else
-                            {
+                            } else {
                                 throw new Exception("Failed to find index buffer while building a convex hull.");
                             }
 
                             var indexIndex = meshData.Draw.IndexBuffer.Offset;
-                            for (var v = 0; v < meshData.Draw.IndexBuffer.Count; v++)
-                            {
-                                if (meshData.Draw.IndexBuffer.Is32Bit)
-                                {
+                            for (var v = 0; v < meshData.Draw.IndexBuffer.Count; v++) {
+                                if (meshData.Draw.IndexBuffer.Is32Bit) {
                                     combinedIndices.Add(BitConverter.ToUInt32(indexData, indexIndex) + indexOffset);
                                     indexIndex += 4;
-                                }
-                                else
-                                {
+                                } else {
                                     combinedIndices.Add(BitConverter.ToUInt16(indexData, indexIndex) + indexOffset);
                                     indexIndex += 2;
                                 }
                             }
                         }
 
-                        var decompositionDesc = new ConvexHullMesh.DecompositionDesc
-                        {
+                        var decompositionDesc = new ConvexHullMesh.DecompositionDesc {
                             VertexCount = (uint)combinedVerts.Count / 3,
                             IndicesCount = (uint)combinedIndices.Count,
                             Vertexes = combinedVerts.ToArray(),
@@ -284,15 +256,13 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
 
                         var vertexCountHull = 0;
 
-                        for (uint h = 0; h < count; h++)
-                        {
+                        for (uint h = 0; h < count; h++) {
                             float[] points;
                             convexHullMesh.CopyPoints(h, out points);
 
                             var pointList = new List<Vector3>();
 
-                            for (var v = 0; v < points.Length; v += 3)
-                            {
+                            for (var v = 0; v < points.Length; v += 3) {
                                 var vert = new Vector3(points[v + 0], points[v + 1], points[v + 2]);
                                 pointList.Add(vert);
 
@@ -304,8 +274,7 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                             uint[] indices;
                             convexHullMesh.CopyIndices(h, out indices);
 
-                            for (var t = 0; t < indices.Length; t += 3)
-                            {
+                            for (var t = 0; t < indices.Length; t += 3) {
                                 Core.Utilities.Swap(ref indices[t], ref indices[t + 2]);
                             }
 
diff --git a/sources/engine/Xenko.Assets/Physics/ColliderShapeFactories.cs b/sources/engine/Xenko.Assets/Physics/ColliderShapeFactories.cs
index ec16ceba86..06bda887a8 100644
--- a/sources/engine/Xenko.Assets/Physics/ColliderShapeFactories.cs
+++ b/sources/engine/Xenko.Assets/Physics/ColliderShapeFactories.cs
@@ -95,4 +95,17 @@ public override ColliderShapeAsset New()
             return Create();
         }
     }
+
+    public class ColliderShapeHeightfieldFactory : AssetFactory<ColliderShapeAsset>
+    {
+        public static ColliderShapeAsset Create()
+        {
+            return new ColliderShapeAsset { ColliderShapes = { new HeightfieldColliderShapeDesc() } };
+        }
+
+        public override ColliderShapeAsset New()
+        {
+            return Create();
+        }
+    }
 }
diff --git a/sources/engine/Xenko.Assets/Physics/FloatHeightmapHeightConversionParamters.cs b/sources/engine/Xenko.Assets/Physics/FloatHeightmapHeightConversionParamters.cs
new file mode 100644
index 0000000000..73cff7cb8a
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/FloatHeightmapHeightConversionParamters.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Physics;
+
+namespace Xenko.Assets.Physics
+{
+    [DataContract]
+    [Display("Float")]
+    public class FloatHeightmapHeightConversionParamters : IHeightmapHeightConversionParameters
+    {
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => HeightfieldTypes.Float;
+
+        [DataMember(10)]
+        public Vector2 HeightRange { get; set; } = new Vector2(-10, 10);
+
+        [DataMemberIgnore]
+        public float HeightScale => 1f;
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/HeightmapAsset.cs b/sources/engine/Xenko.Assets/Physics/HeightmapAsset.cs
new file mode 100644
index 0000000000..bc6d15179e
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/HeightmapAsset.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Assets;
+using Xenko.Core.Mathematics;
+using Xenko.Physics;
+
+namespace Xenko.Assets.Physics
+{
+    [DataContract("HeightmapAsset")]
+    [CategoryOrder(10, "Image File", Expand = ExpandRule.Always)]
+    [CategoryOrder(20, "Convert", Expand = ExpandRule.Always)]
+    [AssetDescription(FileExtension)]
+    [AssetContentType(typeof(Heightmap))]
+    [AssetFormatVersion(XenkoConfig.PackageName, CurrentVersion, "3.0.0.0")]
+    public partial class HeightmapAsset : AssetWithSource
+    {
+        private const string CurrentVersion = "3.0.0.0";
+
+        public const string FileExtension = ".xkhmap";
+
+        /// <summary>
+        /// Parameters to convert pixels to heights.
+        /// </summary>
+        /// <remarks>HeightType size should be greater than or equal to source type size(R channel size).</remarks>
+        [DataMember(10)]
+        [Display("Height", category: "Convert", Expand = ExpandRule.Always)]
+        [NotNull]
+        public IHeightmapHeightConversionParameters HeightConversionParameters { get; set; } = new FloatHeightmapHeightConversionParamters();
+
+        /// <summary>
+        /// The size of the heightmap.
+        /// </summary>
+        /// <remarks>
+        /// X is width and Y is length.
+        /// They should be greater than or equal to 2.
+        /// The heightmap size will be same to the image size, if disabled.
+        /// </remarks>
+        [DataMember(20, "Resize")]
+        [Display(category: "Convert")]
+        public HeightmapResizingParameters Resizing { get; set; } = new HeightmapResizingParameters
+        {
+            Enabled = false,
+            Size = new Int2(1024, 1024),
+        };
+
+        /// <summary>
+        /// Enable if needed to load the image file as sRGB.
+        /// </summary>
+        [DataMember(50, "sRGB sampling")]
+        [Display(category: "Image File")]
+        public bool IsSRgb { get; set; } = false;
+
+        /// <summary>
+        /// If enabled, scale each of the heights to the height range before they are stored as heightmap.
+        /// </summary>
+        /// <remarks>
+        /// By the default, they are considered to be in [-1 .. 1] when the pixel format of the image file is floating-point component format.
+        /// Match FloatingPointComponentRange to actual range.
+        /// </remarks>
+        [DataMember(30)]
+        [Display(category: "Convert")]
+        public bool ScaleToHeightRange { get; set; } = true;
+
+        /// <summary>
+        /// The range of the floating-point component.
+        /// </summary>
+        /// <remarks>
+        /// Determine the range of the floating-point components.
+        /// This property affects nothing when not floating-point component.
+        /// </remarks>
+        [DataMember(40)]
+        [Display(category: "Image File")]
+        public Vector2 FloatingPointComponentRange { get; set; } = new Vector2(-1, 1);
+
+        /// <summary>
+        /// The range of the signed short component.
+        /// </summary>
+        /// <remarks>
+        /// Enable if the R components are signed short integer in [-32767 .. 32767].
+        /// This property affects nothing when not signed short integer component.
+        /// </remarks>
+        [DataMember(41)]
+        [Display(category: "Image File")]
+        public bool IsSymmetricShortComponent { get; set; } = false;
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/HeightmapAssetCompiler.cs b/sources/engine/Xenko.Assets/Physics/HeightmapAssetCompiler.cs
new file mode 100644
index 0000000000..36438edac8
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/HeightmapAssetCompiler.cs
@@ -0,0 +1,346 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Xenko.Assets.Textures;
+using Xenko.Core.Assets;
+using Xenko.Core.Assets.Analysis;
+using Xenko.Core.Assets.Compiler;
+using Xenko.Core.BuildEngine;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Graphics;
+using Xenko.Physics;
+using Xenko.TextureConverter;
+
+namespace Xenko.Assets.Physics
+{
+    [AssetCompiler(typeof(HeightmapAsset), typeof(AssetCompilationContext))]
+    internal class HeightmapAssetCompiler : AssetCompilerBase
+    {
+        public override IEnumerable<BuildDependencyInfo> GetInputTypes(AssetItem assetItem)
+        {
+            yield return new BuildDependencyInfo(typeof(TextureAsset), typeof(AssetCompilationContext), BuildDependencyType.CompileContent);
+        }
+
+        public override IEnumerable<ObjectUrl> GetInputFiles(AssetItem assetItem)
+        {
+            var asset = (HeightmapAsset)assetItem.Asset;
+            var url = asset.Source.FullPath;
+            if (!string.IsNullOrEmpty(url))
+            {
+                yield return new ObjectUrl(UrlType.File, url);
+            }
+        }
+
+        protected override void Prepare(AssetCompilerContext context, AssetItem assetItem, string targetUrlInStorage, AssetCompilerResult result)
+        {
+            var asset = (HeightmapAsset)assetItem.Asset;
+
+            result.BuildSteps = new AssetBuildStep(assetItem);
+            result.BuildSteps.Add(new HeightmapConvertCommand(targetUrlInStorage, asset, assetItem.Package) { InputFilesGetter = () => GetInputFiles(assetItem) });
+        }
+
+        public class HeightmapConvertCommand : AssetCommand<HeightmapAsset>
+        {
+            public HeightmapConvertCommand(string url, HeightmapAsset parameters, IAssetFinder assetFinder)
+                : base(url, parameters, assetFinder)
+            {
+            }
+
+            protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandContext)
+            {
+                var assetManager = new ContentManager(MicrothreadLocalDatabases.ProviderService);
+
+                Heightmap heightmap = null;
+
+                var heightType = Parameters.HeightConversionParameters.HeightType;
+                var heightScale = Parameters.HeightConversionParameters.HeightScale;
+                var heightRange = Parameters.HeightConversionParameters.HeightRange;
+
+                // Heights
+
+                var source = Parameters.Source;
+
+                using (var textureTool = new TextureTool())
+                using (var texImage = textureTool.Load(source, Parameters.IsSRgb))
+                {
+                    // Resize if needed.
+
+                    var size = Parameters.Resizing.Enabled ?
+                        Parameters.Resizing.Size :
+                        new Int2(texImage.Width, texImage.Height);
+
+                    HeightmapUtils.CheckHeightParameters(size, heightType, heightRange, heightScale, true);
+
+                    // Convert the pixel format to single component one.
+
+                    var isConvertedR16 = false;
+
+                    switch (texImage.Format)
+                    {
+                        case PixelFormat.R32_Float:
+                        case PixelFormat.R16_SNorm:
+                        case PixelFormat.R8_UNorm:
+                            break;
+
+                        case PixelFormat.R32G32B32A32_Float:
+                        case PixelFormat.R16G16B16A16_Float:
+                        case PixelFormat.R16_Float:
+                            textureTool.Convert(texImage, PixelFormat.R32_Float);
+                            break;
+
+                        case PixelFormat.R16_UNorm:
+                        case PixelFormat.R16G16B16A16_UNorm:
+                        case PixelFormat.R16G16_UNorm:
+                            textureTool.Convert(texImage, PixelFormat.R16_SNorm);
+                            isConvertedR16 = true;
+                            break;
+
+                        case PixelFormat.R16G16B16A16_SNorm:
+                        case PixelFormat.R16G16_SNorm:
+                            textureTool.Convert(texImage, PixelFormat.R16_SNorm);
+                            break;
+
+                        case PixelFormat.R8_SNorm:
+                        case PixelFormat.B8G8R8A8_UNorm:
+                        case PixelFormat.B8G8R8X8_UNorm:
+                        case PixelFormat.R8G8B8A8_UNorm:
+                        case PixelFormat.R8G8_UNorm:
+                            textureTool.Convert(texImage, PixelFormat.R8_UNorm);
+                            break;
+
+                        case PixelFormat.R8G8B8A8_SNorm:
+                        case PixelFormat.R8G8_SNorm:
+                            textureTool.Convert(texImage, PixelFormat.R8_UNorm);
+                            break;
+
+                        case PixelFormat.B8G8R8A8_UNorm_SRgb:
+                        case PixelFormat.B8G8R8X8_UNorm_SRgb:
+                        case PixelFormat.R8G8B8A8_UNorm_SRgb:
+                            textureTool.Convert(texImage, PixelFormat.R8_UNorm);
+                            break;
+
+                        default:
+                            throw new Exception($"{ texImage.Format } format is not supported.");
+                    }
+
+                    // Convert pixels to heights
+
+                    using (var image = textureTool.ConvertToXenkoImage(texImage))
+                    {
+                        var pixelBuffer = image.PixelBuffer[0];
+                        var pixelBufferSize = new Int2(pixelBuffer.Width, pixelBuffer.Height);
+
+                        var minFloat = Parameters.FloatingPointComponentRange.X;
+                        var maxFloat = Parameters.FloatingPointComponentRange.Y;
+                        var isSNorm = (Math.Abs(-1 - minFloat) < float.Epsilon) && (Math.Abs(1 - maxFloat) < float.Epsilon);
+
+                        if (maxFloat < minFloat)
+                        {
+                            throw new Exception($"{ nameof(Parameters.FloatingPointComponentRange) }.{ nameof(Parameters.FloatingPointComponentRange.Y) } should be greater than { nameof(Parameters.FloatingPointComponentRange.X) }.");
+                        }
+
+                        var useScaleToRange = Parameters.ScaleToHeightRange;
+
+                        switch (heightType)
+                        {
+                            case HeightfieldTypes.Float:
+                                {
+                                    float[] floats = null;
+
+                                    switch (image.Description.Format)
+                                    {
+                                        case PixelFormat.R32_Float:
+                                            floats = HeightmapUtils.Resize(pixelBuffer.GetPixels<float>(), pixelBufferSize, size);
+                                            floats = isSNorm ?
+                                                floats :
+                                                HeightmapUtils.ConvertToFloatHeights(floats, minFloat, maxFloat);
+                                            break;
+
+                                        case PixelFormat.R16_SNorm:
+                                            var shorts = HeightmapUtils.Resize(pixelBuffer.GetPixels<short>(), pixelBufferSize, size);
+                                            floats = !isConvertedR16 && Parameters.IsSymmetricShortComponent ?
+                                                HeightmapUtils.ConvertToFloatHeights(shorts, -short.MaxValue, short.MaxValue) :
+                                                HeightmapUtils.ConvertToFloatHeights(shorts);
+                                            break;
+
+                                        case PixelFormat.R8_UNorm:
+                                            var bytes = HeightmapUtils.Resize(pixelBuffer.GetPixels<byte>(), pixelBufferSize, size);
+                                            floats = HeightmapUtils.ConvertToFloatHeights(bytes);
+                                            break;
+                                    }
+
+                                    if (useScaleToRange)
+                                    {
+                                        ScaleToHeightRange(floats, -1, 1, heightRange, heightScale, commandContext);
+                                    }
+
+                                    heightmap = Heightmap.Create(size, heightType, heightRange, heightScale, floats);
+                                }
+                                break;
+
+                            case HeightfieldTypes.Short:
+                                {
+                                    short[] shorts = null;
+
+                                    switch (image.Description.Format)
+                                    {
+                                        case PixelFormat.R32_Float:
+                                            var floats = HeightmapUtils.Resize(pixelBuffer.GetPixels<float>(), pixelBufferSize, size);
+                                            shorts = HeightmapUtils.ConvertToShortHeights(floats, minFloat, maxFloat);
+                                            break;
+
+                                        case PixelFormat.R16_SNorm:
+                                            shorts = HeightmapUtils.Resize(pixelBuffer.GetPixels<short>(), pixelBufferSize, size);
+                                            shorts = !isConvertedR16 && Parameters.IsSymmetricShortComponent ?
+                                                shorts :
+                                                HeightmapUtils.ConvertToShortHeights(shorts);
+                                            break;
+
+                                        case PixelFormat.R8_UNorm:
+                                            var bytes = HeightmapUtils.Resize(pixelBuffer.GetPixels<byte>(), pixelBufferSize, size);
+                                            shorts = HeightmapUtils.ConvertToShortHeights(bytes);
+                                            break;
+                                    }
+
+                                    if (useScaleToRange)
+                                    {
+                                        ScaleToHeightRange(shorts, short.MinValue, short.MaxValue, heightRange, heightScale, commandContext);
+                                    }
+
+                                    heightmap = Heightmap.Create(size, heightType, heightRange, heightScale, shorts);
+                                }
+                                break;
+
+                            case HeightfieldTypes.Byte:
+                                {
+                                    byte[] bytes = null;
+
+                                    switch (image.Description.Format)
+                                    {
+                                        case PixelFormat.R32_Float:
+                                            var floats = HeightmapUtils.Resize(pixelBuffer.GetPixels<float>(), pixelBufferSize, size);
+                                            bytes = HeightmapUtils.ConvertToByteHeights(floats, minFloat, maxFloat);
+                                            break;
+
+                                        case PixelFormat.R16_SNorm:
+                                            var shorts = HeightmapUtils.Resize(pixelBuffer.GetPixels<short>(), pixelBufferSize, size);
+                                            bytes = !isConvertedR16 && Parameters.IsSymmetricShortComponent ?
+                                                HeightmapUtils.ConvertToByteHeights(shorts, -short.MaxValue, short.MaxValue) :
+                                                HeightmapUtils.ConvertToByteHeights(shorts);
+                                            break;
+
+                                        case PixelFormat.R8_UNorm:
+                                            bytes = HeightmapUtils.Resize(pixelBuffer.GetPixels<byte>(), pixelBufferSize, size);
+                                            break;
+                                    }
+
+                                    if (useScaleToRange)
+                                    {
+                                        ScaleToHeightRange(bytes, byte.MinValue, byte.MaxValue, heightRange, heightScale, commandContext);
+                                    }
+
+                                    heightmap = Heightmap.Create(size, heightType, heightRange, heightScale, bytes);
+                                }
+                                break;
+
+                            default:
+                                throw new Exception($"{ heightType } height type is not supported.");
+                        }
+
+                        commandContext.Logger.Info($"[{Url}] Convert Image(Format={ texImage.Format }, Width={ texImage.Width }, Height={ texImage.Height }) " +
+                            $"to Heightmap(HeightType={ heightType }, MinHeight={ heightRange.X }, MaxHeight={ heightRange.Y }, HeightScale={ heightScale }, Size={ size }).");
+                    }
+                }
+
+                if (heightmap == null)
+                {
+                    throw new Exception($"Failed to compile { Url }.");
+                }
+
+                assetManager.Save(Url, heightmap);
+
+                return Task.FromResult(ResultStatus.Successful);
+            }
+
+            private void CalculateByteOrShortRange(Vector2 heightRage, float heightScale, out float min, out float max)
+            {
+                var minHeight = heightRage.X;
+                var maxHeight = heightRage.Y;
+
+                min = (float)Math.Round((minHeight / heightScale), MidpointRounding.AwayFromZero);
+                max = (float)Math.Round((maxHeight / heightScale), MidpointRounding.AwayFromZero);
+
+                if (heightScale < 0)
+                {
+                    min = (min * heightScale) < minHeight ? min - 1 : min;
+                    max = (max * heightScale) > maxHeight ? max + 1 : max;
+                    Core.Utilities.Swap(ref min, ref max);
+                }
+                else
+                {
+                    min = (min * heightScale) < minHeight ? min + 1 : min;
+                    max = (max * heightScale) > maxHeight ? max - 1 : max;
+                }
+            }
+
+            private void ScaleToHeightRange<T>(T[] heights, float minT, float maxT, Vector2 heightRange, float heightScale, ICommandContext commandContext) where T : struct
+            {
+                float min;
+                float max;
+
+                var typeOfT = typeof(T);
+
+                if (typeOfT == typeof(float))
+                {
+                    min = heightRange.X;
+                    max = heightRange.Y;
+                }
+                else if (typeOfT == typeof(short) || typeOfT == typeof(byte))
+                {
+                    CalculateByteOrShortRange(heightRange, heightScale, out min, out max);
+
+                    if (!MathUtil.IsInRange(min, minT, maxT) ||
+                        !MathUtil.IsInRange(max, minT, maxT))
+                    {
+                        throw new Exception(
+                            $"{ nameof(ScaleToHeightRange) } failed to scale { minT }..{ maxT } to { min }..{ max }. Check HeightScale and HeightRange are proper.");
+                    }
+                }
+                else
+                {
+                    throw new NotSupportedException($"{ typeof(T[]) } type is not supported.");
+                }
+
+                commandContext?.Logger.Info($"[{Url}] ScaleToHeightRange : { minT }..{ maxT } -> { min }..{ max }");
+
+                if (typeOfT == typeof(float))
+                {
+                    float[] floats = heights as float[];
+                    for (var i = 0; i < floats.Length; ++i)
+                    {
+                        floats[i] = MathUtil.Clamp(MathUtil.Lerp(min, max, MathUtil.InverseLerp(minT, maxT, floats[i])), min, max);
+                    }
+                }
+                else if (typeOfT == typeof(short))
+                {
+                    short[] shorts = heights as short[];
+                    for (var i = 0; i < shorts.Length; ++i)
+                    {
+                        shorts[i] = (short)MathUtil.Clamp(MathUtil.Lerp(min, max, MathUtil.InverseLerp(minT, maxT, shorts[i])), min, max);
+                    }
+                }
+                else if (typeOfT == typeof(byte))
+                {
+                    byte[] bytes = heights as byte[];
+                    for (var i = 0; i < bytes.Length; ++i)
+                    {
+                        bytes[i] = (byte)MathUtil.Clamp(MathUtil.Lerp(min, max, MathUtil.InverseLerp(minT, maxT, bytes[i])), min, max);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/HeightmapFactory.cs b/sources/engine/Xenko.Assets/Physics/HeightmapFactory.cs
new file mode 100644
index 0000000000..0e42a1efbb
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/HeightmapFactory.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core.Assets;
+
+namespace Xenko.Assets.Physics
+{
+    public class HeightmapFactory : AssetFactory<HeightmapAsset>
+    {
+        public static HeightmapAsset Create()
+        {
+            return new HeightmapAsset();
+        }
+
+        public override HeightmapAsset New()
+        {
+            return Create();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/HeightmapResizingParameters.cs b/sources/engine/Xenko.Assets/Physics/HeightmapResizingParameters.cs
new file mode 100644
index 0000000000..ef7252612c
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/HeightmapResizingParameters.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Assets.Physics
+{
+    [DataContract]
+    public struct HeightmapResizingParameters
+    {
+        [DataMember(0)]
+        public bool Enabled { get; set; }
+
+        /// <summary>
+        /// New size of the heightmap.
+        /// </summary>
+        [DataMember(10)]
+        [InlineProperty]
+        public Int2 Size { get; set; }
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/IHeightmapHeightConversionParameters.cs b/sources/engine/Xenko.Assets/Physics/IHeightmapHeightConversionParameters.cs
new file mode 100644
index 0000000000..22bbbf703f
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/IHeightmapHeightConversionParameters.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Physics;
+
+namespace Xenko.Assets.Physics
+{
+    public interface IHeightmapHeightConversionParameters : IHeightStickParameters
+    {
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Physics/ShortHeightmapHeightConversionParameters.cs b/sources/engine/Xenko.Assets/Physics/ShortHeightmapHeightConversionParameters.cs
new file mode 100644
index 0000000000..262cb65cc3
--- /dev/null
+++ b/sources/engine/Xenko.Assets/Physics/ShortHeightmapHeightConversionParameters.cs
@@ -0,0 +1,31 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+using Xenko.Physics;
+
+namespace Xenko.Assets.Physics
+{
+    [DataContract]
+    [Display("Short")]
+    public class ShortHeightmapHeightConversionParameters : IHeightmapHeightConversionParameters
+    {
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => HeightfieldTypes.Short;
+
+        [DataMember(10)]
+        public Vector2 HeightRange { get; set; } = new Vector2(-10, 10);
+
+        [DataMemberIgnore]
+        public float HeightScale => HeightScaleCalculator.Calculate(this);
+
+        /// <summary>
+        /// Select how to calculate HeightScale.
+        /// </summary>
+        [DataMember(20)]
+        [NotNull]
+        [Display("HeightScale", Expand = ExpandRule.Always)]
+        public IHeightScaleCalculator HeightScaleCalculator { get; set; } = new HeightScaleCalculator();
+    }
+}
diff --git a/sources/engine/Xenko.Assets/Sprite/SpriteSheetAssetCompiler.cs b/sources/engine/Xenko.Assets/Sprite/SpriteSheetAssetCompiler.cs
index 80b8730d67..8449f47e1c 100644
--- a/sources/engine/Xenko.Assets/Sprite/SpriteSheetAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Sprite/SpriteSheetAssetCompiler.cs
@@ -154,9 +154,8 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                     var center = image.Center + (image.CenterFromMiddle ? new Vector2(image.TextureRegion.Width, image.TextureRegion.Height) / 2 : Vector2.Zero);
 
                     if (isPacking
-                        && spriteToPackedSprite.ContainsKey(image)) // ensure that unpackable elements (invalid because of null size/texture) are properly added in the sheet using the normal path
+                        && spriteToPackedSprite.TryGetValue(image, out var packedSprite)) // ensure that unpackable elements (invalid because of null size/texture) are properly added in the sheet using the normal path
                     {
-                        var packedSprite = spriteToPackedSprite[image];
                         var isOriginalSpriteRotated = image.Orientation == ImageOrientation.Rotated90;
 
                         region = packedSprite.Region;
@@ -452,7 +451,6 @@ public SpriteSheetParameters(SpriteSheetAsset sheetAsset, Dictionary<SpriteInfo,
                 SheetAsset = sheetAsset;
                 Platform = platform;
                 GraphicsPlatform = graphicsPlatform;
-                GraphicsProfile = graphicsProfile;
                 TextureQuality = textureQuality;
                 ColorSpace = colorSpace;
             }
@@ -463,7 +461,7 @@ public SpriteSheetParameters(SpriteSheetAsset sheetAsset, Dictionary<SpriteInfo,
 
             public GraphicsPlatform GraphicsPlatform;
 
-            public GraphicsProfile GraphicsProfile;
+            public GraphicsProfile GraphicsProfile => GraphicsProfile.Level_11_2;
 
             public TextureQuality TextureQuality;
 
diff --git a/sources/engine/Xenko.Assets/SpriteFont/Compiler/BitmapUtils.cs b/sources/engine/Xenko.Assets/SpriteFont/Compiler/BitmapUtils.cs
index 423afbdd56..a4daedda95 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/Compiler/BitmapUtils.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/Compiler/BitmapUtils.cs
@@ -285,6 +285,13 @@ public static void PadBorderPixels(Bitmap bitmap, Rectangle region)
         // Copies a single pixel within a bitmap, preserving RGB but forcing alpha to zero.
         static void CopyBorderPixel(PixelAccessor bitmapData, int sourceX, int sourceY, int destX, int destY)
         {
+            if (sourceX < 0 || sourceY < 0 || destX < 0 || destY < 0 ||
+                sourceX >= bitmapData.Region.Width ||
+                sourceY >= bitmapData.Region.Height ||
+                destX >= bitmapData.Region.Width ||
+                destY >= bitmapData.Region.Height)
+                return;
+
             DrawingColor color = bitmapData[sourceX, sourceY];
 
             bitmapData[destX, destY] = DrawingColor.FromArgb(0, color);
diff --git a/sources/engine/Xenko.Assets/SpriteFont/Compiler/GlyphPacker.cs b/sources/engine/Xenko.Assets/SpriteFont/Compiler/GlyphPacker.cs
index ee07a2871a..d6b48e39f5 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/Compiler/GlyphPacker.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/Compiler/GlyphPacker.cs
@@ -85,7 +85,7 @@ namespace Xenko.Assets.SpriteFont.Compiler
     // Helper for arranging many small bitmaps onto a single larger surface.
     internal static class GlyphPacker
     {
-        public static Bitmap ArrangeGlyphs(Glyph[] sourceGlyphs)
+        public static Bitmap ArrangeGlyphs(Glyph[] sourceGlyphs, int margin = 2)
         {
             // Build up a list of all the glyphs needing to be arranged.
             List<ArrangedGlyph> glyphs = new List<ArrangedGlyph>();
@@ -97,8 +97,8 @@ public static Bitmap ArrangeGlyphs(Glyph[] sourceGlyphs)
                 glyph.Source = sourceGlyphs[i];
 
                 // Leave a one pixel border around every glyph in the output bitmap.
-                glyph.Width = sourceGlyphs[i].Subrect.Width + 2;
-                glyph.Height = sourceGlyphs[i].Subrect.Height + 2;
+                glyph.Width = sourceGlyphs[i].Subrect.Width + margin;
+                glyph.Height = sourceGlyphs[i].Subrect.Height + margin;
 
                 glyphs.Add(glyph);
             }
@@ -121,12 +121,12 @@ public static Bitmap ArrangeGlyphs(Glyph[] sourceGlyphs)
             // Create the merged output bitmap.
             outputHeight = MakeValidTextureSize(outputHeight, false);
 
-            return CopyGlyphsToOutput(glyphs, outputWidth, outputHeight);
+            return CopyGlyphsToOutput(glyphs, outputWidth, outputHeight, margin);
         }
 
 
         // Once arranging is complete, copies each glyph to its chosen position in the single larger output bitmap.
-        static Bitmap CopyGlyphsToOutput(List<ArrangedGlyph> glyphs, int width, int height)
+        static Bitmap CopyGlyphsToOutput(List<ArrangedGlyph> glyphs, int width, int height, int margin = 2)
         {
             Bitmap output = new Bitmap(width, height, PixelFormat.Format32bppArgb);
 
@@ -134,7 +134,7 @@ static Bitmap CopyGlyphsToOutput(List<ArrangedGlyph> glyphs, int width, int heig
             {
                 Glyph sourceGlyph = glyph.Source;
                 Rectangle sourceRegion = sourceGlyph.Subrect;
-                Rectangle destinationRegion = new Rectangle(glyph.X + 1, glyph.Y + 1, sourceRegion.Width, sourceRegion.Height);
+                Rectangle destinationRegion = new Rectangle(glyph.X + margin / 2, glyph.Y + margin / 2, sourceRegion.Width, sourceRegion.Height);
 
                 BitmapUtils.CopyRect(sourceGlyph.Bitmap, sourceRegion, output, destinationRegion);
 
diff --git a/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedFontCompiler.cs b/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedFontCompiler.cs
index 70d073269a..d925c02f19 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedFontCompiler.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedFontCompiler.cs
@@ -115,7 +115,7 @@ public static Graphics.SpriteFont Compile(IFontFactory fontFactory, SpriteFontAs
             foreach (Glyph glyph in glyphs)
                 GlyphCropper.Crop(glyph);
 
-            Bitmap bitmap = GlyphPacker.ArrangeGlyphs(glyphs);
+            Bitmap bitmap = GlyphPacker.ArrangeGlyphs(glyphs, fontAsset.GlyphPackingMargin);
 
             // Automatically detect whether this is a monochromatic or color font?
             //if (fontAsset.Format == FontTextureFormat.Auto)
@@ -139,7 +139,7 @@ public static Graphics.SpriteFont Compile(IFontFactory fontFactory, SpriteFontAs
                 }
             }
 
-            return OfflineRasterizedSpriteFontWriter.CreateSpriteFontData(fontFactory, fontAsset, glyphs, lineSpacing, baseLine, bitmap, srgb);
+            return OfflineRasterizedSpriteFontWriter.CreateSpriteFontData(fontFactory, fontAsset, glyphs, lineSpacing, baseLine, bitmap, srgb, fontAsset.GlyphPackingMargin);
         }
 
         static Glyph[] ImportFont(SpriteFontAsset options, out float lineSpacing, out float baseLine)
diff --git a/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedSpriteFontWriter.cs b/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedSpriteFontWriter.cs
index e17ddd2c1f..d3e04755ba 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedSpriteFontWriter.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/Compiler/OfflineRasterizedSpriteFontWriter.cs
@@ -87,13 +87,13 @@ namespace Xenko.Assets.SpriteFont.Compiler
     // Writes the output sprite font binary file.
     internal static class OfflineRasterizedSpriteFontWriter
     {
-        public static Graphics.SpriteFont CreateSpriteFontData(IFontFactory fontFactory, SpriteFontAsset options, Glyph[] glyphs, float lineSpacing, float baseLine, Bitmap bitmap, bool srgb)
+        public static Graphics.SpriteFont CreateSpriteFontData(IFontFactory fontFactory, SpriteFontAsset options, Glyph[] glyphs, float lineSpacing, float baseLine, Bitmap bitmap, bool srgb, int margin = 0)
         {
             var fontGlyphs = ConvertGlyphs(glyphs);
             var images = new[] { GetImage(options, bitmap, srgb) };
             var sizeInPixels = options.FontType.Size;
 
-            return fontFactory.NewStatic(sizeInPixels, fontGlyphs, images, baseLine, lineSpacing, null, options.Spacing, options.LineSpacing, options.DefaultCharacter);
+            return fontFactory.NewStatic(sizeInPixels, fontGlyphs, images, baseLine + options.YOffset, lineSpacing, null, options.Spacing, options.LineSpacing, options.DefaultCharacter, margin);
         }
 
         static Graphics.Font.Glyph[] ConvertGlyphs(Glyph[] glyphs)
diff --git a/sources/engine/Xenko.Assets/SpriteFont/Compiler/SignedDistanceFieldFontWriter.cs b/sources/engine/Xenko.Assets/SpriteFont/Compiler/SignedDistanceFieldFontWriter.cs
index b2e6abaf32..a2be79f93e 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/Compiler/SignedDistanceFieldFontWriter.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/Compiler/SignedDistanceFieldFontWriter.cs
@@ -93,7 +93,7 @@ public static Graphics.SpriteFont CreateSpriteFontData(IFontFactory fontFactory,
             var images = new[] { GetImage(options, bitmap) };
             var sizeInPixels = options.FontType.Size;
 
-            return fontFactory.NewScalable(sizeInPixels, fontGlyphs, images, baseLine, lineSpacing, null, options.Spacing, options.LineSpacing, options.DefaultCharacter);
+            return fontFactory.NewScalable(sizeInPixels, fontGlyphs, images, baseLine + options.YOffset, lineSpacing, null, options.Spacing, options.LineSpacing, options.DefaultCharacter);
         }
 
         static Graphics.Font.Glyph[] ConvertGlyphs(Glyph[] glyphs)
diff --git a/sources/engine/Xenko.Assets/SpriteFont/PrecompiledSpriteFontAsset.cs b/sources/engine/Xenko.Assets/SpriteFont/PrecompiledSpriteFontAsset.cs
index cb6f928752..5c2abec102 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/PrecompiledSpriteFontAsset.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/PrecompiledSpriteFontAsset.cs
@@ -47,13 +47,6 @@ public partial class PrecompiledSpriteFontAsset : Asset
         [Display(Browsable = false)]
         public float Size = 16; // a random non-null value for font created by users
 
-        /// <summary>
-        /// The reference to the original source asset.
-        /// </summary>
-        /// <userdoc>The sprite font asset that has been used to generate this precompiled font.</userdoc>
-        [DataMember(0)]
-        public AssetReference OriginalFont;
-
         /// <summary>
         /// The file containing the font data.
         /// </summary>
diff --git a/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAsset.cs b/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAsset.cs
index 47313edbd9..15a84ba501 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAsset.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAsset.cs
@@ -111,5 +111,18 @@ public partial class SpriteFontAsset : Asset
         [DataMemberRange(-500, 500, 1, 10, 2)]
         [Display(null, "Rendering")]
         public float LineGapBaseLineFactor { get; set; } = 1.0f;
+
+        [DataMember]
+        [DefaultValue(0)]
+        [Display(null, "Rendering")]
+        public int GlyphPackingMargin { get; set; } = 0;
+
+        /// <summary>
+        /// Adjust Y offset when rendering
+        /// </summary>
+        [DataMember]
+        [DefaultValue(0)]
+        [Display(null, "Rendering")]
+        public float YOffset { get; set; } = 0f;
     }
 }
diff --git a/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetCompiler.cs b/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetCompiler.cs
index 6a1c969f3c..88fc0c6d68 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetCompiler.cs
@@ -192,7 +192,7 @@ protected override Task<ResultStatus> DoCommandOverride(ICommandContext commandC
                 var dynamicFont = FontDataFactory.NewDynamic(
                     Parameters.FontType.Size, Parameters.FontSource.GetFontName(), Parameters.FontSource.Style, 
                     Parameters.FontType.AntiAlias, useKerning:false, extraSpacing:Parameters.Spacing, extraLineSpacing:Parameters.LineSpacing, 
-                    defaultCharacter:Parameters.DefaultCharacter);
+                    defaultCharacter:Parameters.DefaultCharacter, Parameters.YOffset);
 
                 var assetManager = new ContentManager(MicrothreadLocalDatabases.ProviderService);
                 assetManager.Save(Url, dynamicFont);
diff --git a/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetExtensions.cs b/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetExtensions.cs
index 0d76d9cbf1..81d40bb60e 100644
--- a/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetExtensions.cs
+++ b/sources/engine/Xenko.Assets/SpriteFont/SpriteFontAssetExtensions.cs
@@ -48,7 +48,6 @@ public static PrecompiledSpriteFontAsset GeneratePrecompiledSpriteFont(this Spri
                 Glyphs = glyphs,
                 Size = asset.FontType.Size,
                 Style = asset.FontSource.Style,
-                OriginalFont = referenceToSourceFont,
                 FontDataFile = textureFileName,
                 BaseOffset = staticFont.BaseOffsetY,
                 DefaultLineSpacing = staticFont.DefaultLineSpacing,
@@ -96,7 +95,6 @@ public static PrecompiledSpriteFontAsset GeneratePrecompiledSDFSpriteFont(this S
                 Glyphs = glyphs,
                 Size = asset.FontType.Size,
                 Style = asset.FontSource.Style,
-                OriginalFont = referenceToSourceFont,
                 FontDataFile = textureFileName,
                 BaseOffset = scalableFont.BaseOffsetY,
                 DefaultLineSpacing = scalableFont.DefaultLineSpacing,
diff --git a/sources/engine/Xenko.Assets/Templates/ProjectTemplateGeneratorHelper.cs b/sources/engine/Xenko.Assets/Templates/ProjectTemplateGeneratorHelper.cs
index 8869c03684..86e22e0b61 100644
--- a/sources/engine/Xenko.Assets/Templates/ProjectTemplateGeneratorHelper.cs
+++ b/sources/engine/Xenko.Assets/Templates/ProjectTemplateGeneratorHelper.cs
@@ -61,6 +61,7 @@ public static IEnumerable<SolutionProject> UpdatePackagePlatforms(PackageTemplat
                 OutputDirectory = package.FullPath.GetFullDirectory().GetParent(),
                 Session = package.Session,
                 Description = packageParameters.Description,
+                Namespace = packageParameters.Namespace
             };
 
             // Setup the ProjectGameGuid to be accessible from exec (in order to be able to link to the game project.
diff --git a/sources/engine/Xenko.Assets/Textures/TextureAssetCompiler.cs b/sources/engine/Xenko.Assets/Textures/TextureAssetCompiler.cs
index fcd1ae7646..692e8e593e 100644
--- a/sources/engine/Xenko.Assets/Textures/TextureAssetCompiler.cs
+++ b/sources/engine/Xenko.Assets/Textures/TextureAssetCompiler.cs
@@ -124,7 +124,6 @@ public TextureConvertParameters(
             IsStreamable = texture.IsStreamable;
             Platform = platform;
             GraphicsPlatform = graphicsPlatform;
-            GraphicsProfile = graphicsProfile;
             TextureQuality = textureQuality;
             ColorSpace = colorSpace;
         }
@@ -139,7 +138,7 @@ public TextureConvertParameters(
 
         public GraphicsPlatform GraphicsPlatform;
 
-        public GraphicsProfile GraphicsProfile;
+        public GraphicsProfile GraphicsProfile => GraphicsProfile.Level_11_2;
 
         public TextureQuality TextureQuality;
 
diff --git a/sources/engine/Xenko.Assets/Textures/TextureHelper.cs b/sources/engine/Xenko.Assets/Textures/TextureHelper.cs
index 2c7c22c035..0a7ca8cbd1 100644
--- a/sources/engine/Xenko.Assets/Textures/TextureHelper.cs
+++ b/sources/engine/Xenko.Assets/Textures/TextureHelper.cs
@@ -57,7 +57,7 @@ public class ImportParameters
 
             public GraphicsPlatform GraphicsPlatform;
 
-            public GraphicsProfile GraphicsProfile;
+            public GraphicsProfile GraphicsProfile => GraphicsProfile.Level_11_2;
 
             public PlatformType Platform;
 
@@ -81,7 +81,6 @@ public ImportParameters(TextureConvertParameters textureParameters)
                 ColorKeyEnabled = asset.Type.ColorKeyEnabled;
                 TextureQuality = textureParameters.TextureQuality;
                 GraphicsPlatform = textureParameters.GraphicsPlatform;
-                GraphicsProfile = textureParameters.GraphicsProfile;
                 Platform = textureParameters.Platform;
             }
 
@@ -104,7 +103,6 @@ public ImportParameters(SpriteSheetAssetCompiler.SpriteSheetParameters spriteShe
                 ColorKeyEnabled = asset.ColorKeyEnabled;
                 TextureQuality = spriteSheetParameters.TextureQuality;
                 GraphicsPlatform = spriteSheetParameters.GraphicsPlatform;
-                GraphicsProfile = spriteSheetParameters.GraphicsProfile;
                 Platform = spriteSheetParameters.Platform;
             }
         }
@@ -280,8 +278,6 @@ public static PixelFormat DetermineOutputFormat(ImportParameters parameters, Siz
                             switch (parameters.GraphicsPlatform)
                             {
                                 case GraphicsPlatform.Direct3D11:
-                                case GraphicsPlatform.Direct3D12:
-                                case GraphicsPlatform.OpenGL:
                                 case GraphicsPlatform.Vulkan:
 
                                     // https://msdn.microsoft.com/en-us/library/windows/desktop/hh308955%28v=vs.85%29.aspx
@@ -320,11 +316,11 @@ public static PixelFormat DetermineOutputFormat(ImportParameters parameters, Siz
                                     // Support some specific optimized formats based on the hint or input type
                                     if (parameters.GraphicsProfile >= GraphicsProfile.Level_10_0)
                                     {
-                                        if (parameters.GraphicsPlatform != GraphicsPlatform.OpenGL && hint == TextureHint.NormalMap)
+                                        if (hint == TextureHint.NormalMap)
                                         {
                                             outputFormat = PixelFormat.BC5_UNorm;
                                         }
-                                        else if (parameters.GraphicsPlatform != GraphicsPlatform.OpenGL && hint == TextureHint.Grayscale)
+                                        else if (hint == TextureHint.Grayscale)
                                         {
                                             outputFormat = PixelFormat.BC4_UNorm;
                                         }
@@ -337,37 +333,6 @@ public static PixelFormat DetermineOutputFormat(ImportParameters parameters, Siz
                                         // TODO support the BC6/BC7 but they are so slow to compile that we can't use them right now
                                     }
                                     break;
-                                case GraphicsPlatform.OpenGLES: // OpenGLES on Windows
-                                    if (inputImageFormat.IsHDR())
-                                    {
-                                        outputFormat = inputImageFormat;
-                                    }
-                                    else if (parameters.IsSRgb)
-                                    {
-                                        outputFormat = PixelFormat.R8G8B8A8_UNorm_SRgb;
-                                    }
-                                    else
-                                    {
-                                        switch (parameters.GraphicsProfile)
-                                        {
-                                            case GraphicsProfile.Level_9_1:
-                                            case GraphicsProfile.Level_9_2:
-                                            case GraphicsProfile.Level_9_3:
-                                                outputFormat = alphaMode == AlphaFormat.None ? PixelFormat.ETC1 : PixelFormat.R8G8B8A8_UNorm;
-                                                break;
-                                            case GraphicsProfile.Level_10_0:
-                                            case GraphicsProfile.Level_10_1:
-                                            case GraphicsProfile.Level_11_0:
-                                            case GraphicsProfile.Level_11_1:
-                                            case GraphicsProfile.Level_11_2:
-                                                // GLES3.0 starting from Level_10_0, this profile enables ETC2 compression on Android
-                                                outputFormat = alphaMode == AlphaFormat.None ? PixelFormat.ETC1 : PixelFormat.ETC2_RGBA;
-                                                break;
-                                            default:
-                                                throw new ArgumentOutOfRangeException("GraphicsProfile");
-                                        }
-                                    }
-                                    break;
                                 default:
                                     // OpenGL on Windows
                                     // TODO: Need to handle OpenGL Desktop compression
@@ -387,32 +352,6 @@ public static PixelFormat DetermineOutputFormat(ImportParameters parameters, Siz
                     throw new ArgumentOutOfRangeException();
             }
 
-            // OpenGLES: avoid BGRA (optional extension)
-            if (parameters.GraphicsPlatform == GraphicsPlatform.OpenGLES)
-            {
-                switch (outputFormat)
-                {
-                    case PixelFormat.B8G8R8A8_UNorm:
-                        outputFormat = PixelFormat.R8G8B8A8_UNorm;
-                        break;
-                    case PixelFormat.B8G8R8A8_UNorm_SRgb:
-                        outputFormat = PixelFormat.R8G8B8A8_UNorm_SRgb;
-                        break;
-                }
-            }
-
-            // OpenGL and OpenGLES: avoid R5G6B5 (not implemented)
-            if (parameters.GraphicsPlatform == GraphicsPlatform.OpenGLES || parameters.GraphicsPlatform == GraphicsPlatform.OpenGL)
-            {
-                switch (outputFormat)
-                {
-                    case PixelFormat.B5G5R5A1_UNorm:
-                    case PixelFormat.B5G6R5_UNorm:
-                        outputFormat = PixelFormat.R8G8B8A8_UNorm;
-                        break;
-                }
-            }
-
             return outputFormat;
         }
 
diff --git a/sources/engine/Xenko.Assets/Textures/TextureImporter.cs b/sources/engine/Xenko.Assets/Textures/TextureImporter.cs
index 55becb22e5..82be3eb16d 100644
--- a/sources/engine/Xenko.Assets/Textures/TextureImporter.cs
+++ b/sources/engine/Xenko.Assets/Textures/TextureImporter.cs
@@ -7,6 +7,7 @@
 using Xenko.Core.Assets;
 using Xenko.Core.IO;
 using Xenko.Assets.Sprite;
+using Xenko.Assets.Physics;
 
 namespace Xenko.Assets.Textures
 {
@@ -28,6 +29,7 @@ public override IEnumerable<Type> RootAssetTypes
             {
                 yield return typeof(TextureAsset);
                 yield return typeof(SpriteSheetAsset); // TODO: this is temporary, until we can make the asset templates ask compilers instead of importer which type they support
+                yield return typeof(HeightmapAsset);
             }
         }
 
diff --git a/sources/engine/Xenko.Assets/WindowsGameSettingsProfile.cs b/sources/engine/Xenko.Assets/WindowsGameSettingsProfile.cs
index 831b9905e2..87203e9742 100644
--- a/sources/engine/Xenko.Assets/WindowsGameSettingsProfile.cs
+++ b/sources/engine/Xenko.Assets/WindowsGameSettingsProfile.cs
@@ -21,7 +21,7 @@ public WindowsGameSettingsProfile()
 
         public override IEnumerable<GraphicsPlatform> GetSupportedGraphicsPlatforms()
         {
-            return new[] { GraphicsPlatform.Direct3D11, GraphicsPlatform.OpenGL, GraphicsPlatform.OpenGLES, };
+            return new[] { GraphicsPlatform.Direct3D11, GraphicsPlatform.Vulkan, };
         }
     }
 }
diff --git a/sources/engine/Xenko.Assets/Xenko.Assets.csproj b/sources/engine/Xenko.Assets/Xenko.Assets.csproj
index d7abc7282e..2752e501c4 100644
--- a/sources/engine/Xenko.Assets/Xenko.Assets.csproj
+++ b/sources/engine/Xenko.Assets/Xenko.Assets.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -14,28 +14,20 @@
     <DefineConstants>XENKO_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="SharpDX.Direct2D1" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
     <!--PackageReference Include="Esent.Interop" Version="1.9.4" /-->
-    <PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="2.10.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="2.10.0" />
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.6" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.4.0" />
     <Reference Include="Renci.SshNet">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\deps\SSH.NET\Renci.SshNet.dll</HintPath>
     </Reference>
     <PackageReference Include="System.AppContext" Version="4.3.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <PackageReference Include="System.Composition.AttributedModel" Version="1.1.0" />
-    <PackageReference Include="System.Composition.Convention" Version="1.1.0" />
-    <PackageReference Include="System.Composition.Hosting" Version="1.1.0" />
-    <PackageReference Include="System.Composition.Runtime" Version="1.1.0" />
-    <PackageReference Include="System.Composition.TypedParts" Version="1.1.0" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <PackageReference Include="System.Console" Version="4.3.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
+    <PackageReference Include="System.Console" Version="4.3.1" />
     <PackageReference Include="System.Diagnostics.FileVersionInfo" Version="4.3.0" />
     <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
     <PackageReference Include="System.IO" Version="4.3.0" />
@@ -43,17 +35,17 @@
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Metadata" Version="7.0.2" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
     <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
     <PackageReference Include="System.Security.Cryptography.Encoding" Version="4.3.0" />
     <PackageReference Include="System.Security.Cryptography.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
     <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
     <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.Xml.XPath" Version="4.3.0" />
@@ -126,7 +118,7 @@
   </ItemGroup>
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
diff --git a/sources/engine/Xenko.Assets/XenkoConfig.cs b/sources/engine/Xenko.Assets/XenkoConfig.cs
index 5f501b6833..c6d83204ef 100644
--- a/sources/engine/Xenko.Assets/XenkoConfig.cs
+++ b/sources/engine/Xenko.Assets/XenkoConfig.cs
@@ -62,7 +62,7 @@ internal static void RegisterSolutionPlatforms()
                     Name = PlatformType.Windows.ToString(),
                     IsAvailable = true,
                     Alias = "Any CPU",
-                    TargetFramework = "net461",
+                    TargetFramework = "net6.0",
                     Type = PlatformType.Windows
                 };
             windowsPlatform.PlatformsPart.Add(new SolutionPlatformPart("Any CPU"));
@@ -70,7 +70,6 @@ internal static void RegisterSolutionPlatforms()
             windowsPlatform.DefineConstants.Add("XENKO_PLATFORM_WINDOWS");
             windowsPlatform.DefineConstants.Add("XENKO_PLATFORM_WINDOWS_DESKTOP");
             windowsPlatform.Configurations.Add(new SolutionConfiguration("Testing"));
-            windowsPlatform.Configurations.Add(new SolutionConfiguration("AppStore"));
 
             // Currently disabled
             //windowsPlatform.Configurations.Add(coreClrDebug);
@@ -82,60 +81,12 @@ internal static void RegisterSolutionPlatforms()
             }
             solutionPlatforms.Add(windowsPlatform);
 
-            // Universal Windows Platform (UWP)
-            var uwpPlatform = new SolutionPlatform()
-            {
-                Name = PlatformType.UWP.ToString(),
-                Type = PlatformType.UWP,
-                TargetFramework = "uap10.0.16299",
-                Templates =
-                {
-                    //new SolutionPlatformTemplate("ProjectExecutable.UWP/CoreWindow/ProjectExecutable.UWP.ttproj", "Core Window"),
-                    new SolutionPlatformTemplate("ProjectExecutable.UWP/Xaml/ProjectExecutable.UWP.ttproj", "Xaml")
-                },
-                IsAvailable = IsVSComponentAvailableAnyVersion(UniversalWindowsPlatformComponents),
-                UseWithExecutables = false,
-                IncludeInSolution = false,
-            };
-
-            uwpPlatform.DefineConstants.Add("XENKO_PLATFORM_WINDOWS");
-            uwpPlatform.DefineConstants.Add("XENKO_PLATFORM_UWP");
-            uwpPlatform.Configurations.Add(new SolutionConfiguration("Testing"));
-            uwpPlatform.Configurations.Add(new SolutionConfiguration("AppStore"));
-            uwpPlatform.Configurations["Release"].Properties.Add("<NoWarn>;2008</NoWarn>");
-            uwpPlatform.Configurations["Debug"].Properties.Add("<NoWarn>;2008</NoWarn>");
-            uwpPlatform.Configurations["Testing"].Properties.Add("<NoWarn>;2008</NoWarn>");
-            uwpPlatform.Configurations["AppStore"].Properties.Add("<NoWarn>;2008</NoWarn>");
-
-            uwpPlatform.Configurations["Release"].Properties.Add("<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>");
-            uwpPlatform.Configurations["Testing"].Properties.Add("<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>");
-            uwpPlatform.Configurations["AppStore"].Properties.Add("<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>");
-
-            foreach (var cpu in new[] { "x86", "x64", "ARM" })
-            {
-                var uwpPlatformCpu = new SolutionPlatformPart(uwpPlatform.Name + "-" + cpu)
-                {
-                    LibraryProjectName = uwpPlatform.Name,
-                    ExecutableProjectName = cpu,
-                    Cpu = cpu,
-                    InheritConfigurations = true,
-                    UseWithLibraries = false,
-                    UseWithExecutables = true,
-                };
-                uwpPlatformCpu.Configurations.Clear();
-                uwpPlatformCpu.Configurations.AddRange(uwpPlatform.Configurations);
-
-                uwpPlatform.PlatformsPart.Add(uwpPlatformCpu);
-            }
-
-            solutionPlatforms.Add(uwpPlatform);
-
             // Linux
             var linuxPlatform = new SolutionPlatform()
             {
                 Name = PlatformType.Linux.ToString(),
                 IsAvailable = true,
-                TargetFramework = "netcoreapp2.1",
+                TargetFramework = "net6.0",
                 RuntimeIdentifier = "linux-x64",
                 Type = PlatformType.Linux,
             };
@@ -148,7 +99,7 @@ internal static void RegisterSolutionPlatforms()
             {
                 Name = PlatformType.macOS.ToString(),
                 IsAvailable = true,
-                TargetFramework = "netcoreapp2.1",
+                TargetFramework = "net6.0-macos",
                 RuntimeIdentifier = "osx-x64",
                 Type = PlatformType.macOS,
             };
@@ -156,93 +107,6 @@ internal static void RegisterSolutionPlatforms()
             macOSPlatform.DefineConstants.Add("XENKO_PLATFORM_MACOS");
             solutionPlatforms.Add(macOSPlatform);
 
-            // Android
-            var androidPlatform = new SolutionPlatform()
-            {
-                Name = PlatformType.Android.ToString(),
-                Type = PlatformType.Android,
-                TargetFramework = "monoandroid81",
-                IsAvailable = IsVSComponentAvailableAnyVersion(XamarinAndroidComponents)
-            };
-            androidPlatform.DefineConstants.Add("XENKO_PLATFORM_MONO_MOBILE");
-            androidPlatform.DefineConstants.Add("XENKO_PLATFORM_ANDROID");
-            androidPlatform.Configurations.Add(new SolutionConfiguration("Testing"));
-            androidPlatform.Configurations.Add(new SolutionConfiguration("AppStore"));
-            androidPlatform.Configurations["Debug"].Properties.AddRange(new[]
-                {
-                    "<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>",
-                    "<AndroidLinkMode>None</AndroidLinkMode>",
-                });
-            androidPlatform.Configurations["Release"].Properties.AddRange(new[]
-                {
-                    "<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>",
-                    "<AndroidLinkMode>SdkOnly</AndroidLinkMode>",
-                });
-            androidPlatform.Configurations["Testing"].Properties.AddRange(androidPlatform.Configurations["Release"].Properties);
-            androidPlatform.Configurations["AppStore"].Properties.AddRange(androidPlatform.Configurations["Release"].Properties);
-            solutionPlatforms.Add(androidPlatform);
-
-            // iOS: iPhone
-            var iphonePlatform = new SolutionPlatform()
-            {
-                Name = PlatformType.iOS.ToString(),
-                SolutionName = "iPhone", // For iOS, we need to use iPhone as a solution name
-                Type = PlatformType.iOS,
-                TargetFramework = "xamarinios10",
-                IsAvailable = IsVSComponentAvailableAnyVersion(XamariniOSComponents)
-            };
-            iphonePlatform.PlatformsPart.Add(new SolutionPlatformPart("iPhoneSimulator"));
-            iphonePlatform.DefineConstants.Add("XENKO_PLATFORM_MONO_MOBILE");
-            iphonePlatform.DefineConstants.Add("XENKO_PLATFORM_IOS");
-            iphonePlatform.Configurations.Add(new SolutionConfiguration("Testing"));
-            iphonePlatform.Configurations.Add(new SolutionConfiguration("AppStore"));
-            var iPhoneCommonProperties = new List<string>
-                {
-                    "<ConsolePause>false</ConsolePause>",
-                    "<MtouchUseSGen>True</MtouchUseSGen>",
-                    "<MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>"
-                };
-
-            iphonePlatform.Configurations["Debug"].Properties.AddRange(iPhoneCommonProperties);
-            iphonePlatform.Configurations["Debug"].Properties.AddRange(new []
-                {
-                    "<MtouchDebug>True</MtouchDebug>",
-                    "<CodesignKey>iPhone Developer</CodesignKey>",
-                    "<MtouchUseSGen>True</MtouchUseSGen>",
-                });
-            iphonePlatform.Configurations["Release"].Properties.AddRange(iPhoneCommonProperties);
-            iphonePlatform.Configurations["Release"].Properties.AddRange(new[]
-                {
-                    "<CodesignKey>iPhone Developer</CodesignKey>",
-                });
-            iphonePlatform.Configurations["Testing"].Properties.AddRange(iPhoneCommonProperties);
-            iphonePlatform.Configurations["Testing"].Properties.AddRange(new[]
-                {
-                    "<MtouchDebug>True</MtouchDebug>",
-                    "<CodesignKey>iPhone Distribution</CodesignKey>",
-                    "<BuildIpa>True</BuildIpa>",
-                });
-            iphonePlatform.Configurations["AppStore"].Properties.AddRange(iPhoneCommonProperties);
-            iphonePlatform.Configurations["AppStore"].Properties.AddRange(new[]
-                {
-                    "<CodesignKey>iPhone Distribution</CodesignKey>",
-                });
-            solutionPlatforms.Add(iphonePlatform);
-
-            // iOS: iPhoneSimulator
-            var iPhoneSimulatorPlatform = iphonePlatform.PlatformsPart["iPhoneSimulator"];
-            iPhoneSimulatorPlatform.Configurations["Debug"].Properties.AddRange(new[]
-                {
-                    "<MtouchDebug>True</MtouchDebug>",
-                    "<MtouchLink>None</MtouchLink>",
-                    "<MtouchArch>i386, x86_64</MtouchArch>"
-                });
-            iPhoneSimulatorPlatform.Configurations["Release"].Properties.AddRange(new[]
-                {
-                    "<MtouchLink>None</MtouchLink>",
-                    "<MtouchArch>i386, x86_64</MtouchArch>"
-                });
-
             AssetRegistry.RegisterSupportedPlatforms(solutionPlatforms);
         }
 
diff --git a/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs b/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs
index 08c9778097..3b7d26c98a 100644
--- a/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs
+++ b/sources/engine/Xenko.Assets/XenkoPackageUpgrader.cs
@@ -40,6 +40,24 @@ public partial class XenkoPackageUpgrader : PackageUpgrader
 
         public override bool Upgrade(PackageLoadParameters loadParameters, PackageSession session, ILogger log, Package dependentPackage, PackageDependency dependency, Package dependencyPackage, IList<PackageLoadingAssetFile> assetFiles)
         {
+            if (dependency.Version.MinVersion < new PackageVersion("3.1.0.2-beta01"))
+            {
+                foreach (var assetFile in assetFiles)
+                {
+                    // Add new generic parameter to ShadowMapReceiverDirectional in effect log
+                    if (assetFile.FilePath.GetFileExtension() == ".xkeffectlog")
+                    {
+                        var assetContent = assetFile.AssetContent ?? File.ReadAllBytes(assetFile.FilePath.FullPath);
+                        var assetContentString = System.Text.Encoding.UTF8.GetString(assetContent);
+                        var newAssetContentString = System.Text.RegularExpressions.Regex.Replace(assetContentString, @"([ ]*)-   ClassName:", "$1- !ShaderClassSource\r\n$1    ClassName:");
+                        if (assetContentString != newAssetContentString)
+                        {
+                            // Need replacement, update with replaced text
+                            assetFile.AssetContent = System.Text.Encoding.UTF8.GetBytes(newAssetContentString);
+                        }
+                    }
+                }
+            }
             return true;
         }
 
@@ -141,6 +159,51 @@ public override bool UpgradeBeforeAssembliesLoaded(PackageLoadParameters loadPar
                         }
                     }
 
+                    // Change shader generated file from .cs to .xksl.cs or .xkfx.cs
+                    if (dependency.Version.MinVersion < new PackageVersion("3.2.0.1-beta02"))
+                    {
+                        // Find xksl files
+                        var shaderFiles = project.Items.Where(x => x.ItemType == "None" && (x.EvaluatedInclude.EndsWith(".xksl", StringComparison.InvariantCultureIgnoreCase) || x.EvaluatedInclude.EndsWith(".xkfx", StringComparison.InvariantCultureIgnoreCase)) && x.HasMetadata("Generator"));
+
+                        foreach (var shaderFile in shaderFiles)
+                        {
+                            var shaderFilePath = Path.Combine(projectFullPath.GetFullDirectory(), new UFile(shaderFile.EvaluatedInclude));
+                            var oldGeneratedFilePath = Path.ChangeExtension(shaderFilePath, ".cs");
+
+                            if (File.Exists(oldGeneratedFilePath))
+                            {
+                                File.Move(oldGeneratedFilePath, shaderFilePath + ".cs");
+
+                                // Update project (directly with Xml since it is an Update element, not an Include)
+                                foreach (var csElement in project.Xml.ItemGroups.SelectMany(x => x.Items).Where(x => new UFile(x.Update) == new UFile(Path.ChangeExtension(shaderFile.EvaluatedInclude, ".cs"))))
+                                {
+                                    csElement.Update = shaderFile.EvaluatedInclude + ".cs";
+                                    isProjectDirty = true;
+                                }
+                                // I think we should have only Update, not Include, but let's do that just in case
+                                foreach (var csElement in project.Xml.ItemGroups.SelectMany(x => x.Items).Where(x => new UFile(x.Include) == new UFile(Path.ChangeExtension(shaderFile.EvaluatedInclude, ".cs"))))
+                                {
+                                    csElement.Include = shaderFile.EvaluatedInclude + ".cs";
+                                    isProjectDirty = true;
+                                }
+
+                                if (shaderFile.EvaluatedInclude.EndsWith(".xkfx", StringComparison.InvariantCultureIgnoreCase))
+                                {
+                                    shaderFile.GetMetadata("Generator").UnevaluatedValue = "XenkoEffectCodeGenerator";
+                                    isProjectDirty = true;
+                                }
+
+                                // Also update LastGenOutput
+                                var lastGenOutputMetadata = shaderFile.GetMetadata("LastGenOutput");
+                                if (lastGenOutputMetadata != null && !lastGenOutputMetadata.IsImported)
+                                {
+                                    lastGenOutputMetadata.UnevaluatedValue = new UFile(shaderFile.EvaluatedInclude + ".cs").GetFileName();
+                                    isProjectDirty = true;
+                                }
+                            }
+                        }
+                    }
+
                     if (isProjectDirty)
                         project.Save();
 
diff --git a/sources/engine/Xenko.Audio.Tests/Engine/TestAudioEmitterComponent.cs b/sources/engine/Xenko.Audio.Tests/Engine/TestAudioEmitterComponent.cs
deleted file mode 100644
index b43cb8da91..0000000000
--- a/sources/engine/Xenko.Audio.Tests/Engine/TestAudioEmitterComponent.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-//// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-//// This file is distributed under GPL v3. See LICENSE.md for details.
-//
-//using System;
-//
-//using Xunit;
-//
-//using Xenko.Core.IO;
-//using Xenko.Core.Serialization.Assets;
-//using Xenko.Engine;
-//
-//namespace Xenko.Audio.Tests.Engine
-//{
-//    /// <summary>
-//    /// Test the <see cref="AudioEmitterComponent"/>. Some of the test depends on internal implementation and can failed if implementation has been modified.
-//    /// </summary>
-////    public class TestAudioEmitterComponent
-//    {
-//        /// <summary>
-//        /// Test Component default values and states.
-//        /// </summary>
-//        [Fact]
-//        public void TestInitialization()
-//        {
-//            var testInst = new AudioEmitterComponent();
-//            Assert.Equal(testInst.DistanceScale, 1, "Default value of the distance scale is not correct");
-//            Assert.Equal(testInst.DopplerScale, 1, "Default value of the doppler scale is not correct");
-//            Assert.False(testInst.ShouldBeProcessed, "Default value of ShouldBeProcessed si not correct");
-//            Assert.True(testInst.SoundEffectToController.Keys.Count ==0, "Controller list is not empty");
-//        }
-//
-//        [Fact]
-//        public void TestDistanceDopplerScale()
-//        {
-//            var testInst = new AudioEmitterComponent();
-//            Assert.Throws<ArgumentOutOfRangeException>(() => testInst.DistanceScale = -0.1f, "DistanceScale did not throw ArgumentOutOfRangeException");
-//            Assert.Throws<ArgumentOutOfRangeException>(() => testInst.DopplerScale = -0.1f, "DopplerScale did not throw ArgumentOutOfRangeException");
-//        }
-//
-//        /// <summary>
-//        /// Test the internal behaviour of the component when attaching and detaching sound to the component.
-//        /// </summary>
-//        [Fact]
-//        public void TestAttachDetachSounds()
-//        {
-//            var testInst = new AudioEmitterComponent();
-//            using (var game = new Game())
-//            {
-//                Game.InitializeAssetDatabase();
-//                using (var audioStream1 = ContentManager.FileProvider.OpenStream("EffectToneA", VirtualFileMode.Open, VirtualFileAccess.Read))
-//                using (var audioStream2 = ContentManager.FileProvider.OpenStream("EffectBip", VirtualFileMode.Open, VirtualFileAccess.Read))
-//                using (var audioStream3 = ContentManager.FileProvider.OpenStream("EffectStereo", VirtualFileMode.Open, VirtualFileAccess.Read))
-//                {
-//                    var sound1 = SoundEffect.Load(game.Audio.AudioEngine, audioStream1);
-//                    var sound2 = SoundEffect.Load(game.Audio.AudioEngine, audioStream2);
-//                    var sound3 = SoundEffect.Load(game.Audio.AudioEngine, audioStream3);
-//
-//                    // Attach two soundEffect and check that their controller are correctly created.
-//
-//                    AudioEmitterSoundController soundController1 = null;
-//                    AudioEmitterSoundController soundController2 = null;
-//                    Assert.DoesNotThrow(() => testInst.AttachSoundEffect(sound1), "Adding a first soundEffect failed");
-//                    Assert.DoesNotThrow(() => soundController1 = testInst.SoundEffectToController[sound1], "There are no sound controller for sound1.");
-//                    Assert.NotNull(soundController1, "Sound controller for sound1 is null");
-//
-//                    Assert.DoesNotThrow(() => testInst.AttachSoundEffect(sound2), "Adding a second soundEffect failed");
-//                    Assert.DoesNotThrow(() => soundController2 = testInst.SoundEffectToController[sound2], "There are no sound controller for sound1.");
-//                    Assert.NotNull(soundController2, "Sound controller for sound2 is null");
-//
-//                    // Remove the two soundEffect and check that their controller are correctly erased.
-//
-//                    Assert.DoesNotThrow(() => testInst.DetachSoundEffect(sound2), "Removing a first soundEffect failed");
-//                    Assert.False(testInst.SoundEffectToController.ContainsKey(sound2), "The controller for sound2 is still present in the list.");
-//
-//                    Assert.DoesNotThrow(() => testInst.DetachSoundEffect(sound1), "Removing a second soundEffect failed");
-//                    Assert.False(testInst.SoundEffectToController.ContainsKey(sound1), "The controller for sound1 is still present in the list.");
-//
-//                    Assert.True(testInst.SoundEffectToController.Keys.Count == 0, "There are some controller left in the component list.");
-//
-//                    // Check the exception thrwon by attachSoundEffect.
-//
-//                    Assert.Throws<ArgumentNullException>(() => testInst.AttachSoundEffect(null), "AttachSoundEffect did not throw ArgumentNullException");
-//                    Assert.Throws<InvalidOperationException>(() => testInst.AttachSoundEffect(sound3), "AttachSoundEffect did not throw InvalidOperationException.");
-//
-//                    // Check the exception thrown by detachSoundEffect.
-//
-//                    Assert.Throws<ArgumentNullException>(() => testInst.DetachSoundEffect(null), "DetachSoundEffect did not throw ArgumentNullException.");
-//                    Assert.Throws<ArgumentException>(() => testInst.DetachSoundEffect(sound1), "DetachSoundEffect did not throw ArgumentException ");
-//                }
-//            }
-//        }
-//
-//        /// <summary>
-//        /// Test the <see cref="AudioEmitterComponent.GetSoundEffectController"/> function.
-//        /// </summary>
-//        [Fact]
-//        public void TestGetController()
-//        {
-//            var testInst = new AudioEmitterComponent();
-//            using (var game = new Game())
-//            {
-//                Game.InitializeAssetDatabase();
-//                using (var audioStream1 = ContentManager.FileProvider.OpenStream("EffectToneA", VirtualFileMode.Open, VirtualFileAccess.Read))
-//                using (var audioStream2 = ContentManager.FileProvider.OpenStream("EffectBip", VirtualFileMode.Open, VirtualFileAccess.Read))
-//                {
-//                    var sound1 = SoundEffect.Load(game.Audio.AudioEngine, audioStream1);
-//                    var sound2 = SoundEffect.Load(game.Audio.AudioEngine, audioStream2);
-//
-//                    AudioEmitterSoundController soundController1 = null;
-//                    AudioEmitterSoundController soundController2 = null;
-//
-//                    // Add two soundEffect and try to get their controller.
-//
-//                    testInst.AttachSoundEffect(sound1);
-//                    Assert.DoesNotThrow(() => soundController1 = testInst.GetSoundEffectController(sound1), "Failed to get the controller associated to the soundEffect1.");
-//
-//                    testInst.AttachSoundEffect(sound2);
-//                    Assert.DoesNotThrow(() => soundController2 = testInst.GetSoundEffectController(sound2), "Failed to get the controller associated to the soundEffect1.");
-//
-//                    // Suppress the two SoundEffects and check that the function throws the correct exception (ArgumentException)
-//
-//                    testInst.DetachSoundEffect(sound1);
-//                    Assert.Throws<ArgumentException>(() => testInst.GetSoundEffectController(sound1), "GetController did not throw ArgumentException but sound1 was supposed to be detached.");
-//
-//                    testInst.DetachSoundEffect(sound2);
-//                    Assert.Throws<ArgumentException>(() => testInst.GetSoundEffectController(sound2), "GetController did not throw ArgumentException but sound2 was supposed to be detached.");
-//
-//                    // Check the ArgumentNullException
-//                    Assert.Throws<ArgumentNullException>(() => testInst.GetSoundEffectController(null), "GetController did not throw ArgumentNullException.");
-//                }
-//            }
-//        }
-//    }
-//}
diff --git a/sources/engine/Xenko.Audio.Tests/Engine/TestAudioEmitterProcessor.cs b/sources/engine/Xenko.Audio.Tests/Engine/TestAudioEmitterProcessor.cs
deleted file mode 100644
index 96d216b100..0000000000
--- a/sources/engine/Xenko.Audio.Tests/Engine/TestAudioEmitterProcessor.cs
+++ /dev/null
@@ -1,493 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-using Xunit;
-
-using Xenko.Core.Mathematics;
-using Xenko.Engine;
-
-namespace Xenko.Audio.Tests.Engine
-{
-    /// <summary>
-    /// Test the <see cref="AudioEmitterComponent"/>. All the test are performed on internal members. 
-    /// If the implementation of the <see cref="AudioEmitterComponent"/> is modified, those tests may not be valid anymore.
-    /// </summary>
-    public class TestAudioEmitterProcessor
-    {
-        private List<AudioListenerComponent> listComps;
-        private List<AudioEmitterComponent> emitComps;
-        private List<Entity> compEntities;
-
-        private Entity rootEntity;
-        private Entity rootSubEntity1;
-        private Entity rootSubEntity2;
-
-        private List<Sound> sounds;
-        private List<AudioEmitterSoundController> soundControllers;
-
-        // build a simple entity hierarchy as follow that may be used for tests.
-        //       o root
-        //      / \
-        //     o   o subEntities
-        //     |   | 
-        //     o   o listCompEntities
-        private void BuildEntityHierarchy()
-        {
-            rootEntity = new Entity { Name = "Root entity" };
-            rootSubEntity1 = new Entity { Name = "Root sub entity 1" };
-            rootSubEntity2 = new Entity { Name = "Root sub entity 2" };
-            compEntities = new List<Entity> { new Entity { Name = "Comp entity 1" }, new Entity { Name = "Comp entity 2" } };
-
-            rootSubEntity1.Transform.Parent = rootEntity.Transform;
-            rootSubEntity2.Transform.Parent = rootEntity.Transform;
-            compEntities[0].Transform.Parent = rootSubEntity1.Transform;
-            compEntities[1].Transform.Parent = rootSubEntity2.Transform;
-        }
-
-        /// <summary>
-        /// Load some default random <see cref="SoundEffect"/>, attach them to the emitter components, and query their controllers.
-        /// </summary>
-        /// <param name="game"></param>
-        private void AddSoundEffectToEmitterComponents(Game game)
-        {
-            sounds = new List<Sound>
-            {
-                game.Content.Load<Sound>("EffectBip"),
-                game.Content.Load<Sound>("EffectToneA"),
-                game.Content.Load<Sound>("EffectToneA"),
-            };
-
-            emitComps[0].Sounds["EffectBip"] = sounds[0];
-            emitComps[0].Sounds["EffectToneA"] = sounds[1];
-            emitComps[1].Sounds["EffectToneA"] = sounds[2];
-
-            soundControllers = new List<AudioEmitterSoundController>
-            {
-                emitComps[0]["EffectBip"],
-                emitComps[0]["EffectToneA"],
-                emitComps[1]["EffectToneA"],
-            };
-        }
-
-        /// <summary>
-        /// Add the root entity to the entity system
-        /// </summary>
-        /// <param name="game"></param>
-        private void AddRootEntityToEntitySystem(Game game)
-        {
-            throw new NotImplementedException("TODO: UPDATE TO USE Scene and Graphics Composer"); // game.Entities.Add(rootEntity);
-        }
-
-        /// <summary>
-        /// Add all the <see cref="AudioListenerComponent"/> to the <see cref="AudioSystem"/>.
-        /// </summary>
-        /// <param name="game"></param>
-        private void AddListenersToAudioSystem(Game game)
-        {
-            foreach (var t in listComps)
-                game.Audio.AddListener(t);
-        }
-
-        /// <summary>
-        /// Create some <see cref="AudioListenerComponent"/> and add them to 'compEntities'.
-        /// </summary>
-        private void CreateAndAddListenerComponentToEntities()
-        {
-            listComps = new List<AudioListenerComponent> { new AudioListenerComponent(), new AudioListenerComponent() };
-
-            for (int i = 0; i < listComps.Count; i++)
-                compEntities[i].Add(listComps[i]);
-        }
-
-        /// <summary>
-        /// Create some <see cref="AudioEmitterComponent"/> and add them to 'compEntities'.
-        /// </summary>
-        private void CreateAndAddEmitterComponentToEntities()
-        {
-            emitComps = new List<AudioEmitterComponent> { new AudioEmitterComponent(), new AudioEmitterComponent() };
-
-            for (int i = 0; i < compEntities.Count; i++)
-                compEntities[i].Add(emitComps[i]);
-        }
-
-        //        /// <summary>
-        //        /// Check that each <see cref="AudioEmitterSoundController"/> of the scene have one <see cref="SoundEffectInstance"/> 
-        //        /// associated to each <see cref="AudioListenerComponent"/> added to the <see cref="AudioSystem"/>.
-        //        /// </summary>
-        //        /// <param name="matchingEntities">matching entities from the <see cref="AudioEmitterProcessor"/></param>
-        //        private void CheckSoundEffectExistance(Dictionary<Entity, AudioEmitterProcessor.AssociatedData> matchingEntities)
-        //        {
-        //            CheckSoundEffectExistance(new HashSet<AudioListenerComponent>(listComps), matchingEntities);
-        //        }
-        //
-        //        /// <summary>
-        //        /// Check that each <see cref="AudioEmitterSoundController"/> of the scene have one <see cref="SoundEffectInstance"/> 
-        //        /// associated to each <see cref="AudioListenerComponent"/> of the <paramref name="shouldExistListeners"/> list.
-        //        /// </summary>
-        //        /// <param name="shouldExistListeners">the listener component that should exist</param>
-        //        /// <param name="matchingEntities">matching entities from the <see cref="AudioEmitterProcessor"/></param>
-        //        private void CheckSoundEffectExistance(HashSet<AudioListenerComponent> shouldExistListeners, Dictionary<Entity, AudioEmitterProcessor.AssociatedData> matchingEntities)
-        //        {
-        //            for (var i = 0; i < compEntities.Count; i++)
-        //            {
-        //                var data = matchingEntities[compEntities[i]];
-        //                foreach (var listComp in listComps)
-        //                {
-        //                    foreach (var controller in emitComps[i].SoundToController.Values)
-        //                    {
-        //                        var currentKey = Tuple.Create(listComp, controller);
-        //                        if (shouldExistListeners.Contains(listComp))
-        //                            Assert.True(data.ListenerControllerToSoundInstance.ContainsKey(currentKey), "Sound Effect instance should exist for registered listener");
-        //                        else
-        //                            Assert.False(data.ListenerControllerToSoundInstance.ContainsKey(currentKey), "Sound Effect instance should not exist for not registered listener");
-        //                    }
-        //                }
-        //            }
-        //        }
-
-        /// <summary>
-        /// Add and remove <see cref="AudioListenerComponent"/> to the <see cref="AudioSystem"/> and check that 
-        /// <see cref="SoundEffectInstance"/> dedicated to each <see cref="AudioListenerComponent"/> are correctly created.
-        /// </summary>
-        [Fact(Skip = "TODO: UPDATE TO USE Scene and Graphics Composer")]
-        public void TestAddRemoveListeners()
-        {
-            TestUtilities.CreateAndRunGame(TestAddRemoveListenersHelper, TestUtilities.ExitGame);
-        }
-
-        private void TestAddRemoveListenersHelper(Game game)
-        {
-            BuildEntityHierarchy();
-            CreateAndAddListenerComponentToEntities();
-            CreateAndAddEmitterComponentToEntities();
-            AddSoundEffectToEmitterComponents(game);
-            AddRootEntityToEntitySystem(game);
-
-            throw new NotImplementedException("TODO: UPDATE TO USE Scene and Graphics Composer");
-            //var matchingEntities = game.Entities.Processors.OfType<AudioEmitterProcessor>().First().MatchingEntitiesForDebug;
-
-            //// check that there are initially not SoundEffectInstance created.
-            //CheckSoundEffectExistance(new HashSet<AudioListenerComponent> (), matchingEntities);
-
-            //// add one listener
-            //game.Audio.AddListener(listComps[0]);
-
-            //// check that there is now one SoundEffectInstance for each SoundController
-            //CheckSoundEffectExistance(new HashSet<AudioListenerComponent> { listComps[0] }, matchingEntities);
-
-            //// add another listener
-            //game.Audio.AddListener(listComps[1]);
-
-            //// check that there is now two SoundEffectInstance for each SoundController
-            //CheckSoundEffectExistance(new HashSet<AudioListenerComponent> (listComps), matchingEntities);
-
-            //// remove one listener
-            //game.Audio.RemoveListener(listComps[1]);
-
-            //// check that there is now only one SoundEffectInstance for each SoundController left
-            //CheckSoundEffectExistance(new HashSet<AudioListenerComponent> { listComps[0] }, matchingEntities);
-
-            //// remove the other listener
-            //game.Audio.RemoveListener(listComps[0]);
-
-            //// check that there is no SoundEffectInstance left
-            //CheckSoundEffectExistance(new HashSet<AudioListenerComponent>(), matchingEntities);
-        }
-
-
-        /// <summary>
-        /// Add entities with <see cref="AudioEmitterComponent"/> associated and check that for each <see cref="AudioListenerComponent"/> existing in the scene
-        /// a <see cref="SoundEffectInstance"/> have been created. Then remove the entities and check that they are removed.
-        /// </summary>
-        [Fact(Skip = "TODO: UPDATE TO USE Scene and Graphics Composer")]
-        public void TestAddRemoveEntityWithEmitter()
-        {
-            TestUtilities.CreateAndRunGame(TestAddRemoveEntityWithEmitterHelper, TestUtilities.ExitGame);
-        }
-
-        private void TestAddRemoveEntityWithEmitterHelper(Game game)
-        {
-            BuildEntityHierarchy();
-            CreateAndAddListenerComponentToEntities();
-            CreateAndAddEmitterComponentToEntities();
-            AddSoundEffectToEmitterComponents(game);
-            AddListenersToAudioSystem(game);
-            AddRootEntityToEntitySystem(game);
-
-            emitComps.Add(new AudioEmitterComponent());
-            emitComps[2].Sounds["EffectToneA"] = game.Content.Load<Sound>("EffectToneA");
-            var extraEntity = new Entity();
-            extraEntity.Add(emitComps[2]);
-
-            throw new NotImplementedException("TODO: UPDATE TO USE Scene and Graphics Composer");
-            //var matchingEntities = game.Entities.Processors.OfType<AudioEmitterProcessor>().First().MatchingEntitiesForDebug;
-
-            //// check that initially there is no problems.
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //// and an entity and check that the soundEffectInstances have been created.
-            //compEntities.Add(extraEntity);
-            //game.Entities.Add(extraEntity);
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //// remove the entity and check that it is removed from the matchingComp list.
-            //compEntities.Remove(extraEntity);
-            //game.Entities.Remove(extraEntity);
-            //CheckSoundEffectExistance(matchingEntities);
-        }
-
-        /// <summary>
-        /// Attach and detach <see cref="SoundEffect"/> to <see cref="AudioEmitterComponent"/> and check that the 
-        /// <see cref="AudioEmitterSoundController"/> and <see cref="SoundEffectInstance"/> instances are created correctly.
-        /// </summary>
-        [Fact(Skip = "TODO: UPDATE TO USE Scene and Graphics Composer")]
-        public void TestAddRemoveSoundEffect()
-        {
-            TestUtilities.CreateAndRunGame(TestAddRemoveSoundEffectHelper, TestUtilities.ExitGame);
-        }
-
-
-        private void TestAddRemoveSoundEffectHelper(Game game)
-        {
-            BuildEntityHierarchy();
-            CreateAndAddListenerComponentToEntities();
-            CreateAndAddEmitterComponentToEntities();
-            AddRootEntityToEntitySystem(game);
-            AddListenersToAudioSystem(game);
-
-            throw new NotImplementedException("TODO: UPDATE TO USE Scene and Graphics Composer");
-            //var matchingEntities = game.Entities.Processors.OfType<AudioEmitterProcessor>().First().MatchingEntitiesForDebug;
-
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //var sound1 = game.Content.Load<SoundEffect>("EffectToneA");
-            //var sound2 = game.Content.Load<SoundEffect>("EffectFishLamp");
-            //var sound3 = game.Content.Load<SoundEffect>("EffectBip");
-
-            //// attach new Soundeffects and check the SoundEffectInstance creation.
-            //emitComps[0].AttachSoundEffect(sound1);
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //emitComps[1].AttachSoundEffect(sound2);
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //emitComps[0].AttachSoundEffect(sound3);
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //// detach SoundEffect and check that the controllers have been deleted.
-            //emitComps[0].DetachSoundEffect(sound1);
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //emitComps[1].DetachSoundEffect(sound2);
-            //CheckSoundEffectExistance(matchingEntities);
-
-            //emitComps[0].DetachSoundEffect(sound3);
-            //CheckSoundEffectExistance(matchingEntities);
-        }
-
-        /// <summary>
-        /// Check that the <see cref="AudioEmitter"/> associated to the <see cref="AudioEmitterComponent"/> are correctly updated
-        /// when at least one of the <see cref="AudioEmitterSoundController"/> of the <see cref="AudioEmitterComponent"/> is playing.
-        /// </summary>
-        [Fact(Skip = "TODO: UPDATE TO USE Scene and Graphics Composer")]
-        public void TestEmitterUpdateValues()
-        {
-            TestUtilities.ExecuteScriptInDrawLoop(TestEmitterUpdateValuesSetup, EntityPositionAndEmitterbfrUpdate, TestEmitterUpdateValuesAtfUpdate);
-        }
-
-        /// <summary>
-        /// Setup configuration for the test.
-        /// </summary>
-        /// <param name="game"></param>
-        private void TestEmitterUpdateValuesSetup(Game game)
-        {
-            BuildEntityHierarchy();
-            CreateAndAddListenerComponentToEntities();
-            CreateAndAddEmitterComponentToEntities();
-            AddRootEntityToEntitySystem(game);
-            AddSoundEffectToEmitterComponents(game);
-            AddListenersToAudioSystem(game);
-        }
-
-        /// <summary>
-        /// Update the entities position and <see cref="AudioEmitterComponent"/> parameters at each loop turn.
-        /// </summary>
-        /// <param name="game"></param>
-        /// <param name="loopCount"></param>
-        /// <param name="loopCountSum"></param>
-        private void EntityPositionAndEmitterbfrUpdate(Game game, int loopCount, int loopCountSum)
-        {
-            rootSubEntity1.Transform.Position += new Vector3(loopCount, 2 * loopCount, 3 * loopCount);
-            rootSubEntity2.Transform.Position += 2 * new Vector3(loopCount, 2 * loopCount, 3 * loopCount);
-
-            compEntities[0].Transform.Position += new Vector3(loopCount + 1, 2 * loopCount + 1, 3 * loopCount + 1);
-            compEntities[1].Transform.Position -= new Vector3(loopCount, 2 * loopCount, 3 * loopCount);
-
-            //            emitComps[0].DistanceScale = loopCount;
-            //            emitComps[0].DopplerScale = 2 * loopCount;
-            //            emitComps[1].DistanceScale = 3 * loopCount;
-            //            emitComps[1].DopplerScale = 4 * loopCount;
-        }
-
-        //        /// <summary>
-        //        /// Check that the values of the <see cref="AudioEmitter"/> associated to the <see cref="AudioEmitterComponent"/> are or are not updated as they should be.
-        //        /// </summary>
-        //        /// <param name="emitter1ShouldBeValid">boolean indicating if emitter component 1 is supposed to be updated.</param>
-        //        /// <param name="emitter2ShouldBeValid">boolean indicating if emitter component 2 is supposed to be updated.</param>
-        //        /// <param name="matchingEntities">the matching entities of the <see cref="AudioEmitterProcessor"/></param>
-        //        /// <param name="loopCount">the current loopCount of the game</param>
-        //        private void CheckEmittersValues(bool emitter1ShouldBeValid, bool emitter2ShouldBeValid, Dictionary<Entity, AudioEmitterProcessor.AssociatedData> matchingEntities, int loopCount)
-        //        {
-        //            var dataComp1 = matchingEntities[compEntities[0]];
-        //            var dataComp2 = matchingEntities[compEntities[1]];
-        //
-        //            // check that the boolean value of the AudioEmitterComponent indicating the processor if the AudioEmitter should be updated is valid.
-        //            Assert.True(dataComp1.AudioEmitterComponent.ShouldBeProcessed == emitter1ShouldBeValid, "value of ShouldBeProcessed for emitter 1 is not correct at loop turn" + loopCount);
-        //            Assert.True(dataComp2.AudioEmitterComponent.ShouldBeProcessed == emitter2ShouldBeValid, "value of ShouldBeProcessed for emitter 2 is not correct at loop turn" + loopCount);
-        //
-        //            var emitter1Velocity = 2 * new Vector3(loopCount, 2 * loopCount, 3 * loopCount) + Vector3.One;
-        //            if (emitter1ShouldBeValid)
-        //            {
-        //                // check the AudioEmitter 1 values are updated.
-        //                Assert.Equal(emitter1Velocity, dataComp1.AudioEmitter.Velocity, "The velocity of emitter 1 is not valid at loop turn" + loopCount);
-        //                Assert.Equal(loopCount, dataComp1.AudioEmitter.DistanceScale, "The distance scale of emitter 1 is not valid at loop turn" + loopCount);
-        //                Assert.Equal(2 * loopCount, dataComp1.AudioEmitter.DopplerScale, "The Doppler scale of emitter 1 is not valid at loop turn" + loopCount);
-        //            }
-        //            else
-        //            {
-        //                // check the AudioEmitter 1 values are not updated anymore
-        //                Assert.NotEqual(emitter1Velocity, dataComp1.AudioEmitter.Velocity, "The velocity of emitter 1 is calculated for nothing at loop turn" + loopCount);
-        //                Assert.NotEqual(loopCount, dataComp1.AudioEmitter.DistanceScale, "The distance scale of emitter 1 is calculated for nothing at loop turn" + loopCount);
-        //                Assert.NotEqual(2 * loopCount, dataComp1.AudioEmitter.DopplerScale, "The Doppler scale of emitter 1 is calculated for nothing loop turn" + loopCount);
-        //            }
-        //
-        //            var emitter2Velocity = new Vector3(loopCount, 2 * loopCount, 3 * loopCount);
-        //            if (emitter2ShouldBeValid)
-        //            {
-        //                // check the AudioEmitter 2 values are updated.
-        //                Assert.Equal(emitter2Velocity, dataComp2.AudioEmitter.Velocity, "The velocity of emitter 2 is not valid at loop turn" + loopCount);
-        //                Assert.Equal(3 * loopCount, dataComp2.AudioEmitter.DistanceScale, "The distance scale of emitter 2 is not valid at loop turn" + loopCount);
-        //                Assert.Equal(4 * loopCount, dataComp2.AudioEmitter.DopplerScale, "The Doppler scale of emitter 2 is not valid at loop turn" + loopCount);
-        //            }
-        //            else
-        //            {
-        //                // check the AudioEmitter 2 values are not updated anymore
-        //                Assert.NotEqual(emitter2Velocity, dataComp2.AudioEmitter.Velocity, "The velocity of emitter 2 is calculated for nothing at loop turn" + loopCount);
-        //                Assert.NotEqual(3 * loopCount, dataComp2.AudioEmitter.DistanceScale, "The distance scale of emitter 2 is calculated for nothing at loop turn" + loopCount);
-        //                Assert.NotEqual(4 * loopCount, dataComp2.AudioEmitter.DopplerScale, "The Doppler scale of emitter 2 is calculated for nothing loop turn" + loopCount);
-        //            }
-        //        }
-
-        //        private bool soundController0WentToStopState;
-        //        private bool soundController2WentToStopState;
-
-        private void TestEmitterUpdateValuesAtfUpdate(Game game, int loopCount, int loopCountSum)
-        {
-            //throw new NotImplementedException("TODO: UPDATE TO USE Scene and Graphics Composer"); 
-            //var matchingEntities = game.Entities.Processors.OfType<AudioEmitterProcessor>().First().MatchingEntitiesForDebug;
-
-            //var dataComp1 = matchingEntities[compEntities[0]];
-            //var dataComp2 = matchingEntities[compEntities[1]];
-
-            //// check that AudioEmitters position is always valid. (this is required to ensure that the velocity is valid from the first update).
-            //Assert.Equal(2 * new Vector3(loopCountSum, 2 * loopCountSum, 3 * loopCountSum) + (loopCount + 1) * Vector3.One, dataComp1.AudioEmitter.Position, "Position of the emitter 1 is not correct");
-            //Assert.Equal(new Vector3(loopCountSum, 2 * loopCountSum, 3 * loopCountSum), dataComp2.AudioEmitter.Position, "Position of the emitter 2 is not correct");
-
-            //if (loopCount == 0)
-            //{
-            //    soundController0WentToStopState = false;
-            //    soundController2WentToStopState = false;
-
-            //    // check that initially AudioEmitter should not be updated.
-            //    foreach (var data in matchingEntities.Values)
-            //        Assert.False(data.AudioEmitterComponent.ShouldBeProcessed, "Initial value of ShouldBeProcessed is not correct at loop turn"+loopCount);
-
-            //    soundControllers[0].Play();
-            //}
-            //else if (loopCount == 1)
-            //{
-            //    // check that emitter 1 is updated but not emitter 2
-            //    CheckEmittersValues(true, false, matchingEntities, loopCount);
-
-            //    soundControllers[2].Play();
-            //}
-            //else if (soundControllers[0].PlayState == SoundPlayState.Playing)
-            //{
-            //    // check that both emitters are updated.
-            //    CheckEmittersValues(true, true, matchingEntities, loopCount);
-            //}
-            //else if (!soundController0WentToStopState)
-            //{
-            //    // transition state of controller 1 from play to stop 
-            //    // since PlayState is updated asynchronously via callbacks, 
-            //    // PlayState may have changed between the Update and this function calls
-            //    // that is why we wait for next loop turn to perform the new test.
-            //    soundController0WentToStopState = true;
-            //}
-            //else if (soundControllers[2].PlayState == SoundPlayState.Playing)
-            //{
-            //    // check that emitter 2 is still updated but not emitter1 anymore.
-            //    CheckEmittersValues(false, true, matchingEntities, loopCount);
-            //}
-            //else if (!soundController2WentToStopState)
-            //{
-            //    // transition state of controller 2 from play to stop 
-            //    // since PlayState is updated asynchronously via callbacks, 
-            //    // PlayState may have changed between the Update and this function calls
-            //    // that is why we wait for next loop turn to perform the new test.
-            //    soundController2WentToStopState = true;
-            //}
-            //else
-            //{
-            //    // check that both emitter are not updated anymore.
-            //    CheckEmittersValues(false, false, matchingEntities, loopCount);
-            //    game.Exit();
-            //}
-        }
-
-        /// <summary>
-        /// Tests the behavior of processor when several listener are present in the scene.
-        /// </summary>
-        [Fact(Skip = "TODO: UPDATE TO USE Scene and Graphics Composer")]
-        public void TestMultiListener()
-        {
-            TestUtilities.ExecuteScriptInDrawLoop(TestEmitterUpdateValuesSetup, TestMulteListenerUpdate);
-        }
-
-        private void TestMulteListenerUpdate(Game game, int loopCount, int loopCountSum)
-        {
-            throw new NotImplementedException("TODO: UPDATE TO USE Scene and Graphics Composer");
-            //var matchingEntities = game.Entities.Processors.OfType<AudioEmitterProcessor>().First().MatchingEntitiesForDebug;
-
-            //var dataComp1 = matchingEntities[compEntities[0]];
-
-            //if (loopCount == 0)
-            //{
-            //    soundControllers[0].Play();
-            //}
-            //else if (loopCount < 10)
-            //{
-            //    // check that the two instances are correctly create and playing
-            //    var tupple1 = Tuple.Create(listComps[0], soundControllers[0]);
-            //    var tupple2 = Tuple.Create(listComps[1], soundControllers[0]);
-
-            //    Assert.True(dataComp1.ListenerControllerToSoundInstance.ContainsKey(tupple1));
-            //    Assert.True(dataComp1.ListenerControllerToSoundInstance.ContainsKey(tupple2));
-
-            //    var instance1 = dataComp1.ListenerControllerToSoundInstance[tupple1];
-            //    var instance2 = dataComp1.ListenerControllerToSoundInstance[tupple2];
-
-            //    Assert.Equal(SoundPlayState.Playing, instance1.PlayState);
-            //    Assert.Equal(SoundPlayState.Playing, instance2.PlayState);
-            //}
-            //else
-            //{
-            //    game.Exit();
-            //}
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Audio.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Audio.Tests/Properties/AndroidManifest.xml
index 08340571bd..306884a663 100644
--- a/sources/engine/Xenko.Audio.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Audio.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Audio.Tests" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
   <application android:icon="@drawable/icon" android:label="Xenko Audio" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>  
   <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Audio.Tests/TestAudioEmitter.cs b/sources/engine/Xenko.Audio.Tests/TestAudioEmitter.cs
deleted file mode 100644
index bde973eb8f..0000000000
--- a/sources/engine/Xenko.Audio.Tests/TestAudioEmitter.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-
-using Xunit;
-
-using Xenko.Core.Mathematics;
-
-namespace Xenko.Audio.Tests
-{
-    /// <summary>
-    /// Tests for <see cref="AudioEmitter"/>.
-    /// </summary>
-    public class TestAudioEmitter
-    {
-        private readonly AudioEmitter defaultEmitter = new AudioEmitter();
-
-        /// <summary>
-        /// Test the behaviour of the Position function.
-        /// </summary>
-        [Fact]
-        public void TestPosition()
-        {
-            //////////////////////////////
-            // 1. Check the default value
-            Assert.True(Vector3.Zero == defaultEmitter.Position, "The AudioEmitter defaul location is not 0");
-
-            ///////////////////////////////////////////
-            // 2. Check for no crash and correct value
-            defaultEmitter.Position = Vector3.One;
-            Assert.True(Vector3.One == defaultEmitter.Position, "AudioEmitter.Position value is not what it is supposed to be.");
-        }
-
-        /// <summary>
-        /// Test the behaviour of the Velocity function.
-        /// </summary>
-        [Fact]
-        public void TestVelocity()
-        {
-            //////////////////////////////
-            // 1. Check the default value
-            Assert.True(Vector3.Zero == defaultEmitter.Velocity, "The AudioEmitter defaul Velocity is not 0");
-
-            ///////////////////////////////////////////
-            // 2. Check for no crash and correct value
-            defaultEmitter.Velocity = Vector3.One;
-            Assert.True(Vector3.One == defaultEmitter.Velocity, "AudioEmitter.Velocity value is not what it is supposed to be.");
-        }
-
-//        /// <summary>
-//        /// Test the behaviour of the DopplerScale function.
-//        /// </summary>
-//        [Fact]
-//        public void TestDopplerScale()
-//        {
-//            //////////////////////////////
-//            // 1. Check the default value
-//            Assert.True(1f, defaultEmitter.DopplerScale, "The AudioEmitter defaul DopplerScale is not 1");
-//
-//            ///////////////////////////////////////////
-//            // 2. Check for no crash and correct value
-//            defaultEmitter.DopplerScale = 5f;
-//            Assert.Equal(5f, defaultEmitter.DopplerScale, "AudioEmitter.DopplerScale value is not what it is supposed to be.");
-//
-//            /////////////////////////////////////////////////////////////////////////////////////
-//            // 3. Check that a negative value throws the 'ArgumentOutOfRangeException' exception
-//            Assert.Throws<ArgumentOutOfRangeException>(() => defaultEmitter.DopplerScale = -1f, "AudioEmitter.DopplerScale did not throw 'ArgumentOutOfRangeException' when setting a negative value.");
-//        }
-//
-//        /// <summary>
-//        /// Test the behaviour of the DistanceScale function.
-//        /// </summary>
-//        [Fact]
-//        public void TestDistanceScale()
-//        {
-//            //////////////////////////////
-//            // 1. Check the default value
-//            Assert.Equal(1f, defaultEmitter.DistanceScale, "The AudioEmitter defaul DistanceScale is not 1");
-//
-//            ///////////////////////////////////////////
-//            // 2. Check for no crash and correct value
-//            defaultEmitter.DistanceScale = 5f;
-//            Assert.Equal(5f, defaultEmitter.DistanceScale, "AudioEmitter.DistanceScale value is not what it is supposed to be.");
-//
-//            /////////////////////////////////////////////////////////////////////////////////////
-//            // 3. Check that a negative value throws the 'ArgumentOutOfRangeException' exception
-//            Assert.Throws<ArgumentOutOfRangeException>(() => defaultEmitter.DistanceScale = -1f, "AudioEmitter.DistanceScale did not throw 'ArgumentOutOfRangeException' when setting a negative value.");
-//        }
-    }
-}
diff --git a/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Windows.csproj b/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Windows.csproj
index 7bfba83fed..875268e257 100644
--- a/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Audio.Tests</RootNamespace>
@@ -48,8 +48,6 @@
     <Compile Include="Engine\GameClassForTests.cs" />
     <Compile Include="Engine\LaunchProgram.cs" />
     <Compile Include="Engine\TestAssetLoading.cs" />
-    <Compile Include="Engine\TestAudioEmitterComponent.cs" />
-    <Compile Include="Engine\TestAudioEmitterProcessor.cs" />
     <Compile Include="Engine\TestAudioListenerProcessor.cs" />
     <Compile Include="Engine\TestAudioSystem.cs" />
     <Compile Include="Engine\TestController.cs" />
@@ -58,7 +56,6 @@
     <Compile Include="LaunchProgram.cs" />
     <Compile Include="PauseResumeTests.cs" />
     <Compile Include="SoundGenerator.cs" />
-    <Compile Include="TestAudioEmitter.cs" />
     <Compile Include="TestAudioEngine.cs" />
     <Compile Include="TestAudioListener.cs" />
     <Compile Include="TestDynamicSoundEffectInstance.cs" />
@@ -96,6 +93,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="..\Xenko.Shared\Refactor\Xenko.Refactor.projitems" Label="Shared" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.iOS.csproj b/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.iOS.csproj
index 430676189a..9d81adb666 100644
--- a/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.iOS.csproj
+++ b/sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.iOS.csproj
@@ -22,7 +22,6 @@
     <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/sources/engine/Xenko.Audio/AudioEmitter.cs b/sources/engine/Xenko.Audio/AudioEmitter.cs
deleted file mode 100644
index 4e4f809a84..0000000000
--- a/sources/engine/Xenko.Audio/AudioEmitter.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-using Xenko.Native;
-
-namespace Xenko.Audio
-{
-    /// <summary>
-    /// Represents a 3D audio emitter in the audio scene. 
-    /// This object, used in combination with an <see cref="AudioListener"/>, can simulate 3D audio localization effects for a given sound implementing the <see cref="IPositionableSound"/> interface.
-    /// For more details take a look at the <see cref="IPositionableSound.Apply3D"/> function.
-    /// </summary>
-    /// <seealso cref="IPositionableSound.Apply3D"/>
-    /// <seealso cref="AudioListener"/>
-    public class AudioEmitter
-    {
-        /// <summary>
-        /// The position of the emitter in the 3D world.
-        /// </summary>
-        public Vector3 Position;
-
-        /// <summary>
-        /// The velocity of the emitter in the 3D world. 
-        /// </summary>
-        /// <remarks>This is only used to calculate the doppler effect on the sound effect</remarks>
-        public Vector3 Velocity;
-
-        private Vector3 up;
-
-        /// <summary>
-        /// Gets or sets the Up orientation vector for this emitter. This vector up of the world for the emitter.
-        /// </summary>
-        /// <remarks>
-        /// <para>By default, this value is (0,1,0).</para>
-        /// <para>The value provided will be normalized if it is not already.</para>
-        /// <para>The values of the Forward and Up vectors must be orthonormal (at right angles to one another). 
-        /// Behavior is undefined if these vectors are not orthonormal.</para>
-        /// <para>Doppler and Matrix values between an <see name="AudioEmitter"/> and an <see cref="AudioEmitter"/> are effected by the emitter orientation.</para>
-        /// </remarks>
-        /// <exception cref="InvalidOperationException">The value provided to the set accessor is (0,0,0).</exception>
-        public Vector3 Up
-        {
-            get
-            {
-                return up;
-            }
-            set
-            {
-                if (value == Vector3.Zero)
-                    throw new InvalidOperationException("The value of the Up vector can not be (0,0,0)");
-
-                up = Vector3.Normalize(value);
-            }
-        }
-
-        private Vector3 forward;
-
-        /// <summary>
-        /// Gets or sets the forward orientation vector for this emitter. This vector represents the orientation the emitter is looking at.
-        /// </summary>
-        /// <remarks>
-        /// <para>By default, this value is (0,0,1).</para>
-        /// <para>The value provided will be normalized if it is not already.</para>
-        /// <para>The values of the Forward and Up vectors must be orthonormal (at right angles to one another). 
-        /// Behavior is undefined if these vectors are not orthonormal.</para>
-        /// <para>Doppler and Matrix values between an <see name="AudioEmitter"/> and an <see cref="AudioEmitter"/> are effected by the emitter orientation.</para>
-        /// </remarks>
-        /// <exception cref="InvalidOperationException">The value provided to the set accessor is (0,0,0) or <see cref="Up"/>.</exception>
-        public Vector3 Forward
-        {
-            get
-            {
-                return forward;
-            }
-            set
-            {
-                if (value == Vector3.Zero)
-                    throw new InvalidOperationException("The value of the Forward vector can not be (0,0,0)");
-
-                forward = Vector3.Normalize(value);
-            }
-        }
-
-        internal Matrix WorldTransform;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="AudioEmitter"/> class.
-        /// </summary>
-        public AudioEmitter()
-        {
-            Forward = new Vector3(0, 0, 1);
-            Up = new Vector3(0, 1, 0);
-        }
-
-        internal void Apply3D(AudioLayer.Source source)
-        {
-            AudioLayer.SourcePush3D(source, ref Position, ref forward, ref up, ref Velocity, ref WorldTransform);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Audio/AudioEngine.cs b/sources/engine/Xenko.Audio/AudioEngine.cs
index fd5d9d75fa..a9e264d68f 100644
--- a/sources/engine/Xenko.Audio/AudioEngine.cs
+++ b/sources/engine/Xenko.Audio/AudioEngine.cs
@@ -18,7 +18,7 @@ namespace Xenko.Audio
     /// A call to Dispose automatically stops and disposes all the <see cref="SoundBase"/>, <see cref="SoundInstance"/>
     public class AudioEngine : ComponentBase
     {
-        public AudioListener DefaultListener;
+        public static AudioListener DefaultListener;
 
         private readonly AudioDevice audioDevice;
 
@@ -153,12 +153,13 @@ public void PauseAudio()
             {
                 foreach (var sound in notDisposedSounds)
                 {
-                    foreach (var instance in sound.Instances)
+                    for (int i=0; i<sound.Instances.Count; i++)
                     {
-                        if (instance.PlayState == PlayState.Playing)
+                        SoundInstance si = sound.Instances[i];
+                        if (si?.PlayState == PlayState.Playing)
                         {
-                            instance.Pause();
-                            pausedSounds.Add(instance);
+                            si.Pause();
+                            pausedSounds.Add(si);
                         }
                     }
                 }
diff --git a/sources/engine/Xenko.Audio/AudioListener.cs b/sources/engine/Xenko.Audio/AudioListener.cs
index 67a56a1f2e..c0f84a97a9 100644
--- a/sources/engine/Xenko.Audio/AudioListener.cs
+++ b/sources/engine/Xenko.Audio/AudioListener.cs
@@ -69,10 +69,7 @@ public Vector3 Up
             }
             set
             {
-                if (value == Vector3.Zero)
-                    throw new InvalidOperationException("The value of the Up vector can not be (0,0,0)");
-
-                up = Vector3.Normalize(value);
+                up = value == Vector3.Zero ? Vector3.UnitY : value;
             }
         }
 
@@ -97,10 +94,7 @@ public Vector3 Forward
             }
             set
             {
-                if (value == Vector3.Zero)
-                    throw new InvalidOperationException("The value of the Forward vector can not be (0,0,0)");
-
-                forward = Vector3.Normalize(value);
+                forward = value == Vector3.Zero ? Vector3.UnitZ : value;
             }
         }
 
diff --git a/sources/engine/Xenko.Audio/CompressedSoundSource.cs b/sources/engine/Xenko.Audio/CompressedSoundSource.cs
index 915d8a8f21..a98b0528fd 100644
--- a/sources/engine/Xenko.Audio/CompressedSoundSource.cs
+++ b/sources/engine/Xenko.Audio/CompressedSoundSource.cs
@@ -64,7 +64,7 @@ public CompressedSoundSource(SoundInstance instance, byte[] byteBuffer, int numb
             this.samples = numberOfSamples;
             playRange = new PlayRange(TimeSpan.Zero, TimeSpan.Zero);
 
-            NewSources.Add(this);
+            NewSources.Enqueue(this);
         }
 
         //==========================================================================================
@@ -93,7 +93,7 @@ public CompressedSoundSource(SoundInstance instance, IVirtualFileProvider filePr
             this.samples = numberOfSamples;
             playRange = new PlayRange(TimeSpan.Zero, TimeSpan.Zero);
 
-            NewSources.Add(this);
+            NewSources.Enqueue(this);
         }
 
         /// <summary>
@@ -247,6 +247,21 @@ protected override unsafe void ExtractAndFillData()
 
                 FillBuffer(sdata, countByteTransfered, bufferType);
             }
+            else if (currentPacketIndex > endPacketIndex)
+            {
+                // Go back to beginning if necessary
+                if (soundInstance.Position.TotalSeconds == 0.0)
+                {
+                    if (looped) //prepare again to play from begin
+                    {
+                        PrepareInternal();
+                    }
+                    else // stops the sound
+                    {
+                        StopInternal(false);
+                    }
+                }
+            }
             else
             {
                 const int passes = SamplesPerBuffer / SamplesPerFrame;
@@ -292,19 +307,6 @@ protected override unsafe void ExtractAndFillData()
                     begin = false;
                 }
                 FillBuffer(finalPtr, finalSize, bufferType);
-
-                // Go back to beginning if necessary
-                if (endingPacket || compressedSoundStream.Position == compressedSoundStream.Length)
-                {
-                    if (looped) //prepare again to play from begin
-                    {
-                        PrepareInternal();
-                    }
-                    else // stops the sound
-                    {
-                        StopInternal(false);
-                    }
-                }
             }
         }
     }
diff --git a/sources/engine/Xenko.Audio/DynamicSoundSource.cs b/sources/engine/Xenko.Audio/DynamicSoundSource.cs
index f0cd57fcbd..c002927b3b 100644
--- a/sources/engine/Xenko.Audio/DynamicSoundSource.cs
+++ b/sources/engine/Xenko.Audio/DynamicSoundSource.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Xenko.Core;
 using Xenko.Core.Diagnostics;
@@ -14,9 +15,9 @@ public abstract class DynamicSoundSource : IDisposable
     {
         public static Logger Logger = GlobalLogger.GetLogger(nameof(DynamicSoundSource));
 
-        private static Task readFromDiskWorker;
+        private static Thread readFromDiskWorker;
 
-        protected static readonly ConcurrentBag<DynamicSoundSource> NewSources = new ConcurrentBag<DynamicSoundSource>();
+        protected static readonly ConcurrentQueue<DynamicSoundSource> NewSources = new ConcurrentQueue<DynamicSoundSource>();
         protected static readonly List<DynamicSoundSource> Sources = new List<DynamicSoundSource>();
 
         /// <summary>
@@ -35,7 +36,7 @@ protected enum AsyncCommand
         /// <summary>
         /// The commands derived classes should execute.
         /// </summary>
-        protected readonly ConcurrentQueue<AsyncCommand> Commands = new ConcurrentQueue<AsyncCommand>();
+        protected readonly ConcurrentQueue<AsyncCommand> Commands = new ConcurrentQueue<AsyncCommand>(), StopCommands = new ConcurrentQueue<AsyncCommand>();
 
         private bool readyToPlay;
         private int prebufferedCount;
@@ -74,12 +75,6 @@ protected enum AsyncCommand
         /// </summary>
         protected volatile bool playingQueued;
 
-        /// <summary>
-        /// If the source is actually playing sound
-        /// this takes into account multiple factors: Playing, Ended task, and Audio layer playing state
-        /// </summary>
-        private volatile bool isSourcePausedOrPlaying = false;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="DynamicSoundSource"/> class.
         /// Sub classes can implement their own streaming sources.
@@ -101,7 +96,12 @@ protected DynamicSoundSource(SoundInstance soundInstance, int numberOfBuffers, i
             }
 
             if (readFromDiskWorker == null)
-                readFromDiskWorker = Task.Factory.StartNew(Worker, TaskCreationOptions.LongRunning);
+            {
+                readFromDiskWorker = new Thread(new ThreadStart(Worker));
+                readFromDiskWorker.Priority = ThreadPriority.BelowNormal;
+                readFromDiskWorker.IsBackground = true;
+                readFromDiskWorker.Start();
+            }
         }
 
         /// <summary>
@@ -109,7 +109,7 @@ protected DynamicSoundSource(SoundInstance soundInstance, int numberOfBuffers, i
         /// </summary>
         public virtual void Dispose()
         {
-            Commands.Enqueue(AsyncCommand.Dispose);
+            StopCommands.Enqueue(AsyncCommand.Dispose);
         }
 
         /// <summary>
@@ -150,7 +150,7 @@ public void Play()
         /// </summary>
         public void Pause()
         {
-            Commands.Enqueue(AsyncCommand.Pause);
+            StopCommands.Enqueue(AsyncCommand.Pause);
         }
 
         /// <summary>
@@ -158,13 +158,13 @@ public void Pause()
         /// </summary>
         public void Stop()
         {
-            Commands.Enqueue(AsyncCommand.Stop);
+            StopCommands.Enqueue(AsyncCommand.Stop);
         }
 
         /// <summary>
         /// Gets if this instance is in the playing state.
         /// </summary>
-        public bool IsPausedOrPlaying => playingQueued || state != PlayState.Stopped || isSourcePausedOrPlaying;
+        public bool IsPausedOrPlaying => playingQueued || state != PlayState.Stopped;
 
         /// <summary>
         /// Gets or sets the region of time to play from the audio clip.
@@ -249,8 +249,8 @@ protected virtual void StopInternal(bool ignoreQueuedBuffer = true)
         {
             Ended.TrySetResult(true);
             state = PlayState.Stopped;
-            if (ignoreQueuedBuffer)
-                AudioLayer.SourceStop(soundInstance.Source);
+            soundInstance.playState = PlayState.Stopped;
+            if (ignoreQueuedBuffer) AudioLayer.SourceStop(soundInstance.Source);
             RestartInternal();
         }
 
@@ -327,14 +327,11 @@ protected unsafe void FillBuffer(byte[] pcm, int bufferSize, AudioLayer.BufferTy
 
         private static unsafe void Worker()
         {
-            var toRemove = new List<DynamicSoundSource>();
             while (true)
             {
-                toRemove.Clear();
-
                 while (!NewSources.IsEmpty)
                 {
-                    if (!NewSources.TryTake(out var source))
+                    if (!NewSources.TryDequeue(out var source))
                         continue;
 
                     if (!source.isInitialized)
@@ -344,14 +341,46 @@ private static unsafe void Worker()
                         Sources.Add(source);
                 }
 
-                foreach (var source in Sources)
+                // process stops, cleanups & pauses first
+                for (int i = 0; i < Sources.Count; i++)
                 {
+                    var source = Sources[i];
+
                     if (source.isDisposed)
                     {
-                        toRemove.Add(source);
+                        Sources.RemoveAt(i);
+                        i--;
                         continue;
                     }
 
+                    while (!source.StopCommands.IsEmpty)
+                    {
+                        AsyncCommand command;
+                        if (!source.StopCommands.TryDequeue(out command)) continue;
+                        switch (command)
+                        {
+                            case AsyncCommand.Pause:
+                                source.PauseInternal();
+                                break;
+                            case AsyncCommand.Stop:
+                                source.StopInternal();
+                                break;
+                            case AsyncCommand.Dispose:
+                                source.DisposeInternal();
+                                Sources.RemoveAt(i);
+                                i--;
+                                break;
+                            default:
+                                throw new ArgumentOutOfRangeException();
+                        }
+                    }
+                }
+
+                // handle the rest of commands and playing
+                for (int i=0; i<Sources.Count; i++)
+                {
+                    var source = Sources[i];
+
                     source.UpdateInternal();
 
                     var seekRequested = false;
@@ -365,58 +394,49 @@ private static unsafe void Worker()
                             case AsyncCommand.Play:
                                 source.PlayInternal();
                                 break;
-                            case AsyncCommand.Pause:
-                                source.PauseInternal();
-                                break;
-                            case AsyncCommand.Stop:
-                                source.StopInternal();
-                                break;
                             case AsyncCommand.Seek:
                                 seekRequested = true;
                                 break;
                             case AsyncCommand.SetRange:
                                 source.RestartInternal();
                                 break;
-                            case AsyncCommand.Dispose:
-                                source.DisposeInternal();
-                                toRemove.Add(source);
-                                break;
                             default:
                                 throw new ArgumentOutOfRangeException();
                         }
                     }
 
-                    if (source.isDisposed)
-                        continue;
-
-                    source.isSourcePausedOrPlaying = (source.IsPausedOrPlaying && !source.Ended.Task.IsCompleted) || AudioLayer.SourceIsPlaying(source.soundInstance.Source);
-
                     //Did we get a Seek request?
                     if (seekRequested)
                     {
                         source.SeekInternal();
                         continue;
                     }
-                    
-                    if (source.CanFill && source.isSourcePausedOrPlaying)
-                        source.ExtractAndFillData();
-                }
-
-                foreach (var source in toRemove)
-                    Sources.Remove(source);
 
-                var buffersShouldBeFill = false;
-                foreach (var source in Sources)
-                { 
-                    if (source.CanFill)
+                    // handle certain playing states
+                    if (source.state == PlayState.Playing)
                     {
-                        buffersShouldBeFill = true;
-                        break;
+                        if (source.Ended.Task.IsCompleted)
+                        {
+                            // sound ended, stop it
+                            source.StopInternal();
+                        }
+                        else if (source.CanFill)
+                        {
+                            source.ExtractAndFillData();
+                        }
+                        else if (AudioLayer.SourceIsPlaying(source.soundInstance.Source) == false)
+                        {
+                            // get music playing again
+                            AudioLayer.SourceStop(source.soundInstance.Source);
+                            source.RestartInternal();
+                            if (source.CanFill) source.ExtractAndFillData();
+                            AudioLayer.SourcePlay(source.soundInstance.Source);
+                        }
                     }
                 }
 
-                if (!buffersShouldBeFill) // avoid active looping when no work is needed
-                    Utilities.Sleep(10);
+                // sleep after going through the music
+                Thread.Sleep(100);
             }
         }
     }
diff --git a/sources/engine/Xenko.Audio/IPositionableSound.cs b/sources/engine/Xenko.Audio/IPositionableSound.cs
index 8a4ff5fedc..d543c3ed1f 100644
--- a/sources/engine/Xenko.Audio/IPositionableSound.cs
+++ b/sources/engine/Xenko.Audio/IPositionableSound.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using Xenko.Core.Mathematics;
 
 namespace Xenko.Audio
 {
@@ -30,6 +31,11 @@ public interface IPositionableSound : IPlayableSound
         /// </summary>
         float Pitch { get; set; }
 
+        /// <summary>
+        /// How does distance attenuation scale for this sound? 1 is default, 0 is disabling attenuation
+        /// </summary>
+        float DistanceScale { get; set; }
+
         /// <summary>
         /// Applies 3D positioning to the sound. 
         /// More precisely adjust the channel volumes and pitch of the sound, 
@@ -46,6 +52,6 @@ public interface IPositionableSound : IPlayableSound
         /// The final resulting channel volumes depend on the listener and emitter relative positions and the value of <see cref="IPlayableSound.Volume"/>. 
         /// </para>
         /// </remarks>
-        void Apply3D(AudioEmitter emitter);
+        void Apply3D(Vector3 Position, Vector3? velocity = null, Quaternion? direction = null);
     }
 }
diff --git a/sources/engine/Xenko.Audio/Native/AudioLayer.cs b/sources/engine/Xenko.Audio/Native/AudioLayer.cs
index 3b9a7435ba..f4f7ebeafd 100644
--- a/sources/engine/Xenko.Audio/Native/AudioLayer.cs
+++ b/sources/engine/Xenko.Audio/Native/AudioLayer.cs
@@ -155,6 +155,10 @@ public enum BufferType
         [DllImport(NativeInvoke.Library, EntryPoint = "xnAudioSourceSetGain", CallingConvention = CallingConvention.Cdecl)]
         public static extern void SourceSetGain(Source source, float gain);
 
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport(NativeInvoke.Library, EntryPoint = "xnAudioSourceSetRolloff", CallingConvention = CallingConvention.Cdecl)]
+        public static extern void SourceSetRolloff(Source source, float rolloff);
+
         [SuppressUnmanagedCodeSecurity]
         [DllImport(NativeInvoke.Library, EntryPoint = "xnAudioSourceSetPitch", CallingConvention = CallingConvention.Cdecl)]
         public static extern void SourceSetPitch(Source source, float pitch);
diff --git a/sources/engine/Xenko.Audio/Native/Celt.cpp b/sources/engine/Xenko.Audio/Native/Celt.cpp
index 914589847a..b3cb16a675 100644
--- a/sources/engine/Xenko.Audio/Native/Celt.cpp
+++ b/sources/engine/Xenko.Audio/Native/Celt.cpp
@@ -5,6 +5,7 @@
 #include "../../Xenko.Native/XenkoNative.h"
 #define HAVE_STDINT_H
 #include "../../../../deps/Celt/include/opus_custom.h"
+#include <stdio.h>
 
 extern "C" {
 	class XenkoCelt
@@ -14,7 +15,7 @@ extern "C" {
 
 		~XenkoCelt();
 
-		bool Init();
+		bool Init(char* err_str);
 
 		OpusCustomEncoder* GetEncoder() const;
 
@@ -30,10 +31,10 @@ extern "C" {
 		bool decoder_only_;
 	};
 
-	DLL_EXPORT_API void* xnCeltCreate(int sampleRate, int bufferSize, int channels, bool decoderOnly)
+	DLL_EXPORT_API void* xnCeltCreate(int sampleRate, int bufferSize, int channels, bool decoderOnly, char* error)
 	{
 		XenkoCelt* celt = new XenkoCelt(sampleRate, bufferSize, channels, decoderOnly);
-		if(!celt->Init())
+		if(!celt->Init(error))
 		{
 			delete celt;
 			return nullptr;
@@ -91,18 +92,29 @@ XenkoCelt::~XenkoCelt()
 	mode_ = nullptr;
 }
 
-bool XenkoCelt::Init()
+bool XenkoCelt::Init(char* err_str)
 {
-	mode_ = opus_custom_mode_create(sample_rate_, buffer_size_, nullptr);
-	if (!mode_) return false;
+	int err;
 
-	decoder_ = opus_custom_decoder_create(mode_, channels_, nullptr);
-	if (!decoder_) return false;
+	mode_ = opus_custom_mode_create(sample_rate_, buffer_size_, &err);
+	if (!mode_) {
+		sprintf(err_str, "opus_custom_mode_create_err: %d", err);
+		return false;
+	}
+
+	decoder_ = opus_custom_decoder_create(mode_, channels_, &err);
+	if (!decoder_) {
+		sprintf(err_str, "opus_custom_decoder_create: %d", err);
+		return false;
+	}
 
 	if (!decoder_only_)
 	{
-		encoder_ = opus_custom_encoder_create(mode_, channels_, nullptr);
-		if (!encoder_) return false;
+		encoder_ = opus_custom_encoder_create(mode_, channels_, &err);
+		if (!encoder_) {
+			sprintf(err_str, "opus_custom_encoder_create: %d", err);
+			return false;
+		}
 	}
 
 	return true;
diff --git a/sources/engine/Xenko.Audio/Native/Celt.cs b/sources/engine/Xenko.Audio/Native/Celt.cs
index 4738a220a9..7c9f0ce0f4 100644
--- a/sources/engine/Xenko.Audio/Native/Celt.cs
+++ b/sources/engine/Xenko.Audio/Native/Celt.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Security;
+using System.Text;
 
 namespace Xenko.Audio
 {
@@ -37,10 +38,11 @@ public Celt(int sampleRate, int bufferSize, int channels, bool decoderOnly)
             SampleRate = sampleRate;
             BufferSize = bufferSize;
             Channels = channels;
-            celtPtr = xnCeltCreate(sampleRate, bufferSize, channels, decoderOnly);
+            StringBuilder err = new StringBuilder(128);
+            celtPtr = xnCeltCreate(sampleRate, bufferSize, channels, decoderOnly, err);
             if (celtPtr == IntPtr.Zero)
             {
-                throw new Exception("Failed to create an instance of the celt encoder/decoder.");
+                throw new Exception("Failed to create an instance of the celt encoder/decoder. Sample rate is probably unsupported, but check channels/buffer size too. Details: " + err.ToString() + ". Parameters were sampleRate: " + sampleRate + ", bufferSize: " + bufferSize + ", channels: " + channels);
             }
         }
 
@@ -156,7 +158,7 @@ public unsafe int Encode(float[] audioSamples, byte[] outputBuffer)
 
         [SuppressUnmanagedCodeSecurity]
         [DllImport(NativeInvoke.Library, CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr xnCeltCreate(int sampleRate, int bufferSize, int channels, bool decoderOnly);
+        private static extern IntPtr xnCeltCreate(int sampleRate, int bufferSize, int channels, bool decoderOnly, StringBuilder sb);
 
         [SuppressUnmanagedCodeSecurity]
         [DllImport(NativeInvoke.Library, CallingConvention = CallingConvention.Cdecl)]
diff --git a/sources/engine/Xenko.Audio/Native/OpenAL.cpp b/sources/engine/Xenko.Audio/Native/OpenAL.cpp
index 2ab6469a96..b410d797be 100644
--- a/sources/engine/Xenko.Audio/Native/OpenAL.cpp
+++ b/sources/engine/Xenko.Audio/Native/OpenAL.cpp
@@ -3,7 +3,7 @@
 
 #include "Common.h"
 
-#if defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(IOS) || !defined(__clang__)
+#if defined(WINDOWS_DESKTOP) || defined(PLATFORM_LINUX) || defined(PLATFORM_MACOS) || defined(IOS) || !defined(__clang__)
 
 #include "../../../deps/NativePath/NativePath.h"
 #include "../../../deps/NativePath/NativeDynamicLinking.h"
@@ -76,43 +76,6 @@ extern "C" {
 
 		void* OpenALLibrary = NULL;
 
-		class ContextState
-		{
-		public:
-			ContextState(ALCcontext* context)
-			{
-				sOpenAlLock.Lock();
-
-				mOldContext = GetCurrentContext();
-				if (context != mOldContext)
-				{
-					MakeContextCurrent(context);
-					swap = true;
-				}
-				else
-				{
-					swap = false;
-				}
-			}
-
-			~ContextState()
-			{
-				if (swap)
-				{
-					MakeContextCurrent(mOldContext);
-				}
-				
-				sOpenAlLock.Unlock();
-			}
-
-		private:
-			bool swap;
-			ALCcontext* mOldContext;
-			static SpinLock sOpenAlLock;
-		};
-
-		SpinLock ContextState::sOpenAlLock;
-
 		DLL_EXPORT_API npBool xnAudioInit()
 		{
 			if (OpenALLibrary) return true;
@@ -124,13 +87,11 @@ extern "C" {
 			//PC - Windows
 			if(sizeof(intptr_t) == 4)
 			{
-				if (!OpenALLibrary) OpenALLibrary = LoadDynamicLibrary("x86\\OpenAL");
-				if (!OpenALLibrary) OpenALLibrary = LoadDynamicLibrary("x86/OpenAL");
+				if (!OpenALLibrary) OpenALLibrary = LoadDynamicLibrary("OpenAL32");
 			}
 			else
 			{
-				if (!OpenALLibrary) OpenALLibrary = LoadDynamicLibrary("x64\\OpenAL");
-				if (!OpenALLibrary) OpenALLibrary = LoadDynamicLibrary("x64/OpenAL");
+				if (!OpenALLibrary) OpenALLibrary = LoadDynamicLibrary("OpenAL64");
 			}
 			
 			//iOS
@@ -275,8 +236,6 @@ extern "C" {
 
 			for (auto listener : device->listeners)
 			{
-				ContextState lock(listener->context);
-
 				for(auto source : listener->sources)
 				{
 					if (source->streamed)
@@ -326,9 +285,7 @@ extern "C" {
 			ALC_ERROR(device->device);
 
 			device->deviceLock.Lock();
-
 			device->listeners.insert(res);
-
 			device->deviceLock.Unlock();
 
 			return res;
@@ -337,9 +294,7 @@ extern "C" {
 		DLL_EXPORT_API void xnAudioListenerDestroy(xnAudioListener* listener)
 		{
 			listener->device->deviceLock.Lock();
-
 			listener->device->listeners.erase(listener);
-
 			listener->device->deviceLock.Unlock();
 
 			DestroyContext(listener->context);
@@ -349,13 +304,10 @@ extern "C" {
 
 		DLL_EXPORT_API void xnAudioSetMasterVolume(xnAudioDevice* device, float volume)
 		{
-			device->deviceLock.Lock();
 			for(auto listener : device->listeners)
 			{
-				ContextState lock(listener->context);
 				ListenerF(AL_GAIN, volume);
 			}
-			device->deviceLock.Unlock();
 		}
 
 		DLL_EXPORT_API npBool xnAudioListenerEnable(xnAudioListener* listener)
@@ -382,8 +334,6 @@ extern "C" {
 			res->mono = mono;
 			res->streamed = streamed;
 
-			ContextState lock(listener->context);
-
 			GenSources(1, &res->source);
 			AL_ERROR;
 			SourceF(res->source, AL_REFERENCE_DISTANCE, 1.0f);
@@ -400,27 +350,27 @@ extern "C" {
 				SourceI(res->source, AL_SOURCE_RELATIVE, AL_TRUE);
 			}
 
+			listener->device->deviceLock.Lock();
 			listener->sources.insert(res);
+			listener->device->deviceLock.Unlock();
 			
 			return res;
 		}
 
 		DLL_EXPORT_API void xnAudioSourceDestroy(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			DeleteSources(1, &source->source);
 			AL_ERROR;
 
+			source->listener->device->deviceLock.Lock();
 			source->listener->sources.erase(source);
+			source->listener->device->deviceLock.Unlock();
 
 			delete source;
 		}
 
 		DLL_EXPORT_API double xnAudioSourceGetPosition(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			ALfloat offset;
 			GetSourceF(source->source, AL_SEC_OFFSET, &offset);
 
@@ -440,15 +390,11 @@ extern "C" {
 			alpan[1] = sqrt(1.0f - clampedPan*clampedPan);
 			alpan[2] = 0.0f;
 
-			ContextState lock(source->listener->context);
-
 			SourceFV(source->source, AL_POSITION, alpan);
 		}
 
 		DLL_EXPORT_API void xnAudioSourceSetLooping(xnAudioSource* source, npBool looping)
 		{
-			ContextState lock(source->listener->context);
-
 			SourceI(source->source, AL_LOOPING, looping ? AL_TRUE : AL_FALSE);
 		}
 
@@ -459,8 +405,6 @@ extern "C" {
 				return;
 			}
 
-			ContextState lock(source->listener->context);
-
 			ALint playing;
 			GetSourceI(source->source, AL_SOURCE_STATE, &playing);
 			if (playing == AL_PLAYING) SourceStop(source->source);
@@ -500,73 +444,70 @@ extern "C" {
 			if (playing == AL_PLAYING) SourcePlay(source->source);
 		}
 
-		DLL_EXPORT_API void xnAudioSourceSetGain(xnAudioSource* source, float gain)
+		DLL_EXPORT_API void xnAudioSourceSetRolloff(xnAudioSource* source, float rolloff)
 		{
-			ContextState lock(source->listener->context);
+			SourceF(source->source, AL_ROLLOFF_FACTOR, rolloff);
+		}
 
+		DLL_EXPORT_API void xnAudioSourceSetGain(xnAudioSource* source, float gain)
+		{
 			SourceF(source->source, AL_GAIN, gain);
 		}
 
 		DLL_EXPORT_API void xnAudioSourceSetPitch(xnAudioSource* source, float pitch)
 		{
-			ContextState lock(source->listener->context);
-
 			SourceF(source->source, AL_PITCH, pitch);
 		}
 
 		DLL_EXPORT_API void xnAudioSourceSetBuffer(xnAudioSource* source, xnAudioBuffer* buffer)
 		{
-			ContextState lock(source->listener->context);
-
+			source->listener->device->deviceLock.Lock();
 			source->singleBuffer = buffer;
 			SourceI(source->source, AL_BUFFER, buffer->buffer);
+			source->listener->device->deviceLock.Unlock();
 		}
 
 		DLL_EXPORT_API void xnAudioSourceQueueBuffer(xnAudioSource* source, xnAudioBuffer* buffer, short* pcm, int bufferSize, BufferType type)
 		{
-			ContextState lock(source->listener->context);
-
 			buffer->type = type;
 			buffer->size = bufferSize;
 			BufferData(buffer->buffer, source->mono ? AL_FORMAT_MONO16 : AL_FORMAT_STEREO16, pcm, bufferSize, source->sampleRate);
+			source->listener->device->deviceLock.Lock();
 			SourceQueueBuffers(source->source, 1, &buffer->buffer);
 			source->listener->buffers[buffer->buffer] = buffer;
+			source->listener->device->deviceLock.Unlock();
 		}
 
 		DLL_EXPORT_API xnAudioBuffer* xnAudioSourceGetFreeBuffer(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
+			source->listener->device->deviceLock.Lock();
 			if(source->freeBuffers.size() > 0)
 			{
 				auto buffer = source->freeBuffers.back();
 				source->freeBuffers.pop_back();
+				source->listener->device->deviceLock.Unlock();
 				return buffer;
 			}
 
+			source->listener->device->deviceLock.Unlock();
 			return NULL;
 		}
 
 		DLL_EXPORT_API void xnAudioSourcePlay(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			SourcePlay(source->source);
 		}
 
 		DLL_EXPORT_API void xnAudioSourcePause(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			SourcePause(source->source);
 		}
 
 		DLL_EXPORT_API void xnAudioSourceFlushBuffers(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			if (source->streamed)
 			{
+				source->listener->device->deviceLock.Lock();
 				//flush all buffers
 				auto processed = 0;
 				GetSourceI(source->source, AL_BUFFERS_PROCESSED, &processed);
@@ -585,13 +526,12 @@ extern "C" {
 				{
 					source->freeBuffers.push_back(buffer.second);
 				}
+				source->listener->device->deviceLock.Unlock();
 			}
 		}
 
 		DLL_EXPORT_API void xnAudioSourceStop(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			SourceStop(source->source);
 			xnAudioSourceFlushBuffers(source);
 
@@ -602,8 +542,6 @@ extern "C" {
 
 		DLL_EXPORT_API void xnAudioListenerPush3D(xnAudioListener* listener, float* pos, float* forward, float* up, float* vel, Matrix* worldTransform)
 		{
-			ContextState lock(listener->context);
-
 			if (forward && up)
 			{
 				float ori[6];
@@ -637,8 +575,6 @@ extern "C" {
 
 		DLL_EXPORT_API void xnAudioSourcePush3D(xnAudioSource* source, float* pos, float* forward, float* up, float* vel, Matrix* worldTransform)
 		{
-			ContextState lock(source->listener->context);
-
 			if (forward && up)
 			{
 				float ori[6];
@@ -672,8 +608,6 @@ extern "C" {
 
 		DLL_EXPORT_API npBool xnAudioSourceIsPlaying(xnAudioSource* source)
 		{
-			ContextState lock(source->listener->context);
-
 			ALint value;
 			GetSourceI(source->source, AL_SOURCE_STATE, &value);
 			return value == AL_PLAYING || value == AL_PAUSED;
diff --git a/sources/engine/Xenko.Audio/Native/XAudio2.cpp b/sources/engine/Xenko.Audio/Native/XAudio2.cpp
deleted file mode 100644
index bb3057b3ba..0000000000
--- a/sources/engine/Xenko.Audio/Native/XAudio2.cpp
+++ /dev/null
@@ -1,2182 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#include "Common.h"
-
-#if defined(WINDOWS_DESKTOP) || defined(UWP) || defined(WINDOWS_STORE) || defined(WINDOWS_PHONE) || !defined(__clang__)
-
-#include "../../../deps/NativePath/NativePath.h"
-#include "../../../deps/NativePath/NativeThreading.h"
-#include "../../../deps/NativePath/NativeDynamicLinking.h"
-#include "../../Xenko.Native/XenkoNative.h"
-
-extern "C" {
-	class SpinLock
-	{
-	public:
-		SpinLock();
-
-		void Lock();
-
-		void Unlock();
-
-	private:
-		volatile bool mLocked;
-	};
-
-	namespace XAudio2
-	{
-		typedef struct _GUID {
-			unsigned long  Data1;
-			unsigned short Data2;
-			unsigned short Data3;
-			unsigned char  Data4[8];
-		} GUID;
-
-		typedef GUID IID;
-
-		typedef unsigned long       DWORD;
-		typedef int                 BOOL;
-		typedef unsigned char       BYTE;
-		typedef unsigned short      WORD;
-		typedef float               FLOAT;
-		typedef FLOAT               *PFLOAT;
-		typedef int                 INT;
-		typedef unsigned int        UINT;
-		typedef unsigned int        *PUINT;
-
-#define REFIID const IID &
-#define HRESULT long
-#define UINT32 unsigned int 
-#define ULONG unsigned long
-#define THIS_
-#define THIS void
-#define PURE = 0;
-#define _Outptr_
-#define _In_
-#define _In_opt_
-#define _Out_
-#define X2DEFAULT(x) =x
-#define _Reserved_
-#define _In_reads_bytes_(_xxx_)
-#define _Out_writes_bytes_(_xxx_)
-#define _Out_writes_(_xxx_)
-#define _In_reads_(_xxx_)
-#define STDMETHOD(method) virtual HRESULT __stdcall method
-#define STDMETHOD_(type,method) virtual type __stdcall method
-#define XAUDIO2_COMMIT_NOW              0             // Used as an OperationSet argument
-#define XAUDIO2_COMMIT_ALL              0             // Used in IXAudio2::CommitChanges
-#define XAUDIO2_INVALID_OPSET           (UINT32)(-1)  // Not allowed for OperationSet arguments
-#define XAUDIO2_NO_LOOP_REGION          0             // Used in XAUDIO2_BUFFER.LoopCount
-#define XAUDIO2_LOOP_INFINITE           255           // Used in XAUDIO2_BUFFER.LoopCount
-#define XAUDIO2_DEFAULT_CHANNELS        0             // Used in CreateMasteringVoice
-#define XAUDIO2_DEFAULT_SAMPLERATE      0             // Used in CreateMasteringVoice
-#define BYTE char
-#define UINT64 unsigned __int64 
-#define _In_opt_z_
-#define FAILED(hr) (((HRESULT)(hr)) < 0)
-#define _Inout_
-
-#define X3DAUDIO_PI  3.141592654f
-#define X3DAUDIO_2PI 6.283185307f
-
-#if !defined(_SPEAKER_POSITIONS_)
-#define _SPEAKER_POSITIONS_
-#define SPEAKER_FRONT_LEFT            0x00000001
-#define SPEAKER_FRONT_RIGHT           0x00000002
-#define SPEAKER_FRONT_CENTER          0x00000004
-#define SPEAKER_LOW_FREQUENCY         0x00000008
-#define SPEAKER_BACK_LEFT             0x00000010
-#define SPEAKER_BACK_RIGHT            0x00000020
-#define SPEAKER_FRONT_LEFT_OF_CENTER  0x00000040
-#define SPEAKER_FRONT_RIGHT_OF_CENTER 0x00000080
-#define SPEAKER_BACK_CENTER           0x00000100
-#define SPEAKER_SIDE_LEFT             0x00000200
-#define SPEAKER_SIDE_RIGHT            0x00000400
-#define SPEAKER_TOP_CENTER            0x00000800
-#define SPEAKER_TOP_FRONT_LEFT        0x00001000
-#define SPEAKER_TOP_FRONT_CENTER      0x00002000
-#define SPEAKER_TOP_FRONT_RIGHT       0x00004000
-#define SPEAKER_TOP_BACK_LEFT         0x00008000
-#define SPEAKER_TOP_BACK_CENTER       0x00010000
-#define SPEAKER_TOP_BACK_RIGHT        0x00020000
-#define SPEAKER_RESERVED              0x7FFC0000 // bit mask locations reserved for future use
-#define SPEAKER_ALL                   0x80000000 // used to specify that any possible permutation of speaker configurations
-#endif
-
-		// standard speaker geometry configurations, used with X3DAudioInitialize
-#if !defined(SPEAKER_MONO)
-#define SPEAKER_MONO             SPEAKER_FRONT_CENTER
-#define SPEAKER_STEREO           (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT)
-#define SPEAKER_2POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY)
-#define SPEAKER_SURROUND         (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_CENTER)
-#define SPEAKER_QUAD             (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
-#define SPEAKER_4POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
-#define SPEAKER_5POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT)
-#define SPEAKER_7POINT1          (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_FRONT_LEFT_OF_CENTER | SPEAKER_FRONT_RIGHT_OF_CENTER)
-#define SPEAKER_5POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_SIDE_LEFT  | SPEAKER_SIDE_RIGHT)
-#define SPEAKER_7POINT1_SURROUND (SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_LOW_FREQUENCY | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_SIDE_LEFT  | SPEAKER_SIDE_RIGHT)
-#endif
-
-#define X3DAUDIO_CALCULATE_MATRIX          0x00000001 // enable matrix coefficient table calculation
-#define X3DAUDIO_CALCULATE_DELAY           0x00000002 // enable delay time array calculation (stereo final mix only)
-#define X3DAUDIO_CALCULATE_LPF_DIRECT      0x00000004 // enable LPF direct-path coefficient calculation
-#define X3DAUDIO_CALCULATE_LPF_REVERB      0x00000008 // enable LPF reverb-path coefficient calculation
-#define X3DAUDIO_CALCULATE_REVERB          0x00000010 // enable reverb send level calculation
-#define X3DAUDIO_CALCULATE_DOPPLER         0x00000020 // enable doppler shift factor calculation
-#define X3DAUDIO_CALCULATE_EMITTER_ANGLE   0x00000040 // enable emitter-to-listener interior angle calculation
-
-#define HRTF_MAX_GAIN_LIMIT                  12.0f
-#define HRTF_MIN_GAIN_LIMIT                  -96.0f
-#define HRTF_MIN_UNITY_GAIN_DISTANCE         0.05f
-#define HRTF_DEFAULT_UNITY_GAIN_DISTANCE     1.0f
-#define HRTF_DEFAULT_CUTOFF_DISTANCE         FLT_MAX
-
-		struct IUnknown
-		{
-			// NAME: IXAudio2::QueryInterface
-			// DESCRIPTION: Queries for a given COM interface on the XAudio2 object.
-			//              Only IID_IUnknown and IID_IXAudio2 are supported.
-			//
-			// ARGUMENTS:
-			//  riid - IID of the interface to be obtained.
-			//  ppvInterface - Returns a pointer to the requested interface.
-			//
-			STDMETHOD(QueryInterface) (THIS_ REFIID riid, _Outptr_ void** ppvInterface) PURE;
-
-			// NAME: IXAudio2::AddRef
-			// DESCRIPTION: Adds a reference to the XAudio2 object.
-			//
-			STDMETHOD_(ULONG, AddRef) (THIS) PURE;
-
-			// NAME: IXAudio2::Release
-			// DESCRIPTION: Releases a reference to the XAudio2 object.
-			//
-			STDMETHOD_(ULONG, Release) (THIS) PURE;
-		};
-
-		//! Represents a position in 3D space, using a right-handed coordinate system.
-		typedef struct HrtfPosition
-		{
-			float x;
-			float y;
-			float z;
-		} HrtfPosition;
-
-		//! Indicates the orientation of an HRTF directivity object. This is a row-major 3x3 rotation matrix.
-		typedef struct HrtfOrientation
-		{
-			float element[9];
-		} HrtfOrientation;
-
-		//! Indicates one of several stock directivity patterns.
-		typedef enum HrtfDirectivityType
-		{
-			//! The sound emission is in all directions.
-			OmniDirectional = 0,
-			//! The sound emission is a cardiod shape.
-			Cardioid,
-			//! The sound emission is a cone.
-			Cone
-		} HrtfDirectivityType;
-
-		//! Indicates one of several stock environment types.
-		typedef enum HrtfEnvironment
-		{
-			//! A small room.
-			Small = 0,
-			//! A medium-sized room.
-			Medium,
-			//! A large enclosed space.
-			Large,
-			//! An outdoor space.
-			Outdoors,
-		} HrtfEnvironment;
-
-		//
-		//! Base directivity pattern descriptor. Describes the type of directivity applied to a sound.
-		//! The scaling parameter is used to interpolate between directivity behavior and omnidirectional; it determines how much attenuation is applied to the source outside of the directivity pattern and controls how directional the source is.
-		//
-		typedef struct HrtfDirectivity
-		{
-			//! Indicates the type of directivity.
-			HrtfDirectivityType type;
-			//! A normalized value between zero and one. Specifies the amount of linear interpolation between omnidirectional sound and the full directivity pattern, where 0 is fully omnidirectional and 1 is fully directional.
-			float               scaling;
-		} HrtfDirectivity;
-
-		//! Describes a cardioid directivity pattern.
-		typedef struct HrtfDirectivityCardioid
-		{
-			//! Descriptor for the cardioid pattern. The type parameter must be set to HrtfDirectivityType.Cardioid.
-			HrtfDirectivity directivity;
-			//! Order controls the shape of the cardioid. The higher order the shape, the narrower it is. Must be greater than 0 and less than or equal to 32.
-			float           order;
-		} HrtfDirectivityCardioid;
-
-		//
-		//! Describes a cone directivity.
-		//! Attenuation is 0 inside the inner cone.
-		//! Attenuation is linearly interpolated between the inner cone, which is defined by innerAngle, and the outer cone, which is defined by outerAngle.
-		//
-		typedef struct HrtfDirectivityCone
-		{
-			//! Descriptor for the cone pattern. The type parameter must be set to HrtfDirectivityType.Cone.
-			HrtfDirectivity directivity;
-			//! Angle, in radians, that defines the inner cone. Must be between 0 and 2 * pi.
-			float           innerAngle;
-			//! Angle, in radians, that defines the outer cone. Must be between 0 and 2 * pi.
-			float           outerAngle;
-		} HrtfDirectivityCone;
-
-		//
-		//! Indicates a distance-based decay type applied to a sound.
-		//
-		typedef enum HrtfDistanceDecayType
-		{
-			//! Simulates natural decay with distance, as constrained by minimum and maximum gain distance limits. Drops to silence at rolloff distance.
-			NaturalDecay = 0,
-			//! Used to set up a custom gain curve, within the maximum and minimum gain limit.
-			CustomDecay
-		} HrtfDistanceDecayType;
-
-		//
-		//! Describes a distance-based decay behavior.
-		//
-		typedef struct HrtfDistanceDecay
-		{
-			//! The type of decay behavior, natural or custom.
-			HrtfDistanceDecayType type;
-			//! The maximum gain limit applied at any distance. Applies to both natural and custom decay. This value is specified in dB, with a range from -96 to 12 inclusive. The default value is 12 dB.
-			float                 maxGain;
-			//! The minimum gain limit applied at any distance. Applies to both natural and custom decay. This value is specified in dB, with a range from -96 to 12 inclusive. The default value is -96 dB.
-			float                 minGain;
-			//! The distance at which the gain is 0dB. Applies to natural decay only. This value is specified in meters, with a range from 0.05 to infinity (FLT_MAX). The default value is 1 meter.
-			float                 unityGainDistance;
-			//! The distance at which output is silent. Applies to natural decay only. This value is specified in meters, with a range from zero (non-inclusive) to infinity (FLT_MAX). The default value is infinity.
-			float                 cutoffDistance;
-		} HrtfDistanceDecay;
-
-		//
-		//! Specifies parameters used to initialize HRTF.
-		//! 
-		//! Instances of the XAPO interface are created by using the CreateHrtfApo() API:
-		//!   ```STDAPI CreateHrtfApo(_In_ const HrtfApoInit* pInit, _Outptr_ IXAPO** ppXapo);```
-		//! 
-		//
-		typedef struct HrtfApoInit
-		{
-			//! The decay type. If you pass in nullptr, the default value will be used. The default is natural decay.
-			HrtfDistanceDecay* distanceDecay;
-			//! The directivity type. If you pass in nullptr, the default value will be used. The default directivity is omni-directional.
-			HrtfDirectivity*   directivity;
-		} HrtfApoInit;
-
-		struct XMFLOAT3
-		{
-			float x;
-			float y;
-			float z;
-
-			XMFLOAT3();
-
-			XMFLOAT3(float _x, float _y, float _z);
-
-			explicit XMFLOAT3(_In_reads_(3) const float* pArray);
-
-			XMFLOAT3& operator=(const XMFLOAT3& Float3);
-		};
-
-		typedef float FLOAT32; // 32-bit IEEE float
-		typedef XMFLOAT3 X3DAUDIO_VECTOR; // float 3D vector
-
-#pragma pack(push, 1)
-
-		typedef struct X3DAUDIO_CONE
-		{
-			FLOAT32 InnerAngle; // inner cone angle in radians, must be within [0.0f, X3DAUDIO_2PI]
-			FLOAT32 OuterAngle; // outer cone angle in radians, must be within [InnerAngle, X3DAUDIO_2PI]
-
-			FLOAT32 InnerVolume; // volume level scaler on/within inner cone, used only for matrix calculations, must be within [0.0f, 2.0f] when used
-			FLOAT32 OuterVolume; // volume level scaler on/beyond outer cone, used only for matrix calculations, must be within [0.0f, 2.0f] when used
-			FLOAT32 InnerLPF;    // LPF (both direct and reverb paths) coefficient subtrahend on/within inner cone, used only for LPF (both direct and reverb paths) calculations, must be within [0.0f, 1.0f] when used
-			FLOAT32 OuterLPF;    // LPF (both direct and reverb paths) coefficient subtrahend on/beyond outer cone, used only for LPF (both direct and reverb paths) calculations, must be within [0.0f, 1.0f] when used
-			FLOAT32 InnerReverb; // reverb send level scaler on/within inner cone, used only for reverb calculations, must be within [0.0f, 2.0f] when used
-			FLOAT32 OuterReverb; // reverb send level scaler on/beyond outer cone, used only for reverb calculations, must be within [0.0f, 2.0f] when used
-		} X3DAUDIO_CONE, *LPX3DAUDIO_CONE;
-		static const X3DAUDIO_CONE X3DAudioDefault_DirectionalCone = { X3DAUDIO_PI / 2, X3DAUDIO_PI, 1.0f, 0.708f, 0.0f, 0.25f, 0.708f, 1.0f };
-
-		typedef struct X3DAUDIO_LISTENER
-		{
-			X3DAUDIO_VECTOR OrientFront; // orientation of front direction, used only for matrix and delay calculations or listeners with cones for matrix, LPF (both direct and reverb paths), and reverb calculations, must be normalized when used
-			X3DAUDIO_VECTOR OrientTop;   // orientation of top direction, used only for matrix and delay calculations, must be orthonormal with OrientFront when used
-
-			X3DAUDIO_VECTOR Position; // position in user-defined world units, does not affect Velocity
-			X3DAUDIO_VECTOR Velocity; // velocity vector in user-defined world units/second, used only for doppler calculations, does not affect Position
-
-			X3DAUDIO_CONE* pCone; // sound cone, used only for matrix, LPF (both direct and reverb paths), and reverb calculations, NULL specifies omnidirectionality
-		} X3DAUDIO_LISTENER, *LPX3DAUDIO_LISTENER;
-
-		typedef struct X3DAUDIO_DISTANCE_CURVE_POINT
-		{
-			FLOAT32 Distance;   // normalized distance, must be within [0.0f, 1.0f]
-			FLOAT32 DSPSetting; // DSP setting
-		} X3DAUDIO_DISTANCE_CURVE_POINT, *LPX3DAUDIO_DISTANCE_CURVE_POINT;
-
-		typedef struct X3DAUDIO_DISTANCE_CURVE
-		{
-			X3DAUDIO_DISTANCE_CURVE_POINT* pPoints;    // distance curve point array, must have at least PointCount elements with no duplicates and be sorted in ascending order with respect to Distance
-			UINT32                         PointCount; // number of distance curve points, must be >= 2 as all distance curves must have at least two endpoints, defining DSP settings at 0.0f and 1.0f normalized distance
-		} X3DAUDIO_DISTANCE_CURVE, *LPX3DAUDIO_DISTANCE_CURVE;
-		static const X3DAUDIO_DISTANCE_CURVE_POINT X3DAudioDefault_LinearCurvePoints[2] = { {0.0f, 1.0f}, {1.0f, 0.0f} };
-		static const X3DAUDIO_DISTANCE_CURVE       X3DAudioDefault_LinearCurve = { (X3DAUDIO_DISTANCE_CURVE_POINT*)&X3DAudioDefault_LinearCurvePoints[0], 2 };
-
-		typedef struct X3DAUDIO_EMITTER
-		{
-			X3DAUDIO_CONE* pCone; // sound cone, used only with single-channel emitters for matrix, LPF (both direct and reverb paths), and reverb calculations, NULL specifies omnidirectionality
-			X3DAUDIO_VECTOR OrientFront; // orientation of front direction, used only for emitter angle calculations or with multi-channel emitters for matrix calculations or single-channel emitters with cones for matrix, LPF (both direct and reverb paths), and reverb calculations, must be normalized when used
-			X3DAUDIO_VECTOR OrientTop;   // orientation of top direction, used only with multi-channel emitters for matrix calculations, must be orthonormal with OrientFront when used
-
-			X3DAUDIO_VECTOR Position; // position in user-defined world units, does not affect Velocity
-			X3DAUDIO_VECTOR Velocity; // velocity vector in user-defined world units/second, used only for doppler calculations, does not affect Position
-
-			FLOAT32 InnerRadius;      // inner radius, must be within [0.0f, FLT_MAX]
-			FLOAT32 InnerRadiusAngle; // inner radius angle, must be within [0.0f, X3DAUDIO_PI/4.0)
-
-			UINT32 ChannelCount;       // number of sound channels, must be > 0
-			FLOAT32 ChannelRadius;     // channel radius, used only with multi-channel emitters for matrix calculations, must be >= 0.0f when used
-			FLOAT32* pChannelAzimuths; // channel azimuth array, used only with multi-channel emitters for matrix calculations, contains positions of each channel expressed in radians along the channel radius with respect to the front orientation vector in the plane orthogonal to the top orientation vector, or X3DAUDIO_2PI to specify an LFE channel, must have at least ChannelCount elements, all within [0.0f, X3DAUDIO_2PI] when used
-
-			X3DAUDIO_DISTANCE_CURVE* pVolumeCurve;    // volume level distance curve, used only for matrix calculations, NULL specifies a default curve that conforms to the inverse square law, calculated in user-defined world units with distances <= CurveDistanceScaler clamped to no attenuation
-			X3DAUDIO_DISTANCE_CURVE* pLFECurve;       // LFE level distance curve, used only for matrix calculations, NULL specifies a default curve that conforms to the inverse square law, calculated in user-defined world units with distances <= CurveDistanceScaler clamped to no attenuation
-			X3DAUDIO_DISTANCE_CURVE* pLPFDirectCurve; // LPF direct-path coefficient distance curve, used only for LPF direct-path calculations, NULL specifies the default curve: [0.0f,1.0f], [1.0f,0.75f]
-			X3DAUDIO_DISTANCE_CURVE* pLPFReverbCurve; // LPF reverb-path coefficient distance curve, used only for LPF reverb-path calculations, NULL specifies the default curve: [0.0f,0.75f], [1.0f,0.75f]
-			X3DAUDIO_DISTANCE_CURVE* pReverbCurve;    // reverb send level distance curve, used only for reverb calculations, NULL specifies the default curve: [0.0f,1.0f], [1.0f,0.0f]
-
-			FLOAT32 CurveDistanceScaler; // curve distance scaler, used to scale normalized distance curves to user-defined world units and/or exaggerate their effect, used only for matrix, LPF (both direct and reverb paths), and reverb calculations, must be within [FLT_MIN, FLT_MAX] when used
-			FLOAT32 DopplerScaler;       // doppler shift scaler, used to exaggerate doppler shift effect, used only for doppler calculations, must be within [0.0f, FLT_MAX] when used
-		} X3DAUDIO_EMITTER, *LPX3DAUDIO_EMITTER;
-
-		typedef struct X3DAUDIO_DSP_SETTINGS
-		{
-			FLOAT32* pMatrixCoefficients; // [inout] matrix coefficient table, receives an array representing the volume level used to send from source channel S to destination channel D, stored as pMatrixCoefficients[SrcChannelCount * D + S], must have at least SrcChannelCount*DstChannelCount elements
-			FLOAT32* pDelayTimes;         // [inout] delay time array, receives delays for each destination channel in milliseconds, must have at least DstChannelCount elements (stereo final mix only)
-			UINT32 SrcChannelCount;       // [in] number of source channels, must equal number of channels in respective emitter
-			UINT32 DstChannelCount;       // [in] number of destination channels, must equal number of channels of the final mix
-
-			FLOAT32 LPFDirectCoefficient; // [out] LPF direct-path coefficient
-			FLOAT32 LPFReverbCoefficient; // [out] LPF reverb-path coefficient
-			FLOAT32 ReverbLevel; // [out] reverb send level
-			FLOAT32 DopplerFactor; // [out] doppler shift factor, scales resampler ratio for doppler shift effect, where the effective frequency = DopplerFactor * original frequency
-			FLOAT32 EmitterToListenerAngle; // [out] emitter-to-listener interior angle, expressed in radians with respect to the emitter's front orientation
-
-			FLOAT32 EmitterToListenerDistance; // [out] distance in user-defined world units from the emitter base to listener position, always calculated
-			FLOAT32 EmitterVelocityComponent; // [out] component of emitter velocity vector projected onto emitter->listener vector in user-defined world units/second, calculated only for doppler
-			FLOAT32 ListenerVelocityComponent; // [out] component of listener velocity vector projected onto emitter->listener vector in user-defined world units/second, calculated only for doppler
-		} X3DAUDIO_DSP_SETTINGS, *LPX3DAUDIO_DSP_SETTINGS;
-
-#define X3DAUDIO_HANDLE_BYTESIZE 20
-		typedef BYTE X3DAUDIO_HANDLE[X3DAUDIO_HANDLE_BYTESIZE];
-
-#define SPEED_OF_SOUND 343.5f
-
-		extern HRESULT __stdcall CoInitializeEx(void* ppXAudio2, DWORD dwCoInit);
-
-		typedef HRESULT (__stdcall * XAudio2CreatePtr)(void** ppXAudio2, UINT32 flags, UINT32 processor);
-		typedef HRESULT (_cdecl * X3DAudioInitializePtr)(UINT32 SpeakerChannelMask, float SpeedOfSound, _Out_writes_bytes_(X3DAUDIO_HANDLE_BYTESIZE) X3DAUDIO_HANDLE Instance);
-		typedef void (_cdecl * X3DAudioCalculatePtr)(_In_reads_bytes_(X3DAUDIO_HANDLE_BYTESIZE) const X3DAUDIO_HANDLE Instance, _In_ const X3DAUDIO_LISTENER* pListener, _In_ const X3DAUDIO_EMITTER* pEmitter, UINT32 Flags, _Inout_ X3DAUDIO_DSP_SETTINGS* pDSPSettings);
-
-		typedef HRESULT(__stdcall * CreateHrtfApoPtr)(const HrtfApoInit* init, IUnknown** xApo);
-		CreateHrtfApoPtr CreateHrtfApoFunc = NULL;
-
-#ifndef WINDOWS_DESKTOP
-		extern HRESULT __stdcall XAudio2Create(void** ppXAudio2, UINT32 flags, UINT32 processor);
-		XAudio2CreatePtr XAudio2CreateFunc = XAudio2Create;
-		extern HRESULT _cdecl X3DAudioInitialize(UINT32 SpeakerChannelMask, float SpeedOfSound, _Out_writes_bytes_(X3DAUDIO_HANDLE_BYTESIZE) X3DAUDIO_HANDLE Instance);
-		X3DAudioInitializePtr X3DAudioInitializeFunc = X3DAudioInitialize;
-		extern void _cdecl X3DAudioCalculate(_In_reads_bytes_(X3DAUDIO_HANDLE_BYTESIZE) const X3DAUDIO_HANDLE Instance, _In_ const X3DAUDIO_LISTENER* pListener, _In_ const X3DAUDIO_EMITTER* pEmitter, UINT32 Flags, _Inout_ X3DAUDIO_DSP_SETTINGS* pDSPSettings);
-		X3DAudioCalculatePtr X3DAudioCalculateFunc = X3DAudioCalculate;
-#else
-		XAudio2CreatePtr XAudio2CreateFunc = NULL;
-		X3DAudioInitializePtr X3DAudioInitializeFunc = NULL;
-		X3DAudioCalculatePtr X3DAudioCalculateFunc = NULL;
-#endif
-
-		struct IXAudio2Voice;
-
-		typedef struct XAUDIO2_VOICE_DETAILS
-		{
-			UINT32 CreationFlags;               // Flags the voice was created with.
-			UINT32 ActiveFlags;                 // Flags currently active.
-			UINT32 InputChannels;               // Channels in the voice's input audio.
-			UINT32 InputSampleRate;             // Sample rate of the voice's input audio.
-		} XAUDIO2_VOICE_DETAILS;
-
-		typedef struct XAUDIO2_SEND_DESCRIPTOR
-		{
-			UINT32 Flags;                       // Either 0 or XAUDIO2_SEND_USEFILTER.
-			IXAudio2Voice* pOutputVoice;        // This send's destination voice.
-		} XAUDIO2_SEND_DESCRIPTOR;
-
-		typedef struct XAUDIO2_VOICE_SENDS
-		{
-			UINT32 SendCount;                   // Number of sends from this voice.
-			XAUDIO2_SEND_DESCRIPTOR* pSends;    // Array of SendCount send descriptors.
-		} XAUDIO2_VOICE_SENDS;
-
-		typedef struct XAUDIO2_EFFECT_DESCRIPTOR
-		{
-			IUnknown* pEffect;                  // Pointer to the effect object's IUnknown interface.
-			BOOL InitialState;                  // TRUE if the effect should begin in the enabled state.
-			UINT32 OutputChannels;              // How many output channels the effect should produce.
-		} XAUDIO2_EFFECT_DESCRIPTOR;
-
-		typedef struct XAUDIO2_EFFECT_CHAIN
-		{
-			UINT32 EffectCount;                 // Number of effects in this voice's effect chain.
-			XAUDIO2_EFFECT_DESCRIPTOR* pEffectDescriptors; // Array of effect descriptors.
-		} XAUDIO2_EFFECT_CHAIN;
-
-		typedef enum XAUDIO2_FILTER_TYPE
-		{
-			LowPassFilter,                      // Attenuates frequencies above the cutoff frequency (state-variable filter).
-			BandPassFilter,                     // Attenuates frequencies outside a given range      (state-variable filter).
-			HighPassFilter,                     // Attenuates frequencies below the cutoff frequency (state-variable filter).
-			NotchFilter,                        // Attenuates frequencies inside a given range       (state-variable filter).
-			LowPassOnePoleFilter,               // Attenuates frequencies above the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect)
-			HighPassOnePoleFilter               // Attenuates frequencies below the cutoff frequency (one-pole filter, XAUDIO2_FILTER_PARAMETERS.OneOverQ has no effect)
-		} XAUDIO2_FILTER_TYPE;
-
-		typedef struct XAUDIO2_FILTER_PARAMETERS
-		{
-			XAUDIO2_FILTER_TYPE Type;           // Filter type.
-			float Frequency;                    // Filter coefficient.
-												//  must be >= 0 and <= XAUDIO2_MAX_FILTER_FREQUENCY
-												//  See XAudio2CutoffFrequencyToRadians() for state-variable filter types and
-												//  XAudio2CutoffFrequencyToOnePoleCoefficient() for one-pole filter types.
-			float OneOverQ;                     // Reciprocal of the filter's quality factor Q;
-												//  must be > 0 and <= XAUDIO2_MAX_FILTER_ONEOVERQ.
-												//  Has no effect for one-pole filters.
-		} XAUDIO2_FILTER_PARAMETERS;
-
-		struct IXAPOHrtfParameters : IUnknown
-		{
-			// HRTF params
-			//! The position of the sound relative to the listener.
-			STDMETHOD(SetSourcePosition)(THIS_ _In_ const HrtfPosition* position);
-			//! The rotation matrix for the source orientation, with respect to the listener's frame of reference (the listener's coordinate system).
-			STDMETHOD(SetSourceOrientation)(THIS_ _In_ const HrtfOrientation* orientation);
-			//! The custom direct path gain value for the current source position. Valid only for sounds played with the HrtfDistanceDecayType. Custom decay type.
-			STDMETHOD(SetSourceGain)(THIS_ _In_ float gain);
-
-			// Distance cue params
-			//! Selects the acoustic environment to simulate.
-			STDMETHOD(SetEnvironment)(THIS_ _In_ HrtfEnvironment environment);
-		};
-
-		struct IXAudio2EngineCallback
-		{
-			// Called by XAudio2 just before an audio processing pass begins.
-			STDMETHOD_(void, OnProcessingPassStart) (THIS) PURE;
-
-			// Called just after an audio processing pass ends.
-			STDMETHOD_(void, OnProcessingPassEnd) (THIS) PURE;
-
-			// Called in the event of a critical system error which requires XAudio2
-			// to be closed down and restarted.  The error code is given in Error.
-			STDMETHOD_(void, OnCriticalError) (THIS_ HRESULT Error) PURE;
-		};
-
-		struct IXAudio2Voice
-		{
-			/* NAME: IXAudio2Voice::GetVoiceDetails
-			// DESCRIPTION: Returns the basic characteristics of this voice.
-			//
-			// ARGUMENTS:
-			//  pVoiceDetails - Returns the voice's details.
-			*/
-			STDMETHOD_(void, GetVoiceDetails) (THIS_ _Out_ XAUDIO2_VOICE_DETAILS* pVoiceDetails) PURE;
-
-			/* NAME: IXAudio2Voice::SetOutputVoices
-			// DESCRIPTION: Replaces the set of submix/mastering voices that receive
-			//              this voice's output.
-			//
-			// ARGUMENTS:
-			//  pSendList - Optional list of voices this voice should send audio to.
-			*/
-			STDMETHOD(SetOutputVoices) (THIS_ _In_opt_ const XAUDIO2_VOICE_SENDS* pSendList) PURE;
-
-			/* NAME: IXAudio2Voice::SetEffectChain
-			// DESCRIPTION: Replaces this voice's current effect chain with a new one.
-			//
-			// ARGUMENTS:
-			//  pEffectChain - Structure describing the new effect chain to be used.
-			*/
-			STDMETHOD(SetEffectChain) (THIS_ _In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain) PURE;
-
-			/* NAME: IXAudio2Voice::EnableEffect
-			// DESCRIPTION: Enables an effect in this voice's effect chain.
-			//
-			// ARGUMENTS:
-			//  EffectIndex - Index of an effect within this voice's effect chain.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(EnableEffect) (THIS_ UINT32 EffectIndex,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::DisableEffect
-			// DESCRIPTION: Disables an effect in this voice's effect chain.
-			//
-			// ARGUMENTS:
-			//  EffectIndex - Index of an effect within this voice's effect chain.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(DisableEffect) (THIS_ UINT32 EffectIndex,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::GetEffectState
-			// DESCRIPTION: Returns the running state of an effect.
-			//
-			// ARGUMENTS:
-			//  EffectIndex - Index of an effect within this voice's effect chain.
-			//  pEnabled - Returns the enabled/disabled state of the given effect.
-			*/
-			STDMETHOD_(void, GetEffectState) (THIS_ UINT32 EffectIndex, _Out_ BOOL* pEnabled) PURE;
-
-			/* NAME: IXAudio2Voice::SetEffectParameters
-			// DESCRIPTION: Sets effect-specific parameters.
-			//
-			// REMARKS: Unlike IXAPOParameters::SetParameters, this method may
-			//          be called from any thread.  XAudio2 implements
-			//          appropriate synchronization to copy the parameters to the
-			//          realtime audio processing thread.
-			//
-			// ARGUMENTS:
-			//  EffectIndex - Index of an effect within this voice's effect chain.
-			//  pParameters - Pointer to an effect-specific parameters block.
-			//  ParametersByteSize - Size of the pParameters array  in bytes.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(SetEffectParameters) (THIS_ UINT32 EffectIndex,
-				_In_reads_bytes_(ParametersByteSize) const void* pParameters,
-				UINT32 ParametersByteSize,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::GetEffectParameters
-			// DESCRIPTION: Obtains the current effect-specific parameters.
-			//
-			// ARGUMENTS:
-			//  EffectIndex - Index of an effect within this voice's effect chain.
-			//  pParameters - Returns the current values of the effect-specific parameters.
-			//  ParametersByteSize - Size of the pParameters array in bytes.
-			*/
-			STDMETHOD(GetEffectParameters) (THIS_ UINT32 EffectIndex,
-				_Out_writes_bytes_(ParametersByteSize) void* pParameters,
-				UINT32 ParametersByteSize) PURE;
-
-			/* NAME: IXAudio2Voice::SetFilterParameters
-			// DESCRIPTION: Sets this voice's filter parameters.
-			//
-			// ARGUMENTS:
-			//  pParameters - Pointer to the filter's parameter structure.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(SetFilterParameters) (THIS_ _In_ const XAUDIO2_FILTER_PARAMETERS* pParameters,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::GetFilterParameters
-			// DESCRIPTION: Returns this voice's current filter parameters.
-			//
-			// ARGUMENTS:
-			//  pParameters - Returns the filter parameters.
-			*/
-			STDMETHOD_(void, GetFilterParameters) (THIS_ _Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE;
-
-			/* NAME: IXAudio2Voice::SetOutputFilterParameters
-			// DESCRIPTION: Sets the filter parameters on one of this voice's sends.
-			//
-			// ARGUMENTS:
-			//  pDestinationVoice - Destination voice of the send whose filter parameters will be set.
-			//  pParameters - Pointer to the filter's parameter structure.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(SetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice,
-				_In_ const XAUDIO2_FILTER_PARAMETERS* pParameters,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::GetOutputFilterParameters
-			// DESCRIPTION: Returns the filter parameters from one of this voice's sends.
-			//
-			// ARGUMENTS:
-			//  pDestinationVoice - Destination voice of the send whose filter parameters will be read.
-			//  pParameters - Returns the filter parameters.
-			*/
-			STDMETHOD_(void, GetOutputFilterParameters) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice,
-				_Out_ XAUDIO2_FILTER_PARAMETERS* pParameters) PURE;
-
-			/* NAME: IXAudio2Voice::SetVolume
-			// DESCRIPTION: Sets this voice's overall volume level.
-			//
-			// ARGUMENTS:
-			//  Volume - New overall volume level to be used, as an amplitude factor.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(SetVolume) (THIS_ float Volume,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::GetVolume
-			// DESCRIPTION: Obtains this voice's current overall volume level.
-			//
-			// ARGUMENTS:
-			//  pVolume: Returns the voice's current overall volume level.
-			*/
-			STDMETHOD_(void, GetVolume) (THIS_ _Out_ float* pVolume) PURE;
-
-			/* NAME: IXAudio2Voice::SetChannelVolumes
-			// DESCRIPTION: Sets this voice's per-channel volume levels.
-			//
-			// ARGUMENTS:
-			//  Channels - Used to confirm the voice's channel count.
-			//  pVolumes - Array of per-channel volume levels to be used.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(SetChannelVolumes) (THIS_ UINT32 Channels, _In_reads_(Channels) const float* pVolumes,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE; \
-
-				/* NAME: IXAudio2Voice::GetChannelVolumes
-				// DESCRIPTION: Returns this voice's current per-channel volume levels.
-				//
-				// ARGUMENTS:
-				//  Channels - Used to confirm the voice's channel count.
-				//  pVolumes - Returns an array of the current per-channel volume levels.
-				*/
-				STDMETHOD_(void, GetChannelVolumes) (THIS_ UINT32 Channels, _Out_writes_(Channels) float* pVolumes) PURE;
-
-			/* NAME: IXAudio2Voice::SetOutputMatrix
-			// DESCRIPTION: Sets the volume levels used to mix from each channel of this
-			//              voice's output audio to each channel of a given destination
-			//              voice's input audio.
-			//
-			// ARGUMENTS:
-			//  pDestinationVoice - The destination voice whose mix matrix to change.
-			//  SourceChannels - Used to confirm this voice's output channel count
-			//   (the number of channels produced by the last effect in the chain).
-			//  DestinationChannels - Confirms the destination voice's input channels.
-			//  pLevelMatrix - Array of [SourceChannels * DestinationChannels] send
-			//   levels.  The level used to send from source channel S to destination
-			//   channel D should be in pLevelMatrix[S + SourceChannels * D].
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			*/
-			STDMETHOD(SetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice,
-				UINT32 SourceChannels, UINT32 DestinationChannels,
-				_In_reads_(SourceChannels * DestinationChannels) const float* pLevelMatrix,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			/* NAME: IXAudio2Voice::GetOutputMatrix
-			// DESCRIPTION: Obtains the volume levels used to send each channel of this
-			//              voice's output audio to each channel of a given destination
-			//              voice's input audio.
-			//
-			// ARGUMENTS:
-			//  pDestinationVoice - The destination voice whose mix matrix to obtain.
-			//  SourceChannels - Used to confirm this voice's output channel count
-			//   (the number of channels produced by the last effect in the chain).
-			//  DestinationChannels - Confirms the destination voice's input channels.
-			//  pLevelMatrix - Array of send levels, as above.
-			*/
-			STDMETHOD_(void, GetOutputMatrix) (THIS_ _In_opt_ IXAudio2Voice* pDestinationVoice,
-				UINT32 SourceChannels, UINT32 DestinationChannels,
-				_Out_writes_(SourceChannels * DestinationChannels) float* pLevelMatrix) PURE;
-			/* NAME: IXAudio2Voice::DestroyVoice
-			// DESCRIPTION: Destroys this voice, stopping it if necessary and removing
-			//              it from the XAudio2 graph.
-			*/
-			STDMETHOD_(void, DestroyVoice) (THIS) PURE;
-		};
-
-		typedef struct XAUDIO2_BUFFER
-		{
-			UINT32 Flags;                       // Either 0 or XAUDIO2_END_OF_STREAM.
-			UINT32 AudioBytes;                  // Size of the audio data buffer in bytes.
-			const BYTE* pAudioData;             // Pointer to the audio data buffer.
-			UINT32 PlayBegin;                   // First sample in this buffer to be played.
-			UINT32 PlayLength;                  // Length of the region to be played in samples,
-												//  or 0 to play the whole buffer.
-			UINT32 LoopBegin;                   // First sample of the region to be looped.
-			UINT32 LoopLength;                  // Length of the desired loop region in samples,
-												//  or 0 to loop the entire buffer.
-			UINT32 LoopCount;                   // Number of times to repeat the loop region,
-												//  or XAUDIO2_LOOP_INFINITE to loop forever.
-			void* pContext;                     // Context value to be passed back in callbacks.
-		} XAUDIO2_BUFFER;
-
-		typedef struct XAUDIO2_BUFFER_WMA
-		{
-			const UINT32* pDecodedPacketCumulativeBytes; // Decoded packet's cumulative size array.
-														 //  Each element is the number of bytes accumulated
-														 //  when the corresponding XWMA packet is decoded in
-														 //  order.  The array must have PacketCount elements.
-			UINT32 PacketCount;                          // Number of XWMA packets submitted. Must be >= 1 and
-														 //  divide evenly into XAUDIO2_BUFFER.AudioBytes.
-		} XAUDIO2_BUFFER_WMA;
-
-		typedef struct XAUDIO2_VOICE_STATE
-		{
-			void* pCurrentBufferContext;        // The pContext value provided in the XAUDIO2_BUFFER
-												//  that is currently being processed, or NULL if
-												//  there are no buffers in the queue.
-			UINT32 BuffersQueued;               // Number of buffers currently queued on the voice
-												//  (including the one that is being processed).
-			UINT64 SamplesPlayed;               // Total number of samples produced by the voice since
-												//  it began processing the current audio stream.
-												//  If XAUDIO2_VOICE_NOSAMPLESPLAYED is specified
-												//  in the call to IXAudio2SourceVoice::GetState,
-												//  this member will not be calculated, saving CPU.
-		} XAUDIO2_VOICE_STATE;
-
-		struct IXAudio2SourceVoice : IXAudio2Voice
-		{
-			// NAME: IXAudio2SourceVoice::Start
-			// DESCRIPTION: Makes this voice start consuming and processing audio.
-			//
-			// ARGUMENTS:
-			//  Flags - Flags controlling how the voice should be started.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(Start) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::Stop
-			// DESCRIPTION: Makes this voice stop consuming audio.
-			//
-			// ARGUMENTS:
-			//  Flags - Flags controlling how the voice should be stopped.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(Stop) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::SubmitSourceBuffer
-			// DESCRIPTION: Adds a new audio buffer to this voice's input queue.
-			//
-			// ARGUMENTS:
-			//  pBuffer - Pointer to the buffer structure to be queued.
-			//  pBufferWMA - Additional structure used only when submitting XWMA data.
-			//
-			STDMETHOD(SubmitSourceBuffer) (THIS_ _In_ const XAUDIO2_BUFFER* pBuffer, _In_opt_ const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE;
-
-			// NAME: IXAudio2SourceVoice::FlushSourceBuffers
-			// DESCRIPTION: Removes all pending audio buffers from this voice's queue.
-			//
-			STDMETHOD(FlushSourceBuffers) (THIS) PURE;
-
-			// NAME: IXAudio2SourceVoice::Discontinuity
-			// DESCRIPTION: Notifies the voice of an intentional break in the stream of
-			//              audio buffers (e.g. the end of a sound), to prevent XAudio2
-			//              from interpreting an empty buffer queue as a glitch.
-			//
-			STDMETHOD(Discontinuity) (THIS) PURE;
-
-			// NAME: IXAudio2SourceVoice::ExitLoop
-			// DESCRIPTION: Breaks out of the current loop when its end is reached.
-			//
-			// ARGUMENTS:
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::GetState
-			// DESCRIPTION: Returns the number of buffers currently queued on this voice,
-			//              the pContext value associated with the currently processing
-			//              buffer (if any), and other voice state information.
-			//
-			// ARGUMENTS:
-			//  pVoiceState - Returns the state information.
-			//  Flags - Flags controlling what voice state is returned.
-			//
-			STDMETHOD_(void, GetState) (THIS_ _Out_ XAUDIO2_VOICE_STATE* pVoiceState, UINT32 Flags X2DEFAULT(0)) PURE;
-
-			// NAME: IXAudio2SourceVoice::SetFrequencyRatio
-			// DESCRIPTION: Sets this voice's frequency adjustment, i.e. its pitch.
-			//
-			// ARGUMENTS:
-			//  Ratio - Frequency change, expressed as source frequency / target frequency.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::GetFrequencyRatio
-			// DESCRIPTION: Returns this voice's current frequency adjustment ratio.
-			//
-			// ARGUMENTS:
-			//  pRatio - Returns the frequency adjustment.
-			//
-			STDMETHOD_(void, GetFrequencyRatio) (THIS_ _Out_ float* pRatio) PURE;
-
-			// NAME: IXAudio2SourceVoice::SetSourceSampleRate
-			// DESCRIPTION: Reconfigures this voice to treat its source data as being
-			//              at a different sample rate than the original one specified
-			//              in CreateSourceVoice's pSourceFormat argument.
-			//
-			// ARGUMENTS:
-			//  UINT32 - The intended sample rate of further submitted source data.
-			//
-			STDMETHOD(SetSourceSampleRate) (THIS_ UINT32 NewSourceSampleRate) PURE;
-		};
-
-		struct IXAudio2SourceVoice1 : IXAudio2Voice
-		{
-			// NAME: IXAudio2SourceVoice::Start
-			// DESCRIPTION: Makes this voice start consuming and processing audio.
-			//
-			// ARGUMENTS:
-			//  Flags - Flags controlling how the voice should be started.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(Start) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::Stop
-			// DESCRIPTION: Makes this voice stop consuming audio.
-			//
-			// ARGUMENTS:
-			//  Flags - Flags controlling how the voice should be stopped.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(Stop) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::SubmitSourceBuffer
-			// DESCRIPTION: Adds a new audio buffer to this voice's input queue.
-			//
-			// ARGUMENTS:
-			//  pBuffer - Pointer to the buffer structure to be queued.
-			//  pBufferWMA - Additional structure used only when submitting XWMA data.
-			//
-			STDMETHOD(SubmitSourceBuffer) (THIS_ const XAUDIO2_BUFFER* pBuffer, const XAUDIO2_BUFFER_WMA* pBufferWMA X2DEFAULT(NULL)) PURE;
-
-			// NAME: IXAudio2SourceVoice::FlushSourceBuffers
-			// DESCRIPTION: Removes all pending audio buffers from this voice's queue.
-			//
-			STDMETHOD(FlushSourceBuffers) (THIS) PURE;
-
-			// NAME: IXAudio2SourceVoice::Discontinuity
-			// DESCRIPTION: Notifies the voice of an intentional break in the stream of
-			//              audio buffers (e.g. the end of a sound), to prevent XAudio2
-			//              from interpreting an empty buffer queue as a glitch.
-			//
-			STDMETHOD(Discontinuity) (THIS) PURE;
-
-			// NAME: IXAudio2SourceVoice::ExitLoop
-			// DESCRIPTION: Breaks out of the current loop when its end is reached.
-			//
-			// ARGUMENTS:
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(ExitLoop) (THIS_ UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::GetState
-			// DESCRIPTION: Returns the number of buffers currently queued on this voice,
-			//              the pContext value associated with the currently processing
-			//              buffer (if any), and other voice state information.
-			//
-			// ARGUMENTS:
-			//  pVoiceState - Returns the state information.
-			//
-			STDMETHOD_(void, GetState) (THIS_ XAUDIO2_VOICE_STATE* pVoiceState) PURE;
-
-			// NAME: IXAudio2SourceVoice::SetFrequencyRatio
-			// DESCRIPTION: Sets this voice's frequency adjustment, i.e. its pitch.
-			//
-			// ARGUMENTS:
-			//  Ratio - Frequency change, expressed as source frequency / target frequency.
-			//  OperationSet - Used to identify this call as part of a deferred batch.
-			//
-			STDMETHOD(SetFrequencyRatio) (THIS_ float Ratio,
-				UINT32 OperationSet X2DEFAULT(XAUDIO2_COMMIT_NOW)) PURE;
-
-			// NAME: IXAudio2SourceVoice::GetFrequencyRatio
-			// DESCRIPTION: Returns this voice's current frequency adjustment ratio.
-			//
-			// ARGUMENTS:
-			//  pRatio - Returns the frequency adjustment.
-			//
-			STDMETHOD_(void, GetFrequencyRatio) (THIS_ float* pRatio) PURE;
-
-			// NAME: IXAudio2SourceVoice::SetSourceSampleRate
-			// DESCRIPTION: Reconfigures this voice to treat its source data as being
-			//              at a different sample rate than the original one specified
-			//              in CreateSourceVoice's pSourceFormat argument.
-			//
-			// ARGUMENTS:
-			//  UINT32 - The intended sample rate of further submitted source data.
-			//
-			STDMETHOD(SetSourceSampleRate) (THIS_ UINT32 NewSourceSampleRate) PURE;
-		};
-
-		struct IXAudio2SubmixVoice : IXAudio2SourceVoice
-		{
-		};
-
-		typedef struct tWAVEFORMATEX
-		{
-			WORD        wFormatTag;         /* format type */
-			WORD        nChannels;          /* number of channels (i.e. mono, stereo...) */
-			DWORD       nSamplesPerSec;     /* sample rate */
-			DWORD       nAvgBytesPerSec;    /* for buffer estimation */
-			WORD        nBlockAlign;        /* block size of data */
-			WORD        wBitsPerSample;     /* number of bits per sample of mono data */
-			WORD        cbSize;             /* the count in bytes of the size of */
-											/* extra information (after cbSize) */
-		} WAVEFORMATEX;
-
-#define XAUDIO2_MAX_BUFFER_BYTES        0x80000000    // Maximum bytes allowed in a source buffer
-#define XAUDIO2_MAX_QUEUED_BUFFERS      64            // Maximum buffers allowed in a voice queue
-#define XAUDIO2_MAX_BUFFERS_SYSTEM      2             // Maximum buffers allowed for system threads (Xbox 360 only)
-#define XAUDIO2_MAX_AUDIO_CHANNELS      64            // Maximum channels in an audio stream
-#define XAUDIO2_MIN_SAMPLE_RATE         1000          // Minimum audio sample rate supported
-#define XAUDIO2_MAX_SAMPLE_RATE         200000        // Maximum audio sample rate supported
-#define XAUDIO2_MAX_VOLUME_LEVEL        16777216.0f   // Maximum acceptable volume level (2^24)
-#define XAUDIO2_MIN_FREQ_RATIO          (1/1024.0f)   // Minimum SetFrequencyRatio argument
-#define XAUDIO2_MAX_FREQ_RATIO          1024.0f       // Maximum MaxFrequencyRatio argument
-#define XAUDIO2_DEFAULT_FREQ_RATIO      2.0f          // Default MaxFrequencyRatio argument
-#define XAUDIO2_MAX_FILTER_ONEOVERQ     1.5f          // Maximum XAUDIO2_FILTER_PARAMETERS.OneOverQ
-#define XAUDIO2_MAX_FILTER_FREQUENCY    1.0f          // Maximum XAUDIO2_FILTER_PARAMETERS.Frequency
-#define XAUDIO2_MAX_LOOP_COUNT          254           // Maximum non-infinite XAUDIO2_BUFFER.LoopCount
-#define XAUDIO2_MAX_INSTANCES           8             // Maximum simultaneous XAudio2 objects on Xbox 360
-
-#define XAUDIO2_DEBUG_ENGINE                  0x0001    // Used in XAudio2Create
-#define XAUDIO2_VOICE_NOPITCH                 0x0002    // Used in IXAudio2::CreateSourceVoice
-#define XAUDIO2_VOICE_NOSRC                   0x0004    // Used in IXAudio2::CreateSourceVoice
-#define XAUDIO2_VOICE_USEFILTER               0x0008    // Used in IXAudio2::CreateSource/SubmixVoice
-#define XAUDIO2_PLAY_TAILS                    0x0020    // Used in IXAudio2SourceVoice::Stop
-#define XAUDIO2_END_OF_STREAM                 0x0040    // Used in XAUDIO2_BUFFER.Flags
-#define XAUDIO2_SEND_USEFILTER                0x0080    // Used in XAUDIO2_SEND_DESCRIPTOR.Flags
-#define XAUDIO2_VOICE_NOSAMPLESPLAYED         0x0100    // Used in IXAudio2SourceVoice::GetState
-#define XAUDIO2_STOP_ENGINE_WHEN_IDLE         0x2000    // Used in XAudio2Create to force the engine to Stop when no source voices are Started, and Start when a voice is Started
-#define XAUDIO2_1024_QUANTUM                  0x8000    // Used in XAudio2Create to specify nondefault processing quantum of 21.33 ms (1024 samples at 48KHz)
-#define XAUDIO2_NO_VIRTUAL_AUDIO_CLIENT          0x10000   // Used in CreateMasteringVoice to create a virtual audio client
-
-#define WAVE_FORMAT_PCM 1
-
-		struct IXAudio2MasteringVoice : IXAudio2Voice
-		{
-			// NAME: IXAudio2MasteringVoice::GetChannelMask
-			// DESCRIPTION: Returns the channel mask for this voice
-			//
-			// ARGUMENTS:
-			//  pChannelMask - returns the channel mask for this voice.  This corresponds
-			//                 to the dwChannelMask member of WAVEFORMATEXTENSIBLE.
-			//
-			STDMETHOD(GetChannelMask) (THIS_ _Out_ DWORD* pChannelmask) PURE;
-		};
-
-		struct IXAudio2VoiceCallback
-		{
-			// Called just before this voice's processing pass begins.
-			STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired) PURE;
-
-			// Called just after this voice's processing pass ends.
-			STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS) PURE;
-
-			// Called when this voice has just finished playing a buffer stream
-			// (as marked with the XAUDIO2_END_OF_STREAM flag on the last buffer).
-			STDMETHOD_(void, OnStreamEnd) (THIS) PURE;
-
-			// Called when this voice is about to start processing a new buffer.
-			STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext) PURE;
-
-			// Called when this voice has just finished processing a buffer.
-			// The buffer can now be reused or destroyed.
-			STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext) PURE;
-
-			// Called when this voice has just reached the end position of a loop.
-			STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext) PURE;
-
-			// Called in the event of a critical error during voice processing,
-			// such as a failing xAPO or an error from the hardware XMA decoder.
-			// The voice may have to be destroyed and re-created to recover from
-			// the error.  The callback arguments report which buffer was being
-			// processed when the error occurred, and its HRESULT code.
-			STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error) PURE;
-		};
-
-		typedef enum _AUDIO_STREAM_CATEGORY
-		{
-			AudioCategory_Other = 0,
-			AudioCategory_ForegroundOnlyMedia,
-			AudioCategory_BackgroundCapableMedia,
-			AudioCategory_Communications,
-			AudioCategory_Alerts,
-			AudioCategory_SoundEffects,
-			AudioCategory_GameEffects,
-			AudioCategory_GameMedia,
-		} AUDIO_STREAM_CATEGORY;
-
-		typedef struct XAUDIO2_PERFORMANCE_DATA
-		{
-			// CPU usage information
-			UINT64 AudioCyclesSinceLastQuery;   // CPU cycles spent on audio processing since the
-												//  last call to StartEngine or GetPerformanceData.
-			UINT64 TotalCyclesSinceLastQuery;   // Total CPU cycles elapsed since the last call
-												//  (only counts the CPU XAudio2 is running on).
-			UINT32 MinimumCyclesPerQuantum;     // Fewest CPU cycles spent processing any one
-												//  audio quantum since the last call.
-			UINT32 MaximumCyclesPerQuantum;     // Most CPU cycles spent processing any one
-												//  audio quantum since the last call.
-
-												// Memory usage information
-			UINT32 MemoryUsageInBytes;          // Total heap space currently in use.
-
-												// Audio latency and glitching information
-			UINT32 CurrentLatencyInSamples;     // Minimum delay from when a sample is read from a
-												//  source buffer to when it reaches the speakers.
-			UINT32 GlitchesSinceEngineStarted;  // Audio dropouts since the engine was started.
-
-												// Data about XAudio2's current workload
-			UINT32 ActiveSourceVoiceCount;      // Source voices currently playing.
-			UINT32 TotalSourceVoiceCount;       // Source voices currently existing.
-			UINT32 ActiveSubmixVoiceCount;      // Submix voices currently playing/existing.
-
-			UINT32 ActiveResamplerCount;        // Resample xAPOs currently active.
-			UINT32 ActiveMatrixMixCount;        // MatrixMix xAPOs currently active.
-
-												// Usage of the hardware XMA decoder (Xbox 360 only)
-			UINT32 ActiveXmaSourceVoices;       // Number of source voices decoding XMA data.
-			UINT32 ActiveXmaStreams;            // A voice can use more than one XMA stream.
-		} XAUDIO2_PERFORMANCE_DATA;
-
-		typedef struct XAUDIO2_DEBUG_CONFIGURATION
-		{
-			UINT32 TraceMask;                   // Bitmap of enabled debug message types.
-			UINT32 BreakMask;                   // Message types that will break into the debugger.
-			BOOL LogThreadID;                   // Whether to log the thread ID with each message.
-			BOOL LogFileline;                   // Whether to log the source file and line number.
-			BOOL LogFunctionName;               // Whether to log the function name.
-			BOOL LogTiming;                     // Whether to log message timestamps.
-		} XAUDIO2_DEBUG_CONFIGURATION;
-
-		struct IXAudio2 : IUnknown
-		{
-			// NAME: IXAudio2::RegisterForCallbacks
-			// DESCRIPTION: Adds a new client to receive XAudio2's engine callbacks.
-			//
-			// ARGUMENTS:
-			//  pCallback - Callback interface to be called during each processing pass.
-			//
-			STDMETHOD(RegisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE;
-
-			// NAME: IXAudio2::UnregisterForCallbacks
-			// DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks.
-			//
-			// ARGUMENTS:
-			//  pCallback - Previously registered callback interface to be removed.
-			//
-			STDMETHOD_(void, UnregisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE;
-
-			// NAME: IXAudio2::CreateSourceVoice
-			// DESCRIPTION: Creates and configures a source voice.
-			//
-			// ARGUMENTS:
-			//  ppSourceVoice - Returns the new object's IXAudio2SourceVoice interface.
-			//  pSourceFormat - Format of the audio that will be fed to the voice.
-			//  Flags - XAUDIO2_VOICE flags specifying the source voice's behavior.
-			//  MaxFrequencyRatio - Maximum SetFrequencyRatio argument to be allowed.
-			//  pCallback - Optional pointer to a client-provided callback interface.
-			//  pSendList - Optional list of voices this voice should send audio to.
-			//  pEffectChain - Optional list of effects to apply to the audio data.
-			//
-			STDMETHOD(CreateSourceVoice) (THIS_ _Outptr_ IXAudio2SourceVoice** ppSourceVoice,
-				_In_ const WAVEFORMATEX* pSourceFormat,
-				UINT32 Flags X2DEFAULT(0),
-				float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO),
-				_In_opt_ IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-
-			// NAME: IXAudio2::CreateSubmixVoice
-			// DESCRIPTION: Creates and configures a submix voice.
-			//
-			// ARGUMENTS:
-			//  ppSubmixVoice - Returns the new object's IXAudio2SubmixVoice interface.
-			//  InputChannels - Number of channels in this voice's input audio data.
-			//  InputSampleRate - Sample rate of this voice's input audio data.
-			//  Flags - XAUDIO2_VOICE flags specifying the submix voice's behavior.
-			//  ProcessingStage - Arbitrary number that determines the processing order.
-			//  pSendList - Optional list of voices this voice should send audio to.
-			//  pEffectChain - Optional list of effects to apply to the audio data.
-			//
-			STDMETHOD(CreateSubmixVoice) (THIS_ _Outptr_ IXAudio2SubmixVoice** ppSubmixVoice,
-				UINT32 InputChannels, UINT32 InputSampleRate,
-				UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0),
-				_In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-
-
-			// NAME: IXAudio2::CreateMasteringVoice
-			// DESCRIPTION: Creates and configures a mastering voice.
-			//
-			// ARGUMENTS:
-			//  ppMasteringVoice - Returns the new object's IXAudio2MasteringVoice interface.
-			//  InputChannels - Number of channels in this voice's input audio data.
-			//  InputSampleRate - Sample rate of this voice's input audio data.
-			//  Flags - XAUDIO2_VOICE flags specifying the mastering voice's behavior.
-			//  szDeviceId - Identifier of the device to receive the output audio.
-			//  pEffectChain - Optional list of effects to apply to the audio data.
-			//  StreamCategory - The audio stream category to use for this mastering voice
-			//
-			STDMETHOD(CreateMasteringVoice) (THIS_ _Outptr_ IXAudio2MasteringVoice** ppMasteringVoice,
-				UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS),
-				UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE),
-				UINT32 Flags X2DEFAULT(0), _In_opt_z_ void* szDeviceId X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL),
-				_In_ AUDIO_STREAM_CATEGORY StreamCategory X2DEFAULT(AudioCategory_GameEffects)) PURE;
-
-			// NAME: IXAudio2::StartEngine
-			// DESCRIPTION: Creates and starts the audio processing thread.
-			//
-			STDMETHOD(StartEngine) (THIS) PURE;
-
-			// NAME: IXAudio2::StopEngine
-			// DESCRIPTION: Stops and destroys the audio processing thread.
-			//
-			STDMETHOD_(void, StopEngine) (THIS) PURE;
-
-			// NAME: IXAudio2::CommitChanges
-			// DESCRIPTION: Atomically applies a set of operations previously tagged
-			//              with a given identifier.
-			//
-			// ARGUMENTS:
-			//  OperationSet - Identifier of the set of operations to be applied.
-			//
-			STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE;
-
-			// NAME: IXAudio2::GetPerformanceData
-			// DESCRIPTION: Returns current resource usage details: memory, CPU, etc.
-			//
-			// ARGUMENTS:
-			//  pPerfData - Returns the performance data structure.
-			//
-			STDMETHOD_(void, GetPerformanceData) (THIS_ _Out_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE;
-
-			// NAME: IXAudio2::SetDebugConfiguration
-			// DESCRIPTION: Configures XAudio2's debug output (in debug builds only).
-			//
-			// ARGUMENTS:
-			//  pDebugConfiguration - Structure describing the debug output behavior.
-			//  pReserved - Optional parameter; must be NULL.
-			//
-			STDMETHOD_(void, SetDebugConfiguration) (THIS_ _In_opt_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration,
-				_Reserved_ void* pReserved X2DEFAULT(NULL)) PURE;
-		};
-
-		struct IXAudio2_7 : IUnknown
-		{
-
-			// NAME: IXAudio2::GetDeviceCount
-			// DESCRIPTION: Returns the number of audio output devices available.
-			//
-			// ARGUMENTS:
-			//  pCount - Returns the device count.
-			//
-			STDMETHOD(GetDeviceCount) (THIS_ UINT32* pCount) PURE;
-
-			// NAME: IXAudio2::GetDeviceDetails
-			// DESCRIPTION: Returns information about the device with the given index.
-			//
-			// ARGUMENTS:
-			//  Index - Index of the device to be queried.
-			//  pDeviceDetails - Returns the device details.
-			//
-			STDMETHOD(GetDeviceDetails) (THIS_ UINT32 Index, void* pDeviceDetails) PURE;
-
-			// NAME: IXAudio2::Initialize
-			// DESCRIPTION: Sets global XAudio2 parameters and prepares it for use.
-			//
-			// ARGUMENTS:
-			//  Flags - Flags specifying the XAudio2 object's behavior.  Currently unused.
-			//  XAudio2Processor - An XAUDIO2_PROCESSOR enumeration value that specifies
-			//  the hardware thread (Xbox) or processor (Windows) that XAudio2 will use.
-			//  The enumeration values are platform-specific; platform-independent code
-			//  can use XAUDIO2_DEFAULT_PROCESSOR to use the default on each platform.
-			//
-			STDMETHOD(Initialize) (THIS_ UINT32 Flags X2DEFAULT(0), UINT32 XAudio2Processor = 0x00000001) PURE;
-
-			// NAME: IXAudio2::RegisterForCallbacks
-			// DESCRIPTION: Adds a new client to receive XAudio2's engine callbacks.
-			//
-			// ARGUMENTS:
-			//  pCallback - Callback interface to be called during each processing pass.
-			//
-			STDMETHOD(RegisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE;
-
-			// NAME: IXAudio2::UnregisterForCallbacks
-			// DESCRIPTION: Removes an existing receiver of XAudio2 engine callbacks.
-			//
-			// ARGUMENTS:
-			//  pCallback - Previously registered callback interface to be removed.
-			//
-			STDMETHOD_(void, UnregisterForCallbacks) (_In_ IXAudio2EngineCallback* pCallback) PURE;
-
-			// NAME: IXAudio2::CreateSourceVoice
-			// DESCRIPTION: Creates and configures a source voice.
-			//
-			// ARGUMENTS:
-			//  ppSourceVoice - Returns the new object's IXAudio2SourceVoice interface.
-			//  pSourceFormat - Format of the audio that will be fed to the voice.
-			//  Flags - XAUDIO2_VOICE flags specifying the source voice's behavior.
-			//  MaxFrequencyRatio - Maximum SetFrequencyRatio argument to be allowed.
-			//  pCallback - Optional pointer to a client-provided callback interface.
-			//  pSendList - Optional list of voices this voice should send audio to.
-			//  pEffectChain - Optional list of effects to apply to the audio data.
-			//
-			STDMETHOD(CreateSourceVoice) (THIS_ _Outptr_ IXAudio2SourceVoice** ppSourceVoice,
-				_In_ const WAVEFORMATEX* pSourceFormat,
-				UINT32 Flags X2DEFAULT(0),
-				float MaxFrequencyRatio X2DEFAULT(XAUDIO2_DEFAULT_FREQ_RATIO),
-				_In_opt_ IXAudio2VoiceCallback* pCallback X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-
-			// NAME: IXAudio2::CreateSubmixVoice
-			// DESCRIPTION: Creates and configures a submix voice.
-			//
-			// ARGUMENTS:
-			//  ppSubmixVoice - Returns the new object's IXAudio2SubmixVoice interface.
-			//  InputChannels - Number of channels in this voice's input audio data.
-			//  InputSampleRate - Sample rate of this voice's input audio data.
-			//  Flags - XAUDIO2_VOICE flags specifying the submix voice's behavior.
-			//  ProcessingStage - Arbitrary number that determines the processing order.
-			//  pSendList - Optional list of voices this voice should send audio to.
-			//  pEffectChain - Optional list of effects to apply to the audio data.
-			//
-			STDMETHOD(CreateSubmixVoice) (THIS_ _Outptr_ IXAudio2Voice** ppSubmixVoice,
-				UINT32 InputChannels, UINT32 InputSampleRate,
-				UINT32 Flags X2DEFAULT(0), UINT32 ProcessingStage X2DEFAULT(0),
-				_In_opt_ const XAUDIO2_VOICE_SENDS* pSendList X2DEFAULT(NULL),
-				_In_opt_ const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-
-
-			// NAME: IXAudio2::CreateMasteringVoice
-			// DESCRIPTION: Creates and configures a mastering voice.
-			//
-			// ARGUMENTS:
-			//  ppMasteringVoice - Returns the new object's IXAudio2MasteringVoice interface.
-			//  InputChannels - Number of channels in this voice's input audio data.
-			//  InputSampleRate - Sample rate of this voice's input audio data.
-			//  Flags - XAUDIO2_VOICE flags specifying the mastering voice's behavior.
-			//  DeviceIndex - Identifier of the device to receive the output audio.
-			//  pEffectChain - Optional list of effects to apply to the audio data.
-			//
-			STDMETHOD(CreateMasteringVoice) (THIS_ IXAudio2MasteringVoice** ppMasteringVoice,
-				UINT32 InputChannels X2DEFAULT(XAUDIO2_DEFAULT_CHANNELS),
-				UINT32 InputSampleRate X2DEFAULT(XAUDIO2_DEFAULT_SAMPLERATE),
-				UINT32 Flags X2DEFAULT(0), UINT32 DeviceIndex X2DEFAULT(0),
-				const XAUDIO2_EFFECT_CHAIN* pEffectChain X2DEFAULT(NULL)) PURE;
-
-			// NAME: IXAudio2::StartEngine
-			// DESCRIPTION: Creates and starts the audio processing thread.
-			//
-			STDMETHOD(StartEngine) (THIS) PURE;
-
-			// NAME: IXAudio2::StopEngine
-			// DESCRIPTION: Stops and destroys the audio processing thread.
-			//
-			STDMETHOD_(void, StopEngine) (THIS) PURE;
-
-			// NAME: IXAudio2::CommitChanges
-			// DESCRIPTION: Atomically applies a set of operations previously tagged
-			//              with a given identifier.
-			//
-			// ARGUMENTS:
-			//  OperationSet - Identifier of the set of operations to be applied.
-			//
-			STDMETHOD(CommitChanges) (THIS_ UINT32 OperationSet) PURE;
-
-			// NAME: IXAudio2::GetPerformanceData
-			// DESCRIPTION: Returns current resource usage details: memory, CPU, etc.
-			//
-			// ARGUMENTS:
-			//  pPerfData - Returns the performance data structure.
-			//
-			STDMETHOD_(void, GetPerformanceData) (THIS_ _Out_ XAUDIO2_PERFORMANCE_DATA* pPerfData) PURE;
-
-			// NAME: IXAudio2::SetDebugConfiguration
-			// DESCRIPTION: Configures XAudio2's debug output (in debug builds only).
-			//
-			// ARGUMENTS:
-			//  pDebugConfiguration - Structure describing the debug output behavior.
-			//  pReserved - Optional parameter; must be NULL.
-			//
-			STDMETHOD_(void, SetDebugConfiguration) (THIS_ _In_opt_ const XAUDIO2_DEBUG_CONFIGURATION* pDebugConfiguration,
-				_Reserved_ void* pReserved X2DEFAULT(NULL)) PURE;
-		};
-
-#pragma pack(pop)
-
-#define AUDIO_CHANNELS 2
-
-		//Windows 7 has no XAudio by default , it is taken from DX sdk and its loaded using COM...
-		bool xnAudioWindows7Hacks = false;
-
-		void* xnHrtfApoLib;
-
-		typedef IID *LPIID;
-		IID xnHrtfParamsIID;
-
-#ifdef WINDOWS_DESKTOP
-		void* xnXAudioLib;
-		typedef /* [unique] */ IUnknown *LPUNKNOWN;
-		typedef void *LPVOID;
-		typedef GUID IID;
-#define REFCLSID const IID &
-		extern HRESULT __stdcall CoCreateInstance(_In_ REFCLSID rclsid, _In_opt_ LPUNKNOWN pUnkOuter, _In_ DWORD dwClsContext, _In_ REFIID riid, LPVOID* ppv);
-
-		typedef IID *LPIID;
-		typedef wchar_t WCHAR;
-		typedef WCHAR OLECHAR;
-		typedef /* [string] */  const OLECHAR *LPCOLESTR;
-
-		extern HRESULT __stdcall IIDFromString(_In_ LPCOLESTR lpsz, _Out_ LPIID lpiid);
-#endif
-
-		DLL_EXPORT_API npBool xnAudioInit()
-		{
-			CoInitializeEx(NULL, 0x0);
-
-			//On Windows, not desktop platforms we are using XAudio2.lib
-			//On Windows Desktop it's more complicated specially because Windows 7, we try from 2.9 to 2.7 (COM loaded)
-
-#ifdef WINDOWS_DESKTOP
-			xnXAudioLib = LoadDynamicLibrary("XAudio2_9"); //win10+
-			xnHrtfApoLib = LoadDynamicLibrary("HrtfApo"); //win10+
-			
-			if (!xnXAudioLib) xnXAudioLib = LoadDynamicLibrary("XAudio2_8"); //win8+
-			
-			if(xnXAudioLib)
-			{
-				XAudio2CreateFunc = (XAudio2CreatePtr)GetSymbolAddress(xnXAudioLib, "XAudio2Create");
-				if (!XAudio2CreateFunc) return false;
-
-				if(xnHrtfApoLib)
-				{
-					CreateHrtfApoFunc = (CreateHrtfApoPtr)GetSymbolAddress(xnHrtfApoLib, "CreateHrtfApo");
-					IIDFromString(L"{15B3CD66-E9DE-4464-B6E6-2BC3CF63D455}", &xnHrtfParamsIID);
-				}
-			}
-			else
-			{
-				xnAudioWindows7Hacks = true;
-
-				//also load X3daudio
-				xnXAudioLib = LoadDynamicLibrary("X3DAudio1_7");
-				if (!xnXAudioLib) return false;
-            }
-			
-			if (!xnXAudioLib) return false;
-
-			X3DAudioInitializeFunc = (X3DAudioInitializePtr)GetSymbolAddress(xnXAudioLib, "X3DAudioInitialize");
-			if (!X3DAudioInitializeFunc) return false;
-			X3DAudioCalculateFunc = (X3DAudioCalculatePtr)GetSymbolAddress(xnXAudioLib, "X3DAudioCalculate");
-			if (!X3DAudioCalculateFunc) return false;
-#endif
-
-			return true;
-		}
-
-		struct xnAudioDevice
-		{
-			IXAudio2* x_audio2_;
-			IXAudio2_7* x_audio2_7_;
-			X3DAUDIO_HANDLE x3_audio_;
-			IXAudio2MasteringVoice* mastering_voice_;
-			bool hrtf_;
-		};
-
-		struct xnAudioSource;
-		DLL_EXPORT_API void xnAudioSourceStop(xnAudioSource* source);
-
-		struct xnAudioBuffer
-		{
-			XAUDIO2_BUFFER buffer_;
-			int length_;
-			BufferType type_;
-		};
-
-		struct xnAudioListener
-		{
-			xnAudioDevice* device_;
-			X3DAUDIO_LISTENER listener_;
-			Matrix worldTransform_;
-		};
-
-		enum xnAudioDeviceFlags
-		{
-			xnAudioDeviceFlagsNone,
-			xnAudioDeviceFlagsHrtf
-		};
-
-		DLL_EXPORT_API xnAudioDevice* xnAudioCreate(void* deviceName, xnAudioDeviceFlags flags) //Device name is actually LPCWSTR, on C# side encoding is Unicode!
-		{
-			xnAudioDevice* res = new xnAudioDevice;
-
-			HRESULT result;
-
-#ifdef WINDOWS_DESKTOP
-			if(xnAudioWindows7Hacks)
-			{
-#define CLSCTX_INPROC_SERVER 0x1
-				IID cid, iid;
-				IIDFromString(L"{5a508685-a254-4fba-9b82-9a24b00306af}", &cid);
-				IIDFromString(L"{8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb}", &iid);
-				result = CoCreateInstance(cid, NULL, CLSCTX_INPROC_SERVER, iid, (void**)&res->x_audio2_7_);
-				if (FAILED(result))
-				{
-					printf("CoCreateInstance failed to create XAudio2 instance.\n");
-					delete res;
-					return NULL;
-				}
-
-				result = res->x_audio2_7_->Initialize(0, 0x00000001);
-				if (FAILED(result))
-				{
-					printf("Failed to init XAudio2 instance.\n");
-					delete res;
-					return NULL;
-				}
-
-				result = res->x_audio2_7_->CreateMasteringVoice(&res->mastering_voice_, AUDIO_CHANNELS);
-				if (FAILED(result))
-				{
-					printf("Failed to create XAudio2 MasteringVoice.\n");
-					delete res;
-					return NULL;
-				}
-
-				result = res->x_audio2_7_->StartEngine();
-				if (FAILED(result))
-				{
-					printf("Failed to create start XAudio2 engine.\n");
-					delete res;
-					return NULL;
-				}
-			}
-			else
-#endif
-			{
-				res->hrtf_ = xnHrtfApoLib && (flags & xnAudioDeviceFlagsHrtf);
-
-				//XAudio2, no flags, processor 1
-				result = XAudio2CreateFunc(reinterpret_cast<void**>(&res->x_audio2_), res->hrtf_ ? XAUDIO2_1024_QUANTUM : 0, 0x00000001);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-
-				//this means opening the real audio device, which will be virtual actually so in the case of default device change Xaudio will deal with it for us.
-				result = res->x_audio2_->CreateMasteringVoice(&res->mastering_voice_, AUDIO_CHANNELS, 0, 0, deviceName);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-
-				//start audio rendering
-				result = res->x_audio2_->StartEngine();
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}		
-			}
-
-			//X3DAudio
-			result = X3DAudioInitializeFunc(SPEAKER_STEREO, SPEED_OF_SOUND, res->x3_audio_);
-			if (FAILED(result))
-			{
-				delete res;
-				return NULL;
-			}
-
-			return res;
-		}
-
-		DLL_EXPORT_API void xnAudioDestroy(xnAudioDevice* device)
-		{
-			if(xnAudioWindows7Hacks)
-			{
-				device->x_audio2_7_->StopEngine();
-			}
-			else
-			{
-				device->x_audio2_->StopEngine();
-			}
-
-			device->mastering_voice_->DestroyVoice();
-			
-			delete device;
-		}
-
-		DLL_EXPORT_API void xnAudioUpdate(xnAudioDevice* device)
-		{
-		}
-
-		DLL_EXPORT_API void xnAudioSetMasterVolume(xnAudioDevice* device, float volume)
-		{
-			device->mastering_voice_->SetVolume(volume);
-		}
-
-		DLL_EXPORT_API xnAudioListener* xnAudioListenerCreate(xnAudioDevice* device)
-		{
-			auto res = new xnAudioListener;
-			res->device_ = device;
-			memset(&res->listener_, 0x0, sizeof(X3DAUDIO_LISTENER));
-			return res;
-		}
-
-		DLL_EXPORT_API void xnAudioListenerDestroy(xnAudioListener* listener)
-		{
-			delete listener;
-		}
-
-		DLL_EXPORT_API npBool xnAudioListenerEnable(xnAudioListener* listener)
-		{
-			//unused in Xaudio2
-			(void)listener;
-			return true;
-		}
-
-		DLL_EXPORT_API void xnAudioListenerDisable(xnAudioListener* listener)
-		{
-			//unused in Xaudio2
-			(void)listener;
-		}
-
-		struct xnAudioSource : IXAudio2VoiceCallback
-		{
-			IXAudio2MasteringVoice* mastering_voice_;
-			IXAudio2SourceVoice* source_voice_;
-			X3DAUDIO_EMITTER* emitter_;
-			X3DAUDIO_DSP_SETTINGS* dsp_settings_;
-			IXAPOHrtfParameters* hrtf_params_;
-			xnAudioListener* listener_;
-			volatile bool playing_;
-			volatile bool pause_;
-			volatile bool looped_;
-			int sampleRate_;
-			bool mono_;
-			bool streamed_;
-			volatile float pitch_ = 1.0f;
-			volatile float doppler_pitch_ = 1.0f;
-
-			SpinLock bufferLock_;
-			SpinLock apply3DLock_;
-			xnAudioBuffer** freeBuffers_;
-			int freeBuffersMax_;
-
-			XAUDIO2_BUFFER single_buffer_;
-
-			volatile int samplesAtBegin = 0;
-
-			void __stdcall OnVoiceProcessingPassStart(UINT32 BytesRequired) override;
-
-			void __stdcall OnVoiceProcessingPassEnd() override;
-
-			void __stdcall OnStreamEnd() override;
-
-			void __stdcall OnBufferStart(void* context) override;
-
-			void __stdcall OnBufferEnd(void* context) override;
-
-			void __stdcall OnLoopEnd(void* context) override;
-
-			void __stdcall OnVoiceError(void* context, HRESULT error) override;
-
-			void GetState(XAUDIO2_VOICE_STATE* state)
-			{
-				if (xnAudioWindows7Hacks)
-				{
-					auto win7Voice = reinterpret_cast<IXAudio2SourceVoice1*>(source_voice_);
-					win7Voice->GetState(state);
-				}
-				else
-				{
-					source_voice_->GetState(state, 0);
-				}
-			}
-		};
-
-		DLL_EXPORT_API xnAudioSource* xnAudioSourceCreate(xnAudioListener* listener, int sampleRate, int maxNBuffers, npBool mono, npBool spatialized, npBool streamed, npBool hrtf, float directionFactor, HrtfEnvironment environment)
-		{
-			(void)streamed;
-
-			auto res = new xnAudioSource;
-			res->hrtf_params_ = NULL;
-			res->listener_ = listener;
-			res->playing_ = false;
-			res->sampleRate_ = sampleRate;
-			res->mono_ = mono;
-			res->streamed_ = streamed;
-			res->looped_ = false;
-			res->mastering_voice_ = listener->device_->mastering_voice_;
-			if((spatialized && !hrtf) || (hrtf && !res->listener_->device_->hrtf_))
-			{
-				//if spatialized we also need those structures to calculate 3D audio
-				res->emitter_ = new X3DAUDIO_EMITTER;
-				memset(res->emitter_, 0x0, sizeof(X3DAUDIO_EMITTER));
-				res->emitter_->ChannelCount = 1;
-				res->emitter_->CurveDistanceScaler = 1;
-				res->emitter_->DopplerScaler = 1;
-
-				res->dsp_settings_ = new X3DAUDIO_DSP_SETTINGS;
-				memset(res->dsp_settings_, 0x0, sizeof(X3DAUDIO_DSP_SETTINGS));
-				res->dsp_settings_->SrcChannelCount = 1;
-				res->dsp_settings_->DstChannelCount = AUDIO_CHANNELS;
-				res->dsp_settings_->pMatrixCoefficients = new float[AUDIO_CHANNELS];
-				res->dsp_settings_->pDelayTimes = new float[AUDIO_CHANNELS];
-			}
-			else
-			{
-				res->emitter_ = NULL;
-				res->dsp_settings_ = NULL;
-			}
-
-			//we could have used a tinystl vector but it did not link properly on ARM windows... so we just use an array
-			res->freeBuffers_ = new xnAudioBuffer*[maxNBuffers];
-			res->freeBuffersMax_ = maxNBuffers;
-			for (auto i = 0; i < maxNBuffers; i++)
-			{
-				res->freeBuffers_[i] = NULL;
-			}
-
-			//Normal PCM formal 16 bit shorts
-			WAVEFORMATEX pcmWaveFormat = {};
-			pcmWaveFormat.wFormatTag = WAVE_FORMAT_PCM;
-			pcmWaveFormat.nChannels = mono ? 1 : 2;
-			pcmWaveFormat.nSamplesPerSec = sampleRate;
-			pcmWaveFormat.nAvgBytesPerSec = sampleRate * pcmWaveFormat.nChannels * sizeof(short);
-			pcmWaveFormat.wBitsPerSample = 16;
-			pcmWaveFormat.nBlockAlign = pcmWaveFormat.nChannels * pcmWaveFormat.wBitsPerSample / 8;
-
-			if(xnAudioWindows7Hacks)
-			{
-				HRESULT result = listener->device_->x_audio2_7_->CreateSourceVoice(&res->source_voice_, &pcmWaveFormat, 0, XAUDIO2_MAX_FREQ_RATIO, res);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-			}
-			else
-			{
-				HRESULT result = listener->device_->x_audio2_->CreateSourceVoice(&res->source_voice_, &pcmWaveFormat, 0, XAUDIO2_MAX_FREQ_RATIO, res);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-			}
-
-			if (spatialized && res->listener_->device_->hrtf_ && hrtf)
-			{
-				IXAudio2SubmixVoice* submixVoice = NULL;
-
-				HrtfApoInit params = {};
-				HrtfDirectivity directivity;
-				directivity.type = OmniDirectional;
-				directivity.scaling = directionFactor;
-				params.directivity = &directivity;
-
-				IUnknown* apoRoot;
-				HRESULT result = CreateHrtfApoFunc(&params, &apoRoot);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-
-				apoRoot->QueryInterface(xnHrtfParamsIID, reinterpret_cast<void**>(&res->hrtf_params_));
-					
-				XAUDIO2_EFFECT_DESCRIPTOR fxDesc{};
-				fxDesc.InitialState = true;
-				fxDesc.OutputChannels = 2; // Stereo output
-				fxDesc.pEffect = res->hrtf_params_; // HRTF xAPO set as the effect.
-
-				XAUDIO2_EFFECT_CHAIN fxChain{};
-				fxChain.EffectCount = 1;
-				fxChain.pEffectDescriptors = &fxDesc;
-
-				XAUDIO2_VOICE_SENDS sends = {};
-				XAUDIO2_SEND_DESCRIPTOR sendDesc = {};
-				sendDesc.pOutputVoice = res->mastering_voice_;
-				sends.SendCount = 1;
-				sends.pSends = &sendDesc;
-
-				// HRTF APO expects mono 48kHz input, so we configure the submix voice for that format.
-				result = listener->device_->x_audio2_->CreateSubmixVoice(&submixVoice, 1, 48000, 0, 0, &sends, &fxChain);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-
-				res->hrtf_params_->SetEnvironment(environment);
-
-				XAUDIO2_VOICE_SENDS voice_sends = {};
-				XAUDIO2_SEND_DESCRIPTOR voice_sendDesc = {};
-				voice_sendDesc.pOutputVoice = submixVoice;
-				voice_sends.SendCount = 1;
-				voice_sends.pSends = &voice_sendDesc;
-				result = res->source_voice_->SetOutputVoices(&voice_sends);
-				if (FAILED(result))
-				{
-					delete res;
-					return NULL;
-				}
-			}
-
-			return res;
-		}
-
-		DLL_EXPORT_API void xnAudioSourceDestroy(xnAudioSource* source)
-		{
-			source->source_voice_->Stop();
-			source->source_voice_->DestroyVoice();
-			if (source->emitter_) delete source->emitter_;
-			if (source->dsp_settings_)
-			{		
-				delete[] source->dsp_settings_->pMatrixCoefficients;
-				delete[] source->dsp_settings_->pDelayTimes;
-				delete source->dsp_settings_;
-			}
-			delete source;
-		}
-
-		DLL_EXPORT_API void xnAudioSourceSetLooping(xnAudioSource* source, npBool looping)
-		{
-			source->looped_ = looping;
-
-			if (!source->streamed_)
-			{
-				if (!source->looped_)
-				{
-					source->single_buffer_.LoopBegin = 0;
-					source->single_buffer_.LoopLength = 0;
-					source->single_buffer_.LoopCount = 0;
-					source->single_buffer_.Flags = XAUDIO2_END_OF_STREAM;
-				}
-				else
-				{
-					source->single_buffer_.LoopBegin = source->single_buffer_.PlayBegin;
-					source->single_buffer_.LoopLength = source->single_buffer_.PlayLength;
-					source->single_buffer_.LoopCount = XAUDIO2_LOOP_INFINITE;
-					source->single_buffer_.Flags = 0;
-				}
-
-				source->source_voice_->FlushSourceBuffers();
-				source->source_voice_->SubmitSourceBuffer(&source->single_buffer_, NULL);
-			}
-		}
-
-		DLL_EXPORT_API void xnAudioSourceSetBuffer(xnAudioSource* source, xnAudioBuffer* buffer)
-		{
-			//this function is called only when the audio source is acutally fully cached in memory, so we deal only with the first buffer
-			source->streamed_ = false;
-			source->freeBuffers_[0] = buffer;
-			memcpy(&source->single_buffer_, &buffer->buffer_, sizeof(XAUDIO2_BUFFER));
-			source->source_voice_->SubmitSourceBuffer(&source->single_buffer_, NULL);
-		}
-
-		DLL_EXPORT_API xnAudioBuffer* xnAudioSourceGetFreeBuffer(xnAudioSource* source)
-		{
-			//this is used only when we are streaming audio, to fetch the next free buffer to fill
-			source->bufferLock_.Lock();
-
-			xnAudioBuffer* buffer = NULL;
-			for (int i = 0; i < source->freeBuffersMax_; i++)
-			{
-				if (source->freeBuffers_[i] != NULL)
-				{
-					buffer = source->freeBuffers_[i];
-					source->freeBuffers_[i] = NULL;
-					break;
-				}
-			}
-			
-			source->bufferLock_.Unlock();
-			
-			return buffer;
-		}
-
-		DLL_EXPORT_API void xnAudioSourcePlay(xnAudioSource* source)
-		{
-			source->source_voice_->Start();
-			source->playing_ = true;
-
-			if(!source->streamed_ && !source->pause_)
-			{
-				XAUDIO2_VOICE_STATE state;
-				source->GetState(&state);
-				source->samplesAtBegin = state.SamplesPlayed;
-			}
-
-			source->pause_ = false;
-		}
-
-		DLL_EXPORT_API void xnAudioSourceSetPan(xnAudioSource* source, float pan)
-		{
-			if (source->mono_)
-			{
-				float panning[2];
-				if (pan < 0)
-				{
-					panning[0] = 1.0f;
-					panning[1] = 1.0f + pan;
-				}
-				else
-				{
-					panning[0] = 1.0f - pan;
-					panning[1] = 1.0f;
-				}
-				source->source_voice_->SetOutputMatrix(source->mastering_voice_, 1, AUDIO_CHANNELS, panning);
-			}
-			else
-			{
-				float panning[4];
-				if (pan < 0)
-				{
-					panning[0] = 1.0f;
-					panning[1] = 0.0f;
-					panning[2] = 0.0f;
-					panning[3] = 1.0f + pan;
-				}
-				else
-				{
-					panning[0] = 1.0f - pan;
-					panning[1] = 0.0f;
-					panning[2] = 0.0f;
-					panning[3] = 1.0f;
-				}
-				source->source_voice_->SetOutputMatrix(source->mastering_voice_, 2, AUDIO_CHANNELS, panning);
-			}
-		}
-
-		DLL_EXPORT_API double xnAudioSourceGetPosition(xnAudioSource* source)
-		{
-			XAUDIO2_VOICE_STATE state;
-			source->GetState(&state);
-
-			if (!source->streamed_)
-				return double(source->single_buffer_.PlayBegin + state.SamplesPlayed - source->samplesAtBegin) / double(source->sampleRate_);
-			
-			//things work different for streamed sources, but anyway we simply subtract the snapshotted samples at begin of the stream ( could be the begin of the loop )
-			return double(state.SamplesPlayed - source->samplesAtBegin) / double(source->sampleRate_);
-		}
-
-		DLL_EXPORT_API void xnAudioSourceSetRange(xnAudioSource* source, double startTime, double stopTime)
-		{
-			if(!source->streamed_)
-			{
-				auto singleBuffer = source->freeBuffers_[0];
-				if(startTime == 0 && stopTime == 0)
-				{
-					source->single_buffer_.PlayBegin = 0;
-					source->single_buffer_.PlayLength = singleBuffer->length_;
-				}
-				else
-				{					
-					auto sampleStart = int(double(source->sampleRate_) * startTime);
-					auto sampleStop = int(double(source->sampleRate_) * stopTime);
-
-					if (sampleStart > singleBuffer->length_)
-					{
-						return; //the starting position must be less then the total length of the buffer
-					}
-
-					if (sampleStop > singleBuffer->length_) //if the end point is more then the length of the buffer fix the value
-					{
-						sampleStop = singleBuffer->length_;
-					}
-
-					auto len = sampleStop - sampleStart;
-					if (len > 0)
-					{
-						source->single_buffer_.PlayBegin = sampleStart;
-						source->single_buffer_.PlayLength = len;
-					}
-				}
-
-				//sort looping properties and re-submit buffer
-				source->source_voice_->Stop();
-				xnAudioSourceSetLooping(source, source->looped_);
-			}
-		}
-
-		DLL_EXPORT_API void xnAudioSourceSetGain(xnAudioSource* source, float gain)
-		{
-			source->source_voice_->SetVolume(gain);
-		}
-
-		DLL_EXPORT_API void xnAudioSourceSetPitch(xnAudioSource* source, float pitch)
-		{
-			source->pitch_ = pitch;
-			source->source_voice_->SetFrequencyRatio(source->doppler_pitch_ * source->pitch_);
-		}
-
-        void xnAudioSource::OnVoiceProcessingPassStart(unsigned BytesRequired)
-		{
-		}
-
-        void xnAudioSource::OnVoiceProcessingPassEnd()
-		{
-		}
-
-        void xnAudioSource::OnStreamEnd()
-		{
-			if (playing_)
-			{
-				if (streamed_)
-				{
-					//buffer was flagged as end of stream
-					//looping is handled by the streamer, in the top level layer
-					xnAudioSourceStop(this);
-				}
-				else if (!looped_)
-				{
-					playing_ = false;
-					pause_ = false;
-				}
-			}
-		}
-
-        void xnAudioSource::OnBufferStart(void* context)
-		{
-			if (streamed_)
-			{
-				auto buffer = static_cast<xnAudioBuffer*>(context);
-
-				if (buffer->type_ == BeginOfStream)
-				{
-					//we need this info to compute position of stream
-					XAUDIO2_VOICE_STATE state;
-					GetState(&state);
-
-					samplesAtBegin = state.SamplesPlayed;
-				}
-			}
-		}
-
-		void xnAudioSource::OnBufferEnd(void* context)
-		{
-			if (streamed_)
-			{
-				auto buffer = static_cast<xnAudioBuffer*>(context);
-
-				bufferLock_.Lock();
-
-				for (int i = 0; i < freeBuffersMax_; i++)
-				{
-					if (freeBuffers_[i] == NULL)
-					{
-						freeBuffers_[i] = buffer;
-						break;
-					}
-				}
-
-				bufferLock_.Unlock();
-			}			
-		}
-
-        void xnAudioSource::OnLoopEnd(void* context)
-		{
-			if (!streamed_)
-			{
-				XAUDIO2_VOICE_STATE state;
-				GetState(&state);
-
-				samplesAtBegin = state.SamplesPlayed;
-			}
-		}
-
-		DLL_EXPORT_API void xnAudioSourceQueueBuffer(xnAudioSource* source, xnAudioBuffer* buffer, short* pcm, int bufferSize, BufferType type)
-		{
-			//used only when streaming, to fill a buffer, often..
-			source->streamed_ = true;
-
-			//flag the stream
-			buffer->buffer_.Flags = type == EndOfStream ? XAUDIO2_END_OF_STREAM : 0;
-			buffer->type_ = type;
-			
-			buffer->length_ = buffer->buffer_.AudioBytes = bufferSize;
-			memcpy(const_cast<char*>(buffer->buffer_.pAudioData), pcm, bufferSize);
-			source->source_voice_->SubmitSourceBuffer(&buffer->buffer_);
-		}
-
-		DLL_EXPORT_API void xnAudioSourcePause(xnAudioSource* source)
-		{
-			source->source_voice_->Stop();
-			source->playing_ = false;
-			source->pause_ = true;
-		}
-
-		XMFLOAT3::XMFLOAT3(): x(0), y(0), z(0)
-		{
-		}
-
-		XMFLOAT3::XMFLOAT3(float _x, float _y, float _z): x(_x), y(_y), z(_z)
-		{
-		}
-
-		XMFLOAT3::XMFLOAT3(const float* pArray): x(pArray[0]), y(pArray[1]), z(pArray[2])
-		{
-		}
-
-		XMFLOAT3& XMFLOAT3::operator=(const XMFLOAT3& Float3)
-		{
-			x = Float3.x;
-			y = Float3.y;
-			z = Float3.z;
-			return *this;
-		}
-
-		DLL_EXPORT_API void xnAudioSourceFlushBuffers(xnAudioSource* source)
-		{
-			source->apply3DLock_.Lock();
-
-			source->source_voice_->FlushSourceBuffers();
-
-			source->apply3DLock_.Unlock();
-		}
-
-		DLL_EXPORT_API void xnAudioSourceStop(xnAudioSource* source)
-		{
-			source->apply3DLock_.Lock();
-
-			source->source_voice_->Stop();
-			source->source_voice_->FlushSourceBuffers();
-			source->playing_ = false;
-			source->pause_ = false;
-
-			//since we flush we also rebuffer in this case
-			if (!source->streamed_)
-			{
-				source->source_voice_->SubmitSourceBuffer(&source->single_buffer_, NULL);
-			}
-
-			source->apply3DLock_.Unlock();
-		}
-
-		DLL_EXPORT_API void xnAudioListenerPush3D(xnAudioListener* listener, float* pos, float* forward, float* up, float* vel, Matrix* worldTransform)
-		{
-			memcpy(&listener->listener_.Position, pos, sizeof(float) * 3);
-			memcpy(&listener->listener_.Velocity, vel, sizeof(float) * 3);
-			memcpy(&listener->listener_.OrientFront, forward, sizeof(float) * 3);
-			memcpy(&listener->listener_.OrientTop, up, sizeof(float) * 3);
-			memcpy(&listener->worldTransform_, worldTransform, sizeof(Matrix));
-		}
-
-		DLL_EXPORT_API void xnAudioSourcePush3D(xnAudioSource* source, float* pos, float* forward, float* up, float* vel, Matrix* worldTransform)
-		{
-			if(source->hrtf_params_)
-			{
-				Matrix localTransform;
-				Matrix invListener;
-				memcpy(&invListener, &source->listener_->worldTransform_, sizeof(Matrix));
-				xnMatrixInvert(&invListener);
-				xnMatrixMultiply(worldTransform, &invListener, &localTransform);
-
-				HrtfPosition hrtfEmitterPos{ localTransform.Flat.M41, localTransform.Flat.M42, localTransform.Flat.M43 };
-				source->hrtf_params_->SetSourcePosition(&hrtfEmitterPos);
-
-				//set orientation, relative to head, already computed c# side, todo c++ side
-				HrtfOrientation hrtfEmitterRot { 
-					localTransform.Flat.M11, localTransform.Flat.M12, localTransform.Flat.M13,
-					localTransform.Flat.M21, localTransform.Flat.M22, localTransform.Flat.M23,
-					localTransform.Flat.M31, localTransform.Flat.M32, localTransform.Flat.M33 };
-				source->hrtf_params_->SetSourceOrientation(&hrtfEmitterRot);
-			}
-			else
-			{
-				if (!source->emitter_) return;
-
-				memcpy(&source->emitter_->Position, pos, sizeof(float) * 3);
-				memcpy(&source->emitter_->Velocity, vel, sizeof(float) * 3);
-				memcpy(&source->emitter_->OrientFront, forward, sizeof(float) * 3);
-				memcpy(&source->emitter_->OrientTop, up, sizeof(float) * 3);
-
-				source->apply3DLock_.Lock(); //todo is that really needed?
-
-				//everything is calculated by Xaudio for us
-				X3DAudioCalculateFunc(source->listener_->device_->x3_audio_, &source->listener_->listener_, source->emitter_,
-					X3DAUDIO_CALCULATE_MATRIX | X3DAUDIO_CALCULATE_DOPPLER | X3DAUDIO_CALCULATE_LPF_DIRECT | X3DAUDIO_CALCULATE_REVERB, source->dsp_settings_);
-
-				source->source_voice_->SetOutputMatrix(source->mastering_voice_, 1, AUDIO_CHANNELS, source->dsp_settings_->pMatrixCoefficients);
-				source->doppler_pitch_ = source->dsp_settings_->DopplerFactor;
-				source->source_voice_->SetFrequencyRatio(source->dsp_settings_->DopplerFactor * source->pitch_);
-				XAUDIO2_FILTER_PARAMETERS filter_parameters = { LowPassFilter, 2.0f * (float)sin(X3DAUDIO_PI / 6.0f * source->dsp_settings_->LPFDirectCoefficient), 1.0f };
-				if (!xnAudioWindows7Hacks) source->source_voice_->SetFilterParameters(&filter_parameters);
-
-				source->apply3DLock_.Unlock();
-			}
-		}
-
-		DLL_EXPORT_API npBool xnAudioSourceIsPlaying(xnAudioSource* source)
-		{
-			return source->playing_ || source->pause_;
-		}
-
-		DLL_EXPORT_API xnAudioBuffer* xnAudioBufferCreate(int maxBufferSize)
-		{
-			auto buffer = new xnAudioBuffer;
-			buffer->length_ = 0;
-			buffer->buffer_ = {};
-			buffer->buffer_.pContext = buffer;
-			buffer->buffer_.PlayBegin = 0;
-			buffer->buffer_.PlayLength = 0;
-			buffer->buffer_.LoopBegin = 0;
-			buffer->buffer_.LoopLength = 0;
-			buffer->buffer_.LoopCount = 0;
-			buffer->buffer_.pAudioData = new BYTE[maxBufferSize];
-			return buffer;
-		}
-
-		DLL_EXPORT_API void xnAudioBufferDestroy(xnAudioBuffer* buffer)
-		{
-			delete[] buffer->buffer_.pAudioData;
-			delete buffer;
-		}
-
-		DLL_EXPORT_API void xnAudioBufferFill(xnAudioBuffer* buffer, short* pcm, int bufferSize, int sampleRate, npBool mono)
-		{
-			(void)sampleRate;
-			
-			buffer->buffer_.AudioBytes = bufferSize;
-			
-			buffer->buffer_.PlayBegin = 0;
-			buffer->buffer_.PlayLength = buffer->length_ = (bufferSize / sizeof(short)) / (mono ? 1 : 2);
-			
-			memcpy(const_cast<char*>(buffer->buffer_.pAudioData), pcm, bufferSize);
-		}
-
-		void xnAudioSource::OnVoiceError(void* context, long error)
-		{
-		}
-	}
-}
-
-SpinLock::SpinLock()
-{
-	mLocked = false;
-}
-
-void SpinLock::Lock()
-{
-	while (!__sync_bool_compare_and_swap(&mLocked, false, true))
-	{
-	}
-}
-
-void SpinLock::Unlock()
-{
-	mLocked = false;
-}
-
-#endif
diff --git a/sources/engine/Xenko.Audio/SoundBase.cs b/sources/engine/Xenko.Audio/SoundBase.cs
index 8f43aca45f..646eb2dd33 100644
--- a/sources/engine/Xenko.Audio/SoundBase.cs
+++ b/sources/engine/Xenko.Audio/SoundBase.cs
@@ -98,8 +98,8 @@ internal void CheckNotDisposed()
         /// </summary>
         internal void StopAllInstances()
         {
-            foreach (var instance in Instances)
-                instance.Stop();
+            for (int i = 0; i < Instances.Count; i++)
+                Instances[i].Stop();
         }
 
         /// <summary>
@@ -108,10 +108,11 @@ internal void StopAllInstances()
         /// <param name="mainInstance">The main instance of the sound effect</param>
         internal void StopConcurrentInstances(SoundInstance mainInstance)
         {
-            foreach (var instance in Instances)
+            for (int i=0; i<Instances.Count; i++)
             {
-                if (instance != mainInstance)
-                    instance.Stop();
+                SoundInstance si = Instances[i];
+                if (si != mainInstance)
+                    si.Stop();
             }
         }
 
@@ -121,8 +122,11 @@ internal void StopConcurrentInstances(SoundInstance mainInstance)
         /// <param name="instance"></param>
         internal void UnregisterInstance(SoundInstance instance)
         {
-            if (!Instances.Remove(instance))
-                throw new AudioSystemInternalException("Tried to unregister soundEffectInstance while not contained in the instance list.");
+            lock (Instances)
+            {
+                if (!Instances.Remove(instance))
+                    throw new AudioSystemInternalException("Tried to unregister soundEffectInstance while not contained in the instance list.");
+            }
         }
 
         /// <summary>
@@ -131,7 +135,10 @@ internal void UnregisterInstance(SoundInstance instance)
         /// <param name="instance">new instance to register.</param>
         protected void RegisterInstance(SoundInstance instance)
         {
-            Instances.Add(instance);
+            lock (Instances)
+            {
+                Instances.Add(instance);
+            }
             intancesCreationCount++;
         }
 
diff --git a/sources/engine/Xenko.Audio/SoundInstance.cs b/sources/engine/Xenko.Audio/SoundInstance.cs
index 4c841b7c5d..da4cc282d6 100644
--- a/sources/engine/Xenko.Audio/SoundInstance.cs
+++ b/sources/engine/Xenko.Audio/SoundInstance.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Xenko.Core;
+using Xenko.Core.Mathematics;
 using Xenko.Media;
 
 namespace Xenko.Audio
@@ -21,12 +22,18 @@ public class SoundInstance : ComponentBase, IPositionableSound
         protected float pan;
         protected float pitch;
         protected float volume;
+        protected float distancescale;
         protected bool spatialized;
-        protected PlayState playState = PlayState.Stopped;
+        internal PlayState playState = PlayState.Stopped;
 
         internal AudioLayer.Source Source;
 
         internal AudioListener Listener;
+        internal Vector3 spos = Vector3.Zero;
+
+        public bool IsSpatialized => spatialized;
+
+        public Vector3 SpatializedPosition => spatialized ? spos : Listener.Position;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SoundInstance"/> class using a dynamic sound source.
@@ -124,6 +131,8 @@ public float Pan
             get => pan;
             set
             {
+                if (pan == value) return;
+
                 pan = value;
 
                 if (engine.State == AudioEngineState.Invalidated)
@@ -142,6 +151,8 @@ public float Volume
             get => volume;
             set
             {
+                if (volume == value) return;
+
                 volume = value;
 
                 if (engine.State == AudioEngineState.Invalidated)
@@ -159,6 +170,8 @@ public float Pitch
             get => pitch;
             set
             {
+                if (pitch == value) return;
+
                 pitch = value;
 
                 if (engine.State == AudioEngineState.Invalidated)
@@ -168,6 +181,25 @@ public float Pitch
             }
         }
 
+        /// <summary>
+        /// How does distance attenuation scale for this sound? 1 is default, 0 is disabling attenuation
+        /// </summary>
+        public float DistanceScale
+        {
+            get => distancescale;
+            set
+            {
+                if (distancescale == value) return;
+
+                distancescale = value;
+
+                if (engine.State == AudioEngineState.Invalidated)
+                    return;
+
+                AudioLayer.SourceSetRolloff(Source, distancescale);
+            }
+        }
+
         /// <summary>
         /// A task that completes when the sound is ready to play
         /// </summary>
@@ -179,29 +211,22 @@ public async Task<bool> ReadyToPlay()
         }
 
         /// <summary>
-        /// Applies 3D positioning to the sound.
-        /// More precisely adjust the channel volumes and pitch of the sound,
-        /// such that the sound source seems to come from the <paramref name="emitter"/> to the listener/>.
+        /// Quick and easy way to apply 3D parameters without an AudioEmitter
         /// </summary>
-        /// <param name="emitter">The emitter that correspond to this sound</param>
-        /// <remarks>
-        /// <see cref="Apply3D"/> can be used only on mono-sounds.
-        /// <para>
-        /// The final resulting pitch depends on the listener and emitter relative velocity.
-        /// The final resulting channel volumes depend on the listener and emitter relative positions and the value of <see cref="IPlayableSound.Volume"/>.
-        /// </para>
-        /// </remarks>
-        public void Apply3D(AudioEmitter emitter)
+        public void Apply3D(Vector3 Position, Vector3? velocity = null, Quaternion? direction = null)
         {
-            if (engine.State == AudioEngineState.Invalidated)
-                return;
-
             if (!spatialized) return;
 
-            if (emitter == null)
-                throw new ArgumentNullException(nameof(emitter));
+            spos = Position;
+            Vector3 vel = velocity ?? Vector3.Zero;
+            Vector3 dir = direction == null ? Vector3.Zero : Vector3.Transform(-Vector3.UnitZ, direction.Value);
+            Vector3 up = direction == null ? Vector3.Zero : Vector3.Transform(Vector3.UnitY, direction.Value);
+            Matrix m = Matrix.Transformation(Vector3.One, direction ?? Quaternion.Identity, Position);
+
+            if (engine.State == AudioEngineState.Invalidated)
+                return;
 
-            emitter.Apply3D(Source);
+            AudioLayer.SourcePush3D(Source, ref Position, ref dir, ref up, ref vel, ref m);
         }
 
         /// <summary>
@@ -270,9 +295,10 @@ public void Stop()
 
         internal void ResetStateToDefault()
         {
-            Pan = 0;
-            Pitch = 1;
-            Volume = 1;
+            Pan = 0f;
+            Pitch = 1f;
+            Volume = 1f;
+            DistanceScale = 1f;
             IsLooping = false;
             Stop();
         }
@@ -343,9 +369,12 @@ public PlayState PlayState
                 if (engine.State == AudioEngineState.Invalidated)
                     return PlayState.Stopped;
 
-                if (playState == PlayState.Playing && (!soundSource?.IsPausedOrPlaying ?? !AudioLayer.SourceIsPlaying(Source)))
+                if (soundSource == null && playState == PlayState.Playing && isLooping == false &&
+                    AudioLayer.SourceIsPlaying(Source) == false)
                 {
-                    Stop();
+                    // non-streamed sound stopped playing
+                    AudioLayer.SourceStop(Source);
+                    playState = PlayState.Stopped;
                 }
 
                 return playState;
@@ -388,6 +417,42 @@ public void SetRange(PlayRange range)
             }
         }
 
+        /// <summary>
+        /// Sets the range of the sound to play.
+        /// </summary>
+        /// <param name="startPercent">% of when to start, 0.5 is starting at the exact middle</param>
+        /// <param name="endPercent">% of when to end. 1 is default (100%)</param>
+        public void SetRangePercent(double startPercent, double endPercent = 1.0)
+        {
+            if (engine.State == AudioEngineState.Invalidated)
+                return;
+
+            var state = PlayState;
+
+            if (state == PlayState.Playing)
+            {
+                Stop();
+            }
+
+            if (soundSource == null)
+            {
+                double len = sound.TotalLength.TotalSeconds;
+                AudioLayer.SourceSetRange(Source, startPercent * len, endPercent * len);
+            }
+            else
+            {
+                soundSource.PlayRange =
+                    new PlayRange(
+                            new TimeSpan((long)Math.Round((double)sound.TotalLength.Ticks * startPercent)),
+                            endPercent >= 1.0 ? TimeSpan.Zero : new TimeSpan((long)Math.Round((double)sound.TotalLength.Ticks * endPercent)));
+            }
+
+            if (state == PlayState.Playing)
+            {
+                Play();
+            }
+        }
+
         /// <summary>
         /// Gets the position in time of this playing instance.
         /// </summary>
diff --git a/sources/engine/Xenko.Audio/StreamedBufferSoundSource.cs b/sources/engine/Xenko.Audio/StreamedBufferSoundSource.cs
index dd934b06f8..cac17debfe 100644
--- a/sources/engine/Xenko.Audio/StreamedBufferSoundSource.cs
+++ b/sources/engine/Xenko.Audio/StreamedBufferSoundSource.cs
@@ -82,7 +82,7 @@ public StreamedBufferSoundSource(SoundInstanceStreamedBuffer instance, MediaSync
             this.startPosition = startPosition;
             this.length = length;
 
-            NewSources.Add(this);
+            NewSources.Enqueue(this);
         }
 
         protected override bool CanFill => Commands.IsEmpty && base.CanFill;
diff --git a/sources/engine/Xenko.Audio/Xenko.Audio.csproj b/sources/engine/Xenko.Audio/Xenko.Audio.csproj
index f18d186fbc..5b570aae9f 100644
--- a/sources/engine/Xenko.Audio/Xenko.Audio.csproj
+++ b/sources/engine/Xenko.Audio/Xenko.Audio.csproj
@@ -1,28 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoNativeOutputName>libxenkoaudio</XenkoNativeOutputName>
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(XenkoPlatform)' == 'Android'">
-    <!-- <DefineConstants>XENKO_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants> -->
-    <DefineConstants>XENKO_VIDEO_MEDIACODEC;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -48,10 +40,22 @@
   <ItemGroup>
     <None Include="Native\OpenSLES.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Native\XAudio2.cpp" />
-  </ItemGroup>
   <ItemGroup />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <Choose>
+    <When Condition=" '$(XenkoPlatform)' == 'Windows'">
+      <ItemGroup>
+        <XenkoNativeLib Include="$(XenkoDependenciesDir)\OpenAL\Windows\*.dll">
+          <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+          <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </XenkoNativeLib>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Debug/DebugPrimitives.cs b/sources/engine/Xenko.Debug/DebugPrimitives.cs
new file mode 100644
index 0000000000..164f0d0819
--- /dev/null
+++ b/sources/engine/Xenko.Debug/DebugPrimitives.cs
@@ -0,0 +1,745 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// -----------------------------------------------------------------------------
+// The following code is a port of DirectXTk http://directxtk.codeplex.com
+// -----------------------------------------------------------------------------
+// Microsoft Public License (Ms-PL)
+//
+// This license governs use of the accompanying software. If you use the 
+// software, you accept this license. If you do not accept the license, do not
+// use the software.
+//
+// 1. Definitions
+// The terms "reproduce," "reproduction," "derivative works," and 
+// "distribution" have the same meaning here as under U.S. copyright law.
+// A "contribution" is the original software, or any additions or changes to 
+// the software.
+// A "contributor" is any person that distributes its contribution under this 
+// license.
+// "Licensed patents" are a contributor's patent claims that read directly on 
+// its contribution.
+//
+// 2. Grant of Rights
+// (A) Copyright Grant- Subject to the terms of this license, including the 
+// license conditions and limitations in section 3, each contributor grants 
+// you a non-exclusive, worldwide, royalty-free copyright license to reproduce
+// its contribution, prepare derivative works of its contribution, and 
+// distribute its contribution or any derivative works that you create.
+// (B) Patent Grant- Subject to the terms of this license, including the license
+// conditions and limitations in section 3, each contributor grants you a 
+// non-exclusive, worldwide, royalty-free license under its licensed patents to
+// make, have made, use, sell, offer for sale, import, and/or otherwise dispose
+// of its contribution in the software or derivative works of the contribution 
+// in the software.
+//
+// 3. Conditions and Limitations
+// (A) No Trademark License- This license does not grant you rights to use any 
+// contributors' name, logo, or trademarks.
+// (B) If you bring a patent claim against any contributor over patents that 
+// you claim are infringed by the software, your patent license from such 
+// contributor to the software ends automatically.
+// (C) If you distribute any portion of the software, you must retain all 
+// copyright, patent, trademark, and attribution notices that are present in the
+// software.
+// (D) If you distribute any portion of the software in source code form, you 
+// may do so only under this license by including a complete copy of this 
+// license with your distribution. If you distribute any portion of the software
+// in compiled or object code form, you may only do so under a license that 
+// complies with this license.
+// (E) The software is licensed "as-is." You bear the risk of using it. The
+// contributors give no express warranties, guarantees or conditions. You may
+// have additional consumer rights under your local laws which this license 
+// cannot change. To the extent permitted under your local laws, the 
+// contributors exclude the implied warranties of merchantability, fitness for a
+// particular purpose and non-infringement.
+
+using System;
+
+using Xenko.Core.Mathematics;
+using Xenko.Graphics.GeometricPrimitives;
+using Xenko.Graphics;
+
+namespace Xenko.DebugRendering
+{
+    public class DebugPrimitives
+    {
+
+        static private Vector2 noLineUv = new Vector2(0.5f);
+        static private Vector2 lineUv = new Vector2(1.0f);
+
+        public static Vector3 GetCircleVector(int i, int tessellation)
+        {
+            var angle = (float)(i * 2.0 * Math.PI / tessellation);
+            var dx = (float)Math.Sin(angle);
+            var dz = (float)Math.Cos(angle);
+
+            return new Vector3(dx, 0, dz);
+        }
+
+        public static void CopyFromGeometricPrimitive(GeometricMeshData<VertexPositionNormalTexture> primitiveData, ref VertexPositionTexture[] vertices, ref int[] indices)
+        {
+            for (int i = 0; i < vertices.Length; ++i)
+            {
+                vertices[i].Position = primitiveData.Vertices[i].Position;
+                vertices[i].TextureCoordinate = primitiveData.Vertices[i].TextureCoordinate;
+            }
+
+            for (int i = 0; i < indices.Length; ++i)
+            {
+                indices[i] = primitiveData.Indices[i];
+            }
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateQuad(float width, float height)
+        {
+
+            var quadMeshData = GeometricPrimitive.Plane.New(width, height);
+            VertexPositionTexture[] vertices = new VertexPositionTexture[quadMeshData.Vertices.Length];
+            int[] indices = new int[quadMeshData.Indices.Length];
+
+            CopyFromGeometricPrimitive(quadMeshData, ref vertices, ref indices);
+
+            /* transform it because in its default orientation it isnt flat to the normal up */
+            Quaternion rotation = Quaternion.BetweenDirections(Vector3.UnitZ, Vector3.UnitY);
+            for (int i = 0; i < vertices.Length; ++i)
+            {
+                vertices[i].Position = Vector3.Transform(vertices[i].Position, rotation);
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCircle(float radius = 0.5f, int tesselations = 16, int uvSplits = 0, float yOffset = 0.0f, bool isFlipped = false, int uvOffset = 0)
+        {
+
+            if (tesselations < 3) tesselations = 3;
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            int hasUvSplits = (uvSplits > 0 ? 1 : 0);
+            int extraVertices = 0;
+            int extraIndices = 0;
+
+            if (hasUvSplits > 0)
+            {
+                for (int i = 0; i < tesselations * 3; i += 3)
+                {
+                    int splitMod = ((i / 3) - uvOffset) % (tesselations / uvSplits);
+                    var timeToSplit = splitMod == 0;
+                    if (timeToSplit)
+                    {
+                        extraVertices += 2;
+                        extraIndices += 3;
+                    }
+                }
+            }
+
+            VertexPositionTexture[] vertices = new VertexPositionTexture[(tesselations + 1) + hasUvSplits + extraVertices];
+            int[] indices = new int[((tesselations + 1) * 3) + extraIndices];
+
+            double radiansPerSegment = MathUtil.TwoPi / tesselations;
+
+            // center of our circle
+            vertices[0].Position = new Vector3(0.0f, yOffset, 0.0f);
+            vertices[0].TextureCoordinate = noLineUv;
+
+            // center, but with uv coords set
+            if (hasUvSplits > 0)
+            {
+                vertices[1].Position = new Vector3(0.0f, yOffset, 0.0f);
+                vertices[1].TextureCoordinate = lineUv;
+            }
+
+            int offset = 1 + hasUvSplits;
+            for (int i = 0; i < tesselations; ++i)
+            {
+                var normal = GetCircleVector(i, tesselations);
+                vertices[offset + i].Position = (normal * radius) + new Vector3(0.0f, yOffset, 0.0f);
+                vertices[offset + i].TextureCoordinate = lineUv;
+            }
+
+            int curVert = tesselations + offset;
+            int curIdx = (tesselations + 1) * 3;
+            for (int i = 0; i < tesselations * 3; i += 3)
+            {
+                int? splitMod = (uvSplits > 0) ? (((i / 3) - uvOffset) % (tesselations / uvSplits)) : (int?)null;
+                var timeToSplit = splitMod == 0;
+                if (timeToSplit)
+                {
+
+                    indices[i] = 1;
+
+                    indices[i + 1] = curVert;
+                    vertices[curVert] = vertices[offset + ((i / 3) % tesselations)];
+                    vertices[curVert++].TextureCoordinate = lineUv;
+
+                    indices[i + 2] = curVert;
+                    vertices[curVert] = vertices[offset + (((i / 3) + 1) % tesselations)];
+                    vertices[curVert++].TextureCoordinate = noLineUv;
+
+                    // FIXME: this is shit geometry really
+                    indices[curIdx++] = offset + ((i / 3) % tesselations);
+                    indices[curIdx++] = offset + ((i / 3) % tesselations);
+                    indices[curIdx++] = offset + (((i / 3) + 1) % tesselations);
+
+                }
+                else
+                {
+                    indices[i] = 0;
+                    indices[i + 1] = offset + ((i / 3) % tesselations);
+                    indices[i + 2] = offset + (((i / 3) + 1) % tesselations);
+                }
+            }
+
+            if (!isFlipped)
+            {
+                Array.Reverse(indices); // flip the winding if it's a top piece
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCube(float size = 1.0f)
+        {
+
+            var cubeMeshData = GeometricPrimitive.Cube.New(size);
+            VertexPositionTexture[] vertices = new VertexPositionTexture[cubeMeshData.Vertices.Length];
+            int[] indices = new int[cubeMeshData.Indices.Length];
+
+            CopyFromGeometricPrimitive(cubeMeshData, ref vertices, ref indices);
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateSphere(float radius = 0.5f, int tesselations = 16, int uvSplits = 4, int uvSplitOffsetVertical = 0)
+        {
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            if (tesselations < 3) tesselations = 3;
+
+            int verticalSegments = tesselations;
+            int horizontalSegments = tesselations * 2;
+            int hasUvSplit = (uvSplits > 0 ? 1 : 0);
+
+            // FIXME: i tried figuring out a closed form solution for this bugger here, but i feel like i'm missing something crucial...
+            //  it basically is just here to calculate how many extra vertices are needed to create the wireframe topology we want
+            // if *you* can figure out a closed form solution, have at it! you are very welcome!
+            int extraVertexCount = 0;
+
+            if (hasUvSplit > 0)
+            {
+                for (int i = 0; i < verticalSegments; i++)
+                {
+                    for (int j = 0; j <= horizontalSegments; j++)
+                    {
+                        int vertModulo = (i + uvSplitOffsetVertical) % (verticalSegments / uvSplits);
+                        int horizModulo = j % (horizontalSegments / uvSplits);
+                        if (hasUvSplit > 0 && (vertModulo == 0 && horizModulo == 0))
+                        {
+                            extraVertexCount += 4;
+                        }
+                        else if (hasUvSplit > 0 && (vertModulo == 0 || horizModulo == 0))
+                        {
+                            extraVertexCount += 2;
+                        }
+                    }
+                }
+            }
+
+            var vertices = new VertexPositionTexture[(verticalSegments + 1) * (horizontalSegments + 1) + extraVertexCount];
+            var indices = new int[(verticalSegments) * (horizontalSegments + 1) * 6];
+
+            int vertexCount = 0;
+
+            // generate the first extremity points
+            for (int j = 0; j <= horizontalSegments; j++)
+            {
+                var normal = new Vector3(0, -1, 0);
+                var textureCoordinate = new Vector2(0.5f);
+                vertices[vertexCount++] = new VertexPositionTexture(normal * radius, textureCoordinate);
+            }
+
+            // Create rings of vertices at progressively higher latitudes.
+            for (int i = 1; i < verticalSegments; i++)
+            {
+
+                var latitude = (float)((i * Math.PI / verticalSegments) - Math.PI / 2.0);
+                var dy = (float)Math.Sin(latitude);
+                var dxz = (float)Math.Cos(latitude);
+
+                // the first point
+                var firstNormal = new Vector3(0, dy, dxz);
+                var firstHorizontalVertex = new VertexPositionTexture(firstNormal * radius, noLineUv);
+                vertices[vertexCount++] = firstHorizontalVertex;
+
+                // Create a single ring of vertices at this latitude.
+                for (int j = 1; j < horizontalSegments; j++)
+                {
+
+                    var longitude = (float)(j * 2.0 * Math.PI / horizontalSegments);
+                    var dx = (float)Math.Sin(longitude);
+                    var dz = (float)Math.Cos(longitude);
+
+                    dx *= dxz;
+                    dz *= dxz;
+
+                    var normal = new Vector3(dx, dy, dz);
+                    var textureCoordinate = noLineUv;
+
+                    vertices[vertexCount++] = new VertexPositionTexture(normal * radius, textureCoordinate);
+                }
+
+                // the last point equal to the first point
+                firstHorizontalVertex.TextureCoordinate = noLineUv;
+                vertices[vertexCount++] = firstHorizontalVertex;
+            }
+
+            // generate the end extremity points
+            for (int j = 0; j <= horizontalSegments; j++)
+            {
+                var normal = new Vector3(0, 1, 0);
+                var textureCoordinate = noLineUv;
+                vertices[vertexCount++] = new VertexPositionTexture(normal * radius, textureCoordinate);
+            }
+
+            // Fill the index buffer with triangles joining each pair of latitude rings.
+            int stride = horizontalSegments + 1;
+
+            int indexCount = 0;
+            int newVertexCount = vertexCount;
+            for (int i = 0; i < verticalSegments; i++)
+            {
+                for (int j = 0; j <= horizontalSegments; j++)
+                {
+                    int nextI = i + 1;
+                    int nextJ = (j + 1) % stride;
+                    int? vertModulo = (uvSplits > 0) ? ((i + uvSplitOffsetVertical) % (verticalSegments / uvSplits)) : (int?)null;
+                    int? horizModulo = (uvSplits > 0) ? (j % (horizontalSegments / uvSplits)) : (int?)null;
+                    if (hasUvSplit > 0 && ((vertModulo == 0 && horizModulo == 0)))
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && vertModulo == 0)
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && horizModulo == 0)
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+
+                }
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCylinder(float height = 1.0f, float radius = 0.5f, int tesselations = 16, int uvSplits = 4, int? uvSidesForCircle = null)
+        {
+
+            const int uvOffset = 3;
+
+            if (tesselations < 3) tesselations = 3;
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            var hasUvSplit = (uvSplits > 0 ? 1 : 0);
+            var (capVertices, capIndices) = GenerateCircle(radius, tesselations, uvSidesForCircle ?? uvSplits, uvOffset: 1 + uvOffset);
+
+            VertexPositionTexture[] vertices = new VertexPositionTexture[(capVertices.Length * 2) + (tesselations * 4)];
+            int[] indices = new int[(capIndices.Length * 2) + (tesselations * 6)];
+
+            int bottomVertsOffset = (vertices.Length - capVertices.Length);
+            int topVertsOffset = (vertices.Length - capVertices.Length * 2);
+            int bottomIndicesOffset = (indices.Length - capIndices.Length);
+            int topIndicesOffset = (indices.Length - capIndices.Length * 2);
+
+            // copy vertices
+            for (int i = 0; i < capVertices.Length; ++i)
+            {
+                vertices[bottomVertsOffset + i] = capVertices[i];
+                vertices[bottomVertsOffset + i].Position.Y = -(height / 2.0f);
+                vertices[topVertsOffset + i] = capVertices[i];
+                vertices[topVertsOffset + i].Position.Y = height / 2.0f;
+            }
+
+            // copy indices
+            for (int i = 0; i < capIndices.Length; ++i)
+            {
+                indices[bottomIndicesOffset + i] = capIndices[i] + bottomVertsOffset;
+                indices[topIndicesOffset + i] = capIndices[i] + topVertsOffset;
+            }
+
+            // correct winding order so backface is inwards for bottom part
+            Array.Reverse(indices, bottomIndicesOffset, capIndices.Length);
+
+            // generate sides, using our top and bottom circle triangle fans
+            int curVert = 0;
+            int curIndex = 0;
+            for (int i = 0; i < tesselations; ++i)
+            {
+
+                var normal = GetCircleVector(i, tesselations);
+                var curTopPos = (normal * radius) + (Vector3.UnitY * (height / 2.0f));
+                var curBottomPos = (normal * radius) - (Vector3.UnitY * (height / 2.0f));
+
+                int? sideModulo = (uvSplits > 0) ? ((i + 1 - uvOffset) % (tesselations / uvSplits)) : (int?)null;
+
+                vertices[curVert].Position = curBottomPos;
+                vertices[curVert].TextureCoordinate = (sideModulo == 0) ? lineUv : noLineUv;
+                var ip = curVert++;
+
+                var nextBottomNormal = GetCircleVector(i + 1, tesselations) * radius - (Vector3.UnitY * (height / 2.0f));
+                vertices[curVert].Position = nextBottomNormal;
+                vertices[curVert].TextureCoordinate = noLineUv;
+                var ip1 = curVert++;
+
+                vertices[curVert].Position = curTopPos;
+                vertices[curVert].TextureCoordinate = (sideModulo == 0) ? lineUv : noLineUv;
+                var ipv = curVert++;
+
+                var nextTopNormal = (GetCircleVector(i + 1, tesselations) * radius) + (Vector3.UnitY * (height / 2.0f));
+                vertices[curVert].Position = nextTopNormal;
+                vertices[curVert].TextureCoordinate = noLineUv;
+                var ipv1 = curVert++;
+
+                // reuse the old stuff yo
+                indices[curIndex++] = ipv;
+                indices[curIndex++] = ip1;
+                indices[curIndex++] = ip;
+
+                indices[curIndex++] = ipv;
+                indices[curIndex++] = ipv1;
+                indices[curIndex++] = ip1;
+
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCone(float height, float radius, int tesselations, int uvSplits = 4, int uvSplitsBottom = 0)
+        {
+
+            if (tesselations < 3) tesselations = 3;
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            if (uvSplitsBottom != 0 && tesselations % uvSplitsBottom != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits for the bottom to be a divisor of the number of tesselations");
+            }
+
+            var (bottomVertices, bottomIndices) = GenerateCircle(radius, tesselations, uvSplits, yOffset: -(height / 2.0f));
+            var (topVertices, topIndices) = GenerateCircle(radius, tesselations, uvSplitsBottom, isFlipped: true, yOffset: -(height / 2.0f));
+            VertexPositionTexture[] vertices = new VertexPositionTexture[bottomVertices.Length + topVertices.Length];
+            int[] indices = new int[topIndices.Length + bottomIndices.Length];
+
+            // copy vertices from circle
+            for (int i = 0; i < bottomVertices.Length; ++i)
+            {
+                vertices[i] = bottomVertices[i];
+            }
+
+            for (int i = 0; i < topVertices.Length; ++i)
+            {
+                vertices[i + bottomVertices.Length] = topVertices[i];
+            }
+
+            // copy indices from circle
+            for (int i = 0; i < bottomIndices.Length; ++i)
+            {
+                indices[i] = bottomIndices[i];
+            }
+
+            for (int i = 0; i < topIndices.Length; ++i)
+            {
+                indices[i + bottomIndices.Length] = topIndices[i] + bottomVertices.Length;
+            }
+
+            // extrude middle vertex of center of first circle triangle fan
+            vertices[0].Position.Y = height / 2.0f;
+            vertices[1].Position.Y = height / 2.0f;
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCapsule(float length, float radius, int tesselation, int uvSplits = 4)
+        {
+
+            if (tesselation < 3) tesselation = 3;
+
+            if (uvSplits != 0 && tesselation % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            int verticalSegments = 2 * tesselation;
+            int horizontalSegments = 4 * tesselation;
+            int hasUvSplit = (uvSplits > 0) ? 1 : 0;
+
+            // FIXME: i tried figuring out a closed form solution for this bugger here, but i feel like i'm missing something crucial...
+            //  it basically is just here to calculate how many extra vertices are needed to create the wireframe topology we want
+            // if *you* can figure out a closed form solution, have at it! you are very welcome!
+            int extraVertexCount = 0;
+
+            if (hasUvSplit > 0)
+            {
+                for (int i = 0; i < verticalSegments - 1; i++)
+                {
+                    for (int j = 0; j <= horizontalSegments; j++)
+                    {
+                        int vertModulo = i % (verticalSegments / uvSplits);
+                        int horizModulo = j % (horizontalSegments / uvSplits);
+                        if (hasUvSplit > 0 && (vertModulo == 0 && horizModulo == 0))
+                        {
+                            extraVertexCount += 4;
+                        }
+                        else if (hasUvSplit > 0 && (vertModulo == 0 || horizModulo == 0))
+                        {
+                            extraVertexCount += 2;
+                        }
+                    }
+                }
+            }
+
+            var vertices = new VertexPositionTexture[verticalSegments * (horizontalSegments + 1) + extraVertexCount];
+            var indices = new int[(verticalSegments - 1) * (horizontalSegments + 1) * 6];
+
+            var vertexCount = 0;
+            // Create rings of vertices at progressively higher latitudes.
+            for (int i = 0; i < verticalSegments; i++)
+            {
+                float deltaY;
+                float latitude;
+
+                if (i < verticalSegments / 2)
+                {
+                    deltaY = -length / 2;
+                    latitude = (float)((i * Math.PI / (verticalSegments - 2)) - Math.PI / 2.0);
+                }
+                else
+                {
+                    deltaY = length / 2;
+                    latitude = (float)(((i - 1) * Math.PI / (verticalSegments - 2)) - Math.PI / 2.0);
+                }
+
+                var dy = (float)Math.Sin(latitude);
+                var dxz = (float)Math.Cos(latitude);
+
+                // Create a single ring of vertices at this latitude.
+                for (int j = 0; j <= horizontalSegments; j++)
+                {
+
+                    var longitude = (float)(j * 2.0 * Math.PI / horizontalSegments);
+                    var dx = (float)Math.Sin(longitude);
+                    var dz = (float)Math.Cos(longitude);
+
+                    dx *= dxz;
+                    dz *= dxz;
+
+                    var normal = new Vector3(dx, dy, dz);
+                    var textureCoordinate = noLineUv;
+                    var position = radius * normal + new Vector3(0, deltaY, 0);
+
+                    vertices[vertexCount++] = new VertexPositionTexture(position, textureCoordinate);
+                }
+            }
+
+            // Fill the index buffer with triangles joining each pair of latitude rings.
+            int stride = horizontalSegments + 1;
+
+            int indexCount = 0;
+            int newVertexCount = vertexCount;
+            for (int i = 0; i < verticalSegments - 1; i++)
+            {
+                for (int j = 0; j <= horizontalSegments; j++)
+                {
+                    int nextI = i + 1;
+                    int nextJ = (j + 1) % stride;
+                    int? vertModulo = (uvSplits > 0) ? (i % (verticalSegments / uvSplits)) : (int?)null;
+                    int? horizModulo = (uvSplits > 0) ? (j % (horizontalSegments / uvSplits)) : (int?)null;
+                    if (hasUvSplit > 0 && (vertModulo == 0 && horizModulo == 0))
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && vertModulo == 0)
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && horizModulo == 0)
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+
+                }
+            }
+
+            return (vertices, indices);
+
+        }
+
+    }
+}
diff --git a/sources/engine/Xenko.Debug/DebugRenderFeature.cs b/sources/engine/Xenko.Debug/DebugRenderFeature.cs
new file mode 100644
index 0000000000..80a5cadc60
--- /dev/null
+++ b/sources/engine/Xenko.Debug/DebugRenderFeature.cs
@@ -0,0 +1,891 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
+using Xenko.Graphics;
+using Xenko.Rendering;
+
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.DebugRendering
+{
+    public class DebugRenderFeature : RootRenderFeature
+    {
+
+        internal enum DebugRenderStage
+        {
+            Opaque,
+            Transparent
+        }
+
+        public override Type SupportedRenderObjectType => typeof(DebugRenderObject);
+
+        internal struct Primitives
+        {
+
+            public int Quads;
+            public int Circles;
+            public int Spheres;
+            public int HalfSpheres;
+            public int Cubes;
+            public int Capsules;
+            public int Cylinders;
+            public int Cones;
+            public int Lines;
+
+            public void Clear()
+            {
+                Quads = 0;
+                Circles = 0;
+                Spheres = 0;
+                HalfSpheres = 0;
+                Cubes = 0;
+                Capsules = 0;
+                Cylinders = 0;
+                Cones = 0;
+                Lines = 0;
+            }
+
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        internal struct LineVertex
+        {
+
+            public static readonly VertexDeclaration Layout = new VertexDeclaration(VertexElement.Position<Vector3>(), VertexElement.Color<Color>());
+
+            public Vector3 Position;
+            public Color Color;
+
+        }
+
+        internal enum RenderableType : byte
+        {
+            Quad,
+            Circle,
+            Sphere,
+            HalfSphere,
+            Cube,
+            Capsule,
+            Cylinder,
+            Cone,
+            Line
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        internal struct Renderable
+        {
+
+            public Renderable(ref Quad q) : this()
+            {
+                Type = RenderableType.Quad;
+                QuadData = q;
+            }
+
+            public Renderable(ref Circle c) : this()
+            {
+                Type = RenderableType.Circle;
+                CircleData = c;
+            }
+
+            public Renderable(ref Sphere s) : this()
+            {
+                Type = RenderableType.Sphere;
+                SphereData = s;
+            }
+
+            public Renderable(ref HalfSphere h) : this()
+            {
+                Type = RenderableType.HalfSphere;
+                HalfSphereData = h;
+            }
+
+            public Renderable(ref Cube c) : this()
+            {
+                Type = RenderableType.Cube;
+                CubeData = c;
+            }
+
+            public Renderable(ref Capsule c) : this()
+            {
+                Type = RenderableType.Capsule;
+                CapsuleData = c;
+            }
+
+            public Renderable(ref Cylinder c) : this()
+            {
+                Type = RenderableType.Cylinder;
+                CylinderData = c;
+            }
+
+            public Renderable(ref Cone c) : this()
+            {
+                Type = RenderableType.Cone;
+                ConeData = c;
+            }
+
+            public Renderable(ref Line l) : this()
+            {
+                Type = RenderableType.Line;
+                LineData = l;
+            }
+
+            [FieldOffset(0)]
+            public RenderableType Type;
+
+            [FieldOffset(1)]
+            public Quad QuadData;
+
+            [FieldOffset(1)]
+            public Circle CircleData;
+
+            [FieldOffset(1)]
+            public Sphere SphereData;
+
+            [FieldOffset(1)]
+            public HalfSphere HalfSphereData;
+
+            [FieldOffset(1)]
+            public Cube CubeData;
+
+            [FieldOffset(1)]
+            public Capsule CapsuleData;
+
+            [FieldOffset(1)]
+            public Cylinder CylinderData;
+
+            [FieldOffset(1)]
+            public Cone ConeData;
+
+            [FieldOffset(1)]
+            public Line LineData;
+
+        }
+
+        internal struct Quad
+        {
+            public Vector3 Position;
+            public Quaternion Rotation;
+            public Vector2 Size;
+            public Color Color;
+        }
+
+        internal struct Circle
+        {
+            public Vector3 Position;
+            public Quaternion Rotation;
+            public float Radius;
+            public Color Color;
+        }
+
+        internal struct Sphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Color Color;
+        }
+
+        internal struct HalfSphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Cube
+        {
+            public Vector3 Start;
+            public Vector3 End;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Capsule
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Cylinder
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Cone
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Line
+        {
+            public Vector3 Start;
+            public Vector3 End;
+            public Color Color;
+        }
+
+        internal struct InstanceData
+        {
+            public Vector3 Position;
+            public Quaternion Rotation;
+            public Vector3 Scale;
+            public Color Color;
+        }
+
+        private const float DefaultCircleRadius = 0.5f;
+        private const float DefaultSphereRadius = 0.5f;
+        private const float DefaultCubeSize = 1.0f;
+        private const float DefaultCapsuleLength = 1.0f;
+        private const float DefaultCapsuleRadius = 0.5f;
+        private const float DefaultCylinderHeight = 1.0f;
+        private const float DefaultCylinderRadius = 0.5f;
+        private const float DefaultPlaneSize = 1.0f;
+        private const float DefaultConeRadius = 0.5f;
+        private const float DefaultConeHeight = 1.0f;
+
+        private const int CircleTesselation = 16;
+        private const int SphereTesselation = 8;
+        private const int CapsuleTesselation = 8;
+        private const int CylinderTesselation = 16;
+        private const int ConeTesselation = 16;
+
+        /* mesh data we will use when stuffing things in vertex buffers */
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) circle = DebugPrimitives.GenerateCircle(DefaultCircleRadius, CircleTesselation);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) plane = DebugPrimitives.GenerateQuad(DefaultPlaneSize, DefaultPlaneSize);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) sphere = DebugPrimitives.GenerateSphere(DefaultSphereRadius, SphereTesselation, uvSplitOffsetVertical: 1);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) cube = DebugPrimitives.GenerateCube(DefaultCubeSize);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) capsule = DebugPrimitives.GenerateCapsule(DefaultCapsuleLength, DefaultCapsuleRadius, CapsuleTesselation);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) cylinder = DebugPrimitives.GenerateCylinder(DefaultCylinderHeight, DefaultCylinderRadius, CylinderTesselation);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) cone = DebugPrimitives.GenerateCone(DefaultConeHeight, DefaultConeRadius, ConeTesselation, uvSplits: 8);
+
+        /* vertex and index buffer for our primitive data */
+        private Buffer vertexBuffer;
+        private Buffer indexBuffer;
+
+        /* vertex buffer for line rendering */
+        private Buffer lineVertexBuffer;
+
+        /* offsets into our vertex/index buffer */
+        private Primitives primitiveVertexOffsets;
+        private Primitives primitiveIndexOffsets;
+
+        /* other gpu related data */
+        private MutablePipelineState pipelineState;
+        private InputElementDescription[] inputElements;
+        private InputElementDescription[] lineInputElements;
+        private DynamicEffectInstance primitiveEffect;
+        private DynamicEffectInstance lineEffect;
+        private Buffer transformBuffer;
+        private Buffer colorBuffer;
+
+        /* intermediate message related data, written to in extract */
+        private readonly FastList<InstanceData> instances = new FastList<InstanceData>(1);
+
+        /* data written to buffers in prepare */
+        private readonly FastList<Matrix> transforms = new FastList<Matrix>(1);
+        private readonly FastList<Color> colors = new FastList<Color>(1);
+
+        /* data only for line rendering */
+        private readonly FastList<LineVertex> lineVertices = new FastList<LineVertex>(1);
+
+        public DebugRenderFeature()
+        {
+            SortKey = 0xFF; // render last! .. or things without depth testing in the opaque stage will have the background rendered over them
+        }
+
+        protected override void InitializeCore()
+        {
+
+            var device = Context.GraphicsDevice;
+
+            inputElements = VertexPositionTexture.Layout.CreateInputElements();
+            lineInputElements = LineVertex.Layout.CreateInputElements();
+
+            // create our pipeline state object
+            pipelineState = new MutablePipelineState(device);
+            pipelineState.State.SetDefaults();
+
+            // TODO: create our associated effect
+            primitiveEffect = new DynamicEffectInstance("PrimitiveShader");
+            primitiveEffect.Initialize(Context.Services);
+            primitiveEffect.UpdateEffect(device);
+
+            lineEffect = new DynamicEffectInstance("LinePrimitiveShader");
+            lineEffect.Initialize(Context.Services);
+            lineEffect.UpdateEffect(device);
+
+            // create initial vertex and index buffers
+            var vertexData = new VertexPositionTexture[
+                circle.Vertices.Length +
+                plane.Vertices.Length +
+                sphere.Vertices.Length +
+                cube.Vertices.Length +
+                capsule.Vertices.Length +
+                cylinder.Vertices.Length +
+                cone.Vertices.Length
+            ];
+
+            /* set up vertex buffer data */
+
+            int vertexBufferOffset = 0;
+
+            Array.Copy(circle.Vertices, vertexData, circle.Vertices.Length);
+            primitiveVertexOffsets.Circles = vertexBufferOffset;
+            vertexBufferOffset += circle.Vertices.Length;
+
+            Array.Copy(plane.Vertices, 0, vertexData, vertexBufferOffset, plane.Vertices.Length);
+            primitiveVertexOffsets.Quads = vertexBufferOffset;
+            vertexBufferOffset += plane.Vertices.Length;
+
+            Array.Copy(sphere.Vertices, 0, vertexData, vertexBufferOffset, sphere.Vertices.Length);
+            primitiveVertexOffsets.Spheres = vertexBufferOffset;
+            primitiveVertexOffsets.HalfSpheres = vertexBufferOffset; // same as spheres
+            vertexBufferOffset += sphere.Vertices.Length;
+
+            Array.Copy(cube.Vertices, 0, vertexData, vertexBufferOffset, cube.Vertices.Length);
+            primitiveVertexOffsets.Cubes = vertexBufferOffset;
+            vertexBufferOffset += cube.Vertices.Length;
+
+            Array.Copy(capsule.Vertices, 0, vertexData, vertexBufferOffset, capsule.Vertices.Length);
+            primitiveVertexOffsets.Capsules = vertexBufferOffset;
+            vertexBufferOffset += capsule.Vertices.Length;
+
+            Array.Copy(cylinder.Vertices, 0, vertexData, vertexBufferOffset, cylinder.Vertices.Length);
+            primitiveVertexOffsets.Cylinders = vertexBufferOffset;
+            vertexBufferOffset += cylinder.Vertices.Length;
+
+            Array.Copy(cone.Vertices, 0, vertexData, vertexBufferOffset, cone.Vertices.Length);
+            primitiveVertexOffsets.Cones = vertexBufferOffset;
+            vertexBufferOffset += cone.Vertices.Length;
+
+            var newVertexBuffer = Buffer.Vertex.New<VertexPositionTexture>(device, vertexData);
+            vertexBuffer = newVertexBuffer;
+
+            /* set up index buffer data */
+
+            var indexData = new int[
+                circle.Indices.Length +
+                plane.Indices.Length +
+                sphere.Indices.Length +
+                cube.Indices.Length +
+                capsule.Indices.Length +
+                cylinder.Indices.Length +
+                cone.Indices.Length
+            ];
+
+            if (indexData.Length >= 0xFFFF && device.Features.CurrentProfile <= GraphicsProfile.Level_9_3)
+            {
+                throw new InvalidOperationException("Cannot generate more than 65535 indices on feature level HW <= 9.3");
+            }
+
+            int indexBufferOffset = 0;
+
+            Array.Copy(circle.Indices, indexData, circle.Indices.Length);
+            primitiveIndexOffsets.Circles = indexBufferOffset;
+            indexBufferOffset += circle.Indices.Length;
+
+            Array.Copy(plane.Indices, 0, indexData, indexBufferOffset, plane.Indices.Length);
+            primitiveIndexOffsets.Quads = indexBufferOffset;
+            indexBufferOffset += plane.Indices.Length;
+
+            Array.Copy(sphere.Indices, 0, indexData, indexBufferOffset, sphere.Indices.Length);
+            primitiveIndexOffsets.Spheres = indexBufferOffset;
+            primitiveIndexOffsets.HalfSpheres = indexBufferOffset; // same as spheres
+            indexBufferOffset += sphere.Indices.Length;
+
+            Array.Copy(cube.Indices, 0, indexData, indexBufferOffset, cube.Indices.Length);
+            primitiveIndexOffsets.Cubes = indexBufferOffset;
+            indexBufferOffset += cube.Indices.Length;
+
+            Array.Copy(capsule.Indices, 0, indexData, indexBufferOffset, capsule.Indices.Length);
+            primitiveIndexOffsets.Capsules = indexBufferOffset;
+            indexBufferOffset += capsule.Indices.Length;
+
+            Array.Copy(cylinder.Indices, 0, indexData, indexBufferOffset, cylinder.Indices.Length);
+            primitiveIndexOffsets.Cylinders = indexBufferOffset;
+            indexBufferOffset += cylinder.Indices.Length;
+
+            Array.Copy(cone.Indices, 0, indexData, indexBufferOffset, cone.Indices.Length);
+            primitiveIndexOffsets.Cones = indexBufferOffset;
+            indexBufferOffset += cone.Indices.Length;
+
+            var newIndexBuffer = Buffer.Index.New<int>(device, indexData);
+            indexBuffer = newIndexBuffer;
+
+            // allocate our buffers with position/colour etc data
+            var newTransformBuffer = Buffer.Structured.New<Matrix>(device, 1);
+            transformBuffer = newTransformBuffer;
+
+            var newColourBuffer = Buffer.Structured.New<Color>(device, colors.Items);
+            colorBuffer = newColourBuffer;
+
+            var newLineVertexBuffer = Buffer.Vertex.New<LineVertex>(device, lineVertices.Items, GraphicsResourceUsage.Dynamic);
+            lineVertexBuffer = newLineVertexBuffer;
+
+        }
+
+        public override void Extract()
+        {
+
+            void ProcessRenderables(FastList<Renderable> renderables, ref Primitives offsets)
+            {
+
+                for (int i = 0; i < renderables.Count; ++i)
+                {
+                    ref var cmd = ref renderables.Items[i];
+                    switch (cmd.Type)
+                    {
+                        case RenderableType.Quad:
+                            instances.Items[offsets.Quads].Position = cmd.QuadData.Position;
+                            instances.Items[offsets.Quads].Rotation = cmd.QuadData.Rotation;
+                            instances.Items[offsets.Quads].Scale = new Vector3(cmd.QuadData.Size.X, 1.0f, cmd.QuadData.Size.Y);
+                            instances.Items[offsets.Quads].Color = cmd.QuadData.Color;
+                            offsets.Quads++;
+                            break;
+                        case RenderableType.Circle:
+                            instances.Items[offsets.Circles].Position = cmd.CircleData.Position;
+                            instances.Items[offsets.Circles].Rotation = cmd.CircleData.Rotation;
+                            instances.Items[offsets.Circles].Scale = new Vector3(cmd.CircleData.Radius * 2.0f, 0.0f, cmd.CircleData.Radius * 2.0f);
+                            instances.Items[offsets.Circles].Color = cmd.CircleData.Color;
+                            offsets.Circles++;
+                            break;
+                        case RenderableType.Sphere:
+                            instances.Items[offsets.Spheres].Position = cmd.SphereData.Position;
+                            instances.Items[offsets.Spheres].Rotation = Quaternion.Identity;
+                            instances.Items[offsets.Spheres].Scale = new Vector3(cmd.SphereData.Radius * 2);
+                            instances.Items[offsets.Spheres].Color = cmd.SphereData.Color;
+                            offsets.Spheres++;
+                            break;
+                        case RenderableType.HalfSphere:
+                            instances.Items[offsets.HalfSpheres].Position = cmd.HalfSphereData.Position;
+                            instances.Items[offsets.HalfSpheres].Rotation = cmd.HalfSphereData.Rotation;
+                            instances.Items[offsets.HalfSpheres].Scale = new Vector3(cmd.HalfSphereData.Radius * 2);
+                            instances.Items[offsets.HalfSpheres].Color = cmd.HalfSphereData.Color;
+                            offsets.HalfSpheres++;
+                            break;
+                        case RenderableType.Cube:
+                            ref var start = ref cmd.CubeData.Start;
+                            ref var end = ref cmd.CubeData.End;
+                            instances.Items[offsets.Cubes].Position = start;
+                            instances.Items[offsets.Cubes].Rotation = cmd.CubeData.Rotation;
+                            instances.Items[offsets.Cubes].Scale = end - start;
+                            instances.Items[offsets.Cubes].Color = cmd.CubeData.Color;
+                            offsets.Cubes++;
+                            break;
+                        case RenderableType.Capsule:
+                            instances.Items[offsets.Capsules].Position = cmd.CapsuleData.Position;
+                            instances.Items[offsets.Capsules].Rotation = cmd.CapsuleData.Rotation;
+                            instances.Items[offsets.Capsules].Scale = new Vector3(cmd.CapsuleData.Radius * 2.0f, cmd.CapsuleData.Height, cmd.CapsuleData.Radius * 2.0f);
+                            instances.Items[offsets.Capsules].Color = cmd.CapsuleData.Color;
+                            offsets.Capsules++;
+                            break;
+                        case RenderableType.Cylinder:
+                            instances.Items[offsets.Cylinders].Position = cmd.CylinderData.Position;
+                            instances.Items[offsets.Cylinders].Rotation = cmd.CylinderData.Rotation;
+                            instances.Items[offsets.Cylinders].Scale = new Vector3(cmd.CylinderData.Radius * 2.0f, cmd.CylinderData.Height, cmd.CylinderData.Radius * 2.0f);
+                            instances.Items[offsets.Cylinders].Color = cmd.CylinderData.Color;
+                            offsets.Cylinders++;
+                            break;
+                        case RenderableType.Cone:
+                            instances.Items[offsets.Cones].Position = cmd.ConeData.Position;
+                            instances.Items[offsets.Cones].Rotation = cmd.ConeData.Rotation;
+                            instances.Items[offsets.Cones].Scale = new Vector3(cmd.ConeData.Radius * 2.0f, cmd.ConeData.Height, cmd.ConeData.Radius * 2.0f);
+                            instances.Items[offsets.Cones].Color = cmd.ConeData.Color;
+                            offsets.Cones++;
+                            break;
+                        case RenderableType.Line:
+                            lineVertices.Items[offsets.Lines].Position = cmd.LineData.Start;
+                            lineVertices.Items[offsets.Lines++].Color = cmd.LineData.Color;
+                            lineVertices.Items[offsets.Lines].Position = cmd.LineData.End;
+                            lineVertices.Items[offsets.Lines++].Color = cmd.LineData.Color;
+                            break;
+                    }
+                }
+
+            }
+
+            int SumBasicPrimitives(ref Primitives primitives)
+            {
+                return primitives.Quads
+                    + primitives.Circles
+                    + primitives.Spheres
+                    + primitives.HalfSpheres
+                    + primitives.Cubes
+                    + primitives.Capsules
+                    + primitives.Cylinders
+                    + primitives.Cones;
+            }
+
+            Primitives SetupPrimitiveOffsets(ref Primitives counts, int offset = 0)
+            {
+                var offsets = new Primitives();
+                offsets.Quads = 0 + offset;
+                offsets.Circles = offsets.Quads + counts.Quads;
+                offsets.Spheres = offsets.Circles + counts.Circles;
+                offsets.HalfSpheres = offsets.Spheres + counts.Spheres;
+                offsets.Cubes = offsets.HalfSpheres + counts.HalfSpheres;
+                offsets.Capsules = offsets.Cubes + counts.Cubes;
+                offsets.Cylinders = offsets.Capsules + counts.Capsules;
+                offsets.Cones = offsets.Cylinders + counts.Cylinders;
+                return offsets;
+            }
+
+            int lastOffset = 0;
+            int lastLineOffset = 0;
+            foreach (RenderObject renderObject in RenderObjects)
+            {
+
+                DebugRenderObject debugObject = (DebugRenderObject)renderObject;
+
+                /* everything except lines is included here, as lines just get accumulated into a buffer directly */
+                int primitivesWithDepth = SumBasicPrimitives(ref debugObject.totalPrimitives);
+                int primitivesWithoutDepth = SumBasicPrimitives(ref debugObject.totalPrimitivesNoDepth);
+                int totalThingsToDraw = primitivesWithDepth + primitivesWithoutDepth;
+
+                instances.Resize(instances.Count + totalThingsToDraw, true);
+
+                lineVertices.Resize(lineVertices.Count + (debugObject.totalPrimitives.Lines * 2) + (debugObject.totalPrimitivesNoDepth.Lines * 2), true);
+
+                var primitiveOffsets = SetupPrimitiveOffsets(ref debugObject.totalPrimitives, lastOffset);
+                var primitiveOffsetsNoDepth = SetupPrimitiveOffsets(ref debugObject.totalPrimitivesNoDepth, primitiveOffsets.Cones + debugObject.totalPrimitives.Cones);
+
+                /* line rendering data, separate buffer so offset isnt relative to the other data */
+                primitiveOffsets.Lines = 0 + lastLineOffset;
+                primitiveOffsetsNoDepth.Lines = debugObject.totalPrimitives.Lines * 2 + lastLineOffset;
+
+                /* save instance offsets before we mutate them as we need them when rendering */
+                debugObject.instanceOffsets = primitiveOffsets;
+                debugObject.instanceOffsetsNoDepth = primitiveOffsetsNoDepth;
+
+                ProcessRenderables(debugObject.renderablesWithDepth, ref primitiveOffsets);
+                ProcessRenderables(debugObject.renderablesNoDepth, ref primitiveOffsetsNoDepth);
+
+                debugObject.primitivesToDraw = debugObject.totalPrimitives;
+                debugObject.primitivesToDrawNoDepth = debugObject.totalPrimitivesNoDepth;
+
+                // store the last offsets, so we can start from there next iteration
+                lastOffset = debugObject.instanceOffsetsNoDepth.Cones + debugObject.totalPrimitivesNoDepth.Cones;
+                lastLineOffset = debugObject.instanceOffsetsNoDepth.Lines + debugObject.totalPrimitivesNoDepth.Lines * 2;
+
+                // only now clear this data...
+                debugObject.renderablesWithDepth.Clear(true);
+                debugObject.renderablesNoDepth.Clear(true);
+                debugObject.totalPrimitives.Clear();
+                debugObject.totalPrimitivesNoDepth.Clear();
+
+            }
+
+        }
+
+        private unsafe static void UpdateBufferIfNecessary(GraphicsDevice device, CommandList commandList, ref Buffer buffer, DataPointer dataPtr, int elementSize)
+        {
+            int neededBufferSize = dataPtr.Size / elementSize;
+            if (neededBufferSize > buffer.ElementCount)
+            {
+                buffer.Dispose();
+                var newBuffer = Xenko.Graphics.Buffer.New(
+                    device,
+                    dataPtr,
+                    buffer.StructureByteStride,
+                    buffer.Flags
+                );
+                buffer = newBuffer;
+            }
+            else
+            {
+                buffer.SetData(commandList, dataPtr);
+            }
+        }
+
+        private void CheckBuffers(RenderDrawContext context)
+        {
+
+            unsafe
+            {
+
+                fixed (Matrix* transformsPtr = transforms.Items)
+                {
+                    UpdateBufferIfNecessary(
+                        context.GraphicsDevice, context.CommandList, buffer: ref transformBuffer,
+                        dataPtr: new DataPointer(transformsPtr, transforms.Count * Marshal.SizeOf<Matrix>()),
+                        elementSize: Marshal.SizeOf<Matrix>()
+                    );
+                }
+
+                fixed (Color* colorsPtr = colors.Items)
+                {
+                    UpdateBufferIfNecessary(
+                        context.GraphicsDevice, context.CommandList, buffer: ref colorBuffer,
+                        dataPtr: new DataPointer(colorsPtr, colors.Count * Marshal.SizeOf<Color>()),
+                        elementSize: Marshal.SizeOf<Color>()
+                    );
+                }
+
+                fixed (LineVertex* lineVertsPtr = lineVertices.Items)
+                {
+                    UpdateBufferIfNecessary(
+                        context.GraphicsDevice, context.CommandList, buffer: ref lineVertexBuffer,
+                        dataPtr: new DataPointer(lineVertsPtr, lineVertices.Count * Marshal.SizeOf<LineVertex>()),
+                        elementSize: Marshal.SizeOf<LineVertex>()
+                    );
+                }
+
+            }
+
+        }
+
+        public override void Prepare(RenderDrawContext context)
+        {
+
+            transforms.Resize(instances.Count, true);
+            colors.Resize(instances.Count, true);
+
+            Dispatcher.For(0, transforms.Count, (int i) =>
+            {
+                ref var instance = ref instances.Items[i];
+                Matrix.Transformation(ref instance.Scale, ref instance.Rotation, ref instance.Position, out transforms.Items[i]);
+                colors[i] = instance.Color;
+            }
+            );
+
+            CheckBuffers(context);
+            lineVertices.Clear(true);
+            instances.Clear(true);
+
+        }
+
+        private void SetPrimitiveRenderingPipelineState(CommandList commandList, bool depthTest, FillMode selectedFillMode, bool isDoubleSided = false, bool hasTransparency = false)
+        {
+
+            pipelineState.State.SetDefaults();
+            pipelineState.State.PrimitiveType = PrimitiveType.TriangleList;
+            pipelineState.State.RootSignature = primitiveEffect.RootSignature;
+            pipelineState.State.EffectBytecode = primitiveEffect.Effect.Bytecode;
+            pipelineState.State.DepthStencilState = (depthTest) ? (hasTransparency ? DepthStencilStates.DepthRead : DepthStencilStates.Default) : DepthStencilStates.None;
+            pipelineState.State.RasterizerState.FillMode = selectedFillMode;
+            pipelineState.State.RasterizerState.CullMode = (selectedFillMode == FillMode.Solid && !isDoubleSided) ? CullMode.Back : CullMode.None;
+            pipelineState.State.BlendState = hasTransparency ? BlendStates.NonPremultiplied : BlendStates.Opaque;
+            pipelineState.State.Output.CaptureState(commandList);
+            pipelineState.State.InputElements = inputElements;
+            pipelineState.Update();
+
+        }
+
+        private void SetLineRenderingPipelineState(CommandList commandList, bool depthTest, bool hasTransparency = false)
+        {
+            pipelineState.State.SetDefaults();
+            pipelineState.State.PrimitiveType = PrimitiveType.LineList;
+            pipelineState.State.RootSignature = lineEffect.RootSignature;
+            pipelineState.State.EffectBytecode = lineEffect.Effect.Bytecode;
+            pipelineState.State.DepthStencilState = (depthTest) ? (hasTransparency ? DepthStencilStates.DepthRead : DepthStencilStates.Default) : DepthStencilStates.None;
+            pipelineState.State.RasterizerState.FillMode = FillMode.Solid;
+            pipelineState.State.RasterizerState.CullMode = CullMode.None;
+            pipelineState.State.BlendState = (hasTransparency) ? BlendStates.NonPremultiplied : BlendStates.Opaque;
+            pipelineState.State.Output.CaptureState(commandList);
+            pipelineState.State.InputElements = lineInputElements;
+            pipelineState.Update();
+        }
+
+        private void RenderPrimitives(RenderDrawContext context, RenderView renderView, ref Primitives offsets, ref Primitives counts, bool depthTest, FillMode fillMode, bool hasTransparency)
+        {
+
+            var commandList = context.CommandList;
+
+            // set buffers and our current pipeline state
+            commandList.SetVertexBuffer(0, vertexBuffer, 0, VertexPositionTexture.Layout.VertexStride);
+            commandList.SetIndexBuffer(indexBuffer, 0, is32bits: true);
+            commandList.SetPipelineState(pipelineState.CurrentState);
+
+            // we set line width to something absurdly high to avoid having to alter our shader substantially for now
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.LineWidthMultiplier, (fillMode == FillMode.Solid) ? 10000.0f : 1.0f);
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.ViewProjection, renderView.ViewProjection);
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.Transforms, transformBuffer);
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.Colors, colorBuffer);
+
+            primitiveEffect.UpdateEffect(context.GraphicsDevice);
+            primitiveEffect.Apply(context.GraphicsContext);
+
+            // draw spheres
+            if (counts.Spheres > 0)
+            {
+
+                SetPrimitiveRenderingPipelineState(commandList, depthTest, fillMode, isDoubleSided: false, hasTransparency: hasTransparency);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Spheres);
+                primitiveEffect.Apply(context.GraphicsContext);
+
+                commandList.DrawIndexedInstanced(sphere.Indices.Length, counts.Spheres, primitiveIndexOffsets.Spheres, primitiveVertexOffsets.Spheres);
+
+            }
+
+            if (counts.Quads > 0 || counts.Circles > 0 || counts.HalfSpheres > 0)
+            {
+
+                SetPrimitiveRenderingPipelineState(commandList, depthTest, fillMode, isDoubleSided: true, hasTransparency: hasTransparency);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                // draw quads
+                if (counts.Quads > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Quads);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(plane.Indices.Length, counts.Quads, primitiveIndexOffsets.Quads, primitiveVertexOffsets.Quads);
+
+                }
+
+                // draw circles
+                if (counts.Circles > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Circles);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(circle.Indices.Length, counts.Circles, primitiveIndexOffsets.Circles, primitiveVertexOffsets.Circles);
+
+                }
+
+                // draw half spheres
+                if (counts.HalfSpheres > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.HalfSpheres);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    // HACK: we sort of abuse knowledge of the mesh primitive here.. :P
+                    commandList.DrawIndexedInstanced(sphere.Indices.Length / 2, counts.HalfSpheres, primitiveIndexOffsets.HalfSpheres, primitiveVertexOffsets.HalfSpheres);
+
+                }
+
+            }
+
+            if (counts.Cubes > 0 || counts.Capsules > 0 || counts.Cylinders > 0 || counts.Cones > 0)
+            {
+
+                SetPrimitiveRenderingPipelineState(commandList, depthTest, fillMode, isDoubleSided: false, hasTransparency: hasTransparency);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                // draw cubes
+                if (counts.Cubes > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Cubes);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(cube.Indices.Length, counts.Cubes, primitiveIndexOffsets.Cubes, primitiveVertexOffsets.Cubes);
+
+                }
+
+                // draw capsules
+                if (counts.Capsules > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Capsules);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(capsule.Indices.Length, counts.Capsules, primitiveIndexOffsets.Capsules, primitiveVertexOffsets.Capsules);
+
+                }
+
+                // draw cylinders
+                if (counts.Cylinders > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Cylinders);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(cylinder.Indices.Length, counts.Cylinders, primitiveIndexOffsets.Cylinders, primitiveVertexOffsets.Cylinders);
+
+                }
+
+                // draw cones
+                if (counts.Cones > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Cones);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(cone.Indices.Length, counts.Cones, primitiveIndexOffsets.Cones, primitiveVertexOffsets.Cones);
+
+                }
+
+            }
+
+            // draw lines
+            if (counts.Lines > 0)
+            {
+
+                SetLineRenderingPipelineState(commandList, depthTest, hasTransparency);
+                commandList.SetVertexBuffer(0, lineVertexBuffer, 0, LineVertex.Layout.VertexStride);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                lineEffect.Parameters.Set(LinePrimitiveShaderKeys.ViewProjection, renderView.ViewProjection);
+                lineEffect.UpdateEffect(context.GraphicsDevice);
+                lineEffect.Apply(context.GraphicsContext);
+
+                commandList.Draw(counts.Lines * 2, offsets.Lines);
+
+            }
+
+        }
+
+        public override void Draw(RenderDrawContext context, RenderView renderView, RenderViewStage renderViewStage, int startIndex, int endIndex)
+        {
+
+            var commandList = context.CommandList;
+
+            for (int index = startIndex; index < endIndex; index++)
+            {
+
+                var renderNodeReference = renderViewStage.SortedRenderNodes[index].RenderNode;
+                var debugObject = (DebugRenderObject)(GetRenderNode(renderNodeReference).RenderObject);
+                bool objectHasTransparency = debugObject.Stage == DebugRenderStage.Transparent;
+
+                // update pipeline state, render with depth test first
+                SetPrimitiveRenderingPipelineState(commandList, depthTest: true, selectedFillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+                RenderPrimitives(context, renderView, ref debugObject.instanceOffsets, ref debugObject.primitivesToDraw, depthTest: true, fillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+
+                // render without depth test second
+                SetPrimitiveRenderingPipelineState(commandList, depthTest: false, selectedFillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+                RenderPrimitives(context, renderView, offsets: ref debugObject.instanceOffsetsNoDepth, counts: ref debugObject.primitivesToDrawNoDepth, depthTest: false, fillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+
+            }
+
+        }
+
+        public override void Flush(RenderDrawContext context)
+        {
+        }
+
+        /* FIXME: is there a nicer way to handle dispose, some xenko idiom? */
+
+        public override void Unload()
+        {
+            base.Unload();
+            transformBuffer.Dispose();
+            colorBuffer.Dispose();
+            vertexBuffer.Dispose();
+            indexBuffer.Dispose();
+            lineVertexBuffer.Dispose();
+        }
+
+    }
+
+}
diff --git a/sources/engine/Xenko.Debug/DebugRenderObject.cs b/sources/engine/Xenko.Debug/DebugRenderObject.cs
new file mode 100644
index 0000000000..eb124e6936
--- /dev/null
+++ b/sources/engine/Xenko.Debug/DebugRenderObject.cs
@@ -0,0 +1,180 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+using Xenko.Rendering;
+
+using static Xenko.DebugRendering.DebugRenderFeature;
+
+namespace Xenko.DebugRendering
+{
+    public class DebugRenderObject : RenderObject
+    {
+
+        /* messages */
+        internal readonly FastList<Renderable> renderablesWithDepth = new FastList<Renderable>();
+        internal readonly FastList<Renderable> renderablesNoDepth = new FastList<Renderable>();
+
+        /* accumulators used when data is being pushed to the system */
+        internal Primitives totalPrimitives, totalPrimitivesNoDepth;
+
+        /* used to specify offset into instance data buffers when drawing */
+        internal Primitives instanceOffsets, instanceOffsetsNoDepth;
+
+        /* used in render stage to know how many of each instance to draw */
+        internal Primitives primitivesToDraw, primitivesToDrawNoDepth;
+
+        /* state set from outside */
+        internal FillMode CurrentFillMode { get; set; } = FillMode.Wireframe;
+
+        internal DebugRenderStage Stage { get; set; }
+
+        public void DrawQuad(ref Vector3 position, ref Vector2 size, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Quad() { Position = position, Size = size, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Quads++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Quads++;
+            }
+        }
+
+        public void DrawCircle(ref Vector3 position, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Circle() { Position = position, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Circles++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Circles++;
+            }
+        }
+
+        public void DrawSphere(ref Vector3 position, float radius, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Sphere() { Position = position, Radius = radius, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Spheres++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Spheres++;
+            }
+        }
+
+        public void DrawHalfSphere(ref Vector3 position, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new HalfSphere() { Position = position, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.HalfSpheres++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.HalfSpheres++;
+            }
+        }
+
+        public void DrawCube(ref Vector3 start, ref Vector3 end, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Cube() { Start = start, End = end, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Cubes++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Cubes++;
+            }
+        }
+
+        public void DrawCapsule(ref Vector3 position, float height, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Capsule() { Position = position, Height = height, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Capsules++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Capsules++;
+            }
+        }
+
+        public void DrawCylinder(ref Vector3 position, float height, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Cylinder() { Position = position, Height = height, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Cylinders++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Cylinders++;
+            }
+        }
+
+        public void DrawCone(ref Vector3 position, float height, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Cone() { Position = position, Height = height, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Cones++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Cones++;
+            }
+        }
+
+        public void DrawLine(ref Vector3 start, ref Vector3 end, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Line() { Start = start, End = end, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Lines++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Lines++;
+            }
+        }
+
+    }
+
+}
diff --git a/sources/engine/Xenko.Debug/DebugRenderStageSelector.cs b/sources/engine/Xenko.Debug/DebugRenderStageSelector.cs
new file mode 100644
index 0000000000..f1e8fa5ea0
--- /dev/null
+++ b/sources/engine/Xenko.Debug/DebugRenderStageSelector.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.ComponentModel;
+using Xenko.Rendering;
+
+using static Xenko.DebugRendering.DebugRenderFeature;
+
+namespace Xenko.DebugRendering
+{
+    public class DebugRenderStageSelector : RenderStageSelector
+    {
+
+        [DefaultValue(RenderGroupMask.All)]
+        public RenderGroupMask RenderGroup { get; set; } = RenderGroupMask.All;
+
+        [DefaultValue(null)]
+        public RenderStage OpaqueRenderStage { get; set; }
+
+        [DefaultValue(null)]
+        public RenderStage TransparentRenderStage { get; set; }
+
+        public override void Process(RenderObject renderObject)
+        {
+            if (((RenderGroupMask)(1U << (int)renderObject.RenderGroup) & RenderGroup) != 0)
+            {
+                var debugObject = (DebugRenderObject)renderObject;
+                var renderStage = (debugObject.Stage == DebugRenderStage.Opaque) ? OpaqueRenderStage : TransparentRenderStage;
+                if (renderStage != null)
+                {
+                    renderObject.ActiveRenderStages[renderStage.Index] = new ActiveRenderStage(null);
+                }
+            }
+        }
+
+    }
+}
diff --git a/sources/engine/Xenko.Debug/DebugRenderSystem.cs b/sources/engine/Xenko.Debug/DebugRenderSystem.cs
new file mode 100644
index 0000000000..38238759ba
--- /dev/null
+++ b/sources/engine/Xenko.Debug/DebugRenderSystem.cs
@@ -0,0 +1,511 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Graphics;
+using Xenko.Rendering;
+
+namespace Xenko.DebugRendering
+{
+
+    public class DebugRenderSystem : GameSystemBase
+    {
+
+        internal enum DebugRenderableType : byte
+        {
+            Quad,
+            Circle,
+            Line,
+            Cube,
+            Sphere,
+            HalfSphere,
+            Capsule,
+            Cylinder,
+            Cone
+        }
+
+        internal enum DebugRenderableFlags : byte
+        {
+            Solid = (1 << 0),
+            Wireframe = (1 << 1),
+            DepthTest = (1 << 2)
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        internal struct DebugRenderable
+        {
+
+            public DebugRenderable(ref DebugDrawQuad q, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Quad;
+                Flags = renderFlags;
+                QuadData = q;
+            }
+
+            public DebugRenderable(ref DebugDrawCircle c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Circle;
+                Flags = renderFlags;
+                CircleData = c;
+            }
+
+            public DebugRenderable(ref DebugDrawLine l, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Line;
+                Flags = renderFlags;
+                LineData = l;
+            }
+
+            public DebugRenderable(ref DebugDrawCube b, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Cube;
+                Flags = renderFlags;
+                CubeData = b;
+            }
+
+            public DebugRenderable(ref DebugDrawSphere s, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Sphere;
+                Flags = renderFlags;
+                SphereData = s;
+            }
+
+            public DebugRenderable(ref DebugDrawHalfSphere h, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.HalfSphere;
+                Flags = renderFlags;
+                HalfSphereData = h;
+            }
+
+            public DebugRenderable(ref DebugDrawCapsule c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Capsule;
+                Flags = renderFlags;
+                CapsuleData = c;
+            }
+
+            public DebugRenderable(ref DebugDrawCylinder c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Cylinder;
+                Flags = renderFlags;
+                CylinderData = c;
+            }
+
+            public DebugRenderable(ref DebugDrawCone c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Cone;
+                Flags = renderFlags;
+                ConeData = c;
+            }
+
+            [FieldOffset(0)]
+            public DebugRenderableType Type;
+
+            [FieldOffset(sizeof(byte))]
+            public DebugRenderableFlags Flags;
+
+            [FieldOffset(sizeof(byte) * 2)]
+            public float Lifetime;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawQuad QuadData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCircle CircleData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawLine LineData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCube CubeData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawSphere SphereData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawHalfSphere HalfSphereData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCapsule CapsuleData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCylinder CylinderData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCone ConeData;
+
+        }
+
+        internal struct DebugDrawQuad
+        {
+            public Vector3 Position;
+            public Vector2 Size;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCircle
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawLine
+        {
+            public Vector3 Start;
+            public Vector3 End;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCube
+        {
+            public Vector3 Position;
+            public Vector3 End;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawSphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Color Color;
+        }
+
+        internal struct DebugDrawHalfSphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCapsule
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCylinder
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCone
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        private readonly FastList<DebugRenderable> renderMessages = new FastList<DebugRenderable>();
+        private readonly FastList<DebugRenderable> renderMessagesWithLifetime = new FastList<DebugRenderable>();
+
+        private DebugRenderObject solidPrimitiveRenderer;
+        private DebugRenderObject wireframePrimitiveRenderer;
+        private DebugRenderObject transparentSolidPrimitiveRenderer;
+        private DebugRenderObject transparentWireframePrimitiveRenderer;
+
+        public Color PrimitiveColor { get; set; } = Color.LightGreen;
+
+        public int MaxPrimitives { get; set; } = 100;
+        public int MaxPrimitivesWithLifetime { get; set; } = 100;
+
+        public RenderGroup RenderGroup { get; set; } = RenderGroup.Group31;
+
+        public DebugRenderSystem(IServiceRegistry registry) : base(registry)
+        {
+            Enabled = true;
+            Visible = Platform.IsRunningDebugAssembly;
+
+            DrawOrder = 0xffffff;
+            UpdateOrder = -100100; //before script
+        }
+
+        private void PushMessage(ref DebugRenderable msg)
+        {
+            if (msg.Lifetime > 0.0f)
+            {
+                renderMessagesWithLifetime.Add(msg);
+                // drop one old message if the tail size has been reached
+                if (renderMessagesWithLifetime.Count > MaxPrimitivesWithLifetime)
+                {
+                    renderMessagesWithLifetime.RemoveAt(renderMessagesWithLifetime.Count - 1);
+                }
+            }
+            else
+            {
+                renderMessages.Add(msg);
+                // drop one old message if the tail size has been reached
+                if (renderMessages.Count > MaxPrimitives)
+                {
+                    renderMessages.RemoveAt(renderMessages.Count - 1);
+                }
+            }
+        }
+
+        public void DrawLine(Vector3 start, Vector3 end, Color color = default, float duration = 0.0f, bool depthTest = true)
+        {
+            var cmd = new DebugDrawLine { Start = start, End = end, Color = color == default ? PrimitiveColor : color };
+            var msg = new DebugRenderable(ref cmd, depthTest ? DebugRenderableFlags.DepthTest : 0) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawLines(Vector3[] vertices, Color? color = null, float duration = 0.0f, bool depthTest = true)
+        {
+            var totalVertexPairs = vertices.Length - (vertices.Length % 2);
+            for (int i = 0; i < totalVertexPairs; i += 2)
+            {
+                ref var v1 = ref vertices[i];
+                ref var v2 = ref vertices[i];
+                DrawLine(v1, v2, color ?? PrimitiveColor, duration, depthTest);
+            }
+        }
+
+        public void DrawRay(Vector3 start, Vector3 dir, Color color = default, float duration = 0.0f, bool depthTest = true)
+        {
+            DrawLine(start, start + dir, color == default ? PrimitiveColor : color, duration, depthTest);
+        }
+
+        public void DrawArrow(Vector3 from, Vector3 to, float coneHeight = 0.25f, float coneRadius = 0.125f, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            DrawLine(from, to, color, duration, depthTest);
+            DrawCone(to, coneHeight, coneRadius, Quaternion.BetweenDirections(new Vector3(0.0f, 1.0f, 0.0f), to - from), color == default ? PrimitiveColor : color, duration, depthTest, solid);
+        }
+
+        public void DrawSphere(Vector3 position, float radius, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawSphere { Position = position, Radius = radius, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawHalfSphere(Vector3 position, float radius, Color color = default, Quaternion rotation = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawHalfSphere { Position = position, Radius = radius, Rotation = rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawBounds(Vector3 start, Vector3 end, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCube { Position = start + ((end - start) / 2), End = end + ((end - start) / 2), Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCube(Vector3 start, Vector3 size, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCube { Position = start, End = start + size, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCapsule(Vector3 position, float height, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            // FIXME: height is divided by two here but can probably be solved more elegantly elsewhere yes
+            var cmd = new DebugDrawCapsule { Position = position, Height = height / 2.0f, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCylinder(Vector3 position, float height, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCylinder { Position = position, Height = height, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCone(Vector3 position, float height, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCone { Position = position, Height = height, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawQuad(Vector3 position, Vector2 size, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawQuad { Position = position, Size = size, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCircle(Vector3 position, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCircle { Position = position, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        private bool CreateDebugRenderObjects()
+        {
+
+            // TODO: is this sane at all? it still seems a bit off.. what happens if the VisibilityGroups stuff gets changed/updated for instance?
+            //  or will that never happen? ask xen2 about this and visibilitygroups again specifically.....
+            var renderContext = RenderContext.GetShared(Services);
+            if (renderContext == null)
+                return false;
+
+            var visibilityGroup = renderContext.VisibilityGroup;
+            if (visibilityGroup == null)
+                return false;
+
+            var newSolidRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Solid,
+                Stage = DebugRenderFeature.DebugRenderStage.Opaque
+            };
+            visibilityGroup.RenderObjects.Add(newSolidRenderObject);
+            solidPrimitiveRenderer = newSolidRenderObject;
+
+            var newWireframeRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Wireframe,
+                Stage = DebugRenderFeature.DebugRenderStage.Opaque
+            };
+            visibilityGroup.RenderObjects.Add(newWireframeRenderObject);
+            wireframePrimitiveRenderer = newWireframeRenderObject;
+
+            var newTransparentSolidRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Solid,
+                Stage = DebugRenderFeature.DebugRenderStage.Transparent
+            };
+            visibilityGroup.RenderObjects.Add(newTransparentSolidRenderObject);
+            transparentSolidPrimitiveRenderer = newTransparentSolidRenderObject;
+
+            var newTransparentWireframeRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Wireframe,
+                Stage = DebugRenderFeature.DebugRenderStage.Transparent
+            };
+            visibilityGroup.RenderObjects.Add(newTransparentWireframeRenderObject);
+            transparentWireframePrimitiveRenderer = newTransparentWireframeRenderObject;
+
+            return true;
+
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+
+            if (!Enabled || !Visible)
+                return;
+
+            if (wireframePrimitiveRenderer == null)
+            {
+                bool created = CreateDebugRenderObjects();
+                if (!created)
+                    return;
+            }
+
+            // TODO: check if i'm doing this correctly..
+            solidPrimitiveRenderer.RenderGroup = RenderGroup;
+            wireframePrimitiveRenderer.RenderGroup = RenderGroup;
+            transparentSolidPrimitiveRenderer.RenderGroup = RenderGroup;
+            transparentWireframePrimitiveRenderer.RenderGroup = RenderGroup;
+
+            HandlePrimitives(gameTime, renderMessages);
+            HandlePrimitives(gameTime, renderMessagesWithLifetime);
+
+            float delta = (float)gameTime.Elapsed.TotalSeconds;
+
+            /* clear out any messages with no lifetime left */
+            for (int i = 0; i < renderMessagesWithLifetime.Count; ++i)
+            {
+                renderMessagesWithLifetime.Items[i].Lifetime -= delta;
+            }
+
+            renderMessagesWithLifetime.RemoveAll((msg) => msg.Lifetime <= 0.0f);
+
+            /* just clear our per-frame array */
+            renderMessages.Clear(true);
+
+        }
+
+        private void HandlePrimitives(GameTime gameTime, FastList<DebugRenderable> messages)
+        {
+
+            DebugRenderObject ChooseRenderer(DebugRenderableFlags flags, byte alpha)
+            {
+                if (alpha < 255)
+                {
+                    return ((flags & DebugRenderableFlags.Solid) != 0) ? transparentSolidPrimitiveRenderer : transparentWireframePrimitiveRenderer;
+                }
+                else
+                {
+                    return ((flags & DebugRenderableFlags.Solid) != 0) ? solidPrimitiveRenderer : wireframePrimitiveRenderer;
+                }
+            }
+
+            if (messages.Count == 0)
+            {
+                return;
+            }
+
+            for (int i = 0; i < messages.Count; ++i)
+            {
+                ref var msg = ref messages.Items[i];
+                var useDepthTest = (msg.Flags & DebugRenderableFlags.DepthTest) != 0;
+                switch (msg.Type)
+                {
+                    case DebugRenderableType.Quad:
+                        ChooseRenderer(msg.Flags, msg.QuadData.Color.A).DrawQuad(ref msg.QuadData.Position, ref msg.QuadData.Size, ref msg.QuadData.Rotation, ref msg.QuadData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Circle:
+                        ChooseRenderer(msg.Flags, msg.CircleData.Color.A).DrawCircle(ref msg.CircleData.Position, msg.CircleData.Radius, ref msg.CircleData.Rotation, ref msg.CircleData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Line:
+                        ChooseRenderer(msg.Flags, msg.LineData.Color.A).DrawLine(ref msg.LineData.Start, ref msg.LineData.End, ref msg.LineData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Cube:
+                        ChooseRenderer(msg.Flags, msg.CubeData.Color.A).DrawCube(ref msg.CubeData.Position, ref msg.CubeData.End, ref msg.CubeData.Rotation, ref msg.CubeData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Sphere:
+                        ChooseRenderer(msg.Flags, msg.SphereData.Color.A).DrawSphere(ref msg.SphereData.Position, msg.SphereData.Radius, ref msg.SphereData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.HalfSphere:
+                        ChooseRenderer(msg.Flags, msg.HalfSphereData.Color.A).DrawHalfSphere(ref msg.HalfSphereData.Position, msg.HalfSphereData.Radius, ref msg.HalfSphereData.Rotation, ref msg.HalfSphereData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Capsule:
+                        ChooseRenderer(msg.Flags, msg.CapsuleData.Color.A).DrawCapsule(ref msg.CapsuleData.Position, msg.CapsuleData.Height, msg.CapsuleData.Radius, ref msg.CapsuleData.Rotation, ref msg.CapsuleData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Cylinder:
+                        ChooseRenderer(msg.Flags, msg.CylinderData.Color.A).DrawCylinder(ref msg.CylinderData.Position, msg.CylinderData.Height, msg.CylinderData.Radius, ref msg.CylinderData.Rotation, ref msg.CylinderData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Cone:
+                        ChooseRenderer(msg.Flags, msg.ConeData.Color.A).DrawCone(ref msg.ConeData.Position, msg.ConeData.Height, msg.ConeData.Radius, ref msg.ConeData.Rotation, ref msg.ConeData.Color, depthTest: useDepthTest);
+                        break;
+                }
+            }
+
+        }
+
+    }
+
+}
diff --git a/sources/engine/Xenko.Debug/Module.cs b/sources/engine/Xenko.Debug/Module.cs
new file mode 100644
index 0000000000..fce617b991
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Module.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Reflection;
+using Xenko.Core;
+using Xenko.Core.Reflection;
+
+namespace Xenko.DebugRendering
+{
+    class Module
+    {
+        [ModuleInitializer]
+        public static void Initialize()
+        {
+            AssemblyRegistry.Register(typeof(Module).GetTypeInfo().Assembly, AssemblyCommonCategories.Assets);
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Assimp/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Debug/Properties/AssemblyInfo.cs
similarity index 61%
rename from sources/tools/Xenko.Assimp/Properties/AssemblyInfo.cs
rename to sources/engine/Xenko.Debug/Properties/AssemblyInfo.cs
index 776da839ef..c5b2d16f07 100644
--- a/sources/tools/Xenko.Assimp/Properties/AssemblyInfo.cs
+++ b/sources/engine/Xenko.Debug/Properties/AssemblyInfo.cs
@@ -13,16 +13,5 @@
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("52f2a331-0906-4418-ba99-87bb87e51085")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyFileVersion("1.0.0.0")]
+#pragma warning disable 436 // Xenko.PublicKeys is defined in multiple assemblies
+[assembly: InternalsVisibleTo("Xenko.Engine" + Xenko.PublicKeys.Default)]
diff --git a/sources/engine/Xenko.Debug/Shaders/LinePrimitiveShader.cs b/sources/engine/Xenko.Debug/Shaders/LinePrimitiveShader.cs
new file mode 100644
index 0000000000..ae182914b1
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Shaders/LinePrimitiveShader.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.DebugRendering
+{
+    public static partial class LinePrimitiveShaderKeys
+    {
+        public static readonly ValueParameterKey<Matrix> ViewProjection = ParameterKeys.NewValue<Matrix>();
+    }
+}
diff --git a/sources/engine/Xenko.Debug/Shaders/LinePrimitiveShader.xksl b/sources/engine/Xenko.Debug/Shaders/LinePrimitiveShader.xksl
new file mode 100644
index 0000000000..2d5a31f6ca
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Shaders/LinePrimitiveShader.xksl
@@ -0,0 +1,19 @@
+namespace Xenko.DebugRendering
+{
+
+    shader LinePrimitiveShader : ShaderBase, ColorBase {
+
+        float4x4 ViewProjection;
+        stream float3 Position : POSITION;
+
+        override stage void VSMain() {
+            streams.ShadingPosition = mul(float4(streams.Position, 1), ViewProjection);
+        }
+
+        override stage void PSMain() {
+            streams.ColorTarget = streams.Color;
+        }
+
+    };
+
+}
diff --git a/sources/engine/Xenko.Debug/Shaders/PrimitiveShader.cs b/sources/engine/Xenko.Debug/Shaders/PrimitiveShader.cs
new file mode 100644
index 0000000000..11102df3f2
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Shaders/PrimitiveShader.cs
@@ -0,0 +1,27 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.DebugRendering
+{
+    public static partial class PrimitiveShaderKeys
+    {
+        public static readonly ValueParameterKey<Matrix> ViewProjection = ParameterKeys.NewValue<Matrix>();
+        public static readonly ObjectParameterKey<Buffer> Transforms = ParameterKeys.NewObject<Buffer>();
+        public static readonly ObjectParameterKey<Buffer> Colors = ParameterKeys.NewObject<Buffer>();
+        public static readonly ValueParameterKey<int> InstanceOffset = ParameterKeys.NewValue<int>();
+        public static readonly ValueParameterKey<float> LineWidthMultiplier = ParameterKeys.NewValue<float>(1.0f);
+    }
+}
diff --git a/sources/engine/Xenko.Debug/Shaders/PrimitiveShader.xksl b/sources/engine/Xenko.Debug/Shaders/PrimitiveShader.xksl
new file mode 100644
index 0000000000..1339a52494
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Shaders/PrimitiveShader.xksl
@@ -0,0 +1,63 @@
+namespace Xenko.DebugRendering
+{
+
+    shader PrimitiveShader : ShaderBase, ColorBase
+    {
+
+        struct TransformData {
+            float4x4 Matrix;
+        };
+
+        struct ColorData {
+            float Color;
+        };
+
+        float4x4 ViewProjection;
+        StructuredBuffer<TransformData> Transforms;
+        StructuredBuffer<ColorData> Colors;
+        int InstanceOffset;
+
+        float LineWidthMultiplier = 1.0f;
+
+        stream float3 Position : POSITION;
+        stream float2 Uv : TEXCOORD0;
+
+        override stage void VSMain()
+        {
+            int offsetInstanceId = streams.InstanceID + InstanceOffset;
+            streams.ShadingPosition = mul(mul(float4(streams.Position, 1), Transforms[offsetInstanceId].Matrix), ViewProjection);
+            streams.Color = BitsToColor(Colors[offsetInstanceId].Color);
+        }
+
+        override stage void PSMain()
+        {
+
+            float lineWidth = (0.001f * LineWidthMultiplier);
+
+            float2 uv = streams.Uv;
+            float lx = step(lineWidth, uv.x);
+            float ly = step(lineWidth, uv.y);
+            float hx = step(uv.x, 1.0f - lineWidth);
+            float hy = step(uv.y, 1.0f - lineWidth);
+
+            streams.ColorTarget = lerp(streams.Color, float4(streams.Color.rgb, 0.0f), lx*ly*hx*hy);
+            if (streams.ColorTarget.a <= 0.1f) discard;
+
+        }
+
+        float4 BitsToColor(float f)
+        {
+            uint u = asuint(f);
+            float4 c; // it has to be split up like this, don't change it..
+            c = float4(
+                (u >> 0) % 256,
+                (u >> 8) % 256,
+                (u >> 16) % 256,
+                (u >> 24) % 256
+            ) / 255.0;
+            return c;
+        }
+
+    };
+
+}
diff --git a/sources/engine/Xenko.Debug/Xenko.DebugRendering.csproj b/sources/engine/Xenko.Debug/Xenko.DebugRendering.csproj
new file mode 100644
index 0000000000..ba4e43b102
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Xenko.DebugRendering.csproj
@@ -0,0 +1,60 @@
+<Project>
+
+  <PropertyGroup>
+    <XenkoAssemblySign>true</XenkoAssemblySign>
+    <XenkoRuntime>true</XenkoRuntime>
+    <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
+  </PropertyGroup>
+  
+  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
+    <XenkoPackAssets>true</XenkoPackAssets>
+    <XenkoBuildTags>*</XenkoBuildTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj" />
+    <ProjectReference Include="..\Xenko.Graphics\Xenko.Graphics.csproj" />
+    <ProjectReference Include="..\Xenko.Rendering\Xenko.Rendering.csproj" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Compile Update="Shaders\LinePrimitiveShader.cs">
+      <DesignTime>True</DesignTime>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>LinePrimitiveShader.xksl</DependentUpon>
+    </Compile>
+    <Compile Update="Shaders\PrimitiveShader.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>PrimitiveShader.xksl</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="Shaders\LinePrimitiveShader.xksl">
+      <Generator>XenkoShaderKeyGenerator</Generator>
+      <LastGenOutput>LinePrimitiveShader.cs</LastGenOutput>
+    </None>
+    <None Update="Shaders\PrimitiveShader.xksl">
+      <Generator>XenkoShaderKeyGenerator</Generator>
+      <LastGenOutput>PrimitiveShader.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+
+  <Import Project="$(XenkoPostSettingsTargets)" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+
+</Project>
diff --git a/sources/engine/Xenko.Debug/Xenko.DebugRendering.xkpkg b/sources/engine/Xenko.Debug/Xenko.DebugRendering.xkpkg
new file mode 100644
index 0000000000..84b1d46397
--- /dev/null
+++ b/sources/engine/Xenko.Debug/Xenko.DebugRendering.xkpkg
@@ -0,0 +1,5 @@
+!Package
+SerializedVersion: {Assets: 3.1.0.0}
+AssetFolders:
+    -   Path: !dir Shaders
+RootAssets: []
diff --git a/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj b/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj
index 4591cd81e4..f964b45c9e 100644
--- a/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj
+++ b/sources/engine/Xenko.Debugger/Xenko.Debugger.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -14,7 +14,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Mono.Options" Version="5.3.0.1" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <Reference Include="System.ServiceModel" />
   </ItemGroup>
   <ItemGroup>
@@ -26,5 +26,5 @@
     <ProjectReference Include="..\Xenko.Assets\Xenko.Assets.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Engine.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Engine.Tests/Properties/AndroidManifest.xml
index fcd811b982..d245154403 100644
--- a/sources/engine/Xenko.Engine.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Engine.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Engine.Tests" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
   <application android:icon="@drawable/icon" android:label="Xenko Engine" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>  
   <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Engine.Tests/TestUpdateEngine.cs b/sources/engine/Xenko.Engine.Tests/TestUpdateEngine.cs
index 89561e49b5..79807ea7ec 100644
--- a/sources/engine/Xenko.Engine.Tests/TestUpdateEngine.cs
+++ b/sources/engine/Xenko.Engine.Tests/TestUpdateEngine.cs
@@ -417,9 +417,51 @@ public void TestOutOfBoundsSkip()
             Assert.Equal(0, test.TestClassList[0].IntField);
         }
 
-        internal static unsafe void RunUpdateEngine(object test, List<UpdateMemberInfo> updateMemberInfo, TestData[] blittableData, UpdateObjectData[] objectData)
+        [Fact]
+        public void TestInterfaceProperty()
         {
-            var compiledUpdate = UpdateEngine.Compile(test.GetType(), updateMemberInfo);
+            var test = new TestClass();
+
+            var updateMemberInfo = new List<UpdateMemberInfo>
+            {
+                new UpdateMemberInfo("TestInterface.InterfaceMember", 0),
+            };
+
+            var blittableData = new TestData[] { 123 };
+            var objectData = new UpdateObjectData[0];
+
+            RunUpdateEngine(test, updateMemberInfo, blittableData, objectData);
+
+            Assert.Equal(123, test.TestInterface.InterfaceMember);
+        }
+
+        [Fact]
+        public void TestAbstractProperty()
+        {
+            var test = new TestClass();
+
+            var updateMemberInfo = new List<UpdateMemberInfo>
+            {
+                new UpdateMemberInfo("IntPropertyAbstract", 0),
+            };
+
+            var blittableData = new TestData[] { 123 };
+            var objectData = new UpdateObjectData[0];
+
+            RunUpdateEngine(test, updateMemberInfo, blittableData, objectData);
+
+            Assert.Equal(123, test.IntPropertyAbstract);
+
+            // Test again with using TestClassBase type
+            test.IntPropertyAbstract = 0;
+            RunUpdateEngine(test, updateMemberInfo, blittableData, objectData, typeof(TestClassBase));
+
+            Assert.Equal(123, test.IntPropertyAbstract);
+        }
+
+        internal static unsafe void RunUpdateEngine(object test, List<UpdateMemberInfo> updateMemberInfo, TestData[] blittableData, UpdateObjectData[] objectData, Type typeOverride = null)
+        {
+            var compiledUpdate = UpdateEngine.Compile(typeOverride ?? test.GetType(), updateMemberInfo);
 
             fixed (TestData* dataPtr = blittableData)
             {
@@ -453,8 +495,25 @@ public struct BlittableStruct
         public int IntProperty { get; set; }
     }
 
+    public interface ITestInterface
+    {
+        int InterfaceMember { get; set; }
+    }
+
+    [DataContract]
+    public class TestInterfaceImpl : ITestInterface
+    {
+        public int InterfaceMember { get; set; }
+    }
+
     [DataContract]
-    public class TestClass
+    public abstract class TestClassBase
+    {
+        public abstract int IntPropertyAbstract { get; set; }
+    }
+
+    [DataContract]
+    public class TestClass : TestClassBase
     {
         public int IntField;
         public int IntProperty { get; set; }
@@ -475,6 +534,10 @@ public class TestClass
         public IList<int> IntList;
         public IList<TestClass> TestClassList;
 
+        public ITestInterface TestInterface = new TestInterfaceImpl();
+
+        public override int IntPropertyAbstract { get; set; }
+
         public TestClass()
         {
             IntArray = new int[4];
diff --git a/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Android.csproj b/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Android.csproj
index 1bb6d10ae7..e7f59f79a5 100644
--- a/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Android.csproj
+++ b/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Android.csproj
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <!--Import Local Pre Settings for the solution being loaded -->
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
@@ -27,7 +24,6 @@
     <MandroidI18n />
     <JavaMaximumHeapSize />
     <JavaOptions />
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <XenkoPlatform>Android</XenkoPlatform>
     <XenkoBuildProfile>Android</XenkoBuildProfile>
diff --git a/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Windows.csproj b/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Windows.csproj
index 2b4aa67700..5f9c8617a9 100644
--- a/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Engine.Tests</RootNamespace>
@@ -110,6 +110,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.iOS.csproj b/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.iOS.csproj
index b5b572ad42..e682e03a13 100644
--- a/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.iOS.csproj
+++ b/sources/engine/Xenko.Engine.Tests/Xenko.Engine.Tests.iOS.csproj
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <!--Import Local Pre Settings for the solution being loaded -->
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
@@ -25,7 +22,6 @@
     <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/sources/engine/Xenko.Engine/Animations/AnimationCurveEvaluatorDirectGroup.cs b/sources/engine/Xenko.Engine/Animations/AnimationCurveEvaluatorDirectGroup.cs
index c1ad749b29..ccea83f4e1 100644
--- a/sources/engine/Xenko.Engine/Animations/AnimationCurveEvaluatorDirectGroup.cs
+++ b/sources/engine/Xenko.Engine/Animations/AnimationCurveEvaluatorDirectGroup.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #pragma warning disable SA1402 // File may only contain a single class
 using System;
+using Xenko.Core;
 using Xenko.Core.Collections;
 using Xenko.Core.Mathematics;
 using Xenko.Updater;
diff --git a/sources/engine/Xenko.Engine/Animations/AnimationProcessor.cs b/sources/engine/Xenko.Engine/Animations/AnimationProcessor.cs
index fe580d034a..ac02c861d4 100644
--- a/sources/engine/Xenko.Engine/Animations/AnimationProcessor.cs
+++ b/sources/engine/Xenko.Engine/Animations/AnimationProcessor.cs
@@ -7,6 +7,7 @@
 using Xenko.Core.Threading;
 using Xenko.Engine;
 using Xenko.Rendering;
+using Xenko.Games;
 
 namespace Xenko.Animations
 {
@@ -60,10 +61,8 @@ public override void Draw(RenderContext context)
             var time = context.Time;
 
             //foreach (var entity in ComponentDatas.Values)
-            Dispatcher.ForEach(ComponentDatas, () => animationOperationPool.Acquire(), (entity, animationOperations) =>
+            Dispatcher.ForEach(ComponentDataValues, () => animationOperationPool.Acquire(), (associatedData, animationOperations) =>
             {
-                var associatedData = entity.Value;
-
                 var animationUpdater = associatedData.AnimationUpdater;
                 var animationComponent = associatedData.AnimationComponent;
 
@@ -83,7 +82,7 @@ public override void Draw(RenderContext context)
                         {
                             case AnimationRepeatMode.PlayOnceHold:
                             case AnimationRepeatMode.PlayOnce:
-                                playingAnimation.CurrentTime = TimeSpan.FromTicks(playingAnimation.CurrentTime.Ticks + (long)(time.Elapsed.Ticks * (double)playingAnimation.TimeFactor));
+                                playingAnimation.CurrentTime = TimeSpan.FromTicks(playingAnimation.CurrentTime.Ticks + (long)(time.WarpElapsed.Ticks * (double)playingAnimation.TimeFactor));
                                 if (playingAnimation.CurrentTime > playingAnimation.Clip.Duration)
                                     playingAnimation.CurrentTime = playingAnimation.Clip.Duration;
                                 else if (playingAnimation.CurrentTime < TimeSpan.Zero)
@@ -93,7 +92,7 @@ public override void Draw(RenderContext context)
                                 playingAnimation.CurrentTime = playingAnimation.Clip.Duration == TimeSpan.Zero
                                     ? TimeSpan.Zero
                                     : TimeSpan.FromTicks((playingAnimation.CurrentTime.Ticks + playingAnimation.Clip.Duration.Ticks
-                                        + (long)(time.Elapsed.Ticks * (double)playingAnimation.TimeFactor)) % playingAnimation.Clip.Duration.Ticks);
+                                        + (long)(time.WarpElapsed.Ticks * (double)playingAnimation.TimeFactor)) % playingAnimation.Clip.Duration.Ticks);
                                 break;
                             default:
                                 throw new ArgumentOutOfRangeException();
@@ -157,8 +156,8 @@ public override void Draw(RenderContext context)
                         if (playingAnimation.CrossfadeRemainingTime > TimeSpan.Zero)
                         {
                             playingAnimation.Weight += (playingAnimation.WeightTarget - playingAnimation.Weight)
-                                                       * ((float)time.Elapsed.Ticks / playingAnimation.CrossfadeRemainingTime.Ticks);
-                            playingAnimation.CrossfadeRemainingTime -= time.Elapsed;
+                                                       * ((float)time.WarpElapsed.Ticks / playingAnimation.CrossfadeRemainingTime.Ticks);
+                            playingAnimation.CrossfadeRemainingTime -= time.WarpElapsed;
                             if (playingAnimation.CrossfadeRemainingTime <= TimeSpan.Zero)
                             {
                                 playingAnimation.Weight = playingAnimation.WeightTarget;
@@ -194,10 +193,10 @@ private AnimationOperation CreatePushOperation(PlayingAnimation playingAnimation
 
         public AnimationClipResult GetAnimationClipResult(AnimationComponent animationComponent)
         {
-            if (!ComponentDatas.ContainsKey(animationComponent))
+            if (KeyIndex.TryGetValue(animationComponent, out int index) == false)
                 return null;
 
-            return ComponentDatas[animationComponent].AnimationClipResult;
+            return ComponentDataValues[index].AnimationClipResult;
         }
 
         public class AssociatedData
diff --git a/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/DefaultGraphicsCompositorLevel10.xkgfxcomp b/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/DefaultGraphicsCompositorLevel10.xkgfxcomp
index 415de56198..69bee0cee6 100644
--- a/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/DefaultGraphicsCompositorLevel10.xkgfxcomp
+++ b/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/DefaultGraphicsCompositorLevel10.xkgfxcomp
@@ -22,16 +22,6 @@ RenderStages:
         Name: ShadowMapCaster
         EffectSlotName: ShadowMapCaster
         SortMode: !FrontToBackSortMode {}
-    5a50638f5c514dc490c8c4f57cc88b57:
-        Id: 555e84b4-b68a-4f38-ac3a-f0f563028ef0
-        Name: ShadowMapCasterParaboloid
-        EffectSlotName: ShadowMapCasterParaboloid
-        SortMode: !FrontToBackSortMode {}
-    bc1a77d2ab254a6e920f86cff65cd75e:
-        Id: b03a45c6-7a56-417c-8a80-69cc608671f1
-        Name: ShadowMapCasterCubeMap
-        EffectSlotName: ShadowMapCasterCubeMap
-        SortMode: !FrontToBackSortMode {}
     33d9d311a1a65601da9ef56775477f95:
         Id: ecab139e-5f55-42b5-a324-310c195a9c89
         Name: GBuffer
@@ -47,12 +37,6 @@ RenderFeatures:
             6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
-            b60663d7cb46417a94341a39c3bc1a12: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
-                ShadowMapRenderStage: ref!! 555e84b4-b68a-4f38-ac3a-f0f563028ef0
-                EffectName: XenkoForwardShadingEffect.ShadowMapCasterParaboloid
-            f5533b1249b942df8a8aba311cd79532: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
-                ShadowMapRenderStage: ref!! b03a45c6-7a56-417c-8a80-69cc608671f1
-                EffectName: XenkoForwardShadingEffect.ShadowMapCasterCubeMap
             106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
                 OpaqueRenderStage: ref!! ecab139e-5f55-42b5-a324-310c195a9c89
                 EffectName: XenkoForwardShadingEffect.ShadowMapCaster
@@ -61,12 +45,6 @@ RenderFeatures:
                 TransparentRenderStage: ref!! 0fa30591-02ee-486d-9347-2b6aee83d035
             26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
                 ShadowMapRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
-            ff51170a7d1a4761b73ef6a5c9f0cba2: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
-                ShadowMapRenderStage: ref!! 555e84b4-b68a-4f38-ac3a-f0f563028ef0
-                DepthClipping: true
-            ae4336b0a9514e8488e8e0ccbcef25f4: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
-                ShadowMapRenderStage: ref!! b03a45c6-7a56-417c-8a80-69cc608671f1
-                DepthClipping: true
         RenderFeatures:
             86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
             8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
@@ -88,9 +66,9 @@ RenderFeatures:
                         1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
                             ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                         7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
-                            ShadowCasterRenderStage: ref!! 555e84b4-b68a-4f38-ac3a-f0f563028ef0
+                            ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
                         d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
-                            ShadowCasterRenderStage: ref!! b03a45c6-7a56-417c-8a80-69cc608671f1
+                            ShadowCasterRenderStage: ref!! c0524e55-4061-464d-84dd-7c4c70f70e0e
     28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
         RenderStageSelectors:
             d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
diff --git a/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/XenkoDefaultSplashScreen.xktex b/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/XenkoDefaultSplashScreen.xktex
index 645bdc832a..a7a4f4a13a 100644
--- a/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/XenkoDefaultSplashScreen.xktex
+++ b/sources/engine/Xenko.Engine/AssetPackage/Assets/Shared/XenkoDefaultSplashScreen.xktex
@@ -4,5 +4,6 @@ SerializedVersion: {Xenko: 2.0.0}
 Tags: []
 Source: !file ../../Resources/XenkoDefaultSplashScreen.png
 IsCompressed: false
+IsStreamable: false
 Type: !ColorTextureType
     ColorKeyColor: {R: 255, G: 0, B: 255, A: 255}
diff --git a/sources/engine/Xenko.Engine/Audio/AudioEmitterProcessor.cs b/sources/engine/Xenko.Engine/Audio/AudioEmitterProcessor.cs
deleted file mode 100644
index 96ef534140..0000000000
--- a/sources/engine/Xenko.Engine/Audio/AudioEmitterProcessor.cs
+++ /dev/null
@@ -1,280 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System.Collections.Specialized;
-using System.Linq;
-using Xenko.Core;
-using Xenko.Core.Collections;
-using Xenko.Core.Mathematics;
-using Xenko.Engine;
-using Xenko.Media;
-using Xenko.Rendering;
-
-namespace Xenko.Audio
-{
-    /// <summary>
-    /// Processor in charge of updating the <see cref="AudioEmitterComponent"/>s.
-    /// </summary>
-    /// <remarks>
-    /// <para>More precisely it updates the <see cref="AudioEmitter"/>s and 
-    /// then applies 3D localization to each couple <see cref="AudioEmitterComponent"/>-<see cref="AudioListenerComponent"/>.
-    /// When a new emitter or a new listener is added to the system, its creates the required SoundInstances and associate them with the new emitter/listener tuples.
-    /// </para> 
-    /// </remarks>
-    public class AudioEmitterProcessor : EntityProcessor<AudioEmitterComponent, AudioEmitterProcessor.AssociatedData>
-    {
-        /// <summary>
-        /// Reference to the audioSystem.
-        /// </summary>
-        private AudioSystem audioSystem;
-
-        /// <summary>
-        /// Data associated to each <see cref="Entity"/> instances of the system having an <see cref="AudioEmitterComponent"/> and an <see cref="TransformComponent"/>.
-        /// </summary>
-        public class AssociatedData
-        {
-            /// <summary>
-            /// The <see cref="Xenko.Audio.AudioEmitter"/> associated to the <see cref="AudioEmitterComponent"/>.
-            /// </summary>
-            public AudioEmitter AudioEmitter;
-
-            /// <summary>
-            /// The <see cref="Engine.AudioEmitterComponent"/> associated to the entity
-            /// </summary>
-            public AudioEmitterComponent AudioEmitterComponent;
-
-            /// <summary>
-            /// The <see cref="TransformComponent"/> associated to the entity
-            /// </summary>
-            public TransformComponent TransformComponent;
-
-            /// <summary>
-            /// If this emitter has some instances playing
-            /// </summary>
-            public bool IsPlaying;
-        }
-
-        /// <summary>
-        /// Create a new instance of the processor.
-        /// </summary>
-        public AudioEmitterProcessor()
-            : base(typeof(TransformComponent))
-        {
-        }
-
-        protected internal override void OnSystemAdd()
-        {
-            audioSystem = Services.GetSafeServiceAs<AudioSystem>();
-
-            audioSystem.Listeners.CollectionChanged += OnListenerCollectionChanged;
-        }
-
-        protected override AssociatedData GenerateComponentData(Entity entity, AudioEmitterComponent component)
-        {
-            return new AssociatedData
-            {
-                AudioEmitterComponent = component,
-                TransformComponent = entity.Transform,
-            };
-        }
-
-        protected override bool IsAssociatedDataValid(Entity entity, AudioEmitterComponent component, AssociatedData associatedData)
-        {
-            return
-                component == associatedData.AudioEmitterComponent &&
-                entity.Transform == associatedData.TransformComponent;
-        }
-
-        protected internal override void OnSystemRemove()
-        {
-            // Destroy all the SoundInstance created by the processor before closing.
-            foreach (var soundInstance in ComponentDatas.Values.SelectMany(x => x.AudioEmitterComponent.SoundToController.Values))
-                soundInstance.DestroyAllSoundInstances();
-
-            audioSystem.Listeners.CollectionChanged -= OnListenerCollectionChanged;
-        }
-
-        protected override void OnEntityComponentAdding(Entity entity, AudioEmitterComponent component, AssociatedData data)
-        {
-            // initialize the AudioEmitter first position
-            data.TransformComponent.UpdateWorldMatrix(); // ensure the worldMatrix is correct
-            data.AudioEmitter = new AudioEmitter { Position = data.TransformComponent.WorldMatrix.TranslationVector }; // valid position is needed at first Update loop to compute velocity.
-
-            // create a SoundInstance for each listener activated and for each sound controller of the EmitterComponent.
-            foreach (var listener in audioSystem.Listeners.Keys)
-            {
-                foreach (var soundController in data.AudioEmitterComponent.SoundToController.Values)
-                {
-                    soundController.CreateSoundInstance(listener, false);
-                }
-            }
-
-            data.AudioEmitterComponent.ControllerCollectionChanged += OnSoundControllerListChanged;
-
-            component.AttachToProcessor();
-        }
-
-        public override void Draw(RenderContext context)
-        {
-            foreach (var associatedData in ComponentDatas.Values)
-            {
-                if (!associatedData.AudioEmitterComponent.Enabled)
-                {
-                    if (associatedData.IsPlaying)
-                    {
-                        //stop any running instance
-                        associatedData.IsPlaying = false;
-                        foreach (var controller in associatedData.AudioEmitterComponent.SoundToController.Values)
-                        {
-                            foreach (var instanceListener in controller.InstanceToListener)
-                            {
-                                instanceListener.Key.Stop();
-                            }
-                        }
-                    }
-                    continue;
-                }
-
-                var emitter = associatedData.AudioEmitter;
-                emitter.WorldTransform = associatedData.TransformComponent.WorldMatrix;
-                var pos = emitter.WorldTransform.TranslationVector;
-
-                // First update the emitter data if required.
-                emitter.Velocity = pos - emitter.Position;
-                emitter.Position = pos;
-
-                // TODO: if the entity has just been added, it might crash because part of the Transform update is done at the Draw and we might have uninitialized values
-                if (emitter.WorldTransform == Matrix.Zero)
-                    return;
-
-                emitter.Forward = Vector3.Normalize((Vector3)emitter.WorldTransform.Row3);
-                emitter.Up = Vector3.Normalize((Vector3)emitter.WorldTransform.Row2);
-
-                // Then apply 3D localization
-                foreach (var controller in associatedData.AudioEmitterComponent.SoundToController.Values)
-                {
-                    //deal normal instances
-                    foreach (var instanceListener in controller.InstanceToListener)
-                    {
-                        if (!instanceListener.Value.Enabled)
-                        {
-                            instanceListener.Key.Stop();
-                            continue;
-                        }
-
-                        // Apply3D localization
-                        if (instanceListener.Key.PlayState == PlayState.Playing)
-                        {
-                            instanceListener.Key.Apply3D(emitter);
-                        }
-
-                        //Apply parameters
-                        if (instanceListener.Key.Volume != controller.Volume) instanceListener.Key.Volume = controller.Volume; // ensure that instance volume is valid
-                        if (instanceListener.Key.IsLooping != controller.IsLooping) instanceListener.Key.IsLooping = controller.IsLooping;
-
-                        //Play if stopped
-                        if (instanceListener.Key.PlayState != PlayState.Playing && controller.ShouldBePlayed)
-                        {
-                            instanceListener.Key.Apply3D(emitter);
-                            instanceListener.Key.Play();
-                            associatedData.IsPlaying = true;
-                        }
-                    }
-
-                    controller.ShouldBePlayed = false;
-
-                    //handle Play and forget instances
-                    for (var i = 0; i < controller.FastInstances.Count; i++)
-                    {
-                        var instance = controller.FastInstances[i];
-                        if (instance.PlayState != PlayState.Playing)
-                        {
-                            //Decrement the loop counter to iterate this index again, since later elements will get moved down during the remove operation.
-                            controller.FastInstances.RemoveAt(i--);
-                            controller.DestroySoundInstance(instance);
-                        }
-                        else
-                        {
-                            instance.Apply3D(emitter);
-                        }
-                    }
-
-                    //Create new play and forget instances
-                    if (controller.FastInstancePlay)
-                    {
-                        foreach (var listeners in audioSystem.Listeners)
-                        {
-                            if (!listeners.Key.Enabled) continue;
-
-                            var instance = controller.CreateSoundInstance(listeners.Key, true);
-                            if (instance == null) continue;
-
-                            instance.Volume = controller.Volume;
-                            instance.Pitch = controller.Pitch;
-                            instance.Apply3D(emitter);
-                            instance.Play();
-
-                            controller.FastInstances.Add(instance);
-                        }
-                        controller.FastInstancePlay = false;
-                    }
-                }
-            }
-        }
-
-        protected override void OnEntityComponentRemoved(Entity entity, AudioEmitterComponent component, AssociatedData data)
-        {
-            component.DetachFromProcessor();
-
-            // dispose and delete all SoundInstances associated to the EmitterComponent.
-            foreach (var soundController in data.AudioEmitterComponent.SoundToController.Values)
-                soundController.DestroyAllSoundInstances();
-
-            data.AudioEmitterComponent.ControllerCollectionChanged -= OnSoundControllerListChanged;
-        }
-
-        private void OnListenerCollectionChanged(object o, TrackingCollectionChangedEventArgs args)
-        {
-            if (!args.CollectionChanged) // no keys have been added or removed, only one of the values changed
-                return;
-            
-            // A listener have been Added or Removed. 
-            // We need to create/destroy all SoundInstances associated to that listener for each AudioEmitterComponent.
-
-            foreach (var associatedData in ComponentDatas.Values)
-            {
-                var soundControllers = associatedData.AudioEmitterComponent.SoundToController.Values;
-
-                foreach (var soundController in soundControllers)
-                {
-                    if (args.Action == NotifyCollectionChangedAction.Add) // A new listener have been added
-                    {
-                        soundController.CreateSoundInstance((AudioListenerComponent)args.Key, false);
-                    }
-                    else if (args.Action == NotifyCollectionChangedAction.Remove) // A listener have been removed
-                    {
-                        soundController.DestroySoundInstances((AudioListenerComponent)args.Key);
-                    }
-                }
-            }
-        }
-
-        private void OnSoundControllerListChanged(object o, AudioEmitterComponent.ControllerCollectionChangedEventArgs args)
-        {
-            // A new Sound have been associated to the AudioEmitterComponenent or an old Sound have been deleted.
-            // We need to create/destroy the corresponding SoundInstances.
-            var listeners = audioSystem.Listeners.Keys;
-            foreach (var listener in listeners)
-            {
-                if (args.Action == NotifyCollectionChangedAction.Add)
-                {
-                    args.Controller.CreateSoundInstance(listener, false);
-                }
-                else if (args.Action == NotifyCollectionChangedAction.Remove)
-                {
-                    args.Controller.DestroySoundInstances(listener);
-                }
-            }
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Audio/AudioEmitterSoundController.cs b/sources/engine/Xenko.Engine/Audio/AudioEmitterSoundController.cs
deleted file mode 100644
index d2d1838450..0000000000
--- a/sources/engine/Xenko.Engine/Audio/AudioEmitterSoundController.cs
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using Xenko.Core;
-using Xenko.Engine;
-using Xenko.Media;
-
-namespace Xenko.Audio
-{
-    /// <summary>
-    /// This class is used to control a <see cref="SoundBase"/> associated to a <see cref="AudioEmitterComponent"/>.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Instances of this class can not be directly created by the user, but need to queried from an <see cref="AudioEmitterComponent"/>
-    /// instance using the readonly <see cref="AudioEmitterComponent.Item(string)"/> indexer.
-    /// </para>
-    /// <para>
-    /// An instance <see cref="AudioEmitterSoundController"/> is not valid anymore if any of those situations arrives:
-    /// <list type="bullet">
-    ///  <item><description>The underlying <see cref="sound"/> is disposed.</description></item>
-    ///  <item><description>The <see cref="AudioEmitterComponent"/> is detached from its entity.</description></item>
-    ///  <item><description>The entity to which it is attached is removed from the Entity System.</description></item>
-    /// </list>
-    /// </para>
-    /// </remarks>
-    [DebuggerDisplay("Controller for {sound.Name}")]
-    public class AudioEmitterSoundController : IPlayableSound, IMediaPlayer
-    {
-        private readonly SoundBase sound;
-        private readonly AudioEmitterComponent emitter;
-
-        public bool IsDisposed { get; set; }
-
-        /// <summary>
-        /// The instances of <see cref="sound"/> currently created by this controller (one for each listener).
-        /// </summary>
-        [DataMemberIgnore]
-        internal readonly Dictionary<SoundInstance, AudioListenerComponent> InstanceToListener = new Dictionary<SoundInstance, AudioListenerComponent>();
-
-        /// <summary>
-        /// Created a new <see cref="AudioEmitterSoundController"/> instance.
-        /// </summary>
-        /// <param name="parent">The parent AudioEmitterComponent to which the controller is associated.</param>
-        /// <param name="sound">The underlying SoundBase to be controlled</param>
-        /// <remarks>A <see cref="sound"/> can be associated to several controllers.</remarks>
-        internal AudioEmitterSoundController(AudioEmitterComponent parent, SoundBase sound)
-        {
-            this.sound = sound ?? throw new ArgumentNullException(nameof(sound));
-            emitter = parent;
-
-            Volume = 1;
-        }
-
-        /// <summary>
-        /// Create an new instance of underlying sound, and register it in the controller's sound instance list.
-        /// </summary>
-        /// <returns>The new sound effect instance created</returns>
-        internal SoundInstance CreateSoundInstance(AudioListenerComponent listener, bool forget)
-        {
-            var newInstance = sound.CreateInstance(listener.Listener, emitter.UseHRTF, emitter.DirectionalFactor, emitter.Environment);
-
-            if (!forget)
-                InstanceToListener.Add(newInstance, listener);
-
-            return newInstance;
-        }
-
-        internal void DestroySoundInstance(SoundInstance instance)
-        {
-            InstanceToListener.Remove(instance);
-            instance.Dispose();
-        }
-
-        internal void DestroySoundInstances(AudioListenerComponent listener)
-        {
-            var deferRemoval = new List<SoundInstance>();
-
-            foreach (var instance in InstanceToListener.Keys)
-            {
-                deferRemoval.Add(instance);
-            }
-
-            foreach (var soundInstance in deferRemoval)
-            {
-                DestroySoundInstance(soundInstance);
-            }
-
-            for (var i = 0; i < FastInstances.Count; i++)
-            {
-                var instance = FastInstances[i];
-                if (instance.Listener == listener.Listener)
-                {
-                    //Decrement the loop counter to iterate this index again, since later elements will get moved down during the remove operation.
-                    FastInstances.RemoveAt(i--);
-                    instance.Dispose();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Dispose and removes all the controller sound instances.
-        /// </summary>
-        internal void DestroyAllSoundInstances()
-        {
-            foreach (var instance in InstanceToListener)
-            {
-                instance.Key.Dispose();
-            }
-            InstanceToListener.Clear();
-
-            foreach (var soundInstance in FastInstances)
-            {
-                soundInstance.Dispose();
-            }
-            FastInstances.Clear();
-        }
-
-        private PlayState playState;
-
-        public PlayState PlayState
-        {
-            get
-            {
-                // force the play status to 'stopped' if there is no listeners.
-                if (!InstanceToListener.Any())
-                    return PlayState.Stopped;
-
-                // return the controller playStatus if not started playing.
-                if (playState != PlayState.Playing || ShouldBePlayed)
-                    return playState;
-
-                // returns the playStatus of the underlying instances if controller is playing
-
-                // A desynchronization between instances' playState can appear due to asynchronous callbacks
-                // setting the state of the sound to Stopped when reaching the end of the track.
-                // For coherency, we consider a controller as stopped only when all its instances are stopped.
-                // (if not the case, a play call to a stopped controller would restart only some of the underlying instances)
-                if (InstanceToListener.Any(x => x.Key.PlayState == PlayState.Playing))
-                    return PlayState.Playing;
-
-                return playState = PlayState.Stopped;
-            }
-        }
-
-        private bool isLooping;
-
-        /// <summary>
-        /// Gets or sets whether the sound is automatically looping from beginning when it reaches the end.
-        /// </summary>
-        public bool IsLooping
-        {
-            get => isLooping;
-            set
-            {
-                foreach (var instance in InstanceToListener)
-                {
-                    instance.Key.IsLooping = value;
-                }
-                isLooping = value;
-            }
-        }
-
-        private float pitch = 1.0f;
-
-        public float Pitch
-        {
-            get => pitch;
-            set
-            {
-                foreach (var instance in InstanceToListener)
-                {
-                    instance.Key.Pitch = value;
-                }
-                pitch = value;
-            }
-        }
-
-        /// <summary>
-        /// Indicate the <see cref="AudioListenerProcessor"/> if the controller's sound instances need to be played.
-        /// This variable is need because <see cref="Play"/> is asynchronous and actually starts playing only on next system update.
-        /// </summary>
-        internal volatile bool ShouldBePlayed;
-
-        public void Play()
-        {
-            playState = PlayState.Playing;
-
-            // Controller play function is asynchronous.
-            // underlying sound instances actually start playing only after the next system update.
-            // Such a asynchronous behavior is required in order to be able to update the associated AudioEmitter
-            // and apply localization to the sound before starting to play.
-
-            ShouldBePlayed = true;  // tells the EmitterProcessor to start playing the underlying instances.
-        }
-
-        internal volatile bool FastInstancePlay;
-        internal List<SoundInstance> FastInstances = new List<SoundInstance>();
-
-        /// <summary>
-        /// Plays the attached sound in a new instance and let's the engine handle it's disposal.
-        /// This is useful for very fast overlapping sounds, gun shots, machine gun etc. Where you don't care about controlling each sound.
-        /// </summary>
-        public void PlayAndForget()
-        {
-            FastInstancePlay = true; // tells the EmitterProcessor to create and start playing a temporary instances.
-        }
-
-        public void Pause()
-        {
-            if (PlayState != PlayState.Playing)
-                return;
-
-            playState = PlayState.Paused;
-
-            foreach (var instance in InstanceToListener)
-            {
-                instance.Key.Pause();
-            }
-
-            ShouldBePlayed = false;
-        }
-
-        public void Stop()
-        {
-            playState = PlayState.Stopped;
-
-            foreach (var instance in InstanceToListener)
-            {
-                instance.Key.Stop();
-            }
-
-            ShouldBePlayed = false;
-        }
-
-        private float volume;
-
-        public float Volume
-        {
-            get => volume;
-            set
-            {
-                volume = value;
-
-                foreach (var instance in InstanceToListener)
-                {
-                    instance.Key.Volume = volume;
-                }
-            }
-        }
-
-        public float SpeedFactor
-        {
-            get => pitch;
-            set
-            {
-                foreach (var instance in InstanceToListener)
-                {
-                    var mediaReader = instance.Key as IMediaReader;
-                    if (mediaReader != null)
-                        mediaReader.SpeedFactor = value;
-                }
-                Pitch = value;
-            }
-        }
-
-        /// <summary>
-        /// Sets the range of the sound to play.
-        /// </summary>
-        /// <param name="range">a PlayRange structure that describes the starting offset and ending point of the sound to play in seconds.</param>
-        /// <remarks>This will not be valid if the sound is played with PlayAndForget</remarks>
-        public void SetRange(PlayRange range)
-        {
-            foreach (var instance in InstanceToListener)
-            {
-                instance.Key.SetRange(range);
-            }
-        }
-
-        public void Seek(TimeSpan mediaTime)
-        {
-            foreach (var instance in InstanceToListener)
-            {
-                var mediaReader = instance.Key as IMediaReader;
-                if (mediaReader != null)
-                    mediaReader.Seek(mediaTime);
-            }
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Audio/AudioListenerProcessor.cs b/sources/engine/Xenko.Engine/Audio/AudioListenerProcessor.cs
index d5857a3e31..fe8728dffe 100644
--- a/sources/engine/Xenko.Engine/Audio/AudioListenerProcessor.cs
+++ b/sources/engine/Xenko.Engine/Audio/AudioListenerProcessor.cs
@@ -42,40 +42,23 @@ protected internal override void OnSystemAdd()
 
         protected internal override void OnSystemRemove()
         {
-            audioSystem.Listeners.Clear();
         }
 
         protected override void OnEntityComponentAdding(Entity entity, AudioListenerComponent component, AudioListenerComponent data)
         {
-            component.Listener = new AudioListener(audioSystem.AudioEngine);
-
-            audioSystem.Listeners.Add(component, component.Listener);
+            if (!entity.Transform.IsMovingInsideRootScene)
+                audioSystem.primaryTransform = entity.Transform;
         }
 
         protected override void OnEntityComponentRemoved(Entity entity, AudioListenerComponent component, AudioListenerComponent data)
         {
-            audioSystem.Listeners.Remove(component);
-
-            component.Listener.Dispose();
+            if (!entity.Transform.IsMovingInsideRootScene)
+                audioSystem.primaryTransform = null;
         }
 
         public override void Draw(RenderContext context)
         {
-            foreach (var listenerData in ComponentDatas.Values)
-            {
-                if (!listenerData.Enabled) // skip all updates if the listener is not used.
-                    continue;
-
-                var listener = listenerData.Listener;
-                listener.WorldTransform = listenerData.Entity.Transform.WorldMatrix;
-                var newPosition = listener.WorldTransform.TranslationVector;
-                listener.Velocity = newPosition - listener.Position; // estimate velocity from last and new position
-                listener.Position = newPosition;
-                listener.Forward = Vector3.Normalize((Vector3)listener.WorldTransform.Row3);
-                listener.Up = Vector3.Normalize((Vector3)listener.WorldTransform.Row2);
 
-                listener.Update();
-            }
         }
     }
 }
diff --git a/sources/engine/Xenko.Engine/Audio/AudioSystem.cs b/sources/engine/Xenko.Engine/Audio/AudioSystem.cs
index 46b3b503c5..dbca05f500 100644
--- a/sources/engine/Xenko.Engine/Audio/AudioSystem.cs
+++ b/sources/engine/Xenko.Engine/Audio/AudioSystem.cs
@@ -2,10 +2,11 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
 using Xenko.Engine;
+using Xenko.Engine.Design;
 using Xenko.Games;
 
 namespace Xenko.Audio
@@ -19,6 +20,10 @@ public class AudioSystem : GameSystemBase, IAudioEngineProvider
         private static readonly object AudioEngineStaticLock = new object();
         private static AudioEngine audioEngineSingleton;
 
+        private SceneSystem sceneSystem;
+        
+        internal TransformComponent primaryTransform;
+
         /// <summary>
         /// Create an new instance of AudioSystem
         /// </summary>
@@ -37,15 +42,6 @@ public AudioSystem(IServiceRegistry registry)
 
         public AudioDevice RequestedAudioDevice { get; set; } = new AudioDevice();
 
-        /// <summary>
-        /// A collection containing the <see cref="AudioListenerComponent"/>-<see cref="AudioListener"/> associations.
-        /// The AudioListenerComponent keys are added/removed by the user by calls to <see cref="AddListener"/>/<see cref="RemoveListener"/>.
-        /// The AudioListener values are created/updated by the <see cref="AudioListenerProcessor"/>. 
-        /// </summary>
-        /// <remarks>When a AudioListenerComponent is added to the AudioSystem but not present in the Entity System, 
-        /// a valid AudioListener can not be computed. Thus we set its value to 'null'.</remarks>
-        internal readonly TrackingDictionary<AudioListenerComponent, AudioListener> Listeners = new TrackingDictionary<AudioListenerComponent, AudioListener>();
-
         public override void Initialize()
         {
             base.Initialize();
@@ -54,7 +50,7 @@ public override void Initialize()
             {
                 if (audioEngineSingleton == null)
                 {
-                    var settings = ((Game)Game)?.Settings?.Configurations?.Get<AudioEngineSettings>();
+                    var settings = Services.GetService<IGameSettingsService>()?.Settings?.Configurations?.Get<AudioEngineSettings>();
                     audioEngineSingleton = AudioEngineFactory.NewAudioEngine(RequestedAudioDevice, settings != null && settings.HrtfSupport ? AudioLayer.DeviceFlags.Hrtf : AudioLayer.DeviceFlags.None);
                 }
                 else
@@ -67,36 +63,26 @@ public override void Initialize()
 
             Game.Activated += OnActivated;
             Game.Deactivated += OnDeactivated;
-        }
 
-        /// <summary>
-        /// Add and activate a <see cref="AudioListenerComponent" /> to the Audio System.
-        /// After this call sounds played via <see cref="AudioEmitterSoundController" />s will be heard by this listener.
-        /// </summary>
-        /// <param name="listener">The listener to add to the audio system.</param>
-        /// <remarks>Adding a listener already added as no effects.</remarks>
-        internal void AddListener(AudioListenerComponent listener)
-        {
-            if (!Listeners.ContainsKey(listener))
-                Listeners[listener] = null;
-        }
-
-        /// <summary>
-        /// Remove a <see cref="AudioListenerComponent" /> from the Audio System.
-        /// After this call sounds played via <see cref="AudioEmitterSoundController" />s will not be heard by this listener anymore.
-        /// </summary>
-        /// <param name="listener">The listener to remove from the audio system.</param>
-        /// <exception cref="System.ArgumentException">The provided listener was not present in the Audio System.</exception>
-        internal void RemoveListener(AudioListenerComponent listener)
-        {
-            if (!Listeners.ContainsKey(listener))
-                throw new ArgumentException("The provided listener was not present in the Audio System.");
-
-            Listeners.Remove(listener);
+            sceneSystem = Services.GetService<SceneSystem>();
         }
 
         public override void Update(GameTime gameTime)
         {
+            var listener = AudioEngine.DefaultListener;
+            TransformComponent tc = primaryTransform ?? sceneSystem.GraphicsCompositor?.MainCamera?.Entity?.Transform;
+            if (tc != null && listener != null)
+            {
+                listener.WorldTransform = tc.WorldMatrix;
+                var newPosition = listener.WorldTransform.TranslationVector;
+                listener.Velocity = GlobalSoundManager.CompletelyDisableDopplerEffect ? Vector3.Zero : (newPosition - listener.Position) / (float)gameTime.TimePerFrame.TotalSeconds; // estimate velocity from last and new position
+                listener.Position = newPosition;
+                listener.Forward = -tc.Forward(true);
+                listener.Up = tc.Up(true);
+
+                listener.Update();
+            }
+
             AudioEngine.Update();
         }
 
diff --git a/sources/engine/Xenko.Engine/Cinematics/CinematicAnimation.cs b/sources/engine/Xenko.Engine/Cinematics/CinematicAnimation.cs
new file mode 100644
index 0000000000..e7ec60a04c
--- /dev/null
+++ b/sources/engine/Xenko.Engine/Cinematics/CinematicAnimation.cs
@@ -0,0 +1,326 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+
+namespace Xenko.Cinematics
+{
+    /// <summary>
+    /// What kind of action is a given CinematicAction?
+    /// </summary>
+    public enum ACTION_TYPE
+    {
+        SET_POSITION,
+        SET_ROTATION,
+        SET_SCALE,
+        LINEAR_MOVE,
+        LINEAR_ROTATE,
+        LINEAR_SCALE,
+        DELEGATE,
+        APPLY_VELOCITY,
+        APPLY_SPIN,
+        SMOOTH_MOVE,
+        SMOOTH_ROTATE,
+        SMOOTH_SCALE
+    };
+
+    /// <summary>
+    /// An action to be stored and played in a CinematicAnimation
+    /// </summary>
+    public class CinematicAction : IComparable<CinematicAction>
+    {
+        public ACTION_TYPE Type;
+        public object argument0, argument1;
+        public TransformComponent target;
+        public float startTime, endTime;
+        public Action<ActionInfo> method;
+        public bool relativeStartArgument;
+
+        public int CompareTo(CinematicAction other)
+        {
+            if (startTime == other.startTime)
+                return 0;
+
+            return startTime.CompareTo(other.startTime);
+        }
+    }
+
+    /// <summary>
+    /// Arguments provided in an action
+    /// </summary>
+    public struct ActionInfo
+    {
+        public float PercentProgress;
+        public float AnimationTimeElapsed;
+    }
+
+    /// <summary>
+    /// Simple cinematic system to animate TransformComponents, run methods etc.
+    /// </summary>
+    public class CinematicAnimation
+    {
+        /// <summary>
+        /// Should we play this when Play is called? Also gets set to True at the end of the Cinematic
+        /// </summary>
+        public bool Paused = false;
+
+        /// <summary>
+        /// Does this animation loop?
+        /// </summary>
+        public bool Looping = false;
+
+        /// <summary>
+        /// What time are we at in the animation?
+        /// </summary>
+        public float CurrentTime { get; private set; }
+
+        /// <summary>
+        /// All actions added to this CinematicAction. If you change this directly, you'll have to Reset() the animation to sort it in
+        /// </summary>
+        public List<CinematicAction> AllActions { get; private set; } = new List<CinematicAction>();
+
+        /// <summary>
+        /// Actions remaining to be played, sorted internally by start time
+        /// </summary>
+        private List<CinematicAction> RemainingActions = new List<CinematicAction>();
+
+        /// <summary>
+        /// Returns true if this cinematic is finished
+        /// </summary>
+        public bool IsDone => RemainingActions.Count == 0;
+
+        /// <summary>
+        /// Returns true if there are things to be played when Play is called
+        /// </summary>
+        public bool CanBePlayed => !IsDone && !Paused;
+
+        /// <summary>
+        /// Creates a CinematicAnimation for population and playing
+        /// </summary>
+        /// <param name="initialize_as_paused">Should we have this Animation Paused to start with?</param>
+        public CinematicAnimation(bool initialize_as_paused = false)
+        {
+            Paused = initialize_as_paused;
+        }
+
+        /// <summary>
+        /// internal flag to prevent modifications to animation while its playing
+        /// </summary>
+        private bool DontModifyActions = false;
+
+        /// <summary>
+        /// Plays the CinematicAnimation, if it isn't paused. Returns false if nothing is left to play or will loop next play
+        /// </summary>
+        /// <param name="time_delta">Amount of time to progress the animation</param>
+        public bool Play(float time_delta)
+        {
+            if (Paused) return !IsDone;
+            if (Looping && RemainingActions.Count == 0 && AllActions.Count > 0) Reset();
+            CurrentTime += time_delta;
+            DontModifyActions = true;
+            for (int i = 0; i < RemainingActions.Count; i++)
+            {
+                CinematicAction ca = RemainingActions[i];
+                // are we doing this now!?
+                if (ca.startTime <= CurrentTime)
+                {
+                    // yes!
+                    PerformAction(ca, time_delta);
+                    // remove this action?
+                    if (ca.endTime <= CurrentTime)
+                    {
+                        if (ca.relativeStartArgument) ca.argument0 = null;
+                        RemainingActions.RemoveAt(i);
+                        i--;
+                    }
+                }
+                else break; // since we are sorted, once we are past CurrentTime, everything else will be too
+            }
+            DontModifyActions = false;
+            return !IsDone;
+        }
+
+        /// <summary>
+        /// Make an action for this CinematicAnimation at the given time.
+        /// </summary>
+        /// <param name="type">What kind of action is this?</param>
+        /// <param name="target">The TransformComponent to act on</param>
+        /// <param name="endArgument">Primary argument for the action, like Vector3 for SET_POSITION</param>
+        /// <param name="startTime">What time to do this action?</param>
+        /// <param name="startArgument">Where should this action start from? null if use whatever we are currently at</param>
+        /// <param name="endTime">When to end this action?</param>
+        public void AddAction(ACTION_TYPE type, TransformComponent target, object endArgument, float startTime, object startArgument = null, float endTime = 0f)
+        {
+            if (DontModifyActions)
+                throw new InvalidOperationException("Animation is currently in Play call -- you can't modify it at the same time!");
+
+            CinematicAction ca = new CinematicAction()
+            {
+                Type = type,
+                target = target,
+                argument0 = startArgument,
+                argument1 = endArgument,
+                startTime = startTime,
+                endTime = endTime,
+                relativeStartArgument = startArgument == null
+            };
+            AllActions.Add(ca);
+            if (CurrentTime <= startTime)
+            {
+                RemainingActions.Add(ca);
+                RemainingActions.Sort();
+            }
+        }
+
+        /// <summary>
+        /// Add a method to be run at the given time. ActionInfo is constructed, set and passed as an argument to the method
+        /// </summary>
+        /// <param name="method">Action to be executed</param>
+        /// <param name="startTime">When to execute the action</param>
+        /// <param name="endTime">Keep running the action until this time, default is 0 which means always just run this once</param>
+        public void AddMethod(Action<ActionInfo> method, float startTime, float endTime = 0f)
+        {
+            if (DontModifyActions)
+                throw new InvalidOperationException("Animation is currently in Play call -- you can't modify it at the same time!");
+
+            CinematicAction ca = new CinematicAction()
+            {
+                Type = ACTION_TYPE.DELEGATE,
+                method = method,
+                startTime = startTime,
+                endTime = endTime
+            };
+            AllActions.Add(ca);
+            if (CurrentTime <= startTime)
+            {
+                RemainingActions.Add(ca);
+                RemainingActions.Sort();
+            }
+        }
+
+        private float Sigmoid(double value)
+        {
+            return 1.0f / (1.0f + (float)Math.Exp(-value));
+        }
+
+        [ThreadStatic]
+        private static ActionInfo tempArguments;
+
+        private void PerformAction(CinematicAction ca, float delta_time)
+        {
+            // wait, are we just an action to call here?
+            float totalTimeOfAction = ca.endTime - ca.startTime;
+            float positionInAction = totalTimeOfAction > 0f ? (CurrentTime - ca.startTime) / totalTimeOfAction : 1f;
+            if (positionInAction > 1f) positionInAction = 1f;
+            switch (ca.Type)
+            {
+                case ACTION_TYPE.DELEGATE:
+                    tempArguments.AnimationTimeElapsed = delta_time;
+                    tempArguments.PercentProgress = positionInAction;
+                    ca.method(tempArguments);
+                    break;
+                case ACTION_TYPE.SET_POSITION:
+                    ca.target.Position = (Vector3)ca.argument1;
+                    break;
+                case ACTION_TYPE.SET_ROTATION:
+                    ca.target.Rotation = (Quaternion)ca.argument1;
+                    break;
+                case ACTION_TYPE.SET_SCALE:
+                    ca.target.Scale = (Vector3)ca.argument1;
+                    break;
+                case ACTION_TYPE.LINEAR_MOVE:
+                    if (ca.argument0 == null) ca.argument0 = ca.target.Position;
+                    ca.target.Position = Vector3.Lerp((Vector3)ca.argument0, (Vector3)ca.argument1, positionInAction);
+                    break;
+                case ACTION_TYPE.LINEAR_ROTATE:
+                    if (ca.argument0 == null) ca.argument0 = ca.target.Rotation;
+                    ca.target.Rotation = Quaternion.Lerp((Quaternion)ca.argument0, (Quaternion)ca.argument1, positionInAction);
+                    break;
+                case ACTION_TYPE.LINEAR_SCALE:
+                    if (ca.argument0 == null) ca.argument0 = ca.target.Scale;
+                    ca.target.Scale = Vector3.Lerp((Vector3)ca.argument0, (Vector3)ca.argument1, positionInAction);
+                    break;
+                case ACTION_TYPE.APPLY_VELOCITY:
+                    ca.target.Position += (Vector3)(ca.argument1) * delta_time;
+                    break;
+                case ACTION_TYPE.APPLY_SPIN:
+                    ca.target.Rotation *= Quaternion.Lerp(Quaternion.Identity, (Quaternion)ca.argument1, delta_time);
+                    break;
+                case ACTION_TYPE.SMOOTH_MOVE:
+                    if (ca.argument0 == null) ca.argument0 = ca.target.Position;
+                    ca.target.Position = positionInAction < 1f ? Vector3.Lerp((Vector3)ca.argument0, (Vector3)ca.argument1, Sigmoid(positionInAction * 15.0 - 7.0)) : (Vector3)ca.argument1;
+                    break;
+                case ACTION_TYPE.SMOOTH_ROTATE:
+                    if (ca.argument0 == null) ca.argument0 = ca.target.Rotation;
+                    ca.target.Rotation = positionInAction < 1f ? Quaternion.Lerp((Quaternion)ca.argument0, (Quaternion)ca.argument1, Sigmoid(positionInAction * 15.0 - 7.0)) : (Quaternion)ca.argument1;
+                    break;
+                case ACTION_TYPE.SMOOTH_SCALE:
+                    if (ca.argument0 == null) ca.argument0 = ca.target.Scale;
+                    ca.target.Scale = positionInAction < 1f ? Vector3.Lerp((Vector3)ca.argument0, (Vector3)ca.argument1, Sigmoid(positionInAction * 15.0 - 7.0)) : (Vector3)ca.argument1;
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Calculates and provides the total length of this cinematic animation
+        /// </summary>
+        public float Length
+        {
+            get
+            {
+                float len = 0f;
+                for (int i=0; i<AllActions.Count; i++)
+                {
+                    var action = AllActions[i];
+                    float time = Math.Max(action.startTime, action.endTime);
+                    if (time > len) len = time;
+                }
+                return len;
+            }
+        }
+
+        /// <summary>
+        /// Simple shortcut to immediately play the remaining animation to the end
+        /// </summary>
+        public void PlayToEnd()
+        {
+            float timeToPlay = Length - CurrentTime;
+            if (timeToPlay > 0f)
+                Play(Length - CurrentTime);
+        }
+
+        /// <summary>
+        /// Sets the animation to a certain time by resetting the whole animation, then jumping to this time
+        /// </summary>
+        /// <param name="time">What time to set the animation to</param>
+        public void SetTime(float time)
+        {
+            Reset();
+            bool wasPaused = Paused;
+            CurrentTime = time;
+            Paused = false;
+            Play(0f);
+            Paused = wasPaused;
+        }
+
+        /// <summary>
+        /// Sets the animation back to the start for replaying
+        /// </summary>
+        public void Reset()
+        {
+            if (DontModifyActions)
+                throw new InvalidOperationException("Animation is currently in Play call -- you can't modify it at the same time!");
+
+            CurrentTime = 0f;
+            RemainingActions.Clear();
+            for (int i = 0; i < AllActions.Count; i++)
+            {
+                CinematicAction ca = AllActions[i];
+                if (ca.relativeStartArgument) ca.argument0 = null;
+                RemainingActions.Add(ca);
+            }
+            RemainingActions.Sort();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Engine/DebugRendering/DebugPrimitives.cs b/sources/engine/Xenko.Engine/DebugRendering/DebugPrimitives.cs
new file mode 100644
index 0000000000..fdf9112bf8
--- /dev/null
+++ b/sources/engine/Xenko.Engine/DebugRendering/DebugPrimitives.cs
@@ -0,0 +1,745 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// -----------------------------------------------------------------------------
+// The following code is a port of DirectXTk http://directxtk.codeplex.com
+// -----------------------------------------------------------------------------
+// Microsoft Public License (Ms-PL)
+//
+// This license governs use of the accompanying software. If you use the 
+// software, you accept this license. If you do not accept the license, do not
+// use the software.
+//
+// 1. Definitions
+// The terms "reproduce," "reproduction," "derivative works," and 
+// "distribution" have the same meaning here as under U.S. copyright law.
+// A "contribution" is the original software, or any additions or changes to 
+// the software.
+// A "contributor" is any person that distributes its contribution under this 
+// license.
+// "Licensed patents" are a contributor's patent claims that read directly on 
+// its contribution.
+//
+// 2. Grant of Rights
+// (A) Copyright Grant- Subject to the terms of this license, including the 
+// license conditions and limitations in section 3, each contributor grants 
+// you a non-exclusive, worldwide, royalty-free copyright license to reproduce
+// its contribution, prepare derivative works of its contribution, and 
+// distribute its contribution or any derivative works that you create.
+// (B) Patent Grant- Subject to the terms of this license, including the license
+// conditions and limitations in section 3, each contributor grants you a 
+// non-exclusive, worldwide, royalty-free license under its licensed patents to
+// make, have made, use, sell, offer for sale, import, and/or otherwise dispose
+// of its contribution in the software or derivative works of the contribution 
+// in the software.
+//
+// 3. Conditions and Limitations
+// (A) No Trademark License- This license does not grant you rights to use any 
+// contributors' name, logo, or trademarks.
+// (B) If you bring a patent claim against any contributor over patents that 
+// you claim are infringed by the software, your patent license from such 
+// contributor to the software ends automatically.
+// (C) If you distribute any portion of the software, you must retain all 
+// copyright, patent, trademark, and attribution notices that are present in the
+// software.
+// (D) If you distribute any portion of the software in source code form, you 
+// may do so only under this license by including a complete copy of this 
+// license with your distribution. If you distribute any portion of the software
+// in compiled or object code form, you may only do so under a license that 
+// complies with this license.
+// (E) The software is licensed "as-is." You bear the risk of using it. The
+// contributors give no express warranties, guarantees or conditions. You may
+// have additional consumer rights under your local laws which this license 
+// cannot change. To the extent permitted under your local laws, the 
+// contributors exclude the implied warranties of merchantability, fitness for a
+// particular purpose and non-infringement.
+
+using System;
+
+using Xenko.Core.Mathematics;
+using Xenko.Graphics.GeometricPrimitives;
+using Xenko.Graphics;
+
+namespace Xenko.Engine
+{
+    public class DebugPrimitives
+    {
+
+        static private Vector2 noLineUv = new Vector2(0.5f);
+        static private Vector2 lineUv = new Vector2(1.0f);
+
+        public static Vector3 GetCircleVector(int i, int tessellation)
+        {
+            var angle = (float)(i * 2.0 * Math.PI / tessellation);
+            var dx = (float)Math.Sin(angle);
+            var dz = (float)Math.Cos(angle);
+
+            return new Vector3(dx, 0, dz);
+        }
+
+        public static void CopyFromGeometricPrimitive(GeometricMeshData<VertexPositionNormalTexture> primitiveData, ref VertexPositionTexture[] vertices, ref int[] indices)
+        {
+            for (int i = 0; i < vertices.Length; ++i)
+            {
+                vertices[i].Position = primitiveData.Vertices[i].Position;
+                vertices[i].TextureCoordinate = primitiveData.Vertices[i].TextureCoordinate;
+            }
+
+            for (int i = 0; i < indices.Length; ++i)
+            {
+                indices[i] = primitiveData.Indices[i];
+            }
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateQuad(float width, float height)
+        {
+
+            var quadMeshData = GeometricPrimitive.Plane.New(width, height);
+            VertexPositionTexture[] vertices = new VertexPositionTexture[quadMeshData.Vertices.Length];
+            int[] indices = new int[quadMeshData.Indices.Length];
+
+            CopyFromGeometricPrimitive(quadMeshData, ref vertices, ref indices);
+
+            /* transform it because in its default orientation it isnt flat to the normal up */
+            Quaternion rotation = Quaternion.BetweenDirections(Vector3.UnitZ, Vector3.UnitY);
+            for (int i = 0; i < vertices.Length; ++i)
+            {
+                vertices[i].Position = Vector3.Transform(vertices[i].Position, rotation);
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCircle(float radius = 0.5f, int tesselations = 16, int uvSplits = 0, float yOffset = 0.0f, bool isFlipped = false, int uvOffset = 0)
+        {
+
+            if (tesselations < 3) tesselations = 3;
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            int hasUvSplits = (uvSplits > 0 ? 1 : 0);
+            int extraVertices = 0;
+            int extraIndices = 0;
+
+            if (hasUvSplits > 0)
+            {
+                for (int i = 0; i < tesselations * 3; i += 3)
+                {
+                    int splitMod = ((i / 3) - uvOffset) % (tesselations / uvSplits);
+                    var timeToSplit = splitMod == 0;
+                    if (timeToSplit)
+                    {
+                        extraVertices += 2;
+                        extraIndices += 3;
+                    }
+                }
+            }
+
+            VertexPositionTexture[] vertices = new VertexPositionTexture[(tesselations + 1) + hasUvSplits + extraVertices];
+            int[] indices = new int[((tesselations + 1) * 3) + extraIndices];
+
+            double radiansPerSegment = MathUtil.TwoPi / tesselations;
+
+            // center of our circle
+            vertices[0].Position = new Vector3(0.0f, yOffset, 0.0f);
+            vertices[0].TextureCoordinate = noLineUv;
+
+            // center, but with uv coords set
+            if (hasUvSplits > 0)
+            {
+                vertices[1].Position = new Vector3(0.0f, yOffset, 0.0f);
+                vertices[1].TextureCoordinate = lineUv;
+            }
+
+            int offset = 1 + hasUvSplits;
+            for (int i = 0; i < tesselations; ++i)
+            {
+                var normal = GetCircleVector(i, tesselations);
+                vertices[offset + i].Position = (normal * radius) + new Vector3(0.0f, yOffset, 0.0f);
+                vertices[offset + i].TextureCoordinate = lineUv;
+            }
+
+            int curVert = tesselations + offset;
+            int curIdx = (tesselations + 1) * 3;
+            for (int i = 0; i < tesselations * 3; i += 3)
+            {
+                int? splitMod = (uvSplits > 0) ? (((i / 3) - uvOffset) % (tesselations / uvSplits)) : (int?)null;
+                var timeToSplit = splitMod == 0;
+                if (timeToSplit)
+                {
+
+                    indices[i] = 1;
+
+                    indices[i + 1] = curVert;
+                    vertices[curVert] = vertices[offset + ((i / 3) % tesselations)];
+                    vertices[curVert++].TextureCoordinate = lineUv;
+
+                    indices[i + 2] = curVert;
+                    vertices[curVert] = vertices[offset + (((i / 3) + 1) % tesselations)];
+                    vertices[curVert++].TextureCoordinate = noLineUv;
+
+                    // FIXME: this is shit geometry really
+                    indices[curIdx++] = offset + ((i / 3) % tesselations);
+                    indices[curIdx++] = offset + ((i / 3) % tesselations);
+                    indices[curIdx++] = offset + (((i / 3) + 1) % tesselations);
+
+                }
+                else
+                {
+                    indices[i] = 0;
+                    indices[i + 1] = offset + ((i / 3) % tesselations);
+                    indices[i + 2] = offset + (((i / 3) + 1) % tesselations);
+                }
+            }
+
+            if (!isFlipped)
+            {
+                Array.Reverse(indices); // flip the winding if it's a top piece
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCube(float size = 1.0f)
+        {
+
+            var cubeMeshData = GeometricPrimitive.Cube.New(size);
+            VertexPositionTexture[] vertices = new VertexPositionTexture[cubeMeshData.Vertices.Length];
+            int[] indices = new int[cubeMeshData.Indices.Length];
+
+            CopyFromGeometricPrimitive(cubeMeshData, ref vertices, ref indices);
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateSphere(float radius = 0.5f, int tesselations = 16, int uvSplits = 4, int uvSplitOffsetVertical = 0)
+        {
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            if (tesselations < 3) tesselations = 3;
+
+            int verticalSegments = tesselations;
+            int horizontalSegments = tesselations * 2;
+            int hasUvSplit = (uvSplits > 0 ? 1 : 0);
+
+            // FIXME: i tried figuring out a closed form solution for this bugger here, but i feel like i'm missing something crucial...
+            //  it basically is just here to calculate how many extra vertices are needed to create the wireframe topology we want
+            // if *you* can figure out a closed form solution, have at it! you are very welcome!
+            int extraVertexCount = 0;
+
+            if (hasUvSplit > 0)
+            {
+                for (int i = 0; i < verticalSegments; i++)
+                {
+                    for (int j = 0; j <= horizontalSegments; j++)
+                    {
+                        int vertModulo = (i + uvSplitOffsetVertical) % (verticalSegments / uvSplits);
+                        int horizModulo = j % (horizontalSegments / uvSplits);
+                        if (hasUvSplit > 0 && (vertModulo == 0 && horizModulo == 0))
+                        {
+                            extraVertexCount += 4;
+                        }
+                        else if (hasUvSplit > 0 && (vertModulo == 0 || horizModulo == 0))
+                        {
+                            extraVertexCount += 2;
+                        }
+                    }
+                }
+            }
+
+            var vertices = new VertexPositionTexture[(verticalSegments + 1) * (horizontalSegments + 1) + extraVertexCount];
+            var indices = new int[(verticalSegments) * (horizontalSegments + 1) * 6];
+
+            int vertexCount = 0;
+
+            // generate the first extremity points
+            for (int j = 0; j <= horizontalSegments; j++)
+            {
+                var normal = new Vector3(0, -1, 0);
+                var textureCoordinate = new Vector2(0.5f);
+                vertices[vertexCount++] = new VertexPositionTexture(normal * radius, textureCoordinate);
+            }
+
+            // Create rings of vertices at progressively higher latitudes.
+            for (int i = 1; i < verticalSegments; i++)
+            {
+
+                var latitude = (float)((i * Math.PI / verticalSegments) - Math.PI / 2.0);
+                var dy = (float)Math.Sin(latitude);
+                var dxz = (float)Math.Cos(latitude);
+
+                // the first point
+                var firstNormal = new Vector3(0, dy, dxz);
+                var firstHorizontalVertex = new VertexPositionTexture(firstNormal * radius, noLineUv);
+                vertices[vertexCount++] = firstHorizontalVertex;
+
+                // Create a single ring of vertices at this latitude.
+                for (int j = 1; j < horizontalSegments; j++)
+                {
+
+                    var longitude = (float)(j * 2.0 * Math.PI / horizontalSegments);
+                    var dx = (float)Math.Sin(longitude);
+                    var dz = (float)Math.Cos(longitude);
+
+                    dx *= dxz;
+                    dz *= dxz;
+
+                    var normal = new Vector3(dx, dy, dz);
+                    var textureCoordinate = noLineUv;
+
+                    vertices[vertexCount++] = new VertexPositionTexture(normal * radius, textureCoordinate);
+                }
+
+                // the last point equal to the first point
+                firstHorizontalVertex.TextureCoordinate = noLineUv;
+                vertices[vertexCount++] = firstHorizontalVertex;
+            }
+
+            // generate the end extremity points
+            for (int j = 0; j <= horizontalSegments; j++)
+            {
+                var normal = new Vector3(0, 1, 0);
+                var textureCoordinate = noLineUv;
+                vertices[vertexCount++] = new VertexPositionTexture(normal * radius, textureCoordinate);
+            }
+
+            // Fill the index buffer with triangles joining each pair of latitude rings.
+            int stride = horizontalSegments + 1;
+
+            int indexCount = 0;
+            int newVertexCount = vertexCount;
+            for (int i = 0; i < verticalSegments; i++)
+            {
+                for (int j = 0; j <= horizontalSegments; j++)
+                {
+                    int nextI = i + 1;
+                    int nextJ = (j + 1) % stride;
+                    int? vertModulo = (uvSplits > 0) ? ((i + uvSplitOffsetVertical) % (verticalSegments / uvSplits)) : (int?)null;
+                    int? horizModulo = (uvSplits > 0) ? (j % (horizontalSegments / uvSplits)) : (int?)null;
+                    if (hasUvSplit > 0 && ((vertModulo == 0 && horizModulo == 0)))
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && vertModulo == 0)
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && horizModulo == 0)
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+
+                }
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCylinder(float height = 1.0f, float radius = 0.5f, int tesselations = 16, int uvSplits = 4, int? uvSidesForCircle = null)
+        {
+
+            const int uvOffset = 3;
+
+            if (tesselations < 3) tesselations = 3;
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            var hasUvSplit = (uvSplits > 0 ? 1 : 0);
+            var (capVertices, capIndices) = GenerateCircle(radius, tesselations, uvSidesForCircle ?? uvSplits, uvOffset: 1 + uvOffset);
+
+            VertexPositionTexture[] vertices = new VertexPositionTexture[(capVertices.Length * 2) + (tesselations * 4)];
+            int[] indices = new int[(capIndices.Length * 2) + (tesselations * 6)];
+
+            int bottomVertsOffset = (vertices.Length - capVertices.Length);
+            int topVertsOffset = (vertices.Length - capVertices.Length * 2);
+            int bottomIndicesOffset = (indices.Length - capIndices.Length);
+            int topIndicesOffset = (indices.Length - capIndices.Length * 2);
+
+            // copy vertices
+            for (int i = 0; i < capVertices.Length; ++i)
+            {
+                vertices[bottomVertsOffset + i] = capVertices[i];
+                vertices[bottomVertsOffset + i].Position.Y = -(height / 2.0f);
+                vertices[topVertsOffset + i] = capVertices[i];
+                vertices[topVertsOffset + i].Position.Y = height / 2.0f;
+            }
+
+            // copy indices
+            for (int i = 0; i < capIndices.Length; ++i)
+            {
+                indices[bottomIndicesOffset + i] = capIndices[i] + bottomVertsOffset;
+                indices[topIndicesOffset + i] = capIndices[i] + topVertsOffset;
+            }
+
+            // correct winding order so backface is inwards for bottom part
+            Array.Reverse(indices, bottomIndicesOffset, capIndices.Length);
+
+            // generate sides, using our top and bottom circle triangle fans
+            int curVert = 0;
+            int curIndex = 0;
+            for (int i = 0; i < tesselations; ++i)
+            {
+
+                var normal = GetCircleVector(i, tesselations);
+                var curTopPos = (normal * radius) + (Vector3.UnitY * (height / 2.0f));
+                var curBottomPos = (normal * radius) - (Vector3.UnitY * (height / 2.0f));
+
+                int? sideModulo = (uvSplits > 0) ? ((i + 1 - uvOffset) % (tesselations / uvSplits)) : (int?)null;
+
+                vertices[curVert].Position = curBottomPos;
+                vertices[curVert].TextureCoordinate = (sideModulo == 0) ? lineUv : noLineUv;
+                var ip = curVert++;
+
+                var nextBottomNormal = GetCircleVector(i + 1, tesselations) * radius - (Vector3.UnitY * (height / 2.0f));
+                vertices[curVert].Position = nextBottomNormal;
+                vertices[curVert].TextureCoordinate = noLineUv;
+                var ip1 = curVert++;
+
+                vertices[curVert].Position = curTopPos;
+                vertices[curVert].TextureCoordinate = (sideModulo == 0) ? lineUv : noLineUv;
+                var ipv = curVert++;
+
+                var nextTopNormal = (GetCircleVector(i + 1, tesselations) * radius) + (Vector3.UnitY * (height / 2.0f));
+                vertices[curVert].Position = nextTopNormal;
+                vertices[curVert].TextureCoordinate = noLineUv;
+                var ipv1 = curVert++;
+
+                // reuse the old stuff yo
+                indices[curIndex++] = ipv;
+                indices[curIndex++] = ip1;
+                indices[curIndex++] = ip;
+
+                indices[curIndex++] = ipv;
+                indices[curIndex++] = ipv1;
+                indices[curIndex++] = ip1;
+
+            }
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCone(float height, float radius, int tesselations, int uvSplits = 4, int uvSplitsBottom = 0)
+        {
+
+            if (tesselations < 3) tesselations = 3;
+
+            if (uvSplits != 0 && tesselations % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            if (uvSplitsBottom != 0 && tesselations % uvSplitsBottom != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits for the bottom to be a divisor of the number of tesselations");
+            }
+
+            var (bottomVertices, bottomIndices) = GenerateCircle(radius, tesselations, uvSplits, yOffset: -(height / 2.0f));
+            var (topVertices, topIndices) = GenerateCircle(radius, tesselations, uvSplitsBottom, isFlipped: true, yOffset: -(height / 2.0f));
+            VertexPositionTexture[] vertices = new VertexPositionTexture[bottomVertices.Length + topVertices.Length];
+            int[] indices = new int[topIndices.Length + bottomIndices.Length];
+
+            // copy vertices from circle
+            for (int i = 0; i < bottomVertices.Length; ++i)
+            {
+                vertices[i] = bottomVertices[i];
+            }
+
+            for (int i = 0; i < topVertices.Length; ++i)
+            {
+                vertices[i + bottomVertices.Length] = topVertices[i];
+            }
+
+            // copy indices from circle
+            for (int i = 0; i < bottomIndices.Length; ++i)
+            {
+                indices[i] = bottomIndices[i];
+            }
+
+            for (int i = 0; i < topIndices.Length; ++i)
+            {
+                indices[i + bottomIndices.Length] = topIndices[i] + bottomVertices.Length;
+            }
+
+            // extrude middle vertex of center of first circle triangle fan
+            vertices[0].Position.Y = height / 2.0f;
+            vertices[1].Position.Y = height / 2.0f;
+
+            return (vertices, indices);
+
+        }
+
+        public static (VertexPositionTexture[] Vertices, int[] Indices) GenerateCapsule(float length, float radius, int tesselation, int uvSplits = 4)
+        {
+
+            if (tesselation < 3) tesselation = 3;
+
+            if (uvSplits != 0 && tesselation % uvSplits != 0) // FIXME: this can read a lot nicer i think?
+            {
+                throw new ArgumentException("expected the desired number of uv splits to be a divisor of the number of tesselations");
+            }
+
+            int verticalSegments = 2 * tesselation;
+            int horizontalSegments = 4 * tesselation;
+            int hasUvSplit = (uvSplits > 0) ? 1 : 0;
+
+            // FIXME: i tried figuring out a closed form solution for this bugger here, but i feel like i'm missing something crucial...
+            //  it basically is just here to calculate how many extra vertices are needed to create the wireframe topology we want
+            // if *you* can figure out a closed form solution, have at it! you are very welcome!
+            int extraVertexCount = 0;
+
+            if (hasUvSplit > 0)
+            {
+                for (int i = 0; i < verticalSegments - 1; i++)
+                {
+                    for (int j = 0; j <= horizontalSegments; j++)
+                    {
+                        int vertModulo = i % (verticalSegments / uvSplits);
+                        int horizModulo = j % (horizontalSegments / uvSplits);
+                        if (hasUvSplit > 0 && (vertModulo == 0 && horizModulo == 0))
+                        {
+                            extraVertexCount += 4;
+                        }
+                        else if (hasUvSplit > 0 && (vertModulo == 0 || horizModulo == 0))
+                        {
+                            extraVertexCount += 2;
+                        }
+                    }
+                }
+            }
+
+            var vertices = new VertexPositionTexture[verticalSegments * (horizontalSegments + 1) + extraVertexCount];
+            var indices = new int[(verticalSegments - 1) * (horizontalSegments + 1) * 6];
+
+            var vertexCount = 0;
+            // Create rings of vertices at progressively higher latitudes.
+            for (int i = 0; i < verticalSegments; i++)
+            {
+                float deltaY;
+                float latitude;
+
+                if (i < verticalSegments / 2)
+                {
+                    deltaY = -length / 2;
+                    latitude = (float)((i * Math.PI / (verticalSegments - 2)) - Math.PI / 2.0);
+                }
+                else
+                {
+                    deltaY = length / 2;
+                    latitude = (float)(((i - 1) * Math.PI / (verticalSegments - 2)) - Math.PI / 2.0);
+                }
+
+                var dy = (float)Math.Sin(latitude);
+                var dxz = (float)Math.Cos(latitude);
+
+                // Create a single ring of vertices at this latitude.
+                for (int j = 0; j <= horizontalSegments; j++)
+                {
+
+                    var longitude = (float)(j * 2.0 * Math.PI / horizontalSegments);
+                    var dx = (float)Math.Sin(longitude);
+                    var dz = (float)Math.Cos(longitude);
+
+                    dx *= dxz;
+                    dz *= dxz;
+
+                    var normal = new Vector3(dx, dy, dz);
+                    var textureCoordinate = noLineUv;
+                    var position = radius * normal + new Vector3(0, deltaY, 0);
+
+                    vertices[vertexCount++] = new VertexPositionTexture(position, textureCoordinate);
+                }
+            }
+
+            // Fill the index buffer with triangles joining each pair of latitude rings.
+            int stride = horizontalSegments + 1;
+
+            int indexCount = 0;
+            int newVertexCount = vertexCount;
+            for (int i = 0; i < verticalSegments - 1; i++)
+            {
+                for (int j = 0; j <= horizontalSegments; j++)
+                {
+                    int nextI = i + 1;
+                    int nextJ = (j + 1) % stride;
+                    int? vertModulo = (uvSplits > 0) ? (i % (verticalSegments / uvSplits)) : (int?)null;
+                    int? horizModulo = (uvSplits > 0) ? (j % (horizontalSegments / uvSplits)) : (int?)null;
+                    if (hasUvSplit > 0 && (vertModulo == 0 && horizModulo == 0))
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && vertModulo == 0)
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + nextJ)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else if (hasUvSplit > 0 && horizModulo == 0)
+                    {
+
+                        vertices[newVertexCount] = vertices[(i * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (i * stride + j);
+
+                        vertices[newVertexCount] = vertices[(nextI * stride + j)];
+                        vertices[newVertexCount].TextureCoordinate = lineUv;
+                        indices[indexCount++] = newVertexCount++; // indices[indexCount++] = (nextI * stride + j);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+                    else
+                    {
+
+                        indices[indexCount++] = (i * stride + j);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (i * stride + nextJ);
+
+                        indices[indexCount++] = (i * stride + nextJ);
+                        indices[indexCount++] = (nextI * stride + j);
+                        indices[indexCount++] = (nextI * stride + nextJ);
+
+                    }
+
+                }
+            }
+
+            return (vertices, indices);
+
+        }
+
+    }
+}
diff --git a/sources/engine/Xenko.Engine/DebugRendering/DebugRenderFeature.cs b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderFeature.cs
new file mode 100644
index 0000000000..4c59c99b91
--- /dev/null
+++ b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderFeature.cs
@@ -0,0 +1,891 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
+using Xenko.Graphics;
+using Xenko.Rendering;
+
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Engine
+{
+    public class DebugRenderFeature : RootRenderFeature
+    {
+
+        internal enum DebugRenderStage
+        {
+            Opaque,
+            Transparent
+        }
+
+        public override Type SupportedRenderObjectType => typeof(DebugRenderObject);
+
+        internal struct Primitives
+        {
+
+            public int Quads;
+            public int Circles;
+            public int Spheres;
+            public int HalfSpheres;
+            public int Cubes;
+            public int Capsules;
+            public int Cylinders;
+            public int Cones;
+            public int Lines;
+
+            public void Clear()
+            {
+                Quads = 0;
+                Circles = 0;
+                Spheres = 0;
+                HalfSpheres = 0;
+                Cubes = 0;
+                Capsules = 0;
+                Cylinders = 0;
+                Cones = 0;
+                Lines = 0;
+            }
+
+        }
+
+        [StructLayout(LayoutKind.Sequential, Pack = 4)]
+        internal struct LineVertex
+        {
+
+            public static readonly VertexDeclaration Layout = new VertexDeclaration(VertexElement.Position<Vector3>(), VertexElement.Color<Color>());
+
+            public Vector3 Position;
+            public Color Color;
+
+        }
+
+        internal enum RenderableType : byte
+        {
+            Quad,
+            Circle,
+            Sphere,
+            HalfSphere,
+            Cube,
+            Capsule,
+            Cylinder,
+            Cone,
+            Line
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        internal struct Renderable
+        {
+
+            public Renderable(ref Quad q) : this()
+            {
+                Type = RenderableType.Quad;
+                QuadData = q;
+            }
+
+            public Renderable(ref Circle c) : this()
+            {
+                Type = RenderableType.Circle;
+                CircleData = c;
+            }
+
+            public Renderable(ref Sphere s) : this()
+            {
+                Type = RenderableType.Sphere;
+                SphereData = s;
+            }
+
+            public Renderable(ref HalfSphere h) : this()
+            {
+                Type = RenderableType.HalfSphere;
+                HalfSphereData = h;
+            }
+
+            public Renderable(ref Cube c) : this()
+            {
+                Type = RenderableType.Cube;
+                CubeData = c;
+            }
+
+            public Renderable(ref Capsule c) : this()
+            {
+                Type = RenderableType.Capsule;
+                CapsuleData = c;
+            }
+
+            public Renderable(ref Cylinder c) : this()
+            {
+                Type = RenderableType.Cylinder;
+                CylinderData = c;
+            }
+
+            public Renderable(ref Cone c) : this()
+            {
+                Type = RenderableType.Cone;
+                ConeData = c;
+            }
+
+            public Renderable(ref Line l) : this()
+            {
+                Type = RenderableType.Line;
+                LineData = l;
+            }
+
+            [FieldOffset(0)]
+            public RenderableType Type;
+
+            [FieldOffset(1)]
+            public Quad QuadData;
+
+            [FieldOffset(1)]
+            public Circle CircleData;
+
+            [FieldOffset(1)]
+            public Sphere SphereData;
+
+            [FieldOffset(1)]
+            public HalfSphere HalfSphereData;
+
+            [FieldOffset(1)]
+            public Cube CubeData;
+
+            [FieldOffset(1)]
+            public Capsule CapsuleData;
+
+            [FieldOffset(1)]
+            public Cylinder CylinderData;
+
+            [FieldOffset(1)]
+            public Cone ConeData;
+
+            [FieldOffset(1)]
+            public Line LineData;
+
+        }
+
+        internal struct Quad
+        {
+            public Vector3 Position;
+            public Quaternion Rotation;
+            public Vector2 Size;
+            public Color Color;
+        }
+
+        internal struct Circle
+        {
+            public Vector3 Position;
+            public Quaternion Rotation;
+            public float Radius;
+            public Color Color;
+        }
+
+        internal struct Sphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Color Color;
+        }
+
+        internal struct HalfSphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Cube
+        {
+            public Vector3 Start;
+            public Vector3 End;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Capsule
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Cylinder
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Cone
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct Line
+        {
+            public Vector3 Start;
+            public Vector3 End;
+            public Color Color;
+        }
+
+        internal struct InstanceData
+        {
+            public Vector3 Position;
+            public Quaternion Rotation;
+            public Vector3 Scale;
+            public Color Color;
+        }
+
+        private const float DefaultCircleRadius = 0.5f;
+        private const float DefaultSphereRadius = 0.5f;
+        private const float DefaultCubeSize = 1.0f;
+        private const float DefaultCapsuleLength = 1.0f;
+        private const float DefaultCapsuleRadius = 0.5f;
+        private const float DefaultCylinderHeight = 1.0f;
+        private const float DefaultCylinderRadius = 0.5f;
+        private const float DefaultPlaneSize = 1.0f;
+        private const float DefaultConeRadius = 0.5f;
+        private const float DefaultConeHeight = 1.0f;
+
+        private const int CircleTesselation = 16;
+        private const int SphereTesselation = 8;
+        private const int CapsuleTesselation = 8;
+        private const int CylinderTesselation = 16;
+        private const int ConeTesselation = 16;
+
+        /* mesh data we will use when stuffing things in vertex buffers */
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) circle = DebugPrimitives.GenerateCircle(DefaultCircleRadius, CircleTesselation);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) plane = DebugPrimitives.GenerateQuad(DefaultPlaneSize, DefaultPlaneSize);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) sphere = DebugPrimitives.GenerateSphere(DefaultSphereRadius, SphereTesselation, uvSplitOffsetVertical: 1);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) cube = DebugPrimitives.GenerateCube(DefaultCubeSize);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) capsule = DebugPrimitives.GenerateCapsule(DefaultCapsuleLength, DefaultCapsuleRadius, CapsuleTesselation);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) cylinder = DebugPrimitives.GenerateCylinder(DefaultCylinderHeight, DefaultCylinderRadius, CylinderTesselation);
+        private readonly (VertexPositionTexture[] Vertices, int[] Indices) cone = DebugPrimitives.GenerateCone(DefaultConeHeight, DefaultConeRadius, ConeTesselation, uvSplits: 8);
+
+        /* vertex and index buffer for our primitive data */
+        private Buffer vertexBuffer;
+        private Buffer indexBuffer;
+
+        /* vertex buffer for line rendering */
+        private Buffer lineVertexBuffer;
+
+        /* offsets into our vertex/index buffer */
+        private Primitives primitiveVertexOffsets;
+        private Primitives primitiveIndexOffsets;
+
+        /* other gpu related data */
+        private MutablePipelineState pipelineState;
+        private InputElementDescription[] inputElements;
+        private InputElementDescription[] lineInputElements;
+        private DynamicEffectInstance primitiveEffect;
+        private DynamicEffectInstance lineEffect;
+        private Buffer transformBuffer;
+        private Buffer colorBuffer;
+
+        /* intermediate message related data, written to in extract */
+        private readonly FastList<InstanceData> instances = new FastList<InstanceData>(1);
+
+        /* data written to buffers in prepare */
+        private readonly FastList<Matrix> transforms = new FastList<Matrix>(1);
+        private readonly FastList<Color> colors = new FastList<Color>(1);
+
+        /* data only for line rendering */
+        private readonly FastList<LineVertex> lineVertices = new FastList<LineVertex>(1);
+
+        public DebugRenderFeature()
+        {
+            SortKey = 0xFF; // render last! .. or things without depth testing in the opaque stage will have the background rendered over them
+        }
+
+        protected override void InitializeCore()
+        {
+
+            var device = Context.GraphicsDevice;
+
+            inputElements = VertexPositionTexture.Layout.CreateInputElements();
+            lineInputElements = LineVertex.Layout.CreateInputElements();
+
+            // create our pipeline state object
+            pipelineState = new MutablePipelineState(device);
+            pipelineState.State.SetDefaults();
+
+            // TODO: create our associated effect
+            primitiveEffect = new DynamicEffectInstance("PrimitiveShader");
+            primitiveEffect.Initialize(Context.Services);
+            primitiveEffect.UpdateEffect(device);
+
+            lineEffect = new DynamicEffectInstance("LinePrimitiveShader");
+            lineEffect.Initialize(Context.Services);
+            lineEffect.UpdateEffect(device);
+
+            // create initial vertex and index buffers
+            var vertexData = new VertexPositionTexture[
+                circle.Vertices.Length +
+                plane.Vertices.Length +
+                sphere.Vertices.Length +
+                cube.Vertices.Length +
+                capsule.Vertices.Length +
+                cylinder.Vertices.Length +
+                cone.Vertices.Length
+            ];
+
+            /* set up vertex buffer data */
+
+            int vertexBufferOffset = 0;
+
+            Array.Copy(circle.Vertices, vertexData, circle.Vertices.Length);
+            primitiveVertexOffsets.Circles = vertexBufferOffset;
+            vertexBufferOffset += circle.Vertices.Length;
+
+            Array.Copy(plane.Vertices, 0, vertexData, vertexBufferOffset, plane.Vertices.Length);
+            primitiveVertexOffsets.Quads = vertexBufferOffset;
+            vertexBufferOffset += plane.Vertices.Length;
+
+            Array.Copy(sphere.Vertices, 0, vertexData, vertexBufferOffset, sphere.Vertices.Length);
+            primitiveVertexOffsets.Spheres = vertexBufferOffset;
+            primitiveVertexOffsets.HalfSpheres = vertexBufferOffset; // same as spheres
+            vertexBufferOffset += sphere.Vertices.Length;
+
+            Array.Copy(cube.Vertices, 0, vertexData, vertexBufferOffset, cube.Vertices.Length);
+            primitiveVertexOffsets.Cubes = vertexBufferOffset;
+            vertexBufferOffset += cube.Vertices.Length;
+
+            Array.Copy(capsule.Vertices, 0, vertexData, vertexBufferOffset, capsule.Vertices.Length);
+            primitiveVertexOffsets.Capsules = vertexBufferOffset;
+            vertexBufferOffset += capsule.Vertices.Length;
+
+            Array.Copy(cylinder.Vertices, 0, vertexData, vertexBufferOffset, cylinder.Vertices.Length);
+            primitiveVertexOffsets.Cylinders = vertexBufferOffset;
+            vertexBufferOffset += cylinder.Vertices.Length;
+
+            Array.Copy(cone.Vertices, 0, vertexData, vertexBufferOffset, cone.Vertices.Length);
+            primitiveVertexOffsets.Cones = vertexBufferOffset;
+            vertexBufferOffset += cone.Vertices.Length;
+
+            var newVertexBuffer = Buffer.Vertex.New<VertexPositionTexture>(device, vertexData);
+            vertexBuffer = newVertexBuffer;
+
+            /* set up index buffer data */
+
+            var indexData = new int[
+                circle.Indices.Length +
+                plane.Indices.Length +
+                sphere.Indices.Length +
+                cube.Indices.Length +
+                capsule.Indices.Length +
+                cylinder.Indices.Length +
+                cone.Indices.Length
+            ];
+
+            if (indexData.Length >= 0xFFFF && device.Features.CurrentProfile <= GraphicsProfile.Level_9_3)
+            {
+                throw new InvalidOperationException("Cannot generate more than 65535 indices on feature level HW <= 9.3");
+            }
+
+            int indexBufferOffset = 0;
+
+            Array.Copy(circle.Indices, indexData, circle.Indices.Length);
+            primitiveIndexOffsets.Circles = indexBufferOffset;
+            indexBufferOffset += circle.Indices.Length;
+
+            Array.Copy(plane.Indices, 0, indexData, indexBufferOffset, plane.Indices.Length);
+            primitiveIndexOffsets.Quads = indexBufferOffset;
+            indexBufferOffset += plane.Indices.Length;
+
+            Array.Copy(sphere.Indices, 0, indexData, indexBufferOffset, sphere.Indices.Length);
+            primitiveIndexOffsets.Spheres = indexBufferOffset;
+            primitiveIndexOffsets.HalfSpheres = indexBufferOffset; // same as spheres
+            indexBufferOffset += sphere.Indices.Length;
+
+            Array.Copy(cube.Indices, 0, indexData, indexBufferOffset, cube.Indices.Length);
+            primitiveIndexOffsets.Cubes = indexBufferOffset;
+            indexBufferOffset += cube.Indices.Length;
+
+            Array.Copy(capsule.Indices, 0, indexData, indexBufferOffset, capsule.Indices.Length);
+            primitiveIndexOffsets.Capsules = indexBufferOffset;
+            indexBufferOffset += capsule.Indices.Length;
+
+            Array.Copy(cylinder.Indices, 0, indexData, indexBufferOffset, cylinder.Indices.Length);
+            primitiveIndexOffsets.Cylinders = indexBufferOffset;
+            indexBufferOffset += cylinder.Indices.Length;
+
+            Array.Copy(cone.Indices, 0, indexData, indexBufferOffset, cone.Indices.Length);
+            primitiveIndexOffsets.Cones = indexBufferOffset;
+            indexBufferOffset += cone.Indices.Length;
+
+            var newIndexBuffer = Buffer.Index.New<int>(device, indexData);
+            indexBuffer = newIndexBuffer;
+
+            // allocate our buffers with position/colour etc data
+            var newTransformBuffer = Buffer.Structured.New<Matrix>(device, 1);
+            transformBuffer = newTransformBuffer;
+
+            var newColourBuffer = Buffer.Structured.New<Color>(device, colors.Items);
+            colorBuffer = newColourBuffer;
+
+            var newLineVertexBuffer = Buffer.Vertex.New<LineVertex>(device, lineVertices.Items, GraphicsResourceUsage.Dynamic);
+            lineVertexBuffer = newLineVertexBuffer;
+
+        }
+
+        public override void Extract()
+        {
+
+            void ProcessRenderables(FastList<Renderable> renderables, ref Primitives offsets)
+            {
+
+                for (int i = 0; i < renderables.Count; ++i)
+                {
+                    ref var cmd = ref renderables.Items[i];
+                    switch (cmd.Type)
+                    {
+                        case RenderableType.Quad:
+                            instances.Items[offsets.Quads].Position = cmd.QuadData.Position;
+                            instances.Items[offsets.Quads].Rotation = cmd.QuadData.Rotation;
+                            instances.Items[offsets.Quads].Scale = new Vector3(cmd.QuadData.Size.X, 1.0f, cmd.QuadData.Size.Y);
+                            instances.Items[offsets.Quads].Color = cmd.QuadData.Color;
+                            offsets.Quads++;
+                            break;
+                        case RenderableType.Circle:
+                            instances.Items[offsets.Circles].Position = cmd.CircleData.Position;
+                            instances.Items[offsets.Circles].Rotation = cmd.CircleData.Rotation;
+                            instances.Items[offsets.Circles].Scale = new Vector3(cmd.CircleData.Radius * 2.0f, 0.0f, cmd.CircleData.Radius * 2.0f);
+                            instances.Items[offsets.Circles].Color = cmd.CircleData.Color;
+                            offsets.Circles++;
+                            break;
+                        case RenderableType.Sphere:
+                            instances.Items[offsets.Spheres].Position = cmd.SphereData.Position;
+                            instances.Items[offsets.Spheres].Rotation = Quaternion.Identity;
+                            instances.Items[offsets.Spheres].Scale = new Vector3(cmd.SphereData.Radius * 2);
+                            instances.Items[offsets.Spheres].Color = cmd.SphereData.Color;
+                            offsets.Spheres++;
+                            break;
+                        case RenderableType.HalfSphere:
+                            instances.Items[offsets.HalfSpheres].Position = cmd.HalfSphereData.Position;
+                            instances.Items[offsets.HalfSpheres].Rotation = cmd.HalfSphereData.Rotation;
+                            instances.Items[offsets.HalfSpheres].Scale = new Vector3(cmd.HalfSphereData.Radius * 2);
+                            instances.Items[offsets.HalfSpheres].Color = cmd.HalfSphereData.Color;
+                            offsets.HalfSpheres++;
+                            break;
+                        case RenderableType.Cube:
+                            ref var start = ref cmd.CubeData.Start;
+                            ref var end = ref cmd.CubeData.End;
+                            instances.Items[offsets.Cubes].Position = start;
+                            instances.Items[offsets.Cubes].Rotation = cmd.CubeData.Rotation;
+                            instances.Items[offsets.Cubes].Scale = end - start;
+                            instances.Items[offsets.Cubes].Color = cmd.CubeData.Color;
+                            offsets.Cubes++;
+                            break;
+                        case RenderableType.Capsule:
+                            instances.Items[offsets.Capsules].Position = cmd.CapsuleData.Position;
+                            instances.Items[offsets.Capsules].Rotation = cmd.CapsuleData.Rotation;
+                            instances.Items[offsets.Capsules].Scale = new Vector3(cmd.CapsuleData.Radius * 2.0f, cmd.CapsuleData.Height, cmd.CapsuleData.Radius * 2.0f);
+                            instances.Items[offsets.Capsules].Color = cmd.CapsuleData.Color;
+                            offsets.Capsules++;
+                            break;
+                        case RenderableType.Cylinder:
+                            instances.Items[offsets.Cylinders].Position = cmd.CylinderData.Position;
+                            instances.Items[offsets.Cylinders].Rotation = cmd.CylinderData.Rotation;
+                            instances.Items[offsets.Cylinders].Scale = new Vector3(cmd.CylinderData.Radius * 2.0f, cmd.CylinderData.Height, cmd.CylinderData.Radius * 2.0f);
+                            instances.Items[offsets.Cylinders].Color = cmd.CylinderData.Color;
+                            offsets.Cylinders++;
+                            break;
+                        case RenderableType.Cone:
+                            instances.Items[offsets.Cones].Position = cmd.ConeData.Position;
+                            instances.Items[offsets.Cones].Rotation = cmd.ConeData.Rotation;
+                            instances.Items[offsets.Cones].Scale = new Vector3(cmd.ConeData.Radius * 2.0f, cmd.ConeData.Height, cmd.ConeData.Radius * 2.0f);
+                            instances.Items[offsets.Cones].Color = cmd.ConeData.Color;
+                            offsets.Cones++;
+                            break;
+                        case RenderableType.Line:
+                            lineVertices.Items[offsets.Lines].Position = cmd.LineData.Start;
+                            lineVertices.Items[offsets.Lines++].Color = cmd.LineData.Color;
+                            lineVertices.Items[offsets.Lines].Position = cmd.LineData.End;
+                            lineVertices.Items[offsets.Lines++].Color = cmd.LineData.Color;
+                            break;
+                    }
+                }
+
+            }
+
+            int SumBasicPrimitives(ref Primitives primitives)
+            {
+                return primitives.Quads
+                    + primitives.Circles
+                    + primitives.Spheres
+                    + primitives.HalfSpheres
+                    + primitives.Cubes
+                    + primitives.Capsules
+                    + primitives.Cylinders
+                    + primitives.Cones;
+            }
+
+            Primitives SetupPrimitiveOffsets(ref Primitives counts, int offset = 0)
+            {
+                var offsets = new Primitives();
+                offsets.Quads = 0 + offset;
+                offsets.Circles = offsets.Quads + counts.Quads;
+                offsets.Spheres = offsets.Circles + counts.Circles;
+                offsets.HalfSpheres = offsets.Spheres + counts.Spheres;
+                offsets.Cubes = offsets.HalfSpheres + counts.HalfSpheres;
+                offsets.Capsules = offsets.Cubes + counts.Cubes;
+                offsets.Cylinders = offsets.Capsules + counts.Capsules;
+                offsets.Cones = offsets.Cylinders + counts.Cylinders;
+                return offsets;
+            }
+
+            int lastOffset = 0;
+            int lastLineOffset = 0;
+            foreach (RenderObject renderObject in RenderObjects)
+            {
+
+                DebugRenderObject debugObject = (DebugRenderObject)renderObject;
+
+                /* everything except lines is included here, as lines just get accumulated into a buffer directly */
+                int primitivesWithDepth = SumBasicPrimitives(ref debugObject.totalPrimitives);
+                int primitivesWithoutDepth = SumBasicPrimitives(ref debugObject.totalPrimitivesNoDepth);
+                int totalThingsToDraw = primitivesWithDepth + primitivesWithoutDepth;
+
+                instances.Resize(instances.Count + totalThingsToDraw, true);
+
+                lineVertices.Resize(lineVertices.Count + (debugObject.totalPrimitives.Lines * 2) + (debugObject.totalPrimitivesNoDepth.Lines * 2), true);
+
+                var primitiveOffsets = SetupPrimitiveOffsets(ref debugObject.totalPrimitives, lastOffset);
+                var primitiveOffsetsNoDepth = SetupPrimitiveOffsets(ref debugObject.totalPrimitivesNoDepth, primitiveOffsets.Cones + debugObject.totalPrimitives.Cones);
+
+                /* line rendering data, separate buffer so offset isnt relative to the other data */
+                primitiveOffsets.Lines = 0 + lastLineOffset;
+                primitiveOffsetsNoDepth.Lines = debugObject.totalPrimitives.Lines * 2 + lastLineOffset;
+
+                /* save instance offsets before we mutate them as we need them when rendering */
+                debugObject.instanceOffsets = primitiveOffsets;
+                debugObject.instanceOffsetsNoDepth = primitiveOffsetsNoDepth;
+
+                ProcessRenderables(debugObject.renderablesWithDepth, ref primitiveOffsets);
+                ProcessRenderables(debugObject.renderablesNoDepth, ref primitiveOffsetsNoDepth);
+
+                debugObject.primitivesToDraw = debugObject.totalPrimitives;
+                debugObject.primitivesToDrawNoDepth = debugObject.totalPrimitivesNoDepth;
+
+                // store the last offsets, so we can start from there next iteration
+                lastOffset = debugObject.instanceOffsetsNoDepth.Cones + debugObject.totalPrimitivesNoDepth.Cones;
+                lastLineOffset = debugObject.instanceOffsetsNoDepth.Lines + debugObject.totalPrimitivesNoDepth.Lines * 2;
+
+                // only now clear this data...
+                debugObject.renderablesWithDepth.Clear(true);
+                debugObject.renderablesNoDepth.Clear(true);
+                debugObject.totalPrimitives.Clear();
+                debugObject.totalPrimitivesNoDepth.Clear();
+
+            }
+
+        }
+
+        private unsafe static void UpdateBufferIfNecessary(GraphicsDevice device, CommandList commandList, ref Buffer buffer, DataPointer dataPtr, int elementSize)
+        {
+            int neededBufferSize = dataPtr.Size / elementSize;
+            if (neededBufferSize > buffer.ElementCount)
+            {
+                buffer.Dispose();
+                var newBuffer = Xenko.Graphics.Buffer.New(
+                    device,
+                    dataPtr,
+                    buffer.StructureByteStride,
+                    buffer.Flags
+                );
+                buffer = newBuffer;
+            }
+            else
+            {
+                buffer.SetData(commandList, dataPtr);
+            }
+        }
+
+        private void CheckBuffers(RenderDrawContext context)
+        {
+
+            unsafe
+            {
+
+                fixed (Matrix* transformsPtr = transforms.Items)
+                {
+                    UpdateBufferIfNecessary(
+                        context.GraphicsDevice, context.CommandList, buffer: ref transformBuffer,
+                        dataPtr: new DataPointer(transformsPtr, transforms.Count * Marshal.SizeOf<Matrix>()),
+                        elementSize: Marshal.SizeOf<Matrix>()
+                    );
+                }
+
+                fixed (Color* colorsPtr = colors.Items)
+                {
+                    UpdateBufferIfNecessary(
+                        context.GraphicsDevice, context.CommandList, buffer: ref colorBuffer,
+                        dataPtr: new DataPointer(colorsPtr, colors.Count * Marshal.SizeOf<Color>()),
+                        elementSize: Marshal.SizeOf<Color>()
+                    );
+                }
+
+                fixed (LineVertex* lineVertsPtr = lineVertices.Items)
+                {
+                    UpdateBufferIfNecessary(
+                        context.GraphicsDevice, context.CommandList, buffer: ref lineVertexBuffer,
+                        dataPtr: new DataPointer(lineVertsPtr, lineVertices.Count * Marshal.SizeOf<LineVertex>()),
+                        elementSize: Marshal.SizeOf<LineVertex>()
+                    );
+                }
+
+            }
+
+        }
+
+        public override void Prepare(RenderDrawContext context)
+        {
+
+            transforms.Resize(instances.Count, true);
+            colors.Resize(instances.Count, true);
+
+            Dispatcher.For(0, transforms.Count, (int i) =>
+            {
+                ref var instance = ref instances.Items[i];
+                Matrix.Transformation(ref instance.Scale, ref instance.Rotation, ref instance.Position, out transforms.Items[i]);
+                colors[i] = instance.Color;
+            }
+            );
+
+            CheckBuffers(context);
+            lineVertices.Clear(true);
+            instances.Clear(true);
+
+        }
+
+        private void SetPrimitiveRenderingPipelineState(CommandList commandList, bool depthTest, FillMode selectedFillMode, bool isDoubleSided = false, bool hasTransparency = false)
+        {
+
+            pipelineState.State.SetDefaults();
+            pipelineState.State.PrimitiveType = PrimitiveType.TriangleList;
+            pipelineState.State.RootSignature = primitiveEffect.RootSignature;
+            pipelineState.State.EffectBytecode = primitiveEffect.Effect.Bytecode;
+            pipelineState.State.DepthStencilState = (depthTest) ? (hasTransparency ? DepthStencilStates.DepthRead : DepthStencilStates.Default) : DepthStencilStates.None;
+            pipelineState.State.RasterizerState.FillMode = selectedFillMode;
+            pipelineState.State.RasterizerState.CullMode = (selectedFillMode == FillMode.Solid && !isDoubleSided) ? CullMode.Back : CullMode.None;
+            pipelineState.State.BlendState = hasTransparency ? BlendStates.NonPremultiplied : BlendStates.Opaque;
+            pipelineState.State.Output.CaptureState(commandList);
+            pipelineState.State.InputElements = inputElements;
+            pipelineState.Update();
+
+        }
+
+        private void SetLineRenderingPipelineState(CommandList commandList, bool depthTest, bool hasTransparency = false)
+        {
+            pipelineState.State.SetDefaults();
+            pipelineState.State.PrimitiveType = PrimitiveType.LineList;
+            pipelineState.State.RootSignature = lineEffect.RootSignature;
+            pipelineState.State.EffectBytecode = lineEffect.Effect.Bytecode;
+            pipelineState.State.DepthStencilState = (depthTest) ? (hasTransparency ? DepthStencilStates.DepthRead : DepthStencilStates.Default) : DepthStencilStates.None;
+            pipelineState.State.RasterizerState.FillMode = FillMode.Solid;
+            pipelineState.State.RasterizerState.CullMode = CullMode.None;
+            pipelineState.State.BlendState = (hasTransparency) ? BlendStates.NonPremultiplied : BlendStates.Opaque;
+            pipelineState.State.Output.CaptureState(commandList);
+            pipelineState.State.InputElements = lineInputElements;
+            pipelineState.Update();
+        }
+
+        private void RenderPrimitives(RenderDrawContext context, RenderView renderView, ref Primitives offsets, ref Primitives counts, bool depthTest, FillMode fillMode, bool hasTransparency)
+        {
+
+            var commandList = context.CommandList;
+
+            // set buffers and our current pipeline state
+            commandList.SetVertexBuffer(0, vertexBuffer, 0, VertexPositionTexture.Layout.VertexStride);
+            commandList.SetIndexBuffer(indexBuffer, 0, is32bits: true);
+            commandList.SetPipelineState(pipelineState.CurrentState);
+
+            // we set line width to something absurdly high to avoid having to alter our shader substantially for now
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.LineWidthMultiplier, (fillMode == FillMode.Solid) ? 10000.0f : 1.0f);
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.ViewProjection, renderView.ViewProjection);
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.Transforms, transformBuffer);
+            primitiveEffect.Parameters.Set(PrimitiveShaderKeys.Colors, colorBuffer);
+
+            primitiveEffect.UpdateEffect(context.GraphicsDevice);
+            primitiveEffect.Apply(context.GraphicsContext);
+
+            // draw spheres
+            if (counts.Spheres > 0)
+            {
+
+                SetPrimitiveRenderingPipelineState(commandList, depthTest, fillMode, isDoubleSided: false, hasTransparency: hasTransparency);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Spheres);
+                primitiveEffect.Apply(context.GraphicsContext);
+
+                commandList.DrawIndexedInstanced(sphere.Indices.Length, counts.Spheres, primitiveIndexOffsets.Spheres, primitiveVertexOffsets.Spheres);
+
+            }
+
+            if (counts.Quads > 0 || counts.Circles > 0 || counts.HalfSpheres > 0)
+            {
+
+                SetPrimitiveRenderingPipelineState(commandList, depthTest, fillMode, isDoubleSided: true, hasTransparency: hasTransparency);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                // draw quads
+                if (counts.Quads > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Quads);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(plane.Indices.Length, counts.Quads, primitiveIndexOffsets.Quads, primitiveVertexOffsets.Quads);
+
+                }
+
+                // draw circles
+                if (counts.Circles > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Circles);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(circle.Indices.Length, counts.Circles, primitiveIndexOffsets.Circles, primitiveVertexOffsets.Circles);
+
+                }
+
+                // draw half spheres
+                if (counts.HalfSpheres > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.HalfSpheres);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    // HACK: we sort of abuse knowledge of the mesh primitive here.. :P
+                    commandList.DrawIndexedInstanced(sphere.Indices.Length / 2, counts.HalfSpheres, primitiveIndexOffsets.HalfSpheres, primitiveVertexOffsets.HalfSpheres);
+
+                }
+
+            }
+
+            if (counts.Cubes > 0 || counts.Capsules > 0 || counts.Cylinders > 0 || counts.Cones > 0)
+            {
+
+                SetPrimitiveRenderingPipelineState(commandList, depthTest, fillMode, isDoubleSided: false, hasTransparency: hasTransparency);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                // draw cubes
+                if (counts.Cubes > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Cubes);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(cube.Indices.Length, counts.Cubes, primitiveIndexOffsets.Cubes, primitiveVertexOffsets.Cubes);
+
+                }
+
+                // draw capsules
+                if (counts.Capsules > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Capsules);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(capsule.Indices.Length, counts.Capsules, primitiveIndexOffsets.Capsules, primitiveVertexOffsets.Capsules);
+
+                }
+
+                // draw cylinders
+                if (counts.Cylinders > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Cylinders);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(cylinder.Indices.Length, counts.Cylinders, primitiveIndexOffsets.Cylinders, primitiveVertexOffsets.Cylinders);
+
+                }
+
+                // draw cones
+                if (counts.Cones > 0)
+                {
+
+                    primitiveEffect.Parameters.Set(PrimitiveShaderKeys.InstanceOffset, offsets.Cones);
+                    primitiveEffect.Apply(context.GraphicsContext);
+
+                    commandList.DrawIndexedInstanced(cone.Indices.Length, counts.Cones, primitiveIndexOffsets.Cones, primitiveVertexOffsets.Cones);
+
+                }
+
+            }
+
+            // draw lines
+            if (counts.Lines > 0)
+            {
+
+                SetLineRenderingPipelineState(commandList, depthTest, hasTransparency);
+                commandList.SetVertexBuffer(0, lineVertexBuffer, 0, LineVertex.Layout.VertexStride);
+                commandList.SetPipelineState(pipelineState.CurrentState);
+
+                lineEffect.Parameters.Set(LinePrimitiveShaderKeys.ViewProjection, renderView.ViewProjection);
+                lineEffect.UpdateEffect(context.GraphicsDevice);
+                lineEffect.Apply(context.GraphicsContext);
+
+                commandList.Draw(counts.Lines * 2, offsets.Lines);
+
+            }
+
+        }
+
+        public override void Draw(RenderDrawContext context, RenderView renderView, RenderViewStage renderViewStage, int startIndex, int endIndex)
+        {
+
+            var commandList = context.CommandList;
+
+            for (int index = startIndex; index < endIndex; index++)
+            {
+
+                var renderNodeReference = renderViewStage.SortedRenderNodes[index].RenderNode;
+                var debugObject = (DebugRenderObject)(GetRenderNode(renderNodeReference).RenderObject);
+                bool objectHasTransparency = debugObject.Stage == DebugRenderStage.Transparent;
+
+                // update pipeline state, render with depth test first
+                SetPrimitiveRenderingPipelineState(commandList, depthTest: true, selectedFillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+                RenderPrimitives(context, renderView, ref debugObject.instanceOffsets, ref debugObject.primitivesToDraw, depthTest: true, fillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+
+                // render without depth test second
+                SetPrimitiveRenderingPipelineState(commandList, depthTest: false, selectedFillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+                RenderPrimitives(context, renderView, offsets: ref debugObject.instanceOffsetsNoDepth, counts: ref debugObject.primitivesToDrawNoDepth, depthTest: false, fillMode: debugObject.CurrentFillMode, hasTransparency: objectHasTransparency);
+
+            }
+
+        }
+
+        public override void Flush(RenderDrawContext context)
+        {
+        }
+
+        /* FIXME: is there a nicer way to handle dispose, some xenko idiom? */
+
+        public override void Unload()
+        {
+            base.Unload();
+            transformBuffer.Dispose();
+            colorBuffer.Dispose();
+            vertexBuffer.Dispose();
+            indexBuffer.Dispose();
+            lineVertexBuffer.Dispose();
+        }
+
+    }
+
+}
diff --git a/sources/engine/Xenko.Engine/DebugRendering/DebugRenderObject.cs b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderObject.cs
new file mode 100644
index 0000000000..8dce90dc0a
--- /dev/null
+++ b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderObject.cs
@@ -0,0 +1,180 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+using Xenko.Rendering;
+
+using static Xenko.Engine.DebugRenderFeature;
+
+namespace Xenko.Engine
+{
+    public class DebugRenderObject : RenderObject
+    {
+
+        /* messages */
+        internal readonly FastList<Renderable> renderablesWithDepth = new FastList<Renderable>();
+        internal readonly FastList<Renderable> renderablesNoDepth = new FastList<Renderable>();
+
+        /* accumulators used when data is being pushed to the system */
+        internal Primitives totalPrimitives, totalPrimitivesNoDepth;
+
+        /* used to specify offset into instance data buffers when drawing */
+        internal Primitives instanceOffsets, instanceOffsetsNoDepth;
+
+        /* used in render stage to know how many of each instance to draw */
+        internal Primitives primitivesToDraw, primitivesToDrawNoDepth;
+
+        /* state set from outside */
+        internal FillMode CurrentFillMode { get; set; } = FillMode.Wireframe;
+
+        internal DebugRenderStage Stage { get; set; }
+
+        public void DrawQuad(ref Vector3 position, ref Vector2 size, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Quad() { Position = position, Size = size, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Quads++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Quads++;
+            }
+        }
+
+        public void DrawCircle(ref Vector3 position, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Circle() { Position = position, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Circles++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Circles++;
+            }
+        }
+
+        public void DrawSphere(ref Vector3 position, float radius, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Sphere() { Position = position, Radius = radius, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Spheres++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Spheres++;
+            }
+        }
+
+        public void DrawHalfSphere(ref Vector3 position, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new HalfSphere() { Position = position, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.HalfSpheres++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.HalfSpheres++;
+            }
+        }
+
+        public void DrawCube(ref Vector3 start, ref Vector3 end, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Cube() { Start = start, End = end, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Cubes++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Cubes++;
+            }
+        }
+
+        public void DrawCapsule(ref Vector3 position, float height, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Capsule() { Position = position, Height = height, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Capsules++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Capsules++;
+            }
+        }
+
+        public void DrawCylinder(ref Vector3 position, float height, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Cylinder() { Position = position, Height = height, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Cylinders++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Cylinders++;
+            }
+        }
+
+        public void DrawCone(ref Vector3 position, float height, float radius, ref Quaternion rotation, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Cone() { Position = position, Height = height, Radius = radius, Rotation = rotation, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Cones++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Cones++;
+            }
+        }
+
+        public void DrawLine(ref Vector3 start, ref Vector3 end, ref Color color, bool depthTest = true)
+        {
+            var cmd = new Line() { Start = start, End = end, Color = color };
+            var msg = new Renderable(ref cmd);
+            if (depthTest)
+            {
+                renderablesWithDepth.Add(msg);
+                totalPrimitives.Lines++;
+            }
+            else
+            {
+                renderablesNoDepth.Add(msg);
+                totalPrimitivesNoDepth.Lines++;
+            }
+        }
+
+    }
+
+}
diff --git a/sources/engine/Xenko.Engine/DebugRendering/DebugRenderStageSelector.cs b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderStageSelector.cs
new file mode 100644
index 0000000000..2a23a9f530
--- /dev/null
+++ b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderStageSelector.cs
@@ -0,0 +1,37 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.ComponentModel;
+using Xenko.Rendering;
+
+using static Xenko.Engine.DebugRenderFeature;
+
+namespace Xenko.Engine
+{
+    public class DebugRenderStageSelector : RenderStageSelector
+    {
+
+        [DefaultValue(RenderGroupMask.All)]
+        public RenderGroupMask RenderGroup { get; set; } = RenderGroupMask.All;
+
+        [DefaultValue(null)]
+        public RenderStage OpaqueRenderStage { get; set; }
+
+        [DefaultValue(null)]
+        public RenderStage TransparentRenderStage { get; set; }
+
+        public override void Process(RenderObject renderObject)
+        {
+            if (((RenderGroupMask)(1U << (int)renderObject.RenderGroup) & RenderGroup) != 0)
+            {
+                var debugObject = (DebugRenderObject)renderObject;
+                var renderStage = (debugObject.Stage == DebugRenderStage.Opaque) ? OpaqueRenderStage : TransparentRenderStage;
+                if (renderStage != null)
+                {
+                    renderObject.ActiveRenderStages[renderStage.Index] = new ActiveRenderStage(null);
+                }
+            }
+        }
+
+    }
+}
diff --git a/sources/engine/Xenko.Engine/DebugRendering/DebugRenderSystem.cs b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderSystem.cs
new file mode 100644
index 0000000000..8e1787c63d
--- /dev/null
+++ b/sources/engine/Xenko.Engine/DebugRendering/DebugRenderSystem.cs
@@ -0,0 +1,511 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Runtime.InteropServices;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Graphics;
+using Xenko.Rendering;
+
+namespace Xenko.Engine
+{
+
+    public class DebugRenderSystem : GameSystemBase
+    {
+
+        internal enum DebugRenderableType : byte
+        {
+            Quad,
+            Circle,
+            Line,
+            Cube,
+            Sphere,
+            HalfSphere,
+            Capsule,
+            Cylinder,
+            Cone
+        }
+
+        internal enum DebugRenderableFlags : byte
+        {
+            Solid = (1 << 0),
+            Wireframe = (1 << 1),
+            DepthTest = (1 << 2)
+        }
+
+        [StructLayout(LayoutKind.Explicit)]
+        internal struct DebugRenderable
+        {
+
+            public DebugRenderable(ref DebugDrawQuad q, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Quad;
+                Flags = renderFlags;
+                QuadData = q;
+            }
+
+            public DebugRenderable(ref DebugDrawCircle c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Circle;
+                Flags = renderFlags;
+                CircleData = c;
+            }
+
+            public DebugRenderable(ref DebugDrawLine l, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Line;
+                Flags = renderFlags;
+                LineData = l;
+            }
+
+            public DebugRenderable(ref DebugDrawCube b, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Cube;
+                Flags = renderFlags;
+                CubeData = b;
+            }
+
+            public DebugRenderable(ref DebugDrawSphere s, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Sphere;
+                Flags = renderFlags;
+                SphereData = s;
+            }
+
+            public DebugRenderable(ref DebugDrawHalfSphere h, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.HalfSphere;
+                Flags = renderFlags;
+                HalfSphereData = h;
+            }
+
+            public DebugRenderable(ref DebugDrawCapsule c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Capsule;
+                Flags = renderFlags;
+                CapsuleData = c;
+            }
+
+            public DebugRenderable(ref DebugDrawCylinder c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Cylinder;
+                Flags = renderFlags;
+                CylinderData = c;
+            }
+
+            public DebugRenderable(ref DebugDrawCone c, DebugRenderableFlags renderFlags) : this()
+            {
+                Type = DebugRenderableType.Cone;
+                Flags = renderFlags;
+                ConeData = c;
+            }
+
+            [FieldOffset(0)]
+            public DebugRenderableType Type;
+
+            [FieldOffset(sizeof(byte))]
+            public DebugRenderableFlags Flags;
+
+            [FieldOffset(sizeof(byte) * 2)]
+            public float Lifetime;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawQuad QuadData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCircle CircleData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawLine LineData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCube CubeData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawSphere SphereData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawHalfSphere HalfSphereData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCapsule CapsuleData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCylinder CylinderData;
+
+            [FieldOffset((sizeof(byte) * 2) + sizeof(float))]
+            public DebugDrawCone ConeData;
+
+        }
+
+        internal struct DebugDrawQuad
+        {
+            public Vector3 Position;
+            public Vector2 Size;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCircle
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawLine
+        {
+            public Vector3 Start;
+            public Vector3 End;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCube
+        {
+            public Vector3 Position;
+            public Vector3 End;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawSphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Color Color;
+        }
+
+        internal struct DebugDrawHalfSphere
+        {
+            public Vector3 Position;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCapsule
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCylinder
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        internal struct DebugDrawCone
+        {
+            public Vector3 Position;
+            public float Height;
+            public float Radius;
+            public Quaternion Rotation;
+            public Color Color;
+        }
+
+        private readonly FastList<DebugRenderable> renderMessages = new FastList<DebugRenderable>();
+        private readonly FastList<DebugRenderable> renderMessagesWithLifetime = new FastList<DebugRenderable>();
+
+        private DebugRenderObject solidPrimitiveRenderer;
+        private DebugRenderObject wireframePrimitiveRenderer;
+        private DebugRenderObject transparentSolidPrimitiveRenderer;
+        private DebugRenderObject transparentWireframePrimitiveRenderer;
+
+        public Color PrimitiveColor { get; set; } = Color.LightGreen;
+
+        public int MaxPrimitives { get; set; } = 100;
+        public int MaxPrimitivesWithLifetime { get; set; } = 100;
+
+        public RenderGroup RenderGroup { get; set; } = RenderGroup.Group31;
+
+        public DebugRenderSystem(IServiceRegistry registry) : base(registry)
+        {
+            Enabled = true;
+            Visible = Platform.IsRunningDebugAssembly;
+
+            DrawOrder = 0xffffff;
+            UpdateOrder = -100100; //before script
+        }
+
+        private void PushMessage(ref DebugRenderable msg)
+        {
+            if (msg.Lifetime > 0.0f)
+            {
+                renderMessagesWithLifetime.Add(msg);
+                // drop one old message if the tail size has been reached
+                if (renderMessagesWithLifetime.Count > MaxPrimitivesWithLifetime)
+                {
+                    renderMessagesWithLifetime.RemoveAt(renderMessagesWithLifetime.Count - 1);
+                }
+            }
+            else
+            {
+                renderMessages.Add(msg);
+                // drop one old message if the tail size has been reached
+                if (renderMessages.Count > MaxPrimitives)
+                {
+                    renderMessages.RemoveAt(renderMessages.Count - 1);
+                }
+            }
+        }
+
+        public void DrawLine(Vector3 start, Vector3 end, Color color = default, float duration = 0.0f, bool depthTest = true)
+        {
+            var cmd = new DebugDrawLine { Start = start, End = end, Color = color == default ? PrimitiveColor : color };
+            var msg = new DebugRenderable(ref cmd, depthTest ? DebugRenderableFlags.DepthTest : 0) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawLines(Vector3[] vertices, Color? color = null, float duration = 0.0f, bool depthTest = true)
+        {
+            var totalVertexPairs = vertices.Length - (vertices.Length % 2);
+            for (int i = 0; i < totalVertexPairs; i += 2)
+            {
+                ref var v1 = ref vertices[i];
+                ref var v2 = ref vertices[i];
+                DrawLine(v1, v2, color ?? PrimitiveColor, duration, depthTest);
+            }
+        }
+
+        public void DrawRay(Vector3 start, Vector3 dir, Color color = default, float duration = 0.0f, bool depthTest = true)
+        {
+            DrawLine(start, start + dir, color == default ? PrimitiveColor : color, duration, depthTest);
+        }
+
+        public void DrawArrow(Vector3 from, Vector3 to, float coneHeight = 0.25f, float coneRadius = 0.125f, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            DrawLine(from, to, color, duration, depthTest);
+            DrawCone(to, coneHeight, coneRadius, Quaternion.BetweenDirections(new Vector3(0.0f, 1.0f, 0.0f), to - from), color == default ? PrimitiveColor : color, duration, depthTest, solid);
+        }
+
+        public void DrawSphere(Vector3 position, float radius, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawSphere { Position = position, Radius = radius, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawHalfSphere(Vector3 position, float radius, Color color = default, Quaternion rotation = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawHalfSphere { Position = position, Radius = radius, Rotation = rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawBounds(Vector3 start, Vector3 end, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCube { Position = start + ((end - start) / 2), End = end + ((end - start) / 2), Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCube(Vector3 start, Vector3 size, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCube { Position = start, End = start + size, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCapsule(Vector3 position, float height, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            // FIXME: height is divided by two here but can probably be solved more elegantly elsewhere yes
+            var cmd = new DebugDrawCapsule { Position = position, Height = height / 2.0f, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCylinder(Vector3 position, float height, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCylinder { Position = position, Height = height, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCone(Vector3 position, float height, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCone { Position = position, Height = height, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawQuad(Vector3 position, Vector2 size, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawQuad { Position = position, Size = size, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        public void DrawCircle(Vector3 position, float radius, Quaternion rotation = default, Color color = default, float duration = 0.0f, bool depthTest = true, bool solid = false)
+        {
+            var cmd = new DebugDrawCircle { Position = position, Radius = radius, Rotation = rotation == default ? Quaternion.Identity : rotation, Color = color == default ? PrimitiveColor : color };
+            var renderFlags = (depthTest ? DebugRenderableFlags.DepthTest : 0) | (solid ? DebugRenderableFlags.Solid : DebugRenderableFlags.Wireframe);
+            var msg = new DebugRenderable(ref cmd, renderFlags) { Lifetime = duration };
+            PushMessage(ref msg);
+        }
+
+        private bool CreateDebugRenderObjects()
+        {
+
+            // TODO: is this sane at all? it still seems a bit off.. what happens if the VisibilityGroups stuff gets changed/updated for instance?
+            //  or will that never happen? ask xen2 about this and visibilitygroups again specifically.....
+            var renderContext = RenderContext.GetShared(Services);
+            if (renderContext == null)
+                return false;
+
+            var visibilityGroup = renderContext.VisibilityGroup;
+            if (visibilityGroup == null)
+                return false;
+
+            var newSolidRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Solid,
+                Stage = DebugRenderFeature.DebugRenderStage.Opaque
+            };
+            visibilityGroup.RenderObjects.Add(newSolidRenderObject);
+            solidPrimitiveRenderer = newSolidRenderObject;
+
+            var newWireframeRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Wireframe,
+                Stage = DebugRenderFeature.DebugRenderStage.Opaque
+            };
+            visibilityGroup.RenderObjects.Add(newWireframeRenderObject);
+            wireframePrimitiveRenderer = newWireframeRenderObject;
+
+            var newTransparentSolidRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Solid,
+                Stage = DebugRenderFeature.DebugRenderStage.Transparent
+            };
+            visibilityGroup.RenderObjects.Add(newTransparentSolidRenderObject);
+            transparentSolidPrimitiveRenderer = newTransparentSolidRenderObject;
+
+            var newTransparentWireframeRenderObject = new DebugRenderObject
+            {
+                CurrentFillMode = FillMode.Wireframe,
+                Stage = DebugRenderFeature.DebugRenderStage.Transparent
+            };
+            visibilityGroup.RenderObjects.Add(newTransparentWireframeRenderObject);
+            transparentWireframePrimitiveRenderer = newTransparentWireframeRenderObject;
+
+            return true;
+
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+
+            if (!Enabled || !Visible)
+                return;
+
+            if (wireframePrimitiveRenderer == null)
+            {
+                bool created = CreateDebugRenderObjects();
+                if (!created)
+                    return;
+            }
+
+            // TODO: check if i'm doing this correctly..
+            solidPrimitiveRenderer.RenderGroup = RenderGroup;
+            wireframePrimitiveRenderer.RenderGroup = RenderGroup;
+            transparentSolidPrimitiveRenderer.RenderGroup = RenderGroup;
+            transparentWireframePrimitiveRenderer.RenderGroup = RenderGroup;
+
+            HandlePrimitives(gameTime, renderMessages);
+            HandlePrimitives(gameTime, renderMessagesWithLifetime);
+
+            float delta = (float)gameTime.Elapsed.TotalSeconds;
+
+            /* clear out any messages with no lifetime left */
+            for (int i = 0; i < renderMessagesWithLifetime.Count; ++i)
+            {
+                renderMessagesWithLifetime.Items[i].Lifetime -= delta;
+            }
+
+            renderMessagesWithLifetime.RemoveAll((msg) => msg.Lifetime <= 0.0f);
+
+            /* just clear our per-frame array */
+            renderMessages.Clear(true);
+
+        }
+
+        private void HandlePrimitives(GameTime gameTime, FastList<DebugRenderable> messages)
+        {
+
+            DebugRenderObject ChooseRenderer(DebugRenderableFlags flags, byte alpha)
+            {
+                if (alpha < 255)
+                {
+                    return ((flags & DebugRenderableFlags.Solid) != 0) ? transparentSolidPrimitiveRenderer : transparentWireframePrimitiveRenderer;
+                }
+                else
+                {
+                    return ((flags & DebugRenderableFlags.Solid) != 0) ? solidPrimitiveRenderer : wireframePrimitiveRenderer;
+                }
+            }
+
+            if (messages.Count == 0)
+            {
+                return;
+            }
+
+            for (int i = 0; i < messages.Count; ++i)
+            {
+                ref var msg = ref messages.Items[i];
+                var useDepthTest = (msg.Flags & DebugRenderableFlags.DepthTest) != 0;
+                switch (msg.Type)
+                {
+                    case DebugRenderableType.Quad:
+                        ChooseRenderer(msg.Flags, msg.QuadData.Color.A).DrawQuad(ref msg.QuadData.Position, ref msg.QuadData.Size, ref msg.QuadData.Rotation, ref msg.QuadData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Circle:
+                        ChooseRenderer(msg.Flags, msg.CircleData.Color.A).DrawCircle(ref msg.CircleData.Position, msg.CircleData.Radius, ref msg.CircleData.Rotation, ref msg.CircleData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Line:
+                        ChooseRenderer(msg.Flags, msg.LineData.Color.A).DrawLine(ref msg.LineData.Start, ref msg.LineData.End, ref msg.LineData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Cube:
+                        ChooseRenderer(msg.Flags, msg.CubeData.Color.A).DrawCube(ref msg.CubeData.Position, ref msg.CubeData.End, ref msg.CubeData.Rotation, ref msg.CubeData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Sphere:
+                        ChooseRenderer(msg.Flags, msg.SphereData.Color.A).DrawSphere(ref msg.SphereData.Position, msg.SphereData.Radius, ref msg.SphereData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.HalfSphere:
+                        ChooseRenderer(msg.Flags, msg.HalfSphereData.Color.A).DrawHalfSphere(ref msg.HalfSphereData.Position, msg.HalfSphereData.Radius, ref msg.HalfSphereData.Rotation, ref msg.HalfSphereData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Capsule:
+                        ChooseRenderer(msg.Flags, msg.CapsuleData.Color.A).DrawCapsule(ref msg.CapsuleData.Position, msg.CapsuleData.Height, msg.CapsuleData.Radius, ref msg.CapsuleData.Rotation, ref msg.CapsuleData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Cylinder:
+                        ChooseRenderer(msg.Flags, msg.CylinderData.Color.A).DrawCylinder(ref msg.CylinderData.Position, msg.CylinderData.Height, msg.CylinderData.Radius, ref msg.CylinderData.Rotation, ref msg.CylinderData.Color, depthTest: useDepthTest);
+                        break;
+                    case DebugRenderableType.Cone:
+                        ChooseRenderer(msg.Flags, msg.ConeData.Color.A).DrawCone(ref msg.ConeData.Position, msg.ConeData.Height, msg.ConeData.Radius, ref msg.ConeData.Rotation, ref msg.ConeData.Color, depthTest: useDepthTest);
+                        break;
+                }
+            }
+
+        }
+
+    }
+
+}
diff --git a/sources/engine/Xenko.Engine/Engine/AudioEmitterComponent.cs b/sources/engine/Xenko.Engine/Engine/AudioEmitterComponent.cs
deleted file mode 100644
index 36cef08d4d..0000000000
--- a/sources/engine/Xenko.Engine/Engine/AudioEmitterComponent.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using Xenko.Audio;
-using Xenko.Core;
-using Xenko.Core.Annotations;
-using Xenko.Core.Collections;
-using Xenko.Engine.Design;
-
-namespace Xenko.Engine
-{
-    /// <summary>
-    /// Component representing an audio emitter.
-    /// </summary>
-    /// <remarks>
-    /// <para>
-    /// Associate this component to an entity to simulate a 3D localized source of sound coming from the entity center.
-    /// </para>
-    /// <para>
-    /// Several sounds can be associated to a single AudioEmitterComponent.
-    /// Use the <see cref="Sounds"/> dictionary to associate or dissociate a <see cref="SoundBase"/> to the emitter component.
-    /// Each SoundBase associated to the emitter component can be controlled (played, paused, stopped, ...) independently for the others.
-    /// Once attached to the emitter component, a SoundBase is controlled using a <see cref="AudioEmitterSoundController"/>.
-    /// To get the AudioEmitterSoundController associated to a SoundBase use the readonly <see cref="AudioEmitterComponent.Item(string)"/> indexer.
-    /// </para>
-    /// </remarks>
-    [Display("Audio emitter", Expand = ExpandRule.Once)]
-    [DataContract("AudioEmitterComponent")]
-    [DefaultEntityComponentProcessor(typeof(AudioEmitterProcessor), ExecutionMode = ExecutionMode.Runtime)]
-    [ComponentOrder(7000)]
-    [ComponentCategory("Audio")]
-    public sealed class AudioEmitterComponent : ActivableEntityComponent
-    {
-        /// <summary>
-        /// Dictionary associating each SoundBase to a single soundController.
-        /// The controller a valid as long as the corresponding SoundBase is present in the dictionary.
-        /// </summary>
-        internal readonly Dictionary<SoundBase, AudioEmitterSoundController> SoundToController = new Dictionary<SoundBase, AudioEmitterSoundController>();
-
-        /// <summary>
-        /// Event argument class used to signal the <see cref="AudioEmitterProcessor"/> that a new AudioEmitterSoundController has new added or removed to the component.
-        /// </summary>
-        internal class ControllerCollectionChangedEventArgs
-        {
-            /// <summary>
-            /// The entity associated the current component.
-            /// </summary>
-            public Entity Entity;
-
-            /// <summary>
-            /// The controller that have been added or removed to the component.
-            /// </summary>
-            public AudioEmitterSoundController Controller;
-
-            /// <summary>
-            /// The AudioEmitterComponent itself
-            /// </summary>
-            public AudioEmitterComponent EmitterComponent;
-
-            /// <summary>
-            /// Action indication if the controller has been added or removed.
-            /// </summary>
-            public NotifyCollectionChangedAction Action;
-
-            public ControllerCollectionChangedEventArgs(Entity entity, AudioEmitterSoundController controller, AudioEmitterComponent component, NotifyCollectionChangedAction action)
-            {
-                Entity = entity;
-                Controller = controller;
-                EmitterComponent = component;
-                Action = action;
-            }
-        }
-
-        /// <summary>
-        /// Event triggered when an <see cref="AudioEmitterSoundController"/> has be attached or detached to the component.
-        /// </summary>
-        internal event EventHandler<ControllerCollectionChangedEventArgs> ControllerCollectionChanged;
-
-        /// <summary>
-        /// The sounds this audio emitter can play and use
-        /// </summary>
-        [DataMember(10)]
-        public TrackingDictionary<string, Sound> Sounds = new TrackingDictionary<string, Sound>();
-
-        /// <summary>
-        /// The sound controllers associated with the sounds this audio emitter can play and use, use this to access and play sounds.
-        /// </summary>
-        /// <param name="soundName">The name of the sound you want to access.</param>
-        /// <returns>The sound controller.</returns>
-        [DataMemberIgnore]
-        public AudioEmitterSoundController this[string soundName] => SoundToController[Sounds[soundName]];
-
-        /// <summary>
-        /// If possible use a more complex HRTF algorithm to perform 3D sound simulation
-        /// </summary>
-        /// <userdoc>
-        /// If possible use a more complex HRTF algorithm to perform 3D sound simulation
-        /// </userdoc>
-        [DataMember(20)]
-        // ReSharper disable once InconsistentNaming
-        public bool UseHRTF { get; set; }
-
-        /// <summary>
-        /// If 0 the sound will be omnidirectional, 1 fully directional
-        /// </summary>
-        /// <userdoc>
-        /// If 0 the sound will be omnidirectional, 1 fully directional
-        /// </userdoc>
-        [DataMember(30)]
-        [DataMemberRange(0.0, 1.0, 0.1, 0.2, 3)]
-        public float DirectionalFactor { get; set; }
-
-        /// <summary>
-        /// The reverberation model that this emitter will use
-        /// </summary>
-        /// <userdoc>
-        /// The reverberation model that this emitter will use
-        /// </userdoc>
-        [DataMember(40)]
-        public HrtfEnvironment Environment { get; set; }
-
-        /// <summary>
-        /// Attach a <see cref="SoundBase"/> to this emitter component.
-        /// Once attached a <see cref="AudioEmitterSoundController"/> can be queried using readonly <see cref="AudioEmitterComponent.Item(string)"/> indexer to control the attached SoundBase.
-        /// </summary>
-        /// <param name="sound">The SoundBase to attach</param>
-        /// <exception cref="ArgumentNullException">The provided <paramref name="sound"/> is null.</exception>
-        /// <exception cref="InvalidOperationException">The provided <paramref name="sound"/> can not be localized (contains more than one channel).</exception>
-        /// <remarks>Attaching a SoundBase already attached has no effects.</remarks>
-        public AudioEmitterSoundController AttachSound([NotNull] SoundBase sound)
-        {
-            if (sound == null) throw new ArgumentNullException(nameof(sound));
-            if (sound.Channels > 1)
-                throw new InvalidOperationException("The provided Sound has more than one channel. It can not be localized in the 3D scene, please check the spatialized option in the Sound asset.");
-
-            if (SoundToController.ContainsKey(sound))
-                return SoundToController[sound];
-
-            var newController = new AudioEmitterSoundController(this, sound);
-            SoundToController[sound] = newController;
-            ControllerCollectionChanged?.Invoke(this, new ControllerCollectionChangedEventArgs(Entity, newController, this, NotifyCollectionChangedAction.Add));
-
-            return newController;
-        }
-
-        /// <summary>
-        /// Detach a <see cref="SoundBase"/> from this emitter component.
-        /// Once detach the controller previously associated to the SoundBase is invalid.
-        /// </summary>
-        /// <param name="sound">The SoundBase to detach.</param>
-        /// <exception cref="ArgumentNullException">The provided <paramref name="sound"/> is null.</exception>
-        /// <exception cref="ArgumentException">The provided <paramref name="sound"/> is not currently attached to the emitter component.</exception>
-        public void DetachSound([NotNull] SoundBase sound)
-        {
-            if (sound == null) throw new ArgumentNullException(nameof(sound));
-            if (!SoundToController.ContainsKey(sound))
-                throw new ArgumentException("The provided Sound is not currently attached to this emitter component.");
-
-            var oldController = SoundToController[sound];
-            SoundToController.Remove(sound);
-            ControllerCollectionChanged?.Invoke(this, new ControllerCollectionChangedEventArgs(Entity, oldController, this, NotifyCollectionChangedAction.Remove));
-        }
-
-        private void OnSoundsOnCollectionChanged(object sender, TrackingCollectionChangedEventArgs args)
-        {
-            switch (args.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    AttachSound((SoundBase)args.Item);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    DetachSound((SoundBase)args.Item);
-                    break;
-            }
-        }
-
-        internal void AttachToProcessor()
-        {
-            Sounds.CollectionChanged += OnSoundsOnCollectionChanged;
-
-            foreach (var sound in Sounds)
-            {
-                if (sound.Value != null)
-                {
-                    AttachSound(sound.Value);
-                }
-            }
-        }
-
-        internal void DetachFromProcessor()
-        {
-            foreach (var sound in Sounds)
-            {
-                if (sound.Value != null)
-                {
-                    DetachSound(sound.Value);
-                }
-            }
-
-            Sounds.CollectionChanged -= OnSoundsOnCollectionChanged;
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Engine/AudioListenerComponent.cs b/sources/engine/Xenko.Engine/Engine/AudioListenerComponent.cs
index f599d5ae07..4a45df8e03 100644
--- a/sources/engine/Xenko.Engine/Engine/AudioListenerComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/AudioListenerComponent.cs
@@ -24,6 +24,6 @@ namespace Xenko.Engine
     public sealed class AudioListenerComponent : ActivableEntityComponent
     {
         [DataMemberIgnore]
-        internal AudioListener Listener;
+        internal AudioListener Listener => AudioEngine.DefaultListener;
     }
 }
diff --git a/sources/engine/Xenko.Engine/Engine/BackgroundComponent.cs b/sources/engine/Xenko.Engine/Engine/BackgroundComponent.cs
index d8e8a3fb6e..9780f3a796 100644
--- a/sources/engine/Xenko.Engine/Engine/BackgroundComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/BackgroundComponent.cs
@@ -2,9 +2,9 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System.ComponentModel;
-
 using Xenko.Core;
 using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
 using Xenko.Engine.Design;
 using Xenko.Engine.Processors;
 using Xenko.Graphics;
@@ -64,5 +64,18 @@ public BackgroundComponent()
         [Display("2D background")]
         [DefaultValue(false)]
         public bool Is2D { get; set; } = false;
+
+        [DataMember(50)]
+        [Display("Alpha Map Shaded")]
+        [DefaultValue(false)]
+        public bool IsHorizon { get; set; } = false;
+
+        [DataMember(60)]
+        [Display("Full Alpha Shade")]
+        public Color4 AlphaColor { get; set; } = new Color4(0.2f, 0.2f, 0.8f, 1f);
+
+        [DataMember(70)]
+        [Display("Zero Alpha Shade")]
+        public Color4 ZeroColor { get; set; } = new Color4(0.4f, 0.4f, 1f, 1f);
     }
 }
diff --git a/sources/engine/Xenko.Engine/Engine/Batching/BatchedMeshDraw.cs b/sources/engine/Xenko.Engine/Engine/Batching/BatchedMeshDraw.cs
new file mode 100644
index 0000000000..ef497cbafa
--- /dev/null
+++ b/sources/engine/Xenko.Engine/Engine/Batching/BatchedMeshDraw.cs
@@ -0,0 +1,574 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
+using Xenko.Graphics;
+using Xenko.Rendering;
+using Xenko.Rendering.Rendering;
+
+namespace Xenko.Engine
+{
+    /// <summary>
+    /// Helper class to refer to a BatchedMeshDraw index (can get its matrix, scale etc.)
+    /// </summary>
+    public class BatchedMeshDrawReference
+    {
+        public BatchedMeshDraw batchedMeshDraw { get; private set; }
+        public int index { get; private set; }
+
+        /// <summary>
+        /// Returns true if this points to a correct and valid copy index
+        /// </summary>
+        public bool IsValidReference => index > -1 && index < batchedMeshDraw.Capacity;
+
+        public Matrix TransformMatrix
+        {
+            get => batchedMeshDraw.GetTransform(index);
+            set => batchedMeshDraw.SetTransform(index, value);
+        }
+        public Vector2 UVOffset
+        {
+            get => batchedMeshDraw.GetUVOffset(index);
+            set => batchedMeshDraw.SetUVOffset(index, value);
+        }
+        public Vector2 UVScale
+        {
+            get => batchedMeshDraw.GetUVScale(index);
+            set => batchedMeshDraw.SetUVScale(index, value);
+        }
+        public Color4 ColorTint
+        {
+            get => batchedMeshDraw.GetColorTint(index);
+            set => batchedMeshDraw.SetColorTint(index, value);
+        }
+
+        /// <summary>
+        /// This not only hides this index, it invalidates it (since once hidden, it could be reused elsewhere without this reference knowing)
+        /// </summary>
+        public void Hide()
+        {
+            if (index != -1)
+            {
+                batchedMeshDraw.HideIndex(index);
+                index = -1;
+            }
+        }
+
+        /// <summary>
+        /// Finds a new index for this index, if possible. This does nothing if there already is a valid index.
+        /// </summary>
+        /// <returns>true if a new copy index was found (or we already have one). False if no index could be found</returns>
+        public bool FindNewIndex()
+        {
+            if (index == -1)
+                index = batchedMeshDraw.GetAvailableIndex();
+
+            return index != -1;
+        }
+
+        /// <summary>
+        /// Make a reference to a copy in batchedMeshDraw
+        /// </summary>
+        /// <param name="batchedMeshDraw">Which batch to reference copies of?</param>
+        /// <param name="index">Which index to be a reference to? Provide -1 to find one automatically</param>
+        public BatchedMeshDrawReference(BatchedMeshDraw batchedMeshDraw, int index = -1)
+        {
+            this.batchedMeshDraw = batchedMeshDraw;
+            this.index = index == -1 ? batchedMeshDraw.GetAvailableIndex() : index;
+        }
+    }
+
+    /// <summary>
+    /// This is like GPU instancing, but handled on the CPU-side to make it easier to implement and use.
+    /// It tracks the mesh and moves parts only as needed. Generally thread-safe, except don't make changes while rendering is happening.
+    /// Can be linked with other TransformComponents for easy updating "instanced" copies via each TransformComponent's BatchedMeshDrawReference
+    /// Needs one Entity with a ModelComponent to do drawing of all "instances", and you can use GenerateDynamicBatchedModel to provide the Model for dynamic batching
+    /// </summary>
+    public class BatchedMeshDraw : MeshDraw, IDisposable
+    {
+        /// <summary>
+        /// If we set custom colors, are we multiplying or setting directly?
+        /// </summary>
+        public enum COLOR_MODE
+        {
+            MULTIPLY = 0, // original color * custom color
+            SET = 1 // custom color direct set
+        };
+
+        /// <summary>
+        /// Defaults to multiplying colors
+        /// </summary>
+        public COLOR_MODE UseColorTintMode = COLOR_MODE.MULTIPLY;
+
+        /// <summary>
+        /// Set an instance at a certain transform matrix
+        /// </summary>
+        /// <param name="index">Which one to use?</param>
+        /// <param name="transform">WorldTransform</param>
+        public void SetTransform(int index, Matrix transform)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (internalTransforms[index] != transform)
+            {
+                internalTransforms[index] = transform;
+                MarkUpdateNeeded(index);
+
+                if (index == PossibleFreeIndex)
+                    PossibleFreeIndex = (PossibleFreeIndex + 1) % internalTransforms.Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets where this index is, or returns a certain zero-scaled matrix if it is hidden
+        /// </summary>
+        /// <param name="index">Which one</param>
+        /// <returns>Current matrix of index</returns>
+        public Matrix GetTransform(int index)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            return internalTransforms[index];
+        }
+
+        /// <summary>
+        /// Is this index hidden?
+        /// </summary>
+        /// <param name="index">Which one</param>
+        /// <returns>true if hidden</returns>
+        public bool IsHidden(int index)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            return internalTransforms[index] == dontdraw;
+        }
+
+        /// <summary>
+        /// Gets the UV offset of this index, if we are doing that kinda thing
+        /// </summary>
+        /// <param name="index">which one</param>
+        /// <returns>UV offset, if any</returns>
+        public Vector2 GetUVOffset(int index)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (uvOffsets == null) return Vector2.Zero;
+            return uvOffsets[index];
+        }
+
+        /// <summary>
+        /// Gets the UV offset of this index, if we are doing that kinda thing
+        /// </summary>
+        /// <param name="index">which one</param>
+        /// <returns>UV offset, if any</returns>
+        public Vector2 GetUVScale(int index)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (uvScales == null) return Vector2.One;
+            return uvScales[index];
+        }
+
+        /// <summary>
+        /// Gets the custom color of this index, if any
+        /// </summary>
+        /// <param name="index">which one</param>
+        /// <returns>Color, if any</returns>
+        public Color4 GetColorTint(int index)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (colors == null) return Color4.White;
+            return colors[index];
+        }
+
+        /// <summary>
+        /// You can give individual "instances" a UV offset, so copied models use different sections of a texture
+        /// </summary>
+        /// <param name="index">Which index to offset UVs by?</param>
+        /// <param name="offset">How much to offset the UVs?</param>
+        public void SetUVOffset(int index, Vector2 offset)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (uvOffsets == null) uvOffsets = new Vector2[internalTransforms.Length];
+
+            if (uvOffsets[index] != offset)
+            {
+                uvOffsets[index] = offset;
+                MarkUpdateNeeded(index);
+            }
+        }
+
+        /// <summary>
+        /// You can give individual "instances" a UV scale, so copied models use different scales of a texture
+        /// </summary>
+        /// <param name="index">Which index to scale UVs by?</param>
+        /// <param name="scale">How much to scale the UVs?</param>
+        public void SetUVScale(int index, Vector2 scale)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (uvScales == null)
+            {
+                // gotta initialize all of these to 1...
+                uvScales = new Vector2[internalTransforms.Length];
+                for (int i = 0; i < internalTransforms.Length; i++) {
+                    uvScales[i].X = 1f;
+                    uvScales[i].Y = 1f;
+                }
+            }
+
+            if (uvScales[index] != scale)
+            {
+                uvScales[index] = scale;
+                MarkUpdateNeeded(index);
+            }
+        }
+
+        /// <summary>
+        /// You can give individual "instances" color/tints if the shader is using vertex colors instead of textures
+        /// </summary>
+        /// <param name="index">Which index to set a custom color?</param>
+        /// <param name="color">What should the custom color tint be?</param>
+        public void SetColorTint(int index, Color4 color)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (colors == null)
+            {
+                // initialize everything to white, so it doesn't black everything else out
+                colors = new Color4[internalTransforms.Length];
+                for (int i = 0; i < colors.Length; i++) colors[i] = Color4.White;
+            }
+
+            if (colors[index] != color)
+            {
+                colors[index] = color;
+                MarkUpdateNeeded(index);
+            }
+        }
+
+        /// <summary>
+        /// Uses a built-in "zero" matrix to hide this index instance
+        /// </summary>
+        /// <param name="index">Which one to hide</param>
+        public void HideIndex(int index)
+        {
+            if (index < 0 || index >= internalTransforms.Length)
+                throw new IndexOutOfRangeException("BatchedMeshDraw out of bounds: index " + index + " is invalid (length is " + internalTransforms.Length + ")");
+
+            if (internalTransforms[index] != dontdraw)
+            {
+                internalTransforms[index] = dontdraw;
+                MarkUpdateNeeded(index);
+            }
+
+            PossibleFreeIndex = index;
+        }
+
+        /// <summary>
+        /// If true, only copies within the camera's frustum will be updated.
+        /// May cause issues with shadows, but improves performance. Make sure you set "AssociatedTransform" if this is not a root entity, so this
+        /// can be calculated correctly.
+        /// </summary>
+        public bool OptimizeForFrustum = true;
+
+        /// <summary>
+        /// If we are opimizing for frustum, and we are NOT a root entity, we need to know how these matricies are transformed to know if they are
+        /// within camera boundaries.
+        /// </summary>
+        public TransformComponent AssociatedTransform;
+
+        /// <summary>
+        /// Returns how many objects this BatchedMeshDraw can maintain. If you go over this number, you'll get out-of-bound exceptions.
+        /// </summary>
+        public int Capacity => internalTransforms.Length;
+
+        /// <summary>
+        /// Get a copy index that is currently hidden and is ready to be used
+        /// </summary>
+        /// <returns>index of free one. -1 if none could be found</returns>
+        public int GetAvailableIndex()
+        {
+            for (int i=0; i<internalTransforms.Length; i++)
+            {
+                int checkindex = (i + PossibleFreeIndex) % internalTransforms.Length;
+                if (internalTransforms[checkindex] == dontdraw)
+                {
+                    PossibleFreeIndex = (checkindex + 1) % internalTransforms.Length;
+                    return checkindex;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Easy function for making dynamic models. Make sure to do this during initialization and not runtime, as it is a bit slow.
+        /// </summary>
+        /// <param name="baseModel">What is the model we will be copying?</param>
+        /// <param name="capacity">How many do we want to be able to draw at once?</param>
+        /// <param name="bounds">What are the maximum rendering bounds for this?</param>
+        /// <param name="batchManager">Output used for updating transforms of each copy</param>
+        /// <returns></returns>
+        public static Model GenerateDynamicBatchedModel(Model baseModel, int capacity, BoundingBox bounds, out BatchedMeshDraw batchManager)
+        {
+            batchManager = new BatchedMeshDraw(baseModel, capacity);
+            Model mod = new Xenko.Rendering.Model();
+            Xenko.Rendering.Mesh m = new Xenko.Rendering.Mesh(batchManager, new ParameterCollection());
+            m.BoundingBox = mod.BoundingBox = bounds;
+            mod.Add(m);
+            mod.Add(baseModel.Materials[0]);
+            return mod;
+        }
+
+        /// <summary>
+        /// Hides all of the copies, resetting this BatchedMeshDraw to an empty state
+        /// </summary>
+        public void Clear()
+        {
+            for (int i = 0; i < internalTransforms.Length; i++)
+                HideIndex(i);
+
+            PossibleFreeIndex = 0;
+        }
+
+        /// <summary>
+        /// Raw creation of a BatchedMeshDraw object. I recommend using GenerateDynamicBatchedModel instead for ease.
+        /// Make sure to do this during initialization and not runtime, as it is a bit slow.
+        /// </summary>
+        /// <param name="m">Base model that will be copied</param>
+        /// <param name="capacity">How mnay to prepare and be able to draw at once?</param>
+        public BatchedMeshDraw(Model m, int capacity)
+        {
+            if (m.Materials.Count != 1)
+                throw new ArgumentException("Model needs exactly 1 material for proper batching.");
+
+            // calculate what a single mesh looks like and store its original verts
+            Model singleMesh = ModelBatcher.BatchModel(m);
+
+            if (singleMesh.Meshes.Count != 1)
+                throw new ArgumentException("Model couldn't be flattened into 1 mesh. Are you sure the vertex & index buffers have been captured?");
+
+            StagedMeshDraw singleDraw = singleMesh.Meshes[0].Draw as StagedMeshDraw;
+            if (singleDraw.Verticies is VertexPositionNormalTextureTangent[] vppntt)
+                origVerts0 = vppntt;
+            else if (singleDraw.Verticies is VertexPositionNormalColor[] vpnc)
+                origVerts1 = vpnc;
+
+            if (m.BoundingBox == BoundingBox.Empty) m.UpdateBoundingBox();
+            originalBoundingBox = m.BoundingBox;
+
+            internalTransforms = new Matrix[capacity];
+            for (int i = 0; i < capacity; i++)
+                internalTransforms[i] = dontdraw;
+
+            tempHiding = new bool[capacity];
+            avoidDuplicates = new bool[capacity];
+            indexUpdatesRequired = new int[capacity];
+            proccessingUpdates = new int[capacity];
+            actuallyUpdated = new int[capacity];
+            Model batched = ModelBatcher.GenerateBatch(singleMesh, new List<Matrix>(internalTransforms));
+            smd = (StagedMeshDraw)batched.Meshes[0].Draw;
+            updateVerts = UpdateVertexBuffer;
+            uploadVerts = UploadNewVertexBuffers;
+
+            singleDraw.Dispose();
+        }
+
+        private SpinLock duplicateChecker = new SpinLock();
+
+        private void MarkUpdateNeeded(int index)
+        {
+            bool lockTaken = false;
+            try
+            {
+                duplicateChecker.Enter(ref lockTaken);
+
+                if (!avoidDuplicates[index])
+                {
+                    avoidDuplicates[index] = true;
+                    indexUpdatesRequired[tCount++] = index;
+                }
+            }
+            finally
+            {
+                if (lockTaken) duplicateChecker.Exit();
+            }
+        }
+
+        internal void UploadNewVertexBuffers(CommandList commandList)
+        {
+            // only update buffers if something changed
+            int uploadCount = Interlocked.Exchange(ref auCount, 0);
+
+            if (uploadCount > 0)
+            {
+                object origVerts = origVerts0 == null ? origVerts1 : origVerts0;
+                int len = origVerts0 == null ? origVerts1.Length : origVerts0.Length;
+
+                // find the actual range of the buffer we need to upload
+                Array.Sort(actuallyUpdated, 0, uploadCount);
+
+                int startIndex = actuallyUpdated[0] * len;
+                int endIndex = (1 + actuallyUpdated[uploadCount - 1]) * len;
+
+                if (origVerts is VertexPositionNormalTextureTangent[])
+                    smd.VertexBuffers[0].Buffer.FastRawSetData<VertexPositionNormalTextureTangent>(commandList, (VertexPositionNormalTextureTangent[])smd.Verticies, startIndex, endIndex);
+                else
+                    smd.VertexBuffers[0].Buffer.FastRawSetData<VertexPositionNormalColor>(commandList, (VertexPositionNormalColor[])smd.Verticies, startIndex, endIndex);
+            }
+        }
+
+        internal void UpdateVertexBuffer(BoundingFrustum frustum)
+        {
+            if (smd == null || (smd.VertexBuffers?[0].Buffer?.Ready ?? false) == false) return; // not ready yet
+            int tUpdateCount = Interlocked.Exchange(ref tCount, 0);
+            if (tUpdateCount == 0) return;
+            if (tUpdateCount > indexUpdatesRequired.Length) tUpdateCount = indexUpdatesRequired.Length;
+
+            // use a copy of this array, so we don't step over it during multithreaded events
+            Array.Copy(indexUpdatesRequired, proccessingUpdates, tUpdateCount);
+
+            object origVerts = origVerts0 == null ? origVerts1 : origVerts0;
+            int len = origVerts0 == null ? origVerts1.Length : origVerts0.Length;
+            int auRunningcount = 0;
+
+            Xenko.Core.Threading.Dispatcher.For(0, tUpdateCount, (i) =>
+            {
+                int index = proccessingUpdates[i];
+                avoidDuplicates[index] = false;
+                Matrix tMatrix = internalTransforms[index];
+                if (OptimizeForFrustum)
+                {
+                    BoundingBox newbb;
+                    if (AssociatedTransform == null)
+                        BoundingBox.Transform(ref originalBoundingBox, ref tMatrix, out newbb);
+                    else
+                    {
+                        Matrix adjusted = tMatrix * AssociatedTransform.WorldMatrix;
+                        BoundingBox.Transform(ref originalBoundingBox, ref adjusted, out newbb);
+                    }
+                    if (frustum.Contains(ref newbb) == false)
+                    {
+                        // this isn't in the camera's frustum, so check next frame if it is
+                        MarkUpdateNeeded(index);
+                        if (tempHiding[index]) return;
+                        tempHiding[index] = true;
+                        tMatrix = tempskipdraw; // update this to hide it
+                    }
+                    else tempHiding[index] = false;
+                }
+                actuallyUpdated[Interlocked.Increment(ref auRunningcount) - 1] = index;
+                Vector2 uvOffset = uvOffsets == null ? Vector2.Zero : uvOffsets[index];
+                Vector2 uvScale = uvScales == null ? Vector2.One : uvScales[index];
+                Color4? specialColor = colors == null ? null : colors[index];
+                tMatrix.GetScale(out var tMatrixScale);
+                int vPos = index * len;
+                int vertsPerThread = (int)Math.Ceiling((float)len / (float)Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism);
+                if (origVerts is VertexPositionNormalTextureTangent[] ov)
+                {
+                    Xenko.Core.Threading.Dispatcher.For(0, Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism, (t) =>
+                    {
+                        int start = vPos + t * vertsPerThread;
+                        for (int j = start; j < start + vertsPerThread && j < vPos + len; j++)
+                        {
+                            ref VertexPositionNormalTextureTangent ovr = ref ov[j - vPos];
+                            ref VertexPositionNormalTextureTangent endvert = ref ((VertexPositionNormalTextureTangent[])smd.Verticies)[j];
+                            Vector3 origPos = ovr.Position;
+                            Vector3 origNom = ovr.Normal;
+                            endvert.Position.X = (origPos.X * tMatrix.M11) + (origPos.Y * tMatrix.M21) + (origPos.Z * tMatrix.M31) + tMatrix.M41;
+                            endvert.Position.Y = (origPos.X * tMatrix.M12) + (origPos.Y * tMatrix.M22) + (origPos.Z * tMatrix.M32) + tMatrix.M42;
+                            endvert.Position.Z = (origPos.X * tMatrix.M13) + (origPos.Y * tMatrix.M23) + (origPos.Z * tMatrix.M33) + tMatrix.M43;
+                            endvert.Normal.X = ((origNom.X * tMatrix.M11) + (origNom.Y * tMatrix.M21) + (origNom.Z * tMatrix.M31)) / tMatrixScale.X;
+                            endvert.Normal.Y = ((origNom.X * tMatrix.M12) + (origNom.Y * tMatrix.M22) + (origNom.Z * tMatrix.M32)) / tMatrixScale.Y;
+                            endvert.Normal.Z = ((origNom.X * tMatrix.M13) + (origNom.Y * tMatrix.M23) + (origNom.Z * tMatrix.M33)) / tMatrixScale.Z;
+                            endvert.Tangent = ovr.Tangent;
+                            endvert.TextureCoordinate.X = ovr.TextureCoordinate.X * uvScale.X + uvOffset.X;
+                            endvert.TextureCoordinate.Y = ovr.TextureCoordinate.Y * uvScale.Y + uvOffset.Y;
+                        }
+                    });
+                }
+                else
+                {
+                    var opnc = origVerts as VertexPositionNormalColor[];
+                    Xenko.Core.Threading.Dispatcher.For(0, Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism, (t) => {
+                        int start = vPos + t * vertsPerThread;
+                        for (int j = start; j < start + vertsPerThread && j < vPos + len; j++) {
+                            ref VertexPositionNormalColor ovr = ref opnc[j - vPos];
+                            ref VertexPositionNormalColor endvert = ref ((VertexPositionNormalColor[])smd.Verticies)[j];
+                            Vector3 origPos = ovr.Position;
+                            Vector3 origNom = ovr.Normal;
+                            endvert.Position.X = (origPos.X * tMatrix.M11) + (origPos.Y * tMatrix.M21) + (origPos.Z * tMatrix.M31) + tMatrix.M41;
+                            endvert.Position.Y = (origPos.X * tMatrix.M12) + (origPos.Y * tMatrix.M22) + (origPos.Z * tMatrix.M32) + tMatrix.M42;
+                            endvert.Position.Z = (origPos.X * tMatrix.M13) + (origPos.Y * tMatrix.M23) + (origPos.Z * tMatrix.M33) + tMatrix.M43;
+                            endvert.Normal.X = ((origNom.X * tMatrix.M11) + (origNom.Y * tMatrix.M21) + (origNom.Z * tMatrix.M31)) / tMatrixScale.X;
+                            endvert.Normal.Y = ((origNom.X * tMatrix.M12) + (origNom.Y * tMatrix.M22) + (origNom.Z * tMatrix.M32)) / tMatrixScale.Y;
+                            endvert.Normal.Z = ((origNom.X * tMatrix.M13) + (origNom.Y * tMatrix.M23) + (origNom.Z * tMatrix.M33)) / tMatrixScale.Z;
+                            endvert.Color = specialColor.HasValue ? (UseColorTintMode == COLOR_MODE.MULTIPLY ? ovr.Color * specialColor.Value : specialColor.Value) : ovr.Color;
+                        }
+                    });
+                }
+            });
+            auCount = auRunningcount;
+        }
+
+        public void Dispose()
+        {
+            if (smd != null)
+                smd.Dispose();
+
+            tempHiding = null;
+            internalTransforms = null;
+            indexUpdatesRequired = null;
+            proccessingUpdates = null;
+            avoidDuplicates = null;
+            uvOffsets = null;
+            colors = null;
+        }
+
+        ~BatchedMeshDraw()
+        {
+            Dispose();
+        }
+
+        private static Matrix dontdraw = Matrix.Transformation(Vector3.Zero, Quaternion.Identity, Vector3.Zero);
+        private static Matrix tempskipdraw = Matrix.Transformation(Vector3.Zero, Quaternion.Identity, Vector3.One);
+
+        public override PrimitiveType PrimitiveType => smd.PrimitiveType;
+        public override int DrawCount => smd.DrawCount;
+        public override int StartLocation => smd.StartLocation;
+        public override VertexBufferBinding[] VertexBuffers => smd.VertexBuffers;
+        public override IndexBufferBinding IndexBuffer => smd.IndexBuffer;
+        internal override Action<GraphicsDevice, StagedMeshDraw> performStage => smd.performStage;
+        internal override StagedMeshDraw getStagedMeshDraw => smd;
+        private BoundingBox originalBoundingBox;
+        private int PossibleFreeIndex;
+        private bool[] tempHiding;
+
+        private Matrix[] internalTransforms;
+        private StagedMeshDraw smd;
+        private int tCount, auCount;
+        private int[] indexUpdatesRequired, proccessingUpdates, actuallyUpdated;
+        private bool[] avoidDuplicates;
+        private Vector2[] uvOffsets, uvScales;
+        private Color4[] colors;
+
+        VertexPositionNormalTextureTangent[] origVerts0;
+        VertexPositionNormalColor[] origVerts1;
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Engine/Batching/ModelBatcher.cs b/sources/engine/Xenko.Engine/Engine/Batching/ModelBatcher.cs
new file mode 100644
index 0000000000..b5c7941184
--- /dev/null
+++ b/sources/engine/Xenko.Engine/Engine/Batching/ModelBatcher.cs
@@ -0,0 +1,852 @@
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Engine;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Core.Serialization;
+using Xenko.Graphics.Data;
+using System;
+using Xenko.Extensions;
+using Xenko.Core.Mathematics;
+using System.Linq;
+using System.Threading.Tasks;
+using Xenko.Rendering.Materials;
+using Xenko.Core;
+using System.Runtime.InteropServices;
+using Xenko.Rendering.Rendering;
+using Xenko.Core.Collections;
+
+namespace Xenko.Engine
+{
+    /// <summary>
+    /// System for batching entities and models together, to reduce draw calls and entity processing overhead. Works great with static geometry.
+    /// </summary>
+    public class ModelBatcher
+    {
+        private struct BatchingChunk
+        {
+            public Entity Entity;
+            public Model Model;
+            public Matrix? Transform;
+            public Vector2? uvScale, uvOffset;
+            public int MaterialIndex;
+        }
+
+        private struct CachedData
+        {
+            public Vector3[] positions;
+            public Vector3[] normals;
+            public Vector2[] uvs;
+            public Color4[] colors;
+            public Vector4[] tangents;
+            public uint[] indicies;
+        }
+
+        private static CacheConcurrentDictionary<Mesh, CachedData> CachedModelData = new Core.Collections.CacheConcurrentDictionary<Mesh, CachedData>(24);
+
+        /// <summary>
+        /// Unpacks a mesh into raw arrays of data. Data could be later used to manipulate the mesh and make another using StagedMeshDraw, for example.
+        /// </summary>
+        /// <param name="m">Mesh to unpack</param>
+        /// <param name="positions">Output vert positions</param>
+        /// <param name="normals">Output normals</param>
+        /// <param name="uvs">Output UVs</param>
+        /// <param name="colors">Output vert colors</param>
+        /// <param name="tangents">Output vert tangents</param>
+        /// <param name="indicies">Output mesh indicies</param>
+        /// <returns>true if successful, false if not (e.g. mesh didn't have buffer information)</returns>
+        public static unsafe bool UnpackRawVertData(Mesh m, out Vector3[] positions, out Vector3[] normals, out Vector2[] uvs, out Color4[] colors, out Vector4[] tangents, out uint[] indicies)
+        {
+            if (m.Draw is StagedMeshDraw)
+                throw new Exception("Mesh is a StagedMeshDraw. Get vert data straight from Mesh.Draw's Verticies and Indicies parameters.");
+
+            Xenko.Graphics.Buffer buf = m.Draw?.VertexBuffers[0].Buffer;
+            Xenko.Graphics.Buffer ibuf = m.Draw?.IndexBuffer.Buffer;
+            if (buf == null || buf.VertIndexData == null || ibuf == null || ibuf.VertIndexData == null)
+            {
+                positions = null;
+                normals = null;
+                uvs = null;
+                colors = null;
+                tangents = null;
+                indicies = null;
+                return false;
+            }
+
+            if (UnpackRawVertData(buf.VertIndexData, m.Draw.VertexBuffers[0].Declaration,
+                                  out positions, out normals, out uvs, out colors, out tangents, m.Draw.VertexBuffers[0].Offset) == false)
+            {
+                indicies = null;
+                return false;
+            }
+
+            // indicies
+            fixed (byte* pdst = ibuf.VertIndexData)
+            {
+                int numIndices = m.Draw.IndexBuffer.Count;
+                indicies = new uint[numIndices];
+
+                if (m.Draw.IndexBuffer.Is32Bit)
+                {
+                    var dst = (uint*)(pdst + m.Draw.IndexBuffer.Offset);
+                    for (var k = 0; k < numIndices; k++)
+                        indicies[k] = dst[k];
+                }
+                else
+                {
+                    var dst = (ushort*)(pdst + m.Draw.IndexBuffer.Offset);
+                    for (var k = 0; k < numIndices; k++)
+                        indicies[k] = dst[k];
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Unpacks a raw buffer of vertex data into proper arrays
+        /// </summary>
+        /// <returns>Returns true if some data was successful in extraction</returns>
+        public static unsafe bool UnpackRawVertData(byte[] data, VertexDeclaration declaration,
+                                                    out Vector3[] positions, out Vector3[] normals,
+                                                    out Vector2[] uvs, out Color4[] colors, out Vector4[] tangents, int data_offset = 0)
+        {
+            positions = null;
+            normals = null;
+            uvs = null;
+            colors = null;
+            tangents = null;
+            if (data == null || declaration == null || data.Length <= 0) return false;
+            VertexElement[] elements = declaration.VertexElements;
+            int datalen = data.Length - data_offset;
+            datalen -= datalen % declaration.VertexStride; // handle any offset that might not have been accounted for above
+            int totalEntries = datalen / declaration.VertexStride;
+            positions = new Vector3[totalEntries];
+            int[] eoffsets = new int[elements.Length];
+            for (int i = 1; i < elements.Length; i++) eoffsets[i] = eoffsets[i - 1] + elements[i - 1].Format.SizeInBytes();
+            fixed (byte* dp = &data[data_offset])
+            {
+                for (int offset = 0; offset < datalen; offset += declaration.VertexStride)
+                {
+                    int vertindex = offset / declaration.VertexStride;
+                    for (int i = 0; i < elements.Length; i++)
+                    {
+                        VertexElement e = elements[i];
+                        switch (e.SemanticName)
+                        {
+                            case "POSITION":
+                                positions[vertindex] = *(Vector3*)&dp[offset + eoffsets[i]];
+                                break;
+                            case "NORMAL":
+                                if (normals == null) normals = new Vector3[totalEntries];
+                                normals[vertindex] = *(Vector3*)&dp[offset + eoffsets[i]];
+                                break;
+                            case "COLOR":
+                                if (colors == null) colors = new Color4[totalEntries];
+                                colors[vertindex] = *(Color4*)&dp[offset + eoffsets[i]];
+                                break;
+                            case "TEXCOORD":
+                                if (uvs == null) uvs = new Vector2[totalEntries];
+                                uvs[vertindex] = *(Vector2*)&dp[offset + eoffsets[i]];
+                                break;
+                            case "TANGENT":
+                                if (tangents == null) tangents = new Vector4[totalEntries];
+                                tangents[vertindex] = *(Vector4*)&dp[offset + eoffsets[i]];
+                                break;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Tries to separate a model's meshes into separate Entities
+        /// </summary>
+        /// <param name="m">Model to separate</param>
+        /// <param name="prefix">What to prefix Entity names</param>
+        /// <returns>List of Entities from model</returns>
+        public static List<Entity> UnbatchModel(Model m, string prefix = "unbatched")
+        {
+            List<Entity> unbatched = new List<Entity>();
+            if (m == null) return unbatched;
+
+            for (int i=0; i<m.Meshes.Count; i++)
+            {
+                Model newm = new Model();
+                Entity e = new Entity(prefix + i);
+                newm.Add(m.Meshes[i]);
+                newm.Add(m.Materials[m.Meshes[i].MaterialIndex]);
+                e.GetOrCreate<ModelComponent>().Model = newm;
+                unbatched.Add(e);
+            }
+
+            return unbatched;
+        }
+
+        private static unsafe void ProcessMaterial(List<BatchingChunk> chunks, MaterialInstance material, Model prefabModel, HashSet<Entity> unbatched = null)
+        {
+            //actually create the mesh
+            List<VertexPositionNormalTextureTangent> vertsNT = null;
+            List<VertexPositionNormalColor> vertsNC = null;
+            List<uint> indiciesList = new List<uint>();
+            BoundingBox bb = new BoundingBox(new Vector3(float.PositiveInfinity, float.PositiveInfinity, float.PositiveInfinity),
+                                             new Vector3(float.NegativeInfinity, float.NegativeInfinity, float.NegativeInfinity));
+            uint indexOffset = 0;
+            for (int i = 0; i < chunks.Count; i++)
+            {
+                BatchingChunk chunk = chunks[i];
+                if (unbatched != null && unbatched.Contains(chunk.Entity)) continue; // don't try batching other things in this entity if some failed
+                if (chunk.Entity != null)
+                {
+                    chunk.Entity.Transform.UpdateLocalMatrix();
+                    chunk.Entity.Transform.UpdateWorldMatrixInternal(true, false);
+                }
+                Matrix worldMatrix = chunk.Entity == null ? (chunk.Transform ?? Matrix.Identity) : chunk.Entity.Transform.WorldMatrix;
+                Vector2 uvScale = chunk.uvScale ?? Vector2.One;
+                Vector2 uvOffset = chunk.uvOffset ?? Vector2.Zero;
+                Matrix rot;
+                if (worldMatrix != Matrix.Identity)
+                    worldMatrix.GetRotationMatrix(out rot);
+                else rot = Matrix.Identity;
+                for (int j = 0; j < chunk.Model.Meshes.Count; j++)
+                {
+                    Mesh modelMesh = chunk.Model.Meshes[j];
+                    //process only right material
+                    if (modelMesh.MaterialIndex == chunk.MaterialIndex)
+                    {
+                        Vector3[] positions = null, normals = null;
+                        Vector4[] tangents = null;
+                        Vector2[] uvs = null;
+                        Color4[] colors = null;
+
+                        //vertexes
+                        if (CachedModelData.TryGet(modelMesh, out var information))
+                        {
+                            positions = information.positions;
+                            normals = information.normals;
+                            tangents = information.tangents;
+                            uvs = information.uvs;
+                            colors = information.colors;
+                            for (int k = 0; k < information.indicies.Length; k++) indiciesList.Add(information.indicies[k] + indexOffset);
+                        }
+                        else if (modelMesh.Draw is StagedMeshDraw)
+                        {
+                            StagedMeshDraw smd = modelMesh.Draw as StagedMeshDraw;
+
+                            object verts = smd.Verticies;
+
+                            if (verts is VertexPositionNormalColor[])
+                            {
+                                VertexPositionNormalColor[] vpnc = verts as VertexPositionNormalColor[];
+                                positions = new Vector3[vpnc.Length];
+                                normals = new Vector3[vpnc.Length];
+                                colors = new Color4[vpnc.Length];
+                                for (int k = 0; k < vpnc.Length; k++)
+                                {
+                                    positions[k] = vpnc[k].Position;
+                                    normals[k] = vpnc[k].Normal;
+                                    colors[k] = vpnc[k].Color;
+                                }
+                            }
+                            else if (verts is VertexPositionNormalTexture[])
+                            {
+                                VertexPositionNormalTexture[] vpnc = verts as VertexPositionNormalTexture[];
+                                positions = new Vector3[vpnc.Length];
+                                normals = new Vector3[vpnc.Length];
+                                uvs = new Vector2[vpnc.Length];
+                                for (int k = 0; k < vpnc.Length; k++)
+                                {
+                                    positions[k] = vpnc[k].Position;
+                                    normals[k] = vpnc[k].Normal;
+                                    uvs[k] = vpnc[k].TextureCoordinate;
+                                }
+                            }
+                            else if (verts is VertexPositionNormalTextureTangent[])
+                            {
+                                VertexPositionNormalTextureTangent[] vpnc = verts as VertexPositionNormalTextureTangent[];
+                                positions = new Vector3[vpnc.Length];
+                                normals = new Vector3[vpnc.Length];
+                                uvs = new Vector2[vpnc.Length];
+                                tangents = new Vector4[vpnc.Length];
+                                for (int k = 0; k < vpnc.Length; k++)
+                                {
+                                    positions[k] = vpnc[k].Position;
+                                    normals[k] = vpnc[k].Normal;
+                                    uvs[k] = vpnc[k].TextureCoordinate;
+                                    tangents[k] = vpnc[k].Tangent;
+                                }
+                            }
+                            else
+                            {
+                                // unsupported StagedMeshDraw
+                                if (unbatched != null) unbatched.Add(chunk.Entity);
+                                continue;
+                            }
+
+                            // take care of indicies
+                            for (int k = 0; k < smd.Indicies.Length; k++) indiciesList.Add(smd.Indicies[k] + indexOffset);
+
+                            // cache this for later
+                            CachedModelData.Add(modelMesh,
+                                new CachedData()
+                                {
+                                    colors = colors,
+                                    indicies = smd.Indicies,
+                                    normals = normals,
+                                    positions = positions,
+                                    tangents = tangents,
+                                    uvs = uvs
+                                }
+                            );
+                        }
+                        else
+                        {
+                            Xenko.Graphics.Buffer buf = modelMesh.Draw?.VertexBuffers[0].Buffer;
+                            Xenko.Graphics.Buffer ibuf = modelMesh.Draw?.IndexBuffer.Buffer;
+                            if (buf == null || buf.VertIndexData == null ||
+                                ibuf == null || ibuf.VertIndexData == null)
+                            {
+                                if (unbatched != null) unbatched.Add(chunk.Entity);
+                                continue;
+                            }
+
+                            if (UnpackRawVertData(buf.VertIndexData, modelMesh.Draw.VertexBuffers[0].Declaration,
+                                                  out positions, out normals, out uvs, out colors, out tangents, modelMesh.Draw.VertexBuffers[0].Offset) == false)
+                            {
+                                if (unbatched != null) unbatched.Add(chunk.Entity);
+                                continue;
+                            }
+
+                            CachedData cmd = new CachedData()
+                            {
+                                colors = colors,
+                                positions = positions,
+                                normals = normals,
+                                uvs = uvs,
+                                tangents = tangents
+                            };
+
+                            // indicies
+                            fixed (byte* pdst = ibuf.VertIndexData)
+                            {
+                                int numIndices = modelMesh.Draw.IndexBuffer.Count;
+                                cmd.indicies = new uint[numIndices];
+
+                                if (modelMesh.Draw.IndexBuffer.Is32Bit)
+                                {
+                                    var dst = (uint*)(pdst + modelMesh.Draw.IndexBuffer.Offset);
+                                    for (var k = 0; k < numIndices; k++)
+                                    {
+                                        // Offset indices
+                                        cmd.indicies[k] = dst[k];
+                                        indiciesList.Add(dst[k] + indexOffset);
+                                    }
+                                }
+                                else
+                                {
+                                    var dst = (ushort*)(pdst + modelMesh.Draw.IndexBuffer.Offset);
+                                    for (var k = 0; k < numIndices; k++)
+                                    {
+                                        // Offset indices
+                                        cmd.indicies[k] = dst[k];
+                                        indiciesList.Add(dst[k] + indexOffset);
+                                    }
+                                }
+                            }
+
+                            CachedModelData.Add(modelMesh, cmd);
+                        }
+
+                        // what kind of structure will we be making, if we haven't picked one already?
+                        if (vertsNT == null && vertsNC == null)
+                        {
+                            if (uvs != null)
+                            {
+                                vertsNT = new List<VertexPositionNormalTextureTangent>(positions.Length);
+                            }
+                            else
+                            {
+                                vertsNC = new List<VertexPositionNormalColor>(positions.Length);
+                            }
+                        }
+
+                        // bounding box/finish list
+                        bool needmatrix = worldMatrix != Matrix.Identity;
+                        for (int k = 0; k < positions.Length; k++)
+                        {
+                            Vector3 finalPos = positions[k];
+                            Vector3 finalNorm = normals[k];
+
+                            if (needmatrix)
+                            {
+                                Vector3.Transform(ref positions[k], ref worldMatrix, out finalPos);
+
+                                if (normals != null)
+                                    Vector3.TransformNormal(ref normals[k], ref rot, out finalNorm);
+                            }
+
+                            // update bounding box?
+                            if (finalPos.X > bb.Maximum.X) bb.Maximum.X = finalPos.X;
+                            if (finalPos.Y > bb.Maximum.Y) bb.Maximum.Y = finalPos.Y;
+                            if (finalPos.Z > bb.Maximum.Z) bb.Maximum.Z = finalPos.Z;
+                            if (finalPos.X < bb.Minimum.X) bb.Minimum.X = finalPos.X;
+                            if (finalPos.Y < bb.Minimum.Y) bb.Minimum.Y = finalPos.Y;
+                            if (finalPos.Z < bb.Minimum.Z) bb.Minimum.Z = finalPos.Z;
+
+                            if (vertsNT != null)
+                            {
+                                vertsNT.Add(new VertexPositionNormalTextureTangent
+                                {
+                                    Position = finalPos,
+                                    Normal = normals != null ? finalNorm : Vector3.UnitY,
+                                    TextureCoordinate = uvs[k] * uvScale + uvOffset,
+                                    Tangent = tangents != null ? tangents[k] : Vector4.UnitW
+                                });
+                            }
+                            else
+                            {
+                                vertsNC.Add(new VertexPositionNormalColor
+                                {
+                                    Position = finalPos,
+                                    Normal = normals != null ? finalNorm : Vector3.UnitY,
+                                    Color = colors != null ? colors[k] : Color4.White
+                                });
+                            }
+                        }
+
+                        indexOffset += (uint)positions.Length;
+                    }
+                }
+            }
+
+            if (indiciesList.Count <= 0) return;
+
+            uint[] indicies = indiciesList.ToArray();
+
+            // make stagedmesh with verts
+            StagedMeshDraw md;
+            if (vertsNT != null)
+            {
+                var vertsNTa = vertsNT.ToArray();
+                md = StagedMeshDraw.MakeStagedMeshDraw<VertexPositionNormalTextureTangent>(ref indicies, ref vertsNTa, VertexPositionNormalTextureTangent.Layout);
+            }
+            else if (vertsNC != null)
+            {
+                var vertsNCa = vertsNC.ToArray();
+                md = StagedMeshDraw.MakeStagedMeshDraw<VertexPositionNormalColor>(ref indicies, ref vertsNCa, VertexPositionNormalColor.Layout);
+            }
+            else return;
+
+            Mesh m = new Mesh
+            {
+                Draw = md,
+                BoundingBox = bb,
+                MaterialIndex = prefabModel.Materials.Count
+            };
+
+            prefabModel.Add(m);
+            if (material != null) prefabModel.Add(material);
+        }
+
+        private static void Gather(Entity e, List<Entity> into, List<Entity> motion)
+        {
+            if (motion == null || e.Transform.Immobile != IMMOBILITY.FullMotion)
+            {
+                into.Add(e);
+                foreach (Entity ec in e.GetChildren()) Gather(ec, into, motion);
+            }
+            else
+            {
+                motion.Add(e);
+                foreach (Entity ec in e.GetChildren()) Gather(ec, into, motion);
+            }
+        }
+
+        /// <summary>
+        /// Takes an Entity tree and does its best to batch itself and children into one entity. Automatically removes batched entities. Can try and mix and match immobile and non-immobile, but it may not work perfectly.
+        /// </summary>
+        /// <param name="root">The root entity to batch from and merge into</param>
+        /// <param name="preserveAndTransferComponents">Try to move components from batched entities to the main consolidated entity</param>
+        /// <param name="onlyImmobile">Try to batch only things immobile and keep motion things</param>
+        /// <param name="AdditionalComponentTypesToPreserve">If we are preserveAndTransferComponents, are there any other types to maintain in a separate entity? Like lights?</param>
+        /// <returns>Returns the number of successfully batched and removed entities</returns>
+        public static int BatchChildren(Entity root, bool preserveAndTransferComponents = false, bool onlyImmobile = false, List<Type> AdditionalComponentTypesToPreserve = null)
+        {
+            // gather all of the children (and root)
+            List<Entity> allEs = new List<Entity>(), motion = onlyImmobile ? new List<Entity>() : null;
+            Gather(root, allEs, motion);
+            // capture the original transform of the root, then clear it
+            // so it isn't included in individual verticies
+            Vector3 originalPosition = root.Transform.Position;
+            Quaternion originalRotation = root.Transform.Rotation;
+            Vector3 originalScale = root.Transform.Scale;
+            root.Transform.Position = Vector3.Zero;
+            root.Transform.Scale = Vector3.One;
+            root.Transform.Rotation = Quaternion.Identity;
+            // batch them all together into one model
+            Model m = BatchEntities(allEs, out HashSet<Entity> unbatched);
+            // set the root to use the new batched model
+            root.GetOrCreate<ModelComponent>().Model = m;
+            // restore the root transform
+            root.Transform.Rotation = originalRotation;
+            root.Transform.Scale = originalScale;
+            root.Transform.Position = originalPosition;
+            // we will want to remove entities from the scene that were batched,
+            // so convert allEs into a list of things we want to remove
+            foreach (Entity skipped in unbatched) allEs.Remove(skipped);
+            // attach mobile entities to root, if any, with position offset
+            if (motion != null)
+            {
+                for (int i = 0; i < motion.Count; i++)
+                {
+                    Entity mt = motion[i];
+                    mt.Transform.Position = mt.Transform.WorldPosition(true) - root.Transform.Position;
+                    mt.Transform.Parent = root.Transform.Parent;
+                }
+            }
+            // remove now batched entities from the scene, skipping root
+            for (int i = 0; i < allEs.Count; i++)
+            {
+                Entity e = allEs[i];
+                bool keepE = false;
+                if (e != root)
+                {
+                    if (preserveAndTransferComponents)
+                    {
+                        // transfer all non-transform/non-modelcomponents over
+                        for (int j=0; j<e.Components.Count; j++)
+                        {
+                            EntityComponent ec = e.Components[j];
+                            if (ec is ModelComponent == false &&
+                                ec is TransformComponent == false)
+                            {
+                                Type t = ec.GetType();
+                                if ( EntityComponentAttributes.Get(t).AllowMultipleComponents &&
+                                    (AdditionalComponentTypesToPreserve == null || AdditionalComponentTypesToPreserve.Contains(t) == false))
+                                {
+                                    ec.PrepareForTransfer(root);
+                                    e.Remove(ec);
+                                    root.Add(ec);
+                                    j--;
+                                }
+                                else
+                                {
+                                    // wait, we have components that can't stack... keep this entity but without the modelcomponent
+                                    keepE = true;
+                                    e.RemoveAll<ModelComponent>();
+                                    e.Transform.Position = e.Transform.WorldPosition(true) - root.Transform.WorldPosition(true);
+                                    e.Transform.Parent = root.Transform;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if (keepE == false) e.Scene = null;
+                }
+            }
+            // return how many things we were able to batch
+            return allEs.Count;
+        }
+        
+        private static bool ModelOKForBatching(Model model)
+        {
+            if (model == null) return false;
+            for (int i = 0; i < model.Meshes.Count; i++)
+            {
+                Mesh m = model.Meshes[i];
+                if (m.Draw.PrimitiveType != PrimitiveType.TriangleList ||
+                    m.Draw.VertexBuffers == null && m.Draw is StagedMeshDraw == false ||
+                    m.Draw.VertexBuffers != null && m.Draw.VertexBuffers.Length != 1) return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Puts each model at the cooresponding transform into one model
+        /// </summary>
+        /// <param name="models">List of models to batch</param>
+        /// <param name="listOfTransforms">Matrix position for each model listed</param>
+        /// <param name="uvScales">If provided, will scale each model's UV map at that index</param>
+        /// <param name="uvOffsets">If provided, will offset each model's UV map at that index</param>
+        /// <returns>batched model</returns>
+        public static Model GenerateBatch(List<Model> models, List<Matrix> listOfTransforms, List<Vector2> uvScales = null, List<Vector2> uvOffsets = null)
+        {
+            if (models == null || listOfTransforms == null || models.Count != listOfTransforms.Count || uvScales != null && uvScales.Count != models.Count || uvOffsets != null && uvOffsets.Count != models.Count)
+                throw new ArgumentException("Null arguments or counts do not match when generating batched model!");
+
+            var materials = new Dictionary<MaterialInstance, List<BatchingChunk>>();
+
+            for (int m = 0; m < models.Count; m++)
+            {
+                Model model = models[m];
+
+                if (ModelOKForBatching(model) == false) continue;
+
+                for (var index = 0; index < model.Materials.Count; index++)
+                {
+                    var material = model.Materials[index];
+
+                    var chunk = new BatchingChunk { Entity = null, Model = model, MaterialIndex = index, Transform = listOfTransforms[m],
+                                                    uvOffset = uvOffsets != null ? uvOffsets[m] : null, uvScale = uvScales != null ? uvScales[m] : null };
+
+                    if (materials.TryGetValue(material, out var entities))
+                    {
+                        entities.Add(chunk);
+                    }
+                    else
+                    {
+                        materials[material] = new List<BatchingChunk> { chunk };
+                    }
+                }
+            }
+
+            Model prefabModel = new Model();
+
+            foreach (var material in materials)
+            {
+                ProcessMaterial(material.Value, material.Key, prefabModel);
+            }
+
+            prefabModel.UpdateBoundingBox();
+
+            return prefabModel;
+        }
+
+        /// <summary>
+        /// Generate a batched model. Copies each model to all positions in its respective listOfTransforms into one batched model.
+        /// </summary>
+        /// <param name="model">Model to copy around</param>
+        /// <param name="listOfTransforms">2D List of transforms to place each model</param>
+        /// <param name="uvOffsets">Offsets for each model</param>
+        /// <param name="uvScales">UV scales for each model</param>
+        /// <returns>Returns batched model. Null if model coouldn't be made, like if buffers for meshes couldn't be found</returns>
+        public static Model GenerateBatch(List<Model> models, List<List<Matrix>> listOfTransforms, List<List<Vector2>> uvScales = null, List<List<Vector2>> uvOffsets = null)
+        {
+            var materials = new Dictionary<MaterialInstance, List<BatchingChunk>>();
+
+            for (int m = 0; m < models.Count; m++)
+            {
+                Model model = models[m];
+
+                if (ModelOKForBatching(model) == false) continue;
+                for (var index = 0; index < model.Materials.Count; index++)
+                {
+                    var material = model.Materials[index];
+
+                    for (int i = 0; i < listOfTransforms[m].Count; i++)
+                    {
+                        var chunk = new BatchingChunk { Entity = null, Model = model, MaterialIndex = index, Transform = listOfTransforms[m][i],
+                                                        uvOffset = (uvOffsets?[m].Count ?? 0) > 0 ? uvOffsets[m][i] : null,
+                                                        uvScale = (uvScales?[m].Count ?? 0) > 0 ? uvScales[m][i] : null };
+
+                        if (materials.TryGetValue(material, out var entities))
+                        {
+                            entities.Add(chunk);
+                        }
+                        else
+                        {
+                            materials[material] = new List<BatchingChunk> { chunk };
+                        }
+                    }
+                }
+            }
+
+            Model prefabModel = new Model();
+
+            foreach (var material in materials)
+            {
+                ProcessMaterial(material.Value, material.Key, prefabModel);
+            }
+
+            prefabModel.UpdateBoundingBox();
+
+            return prefabModel;
+        }
+
+        /// <summary>
+        /// Generate a batched model. Copies the model to all positions in listOfTransforms into one batched model.
+        /// </summary>
+        /// <param name="model">Model to copy around</param>
+        /// <param name="listOfTransforms">List of transforms to place the model</param>
+        /// <returns>Returns batched model. Null if model coouldn't be made, like if buffers for meshes couldn't be found</returns>
+        public static Model GenerateBatch(Model model, List<Matrix> listOfTransforms)
+        {
+            if (ModelOKForBatching(model) == false) return null;
+
+            Model prefabModel = new Model();
+
+            int cnt = model.Materials.Count;
+            if (cnt <= 1)
+            {
+                List<BatchingChunk> chunks = new List<BatchingChunk>();
+
+                for (int i = 0; i < listOfTransforms.Count; i++)
+                    chunks.Add(new BatchingChunk { Entity = null, Model = model, MaterialIndex = 0, Transform = listOfTransforms[i] });
+
+                ProcessMaterial(chunks, cnt == 0 ? null : model.Materials[0], prefabModel);
+            }
+            else
+            {
+                var materials = new Dictionary<MaterialInstance, List<BatchingChunk>>();
+
+                for (var index = 0; index < model.Materials.Count; index++)
+                {
+                    var material = model.Materials[index];
+
+                    for (int i = 0; i < listOfTransforms.Count; i++)
+                    {
+                        var chunk = new BatchingChunk { Entity = null, Model = model, MaterialIndex = index, Transform = listOfTransforms[i] };
+
+                        if (materials.TryGetValue(material, out var entities))
+                        {
+                            entities.Add(chunk);
+                        }
+                        else
+                        {
+                            materials[material] = new List<BatchingChunk> { chunk };
+                        }
+                    }
+                }
+
+                foreach (var material in materials)
+                {
+                    ProcessMaterial(material.Value, material.Key, prefabModel);
+                }
+            }
+
+            prefabModel.UpdateBoundingBox();
+
+            return prefabModel;
+        }
+
+        /// <summary>
+        /// Batches a model by trying to combine meshes and materials in the model
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public static Model BatchModel(Model model)
+        {
+            if (ModelOKForBatching(model) == false) return model;
+
+            Model prefabModel = new Model();
+
+            int cnt = model.Materials.Count;
+            if (cnt <= 1)
+            {
+                List<BatchingChunk> chunks = new List<BatchingChunk>();
+
+                chunks.Add(new BatchingChunk { Entity = null, Model = model, MaterialIndex = 0, Transform = null });
+
+                ProcessMaterial(chunks, cnt == 0 ? null : model.Materials[0], prefabModel);
+            }
+            else
+            {
+                var materials = new Dictionary<MaterialInstance, List<BatchingChunk>>();
+
+                for (var index = 0; index < model.Materials.Count; index++)
+                {
+                    var material = model.Materials[index];
+
+                    var chunk = new BatchingChunk { Entity = null, Model = model, MaterialIndex = index, Transform = null };
+
+                    if (materials.TryGetValue(material, out var entities))
+                    {
+                        entities.Add(chunk);
+                    }
+                    else
+                    {
+                        materials[material] = new List<BatchingChunk> { chunk };
+                    }
+                }
+
+                foreach (var material in materials)
+                {
+                    ProcessMaterial(material.Value, material.Key, prefabModel);
+                }
+            }
+
+            prefabModel.UpdateBoundingBox();
+
+            return prefabModel;
+        }
+
+        private static MaterialInstance ExtractMaterialInstance(ModelComponent mc, int index)
+        {
+            if (mc.Materials.TryGetValue(index, out var material))
+                return new MaterialInstance(material);
+
+            if (mc.Model != null && index < mc.Model.Materials.Count) {
+                return mc.Model.Materials[index];
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a model that batches as much as possible from all of the entities in the list. Any entities that couldn't be batched into
+        /// the model will be added to unbatched. Entities may not get batched if underlying buffer data couldn't be found to batch with
+        /// </summary>
+        /// <param name="entityList">List of entities to be batched</param>
+        /// <param name="unbatched">List of entities that failed to batch</param>
+        /// <returns>Model with meshes merged as much as possible</returns>
+        public static Model BatchEntities(List<Entity> entityList, out HashSet<Entity> unbatched)
+        {
+            var prefabModel = new Model();
+
+            //The objective is to create 1 mesh per material/shadow params
+            //1. We group by materials
+            //2. Create a mesh per material (might need still more meshes if 16bit indexes or more then 32bit)
+
+            var materials = new Dictionary<MaterialInstance, List<BatchingChunk>>();
+
+            // keep track of any entities that couldn't be batched
+            unbatched = new HashSet<Entity>();
+
+            foreach (var subEntity in entityList)
+            {
+                var modelComponent = subEntity.Get<ModelComponent>();
+
+                if (modelComponent?.Model == null || (modelComponent.Skeleton != null && modelComponent.Skeleton.Nodes.Length != 1) || !modelComponent.Enabled)
+                    continue;
+
+                var model = modelComponent.Model;
+
+                if (ModelOKForBatching(model) == false)
+                {
+                    unbatched.Add(subEntity);
+                    continue;
+                }
+
+                int materialCount = Math.Max(model.Materials.Count, modelComponent.Materials.Count);
+                for (var index = 0; index < materialCount; index++)
+                {
+                    var material = ExtractMaterialInstance(modelComponent, index);
+
+                    if (material == null) continue;
+
+                    var chunk = new BatchingChunk { Entity = subEntity, Model = model, MaterialIndex = index };
+
+                    if (materials.TryGetValue(material, out var entities))
+                    {
+                        entities.Add(chunk);
+                    }
+                    else
+                    {
+                        materials[material] = new List<BatchingChunk> { chunk };
+                    }
+                }
+            }
+
+            foreach (var material in materials)
+            {
+                ProcessMaterial(material.Value, material.Key, prefabModel, unbatched);
+            }
+
+            prefabModel.UpdateBoundingBox();
+
+            return prefabModel;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Engine/CameraComponent.cs b/sources/engine/Xenko.Engine/Engine/CameraComponent.cs
index 24ac2b240b..72c9463257 100644
--- a/sources/engine/Xenko.Engine/Engine/CameraComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/CameraComponent.cs
@@ -11,6 +11,7 @@
 using Xenko.Engine.Processors;
 using Xenko.Rendering;
 using Xenko.Rendering.Compositing;
+using Xenko.VirtualReality;
 
 namespace Xenko.Engine
 {
@@ -35,6 +36,9 @@ public sealed class CameraComponent : ActivableEntityComponent
 
         public const float DefaultFarClipPlane = 1000.0f;
 
+        internal ulong VRProjectionPose;
+        internal Matrix[] cachedVRProjections;
+
         /// <summary>
         /// Create a new <see cref="CameraComponent"/> instance.
         /// </summary>
@@ -71,6 +75,10 @@ public CameraComponent(float nearClipPlane, float farClipPlane)
         [NotNull]
         public CameraProjectionMode Projection { get; set; }
 
+        [DataMember]
+        [DefaultValue(false)]
+        public bool AllowFOVOverride { get; set; } = false;
+
         /// <summary>
         /// Gets or sets the vertical field of view in degrees.
         /// </summary>
@@ -82,7 +90,21 @@ public CameraComponent(float nearClipPlane, float farClipPlane)
         [DefaultValue(DefaultVerticalFieldOfView)]
         [Display("Field of view")]
         [DataMemberRange(1.0, 179.0, 1.0, 10.0, 0)]
-        public float VerticalFieldOfView { get; set; }
+        public float VerticalFieldOfView {
+            get
+            {
+                if (AllowFOVOverride && SceneSystem.OverrideFOV > 0)
+                    return SceneSystem.OverrideFOV;
+
+                return internalFOV;
+            }
+            set
+            {
+                internalFOV = value;
+            }
+        }
+
+        private float internalFOV;
 
         /// <summary>
         /// Gets or sets the height of the orthographic projection.
@@ -143,6 +165,12 @@ public CameraComponent(float nearClipPlane, float farClipPlane)
         [DataMember(50)]
         public SceneCameraSlotId Slot;
 
+        /// <summary>
+        /// If this is a VR camera, have the local transform follow the head?
+        /// </summary>
+        [DataMember]
+        public bool VRHeadSetsTransform = false;
+
         /// <summary>
         /// Gets or sets a value indicating whether to use custom <see cref="ViewMatrix"/>. Default is <c>false</c>
         /// </summary>
@@ -197,6 +225,9 @@ public void Update()
             Update(null);
         }
 
+        [DataMemberIgnore]
+        public OpenXRHmd VRDeviceManaging;
+
         /// <summary>
         /// Calculates the projection matrix and view matrix.
         /// </summary>
diff --git a/sources/engine/Xenko.Engine/Engine/Design/EffectCompilationMode.cs b/sources/engine/Xenko.Engine/Engine/Design/EffectCompilationMode.cs
index 5113b0bda5..bc0fa09d9e 100644
--- a/sources/engine/Xenko.Engine/Engine/Design/EffectCompilationMode.cs
+++ b/sources/engine/Xenko.Engine/Engine/Design/EffectCompilationMode.cs
@@ -21,15 +21,5 @@ public enum EffectCompilationMode
         /// Effects can only be compiled in process (if possible). <see cref="Shaders.Compiler.EffectCompiler"/> will be used.
         /// </summary>
         Local = 1,
-
-        /// <summary>
-        /// Effects can only be compiled over network. <see cref="Shaders.Compiler.RemoteEffectCompiler"/> will be used.
-        /// </summary>
-        Remote = 2,
-
-        /// <summary>
-        /// Effects can be compiled either in process (if possible) or over network otherwise.
-        /// </summary>
-        LocalOrRemote = Local | Remote,
     }
 }
diff --git a/sources/engine/Xenko.Engine/Engine/Design/GameSettings.cs b/sources/engine/Xenko.Engine/Engine/Design/GameSettings.cs
index d92d7799f9..9e3ae4308d 100644
--- a/sources/engine/Xenko.Engine/Engine/Design/GameSettings.cs
+++ b/sources/engine/Xenko.Engine/Engine/Design/GameSettings.cs
@@ -46,11 +46,6 @@ public GameSettings()
         /// </summary>
         public EffectCompilationMode EffectCompilation { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether effect compile (local or remote) should be recorded and sent to effect compile server for GameStudio notification.
-        /// </summary>
-        public bool RecordUsedEffects { get; set; }
-
         /// <summary>
         /// Gets or sets configuration for the actual running platform as compiled during build
         /// </summary>
diff --git a/sources/engine/Xenko.Graphics/OpenGL/MappedResource.OpenGL.cs b/sources/engine/Xenko.Engine/Engine/Design/IGameSettingsService.cs
similarity index 55%
rename from sources/engine/Xenko.Graphics/OpenGL/MappedResource.OpenGL.cs
rename to sources/engine/Xenko.Engine/Engine/Design/IGameSettingsService.cs
index c0c94e4c5f..8583366ca7 100644
--- a/sources/engine/Xenko.Graphics/OpenGL/MappedResource.OpenGL.cs
+++ b/sources/engine/Xenko.Engine/Engine/Design/IGameSettingsService.cs
@@ -1,12 +1,13 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
-#if XENKO_GRAPHICS_API_OPENGL
-namespace Xenko.Graphics
+namespace Xenko.Engine.Design
 {
-    public partial struct MappedResource
+    public interface IGameSettingsService
     {
-        internal int PixelBufferObjectId;
+        /// <summary>
+        /// Gets the GameSettings
+        /// </summary>
+        GameSettings Settings { get; }
     }
 }
-#endif
diff --git a/sources/engine/Xenko.Engine/Engine/Entity.cs b/sources/engine/Xenko.Engine/Engine/Entity.cs
index ae0ccadc40..2fe312db7b 100644
--- a/sources/engine/Xenko.Engine/Engine/Entity.cs
+++ b/sources/engine/Xenko.Engine/Engine/Entity.cs
@@ -13,6 +13,7 @@
 using Xenko.Core.Mathematics;
 using Xenko.Core.Serialization;
 using Xenko.Core.Serialization.Contents;
+using static EntityPool;
 
 namespace Xenko.Engine
 {
@@ -101,8 +102,13 @@ public Scene Scene
 
             set
             {
-                if (this.GetParent() != null)
-                    throw new InvalidOperationException("This entity is another entity's child. Detach it before changing its scene.");
+                TransformComponent parent = Transform.Parent;
+                if (parent != null) {
+                    if (value == null) {
+                        // if we are detaching, take care of removing the parent if we had one
+                        parent.Children.Remove(Transform);
+                    } else throw new InvalidOperationException("This entity is another entity's child. Detach it before changing its scene.");
+                }
 
                 var oldScene = SceneValue;
                 if (oldScene == value)
@@ -113,6 +119,46 @@ public Scene Scene
             }
         }
 
+        /// <summary>
+        /// Shortcut to adding this entity to PersistentEntities
+        /// </summary>
+        [DataMemberIgnore]
+        public bool PersistThroughSceneChanges
+        {
+            get => SceneInstance.PersistentEntities.Contains(this);
+            set
+            {
+                if (value)
+                    SceneInstance.PersistentEntities.Add(this);
+                else
+                    SceneInstance.PersistentEntities.Remove(this);
+            }
+        }
+
+        /// <summary>
+        /// Manually puts this entity back into a pool. This should happen automatically when something
+        /// gets removed from a scene.
+        /// </summary>
+        /// <returns>returns false if wasn't an active pool member</returns>
+        public bool ManualReturnToPool() {
+            if (UsingPool == null) return false;
+            if (UsingPool.active == false) return false;
+            UsingPool.myPool.ReturnToPool(this, ref UsingPool.active);
+            return true;
+        }
+
+        /// <summary>
+        /// Are we part of a EntityPool?
+        /// </summary>
+        [DataMemberIgnore]
+        public PoolMember UsingPool;
+
+        /// <summary>
+        /// Prevent this entity from being returned to the entity pool automatically. Useful if you are detaching something, but want to 'keep' it for readding.
+        /// </summary>
+        [DataMemberIgnore]
+        public bool PreventReturnToPoolOnDetach;
+
         /// <summary>
         /// The entity manager which processes this entity.
         /// </summary>
diff --git a/sources/engine/Xenko.Engine/Engine/EntityComponent.cs b/sources/engine/Xenko.Engine/Engine/EntityComponent.cs
index 603f7dfdb5..1cb5b63f3b 100644
--- a/sources/engine/Xenko.Engine/Engine/EntityComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/EntityComponent.cs
@@ -49,6 +49,11 @@ protected Entity EnsureEntity
             }
         }
 
+        /// <summary>
+        /// for ModelBatcher, transferring component to a batched entity
+        /// </summary>
+        internal virtual void PrepareForTransfer(Entity toEntity) { }
+
         internal class Serializer : DataSerializer<EntityComponent>
         {
             private DataSerializer<Guid> guidSerializer;
diff --git a/sources/engine/Xenko.Engine/Engine/EntityManager.cs b/sources/engine/Xenko.Engine/Engine/EntityManager.cs
index f5623958a8..8bbf627c00 100644
--- a/sources/engine/Xenko.Engine/Engine/EntityManager.cs
+++ b/sources/engine/Xenko.Engine/Engine/EntityManager.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using Xenko.Core;
 using Xenko.Core.Collections;
 using Xenko.Core.Diagnostics;
@@ -24,6 +25,7 @@ namespace Xenko.Engine
     public abstract class EntityManager : ComponentBase, IReadOnlySet<Entity>
     {
         // TODO: Make this class threadsafe (current locks aren't sufficients)
+        static internal bool preventPhysicsProcessor;
 
         public ExecutionMode ExecutionMode { get; protected set; } = ExecutionMode.Runtime;
 
@@ -43,6 +45,9 @@ public abstract class EntityManager : ComponentBase, IReadOnlySet<Entity>
         private readonly HashSet<TypeInfo> componentTypes;
         private int addEntityLevel = 0;
 
+        // enforce add/removals based on rendering thread
+        public static bool EnforceThreads = true;
+
         /// <summary>
         /// Occurs when an entity is added.
         /// </summary>
@@ -204,7 +209,7 @@ internal void Add(Entity entity)
         {
             // Entity can't be a root because it already has a parent?
             if (entity.Transform != null && entity.Transform.Parent != null)
-                throw new ArgumentException("Entity shouldn't have a parent.", nameof(entity));
+                return;
 
             InternalAddEntity(entity);
         }
@@ -219,10 +224,8 @@ internal void InternalAddEntity(Entity entity)
             if (entities.Contains(entity))
                 return;
 
-            if (entity.EntityManager != null)
-            {
-                throw new InvalidOperationException("Cannot add an entity to this entity manager when it is already used by another entity manager");
-            }
+            if (EnforceThreads && Thread.CurrentThread != GameBase.RenderingThread)
+                throw new InvalidOperationException("Trying to add '" + entity.Name + "' to the scene in a non-rendering thread. Set EntityManager.EnforceThreads to disable this check.");
 
             // Add this entity to our internal hashset
             entity.EntityManager = this;
@@ -241,6 +244,9 @@ internal void InternalAddEntity(Entity entity)
                 addEntityLevel--;
             }
 
+            // if we were immmobile, update its position
+            entity.Transform.UpdateImmobilePosition = true;
+
             // Register all new processors
             RegisterPendingProcessors();
 
@@ -272,6 +278,9 @@ internal void InternalRemoveEntity(Entity entity, bool removeParent)
             if (!entities.Contains(entity))
                 return;
 
+            if (EnforceThreads && Thread.CurrentThread != GameBase.RenderingThread)
+                throw new InvalidOperationException("Trying to remove '" + entity.Name + "' from the scene in a non-rendering thread. Set EntityManager.EnforceThreads to disable this check.");
+
             entities.Remove(entity);
 
             if (removeParent && entity.Transform != null)
@@ -288,6 +297,14 @@ internal void InternalRemoveEntity(Entity entity, bool removeParent)
             entity.EntityManager = null;
 
             OnEntityRemoved(entity);
+
+            // if this was batched, hide it
+            if (entity.Transform.AutoUpdateBatchedMesh != null)
+                entity.Transform.AutoUpdateBatchedMesh.Hide();
+
+            // last thing is check is returning to pool
+            if (entity.UsingPool != null && entity.PreventReturnToPoolOnDetach == false)
+                entity.UsingPool.myPool.ReturnToPool(entity, ref entity.UsingPool.active);
         }
 
         private void CollectNewProcessorsByComponentType(TypeInfo componentType)
@@ -478,13 +495,32 @@ private void UpdateDependentProcessors(Entity entity, EntityComponent skipCompon
         private void CheckEntityWithProcessors(Entity entity, bool forceRemove, bool collecComponentTypesAndProcessors)
         {
             var components = entity.Components;
+            EntityComponent tc = null;
             for (int i = 0; i < components.Count; i++)
             {
                 var component = components[i];
-                CheckEntityComponentWithProcessors(entity, component, forceRemove, null);
+
+                if (component is TransformComponent)
+                {
+                    // process the transform last, so parent stuff gets done first
+                    tc = component;
+                }
+                else
+                {
+                    CheckEntityComponentWithProcessors(entity, component, forceRemove, null);
+                    if (collecComponentTypesAndProcessors)
+                    {
+                        CollectNewProcessorsByComponentType(component.GetType().GetTypeInfo());
+                    }
+                }
+            }
+
+            if (tc != null)
+            {
+                CheckEntityComponentWithProcessors(entity, tc, forceRemove, null);
                 if (collecComponentTypesAndProcessors)
                 {
-                    CollectNewProcessorsByComponentType(component.GetType().GetTypeInfo());
+                    CollectNewProcessorsByComponentType(tc.GetType().GetTypeInfo());
                 }
             }
         }
@@ -624,6 +660,9 @@ protected override void AddItem(EntityProcessor processor)
                 if (processor == null) throw new ArgumentNullException(nameof(processor));
                 if (!Contains(processor))
                 {
+                    if (preventPhysicsProcessor && processor.MainTypeName == "PhysicsComponent")
+                        return; // don't use Bullet physics, bepu only!
+
                     base.AddItem(processor);
                     manager.OnProcessorAdded(processor);
                 }
diff --git a/sources/engine/Xenko.Engine/Engine/EntityPool.cs b/sources/engine/Xenko.Engine/Engine/EntityPool.cs
new file mode 100644
index 0000000000..706ce25873
--- /dev/null
+++ b/sources/engine/Xenko.Engine/Engine/EntityPool.cs
@@ -0,0 +1,179 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+
+/// <summary>
+/// Pool for recycling entities
+/// </summary>
+public static class EntityPool {
+
+    // You can avoid resizing of the Stack's internal array by
+    // setting this to a number equal to or greater to what you
+    // expect most of your pool sizes to be.
+    // Note, you can also use Preload() to set the initial size
+    // of a pool -- this can be handy if only some of your pools
+    // are going to be exceptionally large (for example, your bullets.)
+    const int DEFAULT_POOL_SIZE = 3;
+
+    /// <summary>
+    /// The Pool class represents the pool for a particular prefab.
+    /// </summary>
+    public class Pool {
+        // We append an id to the name of anything we instantiate.
+        // This is purely cosmetic.
+        int nextId = 1;
+
+        // The structure containing our inactive objects.
+        // Why a Stack and not a List? Because we'll never need to
+        // pluck an object from the start or middle of the array.
+        // We'll always just grab the last one, which eliminates
+        // any need to shuffle the objects around in memory.
+        Stack<Entity> inactive;
+
+        // The prefab that we are pooling
+        Entity prefab;
+
+        /// <summary>
+        /// prepare a pool for Entity recycling
+        /// </summary>
+        public Pool(Entity prefab, int initialQty) {
+            this.prefab = prefab;
+            // If Stack uses a linked list internally, then this
+            // whole initialQty thing is a placebo that we could
+            // strip out for more minimal code.
+            inactive = new Stack<Entity>(initialQty);
+        }
+
+        /// <summary>
+        /// Spawn an object from our pool
+        /// </summary>
+        public Entity Spawn(Vector3? pos = null, Quaternion? rot = null) {
+            Entity obj = null;
+
+            lock (inactive)
+            {
+                if (inactive.Count > 0)
+                    obj = inactive.Pop();
+            }
+
+            if (obj == null) {
+                // We don't have an object in our pool, so we
+                // instantiate a whole new object.
+                obj = prefab.Clone();
+                obj.Name = prefab.Name + " (" + (nextId++) + ")";
+                // Add a PoolMember component so we know what pool
+                // we belong to.
+                obj.UsingPool = new PoolMember();
+                obj.UsingPool.myPool = this;
+            } else if (obj.UsingPool == null || obj.UsingPool.active || obj.Scene != null) {
+                // something weird happened...
+                // it isn't really inactive...
+                // Just get another one, then...
+                return Spawn(pos, rot);
+            }
+
+            obj.UsingPool.active = true;
+            obj.Transform.Position = pos ?? Vector3.Zero;
+            obj.Transform.Rotation = rot ?? Quaternion.Identity;
+
+            return obj;
+        }
+
+        // Return an object to the inactive pool.
+        public void ReturnToPool(Entity obj, ref bool active) {
+            if (Xenko.Engine.SceneSystem.DoNotDisposeOnNextRemoval) return;
+            if (active)
+            {
+                lock (inactive)
+                {
+                    inactive.Push(obj);
+                }
+            }
+            obj.Scene = null;
+            active = false;
+        }
+    }
+
+    /// <summary>
+    /// Added to freshly instantiated objects, so we can link back
+    /// to the correct pool on despawn.
+    /// </summary>
+    public class PoolMember {
+        public Pool myPool;
+        public bool active;
+    }
+
+    // All of our pools
+    static ConcurrentDictionary<Entity, Pool> pools = new ConcurrentDictionary<Entity, Pool>();
+
+    /// <summary>
+    /// Init our dictionary.
+    /// </summary>
+    static void Init(Entity prefab = null, int qty = DEFAULT_POOL_SIZE) {
+        if (prefab != null && pools.ContainsKey(prefab) == false) {
+            pools[prefab] = new Pool(prefab, qty);
+        }
+    }
+
+    /// <summary>
+    /// If you want to preload a few copies of an object at the start
+    /// of a scene, you can use this. Really not needed unless you're
+    /// going to go from zero instances to 10+ very quickly.
+    /// Could technically be optimized more, but in practice the
+    /// Spawn/Despawn sequence is going to be pretty darn quick and
+    /// this avoids code duplication.
+    /// </summary>
+    static public void Preload(Entity prefab, int qty = DEFAULT_POOL_SIZE) {
+        if (qty <= 0) return;
+
+        Init(prefab, qty);
+        
+        // Make an array to grab the objects we're about to pre-spawn.
+        Entity[] obs = new Entity[qty];
+        for (int i = 0; i < qty; i++) {
+            obs[i] = Spawn(prefab);
+        }
+
+        // Now despawn them all.
+        for (int i = 0; i < qty; i++) {
+            PoolMember pm = obs[i].UsingPool;
+            pm.myPool.ReturnToPool(obs[i], ref pm.active);
+        }
+    }
+
+    private static Entity blankPrefab;
+
+    /// <summary>
+    /// Attempts to return an entity to a pool, which includes removing it from any scene
+    /// </summary>
+    /// <param name="e">Entity to try and return to a pool it came from</param>
+    /// <returns>True if entity was in a pool to return to</returns>
+    static public bool ReturnToPool(Entity e)
+    {
+        if (e == null || e.UsingPool == null ||
+            e.UsingPool.myPool == null || e.UsingPool.active == false)
+            return false;
+
+        e.UsingPool.myPool.ReturnToPool(e, ref e.UsingPool.active);
+
+        return true;
+    }
+
+    /// <summary>
+    /// spawn an empty Entity from a pool
+    /// </summary>
+    static public Entity SpawnEmpty(Vector3? pos = null, Quaternion? rot = null) {
+        if (blankPrefab == null) blankPrefab = new Entity("OriginalEmpty");
+        Init(blankPrefab, DEFAULT_POOL_SIZE);
+        return pools[blankPrefab].Spawn(pos, rot);
+    }
+
+    /// <summary>
+    /// Spawns a copy of the specified prefab (instantiating one if required).
+    /// </summary>
+    static public Entity Spawn(Entity prefab, Vector3? pos = null, Quaternion? rot = null) {
+        Init(prefab, DEFAULT_POOL_SIZE);
+        return pools[prefab].Spawn(pos, rot);
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Engine/EntityProcessor.cs b/sources/engine/Xenko.Engine/Engine/EntityProcessor.cs
index 55d39c4320..35eff8f6a9 100644
--- a/sources/engine/Xenko.Engine/Engine/EntityProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/EntityProcessor.cs
@@ -41,6 +41,8 @@ public abstract class EntityProcessor
         /// </summary>
         public ProfilingState DrawProfilingState;
 
+        public string MainTypeName => mainTypeInfo.Name;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="EntityProcessor"/> class.
         /// </summary>
@@ -218,9 +220,10 @@ internal bool IsDependentOnComponentType(TypeInfo type)
     /// </remarks>
     public abstract class EntityProcessor<TComponent, TData> : EntityProcessor where TData : class where TComponent : EntityComponent
     {
-        protected readonly Dictionary<TComponent, TData> ComponentDatas = new Dictionary<TComponent, TData>();
+        protected readonly List<TComponent> ComponentDataKeys = new List<TComponent>();
+        protected readonly List<TData> ComponentDataValues = new List<TData>();
+        protected readonly Dictionary<TComponent, int> KeyIndex = new System.Collections.Generic.Dictionary<TComponent, int>();
         private readonly HashSet<Entity> reentrancyCheck = new HashSet<Entity>();
-        private readonly FastList<TypeInfo> checkRequiredTypes = new FastList<TypeInfo>();
 
         protected EntityProcessor([NotNull] params Type[] requiredAdditionalTypes)
             : base(typeof(TComponent), requiredAdditionalTypes)
@@ -241,13 +244,9 @@ protected internal override void OnSystemRemove()
         protected internal override void RemoveAllEntities()
         {
             // Keep removing until empty
-            while (ComponentDatas.Count > 0)
+            while(ComponentDataKeys.Count > 0)
             {
-                foreach (var component in ComponentDatas)
-                {
-                    ProcessEntityComponent(component.Key.Entity, component.Key, true);
-                    break; // break right after since we remove from iterator
-                }
+                ProcessEntityComponent(ComponentDataKeys[0].Entity, ComponentDataKeys[0], true);
             }
         }
 
@@ -257,7 +256,8 @@ protected internal override void ProcessEntityComponent(Entity entity, EntityCom
             var entityComponent = (TComponent)entityComponentArg;
             // If forceRemove is true, no need to check if entity matches.
             var entityMatch = !forceRemove && EntityMatch(entity);
-            var entityAdded = ComponentDatas.TryGetValue(entityComponent, out var entityData);
+            bool entityAdded = KeyIndex.TryGetValue(entityComponent, out int index);
+            var entityData = entityAdded ? ComponentDataValues[index] : null;
 
             if (entityMatch && !entityAdded)
             {
@@ -277,7 +277,9 @@ protected internal override void ProcessEntityComponent(Entity entity, EntityCom
                 OnEntityComponentAdding(entity, entityComponent, data);
 
                 // Associate the component to its data
-                ComponentDatas.Add(entityComponent, data);
+                KeyIndex[entityComponent] = ComponentDataKeys.Count;
+                ComponentDataKeys.Add(entityComponent);
+                ComponentDataValues.Add(data);
 
                 lock (reentrancyCheck)
                 {
@@ -289,8 +291,33 @@ protected internal override void ProcessEntityComponent(Entity entity, EntityCom
                 // Notify component being removed
                 OnEntityComponentRemoved(entity, entityComponent, entityData);
 
-                // Removes it from the component => data map
-                ComponentDatas.Remove(entityComponent);
+                // get new index that needs replacement
+                index = KeyIndex[entityComponent];
+
+                // if we are the last element, just remove
+                if (index == ComponentDataKeys.Count - 1)
+                {
+                    ComponentDataKeys.RemoveAt(index);
+                    ComponentDataValues.RemoveAt(index);
+                    KeyIndex.Remove(entityComponent);
+                }
+                else
+                {
+                    // take the last one on the list and replace it at index
+                    // this prevents shifting the whole list down
+                    int lastIndex = ComponentDataKeys.Count - 1;
+                    TComponent lastKey = ComponentDataKeys[lastIndex];
+                    ComponentDataKeys[index] = lastKey;
+                    ComponentDataValues[index] = ComponentDataValues[lastIndex];
+                    KeyIndex[lastKey] = index;
+
+                    // Remove the last one we just moved
+                    ComponentDataKeys.RemoveAt(lastIndex);
+                    ComponentDataValues.RemoveAt(lastIndex);
+
+                    // remove the key index for this component
+                    KeyIndex.Remove(entityComponent);
+                }
             }
             else if (entityMatch) // && entityMatch
             {
@@ -299,7 +326,8 @@ protected internal override void ProcessEntityComponent(Entity entity, EntityCom
                     OnEntityComponentRemoved(entity, entityComponent, entityData);
                     entityData = GenerateComponentData(entity, entityComponent);
                     OnEntityComponentAdding(entity, entityComponent, entityData);
-                    ComponentDatas[entityComponent] = entityData;
+
+                    ComponentDataValues[KeyIndex[entityComponent]] = entityData;
                 }
             }
         }
@@ -342,30 +370,21 @@ private bool EntityMatch(Entity entity)
         {
             // When a processor has no requirement components, it always match with at least the component of entity
             if (!HasRequiredComponents)
-            {
                 return true;
-            }
-
-            checkRequiredTypes.Clear();
-            for (var i = 0; i < RequiredTypes.Length; i++)
-            {
-                checkRequiredTypes.Add(RequiredTypes[i]);
-            }
 
+            int score_track = RequiredTypes.Length;
             var components = entity.Components;
             for (var i = 0; i < components.Count; i++)
             {
                 var componentType = components[i].GetType().GetTypeInfo();
-                for (var j = checkRequiredTypes.Count - 1; j >= 0; j--)
+                for (var j = RequiredTypes.Length - 1; j >= 0; j--)
                 {
-                    if (checkRequiredTypes.Items[j].IsAssignableFrom(componentType))
+                    if (RequiredTypes[j].IsAssignableFrom(componentType))
                     {
-                        checkRequiredTypes.RemoveAt(j);
+                        score_track--;
 
-                        if (checkRequiredTypes.Count == 0)
-                        {
+                        if (score_track <= 0)
                             return true;
-                        }
                     }
                 }
             }
diff --git a/sources/engine/Xenko.Engine/Engine/EntityTransformExtensions.cs b/sources/engine/Xenko.Engine/Engine/EntityTransformExtensions.cs
index b8cbf3a06e..fefdb8ddc5 100644
--- a/sources/engine/Xenko.Engine/Engine/EntityTransformExtensions.cs
+++ b/sources/engine/Xenko.Engine/Engine/EntityTransformExtensions.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Xenko.Core;
@@ -90,7 +91,6 @@ public static Entity GetParent([NotNull] this Entity entity)
 
         /// <summary>
         /// Returns the first child in the hierarchy with the provided name.
-        /// This function can be slow, do not use every frame!
         /// </summary>
         /// <param name="parentEntity">The parent Entity.</param>
         /// <param name="childName">The name of the child to look for.</param>
@@ -99,8 +99,75 @@ public static Entity GetParent([NotNull] this Entity entity)
         [CanBeNull]
         public static Entity FindChild([NotNull] this Entity parentEntity, string childName)
         {
-            if (parentEntity == null) throw new ArgumentNullException(nameof(parentEntity));
-            return Utilities.IterateTree(parentEntity, entity => entity?.GetChildren()).FirstOrDefault(entity => entity != null && entity.Name == childName);
+            foreach(TransformComponent tc in parentEntity.Transform.Children)
+            {
+                if (tc.Entity.Name == childName)
+                    return tc.Entity;
+
+                if (tc.Children.Count > 0)
+                {
+                    Entity child = FindChild(tc.Entity, childName);
+                    if (child != null) return child;
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the first child in the scene with the provided name.
+        /// </summary>
+        /// <param name="parentScene">The parent Scene.</param>
+        /// <param name="childName">The name of the child to look for.</param>
+        /// <returns>Null or the first child with the requested name.</returns>
+        /// <exception cref="ArgumentNullException"><paramref name="parentScene"/> is <c>null</c></exception>
+        [CanBeNull]
+        public static Entity FindChild([NotNull] this Scene parentScene, string childName)
+        {
+            foreach (Entity e in parentScene.Entities)
+            {
+                if (e.Name == childName)
+                    return e;
+
+                if (e.Transform.Children.Count > 0)
+                {
+                    Entity child = FindChild(e, childName);
+                    if (child != null) return child;
+                }
+            }
+
+            foreach (Scene s in parentScene.Children)
+            {
+                Entity child = FindChild(s, childName);
+                if (child != null) return child;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Collects all Entities in this scene into a Dictionary, keyed by Entity names
+        /// </summary>
+        /// <param name="parentScene">The scene to collect entities from</param>
+        /// <returns>Dictionary of all entities currently in this scene</returns>
+        public static Dictionary<string, Entity> CollectChildren([NotNull] this Scene parentScene)
+        {
+            var d = new Dictionary<string, Entity>();
+
+            foreach (Entity e in parentScene.Entities)
+                _addChildren(e, d);
+
+            return d;
+        }
+
+        private static void _addChildren(Entity root, Dictionary<string, Entity> d)
+        {
+            foreach (TransformComponent e in root.Transform.Children)
+            {
+                d[e.Entity.Name] = e.Entity;
+
+                if (e.Children.Count > 0) _addChildren(e.Entity, d);
+            }
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Engine/Engine/Game.cs b/sources/engine/Xenko.Engine/Engine/Game.cs
index 4a12465fc6..bf974c459b 100644
--- a/sources/engine/Xenko.Engine/Engine/Game.cs
+++ b/sources/engine/Xenko.Engine/Engine/Game.cs
@@ -7,19 +7,23 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Xenko.Audio;
+using Xenko.Core;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.IO;
 using Xenko.Core.Mathematics;
 using Xenko.Core.Storage;
+using Xenko.Engine;
 using Xenko.Engine.Design;
 using Xenko.Engine.Processors;
 using Xenko.Games;
 using Xenko.Graphics;
 using Xenko.Graphics.Font;
+using Xenko.Graphics.SDL;
 using Xenko.Input;
 using Xenko.Profiling;
 using Xenko.Rendering;
 using Xenko.Rendering.Fonts;
+using Xenko.Rendering.Rendering;
 using Xenko.Rendering.Sprites;
 using Xenko.Shaders.Compiler;
 using Xenko.Streaming;
@@ -30,7 +34,7 @@ namespace Xenko.Engine
     /// <summary>
     /// Main Game class system.
     /// </summary>
-    public class Game : GameBase, ISceneRendererContext
+    public class Game : GameBase, ISceneRendererContext, IGameSettingsService
     {
         /// <summary>
         /// Static event that will be fired when a game is initialized
@@ -104,10 +108,15 @@ public class Game : GameBase, ISceneRendererContext
         public SpriteAnimationSystem SpriteAnimation { get; }
 
         /// <summary>
-        /// Gets the game profiler system.
+        /// Gets the debug text system.
         /// </summary>
         public DebugTextSystem DebugTextSystem { get; }
 
+        /// <summary>
+        /// Gets the debug rendering system.
+        /// </summary>
+        public DebugRenderSystem DebugRenderSystem { get; }
+
         /// <summary>
         /// Gets the game profiler system.
         /// </summary>
@@ -118,6 +127,16 @@ public class Game : GameBase, ISceneRendererContext
         /// </summary>
         public VRDeviceSystem VRDeviceSystem { get; }
 
+        /// <summary>
+        /// Forces effects to be build in "Release" mode, regardless of GameSettings. Good for performance, even if your app is in debug mode.
+        /// </summary>
+        public bool ForceReleaseEffects { get; set; } = true;
+
+        /// <summary>
+        /// Forces effects to be recorded in "Release" mode, regardless of GameSettings. Good for collecting shaders for distribution.
+        /// </summary>
+        public bool ForceCollectEffects { get; set; } = false;
+
         /// <summary>
         /// Gets the font system.
         /// </summary>
@@ -135,48 +154,18 @@ public IFontFactory Font
         }
 
         /// <summary>
-        /// Gets or sets the console log mode. See remarks.
-        /// </summary>
-        /// <value>The console log mode.</value>
-        /// <remarks>
-        /// Defines how the console will be displayed when running the game. By default, on Windows, It will open only on debug
-        /// if there are any messages logged.
-        /// </remarks>
-        public ConsoleLogMode ConsoleLogMode
-        {
-            get
-            {
-                var consoleLogListener = logListener as ConsoleLogListener;
-                return consoleLogListener != null ? consoleLogListener.LogMode : default(ConsoleLogMode);
-            }
-            set
-            {
-                var consoleLogListener = logListener as ConsoleLogListener;
-                if (consoleLogListener != null)
-                {
-                    consoleLogListener.LogMode = value;
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the default console log level.
+        /// Gets or sets the default console log level (shortcut)
         /// </summary>
         /// <value>The console log level.</value>
         public LogMessageType ConsoleLogLevel
         {
             get
             {
-                var consoleLogListener = logListener as ConsoleLogListener;
-                return consoleLogListener != null ? consoleLogListener.LogLevel : default(LogMessageType);
+                return ConsoleLogListener.LogLevel;
             }
             set
             {
-                var consoleLogListener = logListener as ConsoleLogListener;
-                if (consoleLogListener != null)
-                {
-                    consoleLogListener.LogLevel = value;
-                }
+                ConsoleLogListener.LogLevel = value;
             }
         }
 
@@ -220,6 +209,9 @@ public Game()
             DebugTextSystem = new DebugTextSystem(Services);
             Services.AddService(DebugTextSystem);
 
+            DebugRenderSystem = new DebugRenderSystem(Services);
+            Services.AddService(DebugRenderSystem);
+
             ProfilingSystem = new GameProfilingSystem(Services);
             Services.AddService(ProfilingSystem);
 
@@ -234,6 +226,18 @@ public Game()
             AutoLoadDefaultSettings = true;
         }
 
+        protected override void EndDraw(bool present)
+        {
+            base.EndDraw(present);
+
+            // handle any VR flushing
+            if (VRDeviceSystem.Device != null)
+                VRDeviceSystem.Device.Flush();
+
+            // have any staged mesh draws to clear out?
+            StagedMeshDraw.FlushTrash();
+        }
+
         /// <inheritdoc/>
         protected override void Destroy()
         {
@@ -248,9 +252,9 @@ protected override void Destroy()
         }
 
         /// <inheritdoc/>
-        protected override void PrepareContext()
+        protected override void PrepareContext(float overridefov = -1f)
         {
-            base.PrepareContext();
+            base.PrepareContext(overridefov);
 
             // Init assets
             if (Context.InitializeDatabase)
@@ -272,6 +276,8 @@ protected override void PrepareContext()
                         if (!deviceManager.ShaderProfile.HasValue)
                             deviceManager.ShaderProfile = renderingSettings.DefaultGraphicsProfile;
                     }
+
+                    Services.AddService<IGameSettingsService>(this);
                 }
 
                 // Load several default settings
@@ -283,16 +289,40 @@ protected override void PrepareContext()
                         deviceManager.PreferredGraphicsProfile = new[] { renderingSettings.DefaultGraphicsProfile };
                     }
 
-                    if (renderingSettings.DefaultBackBufferWidth > 0) deviceManager.PreferredBackBufferWidth = renderingSettings.DefaultBackBufferWidth;
-                    if (renderingSettings.DefaultBackBufferHeight > 0) deviceManager.PreferredBackBufferHeight = renderingSettings.DefaultBackBufferHeight;
-
                     deviceManager.PreferredColorSpace = renderingSettings.ColorSpace;
+                    renderingSettings.DefaultBackBufferWidth = deviceManager.preferredBackBufferWidth;
+                    renderingSettings.DefaultBackBufferHeight = deviceManager.PreferredBackBufferHeight;
                     SceneSystem.InitialSceneUrl = Settings?.DefaultSceneUrl;
+                    SceneSystem.OverrideFOV = overridefov;
                     SceneSystem.InitialGraphicsCompositorUrl = Settings?.DefaultGraphicsCompositorUrl;
                     SceneSystem.SplashScreenUrl = Settings?.SplashScreenUrl;
                     SceneSystem.SplashScreenColor = Settings?.SplashScreenColor ?? Color4.Black;
                     SceneSystem.DoubleViewSplashScreen = Settings?.DoubleViewSplashScreen ?? false;
                 }
+
+                // apply rendersettings
+                Xenko.Graphics.Buffer.CaptureIndexBuffersOfSize = renderingSettings.CaptureIndexBufferOfSize;
+                Xenko.Graphics.Buffer.CaptureVertexBuffersOfSize = renderingSettings.CaptureVertexBufferOfSize;
+                Xenko.Graphics.Buffer.UploadBufferSizeInMB = renderingSettings.UploadBufferSizeInMB;
+                Xenko.Graphics.Buffer.SmallPooledBufferSize = (ulong)renderingSettings.SmallPooledBufferSize;
+                Xenko.Graphics.Buffer.SmallPooledBufferCount = (ulong)renderingSettings.SmallPooledBufferCount;
+                Xenko.Graphics.Buffer.LargePooledBufferSize = (ulong)renderingSettings.LargePooledBufferSize;
+                Xenko.Graphics.Buffer.LargePooledBufferCount = (ulong)renderingSettings.LargedPooledBufferCount;
+                VisibilityGroup.CullSmallFactor = renderingSettings.SmallCullFactor;
+                VisibilityGroup.CullShadowsSmallFactor = renderingSettings.SmallShadowCullFactor;
+                
+                ModelComponent.DefaultShadowCasters = renderingSettings.DefaultShadowCasters;
+
+                // enable error file logging?
+                if (renderingSettings.DisableErrorFileLog == false)
+                {
+                    ErrorFileLogger.EnableGlobalExceptionLogger();
+                }
+                else
+                {
+                    // should already be disabled, but we'll make sure
+                    ErrorFileLogger.Disable();
+                }
             }
         }
 
@@ -308,13 +338,9 @@ public override void ConfirmRenderingSettings(bool gameCreation)
             if (gameCreation)
             {
                 //execute the following steps only when the game is still at creation stage
-
                 deviceManager.PreferredGraphicsProfile = Context.RequestedGraphicsProfile = new[] { renderingSettings.DefaultGraphicsProfile };
-
-                //if our device height is actually smaller then requested we use the device one
-                deviceManager.PreferredBackBufferHeight = Context.RequestedHeight = Math.Min(renderingSettings.DefaultBackBufferHeight, Window.ClientBounds.Height);
-                //if our device width is actually smaller then requested we use the device one
-                deviceManager.PreferredBackBufferWidth = Context.RequestedWidth = Math.Min(renderingSettings.DefaultBackBufferWidth, Window.ClientBounds.Width);
+                Context.RequestedHeight = renderingSettings.DefaultBackBufferHeight;
+                Context.RequestedWidth = renderingSettings.DefaultBackBufferWidth;
             }
 
             //these might get triggered even during game runtime, resize, orientation change
@@ -364,19 +390,33 @@ protected override void Initialize()
             //Add the sprite animation System
             GameSystems.Add(SpriteAnimation);
 
+            GameSystems.Add(DebugRenderSystem);
             GameSystems.Add(DebugTextSystem);
             GameSystems.Add(ProfilingSystem);
 
             EffectSystem = new EffectSystem(Services);
             Services.AddService(EffectSystem);
 
+            // prepare effect compilation settings if we have a settings object
+            if (Settings != null) {
+                // align settings with what we may be forcing
+                if (ForceReleaseEffects) Settings.CompilationMode = CompilationMode.Release;
+                if (ForceCollectEffects) {
+                    // we want to collect effects. make sure they are release versions
+                    Settings.EffectCompilation = EffectCompilationMode.Local;
+                    Settings.CompilationMode = CompilationMode.Release;
+                } else if (Settings.CompilationMode == CompilationMode.Testing || Settings.CompilationMode == CompilationMode.Debug) {
+                    // don't collect debug shaders, we won't want to distribute them!
+                    Settings.EffectCompilation = EffectCompilationMode.Local;
+                }
+            }
+
             // If requested in game settings, compile effects remotely and/or notify new shader requests
-            EffectSystem.Compiler = EffectCompilerFactory.CreateEffectCompiler(Content.FileProvider, EffectSystem, Settings?.PackageName, Settings?.EffectCompilation ?? EffectCompilationMode.Local, Settings?.RecordUsedEffects ?? false);
+            EffectSystem.Compiler = EffectCompilerFactory.CreateEffectCompiler(Content.FileProvider, EffectSystem, Settings?.PackageName,
+                                                                               ForceCollectEffects ? EffectCompilationMode.Local : (Settings?.EffectCompilation ?? EffectCompilationMode.Local));
 
             // Setup shader compiler settings from a compilation mode. 
-            // TODO: We might want to provide overrides on the GameSettings to specify debug and/or optim level specifically.
-            if (Settings != null)
-                EffectSystem.SetCompilationMode(Settings.CompilationMode);
+            EffectSystem.SetCompilationMode(ForceReleaseEffects || ForceCollectEffects ? CompilationMode.Release : (Settings?.CompilationMode ?? CompilationMode.Release));
 
             GameSystems.Add(EffectSystem);
 
@@ -416,40 +456,13 @@ private void DestroyAssetDatabase()
         {
             if (databaseFileProvider != null)
             {
-                ((DatabaseFileProviderService)Services.GetService<IDatabaseFileProviderService>()).FileProvider = null;
+                if (Services.GetService<IDatabaseFileProviderService>() is DatabaseFileProviderService dbfp)
+                    dbfp.FileProvider = null;
                 databaseFileProvider.Dispose();
                 databaseFileProvider = null;
             }
         }
 
-        protected override void EndDraw(bool present)
-        {
-#if XENKO_PLATFORM_WINDOWS_DESKTOP
-            // Allow to make a screenshot using CTRL+c+F12 (on release of F12)
-            if (Input.HasKeyboard)
-            {
-                if (Input.IsKeyDown(Keys.LeftCtrl)
-                    && Input.IsKeyDown(Keys.C)
-                    && Input.IsKeyReleased(Keys.F12))
-                {
-                    var currentFilePath = Assembly.GetEntryAssembly().Location;
-                    var timeNow = DateTime.Now.ToString("s", CultureInfo.InvariantCulture).Replace(':', '_');
-                    var newFileName = Path.Combine(
-                        Path.GetDirectoryName(currentFilePath),
-                        Path.GetFileNameWithoutExtension(currentFilePath) + "_" + timeNow + ".png");
-
-                    Console.WriteLine("Saving screenshot: {0}", newFileName);
-
-                    using (var stream = System.IO.File.Create(newFileName))
-                    {
-                        GraphicsDevice.Presenter.BackBuffer.Save(GraphicsContext.CommandList, stream, ImageFileType.Png);
-                    }
-                }
-            }
-#endif
-            base.EndDraw(present);
-        }
-
         /// <summary>
         /// Loads the content.
         /// </summary>
diff --git a/sources/engine/Xenko.Engine/Engine/GamepadSystem.cs b/sources/engine/Xenko.Engine/Engine/GamepadSystem.cs
new file mode 100644
index 0000000000..ed5926a396
--- /dev/null
+++ b/sources/engine/Xenko.Engine/Engine/GamepadSystem.cs
@@ -0,0 +1,254 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Graphics.SDL;
+using Xenko.Input;
+
+namespace Xenko.Engine
+{
+    public class GamepadSystem
+    {
+        public static IGameControllerDevice PrimaryGamepad;
+        private static Game internalGame;
+
+        private static float Clamp(float a, float low, float high)
+        {
+            if (a > high) return high;
+            if (a < low) return low;
+            return a;
+        }
+
+        static GamepadSystem()
+        {
+            internalGame = ServiceRegistry.instance?.GetService<IGame>() as Game;
+            int p = int.MinValue;
+            for (int i = 0; i < internalGame.Input.GameControllerCount; i++)
+            {
+                var gp = internalGame.Input.GameControllers[i];
+                if (gp.Priority > p)
+                {
+                    PrimaryGamepad = gp;
+                    p = gp.Priority;
+                }
+            }
+            Recalibrate();
+            PointerX = internalGame.GraphicsDevice.Presenter.BackBuffer.Width / 2;
+            PointerY = internalGame.GraphicsDevice.Presenter.BackBuffer.Height / 2;
+            // preconfigure a "Click"
+            GamepadInputConfig["Click"] = new Vector3(0f, 1f, 0f);
+        }
+
+        // (axis/button number, multiplier, axis if 1)
+        private static Dictionary<string, Vector3> GamepadInputConfig = new Dictionary<string, Vector3>();
+        private static SimpleSaver configSaver;
+
+        public static void SaveAndLoadConfig(string filename = null, bool forcereload = false)
+        {
+            if (filename == null)
+                filename = configSaver?.Filename;
+
+            if (filename == null)
+                throw new ArgumentException("No filename known to save gamepad data! Need to call this at least once with a filename.");
+
+            if (configSaver == null || configSaver.Filename != filename || forcereload)
+            {
+                // load
+                configSaver = new SimpleSaver(filename);
+                string[] names = configSaver.Get("Names", new string[0]);
+                Vector3[] configs = configSaver.Get("Configs", new Vector3[0]);
+                for(int i=0; i<names.Length; i++)
+                    GamepadInputConfig[names[i]] = configs[i];
+            }
+            else
+            {
+                // save
+                List<string> names = new List<string>();
+                List<Vector3> configs = new List<Vector3>();
+                foreach (var pair in GamepadInputConfig)
+                {
+                    names.Add(pair.Key);
+                    configs.Add(pair.Value);
+                }
+                configSaver.Set("Names", names.ToArray());
+                configSaver.Set("Configs", configs.ToArray());
+                configSaver.SaveToFile();
+            }
+        }
+
+        public static float Deadzone = 0.05f;
+        public static bool ExponentialAxis = false;
+
+        public static float GetInput(string input, bool pressedOnly = false)
+        {
+            if (PrimaryGamepad == null || GamepadInputConfig.TryGetValue(input, out Vector3 config) == false) return 0f;
+            if (config.Z == 1f)
+            {
+                float val = (PrimaryGamepad.GetAxis((int)config.X) - defaultAxis[(int)config.X]) * config.Y;
+                float axis = Math.Abs(val) > Deadzone ? val : 0f;
+                return ExponentialAxis ? axis * Math.Abs(axis) : axis;
+            }
+
+            bool buttonTrue = pressedOnly ? PrimaryGamepad.IsButtonPressed((int)config.X) : PrimaryGamepad.IsButtonDown((int)config.X);
+            return buttonTrue ? 1f : 0f;
+        }
+
+        private static float[] defaultAxis;
+        private static int framesToCollect;
+        private static float PointerX, PointerY, PointerAccel = 0f;
+        public static float PointerSpeed = 50f;
+
+        private static void UpdateEmulatedDPadPointer(float tpf)
+        {
+            if (PrimaryGamepad == null) return;
+            float xdiff = 0f, ydiff = 0f;
+            int padPresses = (int)PrimaryGamepad.GetDPad(0);
+            if ((padPresses & (int)GamePadButton.PadUp) != 0)
+            {
+                ydiff -= tpf * (PointerSpeed + PointerAccel);
+            }
+            else if ((padPresses & (int)GamePadButton.PadDown) != 0)
+            {
+                ydiff += tpf * (PointerSpeed + PointerAccel);
+            }
+            else ydiff = 0f;
+            if ((padPresses & (int)GamePadButton.PadLeft) != 0)
+            {
+                xdiff -= tpf * (PointerSpeed + PointerAccel);
+            }
+            else if ((padPresses & (int)GamePadButton.PadRight) != 0)
+            {
+                xdiff += tpf * (PointerSpeed + PointerAccel);
+            }
+            else xdiff = 0f;
+            if (xdiff != 0f || ydiff != 0f)
+                PointerAccel = Clamp(PointerAccel + tpf * PointerSpeed, 10f, 1000f);
+            else
+                PointerAccel = PointerSpeed;
+            PointerX = Clamp(PointerX + xdiff, 0f, internalGame.GraphicsDevice.Presenter.BackBuffer.Width);
+            PointerY = Clamp(PointerY + ydiff, 0f, internalGame.GraphicsDevice.Presenter.BackBuffer.Height);
+            Vector2 normalizedpos = new Vector2(PointerX / internalGame.GraphicsDevice.Presenter.BackBuffer.Width, PointerY / internalGame.GraphicsDevice.Presenter.BackBuffer.Height);
+            internalGame.Input.Mouse.SetPosition(normalizedpos);
+            if (GetInput("Click", true) == 1f)
+            {
+                internalGame.Window.EmulateMouseEvent(true, true, (int)PointerX, (int)PointerY);
+                internalGame.Window.EmulateMouseEvent(false, true, (int)PointerX, (int)PointerY);
+            }
+        }
+
+        /// <summary>
+        /// Debug dump of all controller info
+        /// </summary>
+        public static string DumpInformation(bool configButtons = true, bool calibratedDefaults = true, bool currentInput = true)
+        {
+            if (PrimaryGamepad == null) return "No controller detected at start!";
+            string info = "---------- CONTROLLER DATA DUMP ----------\n";
+            info += "Primary Controller Name: " + PrimaryGamepad.Name + "\n";
+            if (configButtons)
+            {
+                info += "- Configured Inputs:\n";
+                foreach (var pair in GamepadInputConfig)
+                    info += pair.Key + ", Index: " + pair.Value.X.ToString("0") + ", Multiplier: " + pair.Value.Y.ToString("0") + ", Axis? " + pair.Value.Z.ToString("0") + "\n";
+            }
+            if (calibratedDefaults)
+            {
+                info += "- Calibrated Defaults:\n";
+                for (int i = 0; i < defaultAxis.Length; i++)
+                    info += "Axis #" + i + ": " + defaultAxis[i].ToString("0.00") + "\n";
+            }
+            if (currentInput)
+            {
+                info += "- Current Input:\n";
+                for (int i = 0; i < PrimaryGamepad.GetAxisCount(); i++)
+                    info += "Axis #" + i + ": " + PrimaryGamepad.GetAxis(i).ToString("0.00") + "\n";
+                for (int i = 0; i < PrimaryGamepad.GetButtonCount(); i++)
+                    info += "Button #" + i + ": " + PrimaryGamepad.IsButtonDown(i) + "\n";
+                info += "DPad 0: " + PrimaryGamepad.GetDPad(0).ToString() + "\n";
+            }
+            return info + "----------------------------------------------\n";
+        }
+
+        public static void Recalibrate()
+        {
+            defaultAxis = null;
+            framesToCollect = 5;
+        }
+
+        public static void Update(bool useEmulatedPointer = false)
+        {
+            CollectDefaultAxisValues();
+            if (useEmulatedPointer) UpdateEmulatedDPadPointer((float)internalGame.UpdateTime.Elapsed.TotalSeconds);
+        }
+
+        private static void CollectDefaultAxisValues()
+        {
+            if (PrimaryGamepad == null) return;
+            // do we already have valid defaults?
+            if (framesToCollect-- < 0) return;
+            if (defaultAxis == null) defaultAxis = new float[PrimaryGamepad.GetAxisCount()];
+            for (int i = 0; i < defaultAxis.Length; i++)
+            {
+                float a = PrimaryGamepad.GetAxis(i);
+                if (Math.Abs(a) > defaultAxis[i]) defaultAxis[i] = a;
+            }
+        }
+
+        /// <summary>
+        /// Returns true if any significant input is being detected from a game controller.
+        /// </summary>
+        public static bool AnyInputDetected()
+        {
+            if (PrimaryGamepad == null || defaultAxis == null || framesToCollect > 0) return false;
+            for (int i = 0; i < PrimaryGamepad.GetAxisCount(); i++)
+            {
+                var axis = PrimaryGamepad.GetAxis(i) - defaultAxis[i];
+                if (axis > 0.5f)
+                    return true;
+                else if (axis < -0.5f)
+                    return true;
+            }
+            for (int i = 0; i < PrimaryGamepad.GetButtonCount(); i++)
+            {
+                if (PrimaryGamepad.IsButtonDown(i)) return true;
+            }
+            if (PrimaryGamepad.GetDPad(0) != GamePadButton.None) return true;
+            return false;
+        }
+
+        /// <summary>
+        /// Configures a gamepad input name you pick. Call this and it will return true when it senses a press or axis change and associates the two together.
+        /// </summary>
+        /// <param name="input">Name you make up to monitor for gamepad input to use</param>
+        /// <returns>true when input is detected and configured</returns>
+        public static bool MonitorForInputConfig(string input)
+        {
+            if (PrimaryGamepad == null || defaultAxis == null || framesToCollect > 0) return false;
+            for (int i = 0; i < PrimaryGamepad.GetAxisCount(); i++)
+            {
+                var axis = PrimaryGamepad.GetAxis(i) - defaultAxis[i];
+                if (axis > 0.5f)
+                {
+                    GamepadInputConfig[input] = new Vector3(i, 1f, 1f);
+                    return true;
+                }
+                else if (axis < -0.5f)
+                {
+                    GamepadInputConfig[input] = new Vector3(i, -1f, 1f);
+                    return true;
+                }
+            }
+            for (int i = 0; i < PrimaryGamepad.GetButtonCount(); i++)
+            {
+                var b = PrimaryGamepad.IsButtonDown(i);
+                if (b)
+                {
+                    GamepadInputConfig[input] = new Vector3(i, 1f, 0f);
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Engine/GlobalSoundManager.cs b/sources/engine/Xenko.Engine/Engine/GlobalSoundManager.cs
new file mode 100644
index 0000000000..3728056cb6
--- /dev/null
+++ b/sources/engine/Xenko.Engine/Engine/GlobalSoundManager.cs
@@ -0,0 +1,456 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Xenko.Audio;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
+using Xenko.Games;
+
+namespace Xenko.Engine
+{
+    /// <summary>
+    /// Efficiently plays and manages sound effects for an entire project
+    /// </summary>
+    public sealed class GlobalSoundManager
+    {
+        /// <summary>
+        /// How far can sounds be heard?
+        /// </summary>
+        public static float MaxSoundDistance = 48f;
+
+        /// <summary>
+        /// How many sounds can overlap with eachother?
+        /// </summary>
+        public static int MaxSameSoundOverlaps = 8;
+
+        /// <summary>
+        /// Master volume
+        /// </summary>
+        public static float MasterVolume = 1f;
+
+        /// <summary>
+        /// Volume to apply to streamed audio (e.g. music)
+        /// </summary>
+        public static float StreamedVolume = 1f;
+
+        /// <summary>
+        /// Volume to apply to non-streamed audio (e.g. effects)
+        /// </summary>
+        public static float NonStreamedVolume = 1f;
+
+        /// <summary>
+        /// Sounds really close to the listener can cause jarring pan issues, so this will scoot sounds away to this distance. 0 to disable.
+        /// </summary>
+        public static float MinimumDistanceToListener = 1f;
+
+        /// <summary>
+        /// If a looped sound is out of range, play it anyway? You want it played if it will come near the player at some point. Defaults to true. Set to false to reduce overlapping sound usage. ignoreDistanceCheck will override this if set on function calls.
+        /// </summary>
+        public static bool PlayOutofRangeLoopedSounds = true;
+
+        /// <summary>
+        /// System-wide disabling of doppler effect with 3D audio
+        /// </summary>
+        public static bool CompletelyDisableDopplerEffect = false;
+
+        /// <summary>
+        /// Different policies for replacing existing sounds when new ones want to play (and we ran out of overlapping sounds)
+        /// </summary>
+        public enum REPLACE_SOUND_POLICY
+        {
+            NO_REPLACING,
+            REPLACE_ANY,
+            REPLACE_UNLOOPED_ONLY
+        }
+
+        /// <summary>
+        /// If you want a sound URL to have its own replacement policy, set it in this dictionary
+        /// </summary>
+        public static Dictionary<string, REPLACE_SOUND_POLICY> ReplaceSoundOverrides = new Dictionary<string, REPLACE_SOUND_POLICY>();
+
+        /// <summary>
+        /// If we have hit the overlap max for a new sound that wants to play, should we stop the oldest one and replace it? Defaults to REPLACE_OLDEST_UNLOOPED_ONLY
+        /// </summary>
+        public static REPLACE_SOUND_POLICY DefaultReplacementPolicy = REPLACE_SOUND_POLICY.REPLACE_UNLOOPED_ONLY;
+
+        public static SoundInstance PlayCentralSound(string url, float pitch = 1f, float volume = 1f, float pan = 0f, bool looped = false)
+        {
+            SoundInstance s = getFreeInstance(url, false);
+            if (s != null)
+            {
+                s.Pitch = pitch < 0f ? RandomPitch() : pitch;
+                s.Volume = volume * MasterVolume * (s.DynamicSoundSource == null ? NonStreamedVolume : StreamedVolume);
+                s.IsLooping = looped;
+                s.Pan = pan;
+                if (s.IsSpatialized) s.Apply3D(AudioEngine.DefaultListener.Position);
+                s.Play();
+            }
+            return s;
+        }
+
+        private static Vector3 ProcessMinDistPosition(Vector3 desiredPos)
+        {
+            if (MinimumDistanceToListener <= 0f) return desiredPos;
+            Vector3 diff = desiredPos - AudioEngine.DefaultListener.Position;
+            float dist = diff.Length();
+            if (dist < MinimumDistanceToListener)
+            {
+                if (dist <= float.Epsilon)
+                    diff = AudioEngine.DefaultListener.Forward;
+                else
+                    diff.Normalize();
+
+                return diff * MinimumDistanceToListener + desiredPos;
+            }
+            else return desiredPos;
+        }
+
+        public static SoundInstance PlayPositionSound(string url, Vector3 position, float pitch = 1f, float volume = 1f, float distanceScale = 1f, bool looped = false, bool ignoreDistanceCheck = false)
+        {
+            if (ignoreDistanceCheck == false && MaxSoundDistance > 0f && (!PlayOutofRangeLoopedSounds || !looped))
+            {
+                float sqrDist = ((position - AudioEngine.DefaultListener.Position) * distanceScale).LengthSquared();
+                if (sqrDist >= MaxSoundDistance * MaxSoundDistance) return null;
+            }
+            SoundInstance s = getFreeInstance(url, true);
+            if (s == null) return null;
+            s.Pitch = pitch < 0f ? RandomPitch() : pitch;
+            s.Volume = volume * MasterVolume * (s.DynamicSoundSource == null ? NonStreamedVolume : StreamedVolume);
+            s.IsLooping = looped;
+            s.Pan = 0f;
+            s.DistanceScale = distanceScale;
+            s.Apply3D(ProcessMinDistPosition(position), null, null);
+            s.Play();
+            return s;
+        }
+
+        public static SoundInstance PlayAttachedSound(string url, Entity parent, float pitch = 1f, float volume = 1f, float distanceScale = 1f, bool looped = false, bool ignoreDistanceCheck = false)
+        {
+            Vector3 pos = parent.Transform.WorldPosition(true);
+            if (ignoreDistanceCheck == false && MaxSoundDistance > 0f && (!PlayOutofRangeLoopedSounds || !looped))
+            {
+                float sqrDist = ((pos - AudioEngine.DefaultListener.Position) * distanceScale).LengthSquared();
+                if (MaxSoundDistance > 0f && sqrDist >= MaxSoundDistance * MaxSoundDistance) return null;
+            }
+            SoundInstance s = getFreeInstance(url, true);
+            if (s == null) return null;
+            s.Pitch = pitch < 0f ? RandomPitch() : pitch;
+            s.Volume = volume * MasterVolume * (s.DynamicSoundSource == null ? NonStreamedVolume : StreamedVolume);
+            s.IsLooping = looped;
+            s.Pan = 0f;
+            s.DistanceScale = distanceScale;
+            s.Apply3D(ProcessMinDistPosition(pos), null, null);
+            s.Play();
+            var posSnd = new PositionalSound() {
+                oldpos = pos,
+                soundInstance = s,
+                entity = parent,
+            };
+            currentAttached.Add(posSnd);
+            return s;
+        }
+
+        public static Task<SoundInstance> PlayCentralSoundTask(string url, float pitch = 1f, float volume = 1f, float pan = 0f, bool looped = false)
+        {
+            return Task.Factory.StartNew<SoundInstance>(() =>
+            {
+                return PlayCentralSound(url, pitch, volume, pan, looped);
+            });
+        }
+
+        public static Task<SoundInstance> PlayPositionSoundTask(string url, Vector3 position, float pitch = 1f, float volume = 1f, float distanceScale = 1f, bool looped = false, bool ignoreDistanceCheck = false)
+        {
+            return Task.Factory.StartNew<SoundInstance>(() =>
+            {
+                return PlayPositionSound(url, position, pitch, volume, distanceScale, looped, ignoreDistanceCheck);
+            });
+        }
+
+        public static Task<SoundInstance> PlayAttachedSoundTask(string url, Entity parent, float pitch = 1f, float volume = 1f, float distanceScale = 1f, bool looped = false, bool ignoreDistanceCheck = false)
+        {
+            return Task.Factory.StartNew<SoundInstance>(() =>
+            {
+                return PlayAttachedSound(url, parent, pitch, volume, distanceScale, looped, ignoreDistanceCheck);
+            });
+        }
+
+        /// <summary>
+        /// Call this to make sure sounds attached to things get moved (and cleaned up) properly
+        /// </summary>
+        /// <param name="overrideTimePerFrame"></param>
+        public static void UpdatePlayingSoundPositions(float? overrideTimePerFrame = null)
+        {
+            foreach (PositionalSound ps in currentAttached) {
+                if (ps?.entity?.Scene == null)
+                {
+                    ps?.soundInstance?.Stop();
+                    currentAttached.TryRemove(ps);
+                    continue;
+                }
+                else if (ps.soundInstance.PlayState == Media.PlayState.Stopped)
+                {
+                    currentAttached.TryRemove(ps);
+                    continue;
+                }
+                Vector3 newpos = ps.entity.Transform.WorldPosition();
+                float timePerFrame = overrideTimePerFrame ?? ((float)internalGame.UpdateTime.Elapsed.Ticks / TimeSpan.TicksPerSecond);
+                ps.soundInstance.Apply3D(ProcessMinDistPosition(newpos), CompletelyDisableDopplerEffect ? null : (timePerFrame != 0f ? (newpos - ps.oldpos) / timePerFrame : AudioEngine.DefaultListener.Velocity), null);
+                ps.oldpos = newpos;
+            }
+        }
+
+        public static void StopAllSounds()
+        {
+            using (instanceLock.ReadLock())
+            {
+                foreach (List<SoundInstance> si in instances.Values)
+                {
+                    for (int i = 0; i < si.Count; i++)
+                    {
+                        si[i].Stop();
+                    }
+                }
+            }
+            currentAttached.Clear();
+        }
+
+        /// <summary>
+        /// Returns all of the paused sounds for easy resuming ones you want
+        /// Make sure you either stop these if not resuming them, or resume them
+        /// </summary>
+        public static List<SoundInstance> PauseLoopedSounds()
+        {
+            List<SoundInstance> paused = new List<SoundInstance>();
+            using (instanceLock.ReadLock())
+            {
+                foreach (List<SoundInstance> si in instances.Values)
+                {
+                    for (int i = 0; i < si.Count; i++)
+                    {
+                        if (si[i].IsLooping && si[i].PlayState == Media.PlayState.Playing)
+                        {
+                            si[i].Pause();
+                            paused.Add(si[i]);
+                        }
+                    }
+                }
+            }
+            return paused;
+        }
+
+        /// <summary>
+        /// Helper function for resuming a list of paused, looped sounds usually provided from PauseLoopedSounds()
+        /// </summary>
+        public static void ResumeLoopedSounds(List<SoundInstance> paused_looped_sounds)
+        {
+            if (paused_looped_sounds == null) return;
+            foreach (SoundInstance si in paused_looped_sounds)
+                if (si.IsLooping && si.PlayState == Media.PlayState.Paused) si.Play();
+        }
+
+        public static void StopSound(string url)
+        {
+            using (instanceLock.ReadLock())
+            {
+                if (instances.TryGetValue(url, out var snds))
+                {
+                    for (int i = 0; i < snds.Count; i++)
+                    {
+                        snds[i].Stop();
+                    }
+                }
+            }
+        }
+
+        public static float RandomPitch(float range = 0.2f, float middle = 1f)
+        {
+            if (rand == null) rand = new Random(Environment.TickCount);
+            return (float)rand.NextDouble() * range * 2f + middle - range;
+        }
+
+        public static void Reset()
+        {
+            StopAllSounds();
+            using (instanceLock.WriteLock())
+            {
+                foreach (List<SoundInstance> si in instances.Values)
+                {
+                    for (int i = 0; i < si.Count; i++)
+                    {
+                        si[i].Dispose();
+                    }
+                    si.Clear();
+                }
+                instances.Clear();
+            }
+        }
+
+        /// <summary>
+        /// After this many sound instance creations, we will clean up existing ones to prevent audio engine getting saturated. This is like garbage collection
+        /// </summary>
+        public static int CleanTriggerCount = 64;
+        /// <summary>
+        /// What is the max number of sound instances to clean up when running a clean?
+        /// </summary>
+        public static int CleanCount = 32;
+
+        private static int clean_check;
+        /// <summary>
+        /// Sometimes when playing too many sounds, the audio backend gets buggy. This function will clean up unused instances. instancelock must already be locked
+        /// </summary>
+        private static void Clean()
+        {
+            if (Interlocked.Increment(ref clean_check) == CleanTriggerCount)
+            {
+                clean_check = 0;
+                int cleaned = 0;
+                using (instanceLock.WriteLock())
+                {
+                    foreach (List<SoundInstance> si in instances.Values)
+                    {
+                        for (int i = 0; i < si.Count; i++)
+                        {
+                            var snd = si[i];
+                            if (snd.PlayState == Media.PlayState.Stopped)
+                            {
+                                si.RemoveAt(i);
+                                snd.Dispose();
+                                cleaned++;
+                                if (cleaned >= CleanCount) return;
+                                i--;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        static GlobalSoundManager()
+        {
+            // global sound manager relies on listeners being shared, so everything can be
+            // safely reused
+            internalGame = ServiceRegistry.instance?.GetService<IGame>() as Game;
+        }
+
+        private static Dictionary<string, List<SoundInstance>> instances = new Dictionary<string, List<SoundInstance>>();
+        private static ConcurrentHashSet<PositionalSound> currentAttached = new ConcurrentHashSet<PositionalSound>();
+        private static System.Random rand;
+        private static Game internalGame;
+
+        /// <summary>
+        /// Pre-load a sound so it will play faster later.
+        /// </summary>
+        /// <param name="url">Content URL of the audio</param>
+        public static void PreloadAudio(string url)
+        {
+            using (instanceLock.WriteLock())
+            {
+                if (instances.TryGetValue(url, out var ins))
+                    return; // already loaded
+
+                // this might throw an exception if you provided a bad url
+                Sound snd2 = internalGame.Content.QuickLoad<Sound>(url);
+
+                // load this sound and prepare lists for it
+                SoundInstance si = snd2.CreateInstance(AudioEngine.DefaultListener);
+                List<SoundInstance> lsi = new List<SoundInstance>();
+                lsi.Add(si);
+                instances[url] = lsi;
+            }
+        }
+
+        private static ReaderWriterLockSlim instanceLock = new ReaderWriterLockSlim();
+
+        private static SoundInstance getFreeInstance(string url, bool spatialized)
+        {
+            if (url == null) return null;
+
+            List<SoundInstance> ins = null;
+
+            using (instanceLock.ReadLock())
+            {
+                if (instances.TryGetValue(url, out ins))
+                {
+                    if (ReplaceSoundOverrides.TryGetValue(url, out var ReplacementPolicy) == false)
+                        ReplacementPolicy = DefaultReplacementPolicy;
+
+                    SoundInstance oldestSI = null;
+                    float replaceScore = 0f;
+                    for (int i = 0; i < ins.Count; i++)
+                    {
+                        var snd = ins[i];
+                        if (snd.PlayState == Media.PlayState.Stopped)
+                            return snd;
+
+                        if (ReplacementPolicy != REPLACE_SOUND_POLICY.NO_REPLACING)
+                        {
+                            float myscore = (float)snd.Position.TotalSeconds + (snd.IsSpatialized ? (snd.SpatializedPosition - snd.Listener.Position).Length() : 0f);
+                            if ((i == 0 || myscore > replaceScore) && (ReplacementPolicy == REPLACE_SOUND_POLICY.REPLACE_ANY || snd.IsLooping == false))
+                            {
+                                oldestSI = snd;
+                                replaceScore = myscore;
+                            }
+                        }
+                    }
+
+                    // have we reached our max sounds though?
+                    // are we going to try and replace it?
+                    if (ins.Count >= MaxSameSoundOverlaps)
+                    {
+                        if (oldestSI != null)
+                        {
+                            oldestSI.Stop();
+                            return oldestSI;
+                        }
+
+                        // max reached and no replacement
+                        return null;
+                    }
+                }
+            }
+
+            // run a clean check cuz we be creating a new instance
+            Clean();
+
+            // if we have a sound instance list, add to that and return after clean
+            if (ins != null)
+            {
+                using (instanceLock.ReadLock())
+                {
+                    // don't have a free one to play, add a new one to the list
+                    SoundInstance si0 = internalGame.Content.QuickLoad<Sound>(url).CreateInstance(AudioEngine.DefaultListener);
+                    ins.Add(si0);
+                    return si0;
+                }
+            }
+
+            // no list or anything, need to make everything
+            using (instanceLock.WriteLock())
+            {
+                Sound snd = internalGame.Content.QuickLoad<Sound>(url);
+
+                if (!snd.Spatialized && spatialized)
+                    throw new InvalidOperationException("Trying to play " + url + " positionally, yet it is a non-spatialized sound!");
+
+                SoundInstance si = snd.CreateInstance(AudioEngine.DefaultListener);
+                List<SoundInstance> lsi = new List<SoundInstance>();
+                lsi.Add(si);
+                instances[url] = lsi;
+                return si;
+            }
+        }
+
+        private class PositionalSound
+        {
+            public SoundInstance soundInstance;
+            public Entity entity;
+            public Vector3 oldpos;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Engine/LightComponent.cs b/sources/engine/Xenko.Engine/Engine/LightComponent.cs
index 798e1c799f..6335f028fa 100644
--- a/sources/engine/Xenko.Engine/Engine/LightComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/LightComponent.cs
@@ -19,6 +19,7 @@ namespace Xenko.Engine
     // TODO GRAPHICS REFACTOR
     //[DefaultEntityComponentRenderer(typeof(LightComponentRenderer), -10)]
     [DefaultEntityComponentRenderer(typeof(LightProcessor))]
+    [AllowMultipleComponents]
     [ComponentOrder(12000)]
     [ComponentCategory("Lights")]
     public sealed class LightComponent : ActivableEntityComponent
diff --git a/sources/engine/Xenko.Engine/Engine/ModelComponent.cs b/sources/engine/Xenko.Engine/Engine/ModelComponent.cs
index 79390677a6..bd549c7e70 100644
--- a/sources/engine/Xenko.Engine/Engine/ModelComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/ModelComponent.cs
@@ -11,6 +11,7 @@
 using Xenko.Engine.Design;
 using Xenko.Engine.Processors;
 using Xenko.Rendering;
+using Xenko.Rendering.Materials;
 using Xenko.Updater;
 
 namespace Xenko.Engine
@@ -32,6 +33,11 @@ public sealed class ModelComponent : ActivableEntityComponent, IModelInstance
         private SkeletonUpdater skeleton;
         private bool modelViewHierarchyDirty = true;
 
+        /// <summary>
+        /// Do newly generated models become shadow casters by default? Defaults to true
+        /// </summary>
+        public static bool DefaultShadowCasters = true;
+
         /// <summary>
         /// Per-entity state of each individual mesh of a model.
         /// </summary>
@@ -52,7 +58,7 @@ public class MeshInfo
             /// </summary>
             public BoundingSphere BoundingSphere;
         }
-      
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ModelComponent"/> class.
         /// </summary>
@@ -67,7 +73,7 @@ public ModelComponent() : this(null)
         public ModelComponent(Model model)
         {
             Model = model;
-            IsShadowCaster = true;
+            IsShadowCaster = DefaultShadowCasters;
         }
 
         /// <summary>
@@ -139,7 +145,15 @@ private void CheckSkeleton()
         [DataMember(30)]
         [DefaultValue(true)]
         [Display("Cast shadows")]
-        public bool IsShadowCaster { get; set; }
+        public bool IsShadowCaster { get; set; } = DefaultShadowCasters;
+
+        /// <summary>
+        /// Even if we are transparent, still write to the depth buffer?
+        /// </summary>
+        [DataMember(35)]
+        [DefaultValue(MESH_DEPTH_MODE.Default)]
+        [Display("Depth Mode")]
+        public MESH_DEPTH_MODE DepthMode { get; set; } = MESH_DEPTH_MODE.Default;
 
         /// <summary>
         /// The render group for this component.
@@ -149,6 +163,56 @@ private void CheckSkeleton()
         [Display("Render group")]
         public RenderGroup RenderGroup { get; set; }
 
+        /// <summary>
+        /// Tweak the sorting distance. Can help with transparent sorting.
+        /// </summary>
+        [DataMember(30)]
+        [Display("Distance Sort Fudge")]
+        [DefaultValue(0f)]
+        public float DistanceSortFudge { get; set; }
+
+        /// <summary>
+        /// Disable automatic culling if this is too small to be really noticeable, can be adjusted via SmallFactorMultiplier
+        /// </summary>
+        [DataMember(35)]
+        [DefaultValue(false)]
+        public bool SkipCullIfSmall { get; set; } = false;
+
+        /// <summary>
+        /// Multiply the small factor, if using that auto-culling system (see GameSettings -> Render Settings)
+        /// </summary>
+        [DataMember(40)]
+        [DefaultValue(1f)]
+        public float SmallFactorMultiplier { get; set; } = 1f;
+
+        /// <summary>
+        /// If this model may change at any time, have this false. Otherwise, if the model (material and meshes) stay the same, set this to true for performance improvements.
+        [DataMember(45)]
+        [DefaultValue(false)]
+        public bool FixedModel { get; set; } = false;
+
+        /// <summary>
+        /// How many frames to force updating this model, even if it is considered a fixed model? Useful to doing an update after moving it.
+        /// </summary>
+        [DataMemberIgnore]
+        public int ForceModelUpdateCount = 1;
+
+        /// Update all model components in Entity tree.
+        /// </summary>
+        /// <param name="root">Root entity to look at all model components, updating all of them</param>
+        public static void RecursiveModelUpdate(Entity root)
+        {
+            for (int i=0; i<root.Components.Count; i++)
+            {
+                var component = root.Components[i];
+                if (component is ModelComponent mc)
+                    mc.ForceModelUpdateCount = 1;
+            }
+
+            for (int i = 0; i < root.Transform.Children.Count; i++)
+                RecursiveModelUpdate(root.Transform.Children[i].Entity);
+        }
+
         /// <summary>
         /// Gets the bounding box in world space.
         /// </summary>
@@ -170,19 +234,13 @@ private void CheckSkeleton()
         /// <returns>The material at the specified index or null if not found</returns>
         public Material GetMaterial(int index)
         {
-            if (index < 0) throw new ArgumentOutOfRangeException(nameof(index), @"index cannot be < 0");
-
-            Material material;
-            if (Materials.TryGetValue(index, out material))
-            {
+            if (Materials.TryGetValue(index, out var material))
                 return material;
-            }
-            // TODO: if Model is null, shouldn't we always return null?
+
             if (Model != null && index < Model.Materials.Count)
-            {
-                material = Model.Materials[index].Material;
-            }
-            return material;
+                return Model.Materials[index].Material;
+
+            return MaterialRenderFeature.fallbackMaterial;
         }
 
         /// <summary>
@@ -198,6 +256,34 @@ public int GetMaterialCount()
             return 0;
         }
 
+        /// <summary>
+        /// Generate an oriented bounding box for this ModelComponent. Automatically includes all meshes transformed by its world matrix.
+        /// </summary>
+        /// <param name="scale">Scales the result by this scalar. 1f is default, which is the scale of the model including its world transformation scale.</param>
+        /// <param name="updateModelBounds">Update the model's bounding box? Useful if meshes changed. Will be done if Model.BoundingBox is Empty anyway.</param>
+        /// <param name="updateWorldMatrix">Update the entity's transform worldmatrix? This is useful if you recently moved the object and it hasn't been rendered yet.</param>
+        /// <returns>An oriented bounding box containing meshes, transformed according to the world matrix</returns>
+        /// <exception cref="InvalidOperationException">Raises an exception if this ModelComponent has no model</exception>
+        public OrientedBoundingBox GetOrientedBox(float scale = 1f, bool updateModelBounds = false, bool updateWorldMatrix = false)
+        {
+            if (Model == null)
+                throw new InvalidOperationException("Can't get Oriented Box of ModelComponent '" + Entity.Name + "' without a Model");
+
+            // make sure our transforms are all set
+            if (updateModelBounds || Model.BoundingBox == BoundingBox.Empty)
+                Model.UpdateBoundingBox();
+            if (updateWorldMatrix)
+                Entity.Transform.UpdateWorldMatrix();
+
+            // make the box
+            OrientedBoundingBox box = new OrientedBoundingBox(Model.BoundingBox);
+            box.Transform(Matrix.Transformation(Vector3.One, Entity.Transform.WorldRotation(), Entity.Transform.WorldPosition()));
+            Vector3 worldscale = Entity.Transform.WorldScale();
+            if (scale != 1f) worldscale *= scale;
+            box.Scale(ref worldscale);
+            return box;
+        }
+
         private void ModelUpdated()
         {
             if (model != null)
@@ -267,12 +353,12 @@ internal void Update(TransformComponent transformComponent)
                     for (int boneIndex = 0; boneIndex < bones.Length; boneIndex++)
                     {
                         var nodeIndex = bones[boneIndex].NodeIndex;
-                        Matrix.Multiply(ref bones[boneIndex].LinkToMeshMatrix, ref skeleton.NodeTransformations[nodeIndex].WorldMatrix, out meshInfos[meshIndex].BlendMatrices[boneIndex]);
+                        Matrix.Multiply(ref bones[boneIndex].LinkToMeshMatrix, ref skeleton.NodeTransformations[nodeIndex].WorldMatrix, out meshInfo.BlendMatrices[boneIndex]);
 
                         BoundingBox skinnedBoundingBox;
-                        BoundingBox.Transform(ref mesh.BoundingBox, ref meshInfos[meshIndex].BlendMatrices[boneIndex], out skinnedBoundingBox);
+                        BoundingBox.Transform(ref mesh.BoundingBox, ref meshInfo.BlendMatrices[boneIndex], out skinnedBoundingBox);
                         BoundingSphere skinnedBoundingSphere;
-                        BoundingSphere.Transform(ref mesh.BoundingSphere, ref meshInfos[meshIndex].BlendMatrices[boneIndex], out skinnedBoundingSphere);
+                        BoundingSphere.Transform(ref mesh.BoundingSphere, ref meshInfo.BlendMatrices[boneIndex], out skinnedBoundingSphere);
 
                         if (meshHasBoundingBox)
                         {
diff --git a/sources/engine/Xenko.Engine/Engine/Network/RouterClient.cs b/sources/engine/Xenko.Engine/Engine/Network/RouterClient.cs
deleted file mode 100644
index b790463945..0000000000
--- a/sources/engine/Xenko.Engine/Engine/Network/RouterClient.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using Xenko.Core;
-using Xenko.Core.Diagnostics;
-
-namespace Xenko.Engine.Network
-{
-    public class RouterClient
-    {
-        public static readonly Logger Log = GlobalLogger.GetLogger("RouterClient");
-
-        /// <summary>
-        /// The default port to connect to router server.
-        /// </summary>
-        public static readonly int DefaultPort = 31254;
-
-        /// <summary>
-        /// The default port to listen for connection from router.
-        /// </summary>
-        public static readonly int DefaultListenPort = 31255;
-
-        /// <summary>
-        /// Starts a service.
-        /// </summary>
-        /// <returns></returns>
-        /// <exception cref="System.NotImplementedException"></exception>
-        public static void RegisterService()
-        {
-            // It will need the control connection (if not started yet)
-            // Control connection will be able to list this service as available, and start an instance of it when requested
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Requests a specific server.
-        /// </summary>
-        /// <returns></returns>
-        public static async Task<SimpleSocket> RequestServer(string serverUrl, CancellationToken cancellationToken = default(CancellationToken))
-        {
-            var socketContext = await InitiateConnectionToRouter().ConfigureAwait(false);
-
-            using (cancellationToken.Register(() => socketContext.Dispose()))
-            {
-                await socketContext.WriteStream.WriteInt16Async((short)ClientRouterMessage.RequestServer).ConfigureAwait(false);
-                await socketContext.WriteStream.WriteStringAsync(serverUrl).ConfigureAwait(false);
-                await socketContext.WriteStream.FlushAsync().ConfigureAwait(false);
-
-                var result = (ClientRouterMessage)await socketContext.ReadStream.ReadInt16Async().ConfigureAwait(false);
-                if (result != ClientRouterMessage.ServerStarted)
-                {
-                    throw new SimpleSocketException("Could not connect to server");
-                }
-
-                var errorCode = await socketContext.ReadStream.ReadInt32Async().ConfigureAwait(false);
-                if (errorCode != 0)
-                {
-                    var errorMessage = await socketContext.ReadStream.ReadStringAsync().ConfigureAwait(false);
-                    throw new SimpleSocketException(errorMessage);
-                }
-            }
-
-            return socketContext;
-        }
-
-        /// <summary>
-        /// Initiates a connection to the router.
-        /// </summary>
-        /// <returns></returns>
-        private static async Task<SimpleSocket> InitiateConnectionToRouter()
-        {
-            // Let's make sure this run in a different thread (in case some operation are blocking)
-            var socketContextTCS = new TaskCompletionSource<SimpleSocket>();
-            var socketContext = new SimpleSocket();
-            socketContext.Connected = context =>
-            {
-                socketContextTCS.TrySetResult(context);
-            };
-
-            try
-            {
-                var serverAddress = Environment.GetEnvironmentVariable("XenkoConnectionRouterRemoteIP") ?? "127.0.0.1";
-
-                // If connecting as a client, try once, otherwise try to listen multiple time (in case port is shared)
-                switch (ConnectionMode)
-                {
-                    case RouterConnectionMode.Connect:
-                        socketContext.StartClient(serverAddress, DefaultPort);
-                        break;
-                    case RouterConnectionMode.Listen:
-                        socketContext.StartServer(DefaultListenPort, true, 10);
-                        break;
-                    case RouterConnectionMode.ConnectThenListen:
-                        bool clientException = false;
-                        try
-                        {
-                            socketContext.StartClient(serverAddress, DefaultPort);
-                        }
-                        catch (Exception) // Ideally we should filter SocketException, but not available on some platforms (maybe it should be wrapped in a type available on all paltforms?)
-                        {
-                            clientException = true;
-                        }
-                        if (clientException)
-                        {
-                            socketContext.StartServer(DefaultListenPort, true, 10);
-                        }
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-
-                // Connection should happen within 10 seconds, otherwise consider there is no connection router trying to connect back to us
-                if (await Task.WhenAny(socketContextTCS.Task, Task.Delay(TimeSpan.FromSeconds(10))).ConfigureAwait(false) != socketContextTCS.Task)
-                {
-                    throw new SimpleSocketException("Connection router did not connect back to our listen socket");
-                }
-
-                return await socketContextTCS.Task;
-            }
-            catch (Exception e)
-            {
-                Log.Error($"Could not connect to connection router using mode {ConnectionMode}", e);
-                throw;
-            }
-        }
-
-        private static void StartControlConnection()
-        {
-            // Start control connection
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this platform initiates connections by listening on a port and wait for router (true) or connecting to router (false).
-        /// </summary>
-        private static RouterConnectionMode ConnectionMode
-        {
-            get
-            {
-                switch (Platform.Type)
-                {
-                    case PlatformType.UWP:
-                        return RouterConnectionMode.ConnectThenListen;
-                    case PlatformType.Android:
-                    case PlatformType.iOS:
-                        return RouterConnectionMode.Listen;
-                    default:
-                        return RouterConnectionMode.Connect;
-                }
-            }
-        }
-
-        private enum RouterConnectionMode
-        {
-            /// <summary>
-            /// Tries to connect to the router.
-            /// </summary>
-            Connect = 1,
-
-            /// <summary>
-            /// Tries to listen from a router connection.
-            /// </summary>
-            Listen = 2,
-
-            /// <summary>
-            /// First, tries to connect, and if not possible, listen for a router connection.
-            /// This is useful for platform where we can't be sure (no way to determine if emulator and/or run in desktop or remotely, such as UWP).
-            /// </summary>
-            ConnectThenListen = 3,
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Engine/Prefab.cs b/sources/engine/Xenko.Engine/Engine/Prefab.cs
index 776607cbc8..9d2c57f077 100644
--- a/sources/engine/Xenko.Engine/Engine/Prefab.cs
+++ b/sources/engine/Xenko.Engine/Engine/Prefab.cs
@@ -4,9 +4,11 @@
 using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
 using Xenko.Core.Serialization;
 using Xenko.Core.Serialization.Contents;
 using Xenko.Engine.Design;
+using Xenko.Rendering;
 
 namespace Xenko.Engine
 {
@@ -29,8 +31,120 @@ public sealed class Prefab
         /// <returns>A collection of entities extracted from the prefab</returns>
         public List<Entity> Instantiate()
         {
-            var newPrefab = EntityCloner.Clone(this);
-            return newPrefab.Entities;
+            if (packed == null)
+            {
+                var newPrefab = EntityCloner.Clone(this);
+                return newPrefab.Entities;
+            }
+            else
+            {
+                return new List<Entity>() { EntityCloner.Clone(packed) };
+            }
+        }
+
+        private Entity packed;
+
+        public Prefab() { }
+
+        /// <summary>
+        /// Make Prefab at runtime
+        /// </summary>
+        /// <param name="e"></param>
+        public Prefab(Entity e)
+        {
+            Entities.Add(e);
+            packed = e;
+        }
+
+        /// <summary>
+        /// Shortcut for making an easy prefab from a model
+        /// </summary>
+        public Prefab(Model m, string name = null, Vector3? scale = null, Vector3? position = null)
+        {
+            packed = new Entity(name);
+            packed.GetOrCreate<ModelComponent>().Model = m;
+            packed.Transform.Scale = scale ?? Vector3.One;
+            packed.Transform.Position = position ?? Vector3.Zero;
+            Entities.Add(packed);
+        }
+
+        /// <summary>
+        /// Creates a prefab from a list of models
+        /// </summary>
+        public Prefab(List<Model> m, string name = null, Vector3? scale = null, Vector3? position = null)
+        {
+            for (int i=0; i<m.Count; i++)
+            {
+                Entity e = new Entity(name);
+                e.GetOrCreate<ModelComponent>().Model = m[i];
+                e.Transform.Scale = scale ?? Vector3.One;
+                e.Transform.Position = position ?? Vector3.Zero;
+                Entities.Add(e);
+            }
+        }
+
+        /// <summary>
+        /// Shortcut for making an easy prefab from a mesh
+        /// </summary>
+        public Prefab(Mesh m, Material mat = null, string name = null, Vector3? scale = null, Vector3? position = null)
+        {
+            packed = new Entity(name);
+            Model model = new Model();
+            model.Add(m);
+            model.Add(mat);
+            packed.GetOrCreate<ModelComponent>().Model = model;
+            packed.Transform.Scale = scale ?? Vector3.One;
+            packed.Transform.Position = position ?? Vector3.Zero;
+            Entities.Add(packed);
+        }
+
+        /// <summary>
+        /// Make Prefab at runtime
+        /// </summary>
+        /// <param name="e"></param>
+        public Prefab(List<Entity> e)
+        {
+            Entities.AddRange(e);
+        }
+
+        /// <summary>
+        /// Batches this prefab into a single model
+        /// </summary>
+        public void Optimize()
+        {
+            ModelBatcher.BatchChildren(PackToEntity());
+        }
+
+        /// <summary>
+        /// Converts a Prefab into a single Entity that has all entities as children. Makes it easier to use with an EntityPool
+        /// </summary>
+        /// <param name="p"></param>
+        /// <returns></returns>
+        public Entity PackToEntity() {
+            if (packed == null) {
+                List<Entity> roots = new List<Entity>();
+                for (int i = 0; i < Entities.Count; i++) {
+                    if (Entities[i].Transform.Parent == null)
+                        roots.Add(Entities[i]);
+                }
+                if (roots.Count == 1) {
+                    packed = roots[0];
+                } else {
+                    packed = new Entity();
+                    for (int i = 0; i < roots.Count; i++) {
+                        roots[i].Transform.Parent = packed.Transform;
+                    }
+                }
+            }
+            return packed;
+        }
+
+        /// <summary>
+        /// Shortcut to spawning prefab from a pool
+        /// </summary>
+        public Entity InstantiateFromPool(Vector3? position = null, Quaternion? rotation = null)
+        {
+            return EntityPool.Spawn(PackToEntity(), position, rotation);
         }
     }
 }
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/BackgroundComponentProcessor.cs b/sources/engine/Xenko.Engine/Engine/Processors/BackgroundComponentProcessor.cs
index deb102b2e3..4f1e2f8cb0 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/BackgroundComponentProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/BackgroundComponentProcessor.cs
@@ -25,9 +25,9 @@ public BackgroundComponentProcessor()
         public override void Draw(RenderContext gameTime)
         {
             Backgrounds.Clear();
-            foreach (var backgroundKeyPair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var background = backgroundKeyPair.Key;
+                var background = ComponentDataKeys[i];
                 if (background.Enabled)
                 {
                     Backgrounds.Add(background);
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/CameraProcessor.cs b/sources/engine/Xenko.Engine/Engine/Processors/CameraProcessor.cs
index 2435315136..6805fd043f 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/CameraProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/CameraProcessor.cs
@@ -27,7 +27,7 @@ public CameraProcessor()
 
         public override void Draw(RenderContext context)
         {
-            var graphicsCompositor = Services.GetService<SceneSystem>()?.GraphicsCompositor;
+            var graphicsCompositor = context.Tags.Get(SceneSystem.Current)?.GraphicsCompositor;
 
             // Monitor changes in the camera slots of the current compositor
             if (graphicsCompositor != currentCompositor)
@@ -47,6 +47,7 @@ public override void Draw(RenderContext context)
             // The compositor, or at least the list of slots, has changed. Let's detach everything
             if (cameraSlotsDirty)
             {
+                cameraSlotsDirty = false;
                 if (currentCompositor != null)
                 {
                     // If we have a current compositor, let's clear all camera that are attached to it.
@@ -61,9 +62,9 @@ public override void Draw(RenderContext context)
                     }
                 }
                 // Let's also check on all cameras if they are still attached to a compositor, then let's detach them.
-                foreach (var matchingCamera in ComponentDatas)
+                for (int i=0; i<ComponentDataValues.Count; i++)
                 {
-                    var camera = matchingCamera.Value;
+                    var camera = ComponentDataValues[i];
                     if (camera.Slot.AttachedCompositor != null)
                     {
                         DetachCameraFromSlot(camera);
@@ -72,9 +73,9 @@ public override void Draw(RenderContext context)
             }
 
             // First pass, handle proper detach when Enabled changed
-            foreach (var matchingCamera in ComponentDatas)
+            for (int i = 0; i < ComponentDataValues.Count; i++)
             {
-                var camera = matchingCamera.Value;
+                var camera = ComponentDataValues[i];
                 if (graphicsCompositor != null)
                 {
                     if (camera.Enabled && camera.Slot.AttachedCompositor == null)
@@ -92,16 +93,16 @@ public override void Draw(RenderContext context)
             }
 
             // Second pass, handle proper attach
-            foreach (var matchingCamera in ComponentDatas)
+            for (int i = 0; i < ComponentDataValues.Count; i++)
             {
-                var camera = matchingCamera.Value;
+                var camera = ComponentDataValues[i];
 
                 if (graphicsCompositor != null)
                 {
                     if (camera.Enabled && camera.Slot.AttachedCompositor == null)
                     {
                         // Attach to the new slot
-                        AttachCameraToSlot(camera);
+                        AttachCameraToSlot(graphicsCompositor, camera);
                     }
                 }
 
@@ -125,26 +126,22 @@ private void OnCameraSlotsChanged(object sender, ref FastTrackingCollectionChang
             cameraSlotsDirty = true;
         }
 
-        private void AttachCameraToSlot(CameraComponent camera)
+        private void AttachCameraToSlot(GraphicsCompositor graphicsCompositor, CameraComponent camera)
         {
             if (!camera.Enabled) throw new InvalidOperationException($"The camera [{camera.Entity.Name}] is disabled and can't be attached");
             if (camera.Slot.AttachedCompositor != null) throw new InvalidOperationException($"The camera [{camera.Entity.Name}] is already attached");
 
-            var graphicsCompositor = Services.GetService<SceneSystem>()?.GraphicsCompositor;
-            if (graphicsCompositor != null)
+            for (var i = 0; i < graphicsCompositor.Cameras.Count; ++i)
             {
-                for (var i = 0; i < graphicsCompositor.Cameras.Count; ++i)
+                var slot = graphicsCompositor.Cameras[i];
+                if (slot.Id == camera.Slot.Id)
                 {
-                    var slot = graphicsCompositor.Cameras[i];
-                    if (slot.Id == camera.Slot.Id)
-                    {
-                        if (slot.Camera != null)
-                            throw new InvalidOperationException($"Unable to attach camera [{camera.Entity.Name}] to the graphics compositor. Another camera, [{slot.Camera.Entity.Name}], is enabled and already attached to this slot.");
+                    if (slot.Camera != null)
+                        throw new InvalidOperationException($"Unable to attach camera [{camera.Entity.Name}] to the graphics compositor. Another camera, [{slot.Camera.Entity.Name}], is enabled and already attached to this slot.");
 
-                        slot.Camera = camera;
-                        camera.Slot.AttachedCompositor = graphicsCompositor;
-                        break;
-                    }
+                    slot.Camera = camera;
+                    camera.Slot.AttachedCompositor = graphicsCompositor;
+                    break;
                 }
             }
         }
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/LightShaftBoundingVolumeProcessor.cs b/sources/engine/Xenko.Engine/Engine/Processors/LightShaftBoundingVolumeProcessor.cs
index b31793dd09..837e2c6129 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/LightShaftBoundingVolumeProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/LightShaftBoundingVolumeProcessor.cs
@@ -74,12 +74,13 @@ private void RegenerateVolumesPerLightShaft()
                 }
             }
 
-            foreach (var pair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                if (!pair.Key.Enabled)
+                var pairKey = ComponentDataKeys[i];
+                if (!pairKey.Enabled)
                     continue;
 
-                var lightShaft = pair.Key.LightShaft;
+                var lightShaft = pairKey.LightShaft;
                 if (lightShaft == null)
                     continue;
 
@@ -89,8 +90,8 @@ private void RegenerateVolumesPerLightShaft()
 
                 data.Add(new RenderLightShaftBoundingVolume
                 {
-                    World = pair.Key.Entity.Transform.WorldMatrix,
-                    Model = pair.Key.Model,
+                    World = pairKey.Entity.Transform.WorldMatrix,
+                    Model = pairKey.Model,
                 });
             }
 
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/LightShaftProcessor.cs b/sources/engine/Xenko.Engine/Engine/Processors/LightShaftProcessor.cs
index d57c5c972f..053db4f5fa 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/LightShaftProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/LightShaftProcessor.cs
@@ -63,12 +63,14 @@ public override void Update(GameTime time)
             if (lightShaftBoundingVolumeProcessor == null)
                 return;
 
-            foreach (var pair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                if (!pair.Key.Enabled)
+
+
+                if (!ComponentDataKeys[i].Enabled)
                     continue;
 
-                var lightShaft = pair.Value;
+                var lightShaft = ComponentDataValues[i];
                 if (lightShaft.LightComponent == null)
                     continue;
 
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/ModelNodeLinkProcessor.cs b/sources/engine/Xenko.Engine/Engine/Processors/ModelNodeLinkProcessor.cs
index 1fbe298947..185bf4c94c 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/ModelNodeLinkProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/ModelNodeLinkProcessor.cs
@@ -8,7 +8,7 @@ namespace Xenko.Engine.Processors
 {
     public class ModelNodeLinkProcessor : EntityProcessor<ModelNodeLinkComponent>
     {
-        public Dictionary<ModelNodeLinkComponent, ModelNodeLinkComponent>.KeyCollection ModelNodeLinkComponents => ComponentDatas.Keys;
+        public List<ModelNodeLinkComponent> ModelNodeLinkComponents => ComponentDataKeys;
 
         public ModelNodeLinkProcessor()
             : base(typeof(TransformComponent))
@@ -35,14 +35,14 @@ protected override void OnEntityComponentRemoved(Entity entity, ModelNodeLinkCom
 
         public override void Draw(RenderContext context)
         {
-            foreach (var item in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var entity = item.Key.Entity;
+                var entity = ComponentDataKeys[i].Entity;
                 var transformComponent = entity.Transform;
 
-                if (item.Value.IsValid)
+                if (ComponentDataValues[i].IsValid)
                 {
-                    var modelNodeLink = item.Value;
+                    var modelNodeLink = ComponentDataValues[i];
                     var transformLink = transformComponent.TransformLink as ModelNodeTransformLink;
 
                     // Try to use Target, otherwise Parent
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/ScriptSystem.cs b/sources/engine/Xenko.Engine/Engine/Processors/ScriptSystem.cs
index 9dcbd92e51..3612b19739 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/ScriptSystem.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/ScriptSystem.cs
@@ -85,7 +85,7 @@ public override void Update(GameTime gameTime)
                     var asyncScript = script as AsyncScript;
                     if (asyncScript != null)
                     {
-                        asyncScript.MicroThread = AddTask(asyncScript.Execute, asyncScript.Priority & UpdateBit);
+                        asyncScript.MicroThread = AddTask(asyncScript.Execute, asyncScript.Priority | UpdateBit);
                         asyncScript.MicroThread.ProfilingKey = asyncScript.ProfilingKey;
                     }
                 }
diff --git a/sources/engine/Xenko.Engine/Engine/Processors/TransformProcessor.cs b/sources/engine/Xenko.Engine/Engine/Processors/TransformProcessor.cs
index 3dfef36795..aefad4b2b2 100644
--- a/sources/engine/Xenko.Engine/Engine/Processors/TransformProcessor.cs
+++ b/sources/engine/Xenko.Engine/Engine/Processors/TransformProcessor.cs
@@ -19,7 +19,7 @@ public class TransformProcessor : EntityProcessor<TransformComponent>
         /// <summary>
         /// List of root entities <see cref="TransformComponent"/> of every <see cref="Entity"/> in <see cref="EntityManager"/>.
         /// </summary>
-        internal readonly HashSet<TransformComponent> TransformationRoots = new HashSet<TransformComponent>();
+        internal readonly static HashSet<TransformComponent> TransformationRoots = new HashSet<TransformComponent>();
 
         /// <summary>
         /// The list of the components that are not special roots.
@@ -64,7 +64,10 @@ protected override void OnEntityComponentAdding(Entity entity, TransformComponen
         {
             if (component.Parent == null)
             {
-                TransformationRoots.Add(component);
+                lock (TransformationRoots)
+                {
+                    TransformationRoots.Add(component);
+                }
             }
 
             foreach (var child in data.Children)
@@ -89,7 +92,10 @@ protected override void OnEntityComponentRemoved(Entity entity, TransformCompone
 
             if (component.Parent == null)
             {
-                TransformationRoots.Remove(component);
+                lock (TransformationRoots)
+                {
+                    TransformationRoots.Remove(component);
+                }
             }
         }
 
@@ -101,9 +107,9 @@ internal void UpdateTransformations(FastCollection<TransformComponent> transform
             if (ModelNodeLinkProcessor != null)
             {
                 modelNodeLinkComponents.Clear();
-                foreach (var modelNodeLink in ModelNodeLinkProcessor.ModelNodeLinkComponents)
+                for (int i=0; i<ModelNodeLinkProcessor.ModelNodeLinkComponents.Count; i++)
                 {
-                    modelNodeLinkComponents.Add(modelNodeLink.Entity.Transform);
+                    modelNodeLinkComponents.Add(ModelNodeLinkProcessor.ModelNodeLinkComponents[i].Entity.Transform);
                 }
                 Dispatcher.ForEach(modelNodeLinkComponents, UpdateTransformationAndChildren);
             }
@@ -111,7 +117,30 @@ internal void UpdateTransformations(FastCollection<TransformComponent> transform
 
         private static void UpdateTransformationAndChildren(TransformComponent transformation)
         {
-            UpdateTransformation(transformation);
+            // if we are an immobile transform, skip doing math/recusion on this
+            switch (transformation.Immobile)
+            {
+                case IMMOBILITY.EverythingImmobile:
+                    if (transformation.UpdateImmobilePosition == false)
+                        return;
+
+                    transformation.UpdateImmobilePosition = false;
+                    transformation.UpdateLocalMatrix();
+                    transformation.UpdateWorldMatrixInternal(false);
+                    break;
+                case IMMOBILITY.JustMeImmobile:
+                    if (transformation.UpdateImmobilePosition)
+                    {
+                        transformation.UpdateImmobilePosition = false;
+                        transformation.UpdateLocalMatrix();
+                        transformation.UpdateWorldMatrixInternal(false);
+                    }
+                    break;
+                case IMMOBILITY.FullMotion:
+                    transformation.UpdateLocalMatrix();
+                    transformation.UpdateWorldMatrixInternal(false);
+                    break;
+            }
 
             // Recurse
             if (transformation.Children.Count > 0)
@@ -120,9 +149,12 @@ private static void UpdateTransformationAndChildren(TransformComponent transform
 
         private static void UpdateTransformationsRecursive(FastCollection<TransformComponent> transformationComponents)
         {
-            foreach (var transformation in transformationComponents)
+            for (int i=0; i<transformationComponents.Count; i++)
             {
-                UpdateTransformation(transformation);
+                TransformComponent transformation = transformationComponents[i];
+
+                transformation.UpdateLocalMatrix();
+                transformation.UpdateWorldMatrixInternal(false);
 
                 // Recurse
                 if (transformation.Children.Count > 0)
@@ -130,13 +162,6 @@ private static void UpdateTransformationsRecursive(FastCollection<TransformCompo
             }
         }
 
-        private static void UpdateTransformation(TransformComponent transform)
-        {
-            // Update transform
-            transform.UpdateLocalMatrix();
-            transform.UpdateWorldMatrixInternal(false);
-        }
-
         /// <summary>
         /// Updates all the <see cref="TransformComponent.WorldMatrix"/>.
         /// </summary>
@@ -144,8 +169,15 @@ private static void UpdateTransformation(TransformComponent transform)
         public override void Draw(RenderContext context)
         {
             notSpecialRootComponents.Clear();
-            foreach (var t in TransformationRoots)
-                notSpecialRootComponents.Add(t);
+            
+            lock (TransformationRoots)
+            {
+                foreach (var t in TransformationRoots)
+                {
+                    if (t.UpdateImmobilePosition || t.Immobile != IMMOBILITY.EverythingImmobile)
+                        notSpecialRootComponents.Add(t);
+                }
+            }
 
             // Update scene transforms
             // TODO: Entity processors should not be aware of scenes
@@ -177,13 +209,16 @@ internal void NotifyChildrenCollectionChanged(TransformComponent transformCompon
                 // Still need to update transformation roots
                 if (transformComponent.Parent == null)
                 {
-                    if(added)
-                    {
-                        TransformationRoots.Add(transformComponent);
-                    }
-                    else
+                    lock (TransformationRoots)
                     {
-                        TransformationRoots.Remove(transformComponent);
+                        if (added)
+                        {
+                            TransformationRoots.Add(transformComponent);
+                        }
+                        else
+                        {
+                            TransformationRoots.Remove(transformComponent);
+                        }
                     }
                 }
             }
diff --git a/sources/engine/Xenko.Engine/Engine/Scene.cs b/sources/engine/Xenko.Engine/Engine/Scene.cs
index 8a051346c1..4d02f0b9f5 100644
--- a/sources/engine/Xenko.Engine/Engine/Scene.cs
+++ b/sources/engine/Xenko.Engine/Engine/Scene.cs
@@ -2,7 +2,6 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
-using System.Collections.Specialized;
 using Xenko.Core;
 using Xenko.Core.Annotations;
 using Xenko.Core.Collections;
@@ -28,11 +27,9 @@ public sealed class Scene : ComponentBase, IIdentifiable
         public Scene()
         {
             Id = Guid.NewGuid();
-            Entities = new TrackingCollection<Entity>();
-            Entities.CollectionChanged += Entities_CollectionChanged;
+            Entities = new EntityCollection(this);
 
-            Children = new TrackingCollection<Scene>();
-            Children.CollectionChanged += Children_CollectionChanged;
+            Children = new SceneCollection(this);
         }
 
         [DataMember(-10)]
@@ -112,67 +109,67 @@ public override string ToString()
             return $"Scene {Name}";
         }
 
-        private void Children_CollectionChanged(object sender, TrackingCollectionChangedEventArgs e)
+        [DataContract]
+        public class EntityCollection : TrackingCollection<Entity>
         {
-            switch (e.Action)
+            Scene scene;
+
+            public EntityCollection(Scene sceneParam)
             {
-                case NotifyCollectionChangedAction.Add:
-                    AddItem((Scene)e.Item);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    RemoveItem((Scene)e.Item);
-                    break;
-                default:
-                    throw new NotSupportedException();
+                scene = sceneParam;
             }
-        }
 
-        private void AddItem(Scene item)
-        {
-            if (item.Parent != null)
-                throw new InvalidOperationException("This scene already has a Parent. Detach it first.");
+            /// <inheritdoc/>
+            protected override void InsertItem(int index, Entity item)
+            {
+                // broken item or already in scene
+                if (item == null || item.Scene == scene) return;
 
-            item.parent = this;
-        }
+                item.SceneValue = scene;
+                base.InsertItem(index, item);
+            }
 
-        private void RemoveItem(Scene item)
-        {
-            if (item.Parent != this)
-                throw new InvalidOperationException("This scene's parent is not the expected value.");
+            /// <inheritdoc/>
+            protected override void RemoveItem(int index)
+            {
+                var item = this[index];
+                if (item.SceneValue != scene) return;
 
-            item.parent = null;
+                item.SceneValue = null;
+                base.RemoveItem(index);
+            }
         }
 
-        private void Entities_CollectionChanged(object sender, TrackingCollectionChangedEventArgs e)
+        [DataContract]
+        public class SceneCollection : TrackingCollection<Scene>
         {
-            switch (e.Action)
+            Scene scene;
+
+            public SceneCollection(Scene sceneParam)
             {
-                case NotifyCollectionChangedAction.Add:
-                    AddItem((Entity)e.Item);
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    RemoveItem((Entity)e.Item);
-                    break;
-                default:
-                    throw new NotSupportedException();
+                scene = sceneParam;
             }
-        }
 
-        private void AddItem(Entity item)
-        {
-            // Root entity in another scene, or child of another entity
-            if (item.Scene != null)
-                throw new InvalidOperationException("This entity already has a scene. Detach it first.");
+            /// <inheritdoc/>
+            protected override void InsertItem(int index, Scene item)
+            {
+                if (item.Parent != null)
+                    throw new InvalidOperationException("This scene already has a Parent. Detach it first.");
 
-            item.SceneValue = this;
-        }
+                item.parent = scene;
+                base.InsertItem(index, item);
+            }
 
-        private void RemoveItem(Entity item)
-        {
-            if (item.SceneValue != this)
-                throw new InvalidOperationException("This entity's scene is not the expected value.");
+            /// <inheritdoc/>
+            protected override void RemoveItem(int index)
+            {
+                var item = this[index];
+                if (item.Parent != scene)
+                    throw new InvalidOperationException("This scene's parent is not the expected value.");
 
-            item.SceneValue = null;
+                item.parent = null;
+                base.RemoveItem(index);
+            }
         }
     }
 }
diff --git a/sources/engine/Xenko.Engine/Engine/SceneInstance.cs b/sources/engine/Xenko.Engine/Engine/SceneInstance.cs
index 23d9c89442..27a3104844 100644
--- a/sources/engine/Xenko.Engine/Engine/SceneInstance.cs
+++ b/sources/engine/Xenko.Engine/Engine/SceneInstance.cs
@@ -56,6 +56,11 @@ public SceneInstance(IServiceRegistry registry) : this(registry, null)
         {
         }
 
+        /// <summary>
+        /// Entities in this list will persist across root scene changes, IF the entity was attached in the previous scene.
+        /// </summary>
+        public static readonly HashSet<Entity> PersistentEntities = new HashSet<Entity>();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SceneInstance" /> class.
         /// </summary>
@@ -97,6 +102,11 @@ public Scene RootScene
                 if (value != null)
                 {
                     Add(value);
+
+                    // return any persistent entities
+                    foreach (Entity e in PersistentEntities)
+                        e.Scene = value;
+
                     HandleRendererTypes();
                 }
 
@@ -131,12 +141,67 @@ public static SceneInstance GetCurrent(RenderContext context)
 
         private void Add(Scene scene)
         {
-            foreach (var entity in scene.Entities)
-                Add(entity);
+            if (scene.Entities.Count > 0)
+            {
+                var entitiesToAdd = new FastList<Entity>();
+                // Reverse order, we're adding and removing from the tail to 
+                // avoid forcing the list to move all items when removing at [0]
+                for (int i = scene.Entities.Count -1; i >= 0; i-- )
+                    entitiesToAdd.Add(scene.Entities[i]);
+
+                scene.Entities.CollectionChanged += DealWithTempChanges;
+                while (entitiesToAdd.Count > 0)
+                {
+                    int i = entitiesToAdd.Count - 1;
+                    var entity = entitiesToAdd[i];
+                    entitiesToAdd.RemoveAt(i);
+                    Add(entity);
+                }
+                scene.Entities.CollectionChanged -= DealWithTempChanges;
+
+                void DealWithTempChanges(object sender, TrackingCollectionChangedEventArgs e)
+                {
+                    Entity entity = (Entity)e.Item;
+                    if (e.Action == NotifyCollectionChangedAction.Remove)
+                    {
+                        if (entitiesToAdd.Remove(entity) == false)
+                            Remove(entity);
+                    }
+                    else if (e.Action == NotifyCollectionChangedAction.Add)
+                        entitiesToAdd.Add(entity);
+                }
+            }
 
-            // Listen to future changes in Scene.Entities
-            foreach (var childScene in scene.Children)
-                Add(childScene);
+            if (scene.Children.Count > 0)
+            {
+                var scenesToAdd = new FastList<Scene>();
+                // Reverse order, we're adding and removing from the tail to 
+                // avoid forcing the list to move all items when removing at [0]
+                for (int i = scene.Children.Count - 1; i >= 0; i--)
+                    scenesToAdd.Add(scene.Children[i]);
+
+                scene.Children.CollectionChanged += DealWithTempChanges;
+                while (scenesToAdd.Count > 0)
+                {
+                    int i = scenesToAdd.Count - 1;
+                    var entity = scenesToAdd[i];
+                    scenesToAdd.RemoveAt(i);
+                    Add(entity);
+                }
+                scene.Children.CollectionChanged -= DealWithTempChanges;
+
+                void DealWithTempChanges(object sender, TrackingCollectionChangedEventArgs e)
+                {
+                    Scene subScene = (Scene)e.Item;
+                    if (e.Action == NotifyCollectionChangedAction.Remove)
+                    {
+                        if (scenesToAdd.Remove(subScene) == false)
+                            Remove(subScene);
+                    }
+                    else if (e.Action == NotifyCollectionChangedAction.Add)
+                        scenesToAdd.Add(subScene);
+                }
+            }
 
             // Listen to future changes in entities and child scenes
             scene.Children.CollectionChanged += Children_CollectionChanged;
@@ -148,11 +213,24 @@ private void Remove(Scene scene)
             scene.Entities.CollectionChanged -= Entities_CollectionChanged;
             scene.Children.CollectionChanged -= Children_CollectionChanged;
 
-            foreach (var childScene in scene.Children)
-                Remove(childScene);
+            if (scene.Children.Count > 0)
+            {
+                var scenesToRemove = new Scene[scene.Children.Count];
+                scene.Children.CopyTo(scenesToRemove, 0);
+                foreach (var childScene in scenesToRemove)
+                    Remove(childScene);
+            }
+
+            if (scene.Entities.Count > 0)
+            {
+                var entitiesToRemove = new Entity[scene.Entities.Count];
+                scene.Entities.CopyTo(entitiesToRemove, 0);
+                foreach (var entity in entitiesToRemove)
+                    Remove(entity);
+            }
 
-            foreach (var entity in scene.Entities)
-                Remove(entity);
+            // clear flag, just incase we used it
+            SceneSystem.DoNotDisposeOnNextRemoval = false;
         }
 
         private void Entities_CollectionChanged(object sender, TrackingCollectionChangedEventArgs e)
diff --git a/sources/engine/Xenko.Engine/Engine/SceneSystem.cs b/sources/engine/Xenko.Engine/Engine/SceneSystem.cs
index 1df96d5b6e..dd68652f2c 100644
--- a/sources/engine/Xenko.Engine/Engine/SceneSystem.cs
+++ b/sources/engine/Xenko.Engine/Engine/SceneSystem.cs
@@ -11,6 +11,7 @@
 using Xenko.Graphics;
 using Xenko.Rendering;
 using Xenko.Rendering.Compositing;
+using System.Runtime.InteropServices;
 
 namespace Xenko.Engine
 {
@@ -27,6 +28,12 @@ public class SceneSystem : GameSystemBase
         private int previousWidth;
         private int previousHeight;
 
+        /// <summary>
+        /// Property key to access the current collection of <see cref="CameraComponent"/> from <see cref="RenderContext.Tags"/>.
+        /// </summary>
+        public static readonly PropertyKey<SceneSystem> Current = new PropertyKey<SceneSystem>("SceneSystem.Current", typeof(SceneSystem));
+
+
         /// <summary>
         /// Initializes a new instance of the <see cref="GameSystemBase" /> class.
         /// </summary>
@@ -77,8 +84,30 @@ public SceneSystem(IServiceRegistry registry)
         /// </summary>
         public bool SplashScreenEnabled { get; set; }
 
+        /// <summary>
+        /// If you are detaching things with the intention of bringing them back, use this global flag during the detach.
+        /// </summary>
+        [DataMemberIgnore]
+        public static bool DoNotDisposeOnNextRemoval
+        {
+            get
+            {
+                return doNotDisposeNextRemoval;
+            }
+            set
+            {
+                doNotDisposeNextRemoval = value;
+                if (value) physicsDoNotDisposeNextRemoval = true;
+            }
+        }
+        internal static bool physicsDoNotDisposeNextRemoval;
+        private static bool doNotDisposeNextRemoval;
+
         public GraphicsCompositor GraphicsCompositor { get; set; }
 
+        // custom fov settings
+        public static float OverrideFOV = -1;
+
         private Task<Scene> sceneTask;
         private Task<GraphicsCompositor> compositorTask;
 
@@ -189,110 +218,113 @@ private void RenderSplashScreen(Color4 color, BlendStateDescription blendState)
 
         public override void Draw(GameTime gameTime)
         {
-            // Reset the context
-            renderContext.Reset();
+            using (renderDrawContext.RenderContext.PushTagAndRestore(Current, this))
+            {
+                // Reset the context
+                renderContext.Reset();
 
-            var renderTarget = renderDrawContext.CommandList.RenderTarget;
+                var renderTarget = renderDrawContext.CommandList.RenderTarget;
 
-            // If the width or height changed, we have to recycle all temporary allocated resources.
-            // NOTE: We assume that they are mostly resolution dependent.
-            if (previousWidth != renderTarget.ViewWidth || previousHeight != renderTarget.ViewHeight)
-            {
-                // Force a recycle of all allocated temporary textures
-                renderContext.Allocator.Recycle(link => true);
-            }
+                // If the width or height changed, we have to recycle all temporary allocated resources.
+                // NOTE: We assume that they are mostly resolution dependent.
+                if (previousWidth != renderTarget.ViewWidth || previousHeight != renderTarget.ViewHeight)
+                {
+                    // Force a recycle of all allocated temporary textures
+                    renderContext.Allocator.Recycle(link => true);
+                }
 
-            previousWidth = renderTarget.ViewWidth;
-            previousHeight = renderTarget.ViewHeight;
+                previousWidth = renderTarget.ViewWidth;
+                previousHeight = renderTarget.ViewHeight;
 
-            // Update the entities at draw time.
-            renderContext.Time = gameTime;
+                // Update the entities at draw time.
+                renderContext.Time = gameTime;
 
-            // Execute Draw step of SceneInstance
-            // This will run entity processors
-            SceneInstance?.Draw(renderContext);
+                // Execute Draw step of SceneInstance
+                // This will run entity processors
+                SceneInstance?.Draw(renderContext);
 
-            // Render phase
-            // TODO GRAPHICS REFACTOR
-            //context.GraphicsDevice.Parameters.Set(GlobalKeys.Time, (float)gameTime.Total.TotalSeconds);
-            //context.GraphicsDevice.Parameters.Set(GlobalKeys.TimeStep, (float)gameTime.Elapsed.TotalSeconds);
+                // Render phase
+                // TODO GRAPHICS REFACTOR
+                //context.GraphicsDevice.Parameters.Set(GlobalKeys.Time, (float)gameTime.Total.TotalSeconds);
+                //context.GraphicsDevice.Parameters.Set(GlobalKeys.TimeStep, (float)gameTime.Elapsed.TotalSeconds);
 
-            renderDrawContext.ResourceGroupAllocator.Flush();
-            renderDrawContext.QueryManager.Flush();
+                renderDrawContext.ResourceGroupAllocator.Flush();
+                renderDrawContext.QueryManager.Flush();
 
-            // Push context (pop after using)
-            using (renderDrawContext.RenderContext.PushTagAndRestore(SceneInstance.Current, SceneInstance))
-            {
-                GraphicsCompositor?.Draw(renderDrawContext);
-            }
+                // Push context (pop after using)
+                using (renderDrawContext.RenderContext.PushTagAndRestore(SceneInstance.Current, SceneInstance))
+                {
+                    GraphicsCompositor?.Draw(renderDrawContext);
+                }
 
-            //do this here, make sure GCompositor and Scene are updated/rendered the next frame!
-            if (sceneTask != null && compositorTask != null)
-            {
-                switch (splashScreenState)
+                //do this here, make sure GCompositor and Scene are updated/rendered the next frame!
+                if (sceneTask != null && compositorTask != null)
                 {
-                    case SplashScreenState.Invalid:
-                    {
-                        if (sceneTask.IsCompleted && compositorTask.IsCompleted)
-                        {
-                            SceneInstance = new SceneInstance(Services, sceneTask.Result);
-                            GraphicsCompositor = compositorTask.Result;
-                            sceneTask = null;
-                            compositorTask = null;
-                        }
-                        break;
-                    }
-                    case SplashScreenState.Intro:
-                    {
-                        Game.GraphicsContext.CommandList.Clear(Game.GraphicsContext.CommandList.RenderTarget, SplashScreenColor);
-
-                        if (gameTime.Total.TotalSeconds > SplashScreenFadeTime)
-                        {
-                            splashScreenState = SplashScreenState.FadingIn;
-                            fadeTime = 0.0f;
-                        }
-                        break;
-                    }
-                    case SplashScreenState.FadingIn:
-                    {
-                        var color = Color4.White;
-                        var factor = MathUtil.SmoothStep((float)fadeTime / SplashScreenFadeTime);
-                        color *= factor;
-                        if (factor >= 1.0f)
-                        {
-                            splashScreenState = SplashScreenState.Showing;
-                        }
-
-                        fadeTime += gameTime.Elapsed.TotalSeconds;
-
-                        RenderSplashScreen(color, BlendStates.AlphaBlend);
-                        break;
-                    }
-                    case SplashScreenState.Showing:
-                    {
-                        RenderSplashScreen(Color4.White, BlendStates.Default);
-
-                        if (gameTime.Total.TotalSeconds > MinSplashScreenTime && sceneTask.IsCompleted && compositorTask.IsCompleted)
-                        {
-                            splashScreenState = SplashScreenState.FadingOut;
-                            fadeTime = 0.0f;
-                        }
-                        break;
-                    }
-                    case SplashScreenState.FadingOut:
+                    switch (splashScreenState)
                     {
-                        var color = Color4.White;
-                        var factor = (MathUtil.SmoothStep((float)fadeTime / SplashScreenFadeTime) * -1) + 1;
-                        color *= factor;
-                        if (factor <= 0.0f)
-                        {
-                            splashScreenState = SplashScreenState.Invalid;
-                        }
-
-                        fadeTime += gameTime.Elapsed.TotalSeconds;
-
-                        RenderSplashScreen(color, BlendStates.AlphaBlend);
-                        break;
+                        case SplashScreenState.Invalid:
+                            {
+                                if (sceneTask.IsCompleted && compositorTask.IsCompleted)
+                                {
+                                    SceneInstance = new SceneInstance(Services, sceneTask.Result);
+                                    GraphicsCompositor = compositorTask.Result;
+                                    sceneTask = null;
+                                    compositorTask = null;
+                                }
+                                break;
+                            }
+                        case SplashScreenState.Intro:
+                            {
+                                Game.GraphicsContext.CommandList.Clear(Game.GraphicsContext.CommandList.RenderTarget, SplashScreenColor);
+
+                                if (gameTime.Total.TotalSeconds > SplashScreenFadeTime)
+                                {
+                                    splashScreenState = SplashScreenState.FadingIn;
+                                    fadeTime = 0.0f;
+                                }
+                                break;
+                            }
+                        case SplashScreenState.FadingIn:
+                            {
+                                var color = Color4.White;
+                                var factor = MathUtil.SmoothStep((float)fadeTime / SplashScreenFadeTime);
+                                color *= factor;
+                                if (factor >= 1.0f)
+                                {
+                                    splashScreenState = SplashScreenState.Showing;
+                                }
+
+                                fadeTime += gameTime.Elapsed.TotalSeconds;
+
+                                RenderSplashScreen(color, BlendStates.AlphaBlend);
+                                break;
+                            }
+                        case SplashScreenState.Showing:
+                            {
+                                RenderSplashScreen(Color4.White, BlendStates.Default);
+
+                                if (gameTime.Total.TotalSeconds > MinSplashScreenTime && sceneTask.IsCompleted && compositorTask.IsCompleted)
+                                {
+                                    splashScreenState = SplashScreenState.FadingOut;
+                                    fadeTime = 0.0f;
+                                }
+                                break;
+                            }
+                        case SplashScreenState.FadingOut:
+                            {
+                                var color = Color4.White;
+                                var factor = (MathUtil.SmoothStep((float)fadeTime / SplashScreenFadeTime) * -1) + 1;
+                                color *= factor;
+                                if (factor <= 0.0f)
+                                {
+                                    splashScreenState = SplashScreenState.Invalid;
+                                }
+
+                                fadeTime += gameTime.Elapsed.TotalSeconds;
+
+                                RenderSplashScreen(color, BlendStates.AlphaBlend);
+                                break;
+                            }
                     }
                 }
             }
diff --git a/sources/engine/Xenko.Engine/Engine/ScriptComponent.cs b/sources/engine/Xenko.Engine/Engine/ScriptComponent.cs
index f7ffd9da0d..6610b467f0 100644
--- a/sources/engine/Xenko.Engine/Engine/ScriptComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/ScriptComponent.cs
@@ -8,6 +8,7 @@
 using Xenko.Core;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.Serialization.Contents;
+using Xenko.Engine;
 using Xenko.Engine.Design;
 using Xenko.Engine.Processors;
 using Xenko.Games;
@@ -64,6 +65,7 @@ internal void Initialize(IServiceRegistry registry)
             Audio = Services.GetSafeServiceAs<AudioSystem>();
             SpriteAnimation = Services.GetSafeServiceAs<SpriteAnimationSystem>();
             GameProfiler = Services.GetSafeServiceAs<GameProfilingSystem>();
+            DebugDraw = Services.GetSafeServiceAs<DebugRenderSystem>();
             DebugText = Services.GetSafeServiceAs<DebugTextSystem>();
             Streaming = Services.GetSafeServiceAs<StreamingManager>();
         }
@@ -126,6 +128,9 @@ public ProfilingKey ProfilingKey
         [DataMemberIgnore]
         public DebugTextSystem DebugText { get; private set; }
 
+        [DataMemberIgnore]
+        public DebugRenderSystem DebugDraw { get; private set; }
+
         /// <summary>
         /// Gets the streaming system.
         /// </summary>
diff --git a/sources/engine/Xenko.Engine/Engine/SpriteComponent.cs b/sources/engine/Xenko.Engine/Engine/SpriteComponent.cs
index 3bc6f98f7a..08db39d12b 100644
--- a/sources/engine/Xenko.Engine/Engine/SpriteComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/SpriteComponent.cs
@@ -72,13 +72,12 @@ public sealed class SpriteComponent : ActivableEntityComponent
         public bool PremultipliedAlpha { get; set; }
 
         /// <summary>
-        /// Ignore the depth of other elements of the scene when rendering the sprite by disabling the depth test.
+        /// Set how to read and write to the depth buffer for this sprite.
         /// </summary>
-        /// <userdoc>Ignore the depth of other elements of the scene when rendering the sprite. When checked, the sprite is always put on top of previous elements.</userdoc>
         [DataMember(60)]
-        [DefaultValue(false)]
-        [Display("Ignore Depth")]
-        public bool IgnoreDepth;
+        [DefaultValue(RenderSprite.SpriteDepthMode.ReadWrite)]
+        [Display("Depth Mode")]
+        public RenderSprite.SpriteDepthMode DepthMode;
 
         /// <summary>
         /// Discard pixels with low alpha value when rendering the sprite by performing alpha cut off test.
@@ -128,6 +127,21 @@ public sealed class SpriteComponent : ActivableEntityComponent
         [DefaultValue(RenderGroup.Group0)]
         public RenderGroup RenderGroup { get; set; }
 
+        /// <summary>
+        /// Tweak the sorting distance. Can help with transparent sorting.
+        /// </summary>
+        [DataMember(100)]
+        [Display("Distance Sort Fudge")]
+        [DefaultValue(0f)]
+        public float DistanceSortFudge { get; set; }
+
+        /// <summary>
+        /// Adjust smallness used for automatic culling. Can be useful for long and skinny things (lower number) or things you want to show more (higher number)
+        /// </summary>
+        [DataMember(110)]
+        [DefaultValue(1f)]
+        public float SmallFactorMultiplier { get; set; } = 1f;
+
         [DataMemberIgnore]
         internal double ElapsedTime;
 
diff --git a/sources/engine/Xenko.Engine/Engine/TransformComponent.cs b/sources/engine/Xenko.Engine/Engine/TransformComponent.cs
index bd4908dfb9..b0f23fcc39 100644
--- a/sources/engine/Xenko.Engine/Engine/TransformComponent.cs
+++ b/sources/engine/Xenko.Engine/Engine/TransformComponent.cs
@@ -10,9 +10,24 @@
 using Xenko.Core.Serialization;
 using Xenko.Engine.Design;
 using Xenko.Engine.Processors;
+using Xenko.VirtualReality;
 
 namespace Xenko.Engine
 {
+    public enum IMMOBILITY
+    {
+        FullMotion = 0,
+        EverythingImmobile = 1,
+        JustMeImmobile = 2
+    }
+
+    public enum HIERARCHY_MODE
+    {
+        Normal = 0,
+        IgnoreFinalRotation = 1,
+        IgnoreAllRotation = 2
+    }
+
     /// <summary>
     /// Defines Position, Rotation and Scale of its <see cref="Entity"/>.
     /// </summary>
@@ -81,6 +96,71 @@ public sealed class TransformComponent : EntityComponent //, IEnumerable<Transfo
         [DataMember(30)]
         public Vector3 Scale;
 
+        /// <summary>
+        /// Should this entity track with a VR hand?
+        /// </summary>
+        [DataMember(40)]
+        public VirtualReality.TouchControllerHand TrackVRHand = TouchControllerHand.None;
+
+        /// <summary>
+        /// Should this TransformComponent automatically update a batched model index?
+        /// </summary>
+        [DataMemberIgnore]
+        public BatchedMeshDrawReference AutoUpdateBatchedMesh;
+
+        /// <summary>
+        /// If in VR, do we want to override the normally tracked TransformComponent to point at UI elements?
+        /// This is useful if we want to adjust our pointer with a child TransformComponent.
+        /// </summary>
+        static public TransformComponent OverrideLeftHandUIPointer, OverrideRightHandUIPointer;
+
+        /// <summary>
+        /// Last left VR hand tracked. Useful for quick access to left hand and internal UI picking
+        /// </summary>
+        static public TransformComponent LastLeftHandTracked { get; private set; }
+
+        /// <summary>
+        /// Last right VR hand tracked. Useful for quick access to right hand and internal UI picking
+        /// </summary>
+        static public TransformComponent LastRightHandTracked { get; private set; }
+
+        /// <summary>
+        /// Does this transform component (and its children) not move? If so, we can do some performance improvements
+        /// </summary>
+        [DataMember(50)]
+        [DefaultValue(IMMOBILITY.FullMotion)]
+        public IMMOBILITY Immobile { get; set; } = IMMOBILITY.FullMotion;
+
+        /// <summary>
+        /// Used for advanced transform positioning. Can ignore the heirarchy rotations and rotational positioning.
+        /// </summary>
+        [DataMember(60)]
+        [DefaultValue(HIERARCHY_MODE.Normal)]
+        public HIERARCHY_MODE HierarchyMode { get; set; } = HIERARCHY_MODE.Normal;
+
+        /// <summary>
+        /// If we are immobile, do one transform update to set initial (or just moved) position
+        /// </summary>
+        [DataMemberIgnore]
+        [DefaultValue(true)]
+        public bool UpdateImmobilePosition { get; set; } = true;
+
+        /// <summary>
+        /// Recursively go through transform hierarchy, marking everything as needing an update to its immobile position.
+        /// </summary>
+        public void RecursiveUpdateImmobilePosition()
+        {
+            _updateImmobilePos(this);
+        }
+
+        internal static void _updateImmobilePos(TransformComponent root)
+        {
+            root.UpdateImmobilePosition = true;
+
+            for (int i = 0; i < root.children.Count; i++)
+                _updateImmobilePos(root.children[i]);
+        }
+
         [DataMemberIgnore]
         public TransformLink TransformLink;
 
@@ -201,39 +281,85 @@ public TransformComponent Parent
             get { return parent; }
             set
             {
-                var oldParent = Parent;
+                TransformComponent oldParent = Parent;
                 if (oldParent == value)
                     return;
 
-                var previousScene = oldParent?.Entity?.Scene;
-                var newScene = value?.Entity?.Scene;
+                Scene entityScene = Entity?.Scene;
+                Scene newParentScene = value == null ? entityScene : value.Entity?.Scene;
 
                 // Get to root scene
-                while (previousScene?.Parent != null)
-                    previousScene = previousScene.Parent;
-                while (newScene?.Parent != null)
-                    newScene = newScene.Parent;
+                while (entityScene?.Parent != null)
+                    entityScene = entityScene.Parent;
+                while (newParentScene?.Parent != null)
+                    newParentScene = newParentScene.Parent;
 
                 // Check if root scene didn't change
-                bool moving = (newScene != null && newScene == previousScene);
-                if (moving)
-                    IsMovingInsideRootScene = true;
+                IsMovingInsideRootScene = (newParentScene != null && newParentScene == entityScene);
 
-                // Add/Remove
-                oldParent?.Children.Remove(this);
-                value?.Children.Add(this);
+                // remove from old spot, if needed
+                if (oldParent != null)
+                    oldParent.Children.Remove(this);
+                else
+                {
+                    lock (TransformProcessor.TransformationRoots)
+                    {
+                        TransformProcessor.TransformationRoots.Remove(this);
+                    }
+                }
+
+                // add to new spot
+                if (value != null)
+                    value.Children.Add(this);
+                else if (newParentScene != null)
+                {
+                    if (IsMovingInsideRootScene)
+                    {
+                        lock (TransformProcessor.TransformationRoots)
+                        {
+                            TransformProcessor.TransformationRoots.Add(this);
+                        }
+                    }
+                    else
+                        Entity.Scene = newParentScene;
+                } else
+                    Entity.Scene = null;
 
-                if (moving)
-                    IsMovingInsideRootScene = false;
+                IsMovingInsideRootScene = false;
             }
         }
 
+        private void Entities_CollectionChanged(object sender, TrackingCollectionChangedEventArgs e) {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Updates the local matrix.
         /// If <see cref="UseTRS"/> is true, <see cref="LocalMatrix"/> will be updated from <see cref="Position"/>, <see cref="Rotation"/> and <see cref="Scale"/>.
         /// </summary>
         public void UpdateLocalMatrix()
         {
+            // do we need to update with a VR hand?
+            if (TrackVRHand != VirtualReality.TouchControllerHand.None && VRDeviceSystem.VRActive)
+            {
+                TouchController vrController = VRDeviceSystem.GetSystem.GetController(TrackVRHand);
+
+                if (vrController != null && vrController.State != DeviceState.Invalid)
+                {
+                    Position = vrController.Position;
+                    Rotation = vrController.Rotation;
+
+                    if (TrackVRHand == TouchControllerHand.Left)
+                    {
+                        LastLeftHandTracked = this;
+                    }
+                    else
+                    {
+                        LastRightHandTracked = this;
+                    }
+                }
+            }
+
             if (UseTRS)
             {
                 Matrix.Transformation(ref Scale, ref Rotation, ref Position, out LocalMatrix);
@@ -250,8 +376,7 @@ public void UpdateLocalFromWorld()
                 var scene = Entity?.Scene;
                 if (scene != null)
                 {
-                    var inverseSceneTransform = scene.WorldMatrix;
-                    inverseSceneTransform.Invert();
+                    Matrix.Invert(ref scene.WorldMatrix, out var inverseSceneTransform);
                     Matrix.Multiply(ref WorldMatrix, ref inverseSceneTransform, out LocalMatrix);
                 }
                 else
@@ -262,8 +387,7 @@ public void UpdateLocalFromWorld()
             else
             {
                 //We are not root so we need to derive the local matrix as well
-                var inverseParent = Parent.WorldMatrix;
-                inverseParent.Invert();
+                Matrix.Invert(ref Parent.WorldMatrix, out var inverseParent);
                 Matrix.Multiply(ref WorldMatrix, ref inverseParent, out LocalMatrix);
             }
         }
@@ -273,13 +397,205 @@ public void UpdateLocalFromWorld()
         /// It will first call <see cref="UpdateLocalMatrix"/> on self, and <see cref="UpdateWorldMatrix"/> on <see cref="Parent"/> if not null.
         /// Then <see cref="WorldMatrix"/> will be updated by multiplying <see cref="LocalMatrix"/> and parent <see cref="WorldMatrix"/> (if any).
         /// </summary>
-        public void UpdateWorldMatrix()
+        public void UpdateWorldMatrix(bool recurseToRoot = true, bool doPostProcessing = true)
         {
             UpdateLocalMatrix();
-            UpdateWorldMatrixInternal(true);
+            UpdateWorldMatrixInternal(recurseToRoot, doPostProcessing);
+        }
+
+        /// <summary>
+        /// Make this transform look at the target position
+        /// </summary>
+        /// <param name="target"></param>
+        public void LookAt(Vector3 target)
+        {
+            // get difference of my position to target
+            target -= WorldPosition();
+
+            // inline normalize (also flip for handedness)
+            float length = target.X * target.X + target.Y * target.Y + target.Z * target.Z;
+            if (length != 1f && length != 0f)
+            {
+                length = 1.0f / (float)Math.Sqrt(length);
+                target.X *= -length;
+                target.Y *= -length;
+                target.Z *= -length;
+            }
+            else
+            {
+                target.X = -target.X;
+                target.Y = -target.Y;
+                target.Z = -target.Z;
+            }
+            Vector3 fla_vect1;
+            fla_vect1.X = 0;
+            fla_vect1.Y = 1;
+            fla_vect1.Z = 0;
+            float tempx = (fla_vect1.Y * target.Z) - (fla_vect1.Z * target.Y);
+            float tempy = (fla_vect1.Z * target.X) - (fla_vect1.X * target.Z);
+            fla_vect1.Z = (fla_vect1.X * target.Y) - (fla_vect1.Y * target.X);
+            fla_vect1.X = tempx;
+            fla_vect1.Y = tempy;
+            // inline normalize
+            length = fla_vect1.X * fla_vect1.X + fla_vect1.Y * fla_vect1.Y + fla_vect1.Z * fla_vect1.Z;
+            if (length != 1f && length != 0f)
+            {
+                length = 1.0f / (float)Math.Sqrt(length);
+                fla_vect1.X *= length;
+                fla_vect1.Y *= length;
+                fla_vect1.Z *= length;
+            }
+            Vector3 fla_vect2;
+            fla_vect2.X = target.X;
+            fla_vect2.Y = target.Y;
+            fla_vect2.Z = target.Z;
+            //vect2.crossLocal(vect1);
+            tempx = (fla_vect2.Y * fla_vect1.Z) - (fla_vect2.Z * fla_vect1.Y);
+            tempy = (fla_vect2.Z * fla_vect1.X) - (fla_vect2.X * fla_vect1.Z);
+            fla_vect2.Z = (fla_vect2.X * fla_vect1.Y) - (fla_vect2.Y * fla_vect1.X);
+            fla_vect2.X = tempx;
+            fla_vect2.Y = tempy;
+            // inline normalize
+            length = fla_vect2.X * fla_vect2.X + fla_vect2.Y * fla_vect2.Y + fla_vect2.Z * fla_vect2.Z;
+            if (length != 1f && length != 0f)
+            {
+                length = 1.0f / (float)Math.Sqrt(length);
+                fla_vect2.X *= length;
+                fla_vect2.Y *= length;
+                fla_vect2.Z *= length;
+            }
+
+            float t = fla_vect1.X + fla_vect2.Y + target.Z, w, x, y, z;
+            // we protect the division by s by ensuring that s>=1
+            if (t >= 0)
+            { // |w| >= .5
+                float s = (float)Math.Sqrt(t + 1); // |s|>=1 ...
+                w = 0.5f * s;
+                s = 0.5f / s;                 // so this division isn't bad
+                x = (fla_vect2.Z - target.Y) * s;
+                y = (target.X - fla_vect1.Z) * s;
+                z = (fla_vect1.Y - fla_vect2.X) * s;
+            }
+            else if ((fla_vect1.X > fla_vect2.Y) && (fla_vect1.X > target.Z))
+            {
+                float s = (float)Math.Sqrt(1.0f + fla_vect1.X - fla_vect2.Y - target.Z); // |s|>=1
+                x = s * 0.5f; // |x| >= .5
+                s = 0.5f / s;
+                y = (fla_vect1.Y + fla_vect2.X) * s;
+                z = (target.X + fla_vect1.Z) * s;
+                w = (fla_vect2.Z - target.Y) * s;
+            }
+            else if (fla_vect2.Y > target.Z)
+            {
+                float s = (float)Math.Sqrt(1.0f + fla_vect2.Y - fla_vect1.X - target.Z); // |s|>=1
+                y = s * 0.5f; // |y| >= .5
+                s = 0.5f / s;
+                x = (fla_vect1.Y + fla_vect2.X) * s;
+                z = (fla_vect2.Z + target.Y) * s;
+                w = (target.X - fla_vect1.Z) * s;
+            }
+            else
+            {
+                float s = (float)Math.Sqrt(1.0f + target.Z - fla_vect1.X - fla_vect2.Y); // |s|>=1
+                z = s * 0.5f; // |z| >= .5
+                s = 0.5f / s;
+                x = (target.X + fla_vect1.Z) * s;
+                y = (fla_vect2.Z + target.Y) * s;
+                w = (fla_vect1.Y - fla_vect2.X) * s;
+            }
+            float norm = w * w + x * x + y * y + z * z;
+            float n = (float)(1.0f / Math.Sqrt(norm));
+            w *= n;
+            x *= n;
+            y *= n;
+            z *= n;
+
+            // negate the worldtransform rotation?
+            if (parent != null)
+            {
+                Rotation = new Quaternion(x, y, z, w) * Quaternion.Invert(parent.WorldRotation());
+            }
+            else
+            {
+                Rotation.X = x;
+                Rotation.Y = y;
+                Rotation.Z = z;
+                Rotation.W = w;
+            }
         }
 
-        internal void UpdateWorldMatrixInternal(bool recursive)
+        /// <summary>
+        /// Gets the world position.
+        /// Default call does not recalcuate the position. It just gets the last frame's position quickly.
+        /// If you pass true to this function, it will update the world position (which is a costly procedure) to get the most up-to-date position.
+        /// </summary>
+        public Vector3 WorldPosition(bool recalculate = false)
+        {
+            if (recalculate) UpdateWorldMatrix(true, false);
+            return parent == null ? Position : WorldMatrix.TranslationVector;
+        }
+
+        /// <summary>
+        /// Gets the world scale.
+        /// Default call does not recalcuate the scale. It just gets the last frame's scale quickly.
+        /// If you pass true to this function, it will update the world position (which is a costly procedure) to get the most up-to-date scale.
+        /// </summary>
+        public Vector3 WorldScale(bool recalculate = false)
+        {
+            if (recalculate) UpdateWorldMatrix(true, false);
+            if (parent == null) return Scale;
+            WorldMatrix.GetScale(out Vector3 scale);
+            return scale;
+        }
+
+        /// <summary>
+        /// Gets the world rotation.
+        /// Default call does not recalcuate the rotation. It just gets the last frame's rotation (relatively) quickly.
+        /// If you pass true to this function, it will update the world position (which is a costly procedure) to get the most up-to-date rotation.
+        /// </summary>
+        public Quaternion WorldRotation(bool recalculate = false)
+        {
+            if (recalculate) UpdateWorldMatrix(true, false);
+            if (parent != null && WorldMatrix.GetRotationQuaternion(out Quaternion q)) {
+                return q;
+            } else {
+                return Rotation;
+            }
+        }
+
+        /// <summary>
+        /// Gets Forward vector for transform
+        /// </summary>
+        public Vector3 Forward(bool worldForward = false, bool recalculateWorld = false) {
+            return RotationMatrix(worldForward, recalculateWorld).Forward;
+        }
+
+        /// <summary>
+        /// Gets Left vector for transform
+        /// </summary>
+        public Vector3 Left(bool worldLeft = false, bool recalculateWorld = false) {
+            return RotationMatrix(worldLeft, recalculateWorld).Left;
+        }
+
+        /// <summary>
+        /// Gets Up vector for transform
+        /// </summary>
+        public Vector3 Up(bool worldUp = false, bool recalculateWorld = false) {
+            return RotationMatrix(worldUp, recalculateWorld).Up;
+        }
+
+        /// <summary>
+        /// Gets a rotation matrix for this transform.
+        /// </summary>
+        /// <param name="world">World rotation, or just local rotation?</param>
+        /// <param name="recalculate">Recalculate world (which is slow), or use last frame info?</param>
+        /// <returns>Rotation matrix</returns>
+        public Matrix RotationMatrix(bool world = false, bool recalculate = false) {
+            if (recalculate) UpdateWorldMatrix();
+            return Matrix.RotationQuaternion(world ? WorldRotation() : Rotation);
+        }
+
+        internal void UpdateWorldMatrixInternal(bool recursive, bool postProcess = true)
         {
             if (TransformLink != null)
             {
@@ -290,28 +606,45 @@ internal void UpdateWorldMatrixInternal(bool recursive)
             else if (Parent != null)
             {
                 if (recursive)
-                    Parent.UpdateWorldMatrix();
+                    Parent.UpdateWorldMatrix(true, postProcess);
+
+                if (HierarchyMode != HIERARCHY_MODE.Normal)
+                {
+                    Parent.WorldMatrix.GetRotationMatrix(out Matrix q);
+                    if (HierarchyMode != HIERARCHY_MODE.IgnoreAllRotation)
+                        LocalMatrix.TranslationVector = Vector3.Transform(Position, q).XYZ();
+                    q.Invert();
+                    Matrix cp = LocalMatrix;
+                    Matrix.Multiply(ref cp, ref q, out LocalMatrix);
+                }
+
                 Matrix.Multiply(ref LocalMatrix, ref Parent.WorldMatrix, out WorldMatrix);
             }
             else
             {
-                WorldMatrix = LocalMatrix;
-
                 var scene = Entity?.Scene;
                 if (scene != null)
                 {
                     if (recursive)
-                    {
                         scene.UpdateWorldMatrix();
-                    }
 
-                    Matrix.Multiply(ref WorldMatrix, ref scene.WorldMatrix, out WorldMatrix);
+                    Matrix.Multiply(ref LocalMatrix, ref scene.WorldMatrix, out WorldMatrix);
+                }
+                else
+                {
+                    WorldMatrix = LocalMatrix;
                 }
             }
 
-            foreach (var transformOperation in PostOperations)
+            if (postProcess)
             {
-                transformOperation.Process(this);
+                for (int i = 0; i < PostOperations.Count; i++)
+                {
+                    PostOperations[i].Process(this);
+                }
+
+                if (AutoUpdateBatchedMesh != null)
+                    AutoUpdateBatchedMesh.TransformMatrix = WorldMatrix;
             }
         }
 
diff --git a/sources/engine/Xenko.Engine/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Engine/Properties/AssemblyInfo.cs
index a7f1dea2a5..3a21cc0da5 100644
--- a/sources/engine/Xenko.Engine/Properties/AssemblyInfo.cs
+++ b/sources/engine/Xenko.Engine/Properties/AssemblyInfo.cs
@@ -36,3 +36,4 @@
 [assembly: InternalsVisibleTo("Xenko.Engine.Tests" + Xenko.PublicKeys.Default)]
 [assembly: InternalsVisibleTo("XenkoEngineTests" + Xenko.PublicKeys.Default)]
 [assembly: InternalsVisibleTo("Xenko.VirtualReality" + Xenko.PublicKeys.Default)]
+[assembly: InternalsVisibleTo("Xenko.Physics" + Xenko.PublicKeys.Default)]
diff --git a/sources/engine/Xenko.Engine/Rendering/Background/BackgroundRenderProcessor.cs b/sources/engine/Xenko.Engine/Rendering/Background/BackgroundRenderProcessor.cs
index fb3021c483..217eab8490 100644
--- a/sources/engine/Xenko.Engine/Rendering/Background/BackgroundRenderProcessor.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Background/BackgroundRenderProcessor.cs
@@ -50,14 +50,17 @@ public override void Draw(RenderContext context)
             ActiveBackground = null;
 
             // Start by making it not visible
-            foreach (var entityKeyPair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var backgroundComponent = entityKeyPair.Key;
-                var renderBackground = entityKeyPair.Value;
+                var backgroundComponent = ComponentDataKeys[i];
+                var renderBackground = ComponentDataValues[i];
                 if (backgroundComponent.Enabled && backgroundComponent.Texture != null)
                 {
                     // Select the first active background
                     renderBackground.Is2D = backgroundComponent.Is2D;
+                    renderBackground.FullAlpha = backgroundComponent.AlphaColor;
+                    renderBackground.ZeroAlpha = backgroundComponent.ZeroColor;
+                    renderBackground.IsHorizon = backgroundComponent.IsHorizon;
                     renderBackground.Texture = backgroundComponent.Texture;
                     renderBackground.Intensity = backgroundComponent.Intensity;
                     renderBackground.RenderGroup = backgroundComponent.RenderGroup;
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.LightProbes.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.LightProbes.cs
index eaedbd27b7..930c7d71e2 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.LightProbes.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.LightProbes.cs
@@ -115,14 +115,14 @@ private unsafe void BakeLightProbes(RenderContext context, RenderDrawContext dra
                 drawContext.CommandList.SetStencilReference(0);
 
                 // Apply the effect
-                bakeLightProbes.Parameters.Set(BakeLightProbeShaderKeys.MatrixTransform, renderView.ViewProjection);
+                bakeLightProbes.Parameters.Set(BakeLightProbeShaderKeys.MatrixTransform, ref renderView.ViewProjection);
                 bakeLightProbes.Apply(drawContext.GraphicsContext);
 
                 /*int tetrahedrawGridSize = 5;
                 Vector3 tetrahedraMin = new Vector3(-12.0f);
                 Vector3 tetrahedraMax = new Vector3(12.0f);
                 var lightprobePositions = new Vector3[tetrahedrawGridSize*tetrahedrawGridSize*tetrahedrawGridSize];
-    
+
                 for (int i = 0; i < lightprobePositions.Length; ++i)
                 {
                     lightprobePositions[i] = new Vector3(
@@ -130,12 +130,11 @@ private unsafe void BakeLightProbes(RenderContext context, RenderDrawContext dra
                         MathUtil.Lerp(tetrahedraMin.Y, tetrahedraMax.Y, (float)((i/tetrahedrawGridSize)%tetrahedrawGridSize)/(tetrahedrawGridSize - 1)),
                         MathUtil.Lerp(tetrahedraMin.Z, tetrahedraMax.Z, (float)(i%tetrahedrawGridSize)/(tetrahedrawGridSize - 1)));
                 }
-    
+
                 var tetra = new BowyerWatsonTetrahedralization();
                 var tetraResult = tetra.Compute(lightprobePositions);*/
 
-                Matrix viewInverse = renderView.View;
-                viewInverse.Invert();
+                Matrix.Invert(ref renderView.View, out var viewInverse);
 
                 var eye = new Vector3(viewInverse.M41, viewInverse.M42, viewInverse.M43);
 
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.cs
index 704d60e29b..7f824ae36e 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/ForwardRenderer.cs
@@ -11,9 +11,11 @@
 using Xenko.Core.Diagnostics;
 using Xenko.Core.Mathematics;
 using Xenko.Core.Storage;
+using Xenko.Games;
 using Xenko.Graphics;
 using Xenko.Rendering.Images;
 using Xenko.Rendering.Lights;
+using Xenko.Rendering.Rendering.Materials;
 using Xenko.Rendering.Shadows;
 using Xenko.Rendering.SubsurfaceScattering;
 using Xenko.VirtualReality;
@@ -41,6 +43,8 @@ public partial class ForwardRenderer : SceneRendererBase, ISharedRenderer
         private Texture currentDepthStencil;
         private Texture currentDepthStencilNonMSAA;
 
+        private static List<ForwardRenderer> VRRenderers = new List<ForwardRenderer>();
+
         protected Texture viewOutputTarget;
         protected Texture viewDepthStencil;
 
@@ -130,9 +134,7 @@ protected override void InitializeCore()
                 actualMultisampleCount = (MultisampleCount)Math.Min((int)actualMultisampleCount, (int)GraphicsDevice.Features[DepthBufferFormat].MultisampleCountMax);
 
                 // Note: we cannot support MSAA on DX10 now
-                if (GraphicsDevice.Features.HasMultisampleDepthAsSRV == false && // TODO: Try enabling MSAA on DX9!
-                    GraphicsDevice.Platform != GraphicsPlatform.OpenGL &&
-                    GraphicsDevice.Platform != GraphicsPlatform.OpenGLES)
+                if (GraphicsDevice.Features.HasMultisampleDepthAsSRV == false)
                 {
                     // OpenGL has MSAA support on every version.
                     // OpenGL ES has MSAA support starting from version 3.0.
@@ -155,59 +157,52 @@ protected override void InitializeCore()
 
             var camera = Context.GetCurrentCamera();
 
+            // only update vrSystem if it isn't already enabled
             vrSystem = Services.GetService<VRDeviceSystem>();
             if (vrSystem != null)
             {
                 if (VRSettings.Enabled)
                 {
-                    var requiredDescs = VRSettings.RequiredApis.ToArray();
-                    vrSystem.PreferredApis = requiredDescs.Select(x => x.Api).Distinct().ToArray();
+                    VRRenderers.Add(this);
 
-                    // remove VR API duplicates and keep first desired config only
-                    var preferredScalings = new Dictionary<VRApi, float>();
-                    foreach (var desc in requiredDescs)
+                    if (vrSystem.Enabled)
                     {
-                        if (!preferredScalings.ContainsKey(desc.Api))
-                            preferredScalings[desc.Api] = desc.ResolutionScale;
+                        // VR is already enabled, grab the device
+                        VRSettings.VRDevice = vrSystem.Device;
                     }
-                    vrSystem.PreferredScalings = preferredScalings;
-
-                    vrSystem.RequireMirror = VRSettings.CopyMirror;
-                    vrSystem.MirrorWidth = GraphicsDevice.Presenter.BackBuffer.Width;
-                    vrSystem.MirrorHeight = GraphicsDevice.Presenter.BackBuffer.Height;
+                    else
+                    {
+                        vrSystem.PreferredApi = VRSettings.RequiredApi.Api;
+                        vrSystem.PreferredScalings = VRSettings.RequiredApi.ResolutionScale;
 
-                    vrSystem.Enabled = true; //careful this will trigger the whole chain of initialization!
-                    vrSystem.Visible = true;
+                        vrSystem.RequireMirror = VRSettings.CopyMirror;
 
-                    VRSettings.VRDevice = vrSystem.Device;
+                        vrSystem.Enabled = true; //careful this will trigger the whole chain of initialization!
+                        vrSystem.Visible = true;
 
-                    vrSystem.PreviousUseCustomProjectionMatrix = camera.UseCustomProjectionMatrix;
-                    vrSystem.PreviousUseCustomViewMatrix = camera.UseCustomViewMatrix;
-                    vrSystem.PreviousCameraProjection = camera.ProjectionMatrix;
+                        VRSettings.VRDevice = vrSystem.Device;
 
-                    if (VRSettings.VRDevice.SupportsOverlays)
-                    {
-                        foreach (var overlay in VRSettings.Overlays)
-                        {
-                            if (overlay != null && overlay.Texture != null)
-                            {
-                                overlay.Overlay = VRSettings.VRDevice.CreateOverlay(overlay.Texture.Width, overlay.Texture.Height, overlay.Texture.MipLevels, (int)overlay.Texture.MultisampleCount);
-                            }
-                        }
+                        vrSystem.PreviousUseCustomProjectionMatrix = camera.UseCustomProjectionMatrix;
+                        vrSystem.PreviousUseCustomViewMatrix = camera.UseCustomViewMatrix;
+                        vrSystem.PreviousCameraProjection = camera.ProjectionMatrix;
                     }
                 }
                 else
                 {
-                    vrSystem.Enabled = false;
-                    vrSystem.Visible = false;
-
+                    VRRenderers.Remove(this);
                     VRSettings.VRDevice = null;
 
-                    if (vrSystem.Device != null) //we had a device before so we know we need to restore the camera
+                    if (VRRenderers.Count == 0)
                     {
-                        camera.UseCustomViewMatrix = vrSystem.PreviousUseCustomViewMatrix;
-                        camera.UseCustomProjectionMatrix = vrSystem.PreviousUseCustomProjectionMatrix;
-                        camera.ProjectionMatrix = vrSystem.PreviousCameraProjection;
+                        vrSystem.Enabled = false;
+                        vrSystem.Visible = false;
+
+                        if (vrSystem.Device != null) //we had a device before so we know we need to restore the camera
+                        {
+                            camera.UseCustomViewMatrix = vrSystem.PreviousUseCustomViewMatrix;
+                            camera.UseCustomProjectionMatrix = vrSystem.PreviousUseCustomProjectionMatrix;
+                            camera.ProjectionMatrix = vrSystem.PreviousCameraProjection;
+                        }
                     }
                 }
             }
@@ -237,7 +232,7 @@ protected virtual void ValidateOpaqueStageOutput(RenderOutputValidator renderOut
         {
             renderOutputValidator.Add<ColorTargetSemantic>(renderContext.RenderOutput.RenderTargetFormat0);
 
-            if (PostEffects != null)
+            if (PostEffects != null && PostEffects.Enabled)
             {
                 if (PostEffects.RequiresNormalBuffer)
                 {
@@ -299,46 +294,99 @@ protected override unsafe void CollectCore(RenderContext context)
                 // Mark this view as requiring shadows
                 shadowMapRenderer?.RenderViewsWithShadows.Add(context.RenderView);
 
-                context.RenderOutput = new RenderOutputDescription(PostEffects != null ? PixelFormat.R16G16B16A16_Float : context.RenderOutput.RenderTargetFormat0, DepthBufferFormat, MSAALevel);
+                context.RenderOutput = new RenderOutputDescription(context.RenderOutput.RenderTargetFormat0, DepthBufferFormat, MSAALevel);
 
                 CollectStages(context);
 
                 if (VRSettings.Enabled && VRSettings.VRDevice != null)
                 {
-                    Vector3 cameraPos, cameraScale;
-                    Matrix cameraRot;
+                    Matrix* viewMatrices = stackalloc Matrix[2];
+                    Matrix* projectionMatrices = stackalloc Matrix[2];
+                    camera.VRDeviceManaging = VRSettings.VRDevice as OpenXRHmd;
 
-                    if (!vrSystem.PreviousUseCustomViewMatrix)
+                    // only update the camera once, if we have multiple forward renderers on the same camera
+                    ulong poseCount = VRSettings.VRDevice.PoseCount;
+                    if (poseCount == 0 || poseCount != camera.VRProjectionPose)
                     {
-                        camera.Entity.Transform.WorldMatrix.Decompose(out cameraScale, out cameraRot, out cameraPos);
+                        camera.VRProjectionPose = poseCount;
+
+                        Vector3 cameraPos, cameraScale;
+                        Quaternion cameraRot;
+
+                        VRSettings.VRDevice.UpdatePositions(context.Time);
+
+                        if (camera.VRHeadSetsTransform)
+                        {
+                            if (camera.Entity.Transform.Parent != null)
+                            {
+                                camera.Entity.Transform.Parent.WorldMatrix.Decompose(out cameraScale, out cameraRot, out cameraPos);
+                            }
+                            else
+                            {
+                                cameraPos = Vector3.Zero;
+                                cameraScale = Vector3.One;
+                                cameraRot = Quaternion.Identity;
+                            }
+
+                            // make sure camera position gets body scale
+                            camera.Entity.Transform.Position = VRSettings.VRDevice.HeadPosition;
+                            camera.Entity.Transform.Rotation = VRSettings.VRDevice.HeadRotation;
+                        }
+                        else
+                        {
+                            if (!vrSystem.PreviousUseCustomViewMatrix)
+                            {
+                                camera.Entity.Transform.WorldMatrix.Decompose(out cameraScale, out cameraRot, out cameraPos);
+                            }
+                            else
+                            {
+                                Matrix cameraRotMat;
+                                camera.ViewMatrix.Decompose(out cameraScale, out cameraRotMat, out cameraPos);
+                                cameraRotMat.Transpose();
+                                Vector3.Negate(ref cameraPos, out cameraPos);
+                                Vector3.TransformCoordinate(ref cameraPos, ref cameraRotMat, out cameraPos);
+                                cameraRotMat.GetRotationQuaternion(out cameraRot);
+                            }
+
+                            if (VRSettings.IgnoreCameraRotation)
+                            {
+                                // only remove the local rotation of the camera
+                                cameraRot *= Quaternion.Invert(camera.Entity.Transform.Rotation);
+                            }
+                        }
+
+                        // if we have a rotation override, set it here
+                        if (VRSettings.VRDevice.BaseRotationOverride != null)
+                            cameraRot = VRSettings.VRDevice.BaseRotationOverride.Value;
+
+                        // Compute both view and projection matrices
+                        for (var i = 0; i < 2; ++i)
+                            VRSettings.VRDevice.ReadEyeParameters(i == 0 ? Eyes.Left : Eyes.Right, camera.NearClipPlane, camera.FarClipPlane, ref cameraPos, ref cameraRot, VRSettings.IgnoreDeviceRotation, VRSettings.IgnoreDevicePosition, out viewMatrices[i], out projectionMatrices[i]);
+
+                        // cache these projection values
+                        if (camera.cachedVRProjections == null) camera.cachedVRProjections = new Matrix[4];
+                        camera.cachedVRProjections[0] = viewMatrices[0];
+                        camera.cachedVRProjections[1] = viewMatrices[1];
+                        camera.cachedVRProjections[2] = projectionMatrices[0];
+                        camera.cachedVRProjections[3] = projectionMatrices[1];
+
+                        // if the VRDevice disagreed with the near and far plane, we must re-discover them and follow:
+                        var near = projectionMatrices[0].M43 / projectionMatrices[0].M33;
+                        var far = near * (-projectionMatrices[0].M33 / (-projectionMatrices[0].M33 - 1));
+                        if (Math.Abs(near - camera.NearClipPlane) > 1e-8f)
+                            camera.NearClipPlane = near;
+                        if (Math.Abs(near - camera.FarClipPlane) > 1e-8f)
+                            camera.FarClipPlane = far;
                     }
                     else
                     {
-                        camera.ViewMatrix.Decompose(out cameraScale, out cameraRot, out cameraPos);
-                        cameraRot.Transpose();
-                        Vector3.Negate(ref cameraPos, out cameraPos);
-                        Vector3.TransformCoordinate(ref cameraPos, ref cameraRot, out cameraPos);
-                    }
-
-                    if (VRSettings.IgnoreCameraRotation)
-                    {
-                        cameraRot = Matrix.Identity;
+                        // already calculated this camera, use the cached information
+                        viewMatrices[0] = camera.cachedVRProjections[0];
+                        viewMatrices[1] = camera.cachedVRProjections[1];
+                        projectionMatrices[0] = camera.cachedVRProjections[2];
+                        projectionMatrices[1] = camera.cachedVRProjections[3];
                     }
 
-                    // Compute both view and projection matrices
-                    Matrix* viewMatrices = stackalloc Matrix[2];
-                    Matrix* projectionMatrices = stackalloc Matrix[2];
-                    for (var i = 0; i < 2; ++i)
-                        VRSettings.VRDevice.ReadEyeParameters(i == 0 ? Eyes.Left : Eyes.Right, camera.NearClipPlane, camera.FarClipPlane, ref cameraPos, ref cameraRot, VRSettings.IgnoreDeviceRotation, VRSettings.IgnoreDevicePosition, out viewMatrices[i], out projectionMatrices[i]);
-
-                    // if the VRDevice disagreed with the near and far plane, we must re-discover them and follow:
-                    var near = projectionMatrices[0].M43 / projectionMatrices[0].M33;
-                    var far = near * (-projectionMatrices[0].M33 / (-projectionMatrices[0].M33 - 1));
-                    if (Math.Abs(near - camera.NearClipPlane) > 1e-8f)
-                        camera.NearClipPlane = near;
-                    if (Math.Abs(near - camera.FarClipPlane) > 1e-8f)
-                        camera.FarClipPlane = far;
-
                     // Compute a view matrix and projection matrix that cover both eyes for shadow map and culling
                     ComputeCommonViewMatrices(context, viewMatrices, projectionMatrices);
                     var commonView = context.RenderView;
@@ -379,20 +427,6 @@ protected override unsafe void CollectCore(RenderContext context)
                             PostEffects?.Collect(context);
                         }
                     }
-
-                    if (VRSettings.VRDevice.SupportsOverlays)
-                    {
-                        foreach (var overlay in VRSettings.Overlays)
-                        {
-                            if (overlay != null && overlay.Texture != null)
-                            {
-                                overlay.Overlay.Position = overlay.LocalPosition;
-                                overlay.Overlay.Rotation = overlay.LocalRotation;
-                                overlay.Overlay.SurfaceSize = overlay.SurfaceSize;
-                                overlay.Overlay.FollowHeadRotation = overlay.FollowsHeadRotation;
-                            }
-                        }
-                    }
                 }
                 else
                 {
@@ -482,7 +516,8 @@ protected virtual void DrawView(RenderContext context, RenderDrawContext drawCon
         {
             var renderSystem = context.RenderSystem;
 
-            PrepareVRConstantBuffer(context, eyeIndex, eyeCount);
+            if (eyeCount == 2)
+                PrepareVRConstantBuffer(context, eyeIndex, eyeCount);
 
             // Z Prepass
             var lightProbes = LightProbes && GBufferRenderStage != null;
@@ -578,20 +613,17 @@ protected virtual void DrawView(RenderContext context, RenderDrawContext drawCon
                     }
                 }
 
-                if (PostEffects != null)
+                if (PostEffects != null && PostEffects.Enabled)
                 {
                     // Run post effects
                     // Note: OpaqueRenderStage can't be null otherwise colorTargetIndex would be -1
-                    PostEffects.Draw(drawContext, OpaqueRenderStage.OutputValidator, renderTargets.Items, depthStencil, viewOutputTarget);
+                    if (eyeCount == 1) PostEffects.Draw(drawContext, OpaqueRenderStage.OutputValidator, renderTargets.Items, depthStencil, viewOutputTarget);
                 }
-                else
+                else if (actualMultisampleCount != MultisampleCount.None)
                 {
-                    if (actualMultisampleCount != MultisampleCount.None)
+                    using (drawContext.QueryManager.BeginProfile(Color.Green, CompositingProfilingKeys.MsaaResolve))
                     {
-                        using (drawContext.QueryManager.BeginProfile(Color.Green, CompositingProfilingKeys.MsaaResolve))
-                        {
-                            drawContext.CommandList.Copy(renderTargets[colorTargetIndex], viewOutputTarget);
-                        }
+                        drawContext.CommandList.Copy(renderTargets[colorTargetIndex], viewOutputTarget);
                     }
                 }
 
@@ -609,7 +641,7 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
 
             using (drawContext.PushRenderTargetsAndRestore())
             {
-                // Render Shadow maps
+                GlobalFog.PrepareFogConstantBuffer(context);
                 shadowMapRenderer?.Draw(drawContext);
 
                 if (VRSettings.Enabled && VRSettings.VRDevice != null)
@@ -620,110 +652,75 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
                     if (!isFullViewport)
                         return;
 
-                    var hasPostEffects = PostEffects != null; // When we have post effect we need to bind a different framebuffer for each view to be sure effects impinge on the other view.
+                    bool hasPostEffects = PostEffects != null && PostEffects.Enabled, presentingVR = this == VRRenderers[VRRenderers.Count - 1];
 
                     Texture vrFullSurface;
                     using (drawContext.PushRenderTargetsAndRestore())
                     {
                         var currentRenderTarget = drawContext.CommandList.RenderTarget;
-                        var vrFullFrameSize = VRSettings.VRDevice.ActualRenderFrameSize;
-                        var desiredRenderTargetSize = !hasPostEffects ? vrFullFrameSize : new Size2(vrFullFrameSize.Width / 2, vrFullFrameSize.Height);
-                        if (hasPostEffects || desiredRenderTargetSize.Width != currentRenderTarget.Width || desiredRenderTargetSize.Height != currentRenderTarget.Height)
+                        var desiredRenderTargetSize = VRSettings.VRDevice.ActualRenderFrameSize;
+
+                        if (desiredRenderTargetSize.Width != currentRenderTarget.Width || desiredRenderTargetSize.Height != currentRenderTarget.Height)
                             drawContext.CommandList.SetRenderTargets(null, null); // force to create and bind a new render target
 
                         PrepareRenderTargets(drawContext, desiredRenderTargetSize);
 
-                        //prepare the final VR target
                         vrFullSurface = viewOutputTarget;
-                        if (hasPostEffects)
-                        {
-                            var frameSize = VRSettings.VRDevice.ActualRenderFrameSize;
-                            var renderTargetDescription = TextureDescription.New2D(frameSize.Width, frameSize.Height, 1, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.ShaderResource | TextureFlags.RenderTarget);
-                            vrFullSurface = PushScopedResource(drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(renderTargetDescription));
-                        }
 
                         //draw per eye
                         using (context.SaveViewportAndRestore())
                         using (drawContext.PushRenderTargetsAndRestore())
                         {
                             ViewCount = 2;
-                            bool isWindowsMixedReality = false;
 
                             for (var i = 0; i < 2; i++)
                             {
-#if XENKO_PLATFORM_UWP
-                                if (GraphicsDevice.Platform == GraphicsPlatform.Direct3D11 && drawContext.GraphicsDevice.Presenter is WindowsMixedRealityGraphicsPresenter graphicsPresenter)
-                                {
-                                    isWindowsMixedReality = true;
-
-                                    MSAALevel = MultisampleCount.None;
-                                    currentRenderTargets.Clear();
-
-                                    if (i == 0)
-                                    {
-                                        currentRenderTargets.Add(graphicsPresenter.LeftEyeBuffer);
-                                    }
-                                    else
-                                    {
-                                        currentRenderTargets.Add(graphicsPresenter.RightEyeBuffer);
-                                    }
-                                }
-#endif
-
                                 drawContext.CommandList.SetRenderTargets(currentDepthStencil, currentRenderTargets.Count, currentRenderTargets.Items);
 
-                                if (!hasPostEffects && !isWindowsMixedReality) // need to change the viewport between each eye
-                                {
-                                    var frameSize = VRSettings.VRDevice.ActualRenderFrameSize;
-                                    drawContext.CommandList.SetViewport(new Viewport(i * frameSize.Width / 2, 0, frameSize.Width / 2, frameSize.Height));
-                                }
-                                else if (i == 0) // the viewport is the same for both eyes so we set it only once
-                                {
-                                    drawContext.CommandList.SetViewport(new Viewport(0.0f, 0.0f, VRSettings.VRDevice.ActualRenderFrameSize.Width / 2.0f, VRSettings.VRDevice.ActualRenderFrameSize.Height));
-                                }
+                                var frameSize = VRSettings.VRDevice.ActualRenderFrameSize;
+                                drawContext.CommandList.SetViewport(new Viewport(i * frameSize.Width / 2, 0, frameSize.Width / 2, frameSize.Height));
 
                                 using (context.PushRenderViewAndRestore(VRSettings.RenderViews[i]))
                                 {
                                     // Clear render target and depth stencil
-                                    if (hasPostEffects || i == 0) // need to clear for each eye in the case we have two different render targets
-                                        Clear?.Draw(drawContext);
+                                    if (i == 0) Clear?.Draw(drawContext);
 
                                     ViewIndex = i;
 
+                                    // draw view, but skip post processing (it will not do it, since eye count > 1)
                                     DrawView(context, drawContext, i, 2);
 
-                                    if (hasPostEffects) // copy the rendered view into the vr full view framebuffer
-                                        drawContext.CommandList.CopyRegion(viewOutputTarget, 0, null, vrFullSurface, 0, VRSettings.VRDevice.ActualRenderFrameSize.Width / 2 * i);
-                                }
-                            }
-
-                            if (VRSettings.VRDevice.SupportsOverlays)
-                            {
-                                foreach (var overlay in VRSettings.Overlays)
-                                {
-                                    if (overlay != null && overlay.Texture != null)
+                                    // last eye, draw post effects over both eyes if we have some
+                                    if (hasPostEffects && i == 1)
                                     {
-                                        overlay.Overlay.UpdateSurface(drawContext.CommandList, overlay.Texture);
+                                        if (presentingVR)
+                                        {
+                                            var renderTargetDescription = TextureDescription.New2D(frameSize.Width, frameSize.Height, 1, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.ShaderResource | TextureFlags.RenderTarget);
+                                            vrFullSurface = PushScopedResource(drawContext.GraphicsContext.Allocator.GetTemporaryTexture2D(renderTargetDescription));
+                                        }
+
+                                        PostEffects.Draw(drawContext, OpaqueRenderStage.OutputValidator, currentRenderTargets.Items, currentDepthStencil, vrFullSurface);
                                     }
                                 }
                             }
 
-                            VRSettings.VRDevice.Commit(drawContext.CommandList, vrFullSurface);
+                            // if we are on our last forward renderer and our scene is ready for submission
+                            if (presentingVR) VRSettings.VRDevice.Commit(drawContext.CommandList, vrFullSurface);
                         }
                     }
 
-                    //draw mirror to backbuffer (if size is matching and full viewport)
-                    if (VRSettings.CopyMirror)
+                    //draw mirror if desired
+                    if (VRSettings.CopyMirror != VRDeviceSystem.MIRROR_OPTION.NONE)
                     {
-                        CopyOrScaleTexture(drawContext, VRSettings.VRDevice.MirrorTexture, drawContext.CommandList.RenderTarget);
-                    }
-                    else if (hasPostEffects)
-                    {
-                        CopyOrScaleTexture(drawContext, vrFullSurface, drawContext.CommandList.RenderTarget);
+                        GameBase.ShouldPresent = true;
+                        CopyOrScaleTexture(drawContext, vrFullSurface, drawContext.CommandList.RenderTarget,
+                                           VRSettings.CopyMirror == VRDeviceSystem.MIRROR_OPTION.BOTH_EYES ? Vector2.One : new Vector2(0.5f, 1f));
                     }
                 }
                 else
                 {
+                    GameBase.ShouldPresent = true;
+
                     PrepareRenderTargets(drawContext, new Size2((int)viewport.Width, (int)viewport.Height));
 
                     ViewCount = 1;
@@ -750,10 +747,11 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
             currentDepthStencilNonMSAA = null;
         }
 
-        private void CopyOrScaleTexture(RenderDrawContext drawContext, Texture input, Texture output)
+        private void CopyOrScaleTexture(RenderDrawContext drawContext, Texture input, Texture output, Vector2 scaling)
         {
-            if (input.Size != output.Size)
+            if (input.Size != output.Size || scaling != Vector2.One)
             {
+                VRSettings.MirrorScaler.TexScale = scaling;
                 VRSettings.MirrorScaler.SetInput(0, input);
                 VRSettings.MirrorScaler.SetOutput(output);
                 VRSettings.MirrorScaler.Draw(drawContext);
@@ -796,11 +794,14 @@ private Texture ResolveDepthAsSRV(RenderDrawContext context)
                 }
             }
 
-            context.CommandList.SetRenderTargets(null, context.CommandList.RenderTargetCount, context.CommandList.RenderTargets);
-
+            Texture oldDepthStencil = depthStencilROCached;
             depthStencilROCached = context.Resolver.GetDepthStencilAsRenderTarget(depthStencil, depthStencilROCached);
             context.CommandList.SetRenderTargets(depthStencilROCached, context.CommandList.RenderTargetCount, context.CommandList.RenderTargets);
 
+            // dispose of the old depth stencil if there was a different one used before
+            if (oldDepthStencil != null && oldDepthStencil != depthStencilROCached)
+                oldDepthStencil.Dispose();
+
             return depthStencilSRV;
         }
 
@@ -815,7 +816,7 @@ private void PrepareRenderTargets(RenderDrawContext drawContext, Texture outputR
 
             for (int index = 0; index < renderTargets.Count; index++)
             {
-                if (renderTargets[index].Semantic is ColorTargetSemantic && PostEffects == null && actualMultisampleCount == MultisampleCount.None)
+                if (renderTargets[index].Semantic is ColorTargetSemantic && (PostEffects == null || PostEffects.Enabled == false || PostEffects.RequiresRenderTargetChange == false) && actualMultisampleCount == MultisampleCount.None)
                 {
                     currentRenderTargets[index] = outputRenderTarget;
                 }
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositor.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositor.cs
index f2af34ec5f..18f286e8a1 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositor.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositor.cs
@@ -11,6 +11,8 @@
 using Xenko.Core.Serialization.Contents;
 using Xenko.Engine;
 using Xenko.Graphics;
+using Xenko.Rendering.Images;
+using Xenko.Rendering.Lights;
 
 namespace Xenko.Rendering.Compositing
 {
@@ -72,11 +74,184 @@ public class GraphicsCompositor : RendererBase
         /// </summary>
         public ISceneRenderer Editor { get; set; }
 
+        [DataMemberIgnore]
+        private List<PostProcessingEffects> cachedProcessor;
+
+        [DataMemberIgnore]
+        private List<ForwardRenderer> forwardRenderers;
+
+        private void gatherPostProcessors(ISceneRenderer renderer)
+        {
+            if (renderer is SceneCameraRenderer scr)
+            {
+                gatherPostProcessors(scr.Child);
+            }
+            else if (renderer is SceneRendererCollection src)
+            {
+                List<ISceneRenderer> renderers = src.Children;
+                for (int i = 0; i < renderers.Count; i++)
+                    gatherPostProcessors(renderers[i]);
+            }
+            else if (renderer is ForwardRenderer fr)
+            {
+                IPostProcessingEffects check = fr.PostEffects;
+                if (check != null && check is PostProcessingEffects c)
+                {
+                    cachedProcessor.Add(c);
+                }
+            }
+        }
+
+        private void gatherForwardRenderers(ISceneRenderer renderer)
+        {
+            if (renderer is SceneCameraRenderer scr)
+            {
+                gatherForwardRenderers(scr.Child);
+            }
+            else if (renderer is SceneRendererCollection src)
+            {
+                List<ISceneRenderer> renderers = src.Children;
+                for (int i = 0; i < renderers.Count; i++)
+                    gatherForwardRenderers(renderers[i]);
+            }
+            else if (renderer is ForwardRenderer fr)
+            {
+                forwardRenderers.Add(fr);
+            }
+        }
+
+        /// <summary>
+        /// Shortcut to getting forward renderers
+        /// </summary>
+        [DataMemberIgnore]
+        public List<ForwardRenderer> ForwardRenderers
+        {
+            get
+            {
+                if (forwardRenderers == null)
+                {
+                    // find them
+                    forwardRenderers = new List<ForwardRenderer>();
+                    gatherForwardRenderers(Game);
+                }
+                return forwardRenderers;
+            }
+        }
+
+        /// <summary>
+        /// Shortcut to getting post processing effects
+        /// </summary>
+        [DataMemberIgnore]
+        public List<PostProcessingEffects> PostProcessing {
+            get {
+                if (cachedProcessor == null) {
+                    // find them
+                    cachedProcessor = new List<PostProcessingEffects>();
+                    gatherPostProcessors(Game);
+                }
+                return cachedProcessor;
+            }
+        }
+
+        /// <summary>
+        /// Get the main camera component used for game rendering
+        /// </summary>
+        [DataMemberIgnore]
+        public CameraComponent MainCamera
+        {
+            get
+            {
+                if (Game is SceneCameraRenderer scr)
+                {
+                    return scr.ResolveCamera();
+                }
+                else if (Game is SceneRendererCollection src)
+                {
+                    foreach (ISceneRenderer isr in src.Children)
+                    {
+                        if (isr is SceneCameraRenderer iscr &&
+                            iscr.Camera?.Camera != null)
+                            return iscr.ResolveCamera();
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Shortcut to setting VR settings on renderers to enable or disable. Only renderers with Required APIs set will be enabled via this method.
+        /// </summary>
+        /// <param name="enable">Whether to enable or disable VR settings on renderers</param>
+        public void SetVRRenderers(bool enable)
+        {
+            recursiveVRSet(Game, enable);
+        }
+
+        /// <summary>
+        /// Get the game's first VRRendererSettings, can be useful for changing VR settings during runtime
+        /// </summary>
+        /// <returns></returns>
+        public VRRendererSettings GetVRSettings()
+        {
+            return findVRSettings(Game);
+        }
+
+        private VRRendererSettings findVRSettings(ISceneRenderer r)
+        {
+            if (r is ForwardRenderer fr)
+            {
+                return fr.VRSettings;
+            }
+            else if (r is SceneCameraRenderer scr)
+            {
+                return findVRSettings(scr.Child);
+            }
+            else if (r is SceneRendererCollection src)
+            {
+                VRRendererSettings vrs;
+                foreach (ISceneRenderer isr in src.Children)
+                {
+                    vrs = findVRSettings(isr);
+                    if (vrs != null) return vrs;
+                }
+            }
+
+            return null;
+        }
+
+        private void recursiveVRSet(ISceneRenderer r, bool enable)
+        {
+            if (r is ForwardRenderer fr)
+            {
+                fr.VRSettings.Enabled = enable;
+            }
+            else if (r is SceneCameraRenderer scr)
+            {
+                recursiveVRSet(scr.Child, enable);
+            }
+            else if (r is SceneRendererCollection src)
+            {
+                foreach (ISceneRenderer isr in src.Children)
+                    recursiveVRSet(isr, enable);
+            }
+        }
+
         /// <inheritdoc/>
         protected override void InitializeCore()
         {
             base.InitializeCore();
 
+            // any settings to apply from a meshrenderfeature?
+            foreach (RootRenderFeature rrf in RenderFeatures)
+            {
+                if (rrf is MeshRenderFeature mrf)
+                {
+                    LightClusteredPointSpotGroupRenderer.UseLinearLighting = mrf.LinearLightAttenuation;
+                    break;
+                }
+            }
+
             RenderSystem.Initialize(Context);
         }
 
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositorHelper.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositorHelper.cs
index 64fae15e97..60ca39c889 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositorHelper.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/GraphicsCompositorHelper.cs
@@ -21,13 +21,11 @@ public static class GraphicsCompositorHelper
         /// <summary>
         /// Creates a typical graphics compositor programatically. It can render meshes, sprites and backgrounds.
         /// </summary>
-        public static GraphicsCompositor CreateDefault(bool enablePostEffects, string modelEffectName = "XenkoForwardShadingEffect", CameraComponent camera = null, Color4? clearColor = null, GraphicsProfile graphicsProfile = GraphicsProfile.Level_10_0, RenderGroupMask groupMask = RenderGroupMask.All)
+        public static GraphicsCompositor CreateDefault(bool enablePostEffects, string modelEffectName = "XenkoForwardShadingEffect", CameraComponent camera = null, Color4? clearColor = null, GraphicsProfile graphicsProfile = GraphicsProfile.Level_11_2, RenderGroupMask groupMask = RenderGroupMask.All)
         {
             var opaqueRenderStage = new RenderStage("Opaque", "Main") { SortMode = new StateChangeSortMode() };
             var transparentRenderStage = new RenderStage("Transparent", "Main") { SortMode = new BackToFrontSortMode() };
             var shadowCasterRenderStage = new RenderStage("ShadowMapCaster", "ShadowMapCaster") { SortMode = new FrontToBackSortMode() };
-            var shadowCasterCubeMapRenderStage = new RenderStage("ShadowMapCasterCubeMap", "ShadowMapCasterCubeMap") { SortMode = new FrontToBackSortMode() };
-            var shadowCasterParaboloidRenderStage = new RenderStage("ShadowMapCasterParaboloid", "ShadowMapCasterParaboloid") { SortMode = new FrontToBackSortMode() };
 
             var postProcessingEffects = enablePostEffects
                 ? new PostProcessingEffects
@@ -53,7 +51,7 @@ public static GraphicsCompositor CreateDefault(bool enablePostEffects, string mo
                 Clear = { Color = clearColor ?? Color.CornflowerBlue },
                 OpaqueRenderStage = opaqueRenderStage,
                 TransparentRenderStage = transparentRenderStage,
-                ShadowMapRenderStages = { shadowCasterRenderStage, shadowCasterParaboloidRenderStage, shadowCasterCubeMapRenderStage },
+                ShadowMapRenderStages = { shadowCasterRenderStage },
                 PostEffects = postProcessingEffects,
             };
 
@@ -83,11 +81,11 @@ public static GraphicsCompositor CreateDefault(bool enablePostEffects, string mo
                             },
                             new LightPointShadowMapRendererParaboloid
                             {
-                                ShadowCasterRenderStage = shadowCasterParaboloidRenderStage,
+                                ShadowCasterRenderStage = shadowCasterRenderStage,
                             },
                             new LightPointShadowMapRendererCubeMap
                             {
-                                ShadowCasterRenderStage = shadowCasterCubeMapRenderStage,
+                                ShadowCasterRenderStage = shadowCasterRenderStage,
                             },
                         },
                     },
@@ -118,9 +116,7 @@ public static GraphicsCompositor CreateDefault(bool enablePostEffects, string mo
                 {
                     opaqueRenderStage,
                     transparentRenderStage,
-                    shadowCasterRenderStage,
-                    shadowCasterParaboloidRenderStage,
-                    shadowCasterCubeMapRenderStage,
+                    shadowCasterRenderStage
                 },
                 RenderFeatures =
                 {
@@ -152,22 +148,20 @@ public static GraphicsCompositor CreateDefault(bool enablePostEffects, string mo
                             new ShadowMapRenderStageSelector
                             {
                                 EffectName = modelEffectName + ".ShadowMapCasterParaboloid",
-                                ShadowMapRenderStage = shadowCasterParaboloidRenderStage,
+                                ShadowMapRenderStage = shadowCasterRenderStage,
                                 RenderGroup = groupMask,
                             },
                             new ShadowMapRenderStageSelector
                             {
                                 EffectName = modelEffectName + ".ShadowMapCasterCubeMap",
-                                ShadowMapRenderStage = shadowCasterCubeMapRenderStage,
+                                ShadowMapRenderStage = shadowCasterRenderStage,
                                 RenderGroup = groupMask,
                             },
                         },
                         PipelineProcessors =
                         {
                             new MeshPipelineProcessor { TransparentRenderStage = transparentRenderStage },
-                            new ShadowMeshPipelineProcessor { ShadowMapRenderStage = shadowCasterRenderStage },
-                            new ShadowMeshPipelineProcessor { ShadowMapRenderStage = shadowCasterParaboloidRenderStage, DepthClipping = true },
-                            new ShadowMeshPipelineProcessor { ShadowMapRenderStage = shadowCasterCubeMapRenderStage, DepthClipping = true },
+                            new ShadowMeshPipelineProcessor { ShadowMapRenderStage = shadowCasterRenderStage, DepthClipping = true },
                         },
                     },
                     new SpriteRenderFeature
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/SceneCameraRenderer.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/SceneCameraRenderer.cs
index 9842838e31..7fb8a99c33 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/SceneCameraRenderer.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/SceneCameraRenderer.cs
@@ -1,10 +1,13 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Collections.Generic;
 using Xenko.Core;
+using Xenko.Core.Collections;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.Mathematics;
 using Xenko.Engine;
+using Xenko.VirtualReality;
 
 namespace Xenko.Rendering.Compositing
 {
@@ -42,7 +45,7 @@ protected override void CollectCore(RenderContext context)
             base.CollectCore(context);
 
             // Find camera
-            var camera = ResolveCamera(context);
+            var camera = ResolveCamera();
             if (camera == null)
                 return;
 
@@ -60,7 +63,7 @@ protected override void CollectCore(RenderContext context)
         protected override void DrawCore(RenderContext context, RenderDrawContext drawContext)
         {
             // Find camera
-            var camera = ResolveCamera(context);
+            var camera = ResolveCamera();
             if (camera == null)
                 return;
 
@@ -71,10 +74,35 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
             }
         }
 
+        // find and set a camera if one wasn't already set
+        private CameraComponent SetFirstCamera(ref SceneCameraSlotId id, IEnumerable<Entity> es)
+        {
+            if (es == null) return null;
+
+            foreach (Entity e in es)
+            {
+                // do we have a camera?
+                CameraComponent cam = e.Get<CameraComponent>();
+
+                // do we need to check children?
+                if (cam == null)
+                    cam = SetFirstCamera(ref id, e.GetChildren());
+
+                // did we get a camera?
+                if (cam != null && cam.Enabled)
+                {
+                    cam.Slot = id;
+                    return cam;
+                }
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Resolves camera to the one contained in slot <see cref="Camera"/>.
         /// </summary>
-        protected virtual CameraComponent ResolveCamera(RenderContext renderContext)
+        internal virtual CameraComponent ResolveCamera()
         {
             if (Camera == null && !cameraSlotResolutionFailed)
                 Logger.Warning($"{nameof(SceneCameraRenderer)} [{Id}] has no camera set. Make sure to set camera to the renderer via the Graphic Compositor Editor.");
@@ -85,7 +113,37 @@ protected virtual CameraComponent ResolveCamera(RenderContext renderContext)
 
             var camera = Camera?.Camera;
             if (camera == null && !cameraResolutionFailed)
+            {
+                // no slot set, try to set one automatically
+                SceneSystem ss = ServiceRegistry.instance?.GetService<SceneSystem>();
+                GraphicsCompositor gc = ss?.GraphicsCompositor;
+                if (gc != null)
+                {
+                    // if there are no cameras in this compositor, make one
+                    if (gc.Cameras.Count == 0)
+                    {
+                        camera = new CameraComponent(0.1f, 800f);
+                        Entity camEntity = new Entity("AutomaticCamera");                        
+                        camEntity.Add(camera);
+                        ss.SceneInstance.RootScene.Entities.Add(camEntity);
+                        Guid Id = Guid.NewGuid();
+                        camera.Slot = new SceneCameraSlotId(Id);
+                        gc.Cameras.Add(new SceneCameraSlot() {
+                            Camera = camera,
+                            Name = "AutomaticCamera",
+                            Id = Id
+                        });
+                    }
+                    else
+                    {
+                        var id = gc.Cameras[0].ToSlotId();
+                        camera = SetFirstCamera(ref id, ss.SceneInstance.RootScene.Entities);
+                    }
+                }
+
+                if (camera == null)
                     Logger.Warning($"{nameof(SceneCameraRenderer)} [{Id}] has no camera assigned to its {nameof(CameraComponent.Slot)}[{Camera.Name}]. Make sure a camera is enabled and assigned to the corresponding {nameof(CameraComponent.Slot)}.");
+            }
 
             cameraResolutionFailed = camera == null;
 
@@ -129,6 +187,9 @@ public static void UpdateCameraToRenderView(RenderContext context, RenderView re
             camera.Update(aspectRatio);
 
             // Copy camera data
+            renderView.Camera = camera;
+            renderView.CameraFOV = camera.VerticalFieldOfView;
+            if (camera.VRDeviceManaging != null) renderView.CameraFOV *= camera.VRDeviceManaging.FOVScale;
             renderView.View = camera.ViewMatrix;
             renderView.Projection = camera.ProjectionMatrix;
             renderView.NearClipPlane = camera.NearClipPlane;
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/SceneExternalCameraRenderer.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/SceneExternalCameraRenderer.cs
index 63da6dbcda..e5a972ae35 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/SceneExternalCameraRenderer.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/SceneExternalCameraRenderer.cs
@@ -1,4 +1,4 @@
-using Xenko.Core.Annotations;
+using Xenko.Core.Annotations;
 using Xenko.Engine;
 
 namespace Xenko.Rendering.Compositing
@@ -14,9 +14,9 @@ public class SceneExternalCameraRenderer : SceneCameraRenderer
         /// <summary>
         /// Resolves camera to <see cref="ExternalCamera"/> rather than the default behavior.
         /// </summary>
-        protected override CameraComponent ResolveCamera(RenderContext renderContext)
+        internal override CameraComponent ResolveCamera()
         {
             return ExternalCamera;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/VRDeviceDescription.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/VRDeviceDescription.cs
index c53e57c6be..f5e38d76fe 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/VRDeviceDescription.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/VRDeviceDescription.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,10 +11,11 @@ namespace Xenko.Rendering.Compositing
     [DataContract]
     public class VRDeviceDescription
     {
+        // defaults to OpenXR, the only supported VR API
         [DataMember(10)]
-        public VRApi Api { get; set; }
+        public VRApi Api { get; set; } = VRApi.OpenXR;
 
         [DataMember(20)]
-        public float ResolutionScale { get; set; } = 1.0f;
+        public float ResolutionScale { get; set; } = 1f;
     }
 }
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/VROverlayRenderer.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/VROverlayRenderer.cs
deleted file mode 100644
index 8cdfe574d8..0000000000
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/VROverlayRenderer.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-using Xenko.Graphics;
-using Xenko.VirtualReality;
-
-namespace Xenko.Rendering.Compositing
-{
-    [DataContract]
-    public class VROverlayRenderer
-    {
-        [DataMember(10)]
-        public Texture Texture;
-
-        [DataMember(20)]
-        public Vector3 LocalPosition;
-
-        [DataMember(30)]
-        public Quaternion LocalRotation = Quaternion.Identity;
-
-        [DataMember(40)]
-        public Vector2 SurfaceSize = Vector2.One;
-
-        [DataMember(50)]
-        public bool FollowsHeadRotation;
-
-        [DataMemberIgnore]
-        public VROverlay Overlay;
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Rendering/Compositing/VRRendererSettings.cs b/sources/engine/Xenko.Engine/Rendering/Compositing/VRRendererSettings.cs
index faa6a8c597..223eea48ec 100644
--- a/sources/engine/Xenko.Engine/Rendering/Compositing/VRRendererSettings.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Compositing/VRRendererSettings.cs
@@ -31,14 +31,11 @@ public class VRRendererSettings
         /// </summary>
         /// <userdoc>Copy VR rendering to the current render target. Leave disabled to have different rendering on desktop than VR headset.</userdoc>
         [DataMember(25)]
-        [DefaultValue(true)]
-        public bool CopyMirror { get; set; } = true;
+        [DefaultValue(VRDeviceSystem.MIRROR_OPTION.SINGLE_EYE)]
+        public VRDeviceSystem.MIRROR_OPTION CopyMirror { get; set; } = VRDeviceSystem.MIRROR_OPTION.SINGLE_EYE;
 
         [DataMember(30)]
-        public List<VRDeviceDescription> RequiredApis { get; } = new List<VRDeviceDescription>();
-
-        [DataMember(40)]
-        public List<VROverlayRenderer> Overlays { get; } = new List<VROverlayRenderer>();
+        public VRDeviceDescription RequiredApi { get; } = new VRDeviceDescription();
 
         [DataMemberIgnore]
         public RenderView[] RenderViews = { new RenderView(), new RenderView() };
diff --git a/sources/engine/Xenko.Engine/Rendering/LightProbes/LightProbeProcessor.cs b/sources/engine/Xenko.Engine/Rendering/LightProbes/LightProbeProcessor.cs
index 7b86017bb5..4ccc2cd946 100644
--- a/sources/engine/Xenko.Engine/Rendering/LightProbes/LightProbeProcessor.cs
+++ b/sources/engine/Xenko.Engine/Rendering/LightProbes/LightProbeProcessor.cs
@@ -37,9 +37,9 @@ public void UpdateLightProbePositions()
                 // Collect LightProbes
                 var lightProbes = new FastList<LightProbeComponent>();
 
-                foreach (var lightProbe in ComponentDatas)
+                for (int i=0; i<ComponentDataKeys.Count; i++)
                 {
-                    lightProbes.Add(lightProbe.Key);
+                    lightProbes.Add(ComponentDataKeys[i]);
                 }
 
                 // Need at least 4 light probes to form a tetrahedron
diff --git a/sources/engine/Xenko.Engine/Rendering/Lights/LightProcessor.cs b/sources/engine/Xenko.Engine/Rendering/Lights/LightProcessor.cs
index 78c3014e66..9f9f697afb 100644
--- a/sources/engine/Xenko.Engine/Rendering/Lights/LightProcessor.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Lights/LightProcessor.cs
@@ -29,16 +29,9 @@ public LightProcessor()
         /// <inheritdoc/>
         public VisibilityGroup VisibilityGroup { get; set; }
 
-        /// <summary>
-        /// Gets the active lights.
-        /// </summary>
-        /// <value>The lights.</value>
-        public RenderLightCollection Lights { get; } = new RenderLightCollection(DefaultLightCapacityCount);
-
         public RenderLight GetRenderLight(LightComponent lightComponent)
         {
-            ComponentDatas.TryGetValue(lightComponent, out var renderLight);
-            return renderLight;
+            return KeyIndex.TryGetValue(lightComponent, out int index) ? ComponentDataValues[index] : null;
         }
 
         protected override RenderLight GenerateComponentData(Entity entity, LightComponent component) => new RenderLight();
@@ -48,27 +41,28 @@ public RenderLight GetRenderLight(LightComponent lightComponent)
         protected internal override void OnSystemAdd()
         {
             base.OnSystemAdd();
-            VisibilityGroup.Tags.Set(ForwardLightingRenderFeature.CurrentLights, Lights);
         }
 
         protected internal override void OnSystemRemove()
         {
-            VisibilityGroup.Tags.Set(ForwardLightingRenderFeature.CurrentLights, null);
             base.OnSystemRemove();
         }
 
         public override void Draw(RenderContext context)
         {
             // 1) Clear the cache of current lights (without destroying collections but keeping previously allocated ones)
-            Lights.Clear();
+            if (context.Lights == null)
+                context.Lights = new RenderLightCollection(DefaultLightCapacityCount);
+            else
+                context.Lights.Clear();
 
             var colorSpace = context.GraphicsDevice.ColorSpace;
 
             // 2) Prepare lights to be dispatched to the correct light group
-            foreach (var lightPair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var lightComponent = lightPair.Key;
-                var renderLight = lightPair.Value;
+                var lightComponent = ComponentDataKeys[i];
+                var renderLight = ComponentDataValues[i];
 
                 if (lightComponent.Type == null || !lightComponent.Enabled)
                 {
@@ -101,7 +95,7 @@ public override void Draw(RenderContext context)
                 // Compute bounding boxes
                 renderLight.UpdateBoundingBox();
 
-                Lights.Add(renderLight);
+                context.Lights.Add(renderLight);
             }
         }
     }
diff --git a/sources/engine/Xenko.Engine/Rendering/ModelRenderProcessor.cs b/sources/engine/Xenko.Engine/Rendering/ModelRenderProcessor.cs
index 97273cb7cb..d8a8947f92 100644
--- a/sources/engine/Xenko.Engine/Rendering/ModelRenderProcessor.cs
+++ b/sources/engine/Xenko.Engine/Rendering/ModelRenderProcessor.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Xenko.Core;
+using Xenko.Core.Annotations;
 using Xenko.Core.Extensions;
 using Xenko.Core.Mathematics;
 using Xenko.Core.Threading;
@@ -15,9 +16,8 @@ namespace Xenko.Rendering
 {
     public class ModelRenderProcessor : EntityProcessor<ModelComponent, RenderModel>, IEntityComponentRenderProcessor
     {
-        private Material fallbackMaterial;
-
-        public Dictionary<ModelComponent, RenderModel> RenderModels => ComponentDatas;
+        public List<RenderModel> RenderModels => ComponentDataValues;
+        public List<ModelComponent> ModelComponents => ComponentDataKeys;
 
         public VisibilityGroup VisibilityGroup { get; set; }
 
@@ -28,16 +28,7 @@ public ModelRenderProcessor() : base(typeof(TransformComponent))
         /// <inheritdoc />
         protected internal override void OnSystemAdd()
         {
-            var graphicsDevice = Services.GetSafeServiceAs<IGraphicsDeviceService>().GraphicsDevice;
-
-            fallbackMaterial = Material.New(graphicsDevice, new MaterialDescriptor
-            {
-                Attributes =
-                {
-                    Diffuse = new MaterialDiffuseMapFeature(new ComputeTextureColor()),
-                    DiffuseModel = new MaterialDiffuseLambertModelFeature(),
-                },
-            });
+        
         }
 
         /// <inheritdoc />
@@ -66,27 +57,64 @@ protected override void OnEntityComponentRemoved(Entity entity, ModelComponent c
             }
         }
 
+        protected override void OnEntityComponentAdding(Entity entity, [NotNull] ModelComponent component, [NotNull] RenderModel data)
+        {
+            base.OnEntityComponentAdding(entity, component, data);
+            if (component.ForceModelUpdateCount < 1)
+                component.ForceModelUpdateCount = 1;
+        }
+
+        internal List<int> checkMeshes = new List<int>();
+        internal List<int> updateMeshes = new List<int>();
+
         /// <inheritdoc />
         public override void Draw(RenderContext context)
         {
-            // Note: we are rebuilding RenderMeshes every frame
-            // TODO: check if it wouldn't be better to add/remove directly in CheckMeshes()?
-            //foreach (var entity in ComponentDatas)
-            Dispatcher.ForEach(ComponentDatas, entity =>
+            checkMeshes.Clear();
+            updateMeshes.Clear();
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var modelComponent = entity.Key;
-                var renderModel = entity.Value;
+                var modelComponent = ComponentDataKeys[i];
+                if (modelComponent == null) continue;
+                var renderModel = ComponentDataValues[i];
+                if (renderModel == null) continue;
+
+                if (modelComponent.FixedModel == false ||
+                    modelComponent.ForceModelUpdateCount > 0 ||
+                    modelComponent.Entity.Transform.UpdateImmobilePosition)
+                {
+                    checkMeshes.Add(i);
+                    if (modelComponent.Model != null)
+                        updateMeshes.Add(i);
+                }
+                else if (modelComponent.Entity.Transform.Immobile == IMMOBILITY.FullMotion &&
+                         modelComponent.Model != null)
+                {
+                    updateMeshes.Add(i);
+                }
+            }
 
+            Dispatcher.For(0, checkMeshes.Count, j =>
+            {
+                var i = checkMeshes[j];
+                var modelComponent = ComponentDataKeys[i];
+                var renderModel = ComponentDataValues[i];
+                if (modelComponent.ForceModelUpdateCount > 0)
+                    modelComponent.ForceModelUpdateCount--;
                 CheckMeshes(modelComponent, renderModel);
+            });
+
+            Dispatcher.For(0, updateMeshes.Count, j =>
+            {
+                var i = updateMeshes[j];
+                var modelComponent = ComponentDataKeys[i];
+                var renderModel = ComponentDataValues[i];
                 UpdateRenderModel(modelComponent, renderModel);
             });
         }
 
         private void UpdateRenderModel(ModelComponent modelComponent, RenderModel renderModel)
         {
-            if (modelComponent.Model == null)
-                return;
-
             var modelViewHierarchy = modelComponent.Skeleton;
             var nodeTransformations = modelViewHierarchy.NodeTransformations;
 
@@ -99,7 +127,7 @@ private void UpdateRenderModel(ModelComponent modelComponent, RenderModel render
                 for (int pass = 0; pass < passes; ++pass, ++meshIndex)
                 {
                     var renderMesh = renderModel.Meshes[meshIndex];
-
+                    
                     renderMesh.Enabled = modelComponent.Enabled;
                     renderMesh.RenderGroup = modelComponent.RenderGroup;
 
@@ -109,29 +137,31 @@ private void UpdateRenderModel(ModelComponent modelComponent, RenderModel render
                         var mesh = renderModel.Model.Meshes[sourceMeshIndex];
                         var meshInfo = modelComponent.MeshInfos[sourceMeshIndex];
                         var nodeIndex = mesh.NodeIndex;
+                        renderMesh.DistanceSortFudge = modelComponent.DistanceSortFudge;
+                        if (modelComponent.SkipCullIfSmall)
+                            renderMesh.SmallFactorMultiplier = 0f;
+                        else if (renderModel.Model.SmallFactorMultiplierOverride > 0.000001f)
+                            renderMesh.SmallFactorMultiplier = renderModel.Model.SmallFactorMultiplierOverride;
+                        else if (modelComponent.SmallFactorMultiplier > 0.000001f)
+                            renderMesh.SmallFactorMultiplier = modelComponent.SmallFactorMultiplier;
+                        else
+                            renderMesh.SmallFactorMultiplier = 1f;
                         renderMesh.World = nodeTransformations[nodeIndex].WorldMatrix;
                         renderMesh.IsScalingNegative = nodeTransformations[nodeIndex].IsScalingNegative;
-                        renderMesh.BoundingBox = new BoundingBoxExt(meshInfo.BoundingBox);
+                        renderMesh.BoundingBox.Center = (meshInfo.BoundingBox.Maximum + meshInfo.BoundingBox.Minimum) * 0.5f;
+                        renderMesh.BoundingBox.Extent = (meshInfo.BoundingBox.Maximum - meshInfo.BoundingBox.Minimum) * 0.5f;
                         renderMesh.BlendMatrices = meshInfo.BlendMatrices;
                     }
                 }
             }
         }
 
-        private void UpdateMaterial(RenderMesh renderMesh, MaterialPass materialPass, MaterialInstance modelMaterialInstance, ModelComponent modelComponent)
+        private void UpdateMaterial(RenderMesh renderMesh, MaterialPass materialPass, ModelComponent modelComponent)
         {
             renderMesh.MaterialPass = materialPass;
 
             renderMesh.IsShadowCaster = modelComponent.IsShadowCaster;
-            if (modelMaterialInstance != null)
-            {
-                renderMesh.IsShadowCaster = renderMesh.IsShadowCaster && modelMaterialInstance.IsShadowCaster;
-            }
-        }
-
-        private Material FindMaterial(Material materialOverride, MaterialInstance modelMaterialInstance)
-        {
-            return materialOverride ?? modelMaterialInstance?.Material ?? fallbackMaterial;
+            renderMesh.DepthMode = modelComponent.DepthMode;
         }
 
         private void CheckMeshes(ModelComponent modelComponent, RenderModel renderModel)
@@ -144,30 +174,43 @@ private void CheckMeshes(ModelComponent modelComponent, RenderModel renderModel)
                 if (model != null)
                 {
                     // Number of meshes changed in the model?
-                    if (model.Meshes.Count != renderModel.Meshes.Length)
+                    if (model.Meshes.Count != renderModel.UniqueMeshCount)
                         goto RegenerateMeshes;
 
                     if (modelComponent.Enabled)
                     {
                         // Check materials
-                        var modelComponentMaterials = modelComponent.Materials;
                         for (int sourceMeshIndex = 0; sourceMeshIndex < model.Meshes.Count; sourceMeshIndex++)
                         {
                             ref var material = ref renderModel.Materials[sourceMeshIndex];
                             var materialIndex = model.Meshes[sourceMeshIndex].MaterialIndex;
 
-                            var newMaterial = FindMaterial(modelComponentMaterials.SafeGet(materialIndex), model.Materials.GetItemOrNull(materialIndex));
+                            var newMaterial = modelComponent.GetMaterial(materialIndex);
 
                             // If material changed or its number of pass changed, trigger a full regeneration of RenderMeshes (note: we could do partial later)
                             if ((newMaterial?.Passes.Count ?? 1) != material.MeshCount)
                                 goto RegenerateMeshes;
 
-                            // Update materials
                             material.Material = newMaterial;
+
                             int meshIndex = material.MeshStartIndex;
-                            for (int pass = 0; pass < material.MeshCount; ++pass, ++meshIndex)
+                            if (meshIndex >= 0 && meshIndex < renderModel.Meshes.Length)
                             {
-                                UpdateMaterial(renderModel.Meshes[meshIndex], newMaterial?.Passes[pass], model.Materials.GetItemOrNull(materialIndex), modelComponent);
+                                var renderMesh = renderModel.Meshes[meshIndex];
+                                bool hasTransparency = false;
+
+                                for (int pass = 0; pass < material.MeshCount; ++pass, ++meshIndex)
+                                {
+                                    UpdateMaterial(renderMesh, newMaterial?.Passes[pass], modelComponent);
+                                    hasTransparency |= renderMesh.MaterialPass?.HasTransparency ?? false;
+                                }
+
+                                // make sure we are in the right stage if transparency changed
+                                if (renderMesh.lastTransparency != hasTransparency)
+                                {
+                                    renderMesh.lastTransparency = hasTransparency;
+                                    VisibilityGroup.ReevaluateActiveRenderStages(renderMesh);
+                                }
                             }
                         }
                     }
@@ -176,7 +219,7 @@ private void CheckMeshes(ModelComponent modelComponent, RenderModel renderModel)
                 return;
             }
 
-        RegenerateMeshes:
+RegenerateMeshes:
             renderModel.Model = model;
 
             // Remove old meshes
@@ -201,7 +244,7 @@ private void CheckMeshes(ModelComponent modelComponent, RenderModel renderModel)
             for (int sourceMeshIndex = 0; sourceMeshIndex < model.Meshes.Count; sourceMeshIndex++)
             {
                 var materialIndex = model.Meshes[sourceMeshIndex].MaterialIndex;
-                var material = FindMaterial(modelComponent.Materials.SafeGet(materialIndex), model.Materials.GetItemOrNull(materialIndex));
+                var material = modelComponent.GetMaterial(materialIndex);
                 var meshCount = material?.Passes.Count ?? 1;
                 renderModel.Materials[sourceMeshIndex] = new RenderModel.MaterialInfo { Material = material, MeshStartIndex = materialMeshCount, MeshCount = meshCount };
                 materialMeshCount += meshCount;
@@ -217,7 +260,6 @@ private void CheckMeshes(ModelComponent modelComponent, RenderModel renderModel)
 
                 for (int pass = 0; pass < material.MeshCount; ++pass, ++meshIndex)
                 {
-                    // TODO: Somehow, if material changed we might need to remove/add object in render system again (to evaluate new render stage subscription)
                     var materialIndex = mesh.MaterialIndex;
                     renderMeshes[meshIndex] = new RenderMesh
                     {
@@ -227,11 +269,13 @@ private void CheckMeshes(ModelComponent modelComponent, RenderModel renderModel)
                     };
 
                     // Update material
-                    UpdateMaterial(renderMeshes[meshIndex], material.Material?.Passes[pass], model.Materials.GetItemOrNull(materialIndex), modelComponent);
+                    UpdateMaterial(renderMeshes[meshIndex], material.Material?.Passes[pass], modelComponent);
+                    renderMeshes[meshIndex].lastTransparency = renderMeshes[meshIndex].MaterialPass?.HasTransparency ?? false;
                 }
             }
 
             renderModel.Meshes = renderMeshes;
+            renderModel.UniqueMeshCount = model.Meshes.Count;
 
             // Update before first add so that RenderGroup is properly set
             UpdateRenderModel(modelComponent, renderModel);
diff --git a/sources/engine/Xenko.Engine/Rendering/Sprites/SpriteRenderProcessor.cs b/sources/engine/Xenko.Engine/Rendering/Sprites/SpriteRenderProcessor.cs
index efe59003c2..612d520091 100644
--- a/sources/engine/Xenko.Engine/Rendering/Sprites/SpriteRenderProcessor.cs
+++ b/sources/engine/Xenko.Engine/Rendering/Sprites/SpriteRenderProcessor.cs
@@ -24,10 +24,11 @@ public SpriteRenderProcessor()
 
         public override void Draw(RenderContext gameTime)
         {
-            foreach (var spriteStateKeyPair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var spriteComponent = spriteStateKeyPair.Key;
-                var renderSprite = spriteStateKeyPair.Value.RenderSprite;
+                var spriteComponent = ComponentDataKeys[i];
+                var sprite = ComponentDataValues[i];
+                var renderSprite = sprite.RenderSprite;
                 var currentSprite = spriteComponent.CurrentSprite;
 
                 renderSprite.Enabled = spriteComponent.Enabled;
@@ -38,10 +39,11 @@ public override void Draw(RenderContext gameTime)
                     renderSprite.RotationEulerZ = spriteComponent.Entity.Transform.RotationEulerXYZ.Z;
 
                     renderSprite.RenderGroup = spriteComponent.RenderGroup;
-
+                    renderSprite.DistanceSortFudge = spriteComponent.DistanceSortFudge;
+                    renderSprite.SmallFactorMultiplier = spriteComponent.SmallFactorMultiplier;
                     renderSprite.Sprite = currentSprite;
                     renderSprite.SpriteType = spriteComponent.SpriteType;
-                    renderSprite.IgnoreDepth = spriteComponent.IgnoreDepth;
+                    renderSprite.DepthMode = spriteComponent.DepthMode;
                     renderSprite.Sampler = spriteComponent.Sampler;
                     renderSprite.BlendMode = spriteComponent.BlendMode;
                     renderSprite.Swizzle = spriteComponent.Swizzle;
@@ -56,9 +58,9 @@ public override void Draw(RenderContext gameTime)
 
                 // TODO Should we allow adding RenderSprite without a CurrentSprite instead? (if yes, need some improvement in RenderSystem)
                 var isActive = (currentSprite != null) && renderSprite.Enabled;
-                if (spriteStateKeyPair.Value.Active != isActive)
+                if (sprite.Active != isActive)
                 {
-                    spriteStateKeyPair.Value.Active = isActive;
+                    sprite.Active = isActive;
                     if (isActive)
                         VisibilityGroup.RenderObjects.Add(renderSprite);
                     else
diff --git a/sources/engine/Xenko.Engine/ShaderBuilderHelper/SceneMaker.cs b/sources/engine/Xenko.Engine/ShaderBuilderHelper/SceneMaker.cs
new file mode 100644
index 0000000000..8a977431d3
--- /dev/null
+++ b/sources/engine/Xenko.Engine/ShaderBuilderHelper/SceneMaker.cs
@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Engine;
+using Xenko.Games;
+using Xenko.Rendering;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.ProceduralModels;
+
+namespace Xenko.ShaderBuilderHelper
+{
+    /// <summary>
+    /// Helper class to build shaders for a game by loading materials and introducing them to different lights.
+    /// </summary>
+    public class SceneBuilder
+    {
+        public static List<Material> GetAllMaterials(string contentURLbase) 
+        {
+            Game curGame = ServiceRegistry.instance.GetService<IGame>() as Game;
+            ContentManager cm = curGame.Content;
+            string[] materials = cm.AllURLs(contentURLbase);
+            ConcurrentQueue<Material> materialList = new ConcurrentQueue<Material>();
+            Xenko.Core.Threading.Dispatcher.For(0, materials.Length, (i) =>
+            {
+                try
+                {
+                    materialList.Enqueue(cm.Load<Material>(materials[i]));
+                }
+                catch (Exception e)
+                {
+                    // probably not a material, skip
+                }
+            });
+
+            List<Material> ms = new List<Material>();
+            while (materialList.TryDequeue(out Material material))
+                ms.Add(material);
+
+            return ms;
+        }
+
+        public static Scene GetShaderBuilderScene(List<Material> materials_to_build)
+        {
+            Scene scene = new Scene();
+
+            // setup camera
+            CameraComponent camera_component = new CameraComponent();
+            Entity camEntity = new Entity("Camera");
+            camEntity.Add(camera_component);
+            scene.Entities.Add(camEntity);
+            Model basemodel = new Model();
+            CubeProceduralModel cube = new CubeProceduralModel();
+            cube.Generate(ServiceRegistry.instance, basemodel);
+            camEntity.Transform.Position.Z = 3f;
+
+            // setup materials
+            foreach (Material material in materials_to_build)
+            {
+                Entity e = new Entity();
+                ModelComponent mc = e.GetOrCreate<ModelComponent>();
+                Model m = new Model();
+                m.Materials.Add(material);
+                m.Meshes.Add(basemodel.Meshes[0]);
+                mc.Model = m;
+                e.Add(mc);
+                scene.Entities.Add(e);
+            }
+
+            // setup basic lighting base
+            Entity lightBase = new Entity("lightbase");
+            scene.Entities.Add(lightBase);
+
+            return scene;
+        }
+
+        public static void SetLightingSituation(Scene shader_build_scene, bool AmbientLight, bool DirectionalLight, int PointLights, int SpotLights, bool useShadows)
+        {
+            Entity lightbase = shader_build_scene.FindChild("lightbase");
+            lightbase.Transform.Children.Clear();
+           
+            if (AmbientLight)
+            {
+                Entity al = new Entity("AmbientLight");
+                LightComponent alc = new LightComponent();
+                alc.Type = new LightPoint();
+                al.Add(alc);
+                al.Transform.Parent = lightbase.Transform;
+            }
+
+            if (DirectionalLight)
+            {
+                Entity al = new Entity("DirectionalLight");
+                LightComponent alc = new LightComponent();
+                LightDirectional ld = new LightDirectional();
+                ld.Shadow.Enabled = useShadows;
+                alc.Type = ld;
+                al.Add(alc);
+                al.Transform.Parent = lightbase.Transform;
+            }
+
+            for (int i=0; i<PointLights; i++)
+            {
+                Entity al = new Entity("PointLight " + i);
+                LightComponent alc = new LightComponent();
+                LightPoint ld = new LightPoint();
+                ld.Shadow.Enabled = useShadows;
+                alc.Type = ld;
+                al.Add(alc);
+                al.Transform.Parent = lightbase.Transform;
+                al.Transform.Position.Z = 1f;
+            }
+
+            for (int i = 0; i < SpotLights; i++)
+            {
+                Entity al = new Entity("SpotLight " + i);
+                LightComponent alc = new LightComponent();
+                LightSpot ld = new LightSpot();
+                ld.Shadow.Enabled = useShadows;
+                alc.Type = ld;
+                al.Add(alc);
+                al.Transform.Parent = lightbase.Transform;
+                al.Transform.Position.Z = 1f;
+                al.Transform.Rotation = Core.Mathematics.Quaternion.Identity;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Engine/Shaders.Compiler/EffectCompilerFactory.cs b/sources/engine/Xenko.Engine/Shaders.Compiler/EffectCompilerFactory.cs
index 37e86be3db..96cba765ce 100644
--- a/sources/engine/Xenko.Engine/Shaders.Compiler/EffectCompilerFactory.cs
+++ b/sources/engine/Xenko.Engine/Shaders.Compiler/EffectCompilerFactory.cs
@@ -12,7 +12,7 @@ namespace Xenko.Shaders.Compiler
 {
     public static class EffectCompilerFactory
     {
-        public static IEffectCompiler CreateEffectCompiler(IVirtualFileProvider fileProvider, EffectSystem effectSystem = null, string packageName = null, EffectCompilationMode effectCompilationMode = EffectCompilationMode.Local, bool recordEffectRequested = false, TaskSchedulerSelector taskSchedulerSelector = null)
+        public static IEffectCompiler CreateEffectCompiler(IVirtualFileProvider fileProvider, EffectSystem effectSystem = null, string packageName = null, EffectCompilationMode effectCompilationMode = EffectCompilationMode.Local, TaskSchedulerSelector taskSchedulerSelector = null)
         {
             EffectCompilerBase compiler = null;
 
@@ -27,32 +27,6 @@ public static IEffectCompiler CreateEffectCompiler(IVirtualFileProvider fileProv
             }
 #endif
 
-            // Nothing to do remotely
-            bool needRemoteCompiler = (compiler == null && (effectCompilationMode & EffectCompilationMode.Remote) != 0);
-            if (needRemoteCompiler || recordEffectRequested)
-            {
-                // Create the object that handles the connection
-                var shaderCompilerTarget = new RemoteEffectCompilerClient(packageName);
-
-                if (recordEffectRequested)
-                {
-                    // Let's notify effect compiler server for each new effect requested
-                    effectSystem.EffectUsed += shaderCompilerTarget.NotifyEffectUsed;
-                }
-
-                // Use remote only if nothing else was found before (i.e. a local compiler)
-                if (needRemoteCompiler)
-                {
-                    // Create a remote compiler
-                    compiler = new RemoteEffectCompiler(fileProvider, shaderCompilerTarget);
-                }
-                else
-                {
-                    // Otherwise, EffectSystem takes ownership of shaderCompilerTarget
-                    shaderCompilerTarget.DisposeBy(effectSystem);
-                }
-            }
-
             // Local not possible or allowed, and remote not allowed either => switch back to null compiler
             if (compiler == null)
             {
diff --git a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompiler.cs b/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompiler.cs
deleted file mode 100644
index d4308226f8..0000000000
--- a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompiler.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using Xenko.Core.IO;
-using Xenko.Core.Serialization.Contents;
-using Xenko.Core.Storage;
-
-namespace Xenko.Shaders.Compiler
-{
-    /// <summary>
-    /// Compiles effect remotely on the developer host PC.
-    /// </summary>
-    internal class RemoteEffectCompiler : EffectCompilerBase
-    {
-        private RemoteEffectCompilerClient remoteEffectCompilerClient;
-
-        /// <inheritdoc/>
-        public override IVirtualFileProvider FileProvider { get; set; }
-
-        public RemoteEffectCompiler(IVirtualFileProvider fileProvider, RemoteEffectCompilerClient remoteEffectCompilerClient)
-        {
-            FileProvider = fileProvider;
-            this.remoteEffectCompilerClient = remoteEffectCompilerClient;
-        }
-
-        protected override void Destroy()
-        {
-            remoteEffectCompilerClient.Dispose();
-
-            base.Destroy();
-        }
-
-        /// <inheritdoc/>
-        public override ObjectId GetShaderSourceHash(string type)
-        {
-            var url = GetStoragePathFromShaderType(type);
-            ((DatabaseFileProvider)FileProvider).ContentIndexMap.TryGetValue(url, out var shaderSourceId);
-            return shaderSourceId;
-        }
-
-        /// <inheritdoc/>
-        public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSource mixinTree, EffectCompilerParameters effectParameters, CompilerParameters compilerParameters = null)
-        {
-            return CompileAsync(mixinTree, effectParameters);
-        }
-
-        private async Task<EffectBytecodeCompilerResult> CompileAsync(ShaderMixinSource mixinTree, EffectCompilerParameters effectParameters)
-        {
-            return await remoteEffectCompilerClient.Compile(mixinTree, effectParameters);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerClient.cs b/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerClient.cs
deleted file mode 100644
index 6ca3a76c94..0000000000
--- a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerClient.cs
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Xenko.Core.Serialization;
-using Xenko.Engine.Network;
-using Xenko.Shaders.Compiler.Internals;
-
-namespace Xenko.Shaders.Compiler
-{
-    /// <summary>
-    /// Used internally by <see cref="RemoteEffectCompiler"/> to compile shaders remotely,
-    /// and <see cref="Rendering.EffectSystem.CreateEffectCompiler"/> to record effect requested.
-    /// </summary>
-    internal class RemoteEffectCompilerClient : IDisposable
-    {
-        private readonly object lockObject = new object();
-        private readonly string packageName;
-        private Task<SocketMessageLayer> socketMessageLayerTask;
-        private CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-
-        public RemoteEffectCompilerClient(string packageName)
-        {
-            this.packageName = packageName;
-        }
-
-        public void Dispose()
-        {
-            // Notify cancellation
-            cancellationTokenSource.Cancel();
-            if (socketMessageLayerTask != null && socketMessageLayerTask.Status == TaskStatus.RanToCompletion)
-            {
-                socketMessageLayerTask.Result.Context.Dispose();
-                socketMessageLayerTask = null;
-            }
-        }
-
-        public void NotifyEffectUsed(EffectCompileRequest effectCompileRequest, CompilerResults result)
-        {
-            if (result.HasErrors)
-                return;
-
-            Task.Run(async () =>
-            {
-                // Silently fails if connection already failed previously
-                var socketMessageLayerTask = GetOrCreateConnection(cancellationTokenSource.Token);
-                if (socketMessageLayerTask.IsFaulted)
-                    return;
-
-                var bytecode = await result.Bytecode.AwaitResult();
-                if (bytecode.CompilationLog.HasErrors)
-                    return;
-
-                // Ignore everything that has been compiled by the startup cache
-                if (bytecode.LoadSource == EffectBytecodeCacheLoadSource.StartupCache)
-                    return;
-
-                // Send any effect request remotely (should fail if not connected)
-                var socketMessageLayer = await socketMessageLayerTask;
-
-                var memoryStream = new MemoryStream();
-                var binaryWriter = new BinarySerializationWriter(memoryStream);
-                binaryWriter.Context.SerializerSelector = SerializerSelector.AssetWithReuse;
-                binaryWriter.SerializeExtended(effectCompileRequest, ArchiveMode.Serialize, null);
-
-                await socketMessageLayer.Send(new RemoteEffectCompilerEffectRequested { Request = memoryStream.ToArray() });
-            });
-        }
-
-        public async Task<SocketMessageLayer> Connect(string packageName, CancellationToken cancellationToken)
-        {
-            var url = $"/service/Xenko.EffectCompilerServer/{XenkoVersion.NuGetVersion}/Xenko.EffectCompilerServer.exe";
-            if (packageName != null)
-                url += string.Format("?packagename={0}", packageName);
-
-            var socketContext = await RouterClient.RequestServer(url, cancellationToken);
-
-            var socketMessageLayer = new SocketMessageLayer(socketContext, false);
-
-            // Register network VFS
-            NetworkVirtualFileProvider.RegisterServer(socketMessageLayer);
-
-            Task.Run(() => socketMessageLayer.MessageLoop());
-
-            return socketMessageLayer;
-        }
-
-        public async Task<EffectBytecodeCompilerResult> Compile(ShaderMixinSource mixinTree, EffectCompilerParameters effectParameters)
-        {
-            // Make sure we are connected
-            // TODO: Handle reconnections, etc...
-            var socketMessageLayer = await GetOrCreateConnection(cancellationTokenSource.Token);
-
-            var shaderCompilerAnswer = (RemoteEffectCompilerEffectAnswer)await socketMessageLayer.SendReceiveAsync(new RemoteEffectCompilerEffectRequest
-            {
-                MixinTree = mixinTree,
-                EffectParameters = effectParameters,
-            });
-
-            var result = new EffectBytecodeCompilerResult(shaderCompilerAnswer.EffectBytecode, EffectBytecodeCacheLoadSource.JustCompiled);
-
-            foreach (var message in shaderCompilerAnswer.LogMessages)
-                result.CompilationLog.Messages.Add(message);
-
-            result.CompilationLog.HasErrors = shaderCompilerAnswer.LogHasErrors;
-
-            return result;
-        }
-
-        private async Task<SocketMessageLayer> GetOrCreateConnection(CancellationToken cancellationToken)
-        {
-            // Lazily connect
-            lock (lockObject)
-            {
-                if (socketMessageLayerTask == null)
-                    socketMessageLayerTask = Task.Run(() => Connect(packageName, cancellationToken));
-            }
-
-            return await socketMessageLayerTask;
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectAnswer.cs b/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectAnswer.cs
deleted file mode 100644
index de4da61498..0000000000
--- a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectAnswer.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System.Collections.Generic;
-using Xenko.Core.Diagnostics;
-using Xenko.Engine.Network;
-
-namespace Xenko.Shaders.Compiler
-{
-    // TODO: Make that private as soon as we stop signing assemblies (so that EffectCompilerServer can use it)
-    public class RemoteEffectCompilerEffectAnswer : SocketMessage
-    {
-        // TODO: Support LoggerResult as well
-        public EffectBytecode EffectBytecode { get; set; }
-
-        public List<SerializableLogMessage> LogMessages { get; set; }
-
-        public bool LogHasErrors { get; set; }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectRequest.cs b/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectRequest.cs
deleted file mode 100644
index a109890a7b..0000000000
--- a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectRequest.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Engine.Network;
-
-namespace Xenko.Shaders.Compiler
-{
-    // TODO: Make that private as soon as we stop signing assemblies (so that EffectCompilerServer can use it)
-    public class RemoteEffectCompilerEffectRequest : SocketMessage
-    {
-        public ShaderMixinSource MixinTree { get; set; }
-        
-        public EffectCompilerParameters EffectParameters { get; set; }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectRequested.cs b/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectRequested.cs
deleted file mode 100644
index c5dfa32ab0..0000000000
--- a/sources/engine/Xenko.Engine/Shaders.Compiler/RemoteEffectCompilerEffectRequested.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Core;
-
-namespace Xenko.Shaders.Compiler
-{
-    [DataContract]
-    public class RemoteEffectCompilerEffectRequested
-    {
-        // EffectCompileRequest serialized (so that it can be forwarded by EffectCompilerServer without being deserialized, since it might contain unknown types)
-        public byte[] Request { get; set; }
-    }
-}
diff --git a/sources/engine/Xenko.Engine/Starter/AndroidXenkoActivity.cs b/sources/engine/Xenko.Engine/Starter/AndroidXenkoActivity.cs
index 65aa27d047..8af6a59838 100644
--- a/sources/engine/Xenko.Engine/Starter/AndroidXenkoActivity.cs
+++ b/sources/engine/Xenko.Engine/Starter/AndroidXenkoActivity.cs
@@ -21,6 +21,8 @@
 
 namespace Xenko.Starter
 {
+    using Resource = Xenko.Engine.Resource;
+    
     // NOTE: the class should implement View.IOnSystemUiVisibilityChangeListener but doing so will prevent the engine to work on Android below 3.0 (API Level 11 is mandatory).
     // So the methods are implemented but the class does not implement View.IOnSystemUiVisibilityChangeListener.
     // Maybe this will change when support for API Level 10 is dropped
diff --git a/sources/engine/Xenko.Engine/Updater/UpdatableCustomAccessor.cs b/sources/engine/Xenko.Engine/Updater/UpdatableCustomAccessor.cs
index e60b4e1f93..e73004c4d1 100644
--- a/sources/engine/Xenko.Engine/Updater/UpdatableCustomAccessor.cs
+++ b/sources/engine/Xenko.Engine/Updater/UpdatableCustomAccessor.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Reflection;
+using Xenko.Core;
 
 namespace Xenko.Updater
 {
diff --git a/sources/engine/Xenko.Engine/Updater/UpdatableProperty.cs b/sources/engine/Xenko.Engine/Updater/UpdatableProperty.cs
index 117ef03de0..4d993474df 100644
--- a/sources/engine/Xenko.Engine/Updater/UpdatableProperty.cs
+++ b/sources/engine/Xenko.Engine/Updater/UpdatableProperty.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using Xenko.Core;
 
 namespace Xenko.Updater
 {
@@ -13,11 +14,15 @@ public abstract class UpdatableProperty : UpdatablePropertyBase
     {
         public readonly IntPtr Getter;
         public readonly IntPtr Setter;
+        public readonly bool VirtualDispatchGetter;
+        public readonly bool VirtualDispatchSetter;
 
-        protected UpdatableProperty(IntPtr getter, IntPtr setter)
+        protected UpdatableProperty(IntPtr getter, bool virtualDispatchGetter, IntPtr setter, bool virtualDispatchSetter)
         {
             Getter = getter;
             Setter = setter;
+            VirtualDispatchGetter = virtualDispatchGetter;
+            VirtualDispatchSetter = virtualDispatchSetter;
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Engine/Updater/UpdatablePropertyObject.cs b/sources/engine/Xenko.Engine/Updater/UpdatablePropertyObject.cs
index 9b652f3581..f4c34ee386 100644
--- a/sources/engine/Xenko.Engine/Updater/UpdatablePropertyObject.cs
+++ b/sources/engine/Xenko.Engine/Updater/UpdatablePropertyObject.cs
@@ -10,7 +10,7 @@ namespace Xenko.Updater
     /// <typeparam name="T">The property type.</typeparam>
     public class UpdatablePropertyObject<T> : UpdatableProperty
     {
-        public UpdatablePropertyObject(IntPtr getter, IntPtr setter) : base(getter, setter)
+        public UpdatablePropertyObject(IntPtr getter, bool virtualDispatchGetter, IntPtr setter, bool virtualDispatchSetter) : base(getter, virtualDispatchGetter, setter, virtualDispatchSetter)
         {
         }
 
diff --git a/sources/engine/Xenko.Engine/Updater/UpdatablePropertyT.cs b/sources/engine/Xenko.Engine/Updater/UpdatablePropertyT.cs
index 669c5d12c7..a5d765c33b 100644
--- a/sources/engine/Xenko.Engine/Updater/UpdatablePropertyT.cs
+++ b/sources/engine/Xenko.Engine/Updater/UpdatablePropertyT.cs
@@ -12,8 +12,7 @@ namespace Xenko.Updater
     /// <typeparam name="T">The property type.</typeparam>
     public class UpdatableProperty<T> : UpdatableProperty where T : struct
     {
-        public UpdatableProperty(IntPtr getter, IntPtr setter)
-            : base(getter, setter)
+        public UpdatableProperty(IntPtr getter, bool virtualDispatchGetter, IntPtr setter, bool virtualDispatchSetter) : base(getter, virtualDispatchGetter, setter, virtualDispatchSetter)
         {
         }
 
diff --git a/sources/engine/Xenko.Engine/Updater/UpdateEngine.cs b/sources/engine/Xenko.Engine/Updater/UpdateEngine.cs
index 01df3b3240..b8c48b8a86 100644
--- a/sources/engine/Xenko.Engine/Updater/UpdateEngine.cs
+++ b/sources/engine/Xenko.Engine/Updater/UpdateEngine.cs
@@ -723,7 +723,7 @@ private struct Blittable16
         /// <summary>
         /// Internally used as key to register members.
         /// </summary>
-        private struct UpdateKey
+        private struct UpdateKey : IEquatable<UpdateKey>
         {
             public readonly Type Owner;
             public readonly string Name;
@@ -738,6 +738,26 @@ public override string ToString()
             {
                 return $"{Owner.Name}.{Name}";
             }
+
+            public bool Equals(UpdateKey other)
+            {
+                return Owner == other.Owner && Name == other.Name;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is UpdateKey key && Equals(key);
+            }
+
+            public override int GetHashCode()
+            {
+                unchecked
+                {
+                    int hashCode = Owner.GetHashCode();
+                    hashCode = (hashCode * 397) ^ Name.GetHashCode();
+                    return hashCode;
+                }
+            }
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Engine/Xenko.Engine.csproj b/sources/engine/Xenko.Engine/Xenko.Engine.csproj
index 8c163c3073..28b52b8250 100644
--- a/sources/engine/Xenko.Engine/Xenko.Engine.csproj
+++ b/sources/engine/Xenko.Engine/Xenko.Engine.csproj
@@ -1,12 +1,10 @@
 <Project>
-
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
 
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -16,29 +14,18 @@
     <XenkoAssemblyProcessorOptions>$(XenkoAssemblyProcessorDefaultOptions)</XenkoAssemblyProcessorOptions>
     <XenkoProjectPlatformDependentWindows>true</XenkoProjectPlatformDependentWindows>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <RestorePackages>true</RestorePackages>
     <RootNamespace>Xenko</RootNamespace>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
     <XenkoPackAssets>true</XenkoPackAssets>
+    <!-- force generate Resource.designer.cs to namespace Xenko.Engine to fix issue #553 -->
+    <AndroidResgenNamespace>Xenko.Engine</AndroidResgenNamespace>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="Resources\Resource.Designer.cs" />
   </ItemGroup>
-  <Choose>
-    <When Condition=" '$(XenkoPlatform)' == 'Android'">
-      <PropertyGroup>
-        <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
-      </PropertyGroup>
-      <ItemGroup>
-        <Compile Include="Resources\Resource.Designer.cs" />
-        <AndroidResource Include="Resources\Layout\Game.axml">
-          <SubType>AndroidResource</SubType>
-        </AndroidResource>
-        <Reference Include="System.Xml" />
-      </ItemGroup>
-    </When>
-  </Choose>
 
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
@@ -46,8 +33,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.7.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
     <ProjectReference Include="..\Xenko.Audio\Xenko.Audio.csproj" />
     <ProjectReference Include="..\Xenko.Rendering\Xenko.Rendering.csproj" />
     <ProjectReference Include="..\Xenko.VirtualReality\Xenko.VirtualReality.csproj" />
@@ -65,12 +52,8 @@
     </When>
   </Choose>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
diff --git a/sources/engine/Xenko.FontCompiler/Xenko.FontCompiler.csproj b/sources/engine/Xenko.FontCompiler/Xenko.FontCompiler.csproj
index a5ae3b3ce9..a778f704cc 100644
--- a/sources/engine/Xenko.FontCompiler/Xenko.FontCompiler.csproj
+++ b/sources/engine/Xenko.FontCompiler/Xenko.FontCompiler.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
   </PropertyGroup>
@@ -19,5 +19,5 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Games.Testing/Xenko.Games.Testing.csproj b/sources/engine/Xenko.Games.Testing/Xenko.Games.Testing.csproj
index d189168d07..4e108e1ea5 100644
--- a/sources/engine/Xenko.Games.Testing/Xenko.Games.Testing.csproj
+++ b/sources/engine/Xenko.Games.Testing/Xenko.Games.Testing.csproj
@@ -3,7 +3,7 @@
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
@@ -29,5 +29,5 @@
     <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Games/Desktop/GameForm.cs b/sources/engine/Xenko.Games/Desktop/GameForm.cs
index 554967eec3..3e83ef8561 100644
--- a/sources/engine/Xenko.Games/Desktop/GameForm.cs
+++ b/sources/engine/Xenko.Games/Desktop/GameForm.cs
@@ -215,6 +215,7 @@ protected override void OnPaintBackground(PaintEventArgs e)
         /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
         private void OnPauseRendering(EventArgs e)
         {
+            GameBase.PauseRendering = true;
             PauseRendering?.Invoke(this, e);
         }
 
@@ -224,6 +225,7 @@ private void OnPauseRendering(EventArgs e)
         /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
         private void OnResumeRendering(EventArgs e)
         {
+            GameBase.PauseRendering = false;
             ResumeRendering?.Invoke(this, e);
         }
 
@@ -408,16 +410,20 @@ protected override void WndProc(ref Message m)
                 case Win32Native.WM_SYSKEYDOWN: //alt is down
                     if (wparam == VK_RETURN)
                     {
-                        isSwitchingFullScreen = true;
-                        if (!enableFullscreenToggle) return;
-                        OnFullscreenToggle(new EventArgs()); //we handle alt enter manually
-                        isSwitchingFullScreen = false;
+                        ToggleFullscreen();
                     }
                     break;
             }
             base.WndProc(ref m);
         }
 
+        public void ToggleFullscreen() {
+            if (!enableFullscreenToggle) return;
+            isSwitchingFullScreen = true;
+            OnFullscreenToggle(new EventArgs()); //we handle alt enter manually
+            isSwitchingFullScreen = false;        
+        }
+
         protected override void OnKeyUp(KeyEventArgs e)
         {
             if (IsSystemKeyToFilter(e))
diff --git a/sources/engine/Xenko.Games/Desktop/GamePlatformWindows.cs b/sources/engine/Xenko.Games/Desktop/GamePlatformWindows.cs
index 0065986db8..c2d0c7270e 100644
--- a/sources/engine/Xenko.Games/Desktop/GamePlatformWindows.cs
+++ b/sources/engine/Xenko.Games/Desktop/GamePlatformWindows.cs
@@ -31,7 +31,6 @@ internal class GamePlatformWindows : GamePlatform
     {
         public GamePlatformWindows(GameBase game) : base(game)
         {
-            IsBlockingRun = true;
 #if XENKO_PLATFORM_WINDOWS_DESKTOP && XENKO_RUNTIME_CORECLR
                 // This is required by the Audio subsystem of SharpDX.
             Win32Native.CoInitialize(IntPtr.Zero);
diff --git a/sources/engine/Xenko.Games/Desktop/GameWindowWinforms.cs b/sources/engine/Xenko.Games/Desktop/GameWindowWinforms.cs
index a39f52c20d..4a30abc9b0 100644
--- a/sources/engine/Xenko.Games/Desktop/GameWindowWinforms.cs
+++ b/sources/engine/Xenko.Games/Desktop/GameWindowWinforms.cs
@@ -42,6 +42,8 @@ internal GameWindowWinforms()
         {
         }
 
+        public override void EmulateMouseEvent(bool pressDown, bool left, int positionX, int positionY) { }
+
         public override WindowHandle NativeWindow
         {
             get
@@ -120,6 +122,21 @@ public override void EndScreenDeviceChange(int clientWidth, int clientHeight)
             deviceChangeWillBeFullScreen = null;
         }
 
+        public override bool IsFullscreen {
+            get {
+                GameForm gform = form as GameForm;
+                return gform == null ? false : gform.IsFullScreen;
+            }
+            set {
+                GameForm gform = form as GameForm;
+                if( gform != null ) {
+                    if( gform.IsFullScreen == value ) return;
+                    gform.ToggleFullscreen();
+                    gform.IsFullScreen = value;
+                }
+            }
+        }
+
         protected internal override void SetSupportedOrientations(DisplayOrientation orientations)
         {
             // Desktop doesn't have orientation (unless on Windows 8?)
@@ -157,6 +174,7 @@ protected override void Initialize(GameContext<Control> gameContext)
                 //gameForm.AppDeactivated += OnDeactivated;
                 gameForm.UserResized += OnClientSizeChanged;
                 gameForm.FullscreenToggle += OnFullscreenToggle;
+                gameForm.FormClosing += OnClosing;
             }
             else
             {
@@ -291,7 +309,7 @@ protected override void SetTitle(string title)
             }
         }
 
-        internal override void Resize(int width, int height)
+        public override void Resize(int width, int height)
         {
             Control.ClientSize = new Size(width, height);
         }
diff --git a/sources/engine/Xenko.Games/GameBase.cs b/sources/engine/Xenko.Games/GameBase.cs
index 5e9926ced6..474fb4a468 100644
--- a/sources/engine/Xenko.Games/GameBase.cs
+++ b/sources/engine/Xenko.Games/GameBase.cs
@@ -22,7 +22,9 @@
 // THE SOFTWARE.
 
 using System;
+using System.IO;
 using System.Reflection;
+using System.Threading;
 using Xenko.Core;
 using Xenko.Core.Annotations;
 using Xenko.Core.Diagnostics;
@@ -30,6 +32,7 @@
 using Xenko.Core.Serialization.Contents;
 using Xenko.Games.Time;
 using Xenko.Graphics;
+using Xenko.Graphics.SDL;
 
 namespace Xenko.Games
 {
@@ -47,22 +50,20 @@ public abstract class GameBase : ComponentBase, IGame
         private readonly int[] lastUpdateCount;
         private readonly float updateCountAverageSlowLimit;
         private readonly GamePlatform gamePlatform;
-        private TimeSpan singleFrameUpdateTime;
         private IGraphicsDeviceService graphicsDeviceService;
         protected IGraphicsDeviceManager graphicsDeviceManager;
         private ResumeManager resumeManager;
-        private bool isEndRunRequired;
         private bool isExiting;
         private bool suppressDraw;
         private bool beginDrawOk;
 
+        private TimeSpan defaultTimeSpan = TimeSpan.FromTicks(1);
         private TimeSpan totalUpdateTime;
         private TimeSpan totalDrawTime;
         private readonly TimeSpan maximumElapsedTime;
         private TimeSpan accumulatedElapsedGameTime;
         private TimeSpan lastFrameElapsedGameTime;
         private int nextLastUpdateCountIndex;
-        private bool drawRunningSlowly;
         private bool forceElapsedTimeToZero;
 
         private readonly TimerTick timer;
@@ -94,12 +95,13 @@ protected GameBase()
             timer = new TimerTick();
             IsFixedTimeStep = false;
             maximumElapsedTime = TimeSpan.FromMilliseconds(500.0);
-            TargetElapsedTime = TimeSpan.FromTicks(TimeSpan.TicksPerSecond / 60); // target elapsed time is by default 60Hz
             lastUpdateCount = new int[4];
             nextLastUpdateCountIndex = 0;
-            
+            TargetElapsedTime = defaultTimeSpan; // default empty timespan, will be set on window create if not set elsewhere
+
             TreatNotFocusedLikeMinimized = true;
-            WindowMinimumUpdateRate      = new ThreadThrottler(TimeSpan.FromSeconds(0d));
+            DrawEvenMinimized            = false;
+            WindowMinimumUpdateRate      = new ThreadThrottler(defaultTimeSpan); // will be set when window gets created with window's refresh rate
             MinimizedMinimumUpdateRate   = new ThreadThrottler(TimeSpan.FromTicks(TimeSpan.TicksPerSecond / 15)); // by default 15 updates per second while minimized
 
             // Calculate the updateCountAverageSlowLimit (assuming moving average is >=3 )
@@ -110,7 +112,7 @@ protected GameBase()
             updateCountAverageSlowLimit = (float)(maxLastCount + (lastUpdateCount.Length - maxLastCount)) / lastUpdateCount.Length;
 
             // Externals
-            Services = new ServiceRegistry();
+            Services = new ServiceRegistry(true);
 
             // Database file provider
             Services.AddService<IDatabaseFileProviderService>(new DatabaseFileProviderService(null));
@@ -158,8 +160,6 @@ protected GameBase()
         /// </summary>
         public event EventHandler<EventArgs> WindowCreated;
 
-        public event EventHandler<GameUnhandledExceptionEventArgs> UnhandledException;
-
         #endregion
 
         #region Public Properties
@@ -256,7 +256,7 @@ public TimerTick PlayTime
         /// Gets or sets a value indicating whether this instance should force exactly one update step per one draw step
         /// </summary>
         /// <value><c>true</c> if this instance forces one update step per one draw step; otherwise, <c>false</c>.</value>
-        protected internal bool ForceOneUpdatePerDraw { get; set; }
+        public bool ForceOneUpdatePerDraw { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether draw can happen as fast as possible, even when <see cref="IsFixedTimeStep"/> is set.
@@ -329,6 +329,17 @@ public bool IsMouseVisible
         /// </summary>
         public bool TreatNotFocusedLikeMinimized { get; set; }
 
+        /// <summary>
+        /// Draw even when minimized? Needed in VR
+        /// </summary>
+        public bool DrawEvenMinimized { get; set; }
+
+        /// <summary>
+        /// If the game fails to render correctly, automatically set a DefaultResolution.txt to 1280x720 windowed for troubleshooting? Defaults to true.
+        /// If your program does not have a resolution picker, you probably want this false. Must be set before window creation.
+        /// </summary>
+        public bool ResetWindowOnRenderFail { get; set; } = true;
+
         /// <summary>
         /// Gets the abstract window.
         /// </summary>
@@ -356,11 +367,6 @@ public GameWindow Window
 
         #endregion
 
-        internal EventHandler<GameUnhandledExceptionEventArgs> UnhandledExceptionInternal
-        {
-            get { return UnhandledException; }
-        }
-
         #region Public Methods and Operators
 
         /// <summary>
@@ -378,7 +384,6 @@ public void Exit()
         public void ResetElapsedTime()
         {
             forceElapsedTimeToZero = true;
-            drawRunningSlowly = false;
             Array.Clear(lastUpdateCount, 0, lastUpdateCount.Length);
             nextLastUpdateCountIndex = 0;
         }
@@ -430,7 +435,6 @@ internal void InitializeBeforeRun()
                         Update(updateTime);
                     }
                     updateTimer.Tick();
-                    singleFrameUpdateTime += updateTimer.ElapsedTime;
 
                     // Reset PlayTime
                     playTimer.Reset();
@@ -446,6 +450,114 @@ internal void InitializeBeforeRun()
             }
         }
 
+        /// <summary>
+        /// If AutoLoadDefaultSettings is true, these values will be set on game start. Set width & height to int.MaxValue to use highest native values.
+        /// </summary>
+        /// <returns>true if default settings changed</returns>
+        public bool SetDefaultSettings(int width, int height, bool fullscreen, float? fov = null, int displayindex = 0)
+        {
+            GetDefaultSettings(out int current_width, out int current_height, out bool current_fullscreen, out float outfov, out int outindex);
+            if (width == current_width && height == current_height && current_fullscreen == fullscreen && (fov.HasValue == false || fov == outfov) && outindex == displayindex) return false;
+            try
+            {
+                System.IO.File.WriteAllText(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + "/DefaultResolution.txt",
+                                            width.ToString() + "\n" +
+                                            height.ToString() + "\n" +
+                                            (fullscreen ? "fullscreen" : "window") + "\n" +
+                                            (fov ?? outfov).ToString() + "\n" +
+                                            displayindex.ToString());
+                return true;
+            }
+            catch (Exception e)
+            {
+                return false;
+            }
+        }
+
+        private bool settingsOverride = false, settingsOverrideFS;
+        private int settingsOverrideW, settingsOverrideH, settingsOverrideDisplay;
+
+        /// <summary>
+        /// Temporarily uses different settings this run, without changing the saved default settings. Set width & height to int.MaxValue to use highest native values.
+        /// </summary>
+        public void OverrideDefaultSettings(int width, int height, bool fullscreen, int displayindex = 0)
+        {
+            settingsOverride = true;
+            settingsOverrideW = width;
+            settingsOverrideH = height;
+            settingsOverrideFS = fullscreen;
+            settingsOverrideDisplay = displayindex;
+        }
+
+        /// <summary>
+        /// Gets default settings that will be used on game startup, if AutoLoadDefaultSettings is true. Caps resolution to native display resolution.
+        /// </summary>
+        public void GetDefaultSettings(out int width, out int height, out bool fullscreen, out float fov, out int displayindex, Window useSDLWindow = null)
+        {
+            string defaultFile = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + "/DefaultResolution.txt";
+            // default settings are maximum native resolution
+            bool gotCustomWH = false;
+            width = int.MaxValue;
+            height = int.MaxValue;
+            displayindex = 0;
+            fullscreen = true;
+            fov = -1f;
+            // wait, are we overriding settings?
+            if (settingsOverride)
+            {
+                width = settingsOverrideW;
+                height = settingsOverrideH;
+                fullscreen = settingsOverrideFS;
+                displayindex = settingsOverrideDisplay;
+                gotCustomWH = true;
+            }
+            else if (File.Exists(defaultFile))
+            {
+                try
+                {
+                    string[] vals = File.ReadAllLines(defaultFile);
+                    if (vals.Length >= 2)
+                        gotCustomWH = int.TryParse(vals[0].Trim(), out width) && int.TryParse(vals[1].Trim(), out height);
+                    if (vals.Length >= 3)
+                        fullscreen = vals[2].Trim().ToLower().StartsWith("full");
+                    if (vals.Length >= 4)
+                        float.TryParse(vals[3].Trim(), out fov);
+                    if (vals.Length >= 5)
+                        int.TryParse(vals[4].Trim(), out displayindex);
+                }
+                catch (Exception e) { }
+            }
+            try
+            {
+                // cap values to native resolution (try to use display window)
+                int native_width, native_height, refresh_rate;
+                if (useSDLWindow is Window gwsdl) displayindex = gwsdl.GetWindowDisplay();
+                Graphics.SDL.Window.GetDisplayInformation(out native_width, out native_height, out refresh_rate, displayindex);
+                if (width >= native_width || height >= native_height)
+                {
+                    // force fullscreen if using native or higher,
+                    // as crashes can happen on some hardware if using this big of a window
+                    width = native_width;
+                    height = native_height;
+                    fullscreen = true;
+                }
+                gotCustomWH = true;
+            }
+            catch (Exception e) { }
+            // make sure we got something valid
+            if (gotCustomWH == false)
+            {
+                width = 1280;
+                height = 720;
+                fullscreen = false;
+            }
+        }
+
+#if XENKO_PLATFORM_WINDOWS_DESKTOP && XENKO_GRAPHICS_API_VULKAN
+        [System.Runtime.InteropServices.DllImport("shcore.dll")]
+        private static extern bool SetProcessDpiAwareness(int dpimode);
+#endif
+
         /// <summary>
         /// Call this method to initialize the game, begin running the game loop, and start processing events for the game.
         /// </summary>
@@ -465,10 +577,25 @@ public void Run(GameContext gameContext = null)
                 throw new InvalidOperationException("No GraphicsDeviceManager found");
             }
 
+#if XENKO_PLATFORM_WINDOWS_DESKTOP && XENKO_GRAPHICS_API_VULKAN
+            try {
+                // fix scaling on Windows 8.1+
+                SetProcessDpiAwareness(2);
+            } catch(Exception e) { } // don't break if we are on windows 8 or lower
+#endif
+
+#if XENKO_GRAPHICS_API_VULKAN
+            // get the resolution now, so we can create our window with the right settings right from the start
+            GraphicsDeviceManager gdm = graphicsDeviceManager as GraphicsDeviceManager;
+            GetDefaultSettings(out gdm.preferredBackBufferWidth, out gdm.preferredBackBufferHeight, out bool fullScreen, out float fov, out int index, (gameContext as GameContextSDL)?.Control ?? null);
+            gdm.IsFullScreen = fullScreen;
             // Gets the GameWindow Context
+            Context = gameContext ?? GameContextFactory.NewDefaultGameContext(gdm.preferredBackBufferWidth, gdm.preferredBackBufferHeight, fullScreen, index);
+            PrepareContext(fov);
+#else
             Context = gameContext ?? GameContextFactory.NewDefaultGameContext();
-
-            PrepareContext();
+            PrepareContext();            
+#endif
 
             try
             {
@@ -483,30 +610,18 @@ public void Run(GameContext gameContext = null)
 
                 gamePlatform.Run(Context);
 
-                if (gamePlatform.IsBlockingRun)
-                {
-                    // If the previous call was blocking, then we can call Endrun
-                    EndRun();
-                }
-                else
-                {
-                    // EndRun will be executed on Game.Exit
-                    isEndRunRequired = true;
-                }
+                EndRun();
             }
             finally
             {
-                if (!isEndRunRequired)
-                {
-                    IsRunning = false;
-                }
+                IsRunning = false;
             }
         }
 
         /// <summary>
         /// Creates or updates <see cref="Context"/> before window and device are created.
         /// </summary>
-        protected virtual void PrepareContext()
+        protected virtual void PrepareContext(float overridefov = -1f)
         {
             // Content manager
             Content = new ContentManager(Services);
@@ -533,16 +648,14 @@ public void Tick()
             }
         }
 
+        internal static bool ShouldPresent = false, PauseRendering = false;
         private void TickInternal()
         {
             try
             {
                 // If this instance is existing, then don't make any further update/draw
                 if (isExiting)
-                {
-                    CheckEndRun();
                     return;
-                }
 
                 // If this instance is not active, sleep for an inactive sleep time
                 if (!IsActive)
@@ -582,8 +695,7 @@ private void TickInternal()
                 {
                     // If the rounded TargetElapsedTime is equivalent to current ElapsedAdjustedTime
                     // then make ElapsedAdjustedTime = TargetElapsedTime. We take the same internal rules as XNA
-                    if (Math.Abs(elapsedAdjustedTime.Ticks - TargetElapsedTime.Ticks) < (TargetElapsedTime.Ticks >> 6))
-                    {
+                    if (Math.Abs(elapsedAdjustedTime.Ticks - TargetElapsedTime.Ticks) < (TargetElapsedTime.Ticks >> 6)) {
                         elapsedAdjustedTime = TargetElapsedTime;
                     }
 
@@ -591,22 +703,16 @@ private void TickInternal()
                     accumulatedElapsedGameTime += elapsedAdjustedTime;
 
                     // Calculate the number of update to issue
-                    if (ForceOneUpdatePerDraw)
-                    {
+                    if (ForceOneUpdatePerDraw) {
                         updateCount = 1;
-                    }
-                    else
-                    {
+                    } else {
                         updateCount = (int)(accumulatedElapsedGameTime.Ticks / TargetElapsedTime.Ticks);
                     }
 
-                    if (IsDrawDesynchronized)
-                    {
+                    if (IsDrawDesynchronized) {
                         drawLag = accumulatedElapsedGameTime.Ticks % TargetElapsedTime.Ticks;
                         suppressNextDraw = false;
-                    }
-                    else if (updateCount == 0)
-                    {
+                    } else if (updateCount == 0) {
                         // If there is no need for update, then exit
                         return;
                     }
@@ -614,17 +720,13 @@ private void TickInternal()
                     // Calculate a moving average on updateCount
                     lastUpdateCount[nextLastUpdateCountIndex] = updateCount;
                     float updateCountMean = 0;
-                    for (int i = 0; i < lastUpdateCount.Length; i++)
-                    {
+                    for (int i = 0; i < lastUpdateCount.Length; i++) {
                         updateCountMean += lastUpdateCount[i];
                     }
 
                     updateCountMean /= lastUpdateCount.Length;
                     nextLastUpdateCountIndex = (nextLastUpdateCountIndex + 1) % lastUpdateCount.Length;
 
-                    // Test when we are running slowly
-                    drawRunningSlowly = updateCountMean > updateCountAverageSlowLimit;
-
                     // We are going to call Update updateCount times, so we can substract this from accumulated elapsed game time
                     accumulatedElapsedGameTime = new TimeSpan(accumulatedElapsedGameTime.Ticks - (updateCount * TargetElapsedTime.Ticks));
                     singleFrameElapsedTime = TargetElapsedTime;
@@ -633,7 +735,6 @@ private void TickInternal()
                 {
                     Array.Clear(lastUpdateCount, 0, lastUpdateCount.Length);
                     nextLastUpdateCountIndex = 0;
-                    drawRunningSlowly = false;
                 }
 
                 bool beginDrawSuccessful = false;
@@ -644,7 +745,7 @@ private void TickInternal()
                     // Reset the time of the next frame
                     for (lastFrameElapsedGameTime = TimeSpan.Zero; updateCount > 0 && !isExiting; updateCount--)
                     {
-                        updateTime.Update(totalUpdateTime, singleFrameElapsedTime, singleFrameUpdateTime, drawRunningSlowly, true);
+                        updateTime.Update(totalUpdateTime, singleFrameElapsedTime, true);
                         try
                         {
                             UpdateAndProfile(updateTime);
@@ -664,7 +765,6 @@ private void TickInternal()
 
                     // End measuring update time
                     updateTimer.Tick();
-                    singleFrameUpdateTime += updateTimer.ElapsedTime;
 
                     // Update game time just before calling draw
                     //updateTime.Update(totalUpdateTime, singleFrameElapsedTime, singleFrameUpdateTime, drawRunningSlowly, true);
@@ -675,8 +775,6 @@ private void TickInternal()
                         DrawInterpolationFactor = drawLag / (float)TargetElapsedTime.Ticks;
                         DrawFrame();
                     }
-
-                    singleFrameUpdateTime = TimeSpan.Zero;
                 }
                 finally
                 {
@@ -684,15 +782,15 @@ private void TickInternal()
                     {
                         using (Profiler.Begin(GameProfilingKeys.GameEndDraw))
                         {
-                            EndDraw(true);
-                            if (gamePlatform.MainWindow.IsMinimized || gamePlatform.MainWindow.Visible == false || (gamePlatform.MainWindow.Focused == false && TreatNotFocusedLikeMinimized))
-                                MinimizedMinimumUpdateRate.Throttle(out _);
-                            else
-                                WindowMinimumUpdateRate.Throttle(out _);
+                            bool presenting = ShouldPresent && !PauseRendering;
+                            EndDraw(presenting);
+
+                            if (!presenting || TreatNotFocusedLikeMinimized && gamePlatform.MainWindow.Focused == false)
+	                            MinimizedMinimumUpdateRate.Throttle(out _);
+	                        else
+	                            WindowMinimumUpdateRate.Throttle(out _);
                         }
                     }
-
-                    CheckEndRun();
                 }
             }
             catch (Exception ex)
@@ -702,15 +800,6 @@ private void TickInternal()
             }
         }
 
-        private void CheckEndRun()
-        {
-            if (isExiting && IsRunning && isEndRunRequired)
-            {
-                EndRun();
-                IsRunning = false;
-            }
-        }
-
         #endregion
 
         #region Methods
@@ -855,9 +944,16 @@ protected virtual void EndRun()
         {
         }
 
+        /// <summary>
+        /// Stores a reference to the main GameBase thread
+        /// </summary>
+        public static Thread RenderingThread { get; private set; }
+
         /// <summary>Called after the Game is created, but before GraphicsDevice is available and before LoadContent(). Reference page contains code sample.</summary>
         protected virtual void Initialize()
         {
+            RenderingThread = Thread.CurrentThread;
+
             GameSystems.Initialize();
         }
 
@@ -901,9 +997,22 @@ protected virtual void OnExiting(object sender, EventArgs args)
             Exiting?.Invoke(this, args);
         }
 
-        protected virtual void OnWindowCreated()
-        {
+        protected virtual void OnWindowCreated() {
             WindowCreated?.Invoke(this, EventArgs.Empty);
+
+            // make sure we render frames faster than vysnc if we are in vulkan
+            int vsyncWiggleRoom = GraphicsDevice.Platform == GraphicsPlatform.Vulkan ? 1 : 0;
+            // If we still have default values, let's set these based on SDL refresh rate (if we can)
+            if (gamePlatform.MainWindow is GameWindowSDL gwsdl) {
+                Graphics.SDL.Window._makeDefaultResolutionOnCrash = ResetWindowOnRenderFail;
+                if (TargetElapsedTime == defaultTimeSpan) {
+                    gwsdl.GetDisplayInformation(out int width, out int height, out int refresh_rate);
+                    TargetElapsedTime = TimeSpan.FromTicks(TimeSpan.TicksPerSecond / (refresh_rate + vsyncWiggleRoom));
+                }
+                if (WindowMinimumUpdateRate.MinimumElapsedTime == defaultTimeSpan) WindowMinimumUpdateRate.MinimumElapsedTime = TargetElapsedTime;
+            } else if (TargetElapsedTime == defaultTimeSpan) {
+                TargetElapsedTime = TimeSpan.FromTicks(TimeSpan.TicksPerSecond / (60 + vsyncWiggleRoom)); // target elapsed time is by default 60Hz
+            }
         }
 
         private void GamePlatformOnWindowCreated(object sender, EventArgs eventArgs)
@@ -949,7 +1058,6 @@ private void UpdateAndProfile(GameTime gameTime)
                 Update(gameTime);
             }
             updateTimer.Tick();
-            singleFrameUpdateTime += updateTimer.ElapsedTime;
         }
 
         private void GamePlatform_Activated(object sender, EventArgs e)
@@ -982,9 +1090,10 @@ private void DrawFrame()
 
             try
             {
-                if (!isExiting && GameSystems.IsFirstUpdateDone && !Window.IsMinimized)
+                if (!isExiting && GameSystems.IsFirstUpdateDone && (!Window.IsMinimized || DrawEvenMinimized))
                 {
-                    drawTime.Update(totalDrawTime, lastFrameElapsedGameTime, singleFrameUpdateTime, drawRunningSlowly, true);
+                    DrawTime.Factor = UpdateTime.Factor;
+                    drawTime.Update(totalDrawTime, lastFrameElapsedGameTime, true);
 
                     var profilingDraw = Profiler.Begin(GameProfilingKeys.GameDrawFPS);
                     var profiler = Profiler.Begin(GameProfilingKeys.GameDraw);
diff --git a/sources/engine/Xenko.Games/GameContext.cs b/sources/engine/Xenko.Games/GameContext.cs
index 5e6d2f3d17..78e4d9d0ba 100644
--- a/sources/engine/Xenko.Games/GameContext.cs
+++ b/sources/engine/Xenko.Games/GameContext.cs
@@ -38,6 +38,11 @@ public abstract class GameContext
         /// </summary>
         public AppContextType ContextType { get; protected set; }
 
+        /// <summary>
+        /// Indicating whether the user will call the main loop. E.g. Xenko is used as a library.
+        /// </summary>
+        public bool IsUserManagingRun { get; protected set; }
+
         // TODO: remove these requested values.
 
         /// <summary>
@@ -50,6 +55,11 @@ public abstract class GameContext
         /// </summary>
         internal int RequestedHeight;
 
+        /// <summary>
+        /// Fullscreen?
+        /// </summary>
+        internal bool RequestedFullscreen;
+
         /// <summary>
         /// The requested back buffer format.
         /// </summary>
@@ -158,11 +168,12 @@ public abstract class GameContext<TK> : GameContext
         /// <param name="control">The control.</param>
         /// <param name="requestedWidth">Width of the requested.</param>
         /// <param name="requestedHeight">Height of the requested.</param>
-        protected GameContext(TK control, int requestedWidth = 0, int requestedHeight = 0)
+        protected GameContext(TK control, int requestedWidth = 1280, int requestedHeight = 720, bool fullscreen = false)
         {
             Control = control;
             RequestedWidth = requestedWidth;
             RequestedHeight = requestedHeight;
+            RequestedFullscreen = fullscreen;
         }
     }
 }
diff --git a/sources/engine/Xenko.Games/GameContextFactory.cs b/sources/engine/Xenko.Games/GameContextFactory.cs
index 07d6833a76..2e440896f1 100644
--- a/sources/engine/Xenko.Games/GameContextFactory.cs
+++ b/sources/engine/Xenko.Games/GameContextFactory.cs
@@ -10,8 +10,7 @@ namespace Xenko.Games
     /// </summary>
     public static class GameContextFactory
     {
-        [Obsolete("Use NewGameContext with the proper AppContextType.")]
-        internal static GameContext NewDefaultGameContext()
+        internal static GameContext NewDefaultGameContext(int width = 1280, int height = 720, bool fullscreen = false, int displayindex = 0)
         {
             // Default context is Desktop
             AppContextType type = AppContextType.Desktop;
@@ -36,14 +35,14 @@ internal static GameContext NewDefaultGameContext()
 #elif XENKO_PLATFORM_IOS
             type = AppContextType.iOS;
 #endif
-            return NewGameContext(type);
+            return NewGameContext(type, width, height, fullscreen, displayindex);
         }
 
         /// <summary>
         /// Given a <paramref name="type"/> create the appropriate game Context for the current executing platform.
         /// </summary>
         /// <returns></returns>
-        public static GameContext NewGameContext(AppContextType type)
+        public static GameContext NewGameContext(AppContextType type, int width, int height, bool fullscreen, int displayindex)
         {
             GameContext res = null;
             switch (type)
@@ -54,11 +53,8 @@ public static GameContext NewGameContext(AppContextType type)
                 case AppContextType.Desktop:
                     res = NewGameContextDesktop();
                     break;
-                case AppContextType.DesktopOpenTK:
-                    res = NewGameContextOpenTK();
-                    break;
                 case AppContextType.DesktopSDL:
-                    res = NewGameContextSDL();
+                    res = NewGameContextSDL(width, height, fullscreen, displayindex);
                     break;
                 case AppContextType.DesktopWpf:
                     res = NewGameContextWpf();
@@ -146,10 +142,10 @@ public static GameContext NewGameContextOpenTK()
 #endif
         }
 
-        public static GameContext NewGameContextSDL()
+        public static GameContext NewGameContextSDL(int width, int height, bool fullscreen, int displayindex)
         {
 #if XENKO_UI_SDL
-            return new GameContextSDL(null);
+            return new GameContextSDL(null, width, height, fullscreen, displayindex);
 #else
             return null;
 #endif
diff --git a/sources/engine/Xenko.Games/GameContextOpenTK.cs b/sources/engine/Xenko.Games/GameContextOpenTK.cs
deleted file mode 100644
index dc46605174..0000000000
--- a/sources/engine/Xenko.Games/GameContextOpenTK.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-//
-// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-#if (XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX) && XENKO_GRAPHICS_API_OPENGL && XENKO_UI_OPENTK
-using System;
-using OpenTK;
-using OpenTK.Graphics;
-using Xenko.Graphics.OpenGL;
-
-namespace Xenko.Games
-{
-    /// <summary>
-    /// A <see cref="GameContext"/> to use for rendering to an existing OpenTK Window.
-    /// </summary>
-    public class GameContextOpenTK : GameContextWindows<OpenTK.GameWindow>
-    {
-        /// <inheritDoc/>
-        public GameContextOpenTK(OpenTK.GameWindow control, int requestedWidth = 0, int requestedHeight = 0)
-            : base(control, requestedWidth, requestedHeight)
-        {
-            ContextType = AppContextType.DesktopOpenTK;
-            if (requestedWidth == 0 || requestedHeight == 0)
-            {
-                requestedWidth = 1280;
-                requestedHeight = 720;
-            }
-
-            var creationFlags = GraphicsContextFlags.Default;
-#if XENKO_GRAPHICS_API_OPENGLES
-            creationFlags |= GraphicsContextFlags.Embedded;
-#endif
-            if ((this.DeviceCreationFlags & Graphics.DeviceCreationFlags.Debug) != 0)
-                creationFlags |= GraphicsContextFlags.Debug;
-
-            // force the stencil buffer to be not null.
-            var defaultMode = GraphicsMode.Default;
-            var graphicMode = new GraphicsMode(defaultMode.ColorFormat, 0, 0, defaultMode.Samples, defaultMode.AccumulatorFormat, defaultMode.Buffers, defaultMode.Stereo);
-            
-            GraphicsContext.ShareContexts = true;
-
-            if (control == null)
-            {
-                int version;
-                if (RequestedGraphicsProfile == null || RequestedGraphicsProfile.Length == 0)
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    version = 300;
-#else
-                    // PC: 4.3 is commonly available (= compute shaders)
-                    // MacOS X: 4.1 maximum
-                    version = 410;
-#endif
-                    Control = TryGameWindow(requestedWidth, requestedHeight, graphicMode, version / 100, (version % 100) / 10, creationFlags);
-                }
-                else
-                {
-                    foreach (var profile in RequestedGraphicsProfile)
-                    {
-                        OpenGLUtils.GetGLVersion(profile, out version);
-                        var gameWindow = TryGameWindow(requestedWidth, requestedHeight, graphicMode, version / 100, (version % 100) / 10, creationFlags);
-                        if (gameWindow != null)
-                        {
-                            Control = gameWindow;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if (Control == null)
-            {
-                throw new Exception("Unable to initialize graphics context.");
-            }
-        }
-
-        /// <summary>
-        /// Try to create the graphics context.
-        /// </summary>
-        /// <param name="requestedWidth">The requested width.</param>
-        /// <param name="requestedHeight">The requested height.</param>
-        /// <param name="graphicMode">The graphics mode.</param>
-        /// <param name="versionMajor">The major version of OpenGL.</param>
-        /// <param name="versionMinor">The minor version of OpenGL.</param>
-        /// <param name="creationFlags">The creation flags.</param>
-        /// <returns>The created GameWindow.</returns>
-        private static OpenTK.GameWindow TryGameWindow(int requestedWidth, int requestedHeight, GraphicsMode graphicMode, int versionMajor, int versionMinor, GraphicsContextFlags creationFlags)
-        {
-            try
-            {
-#if XENKO_GRAPHICS_API_OPENGL || XENKO_GRAPHICS_API_OPENGLES
-                // Preload proper SDL native library (depending on CPU type)
-                // This is for OpenGL ES on desktop
-                Core.NativeLibrary.PreloadLibrary("SDL2.dll", typeof(GameContextOpenTK));
-#endif
-
-                var gameWindow = new OpenTK.GameWindow(requestedWidth, requestedHeight, graphicMode, GameContext.ProductName, GameWindowFlags.Default, DisplayDevice.Default, versionMajor, versionMinor,
-                    creationFlags);
-                return gameWindow;
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Games/GameContextSDL.cs b/sources/engine/Xenko.Games/GameContextSDL.cs
index c1b764a253..c5a1049922 100644
--- a/sources/engine/Xenko.Games/GameContextSDL.cs
+++ b/sources/engine/Xenko.Games/GameContextSDL.cs
@@ -10,15 +10,9 @@ namespace Xenko.Games
     /// </summary>
     public class GameContextSDL : GameContextWindows<Window>
     {
-        static GameContextSDL()
-        {
-            // Preload proper SDL native library (depending on CPU type)
-            Core.NativeLibrary.PreloadLibrary("SDL2.dll", typeof(Window));
-        }
-
         /// <inheritDoc/>
-        public GameContextSDL(Window control, int requestedWidth = 0, int requestedHeight = 0)
-            : base(control ?? new GameFormSDL(), requestedWidth, requestedHeight) 
+        public GameContextSDL(Window control, int requestedWidth = 1280, int requestedHeight = 720, bool fullscreen = false, int displayindex = 0)
+            : base(control ?? new GameFormSDL(requestedWidth, requestedHeight, fullscreen, displayindex), requestedWidth, requestedHeight, fullscreen) 
         {
             ContextType = AppContextType.DesktopSDL;
         }
diff --git a/sources/engine/Xenko.Games/GameContextWindows.cs b/sources/engine/Xenko.Games/GameContextWindows.cs
index d229d01f1d..429a969683 100644
--- a/sources/engine/Xenko.Games/GameContextWindows.cs
+++ b/sources/engine/Xenko.Games/GameContextWindows.cs
@@ -11,8 +11,8 @@ namespace Xenko.Games
     public abstract class GameContextWindows<TK> : GameContext<TK>
     {
         /// <inheritDoc/>
-        protected GameContextWindows(TK control, int requestedWidth = 0, int requestedHeight = 0)
-            : base(control, requestedWidth, requestedHeight)
+        protected GameContextWindows(TK control, int requestedWidth = 1280, int requestedHeight = 720, bool fullscreen = false)
+            : base(control, requestedWidth, requestedHeight, fullscreen)
         {
         }
     }
diff --git a/sources/engine/Xenko.Games/GameContextWinforms.cs b/sources/engine/Xenko.Games/GameContextWinforms.cs
index 48ea0049d0..c1c215577a 100644
--- a/sources/engine/Xenko.Games/GameContextWinforms.cs
+++ b/sources/engine/Xenko.Games/GameContextWinforms.cs
@@ -40,11 +40,6 @@ public GameContextWinforms(Control control, int requestedWidth = 0, int requeste
             IsUserManagingRun = isUserManagingRun;
         }
 
-        /// <summary>
-        /// The is running delegate
-        /// </summary>
-        public bool IsUserManagingRun { get; protected set; }
-
         /// <summary>
         /// Gets the run loop to be called when <see cref="IsUserManagingRun"/> is true.
         /// </summary>
diff --git a/sources/engine/Xenko.Games/GamePlatform.cs b/sources/engine/Xenko.Games/GamePlatform.cs
index 443bfeae89..c0bc310a87 100644
--- a/sources/engine/Xenko.Games/GamePlatform.cs
+++ b/sources/engine/Xenko.Games/GamePlatform.cs
@@ -102,8 +102,6 @@ public virtual GameWindow CreateWindow(GameContext gameContext)
             throw new ArgumentException("Game Window context not supported on this platform");
         }
 
-        public bool IsBlockingRun { get; protected set; }
-
         public void Run(GameContext gameContext)
         {
             gameWindow = CreateWindow(gameContext);
@@ -112,66 +110,23 @@ public void Run(GameContext gameContext)
             gameWindow.Activated += OnActivated;
             gameWindow.Deactivated += OnDeactivated;
             gameWindow.InitCallback = OnInitCallback;
-            gameWindow.RunCallback = OnRunCallback;
+            gameWindow.RunCallback = Tick;
 
             WindowCreated?.Invoke(this, EventArgs.Empty);
 
             gameWindow.Run();
         }
 
-        private void OnRunCallback()
-        {
-            // If/else outside of try-catch to separate user-unhandled exceptions properly
-            var unhandledException = game.UnhandledExceptionInternal;
-            if (unhandledException != null)
-            {
-                // Catch exceptions and transmit them to UnhandledException event
-                try
-                {
-                    Tick();
-                }
-                catch (Exception e)
-                {
-                    // Some system was listening for exceptions
-                    unhandledException(this, new GameUnhandledExceptionEventArgs(e, false));
-                    game.Exit();
-                }
-            }
-            else
-            {
-                Tick();
-            }
-        }
-
         private void OnInitCallback()
         {
-            // If/else outside of try-catch to separate user-unhandled exceptions properly
-            var unhandledException = game.UnhandledExceptionInternal;
-            if (unhandledException != null)
-            {
-                // Catch exceptions and transmit them to UnhandledException event
-                try
-                {
-                    game.InitializeBeforeRun();
-                }
-                catch (Exception e)
-                {
-                    // Some system was listening for exceptions
-                    unhandledException(this, new GameUnhandledExceptionEventArgs(e, false));
-                    game.Exit();
-                }
-            }
-            else
-            {
-                game.InitializeBeforeRun();
-            }
+            game.InitializeBeforeRun();
         }
 
         private void Tick()
         {
             game.Tick();
 
-            if (!IsBlockingRun && game.IsExiting() && !hasExitRan)
+            if (game.IsExiting() && !hasExitRan)
             {
                 hasExitRan = true;
                 OnExiting(this, EventArgs.Empty);
@@ -267,47 +222,29 @@ public virtual List<GraphicsDeviceInformation> FindBestDevices(GameGraphicsParam
                 // Iterate on each preferred graphics profile
                 foreach (var featureLevel in preferredGraphicsProfiles)
                 {
-                    // Check if this profile is supported.
-                    if (graphicsAdapter.IsProfileSupported(featureLevel))
+                    var deviceInfo = new GraphicsDeviceInformation
                     {
-                        var deviceInfo = new GraphicsDeviceInformation
+                        Adapter = graphicsAdapter,
+                        GraphicsProfile = featureLevel,
+                        PresentationParameters =
                         {
-                            Adapter = graphicsAdapter,
-                            GraphicsProfile = featureLevel,
-                            PresentationParameters =
-                            {
-                                MultisampleCount = preferredParameters.PreferredMultisampleCount,
-                                IsFullScreen = preferredParameters.IsFullScreen,
-                                PreferredFullScreenOutputIndex = preferredParameters.PreferredFullScreenOutputIndex,
-                                PresentationInterval = preferredParameters.SynchronizeWithVerticalRetrace ? PresentInterval.One : PresentInterval.Immediate,
-                                DeviceWindowHandle = MainWindow.NativeWindow,
-                                ColorSpace = preferredParameters.ColorSpace,
-                            },
-                        };
-
-                        var preferredMode = new DisplayMode(preferredParameters.PreferredBackBufferFormat,
-                            preferredParameters.PreferredBackBufferWidth,
-                            preferredParameters.PreferredBackBufferHeight,
-                            preferredParameters.PreferredRefreshRate);
-
-                        // if we want to switch to fullscreen, try to find only needed output, otherwise check them all
-                        if (preferredParameters.IsFullScreen)
-                        {
-                            if (preferredParameters.PreferredFullScreenOutputIndex < graphicsAdapter.Outputs.Length)
-                            {
-                                var output = graphicsAdapter.Outputs[preferredParameters.PreferredFullScreenOutputIndex];
-                                var displayMode = output.FindClosestMatchingDisplayMode(preferredGraphicsProfiles, preferredMode);
-                                AddDevice(displayMode, deviceInfo, preferredParameters, graphicsDeviceInfos);
-                            }
-                        }
-                        else
-                        {
-                            AddDevice(preferredMode, deviceInfo, preferredParameters, graphicsDeviceInfos);
-                        }
-
-                        // If the profile is supported, we are just using the first best one
-                        break;
-                    }
+                            MultisampleCount = preferredParameters.PreferredMultisampleCount,
+                            IsFullScreen = preferredParameters.IsFullScreen,
+                            PreferredFullScreenOutputIndex = preferredParameters.PreferredFullScreenOutputIndex,
+                            PresentationInterval = preferredParameters.SynchronizeWithVerticalRetrace ? PresentInterval.One : PresentInterval.Immediate,
+                            DeviceWindowHandle = MainWindow.NativeWindow,
+                            ColorSpace = preferredParameters.ColorSpace,
+                        },
+                    };
+
+                    var preferredMode = new DisplayMode(preferredParameters.PreferredBackBufferFormat,
+                        preferredParameters.PreferredBackBufferWidth,
+                        preferredParameters.PreferredBackBufferHeight,
+                        preferredParameters.PreferredRefreshRate);
+
+                    // just add it and continue
+                    AddDevice(preferredMode, deviceInfo, preferredParameters, graphicsDeviceInfos);
+                    break;
                 }
             }
 
@@ -342,12 +279,13 @@ public virtual void RecreateDevice(GraphicsDevice currentDevice, GraphicsDeviceI
 
         public virtual void DeviceChanged(GraphicsDevice currentDevice, GraphicsDeviceInformation deviceInformation)
         {
-            // Force to resize the gameWindow
-            gameWindow.Resize(deviceInformation.PresentationParameters.BackBufferWidth, deviceInformation.PresentationParameters.BackBufferHeight);
         }
 
         public virtual GraphicsDevice ChangeOrCreateDevice(GraphicsDevice currentDevice, GraphicsDeviceInformation deviceInformation)
         {
+            // Force to resize the gameWindow before the device is created, so it creates to our window
+            gameWindow.Resize(deviceInformation.PresentationParameters.BackBufferWidth, deviceInformation.PresentationParameters.BackBufferHeight);
+
             if (currentDevice == null)
             {
                 currentDevice = CreateDevice(deviceInformation);
@@ -357,8 +295,6 @@ public virtual GraphicsDevice ChangeOrCreateDevice(GraphicsDevice currentDevice,
                 RecreateDevice(currentDevice, deviceInformation);
             }
 
-            DeviceChanged(currentDevice, deviceInformation);
-
             return currentDevice;
         }
 
diff --git a/sources/engine/Xenko.Games/GameSystemBase.cs b/sources/engine/Xenko.Games/GameSystemBase.cs
index d6feb2eaf9..3d86ee1571 100644
--- a/sources/engine/Xenko.Games/GameSystemBase.cs
+++ b/sources/engine/Xenko.Games/GameSystemBase.cs
@@ -50,10 +50,10 @@ public abstract class GameSystemBase : ComponentBase, IGameSystemBase, IUpdateab
         /// <remarks>
         /// The GameSystem is expecting the following services to be registered: <see cref="IGame"/> and <see cref="IContentManager"/>.
         /// </remarks>
-        protected GameSystemBase([NotNull] IServiceRegistry registry)
+        protected GameSystemBase(IServiceRegistry registry)
         {
-            Services = registry ?? throw new ArgumentNullException(nameof(registry));
-            Game = (GameBase)Services.GetService<IGame>();
+            Services = registry ?? ServiceRegistry.instance;
+            Game = (GameBase)Services?.GetService<IGame>();
         }
 
         /// <summary>
@@ -137,7 +137,7 @@ public virtual void Initialize()
         {
         }
 
-        private void InitGraphicsDeviceService()
+        protected void InitGraphicsDeviceService()
         {
             if (graphicsDeviceService == null)
             {
diff --git a/sources/engine/Xenko.Games/GameSystemCollection.cs b/sources/engine/Xenko.Games/GameSystemCollection.cs
index cbdf030012..2b9bbf49e7 100644
--- a/sources/engine/Xenko.Games/GameSystemCollection.cs
+++ b/sources/engine/Xenko.Games/GameSystemCollection.cs
@@ -327,8 +327,14 @@ private void GameSystems_ItemRemoved(object sender, TrackingCollectionChangedEve
             {
                 lock (updateableGameSystems)
                 {
-                    var key = new KeyValuePair<IUpdateable, ProfilingKey>(updateableSystem, null);
-                    updateableGameSystems.Remove(key);
+                    for(int i = 0; i < updateableGameSystems.Count; i++)
+                    {
+                        if(ReferenceEquals(updateableGameSystems[i].Key, updateableSystem))
+                        {
+                            updateableGameSystems.RemoveAt(i);
+                            break;
+                        }
+                    }
                 }
 
                 updateableSystem.UpdateOrderChanged -= UpdateableGameSystem_UpdateOrderChanged;
@@ -339,8 +345,14 @@ private void GameSystems_ItemRemoved(object sender, TrackingCollectionChangedEve
             {
                 lock (drawableGameSystems)
                 {
-                    var key = new KeyValuePair<IDrawable, ProfilingKey>(drawableSystem, null);
-                    drawableGameSystems.Remove(key);
+                    for (int i = 0; i < drawableGameSystems.Count; i++)
+                    {
+                        if (ReferenceEquals(drawableGameSystems[i].Key, drawableSystem))
+                        {
+                            drawableGameSystems.RemoveAt(i);
+                            break;
+                        }
+                    }
                 }
 
                 drawableSystem.DrawOrderChanged -= DrawableGameSystem_DrawOrderChanged;
diff --git a/sources/engine/Xenko.Games/GameTime.cs b/sources/engine/Xenko.Games/GameTime.cs
index fc114de2a6..88d0b1f919 100644
--- a/sources/engine/Xenko.Games/GameTime.cs
+++ b/sources/engine/Xenko.Games/GameTime.cs
@@ -34,6 +34,7 @@ public class GameTime
     {
         private TimeSpan accumulatedElapsedTime;
         private int accumulatedFrameCountPerSecond;
+        private double factor;
 
         #region Constructors and Destructors
 
@@ -43,6 +44,7 @@ public class GameTime
         public GameTime()
         {
             accumulatedElapsedTime = TimeSpan.Zero;
+            factor = 1;
         }
 
         /// <summary>
@@ -55,20 +57,7 @@ public GameTime(TimeSpan totalTime, TimeSpan elapsedTime)
             Total = totalTime;
             Elapsed = elapsedTime;
             accumulatedElapsedTime = TimeSpan.Zero;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="GameTime" /> class.
-        /// </summary>
-        /// <param name="totalTime">The total game time since the start of the game.</param>
-        /// <param name="elapsedTime">The elapsed game time since the last update.</param>
-        /// <param name="isRunningSlowly">True if the game is running unexpectedly slowly.</param>
-        public GameTime(TimeSpan totalTime, TimeSpan elapsedTime, bool isRunningSlowly)
-        {
-            Total = totalTime;
-            Elapsed = elapsedTime;
-            IsRunningSlowly = isRunningSlowly;
-            accumulatedElapsedTime = TimeSpan.Zero;
+            factor = 1;
         }
 
         #endregion
@@ -81,12 +70,6 @@ public GameTime(TimeSpan totalTime, TimeSpan elapsedTime, bool isRunningSlowly)
         /// <value>The elapsed game time.</value>
         public TimeSpan Elapsed { get; private set; }
 
-        /// <summary>
-        /// Gets a value indicating whether the game is running slowly than its TargetElapsedTime. This can be used for example to render less details...etc.
-        /// </summary>
-        /// <value><c>true</c> if this instance is running slowly; otherwise, <c>false</c>.</value>
-        public bool IsRunningSlowly { get; private set; }
-
         /// <summary>
         /// Gets the amount of game time since the start of the game.
         /// </summary>
@@ -116,11 +99,34 @@ public GameTime(TimeSpan totalTime, TimeSpan elapsedTime, bool isRunningSlowly)
         /// <value><c>true</c> if the <see cref="FramePerSecond"/> and <see cref="TimePerFrame"/> were updated for this frame; otherwise, <c>false</c>.</value>
         public bool FramePerSecondUpdated { get; private set; }
 
-        internal void Update(TimeSpan totalGameTime, TimeSpan elapsedGameTime, TimeSpan elapsedUpdateTime, bool isRunningSlowly, bool incrementFrameCount)
+
+
+        /// <summary>
+        /// Gets the amount of time elapsed multiplied by the time factor.
+        /// </summary>
+        /// <value>The warped elapsed time</value>
+        public TimeSpan WarpElapsed { get; private set; }
+
+
+        /// <summary>
+        /// Gets or sets the time factor.<br/>
+        /// This value controls how much the warped time flows, this includes physics, animations and particles.
+        /// A value between 0 and 1 will slow time, a value above 1 will make it faster.
+        /// </summary>
+        /// <value>The multiply factor, a double value higher or equal to 0</value>
+        public double Factor
+        {
+            get => factor;
+            set => factor = value > 0 ? value : 0;
+        }
+
+
+        internal void Update(TimeSpan totalGameTime, TimeSpan elapsedGameTime, bool incrementFrameCount)
         {
             Total = totalGameTime;
             Elapsed = elapsedGameTime;
-            IsRunningSlowly = isRunningSlowly;
+            WarpElapsed = TimeSpan.FromTicks((long)(Elapsed.Ticks * Factor));
+
             FramePerSecondUpdated = false;
 
             if (incrementFrameCount)
@@ -143,12 +149,17 @@ internal void Update(TimeSpan totalGameTime, TimeSpan elapsedGameTime, TimeSpan
 
         internal void Reset(TimeSpan totalGameTime)
         {
-            Update(totalGameTime, TimeSpan.Zero, TimeSpan.Zero, false, false);
+            Update(totalGameTime, TimeSpan.Zero, false);
             accumulatedElapsedTime = TimeSpan.Zero;
             accumulatedFrameCountPerSecond = 0;
             FrameCount = 0;
         }
 
+        public void ResetTimeFactor()
+        {
+            factor = 1;
+        }
+
         #endregion
     }
 }
diff --git a/sources/engine/Xenko.Games/GameWindow.cs b/sources/engine/Xenko.Games/GameWindow.cs
index 5dc590b81a..1e2ee9829f 100644
--- a/sources/engine/Xenko.Games/GameWindow.cs
+++ b/sources/engine/Xenko.Games/GameWindow.cs
@@ -23,6 +23,7 @@
 #pragma warning disable SA1402 // File may only contain a single type
 
 using System;
+using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
 using Xenko.Graphics;
@@ -53,7 +54,7 @@ public abstract class GameWindow : ComponentBase
         public event EventHandler<EventArgs> Activated;
 
         /// <summary>
-        /// Occurs, when device client size is changed.
+        /// Occurs when device client size is changed.
         /// </summary>
         public event EventHandler<EventArgs> ClientSizeChanged;
 
@@ -63,15 +64,20 @@ public abstract class GameWindow : ComponentBase
         public event EventHandler<EventArgs> Deactivated;
 
         /// <summary>
-        /// Occurs, when device orientation is changed.
+        /// Occurs when device orientation is changed.
         /// </summary>
         public event EventHandler<EventArgs> OrientationChanged;
 
         /// <summary>
-        /// Occurs, when device full screen mode is toggled.
+        /// Occurs when device full screen mode is toggled.
         /// </summary>
         public event EventHandler<EventArgs> FullscreenToggle;
 
+        /// <summary>
+        /// Occurs before the window gets destroyed.
+        /// </summary>
+        public event EventHandler<EventArgs> Closing;
+
         #endregion
 
         #region Public Properties
@@ -123,6 +129,12 @@ public abstract class GameWindow : ComponentBase
         /// <value><c>true</c> if visible; otherwise, <c>false</c>.</value>
         public abstract bool Visible { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="GameWindow" /> is fullscreen.
+        /// </summary>
+        /// <value><c>true</c> if visible; otherwise, <c>false</c>.</value>
+        public abstract bool IsFullscreen { get; set; }
+
         /// <summary>
         /// Gets or sets the position of the window on the screen.
         /// </summary>
@@ -163,6 +175,16 @@ public string Title
 
         #region Public Methods and Operators
 
+        virtual public List<Vector3> GetDisplayModes(int display = -1, bool maxRefreshRateOnly = true)
+        {
+            throw new NotImplementedException("Only implemented for SDL windows");
+        }
+
+        virtual public void GetDisplayInformation(out int width, out int height, out int refresh_rate, int display = -1)
+        {
+            throw new NotImplementedException("Only implemented for SDL windows");
+        }
+
         public abstract void BeginScreenDeviceChange(bool willBeFullScreen);
 
         public void EndScreenDeviceChange()
@@ -188,7 +210,7 @@ public void EndScreenDeviceChange()
 
         internal abstract void Run();
 
-        internal abstract void Resize(int width, int height);
+        public abstract void Resize(int width, int height);
 
         internal IServiceRegistry Services { get; set; }
 
@@ -228,6 +250,14 @@ protected void OnFullscreenToggle(object source, EventArgs e)
             handler?.Invoke(this, e);
         }
 
+        protected void OnClosing(object source, EventArgs e)
+        {
+            var handler = Closing;
+            handler?.Invoke(this, e);
+        }
+
+        public abstract void EmulateMouseEvent(bool pressDown, bool left, int positionX, int positionY);
+
         protected abstract void SetTitle(string title);
 
         #endregion
diff --git a/sources/engine/Xenko.Games/GameWindowRenderer.cs b/sources/engine/Xenko.Games/GameWindowRenderer.cs
index eea041c8da..16cd17475b 100644
--- a/sources/engine/Xenko.Games/GameWindowRenderer.cs
+++ b/sources/engine/Xenko.Games/GameWindowRenderer.cs
@@ -209,7 +209,7 @@ public override bool BeginDraw()
                 {
                     PixelFormat resizeFormat;
                     var size = GetRequestedSize(out resizeFormat);
-                    Presenter.Resize((int)size.X, (int)size.Y, resizeFormat);
+                    Presenter.InternalResize((int)size.X, (int)size.Y, resizeFormat);
 
                     isBackBufferToResize = false;
                     windowUserResized = false;
diff --git a/sources/engine/Xenko.Games/GraphicsDeviceManager.cs b/sources/engine/Xenko.Games/GraphicsDeviceManager.cs
index c507ca8fe6..cf4583b0dc 100644
--- a/sources/engine/Xenko.Games/GraphicsDeviceManager.cs
+++ b/sources/engine/Xenko.Games/GraphicsDeviceManager.cs
@@ -58,9 +58,9 @@ public class GraphicsDeviceManager : ComponentBase, IGraphicsDeviceManager, IGra
 
         private PixelFormat preferredBackBufferFormat;
 
-        private int preferredBackBufferHeight;
+        internal int preferredBackBufferHeight;
 
-        private int preferredBackBufferWidth;
+        internal int preferredBackBufferWidth;
 
         private Rational preferredRefreshRate;
 
@@ -110,7 +110,7 @@ internal GraphicsDeviceManager(GameBase game)
             lockDeviceCreation = new object();
 
             // Defines all default values
-            SynchronizeWithVerticalRetrace = true;
+            SynchronizeWithVerticalRetrace = GraphicsDevice.Platform != GraphicsPlatform.Vulkan;
             PreferredColorSpace = ColorSpace.Linear;
             PreferredBackBufferFormat = PixelFormat.R8G8B8A8_UNorm;
             PreferredDepthStencilFormat = PixelFormat.D24_UNorm_S8_UInt;
@@ -192,7 +192,14 @@ private void GameOnWindowCreated(object sender, EventArgs eventArgs)
         /// Gets or sets the device creation flags that will be used to create the <see cref="GraphicsDevice"/>
         /// </summary>
         /// <value>The device creation flags.</value>
-        public DeviceCreationFlags DeviceCreationFlags { get; set; }
+        public DeviceCreationFlags DeviceCreationFlags
+        {
+            get => GraphicsAdapterFactory.adapterFlags;
+            set
+            {
+                GraphicsAdapterFactory.adapterFlags = value;
+            }
+        }
 
         /// <summary>
         /// If populated the engine will try to initialize the device with the same unique id
@@ -592,7 +599,7 @@ protected override void Destroy()
                 {
                     // Make sure that the Presenter is reverted to window before shuting down
                     // otherwise the Direct3D11.Device will generate an exception on Dispose()
-                    GraphicsDevice.Presenter.IsFullScreen = false;
+                    GraphicsDevice.Presenter.InternalFullscreen = false;
                     GraphicsDevice.Presenter.Dispose();
                     GraphicsDevice.Presenter = null;
                 }
@@ -679,18 +686,7 @@ protected virtual GraphicsDeviceInformation FindBestDevice(bool anySuitableDevic
 
             var devices = graphicsDeviceFactory.FindBestDevices(preferredParameters);
             if (devices.Count == 0)
-            {
-                // Nothing was found; first, let's check if graphics profile was actually supported
-                // Note: we don't do this preemptively because in some cases it seems to take lot of time (happened on a test machine, several seconds freeze on ID3D11Device.Release())
-                GraphicsProfile availableGraphicsProfile;
-                if (!IsPreferredProfileAvailable(preferredParameters.PreferredGraphicsProfile, out availableGraphicsProfile))
-                {
-                    throw new InvalidOperationException($"Graphics profiles [{string.Join(", ", preferredParameters.PreferredGraphicsProfile)}] are not supported by the device. The highest available profile is [{availableGraphicsProfile}].");
-                }
-
-                // Otherwise, there was just no screen mode
                 throw new InvalidOperationException("No screen modes found");
-            }
 
             RankDevices(devices);
 
@@ -812,31 +808,6 @@ protected virtual void RankDevices(List<GraphicsDeviceInformation> foundDevices)
                     });
         }
 
-        protected virtual bool IsPreferredProfileAvailable(GraphicsProfile[] preferredProfiles, out GraphicsProfile availableProfile)
-        {
-            availableProfile = GraphicsProfile.Level_9_1;
-
-            var graphicsProfiles = Enum.GetValues(typeof(GraphicsProfile));
-
-            foreach (var graphicsAdapter in GraphicsAdapterFactory.Adapters)
-            {
-                foreach (var graphicsProfileValue in graphicsProfiles)
-                {
-                    var graphicsProfile = (GraphicsProfile)graphicsProfileValue;
-                    if (graphicsProfile > availableProfile && graphicsAdapter.IsProfileSupported(graphicsProfile))
-                        availableProfile = graphicsProfile;
-                }
-            }
-
-            foreach (var preferredProfile in preferredProfiles)
-            {
-                if (availableProfile >= preferredProfile)
-                    return true;
-            }
-
-            return false;
-        }
-
         private int CalculateRankForFormat(PixelFormat format)
         {
             if (format == PreferredBackBufferFormat)
@@ -898,6 +869,9 @@ protected virtual void OnPreparingDeviceSettings(object sender, PreparingDeviceS
 
         private void Window_ClientSizeChanged(object sender, EventArgs e)
         {
+            // resizing not supported in vulkan
+            if (GraphicsDevice.Platform == GraphicsPlatform.Vulkan) return;
+
             if (!isChangingDevice && ((game.Window.ClientBounds.Height != 0) || (game.Window.ClientBounds.Width != 0)))
             {
                 resizedBackBufferWidth = game.Window.ClientBounds.Width;
@@ -933,7 +907,7 @@ private void WindowOnFullscreenToggle(object sender, EventArgs eventArgs)
             ApplyChanges();
         }
 
-        private void CreateDevice(GraphicsDeviceInformation newInfo)
+        internal void CreateDevice(GraphicsDeviceInformation newInfo)
         {
             newInfo.PresentationParameters.IsFullScreen = isFullScreen;
             newInfo.PresentationParameters.PresentationInterval = SynchronizeWithVerticalRetrace ? PresentInterval.One : PresentInterval.Immediate;
@@ -1046,10 +1020,10 @@ private void ChangeOrCreateDevice(bool forceCreate)
 
                                     GraphicsDevice.Presenter.Description.PreferredFullScreenOutputIndex = newOutputIndex;
                                     GraphicsDevice.Presenter.Description.RefreshRate = graphicsDeviceInformation.PresentationParameters.RefreshRate;
-                                    GraphicsDevice.Presenter.Resize(newWidth, newHeight, newFormat);
+                                    GraphicsDevice.Presenter.InternalResize(newWidth, newHeight, newFormat);
 
                                     // Change full screen if needed
-                                    GraphicsDevice.Presenter.IsFullScreen = graphicsDeviceInformation.PresentationParameters.IsFullScreen;
+                                    GraphicsDevice.Presenter.InternalFullscreen = graphicsDeviceInformation.PresentationParameters.IsFullScreen;
 
                                     needToCreateNewDevice = false;
                                 }
diff --git a/sources/engine/Xenko.Games/OpenTK/GamePlatformOpenTK.cs b/sources/engine/Xenko.Games/OpenTK/GamePlatformOpenTK.cs
deleted file mode 100644
index 88c962ea68..0000000000
--- a/sources/engine/Xenko.Games/OpenTK/GamePlatformOpenTK.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_PLATFORM_WINDOWS_DESKTOP && XENKO_GRAPHICS_API_OPENGL && (XENKO_UI_WINFORMS || XENKO_UI_WPF) && XENKO_UI_OPENTK
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
-using Xenko.Graphics;
-
-namespace Xenko.Games
-{
-    internal class GamePlatformOpenTK : GamePlatformWindows, IGraphicsDeviceFactory
-    {
-        public GamePlatformOpenTK(GameBase game) : base(game)
-        {
-        }
-
-        public virtual void DeviceChanged(GraphicsDevice currentDevice, GraphicsDeviceInformation deviceInformation)
-        {
-            // TODO: Check when it needs to be disabled on iOS (OpenGL)?
-            // Force to resize the gameWindow
-            //gameWindow.Resize(deviceInformation.PresentationParameters.BackBufferWidth, deviceInformation.PresentationParameters.BackBufferHeight);
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Games/OpenTK/GameWindowOpenTK.cs b/sources/engine/Xenko.Games/OpenTK/GameWindowOpenTK.cs
deleted file mode 100644
index 9e1ffe4d93..0000000000
--- a/sources/engine/Xenko.Games/OpenTK/GameWindowOpenTK.cs
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if (XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX) && XENKO_GRAPHICS_API_OPENGL && XENKO_UI_OPENTK
-using System.Diagnostics;
-using Xenko.Core.Mathematics;
-using Xenko.Graphics;
-
-namespace Xenko.Games
-{
-    /// <summary>
-    /// An abstract window.
-    /// </summary>
-    internal class GameWindowOpenTK : GameWindow<OpenTK.GameWindow>
-    {
-        private bool isMouseVisible;
-
-        private bool isMouseCurrentlyHidden;
-
-        private OpenTK.GameWindow gameForm;
-        private WindowHandle nativeWindow;
-
-        internal GameWindowOpenTK()
-        {
-        }
-
-        public override WindowHandle NativeWindow
-        {
-            get
-            {
-                return nativeWindow;
-            }
-        }
-
-        public override Int2 Position
-        {
-            get
-            {
-                if (gameForm == null)
-                    return base.Position;
-
-                return new Int2(gameForm.X, gameForm.Y);
-            }
-            set
-            {
-                if (gameForm != null)
-                {
-                    gameForm.X = value.X;
-                    gameForm.Y = value.Y;
-                }
-
-                base.Position = value;
-            }
-        }
-
-        public override void BeginScreenDeviceChange(bool willBeFullScreen)
-        {
-
-        }
-
-        public override void EndScreenDeviceChange(int clientWidth, int clientHeight)
-        {
-
-        }
-
-        protected internal override void SetSupportedOrientations(DisplayOrientation orientations)
-        {
-            // Desktop doesn't have orientation (unless on Windows 8?)
-        }
-
-        protected override void Initialize(GameContext<OpenTK.GameWindow> gameContext)
-        {
-            gameForm = gameContext.Control;
-            nativeWindow = new WindowHandle(AppContextType.DesktopOpenTK, gameForm, gameForm.WindowInfo.Handle);
-
-            // Setup the initial size of the window
-            var width = gameContext.RequestedWidth;
-            if (width == 0)
-            {
-                width = gameForm.Width;
-            }
-
-            var height = gameContext.RequestedHeight;
-            if (height == 0)
-            {
-                height = gameForm.Height;
-            }
-
-            // Update gameForm.ClientSize with (width, height)
-            Resize(width, height);
-
-            gameForm.MouseEnter += GameWindowForm_MouseEnter;
-            gameForm.MouseLeave += GameWindowForm_MouseLeave;
-
-            gameForm.Resize += OnClientSizeChanged;
-        }
-
-        internal override void Run()
-        {
-            Debug.Assert(InitCallback != null);
-            Debug.Assert(RunCallback != null);
-
-            // Initialize the init callback
-            InitCallback();
-
-            // Make the window visible
-            gameForm.Visible = true;
-
-            // Run the rendering loop
-            try
-            {
-                while (!Exiting)
-                {
-                    gameForm.ProcessEvents();
-
-                    RunCallback();
-                }
-
-                if (gameForm != null)
-                {
-                    if (OpenTK.Graphics.GraphicsContext.CurrentContext == gameForm.Context)
-                        gameForm.Context.MakeCurrent(null);
-                    gameForm.Close();
-                    gameForm.Dispose();
-                    gameForm = null;
-                }
-            }
-            finally
-            {
-                if (ExitCallback != null)
-                {
-                    ExitCallback();
-                }
-            }
-        }
-
-        private void GameWindowForm_MouseEnter(object sender, System.EventArgs e)
-        {
-            if (!isMouseVisible && !isMouseCurrentlyHidden)
-            {
-                gameForm.CursorVisible = false;
-                isMouseCurrentlyHidden = true;
-            }
-        }
-
-        private void GameWindowForm_MouseLeave(object sender, System.EventArgs e)
-        {
-            if (isMouseCurrentlyHidden)
-            {
-                gameForm.CursorVisible = true;
-                isMouseCurrentlyHidden = false;
-            }
-        }
-
-        public override bool IsMouseVisible
-        {
-            get
-            {
-                return isMouseVisible;
-            }
-            set
-            {
-                if (isMouseVisible != value)
-                {
-                    isMouseVisible = value;
-                    if (isMouseVisible)
-                    {
-                        if (isMouseCurrentlyHidden)
-                        {
-                            gameForm.CursorVisible = true;
-                            isMouseCurrentlyHidden = false;
-                        }
-                    }
-                    else if (!isMouseCurrentlyHidden)
-                    {
-                        gameForm.CursorVisible = false;
-                        isMouseCurrentlyHidden = true;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this <see cref="GameWindow" /> is visible.
-        /// </summary>
-        /// <value><c>true</c> if visible; otherwise, <c>false</c>.</value>
-        public override bool Visible
-        {
-            get
-            {
-                return gameForm.Visible;
-            }
-            set
-            {
-                gameForm.Visible = value;
-            }
-        }
-
-        protected override void SetTitle(string title)
-        {
-            gameForm.Title = title;
-        }
-
-        internal override void Resize(int width, int height)
-        {
-            // Unfortunately on OpenTK, depending on how you compile it, it may use System.Drawing.Size or
-            // OpenTK.Size. To avoid having to put the exact type, we will use C# inference to guess the right
-            // type at compile time which will depend on the OpenTK.dll used to compile this code.
-            var size = gameForm.ClientSize;
-            size.Width = width;
-            size.Height = height;
-            gameForm.ClientSize = size;
-        }
-
-        public override bool IsBorderLess
-        {
-            get
-            {
-                return true;
-            }
-            set
-            {
-            }
-        }
-
-        public override bool AllowUserResizing
-        {
-            get
-            {
-                return true;
-            }
-            set
-            {
-            }
-        }
-
-        public override Rectangle ClientBounds
-        {
-            get
-            {
-                return new Rectangle(0, 0, gameForm.ClientSize.Width, gameForm.ClientSize.Height);
-            }
-        }
-
-        public override DisplayOrientation CurrentOrientation
-        {
-            get
-            {
-                return DisplayOrientation.Default;
-            }
-        }
-
-        public override bool IsMinimized
-        {
-            get
-            {
-                return gameForm.WindowState == OpenTK.WindowState.Minimized;
-            }
-        }
-
-        public override bool Focused
-        {
-            get
-            {
-                return gameForm.Focused;
-            }
-        }
-
-        protected override void Destroy()
-        {
-            if (gameForm != null)
-            {
-                gameForm.Context.MakeCurrent(null);
-                gameForm.Close();
-                gameForm.Dispose();
-                gameForm = null;
-            }
-
-            base.Destroy();
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Games/Resources/Logo.ico b/sources/engine/Xenko.Games/Resources/Logo.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/engine/Xenko.Games/Resources/Logo.ico and b/sources/engine/Xenko.Games/Resources/Logo.ico differ
diff --git a/sources/engine/Xenko.Games/SDL/GameFormSDL.cs b/sources/engine/Xenko.Games/SDL/GameFormSDL.cs
index 4a8a55faab..385999ecd8 100644
--- a/sources/engine/Xenko.Games/SDL/GameFormSDL.cs
+++ b/sources/engine/Xenko.Games/SDL/GameFormSDL.cs
@@ -18,7 +18,7 @@ public class GameFormSDL : Window
         /// <summary>
         /// Initializes a new instance of the <see cref="GameForm"/> class.
         /// </summary>
-        public GameFormSDL() : this(GameContext.ProductName)
+        public GameFormSDL(int width, int height, bool fullscreen, int displayindex) : this(GameContext.ProductName, width, height, fullscreen, displayindex)
         {
         }
 
@@ -26,9 +26,8 @@ public GameFormSDL() : this(GameContext.ProductName)
         /// Initializes a new instance of the <see cref="GameForm"/> class.
         /// </summary>
         /// <param name="text">The text.</param>
-        public GameFormSDL(string text) : base(text)
+        public GameFormSDL(string text, int width, int height, bool fullscreen, int displayindex) : base(text, width, height, fullscreen, displayindex)
         {
-            Size = new Size2(800, 600);
             ResizeBeginActions += GameForm_ResizeBeginActions;
             ResizeEndActions += GameForm_ResizeEndActions;
             ActivateActions += GameForm_ActivateActions;
@@ -37,6 +36,8 @@ public GameFormSDL(string text) : base(text)
             MinimizedActions += GameForm_MinimizedActions;
             MaximizedActions += GameForm_MaximizedActions;
             RestoredActions += GameForm_RestoredActions;
+            FocusLostActions += GameForm_FocusEvent;
+            FocusGainedActions += GameForm_FocusEvent;
         }
 #endregion
 
@@ -74,16 +75,27 @@ public GameFormSDL(string text) : base(text)
         //private DisplayMonitor monitor;
         private bool isUserResizing;
 
+        private void GameForm_FocusEvent(SDL.SDL_WindowEvent e)
+        {
+            if (e.data1 == 0) return; // make no change
+
+            GameBase.PauseRendering = e.data1 == 2;
+        }
+
         private void GameForm_MinimizedActions(SDL.SDL_WindowEvent e)
         {
             previousWindowState = FormWindowState.Minimized;
+            GameBase.PauseRendering = true;
             PauseRendering?.Invoke(this, EventArgs.Empty);
         }
 
         private void GameForm_MaximizedActions(SDL.SDL_WindowEvent e)
         {
             if (previousWindowState == FormWindowState.Minimized)
+            {
+                GameBase.PauseRendering = false;
                 ResumeRendering?.Invoke(this, EventArgs.Empty);
+            }
 
             previousWindowState = FormWindowState.Maximized;
 
@@ -96,6 +108,7 @@ private void GameForm_RestoredActions(SDL.SDL_WindowEvent e)
         {
             if (previousWindowState == FormWindowState.Minimized)
             {
+                GameBase.PauseRendering = false;
                 ResumeRendering?.Invoke(this, EventArgs.Empty);
             }
             previousWindowState = FormWindowState.Normal;
@@ -103,31 +116,46 @@ private void GameForm_RestoredActions(SDL.SDL_WindowEvent e)
 
         private void GameForm_DeActivateActions(SDL.SDL_WindowEvent e)
         {
-            AppActivated?.Invoke(this, EventArgs.Empty);
+            AppDeactivated?.Invoke(this, EventArgs.Empty);
         }
 
         private void GameForm_ActivateActions(SDL.SDL_WindowEvent e)
         {
-            AppDeactivated?.Invoke(this, EventArgs.Empty);
+            AppActivated?.Invoke(this, EventArgs.Empty);
         }
 
         private void GameForm_ResizeBeginActions(SDL.SDL_WindowEvent e)
         {
-            isUserResizing = true;
-            cachedSize = Size;
-            PauseRendering?.Invoke(this, EventArgs.Empty);
+            if (Graphics.GraphicsDevice.Platform == Graphics.GraphicsPlatform.Vulkan && OriginalSize.HasValue)
+                // resizing not supported, return to original resolution
+                Size = cachedSize = OriginalSize.Value;
+            else
+            {
+                isUserResizing = true;
+                PauseRendering?.Invoke(this, EventArgs.Empty);
+                cachedSize = Size;
+            }
         }
 
         private void GameForm_ResizeEndActions(SDL.SDL_WindowEvent e)
         {
-            if (isUserResizing && cachedSize.Equals(Size))
+            if (Graphics.GraphicsDevice.Platform == Graphics.GraphicsPlatform.Vulkan && OriginalSize.HasValue)
             {
-                UserResized?.Invoke(this, EventArgs.Empty);
-                // UpdateScreen();
+                // resizing not supported, return to original resolution
+                Size = cachedSize = OriginalSize.Value;
+            }
+            else
+            {
+                if (isUserResizing && cachedSize.Equals(Size))
+                {
+                    UserResized?.Invoke(this, EventArgs.Empty);
+                    // UpdateScreen();
+                }
+
+                isUserResizing = false;
+                GameBase.PauseRendering = false;
+                ResumeRendering?.Invoke(this, EventArgs.Empty);
             }
-
-            isUserResizing = false;
-            ResumeRendering?.Invoke(this, EventArgs.Empty);
         }
 #endregion
     }
diff --git a/sources/engine/Xenko.Games/SDL/GameWindowSDL.cs b/sources/engine/Xenko.Games/SDL/GameWindowSDL.cs
index 67860e2838..d8bff7b96e 100644
--- a/sources/engine/Xenko.Games/SDL/GameWindowSDL.cs
+++ b/sources/engine/Xenko.Games/SDL/GameWindowSDL.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_UI_SDL
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using SDL2;
 using Xenko.Core.Mathematics;
@@ -24,10 +25,6 @@ internal class GameWindowSDL : GameWindow<Window>
         private WindowHandle windowHandle;
 
         private bool isFullScreenMaximized;
-        private FormBorderStyle savedFormBorderStyle;
-        private bool oldVisible;
-        private bool deviceChangeChangedVisible;
-        private bool? deviceChangeWillBeFullScreen;
 
         private bool allowUserResizing;
         private bool isBorderLess;
@@ -46,72 +43,13 @@ public override WindowHandle NativeWindow
 
         public override void BeginScreenDeviceChange(bool willBeFullScreen)
         {
-            if (willBeFullScreen && !isFullScreenMaximized && window != null)
-            {
-                savedFormBorderStyle = window.FormBorderStyle;
-            }
-
-            if (willBeFullScreen != isFullScreenMaximized)
-            {
-                deviceChangeChangedVisible = true;
-                oldVisible = Visible;
-                Visible = false;
-
-                if (window != null)
-                {
-                    window.SendToBack();
-                }
-            }
-            else
-            {
-                deviceChangeChangedVisible = false;
-            }
-
-            if (!willBeFullScreen && isFullScreenMaximized && window != null)
-            {
-                window.TopMost = false;
-                window.FormBorderStyle = savedFormBorderStyle;
-            }
-
-            deviceChangeWillBeFullScreen = willBeFullScreen;
+            IsFullscreen = willBeFullScreen;
+            if (!willBeFullScreen) window?.RecenterWindow();
         }
 
         public override void EndScreenDeviceChange(int clientWidth, int clientHeight)
         {
-            if (!deviceChangeWillBeFullScreen.HasValue)
-                return;
-
-            if (deviceChangeWillBeFullScreen.Value)
-            {
-                isFullScreenMaximized = true;
-            }
-            else if (isFullScreenMaximized)
-            {
-                if (window != null)
-                {
-                    window.BringToFront();
-                }
-                isFullScreenMaximized = false;
-            }
-
-            UpdateFormBorder();
-
-            if (deviceChangeChangedVisible)
-                Visible = oldVisible;
-
-            if (window != null)
-            {
-                window.ClientSize = new Size2(clientWidth, clientHeight);
-            }
-
-            // Notifies the GameForm about the fullscreen state
-            var gameForm = window as GameFormSDL;
-            if (gameForm != null)
-            {
-                gameForm.IsFullScreen = isFullScreenMaximized;
-            }
-
-            deviceChangeWillBeFullScreen = null;
+            // fullscreen is handled by IsFullscreen
         }
 
         protected internal override void SetSupportedOrientations(DisplayOrientation orientations)
@@ -122,33 +60,17 @@ protected internal override void SetSupportedOrientations(DisplayOrientation ori
         protected override void Initialize(GameContext<Window> gameContext)
         {
             window = gameContext.Control;
-
-            // Setup the initial size of the window
-            var width = gameContext.RequestedWidth;
-            if (width == 0)
-            {
-                width = window.ClientSize.Width;
-            }
-
-            var height = gameContext.RequestedHeight;
-            if (height == 0)
-            {
-                height = window.ClientSize.Height;
-            }
-
             windowHandle = new WindowHandle(AppContextType.Desktop, window, window.Handle);
-
-            window.ClientSize = new Size2(width, height);
-
             window.MouseEnterActions += WindowOnMouseEnterActions;   
             window.MouseLeaveActions += WindowOnMouseLeaveActions;
 
             var gameForm = window as GameFormSDL;
             if (gameForm != null)
             {
-                //gameForm.AppActivated += OnActivated;
-                //gameForm.AppDeactivated += OnDeactivated;
+                gameForm.AppActivated += OnActivated;
+                gameForm.AppDeactivated += OnDeactivated;
                 gameForm.UserResized += OnClientSizeChanged;
+                gameForm.CloseActions += GameForm_CloseActions;
             }
             else
             {
@@ -156,6 +78,11 @@ protected override void Initialize(GameContext<Window> gameContext)
             }
         }
 
+        private void GameForm_CloseActions()
+        {
+            OnClosing(this, new EventArgs());
+        }
+
         internal override void Run()
         {
             Debug.Assert(InitCallback != null, $"{nameof(InitCallback)} is null");
@@ -252,6 +179,21 @@ public override bool Visible
             }
         }
 
+        /// <summary>
+        /// Gets refresh rate of window in Hz.
+        /// </summary>
+        public override void GetDisplayInformation(out int width, out int height, out int refresh_rate, int display = -1) {
+            Window.GetDisplayInformation(out width, out height, out refresh_rate, display == -1 ? window?.GetWindowDisplay() ?? 0 : display);
+        }
+
+        /// <summary>
+        /// Gets available display modes for a given display (-1 will just pick the current display).
+        /// </summary>
+        public override List<Vector3> GetDisplayModes(int display = -1, bool maxRefreshRateOnly = true)
+        {
+            return Window.GetDisplayModes(maxRefreshRateOnly, display == -1 ? window?.GetWindowDisplay() ?? 0 : display);
+        }
+
         public override Int2 Position
         {
             get
@@ -270,6 +212,24 @@ public override Int2 Position
             }
         }
 
+        /// <summary>
+        /// Emulate a mouse press or release action.
+        /// </summary>
+        public override void EmulateMouseEvent(bool pressDown, bool left, int positionX, int positionY)
+        {
+            window.ProcessEvent(new SDL.SDL_Event()
+            {
+                button = new SDL.SDL_MouseButtonEvent()
+                {
+                    button = left ? (byte)SDL.SDL_BUTTON_LEFT : (byte)SDL.SDL_BUTTON_RIGHT,
+                    clicks = 1,
+                    type = pressDown ? SDL.SDL_EventType.SDL_MOUSEBUTTONDOWN : SDL.SDL_EventType.SDL_MOUSEBUTTONUP,
+                    x = positionX,
+                    y = positionY
+                }
+            });
+        }
+
         protected override void SetTitle(string title)
         {
             if (window != null)
@@ -278,7 +238,22 @@ protected override void SetTitle(string title)
             }
         }
 
-        internal override void Resize(int width, int height)
+        public override bool IsFullscreen {
+            get {
+                return window == null ? false : window.IsFullScreen;
+            }
+            set {
+                if (window != null && window.IsFullScreen != value ) {
+                    Visible = false;
+                    isFullScreenMaximized = value;
+                    UpdateFormBorder();
+                    window.IsFullScreen = value;
+                    Visible = true;
+                }
+            }
+        }
+
+        public override void Resize(int width, int height)
         {
             window.ClientSize = new Size2(width, height);
         }
@@ -320,7 +295,8 @@ private void UpdateFormBorder()
             if (window != null)
             {
                 window.MaximizeBox = allowUserResizing;
-                window.FormBorderStyle = isFullScreenMaximized || isBorderLess ? FormBorderStyle.None : allowUserResizing ? FormBorderStyle.Sizable : FormBorderStyle.FixedSingle;
+                window.FormBorderStyle = isFullScreenMaximized || isBorderLess ? FormBorderStyle.None : 
+                                         allowUserResizing ? FormBorderStyle.Sizable : FormBorderStyle.FixedSingle;
 
                 if (isFullScreenMaximized)
                 {
@@ -373,6 +349,11 @@ public override bool Focused
             }
         }
 
+        public int GetWindowIndex()
+        {
+            return window?.GetWindowDisplay() ?? 0;
+        }
+
         protected override void Destroy()
         {
             if (window != null)
diff --git a/sources/engine/Xenko.Games/Xenko.Games.csproj b/sources/engine/Xenko.Games/Xenko.Games.csproj
index 65f5be6d03..bc15e840e3 100644
--- a/sources/engine/Xenko.Games/Xenko.Games.csproj
+++ b/sources/engine/Xenko.Games/Xenko.Games.csproj
@@ -1,12 +1,11 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeWindowsDotNet>true</XenkoRuntimeWindowsDotNet>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -15,6 +14,7 @@
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
     <XenkoProjectPlatformDependentWindows>true</XenkoProjectPlatformDependentWindows>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
   <Import Condition="$(XenkoUI.Contains('SDL'))" Project="..\..\targets\SDL.targets" />
@@ -29,8 +29,7 @@
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Include="..\Xenko.Graphics\OpenGL\OpenGLUtils.cs" Link="OpenGLUtils.cs" />
-    <Compile Update="Resources\GameResources.Designer.cs" Condition=" '$(XenkoPlatform)' == 'Windows'">
+    <Compile Update="Resources\GameResources.Designer.cs" Condition="'$(XenkoPlatform)' == 'Windows'">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>GameResources.resx</DependentUpon>
@@ -40,14 +39,17 @@
     <ProjectReference Include="..\Xenko.Graphics\Xenko.Graphics.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Update="Resources\GameResources.resx" Condition=" '$(XenkoPlatform)' == 'Windows'">
+    <EmbeddedResource Update="Resources\GameResources.resx" Condition="'$(XenkoPlatform)' == 'Windows'">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>GameResources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\Logo.ico" Condition=" '$(XenkoPlatform)' == 'Windows'" />
+    <Content Include="Resources\Logo.ico" Condition="'$(XenkoPlatform)' == 'Windows'" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Regression/Properties/AndroidManifest.xml b/sources/engine/Xenko.Graphics.Regression/Properties/AndroidManifest.xml
index 8aaca749c5..f419892031 100644
--- a/sources/engine/Xenko.Graphics.Regression/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Graphics.Regression/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" package="Xenko.Graphics.RegressionTests">
-	<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
 	<application android:label="Graphics Regression Tests"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Regression/Xenko.Graphics.Regression.csproj b/sources/engine/Xenko.Graphics.Regression/Xenko.Graphics.Regression.csproj
index cca40c44c9..99cd63f22c 100644
--- a/sources/engine/Xenko.Graphics.Regression/Xenko.Graphics.Regression.csproj
+++ b/sources/engine/Xenko.Graphics.Regression/Xenko.Graphics.Regression.csproj
@@ -1,11 +1,10 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoPlatformFilter>Windows;Android;iOS;Linux;macOS;UWP</XenkoPlatformFilter>
     <DefineConstants>$(DefineConstants);XAMCORE_2_0</DefineConstants>
@@ -51,6 +50,6 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/ActivityAndroid.cs b/sources/engine/Xenko.Graphics.Tests.10_0/ActivityAndroid.cs
deleted file mode 100644
index 68a44e1917..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/ActivityAndroid.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Runtime.CompilerServices;
-using Android.App;
-using Android.OS;
-using Xenko.Effects;
-using Xenko.Starter;
-
-namespace Xenko.Graphics.Tests
-{
-    [Activity(Label = "Xenko Graphics", MainLauncher = true, Icon = "@drawable/icon")]
-    public class ActivityAndroid : AndroidXenkoActivity
-    {
-        protected override void OnCreate(Bundle bundle)
-        {
-            RuntimeHelpers.RunModuleConstructor(typeof(MaterialKeys).Module.ModuleHandle);
-
-            base.OnCreate(bundle);
-            
-            //Game = new TestDrawQuad();
-            //Game = new TestGeometricPrimitives();
-            //Game = new TestRenderToTexture();
-            //Game = new TestSpriteBatch();
-            //Game = new TestImageLoad();
-            //Game = new TestStaticSpriteFont();
-            //Game = new TestDynamicSpriteFont();
-            //Game = new TestDynamicSpriteFontJapanese();
-            Game = new TestDynamicSpriteFontVarious();
-
-            Game.Run(GameContext);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Application.iOS.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Application.iOS.cs
deleted file mode 100644
index 4e86a91fad..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Application.iOS.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using Xenko.Starter;
-
-namespace Xenko.Graphics.Tests
-{
-    public class ManualApplication
-    {
-        static void Main(string[] args)
-        {
-            UIApplication.Main(args, null, "ManualAppDelegate");
-        }
-    }
-
-    [Register("ManualAppDelegate")]
-    public class ManualAppDelegate : XenkoApplicationDelegate
-    {
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            //Game = new TestImageLoad();
-            //Game = new TestStaticSpriteFont();
-            //Game = new TestDynamicSpriteFont();
-            //Game = new TestDynamicSpriteFontJapanese();
-            Game = new TestDynamicSpriteFontVarious();
-
-            return base.FinishedLaunching(app, options);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.cs
deleted file mode 100644
index accf477ccc..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.cs
+++ /dev/null
@@ -1,2 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl
index 29e545bb17..8c60e6597f 100644
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl
+++ b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl
@@ -9,7 +9,7 @@ namespace Xenko.Rendering.Lights
         {
             float3 Position;
             float Radius;
-        }
+        };
 
 
 
@@ -67,5 +67,5 @@ namespace Xenko.Rendering.Lights
                 FilteredLightIndicesBuffer[FilteredLightIndicesCount] = -1;
             }
         }
-    }
+    };
 }
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl.cs
new file mode 100644
index 0000000000..51d014429f
--- /dev/null
+++ b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/LightTiling.xksl.cs
@@ -0,0 +1,25 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Lights
+{
+    public static partial class LightTilingKeys
+    {
+        public static readonly ValueParameterKey<int> PointLightCount = ParameterKeys.NewValue<int>();
+        public static readonly ObjectParameterKey<Buffer> PointLights = ParameterKeys.NewObject<Buffer>();
+        public static readonly ObjectParameterKey<Buffer> FilteredLightIndicesBuffer = ParameterKeys.NewObject<Buffer>();
+    }
+}
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffect.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffect.cs
rename to sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffectShader.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffectShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffectShader.cs
rename to sources/engine/Xenko.Graphics.Tests.10_0/Assets/MultipleRenderTargetsEffectShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Info.plist b/sources/engine/Xenko.Graphics.Tests.10_0/Info.plist
deleted file mode 100644
index b4126d24dc..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Info.plist
+++ /dev/null
@@ -1,30 +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>CFBundleDisplayName</key>
-	<string>PDX Graphics</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.xenko.graphics.tests</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>MinimumOSVersion</key>
-	<string>7.0</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>Icon@2x.png</string>
-		<string>Icon.png</string>
-		<string>Icon-60@2x.png</string>
-	</array>
-</dict>
-</plist>
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AndroidManifest.xml b/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AndroidManifest.xml
deleted file mode 100644
index 3f57270f7d..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Graphics.Tests_10_0" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
-	<application android:icon="@drawable/icon" android:label="Xenko Graphics" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
-	<uses-feature android:glEsVersion="0x00020000" android:required="true" />
-	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-	<uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-</manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AssemblyInfo.Android.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AssemblyInfo.Android.cs
deleted file mode 100644
index 27a54ef326..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AssemblyInfo.Android.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Graphics")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xenko.Graphics")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1ebcac74-0858-4b96-8979-f0ac6db3c2e7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8094c50b3e..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Resources;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Graphics.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Xenko.Graphics.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Drawable/icon.png b/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Drawable/icon.png
deleted file mode 100644
index 8c70a8b1d4..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Drawable/icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f3ad740f385a95762943a6aad4b9681f8d2baf8935d5f3457b1855a7ee67e99
-size 15351
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon-60@2x.png b/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon-60@2x.png
deleted file mode 100644
index f8a4b181af..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon-60@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0d5fcd3786c0ff6a274d767ed7d6a6281989d422ba9c2abc543f77b0d0605ac
-size 14005
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon.png b/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon.png
deleted file mode 100644
index 7a12e35579..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c669dbc80ab0f766aa49dd3f4cd5fa2d59f3c90de728630e7052013b20442cd2
-size 5451
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon@2x.png b/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon@2x.png
deleted file mode 100644
index 828dd63a8f..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Icon@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81c3034b0ecc3c5baa665b20f36bbd016f1b6c20135be38a5f16bc0688b9fde4
-size 13031
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Resource.Designer.cs b/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Resource.Designer.cs
deleted file mode 100644
index e0641c3dc5..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Resources/Resource.Designer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("Xenko.Graphics.Tests.Resource", IsApplication=true)]
-
-namespace Xenko.Graphics.Tests
-{
-	
-	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
-	public partial class Resource
-	{
-		
-		static Resource()
-		{
-			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-		}
-		
-		public static void UpdateIdValues()
-		{
-			global::Xenko.Resource.Id.EditTextLayout = global::Xenko.Graphics.Tests.Resource.Id.EditTextLayout;
-			global::Xenko.Resource.Id.GameMainLayout = global::Xenko.Graphics.Tests.Resource.Id.GameMainLayout;
-			global::Xenko.Resource.Id.GameViewLayout = global::Xenko.Graphics.Tests.Resource.Id.GameViewLayout;
-			global::Xenko.Resource.Layout.Game = global::Xenko.Graphics.Tests.Resource.Layout.Game;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::Xenko.Graphics.Tests.Resource.Id.OptionHostName;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::Xenko.Graphics.Tests.Resource.Id.OptionPort;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::Xenko.Graphics.Tests.Resource.Id.OptionRemoteServer;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionsButton = global::Xenko.Graphics.Tests.Resource.Id.OptionsButton;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::Xenko.Graphics.Tests.Resource.Id.ResultFullName;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::Xenko.Graphics.Tests.Resource.Id.ResultMessage;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::Xenko.Graphics.Tests.Resource.Id.ResultResultState;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultRunSingleMethodTest = global::Xenko.Graphics.Tests.Resource.Id.ResultRunSingleMethodTest;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::Xenko.Graphics.Tests.Resource.Id.ResultStackTrace;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::Xenko.Graphics.Tests.Resource.Id.ResultsFailed;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::Xenko.Graphics.Tests.Resource.Id.ResultsId;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsIgnored = global::Xenko.Graphics.Tests.Resource.Id.ResultsIgnored;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsInconclusive = global::Xenko.Graphics.Tests.Resource.Id.ResultsInconclusive;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsMessage = global::Xenko.Graphics.Tests.Resource.Id.ResultsMessage;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsPassed = global::Xenko.Graphics.Tests.Resource.Id.ResultsPassed;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsResult = global::Xenko.Graphics.Tests.Resource.Id.ResultsResult;
-			global::Xamarin.Android.NUnitLite.Resource.Id.RunTestsButton = global::Xenko.Graphics.Tests.Resource.Id.RunTestsButton;
-			global::Xamarin.Android.NUnitLite.Resource.Id.TestSuiteListView = global::Xenko.Graphics.Tests.Resource.Id.TestSuiteListView;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.options = global::Xenko.Graphics.Tests.Resource.Layout.options;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.results = global::Xenko.Graphics.Tests.Resource.Layout.results;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.test_result = global::Xenko.Graphics.Tests.Resource.Layout.test_result;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.test_suite = global::Xenko.Graphics.Tests.Resource.Layout.test_suite;
-		}
-		
-		public partial class Attribute
-		{
-			
-			static Attribute()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Attribute()
-			{
-			}
-		}
-		
-		public partial class Drawable
-		{
-			
-			// aapt resource value: 0x7f020000
-			public const int dialog_disclosure = 2130837504;
-			
-			// aapt resource value: 0x7f020001
-			public const int dialog_expander_ic_minimized = 2130837505;
-			
-			// aapt resource value: 0x7f020002
-			public const int Icon = 2130837506;
-			
-			static Drawable()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Drawable()
-			{
-			}
-		}
-		
-		public partial class Id
-		{
-			
-			// aapt resource value: 0x7f04000f
-			public const int EditTextLayout = 2130968591;
-			
-			// aapt resource value: 0x7f04000d
-			public const int GameMainLayout = 2130968589;
-			
-			// aapt resource value: 0x7f04000e
-			public const int GameViewLayout = 2130968590;
-			
-			// aapt resource value: 0x7f040011
-			public const int OptionHostName = 2130968593;
-			
-			// aapt resource value: 0x7f040012
-			public const int OptionPort = 2130968594;
-			
-			// aapt resource value: 0x7f040010
-			public const int OptionRemoteServer = 2130968592;
-			
-			// aapt resource value: 0x7f040020
-			public const int OptionsButton = 2130968608;
-			
-			// aapt resource value: 0x7f04001b
-			public const int ResultFullName = 2130968603;
-			
-			// aapt resource value: 0x7f04001d
-			public const int ResultMessage = 2130968605;
-			
-			// aapt resource value: 0x7f04001c
-			public const int ResultResultState = 2130968604;
-			
-			// aapt resource value: 0x7f04001a
-			public const int ResultRunSingleMethodTest = 2130968602;
-			
-			// aapt resource value: 0x7f04001e
-			public const int ResultStackTrace = 2130968606;
-			
-			// aapt resource value: 0x7f040016
-			public const int ResultsFailed = 2130968598;
-			
-			// aapt resource value: 0x7f040013
-			public const int ResultsId = 2130968595;
-			
-			// aapt resource value: 0x7f040017
-			public const int ResultsIgnored = 2130968599;
-			
-			// aapt resource value: 0x7f040018
-			public const int ResultsInconclusive = 2130968600;
-			
-			// aapt resource value: 0x7f040019
-			public const int ResultsMessage = 2130968601;
-			
-			// aapt resource value: 0x7f040015
-			public const int ResultsPassed = 2130968597;
-			
-			// aapt resource value: 0x7f040014
-			public const int ResultsResult = 2130968596;
-			
-			// aapt resource value: 0x7f04001f
-			public const int RunTestsButton = 2130968607;
-			
-			// aapt resource value: 0x7f040021
-			public const int TestSuiteListView = 2130968609;
-			
-			// aapt resource value: 0x7f040002
-			public const int dialog_BoolField = 2130968578;
-			
-			// aapt resource value: 0x7f040003
-			public const int dialog_Button = 2130968579;
-			
-			// aapt resource value: 0x7f040009
-			public const int dialog_DisclosureField = 2130968585;
-			
-			// aapt resource value: 0x7f040005
-			public const int dialog_ImageLeft = 2130968581;
-			
-			// aapt resource value: 0x7f040007
-			public const int dialog_ImageRight = 2130968583;
-			
-			// aapt resource value: 0x7f040000
-			public const int dialog_LabelField = 2130968576;
-			
-			// aapt resource value: 0x7f040001
-			public const int dialog_LabelSubtextField = 2130968577;
-			
-			// aapt resource value: 0x7f040008
-			public const int dialog_Panel = 2130968584;
-			
-			// aapt resource value: 0x7f04000a
-			public const int dialog_RadioButtonList = 2130968586;
-			
-			// aapt resource value: 0x7f040006
-			public const int dialog_SliderField = 2130968582;
-			
-			// aapt resource value: 0x7f04000b
-			public const int dialog_Spinner = 2130968587;
-			
-			// aapt resource value: 0x7f040004
-			public const int dialog_ValueField = 2130968580;
-			
-			// aapt resource value: 0x7f04000c
-			public const int iFormFieldValue = 2130968588;
-			
-			static Id()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Id()
-			{
-			}
-		}
-		
-		public partial class Layout
-		{
-			
-			// aapt resource value: 0x7f030000
-			public const int dialog_achievements = 2130903040;
-			
-			// aapt resource value: 0x7f030001
-			public const int dialog_boolfieldleft = 2130903041;
-			
-			// aapt resource value: 0x7f030002
-			public const int dialog_boolfieldright = 2130903042;
-			
-			// aapt resource value: 0x7f030003
-			public const int dialog_boolfieldsubleft = 2130903043;
-			
-			// aapt resource value: 0x7f030004
-			public const int dialog_boolfieldsubright = 2130903044;
-			
-			// aapt resource value: 0x7f030005
-			public const int dialog_button = 2130903045;
-			
-			// aapt resource value: 0x7f030006
-			public const int dialog_datefield = 2130903046;
-			
-			// aapt resource value: 0x7f030007
-			public const int dialog_fieldsetlabel = 2130903047;
-			
-			// aapt resource value: 0x7f030008
-			public const int dialog_floatimage = 2130903048;
-			
-			// aapt resource value: 0x7f030009
-			public const int dialog_labelfieldbelow = 2130903049;
-			
-			// aapt resource value: 0x7f03000a
-			public const int dialog_labelfieldright = 2130903050;
-			
-			// aapt resource value: 0x7f03000b
-			public const int dialog_onofffieldright = 2130903051;
-			
-			// aapt resource value: 0x7f03000c
-			public const int dialog_panel = 2130903052;
-			
-			// aapt resource value: 0x7f03000d
-			public const int dialog_root = 2130903053;
-			
-			// aapt resource value: 0x7f03000e
-			public const int dialog_selectlist = 2130903054;
-			
-			// aapt resource value: 0x7f03000f
-			public const int dialog_selectlistfield = 2130903055;
-			
-			// aapt resource value: 0x7f030010
-			public const int dialog_textarea = 2130903056;
-			
-			// aapt resource value: 0x7f030011
-			public const int dialog_textfieldbelow = 2130903057;
-			
-			// aapt resource value: 0x7f030012
-			public const int dialog_textfieldright = 2130903058;
-			
-			// aapt resource value: 0x7f030013
-			public const int Game = 2130903059;
-			
-			// aapt resource value: 0x7f030014
-			public const int options = 2130903060;
-			
-			// aapt resource value: 0x7f030015
-			public const int results = 2130903061;
-			
-			// aapt resource value: 0x7f030016
-			public const int test_result = 2130903062;
-			
-			// aapt resource value: 0x7f030017
-			public const int test_suite = 2130903063;
-			
-			static Layout()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Layout()
-			{
-			}
-		}
-	}
-}
-#pragma warning restore 1591
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapDeferred.cs b/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapDeferred.cs
deleted file mode 100644
index 82a703ca18..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapDeferred.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-
-using Xunit;
-
-using Xenko.Core.Mathematics;
-using Xenko.Effects;
-using Xenko.Effects.Cubemap;
-using Xenko.Effects.Renderers;
-using Xenko.Engine;
-using Xenko.EntityModel;
-using Xenko.Extensions;
-
-namespace Xenko.Graphics.Tests
-{
-    public class TestCubemapDeferred : TestGameBase
-    {
-        private LightingIBLRenderer IBLRenderer;
-
-        private Entity teapotEntity;
-
-        private Entity dynamicCubemapEntity;
-
-        public TestCubemapDeferred()
-        {
-            GraphicsDeviceManager.PreferredGraphicsProfile = new[] { GraphicsProfile.Level_11_0 };
-        }
-
-        protected override async Task LoadContent()
-        {
-            await base.LoadContent();
-
-            // create pipeline
-            CreatePipeline();
-
-            // setup the scene
-            var material = Asset.Load<Material>("BasicMaterial");
-            teapotEntity = new Entity()
-            {
-                new ModelComponent()
-                {
-                    Model = new Model()
-                    {
-                        material,
-                        new Mesh()
-                        {
-                            Draw = GeometricPrimitive.Teapot.New(GraphicsDevice).ToMeshDraw(),
-                            MaterialIndex = 0,
-                        }
-                    }
-                }
-            };
-            Entities.Add(teapotEntity);
-
-            var textureCube = Asset.Load<Texture>("uv_cube");
-            var staticCubemapEntity = new Entity()
-            {
-                new CubemapSourceComponent(textureCube) { InfluenceRadius = 2f, IsDynamic = false },
-                new TransformationComponent() { Translation = Vector3.UnitZ }
-            };
-            Entities.Add(staticCubemapEntity);
-
-            dynamicCubemapEntity = new Entity()
-            {
-                new CubemapSourceComponent(textureCube) { InfluenceRadius = 0.5f, IsDynamic = false },
-                new TransformationComponent() { Translation = Vector3.Zero }
-            };
-            Entities.Add(dynamicCubemapEntity);
-
-            var mainCamera = new Entity()
-            {
-                new CameraComponent
-                {
-                    AspectRatio = 8/4.8f,
-                    FarPlane = 20,
-                    NearPlane = 1,
-                    VerticalFieldOfView = 0.6f,
-                    Target = teapotEntity,
-                    TargetUp = Vector3.UnitY,
-                },
-                new TransformationComponent
-                {
-                    Translation = new Vector3(4, 3, 0)
-                }
-            };
-            Entities.Add(mainCamera);
-
-            RenderSystem.Pipeline.SetCamera(mainCamera.Get<CameraComponent>());
-
-            Script.Add(GameScript1);
-        }
-
-        private void CreatePipeline()
-        {
-            // Processor
-            Entities.Processors.Add(new CubemapSourceProcessor(GraphicsDevice));
-
-            // Rendering pipeline
-            RenderSystem.Pipeline.Renderers.Add(new CameraSetter(Services));
-
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services)
-            {
-                ClearColor = Color.CornflowerBlue,
-                EnableClearDepth = true,
-                ClearDepth = 1f
-            });
-
-            // Create G-buffer pass
-            var gbufferPipeline = new RenderPipeline("GBuffer");
-            // Renders the G-buffer for opaque geometry.
-            gbufferPipeline.Renderers.Add(new ModelRenderer(Services, "CubemapIBLEffect.XenkoGBufferShaderPass"));
-            var gbufferProcessor = new GBufferRenderProcessor(Services, gbufferPipeline, GraphicsDevice.DepthStencilBuffer, false);
-
-            // Add sthe G-buffer pass to the pipeline.
-            RenderSystem.Pipeline.Renderers.Add(gbufferProcessor);
-
-            var readOnlyDepthBuffer = GraphicsDevice.DepthStencilBuffer; // TODO ToDepthStencilBuffer(true);
-            IBLRenderer = new LightingIBLRenderer(Services, "CubemapIBLSpecular", readOnlyDepthBuffer);
-            RenderSystem.Pipeline.Renderers.Add(IBLRenderer);
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services)
-            {
-                ClearColor = Color.CornflowerBlue,
-                EnableClearDepth = false,
-            });
-            RenderSystem.Pipeline.Renderers.Add(new DelegateRenderer(Services) { Render = ShowIBL });
-        }
-
-        private void ShowIBL(RenderContext context)
-        {
-            GraphicsDevice.DrawTexture(IBLRenderer.IBLTexture);
-        }
-
-        private async Task GameScript1()
-        {
-            while (IsRunning)
-            {
-                // Wait next rendering frame
-                await Script.NextFrame();
-
-                teapotEntity.Transform.Rotation = Quaternion.RotationY((float)(2 * Math.PI * UpdateTime.Total.TotalMilliseconds / 5000.0f));
-                dynamicCubemapEntity.Transform.Translation = new Vector3(2f * (float)Math.Sin(2 * Math.PI * UpdateTime.Total.TotalMilliseconds / 15000.0f), 0, 0);
-            }
-        }
-
-        public static void Main()
-        {
-            using (var game = new TestCubemapDeferred())
-                game.Run();
-        }
-
-        /// <summary>
-        /// Run the test
-        /// </summary>
-        [Fact]
-        public void RunCubemapRendering()
-        {
-            RunGameTest(new TestCubemapDeferred());
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapDisplay.cs b/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapDisplay.cs
deleted file mode 100644
index 0f3b5934fd..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapDisplay.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-
-using Xunit;
-
-using Xenko.Core.Mathematics;
-using Xenko.Effects;
-using Xenko.Engine;
-using Xenko.EntityModel;
-using Xenko.Extensions;
-
-namespace Xenko.Graphics.Tests
-{
-    public class TestCubemapDisplay : TestGameBase
-    {
-        private Entity mainCamera;
-        private float cameraDistance = 3;
-        private float cameraHeight = 3;
-        private Vector3 cameraUp = Vector3.UnitY;
-
-        public TestCubemapDisplay()
-        {
-            GraphicsDeviceManager.PreferredGraphicsProfile = new[] { GraphicsProfile.Level_9_1 };
-        }
-
-        protected override async Task LoadContent()
-        {
-            await base.LoadContent();
-
-            CreatePipeline();
-
-            var material = Asset.Load<Material>("BasicMaterial");
-            var textureCube = Asset.Load<Texture>("uv_cube");
-            material.Parameters.Set(TexturingKeys.TextureCube0, textureCube);
-            var mesh = new Mesh()
-            {
-                Draw = GeometricPrimitive.GeoSphere.New(GraphicsDevice).ToMeshDraw(),
-                Material = material
-            };
-            mesh.Parameters.Set(RenderingParameters.RenderGroup, RenderGroups.Group1);
-
-            var entity = new Entity()
-            {
-                new ModelComponent()
-                {
-                    Model = new Model() { mesh }
-                },
-                new TransformationComponent()
-            };
-            
-            Entities.Add(entity);
-
-            var mainCameraTargetEntity = new Entity(Vector3.Zero);
-            Entities.Add(mainCameraTargetEntity);
-            mainCamera = new Entity()
-            {
-                new CameraComponent
-                {
-                    AspectRatio = 8/4.8f,
-                    FarPlane = 1000,
-                    NearPlane = 1,
-                    VerticalFieldOfView = 0.6f,
-                    Target = mainCameraTargetEntity,
-                    TargetUp = cameraUp,
-                },
-                new TransformationComponent
-                {
-                    Translation = cameraDistance * Vector3.UnitX
-                }
-            };
-            Entities.Add(mainCamera);
-
-            RenderSystem.Pipeline.SetCamera(mainCamera.Get<CameraComponent>());
-
-            // Add a custom script
-            Script.Add(GameScript1);
-        }
-
-        private void CreatePipeline()
-        {
-            RenderSystem.Pipeline.Renderers.Add(new CameraSetter(Services));
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services) { ClearColor = Color.CornflowerBlue });
-            RenderSystem.Pipeline.Renderers.Add(new ModelRenderer(Services, "CubemapDisplayEffect"));
-        }
-
-        private async Task GameScript1()
-        {
-            while (IsRunning)
-            {
-                // Wait next rendering frame
-                await Script.NextFrame();
-
-                var angle = Math.PI * UpdateTime.Total.TotalMilliseconds / 5000;
-                mainCamera.Transform.Translation = new Vector3((float)(cameraDistance * Math.Cos(angle)), cameraHeight, (float)(cameraDistance * Math.Sin(angle)));
-            }
-        }
-
-        public static void Main()
-        {
-            using (var game = new TestCubemapDisplay())
-                game.Run();
-        }
-
-        /// <summary>
-        /// Run the test
-        /// </summary>
-        [Fact]
-        public void RunCubemapRendering()
-        {
-            RunGameTest(new TestCubemapDisplay());
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapRendering.cs b/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapRendering.cs
deleted file mode 100644
index b10141aa81..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/TestCubemapRendering.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-using Xenko.Core.Mathematics;
-using Xenko.Effects;
-using Xenko.Effects.Cubemap;
-using Xenko.Engine;
-using Xenko.EntityModel;
-using Xenko.Extensions;
-using Xenko.Input;
-
-namespace Xenko.Graphics.Tests
-{
-    public class TestCubemapRendering : TestGameBase
-    {
-        private Entity mainCamera;
-        private Vector3 cameraInitPos = new Vector3(10, 0, 0);
-        private Vector3 cameraUp = Vector3.UnitY;
-        private Entity[] primitiveEntities;
-        private Vector3[] rotationAxis;
-
-        public TestCubemapRendering()
-        {
-            // cannot render cubemap in level below 10.1
-            GraphicsDeviceManager.PreferredGraphicsProfile = new[] { GraphicsProfile.Level_11_0 };
-        }
-
-        protected override async Task LoadContent()
-        {
-            await base.LoadContent();
-
-            CreatePipeline(true);
-
-            IsMouseVisible = true;
-
-            //Input.ActivatedGestures.Add(new GestureConfigDrag());
-
-            // Creates all primitives
-            //                                     type           pos     axis
-            var primitives = new List<Tuple<GeometricPrimitive, Vector3, Vector3>>
-                             {
-                                 Tuple.Create(GeometricPrimitive.Cube.New(GraphicsDevice), 2 * Vector3.UnitX, new Vector3(1,1,1)),
-                                 Tuple.Create(GeometricPrimitive.Teapot.New(GraphicsDevice), -2 * Vector3.UnitX, new Vector3(-1,1,1)),
-                                 Tuple.Create(GeometricPrimitive.GeoSphere.New(GraphicsDevice), 2 * Vector3.UnitY, new Vector3(1,0,1)),
-                                 Tuple.Create(GeometricPrimitive.Cylinder.New(GraphicsDevice), -2 * Vector3.UnitY, new Vector3(-1,-1,1)),
-                                 Tuple.Create(GeometricPrimitive.Torus.New(GraphicsDevice), 2 * Vector3.UnitZ, new Vector3(1,-1,1)),
-                                 Tuple.Create(GeometricPrimitive.Sphere.New(GraphicsDevice), -2 * Vector3.UnitZ, new Vector3(0,1,1)),
-                             };
-
-            primitiveEntities = new Entity[primitives.Count];
-            rotationAxis = new Vector3[primitives.Count];
-            var material = Asset.Load<Material>("BasicMaterial");
-            for (var i =0; i < primitives.Count; ++i)
-            {
-                var mesh = new Mesh
-                {
-                    Draw = primitives[i].Item1.ToMeshDraw(),
-                    MaterialIndex = 0,
-                };
-                mesh.Parameters.Set(RenderingParameters.RenderGroup, RenderGroups.Group1);
-
-                var entity = new Entity
-                {
-                    new ModelComponent
-                    {
-                        Model = new Model { mesh, material }
-                    },
-                    new TransformationComponent { Translation = primitives[i].Item2 }
-                };
-                Entities.Add(entity);
-                primitiveEntities[i] = entity;
-                rotationAxis[i] = primitives[i].Item3;
-            }
-
-            var reflectivePrimitive = GeometricPrimitive.Sphere.New(GraphicsDevice);
-            var reflectiveMesh = new Mesh
-            {
-                Draw = reflectivePrimitive.ToMeshDraw(),
-            };
-            reflectiveMesh.Parameters.Set(RenderingParameters.RenderGroup, RenderGroups.Group2);
-
-            var reflectEntity = new Entity
-            {
-                new ModelComponent
-                {
-                    Model = new Model { reflectiveMesh }
-                },
-                new TransformationComponent(),
-                new CubemapSourceComponent { IsDynamic = true, Size = 128 }
-            };
-            Entities.Add(reflectEntity);
-            reflectEntity.Get<ModelComponent>().Parameters.Set(TexturingKeys.TextureCube0, reflectEntity.Get<CubemapSourceComponent>().Texture);
-
-            var mainCameraTargetEntity = new Entity(Vector3.Zero);
-            Entities.Add(mainCameraTargetEntity);
-            mainCamera = new Entity
-            {
-                new CameraComponent
-                {
-                    AspectRatio = 8/4.8f,
-                    FarPlane = 1000,
-                    NearPlane = 1,
-                    VerticalFieldOfView = 0.6f,
-                    Target = mainCameraTargetEntity,
-                    TargetUp = cameraUp,
-                },
-                new TransformationComponent
-                {
-                    Translation = cameraInitPos
-                }
-            };
-            Entities.Add(mainCamera);
-
-            RenderSystem.Pipeline.SetCamera(mainCamera.Get<CameraComponent>());
-
-            // Add a custom script
-            Script.Add(GameScript1);
-        }
-
-        private void CreatePipeline(bool renderInOnePass)
-        {
-            // Processor
-            Entities.Processors.Add(new CubemapSourceProcessor(GraphicsDevice));
-
-            // Rendering pipeline
-            var cubeMapPipeline = new RenderPipeline("CubeMap");
-            cubeMapPipeline.Renderers.Add(new ModelRenderer(Services, renderInOnePass ? "CubemapGeomEffect" : "CubemapEffect").AddLayerFilter(RenderGroups.Group1));
-            RenderSystem.Pipeline.Renderers.Add(new CubemapRenderer(Services, cubeMapPipeline, renderInOnePass));
-            RenderSystem.Pipeline.Renderers.Add(new CameraSetter(Services));
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services) { ClearColor = Color.CornflowerBlue });
-            RenderSystem.Pipeline.Renderers.Add(new ModelRenderer(Services, "CubemapEffect"));
-        }
-
-        private async Task GameScript1()
-        {
-            var dragValue = Vector2.Zero;
-            var rotationFactor = 0.125f;
-            var rotationUpFactor = 0.1f;
-            var rotate = true;
-            while (IsRunning)
-            {
-                // Wait next rendering frame
-                await Script.NextFrame();
-
-                if (Input.IsKeyPressed(Keys.Space))
-                    rotate = !rotate;
-
-                if (rotate)
-                {
-                    var rotationPrim = (float) (2*Math.PI*UpdateTime.Total.TotalMilliseconds/15000);
-                    for (var i = 0; i < primitiveEntities.Length; ++i)
-                    {
-                        primitiveEntities[i].Transform.Rotation = Quaternion.RotationAxis(rotationAxis[i], rotationPrim);
-                    }
-                }
-
-                // rotate camera
-                dragValue = 0.95f * dragValue;
-                if (Input.PointerEvents.Count > 0)
-                {
-                    dragValue = Input.PointerEvents.Aggregate(Vector2.Zero, (t, x) => x.DeltaPosition + t);
-                }
-                rotationFactor -= dragValue.X;
-                rotationUpFactor += dragValue.Y;
-                if (rotationUpFactor > 0.45f)
-                    rotationUpFactor = 0.45f;
-                else if (rotationUpFactor < -0.45f)
-                    rotationUpFactor = -0.45f;
-                mainCamera.Transform.Translation = Vector3.Transform(cameraInitPos, Quaternion.RotationZ((float)(Math.PI * rotationUpFactor)) * Quaternion.RotationY((float)(2 * Math.PI * rotationFactor)));
-            }
-        }
-
-        public static void Main()
-        {
-            using (var game = new TestCubemapRendering())
-                game.Run();
-        }
-
-        /// <summary>
-        /// Run the test
-        /// </summary>
-        [Fact]
-        public void RunCubemapRendering()
-        {
-            RunGameTest(new TestCubemapRendering());
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Android.csproj b/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Android.csproj
deleted file mode 100644
index a569a1074b..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Android.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
-    <AssemblyName>Xenko.Graphics.Tests.10_0</AssemblyName>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AndroidApplication>true</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
-    <AndroidUseLatestPlatformSdk></AndroidUseLatestPlatformSdk>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
-    <AndroidStoreUncompressedFileExtensions />
-    <MandroidI18n />
-    <JavaMaximumHeapSize />
-    <JavaOptions />
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <XenkoPlatform>Android</XenkoPlatform>
-    <XenkoBuildProfile>Android</XenkoBuildProfile>
-    <XenkoPackageGuid>{04ed1618-1a06-4a69-ac34-1006a978af11}</XenkoPackageGuid>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''">OpenGLES</XenkoGraphicsApi>
-    <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
-    <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Graphics.Tests.10_0.xkpkg</XenkoCurrentPackagePath>
-    <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Android' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID;XENKO_GRAPHICS_API_OPENGL;XENKO_GRAPHICS_API_OPENGLES</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Android' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID;XENKO_GRAPHICS_API_OPENGL;XENKO_GRAPHICS_API_OPENGLES</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Label="Xenko.DoNotSync" Include="Properties\AssemblyInfo.cs" />
-    <Content Label="Xenko.DoNotSync" Include="Properties\AndroidManifest.xml" />
-    <AndroidResource Label="Xenko.DoNotSync" Include="Resources\Drawable\Icon.png" />
-    <Compile Label="Xenko.DoNotSync" Include="Resources\Resource.Designer.cs" />
-    <Compile Label="Xenko.DoNotSync" Include="..\..\..\sources\shared\tests\nunitlite\NUnitLiteLauncher.Android.cs">
-      <Link>NUnitLiteLauncher.Android.cs</Link>
-    </Compile>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Assets\MultipleRenderTargetsEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultipleRenderTargetsEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Assets\MultipleRenderTargetsEffectShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultipleRenderTargetsEffectShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="LightingTests.cs" />
-    <Compile Include="MaterialTests.cs" />
-    <Compile Include="NextGen\NextGenTest1.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <Compile Include="TestImageEffect.cs" />
-    <Compile Include="TestLightShafts.cs" />
-    <None Include="Assets\MultipleRenderTargetsEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultipleRenderTargetsEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\MultipleRenderTargetsEffectShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultipleRenderTargetsEffectShader.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.10_0.xkpkg" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="$(XenkoPackageProps)" Condition="Exists('$(XenkoPackageProps)')" />
-  <Import Project="..\..\targets\Xenko.UnitTests.targets" Condition="Exists('..\..\targets\Xenko.UnitTests.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-    Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Windows.csproj b/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Windows.csproj
index 4de700d579..b5e115f3f9 100644
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Windows.csproj
+++ b/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.Windows.csproj
@@ -1,13 +1,12 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
     <AssemblyName>Xenko.Graphics.Tests.10_0</AssemblyName>
     <TargetFramework>net461</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <EnableDefaultItems>false</EnableDefaultItems>
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoPlatform>Windows</XenkoPlatform>
     <XenkoBuildProfile>Windows</XenkoBuildProfile>
@@ -28,46 +27,21 @@
     <StartupObject>Xenko.Engine.NextGen.NextGenTest1</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
+    <Compile Remove="Assets\LightTiling.xksl.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <None Remove="Assets\LightTiling.xksl" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Assets\MultipleRenderTargetsEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultipleRenderTargetsEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Assets\MultipleRenderTargetsEffectShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultipleRenderTargetsEffectShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="LightingTests.cs" />
-    <Compile Include="MaterialTests.cs" />
-    <Compile Include="NextGen\NextGenTest1.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <Compile Include="TestImageEffect.cs" />
-    <Compile Include="TestLightShafts.cs" />
-    <None Include="Assets\MultipleRenderTargetsEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultipleRenderTargetsEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\MultipleRenderTargetsEffectShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultipleRenderTargetsEffectShader.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.10_0.xkpkg" />
+    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
+    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.iOS.csproj b/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.iOS.csproj
deleted file mode 100644
index 38ce9bddca..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.10_0/Xenko.Graphics.Tests.10_0.iOS.csproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{570B0FF9-246F-4C6C-8384-F6BE1887A4A9}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
-    <AssemblyName>XenkoGraphicsTests10_0</AssemblyName>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <XenkoPlatform>iOS</XenkoPlatform>
-    <XenkoBuildProfile>iOS</XenkoBuildProfile>
-    <XenkoPackageGuid>{04ed1618-1a06-4a69-ac34-1006a978af11}</XenkoPackageGuid>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''">OpenGLES</XenkoGraphicsApi>
-    <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
-    <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Graphics.Tests.10_0.xkpkg</XenkoCurrentPackagePath>
-    <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>True</MtouchUseSGen>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <CodesignKey>iPhone Developer</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Testing|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <BuildIpa>True</BuildIpa>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Xenko.Core.Tests.Application</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.iOS" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Label="Xenko.DoNotSync" Include="Info.plist" />
-    <Compile Label="Xenko.DoNotSync" Include="Properties\AssemblyInfo.cs" />
-    <Compile Label="Xenko.DoNotSync" Include="..\..\..\sources\shared\tests\nunitlite\NUnitLiteLauncher.iPhone.cs">
-      <Link>NUnitLiteLauncher.iPhone.cs</Link>
-    </Compile>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Assets\MultipleRenderTargetsEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultipleRenderTargetsEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Assets\MultipleRenderTargetsEffectShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultipleRenderTargetsEffectShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="LightingTests.cs" />
-    <Compile Include="MaterialTests.cs" />
-    <Compile Include="NextGen\NextGenTest1.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <Compile Include="TestImageEffect.cs" />
-    <Compile Include="TestLightShafts.cs" />
-    <None Include="Assets\MultipleRenderTargetsEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultipleRenderTargetsEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\MultipleRenderTargetsEffectShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultipleRenderTargetsEffectShader.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.10_0.xkpkg" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Icon.png" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Icon%402x.png" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Icon-60%402x.png" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="$(XenkoPackageProps)" Condition="Exists('$(XenkoPackageProps)')" />
-  <Import Project="..\..\targets\Xenko.UnitTests.targets" Condition="Exists('..\..\targets\Xenko.UnitTests.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-    Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/ActivityAndroid.cs b/sources/engine/Xenko.Graphics.Tests.11_0/ActivityAndroid.cs
deleted file mode 100644
index 68a44e1917..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/ActivityAndroid.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Runtime.CompilerServices;
-using Android.App;
-using Android.OS;
-using Xenko.Effects;
-using Xenko.Starter;
-
-namespace Xenko.Graphics.Tests
-{
-    [Activity(Label = "Xenko Graphics", MainLauncher = true, Icon = "@drawable/icon")]
-    public class ActivityAndroid : AndroidXenkoActivity
-    {
-        protected override void OnCreate(Bundle bundle)
-        {
-            RuntimeHelpers.RunModuleConstructor(typeof(MaterialKeys).Module.ModuleHandle);
-
-            base.OnCreate(bundle);
-            
-            //Game = new TestDrawQuad();
-            //Game = new TestGeometricPrimitives();
-            //Game = new TestRenderToTexture();
-            //Game = new TestSpriteBatch();
-            //Game = new TestImageLoad();
-            //Game = new TestStaticSpriteFont();
-            //Game = new TestDynamicSpriteFont();
-            //Game = new TestDynamicSpriteFontJapanese();
-            Game = new TestDynamicSpriteFontVarious();
-
-            Game.Run(GameContext);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Application.iOS.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Application.iOS.cs
deleted file mode 100644
index 4e86a91fad..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Application.iOS.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using Xenko.Starter;
-
-namespace Xenko.Graphics.Tests
-{
-    public class ManualApplication
-    {
-        static void Main(string[] args)
-        {
-            UIApplication.Main(args, null, "ManualAppDelegate");
-        }
-    }
-
-    [Register("ManualAppDelegate")]
-    public class ManualAppDelegate : XenkoApplicationDelegate
-    {
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            //Game = new TestImageLoad();
-            //Game = new TestStaticSpriteFont();
-            //Game = new TestDynamicSpriteFont();
-            //Game = new TestDynamicSpriteFontJapanese();
-            Game = new TestDynamicSpriteFontVarious();
-
-            return base.FinishedLaunching(app, options);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTest.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTest.cs
rename to sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTest.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTestEffect.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTestEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTestEffect.cs
rename to sources/engine/Xenko.Graphics.Tests.11_0/Assets/ComputeShaderTestEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Assets/CubemapSprite.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Assets/CubemapSprite.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests.11_0/Assets/CubemapSprite.cs
rename to sources/engine/Xenko.Graphics.Tests.11_0/Assets/CubemapSprite.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Assets/HammersleyTest.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Assets/HammersleyTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests.11_0/Assets/HammersleyTest.cs
rename to sources/engine/Xenko.Graphics.Tests.11_0/Assets/HammersleyTest.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Info.plist b/sources/engine/Xenko.Graphics.Tests.11_0/Info.plist
deleted file mode 100644
index cce2f372fe..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Info.plist
+++ /dev/null
@@ -1,32 +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>CFBundleDisplayName</key>
-	<string>PDX Graphics</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.xenko.graphics.tests</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>UIDeviceFamily</key>
-	<array>
-		<integer>1</integer>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>MinimumOSVersion</key>
-	<string>7.0</string>
-	<key>NSMainNibFile</key>
-	<string></string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>Icon@2x.png</string>
-		<string>Icon.png</string>
-		<string>Icon-60@2x.png</string>
-	</array>
-</dict>
-</plist>
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AndroidManifest.xml b/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AndroidManifest.xml
deleted file mode 100644
index 0e93b94b45..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Graphics.Tests_11_0" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
-  <application android:icon="@drawable/icon" android:label="Xenko Graphics" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
-  <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-</manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AssemblyInfo.Android.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AssemblyInfo.Android.cs
deleted file mode 100644
index 27a54ef326..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AssemblyInfo.Android.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Graphics")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xenko.Graphics")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1ebcac74-0858-4b96-8979-f0ac6db3c2e7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8094c50b3e..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Resources;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Graphics.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Xenko.Graphics.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Drawable/icon.png b/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Drawable/icon.png
deleted file mode 100644
index d38fb06661..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Drawable/icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:67ad238d2d0126e2cec3976d052bacf5dfaad7586b1e48f0eeadf6a5b4c497c6
-size 14758
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon-60@2x.png b/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon-60@2x.png
deleted file mode 100644
index f8a4b181af..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon-60@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0d5fcd3786c0ff6a274d767ed7d6a6281989d422ba9c2abc543f77b0d0605ac
-size 14005
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon.png b/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon.png
deleted file mode 100644
index 7a12e35579..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c669dbc80ab0f766aa49dd3f4cd5fa2d59f3c90de728630e7052013b20442cd2
-size 5451
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon@2x.png b/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon@2x.png
deleted file mode 100644
index 828dd63a8f..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Icon@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81c3034b0ecc3c5baa665b20f36bbd016f1b6c20135be38a5f16bc0688b9fde4
-size 13031
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Resource.Designer.cs b/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Resource.Designer.cs
deleted file mode 100644
index e0641c3dc5..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Resources/Resource.Designer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("Xenko.Graphics.Tests.Resource", IsApplication=true)]
-
-namespace Xenko.Graphics.Tests
-{
-	
-	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
-	public partial class Resource
-	{
-		
-		static Resource()
-		{
-			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-		}
-		
-		public static void UpdateIdValues()
-		{
-			global::Xenko.Resource.Id.EditTextLayout = global::Xenko.Graphics.Tests.Resource.Id.EditTextLayout;
-			global::Xenko.Resource.Id.GameMainLayout = global::Xenko.Graphics.Tests.Resource.Id.GameMainLayout;
-			global::Xenko.Resource.Id.GameViewLayout = global::Xenko.Graphics.Tests.Resource.Id.GameViewLayout;
-			global::Xenko.Resource.Layout.Game = global::Xenko.Graphics.Tests.Resource.Layout.Game;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::Xenko.Graphics.Tests.Resource.Id.OptionHostName;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::Xenko.Graphics.Tests.Resource.Id.OptionPort;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::Xenko.Graphics.Tests.Resource.Id.OptionRemoteServer;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionsButton = global::Xenko.Graphics.Tests.Resource.Id.OptionsButton;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::Xenko.Graphics.Tests.Resource.Id.ResultFullName;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::Xenko.Graphics.Tests.Resource.Id.ResultMessage;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::Xenko.Graphics.Tests.Resource.Id.ResultResultState;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultRunSingleMethodTest = global::Xenko.Graphics.Tests.Resource.Id.ResultRunSingleMethodTest;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::Xenko.Graphics.Tests.Resource.Id.ResultStackTrace;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::Xenko.Graphics.Tests.Resource.Id.ResultsFailed;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::Xenko.Graphics.Tests.Resource.Id.ResultsId;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsIgnored = global::Xenko.Graphics.Tests.Resource.Id.ResultsIgnored;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsInconclusive = global::Xenko.Graphics.Tests.Resource.Id.ResultsInconclusive;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsMessage = global::Xenko.Graphics.Tests.Resource.Id.ResultsMessage;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsPassed = global::Xenko.Graphics.Tests.Resource.Id.ResultsPassed;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsResult = global::Xenko.Graphics.Tests.Resource.Id.ResultsResult;
-			global::Xamarin.Android.NUnitLite.Resource.Id.RunTestsButton = global::Xenko.Graphics.Tests.Resource.Id.RunTestsButton;
-			global::Xamarin.Android.NUnitLite.Resource.Id.TestSuiteListView = global::Xenko.Graphics.Tests.Resource.Id.TestSuiteListView;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.options = global::Xenko.Graphics.Tests.Resource.Layout.options;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.results = global::Xenko.Graphics.Tests.Resource.Layout.results;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.test_result = global::Xenko.Graphics.Tests.Resource.Layout.test_result;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.test_suite = global::Xenko.Graphics.Tests.Resource.Layout.test_suite;
-		}
-		
-		public partial class Attribute
-		{
-			
-			static Attribute()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Attribute()
-			{
-			}
-		}
-		
-		public partial class Drawable
-		{
-			
-			// aapt resource value: 0x7f020000
-			public const int dialog_disclosure = 2130837504;
-			
-			// aapt resource value: 0x7f020001
-			public const int dialog_expander_ic_minimized = 2130837505;
-			
-			// aapt resource value: 0x7f020002
-			public const int Icon = 2130837506;
-			
-			static Drawable()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Drawable()
-			{
-			}
-		}
-		
-		public partial class Id
-		{
-			
-			// aapt resource value: 0x7f04000f
-			public const int EditTextLayout = 2130968591;
-			
-			// aapt resource value: 0x7f04000d
-			public const int GameMainLayout = 2130968589;
-			
-			// aapt resource value: 0x7f04000e
-			public const int GameViewLayout = 2130968590;
-			
-			// aapt resource value: 0x7f040011
-			public const int OptionHostName = 2130968593;
-			
-			// aapt resource value: 0x7f040012
-			public const int OptionPort = 2130968594;
-			
-			// aapt resource value: 0x7f040010
-			public const int OptionRemoteServer = 2130968592;
-			
-			// aapt resource value: 0x7f040020
-			public const int OptionsButton = 2130968608;
-			
-			// aapt resource value: 0x7f04001b
-			public const int ResultFullName = 2130968603;
-			
-			// aapt resource value: 0x7f04001d
-			public const int ResultMessage = 2130968605;
-			
-			// aapt resource value: 0x7f04001c
-			public const int ResultResultState = 2130968604;
-			
-			// aapt resource value: 0x7f04001a
-			public const int ResultRunSingleMethodTest = 2130968602;
-			
-			// aapt resource value: 0x7f04001e
-			public const int ResultStackTrace = 2130968606;
-			
-			// aapt resource value: 0x7f040016
-			public const int ResultsFailed = 2130968598;
-			
-			// aapt resource value: 0x7f040013
-			public const int ResultsId = 2130968595;
-			
-			// aapt resource value: 0x7f040017
-			public const int ResultsIgnored = 2130968599;
-			
-			// aapt resource value: 0x7f040018
-			public const int ResultsInconclusive = 2130968600;
-			
-			// aapt resource value: 0x7f040019
-			public const int ResultsMessage = 2130968601;
-			
-			// aapt resource value: 0x7f040015
-			public const int ResultsPassed = 2130968597;
-			
-			// aapt resource value: 0x7f040014
-			public const int ResultsResult = 2130968596;
-			
-			// aapt resource value: 0x7f04001f
-			public const int RunTestsButton = 2130968607;
-			
-			// aapt resource value: 0x7f040021
-			public const int TestSuiteListView = 2130968609;
-			
-			// aapt resource value: 0x7f040002
-			public const int dialog_BoolField = 2130968578;
-			
-			// aapt resource value: 0x7f040003
-			public const int dialog_Button = 2130968579;
-			
-			// aapt resource value: 0x7f040009
-			public const int dialog_DisclosureField = 2130968585;
-			
-			// aapt resource value: 0x7f040005
-			public const int dialog_ImageLeft = 2130968581;
-			
-			// aapt resource value: 0x7f040007
-			public const int dialog_ImageRight = 2130968583;
-			
-			// aapt resource value: 0x7f040000
-			public const int dialog_LabelField = 2130968576;
-			
-			// aapt resource value: 0x7f040001
-			public const int dialog_LabelSubtextField = 2130968577;
-			
-			// aapt resource value: 0x7f040008
-			public const int dialog_Panel = 2130968584;
-			
-			// aapt resource value: 0x7f04000a
-			public const int dialog_RadioButtonList = 2130968586;
-			
-			// aapt resource value: 0x7f040006
-			public const int dialog_SliderField = 2130968582;
-			
-			// aapt resource value: 0x7f04000b
-			public const int dialog_Spinner = 2130968587;
-			
-			// aapt resource value: 0x7f040004
-			public const int dialog_ValueField = 2130968580;
-			
-			// aapt resource value: 0x7f04000c
-			public const int iFormFieldValue = 2130968588;
-			
-			static Id()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Id()
-			{
-			}
-		}
-		
-		public partial class Layout
-		{
-			
-			// aapt resource value: 0x7f030000
-			public const int dialog_achievements = 2130903040;
-			
-			// aapt resource value: 0x7f030001
-			public const int dialog_boolfieldleft = 2130903041;
-			
-			// aapt resource value: 0x7f030002
-			public const int dialog_boolfieldright = 2130903042;
-			
-			// aapt resource value: 0x7f030003
-			public const int dialog_boolfieldsubleft = 2130903043;
-			
-			// aapt resource value: 0x7f030004
-			public const int dialog_boolfieldsubright = 2130903044;
-			
-			// aapt resource value: 0x7f030005
-			public const int dialog_button = 2130903045;
-			
-			// aapt resource value: 0x7f030006
-			public const int dialog_datefield = 2130903046;
-			
-			// aapt resource value: 0x7f030007
-			public const int dialog_fieldsetlabel = 2130903047;
-			
-			// aapt resource value: 0x7f030008
-			public const int dialog_floatimage = 2130903048;
-			
-			// aapt resource value: 0x7f030009
-			public const int dialog_labelfieldbelow = 2130903049;
-			
-			// aapt resource value: 0x7f03000a
-			public const int dialog_labelfieldright = 2130903050;
-			
-			// aapt resource value: 0x7f03000b
-			public const int dialog_onofffieldright = 2130903051;
-			
-			// aapt resource value: 0x7f03000c
-			public const int dialog_panel = 2130903052;
-			
-			// aapt resource value: 0x7f03000d
-			public const int dialog_root = 2130903053;
-			
-			// aapt resource value: 0x7f03000e
-			public const int dialog_selectlist = 2130903054;
-			
-			// aapt resource value: 0x7f03000f
-			public const int dialog_selectlistfield = 2130903055;
-			
-			// aapt resource value: 0x7f030010
-			public const int dialog_textarea = 2130903056;
-			
-			// aapt resource value: 0x7f030011
-			public const int dialog_textfieldbelow = 2130903057;
-			
-			// aapt resource value: 0x7f030012
-			public const int dialog_textfieldright = 2130903058;
-			
-			// aapt resource value: 0x7f030013
-			public const int Game = 2130903059;
-			
-			// aapt resource value: 0x7f030014
-			public const int options = 2130903060;
-			
-			// aapt resource value: 0x7f030015
-			public const int results = 2130903061;
-			
-			// aapt resource value: 0x7f030016
-			public const int test_result = 2130903062;
-			
-			// aapt resource value: 0x7f030017
-			public const int test_suite = 2130903063;
-			
-			static Layout()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Layout()
-			{
-			}
-		}
-	}
-}
-#pragma warning restore 1591
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Android.csproj b/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Android.csproj
deleted file mode 100644
index a496b5f3b1..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Android.csproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
-    <AssemblyName>Xenko.Graphics.Tests.11_0</AssemblyName>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AndroidApplication>true</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
-    <AndroidUseLatestPlatformSdk></AndroidUseLatestPlatformSdk>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
-    <AndroidStoreUncompressedFileExtensions />
-    <MandroidI18n />
-    <JavaMaximumHeapSize />
-    <JavaOptions />
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <XenkoPlatform>Android</XenkoPlatform>
-    <XenkoBuildProfile>Android</XenkoBuildProfile>
-    <XenkoPackageGuid>{04ed1618-1a06-4a69-ac34-1006a978af11}</XenkoPackageGuid>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''">OpenGLES</XenkoGraphicsApi>
-    <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
-    <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Graphics.Tests.11_0.xkpkg</XenkoCurrentPackagePath>
-    <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Android' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID;XENKO_GRAPHICS_API_OPENGL;XENKO_GRAPHICS_API_OPENGLES</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Android' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID;XENKO_GRAPHICS_API_OPENGL;XENKO_GRAPHICS_API_OPENGLES</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Mono.Android" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Label="Xenko.DoNotSync" Include="Properties\AssemblyInfo.cs" />
-    <Content Label="Xenko.DoNotSync" Include="Properties\AndroidManifest.xml" />
-    <AndroidResource Label="Xenko.DoNotSync" Include="Resources\Drawable\Icon.png" />
-    <Compile Label="Xenko.DoNotSync" Include="Resources\Resource.Designer.cs" />
-    <Compile Label="Xenko.DoNotSync" Include="..\..\..\sources\shared\tests\nunitlite\NUnitLiteLauncher.Android.cs">
-      <Link>NUnitLiteLauncher.Android.cs</Link>
-    </Compile>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Assets\ComputeShaderTestEffect.cs">
-      <DependentUpon>ComputeShaderTestEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Assets\HammersleyTest.cs">
-      <DependentUpon>HammersleyTest.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Assets\ComputeShaderTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeShaderTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="Assets\CubemapSprite.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CubemapSprite.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="TestHammersley.cs" />
-    <Compile Include="TestLambertPrefilteringSHPass2.cs" />
-    <Compile Include="TestLambertPrefilteringSH.cs" />
-    <Compile Include="TestComputeShader.cs" />
-    <Compile Include="TestRadiancePrefilteringGgx.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <None Include="Assets\ComputeShaderTestEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderTestEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\HammersleyTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>HammersleyTest.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\ComputeShaderTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderTest.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\CubemapSprite.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CubemapSprite.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.11_0.xkpkg" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="$(XenkoPackageProps)" Condition="Exists('$(XenkoPackageProps)')" />
-  <Import Project="..\..\targets\Xenko.UnitTests.targets" Condition="Exists('..\..\targets\Xenko.UnitTests.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-    Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Windows.csproj b/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Windows.csproj
index 1e63f1c113..d06f4e8d95 100644
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Windows.csproj
+++ b/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.Windows.csproj
@@ -1,13 +1,12 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
     <AssemblyName>Xenko.Graphics.Tests.11_0</AssemblyName>
     <TargetFramework>net461</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <EnableDefaultItems>false</EnableDefaultItems>
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoPlatform>Windows</XenkoPlatform>
     <XenkoBuildProfile>Windows</XenkoBuildProfile>
@@ -28,66 +27,20 @@
     <StartupObject>Xenko.Graphics.Tests.TestRadiancePrefilteringGgx</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
+    <Compile Remove="TestCubemapDeferred.cs" />
+    <Compile Remove="TestCubemapDisplay.cs" />
+    <Compile Remove="TestCubemapRendering.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
+    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
+    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Assets\ComputeShaderTestEffect.cs">
-      <DependentUpon>ComputeShaderTestEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Assets\HammersleyTest.cs">
-      <DependentUpon>HammersleyTest.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Assets\ComputeShaderTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeShaderTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="Assets\CubemapSprite.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CubemapSprite.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="TestHammersley.cs" />
-    <Compile Include="TestLambertPrefilteringSHPass2.cs" />
-    <Compile Include="TestLambertPrefilteringSH.cs" />
-    <Compile Include="TestComputeShader.cs" />
-    <Compile Include="TestRadiancePrefilteringGgx.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <None Include="Assets\ComputeShaderTestEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderTestEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\HammersleyTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>HammersleyTest.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\ComputeShaderTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderTest.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\CubemapSprite.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CubemapSprite.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.11_0.xkpkg" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.iOS.csproj b/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.iOS.csproj
deleted file mode 100644
index 178a7c9672..0000000000
--- a/sources/engine/Xenko.Graphics.Tests.11_0/Xenko.Graphics.Tests.11_0.iOS.csproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7CA99C7B-E3A2-4DE6-9D6C-314AE39BBBB7}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
-    <AssemblyName>XenkoGraphicsTests110</AssemblyName>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <XenkoPlatform>iOS</XenkoPlatform>
-    <XenkoBuildProfile>iOS</XenkoBuildProfile>
-    <XenkoPackageGuid>{04ed1618-1a06-4a69-ac34-1006a978af11}</XenkoPackageGuid>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''">OpenGLES</XenkoGraphicsApi>
-    <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
-    <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Graphics.Tests.11_0.xkpkg</XenkoCurrentPackagePath>
-    <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>True</MtouchUseSGen>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <CodesignKey>iPhone Developer</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Testing|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <BuildIpa>True</BuildIpa>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <XenkoGraphicsApi>OpenGLES</XenkoGraphicsApi>
-    <OutputPath>..\..\..\Bin\iOS-OpenGLES\</OutputPath>
-    <IntermediateOutputPath>obj\iOS\Debug\</IntermediateOutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Xenko.Core.Tests.Application</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Xamarin.iOS" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Label="Xenko.DoNotSync" Include="Info.plist" />
-    <Compile Label="Xenko.DoNotSync" Include="Properties\AssemblyInfo.cs" />
-    <Compile Label="Xenko.DoNotSync" Include="..\..\..\sources\shared\tests\nunitlite\NUnitLiteLauncher.iPhone.cs">
-      <Link>NUnitLiteLauncher.iPhone.cs</Link>
-    </Compile>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Assets\ComputeShaderTestEffect.cs">
-      <DependentUpon>ComputeShaderTestEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Assets\HammersleyTest.cs">
-      <DependentUpon>HammersleyTest.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Assets\ComputeShaderTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeShaderTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="Assets\CubemapSprite.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CubemapSprite.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="TestHammersley.cs" />
-    <Compile Include="TestLambertPrefilteringSHPass2.cs" />
-    <Compile Include="TestLambertPrefilteringSH.cs" />
-    <Compile Include="TestComputeShader.cs" />
-    <Compile Include="TestRadiancePrefilteringGgx.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <None Include="Assets\ComputeShaderTestEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderTestEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\HammersleyTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>HammersleyTest.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\ComputeShaderTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderTest.cs</LastGenOutput>
-    </None>
-    <None Include="Assets\CubemapSprite.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CubemapSprite.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.11_0.xkpkg" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Icon.png" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Icon%402x.png" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <ItemGroup>
-    <BundleResource Include="Resources\Icon-60%402x.png" Label="Xenko.DoNotSync" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="$(XenkoPackageProps)" Condition="Exists('$(XenkoPackageProps)')" />
-  <Import Project="..\..\targets\Xenko.UnitTests.targets" Condition="Exists('..\..\targets\Xenko.UnitTests.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-    Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests/ActivityAndroid.cs b/sources/engine/Xenko.Graphics.Tests/ActivityAndroid.cs
deleted file mode 100644
index 68a44e1917..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/ActivityAndroid.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Runtime.CompilerServices;
-using Android.App;
-using Android.OS;
-using Xenko.Effects;
-using Xenko.Starter;
-
-namespace Xenko.Graphics.Tests
-{
-    [Activity(Label = "Xenko Graphics", MainLauncher = true, Icon = "@drawable/icon")]
-    public class ActivityAndroid : AndroidXenkoActivity
-    {
-        protected override void OnCreate(Bundle bundle)
-        {
-            RuntimeHelpers.RunModuleConstructor(typeof(MaterialKeys).Module.ModuleHandle);
-
-            base.OnCreate(bundle);
-            
-            //Game = new TestDrawQuad();
-            //Game = new TestGeometricPrimitives();
-            //Game = new TestRenderToTexture();
-            //Game = new TestSpriteBatch();
-            //Game = new TestImageLoad();
-            //Game = new TestStaticSpriteFont();
-            //Game = new TestDynamicSpriteFont();
-            //Game = new TestDynamicSpriteFontJapanese();
-            Game = new TestDynamicSpriteFontVarious();
-
-            Game.Run(GameContext);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests/Application.iOS.cs b/sources/engine/Xenko.Graphics.Tests/Application.iOS.cs
deleted file mode 100644
index 4e86a91fad..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Application.iOS.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using MonoTouch.Foundation;
-using MonoTouch.UIKit;
-using Xenko.Starter;
-
-namespace Xenko.Graphics.Tests
-{
-    public class ManualApplication
-    {
-        static void Main(string[] args)
-        {
-            UIApplication.Main(args, null, "ManualAppDelegate");
-        }
-    }
-
-    [Register("ManualAppDelegate")]
-    public class ManualAppDelegate : XenkoApplicationDelegate
-    {
-        public override bool FinishedLaunching(UIApplication app, NSDictionary options)
-        {
-            //Game = new TestImageLoad();
-            //Game = new TestStaticSpriteFont();
-            //Game = new TestDynamicSpriteFont();
-            //Game = new TestDynamicSpriteFontJapanese();
-            Game = new TestDynamicSpriteFontVarious();
-
-            return base.FinishedLaunching(app, options);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx b/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx
index 39fb03c53a..14c756fc80 100644
--- a/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx
+++ b/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx
@@ -1,8 +1,5 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Effects.Data;
-using Xenko.Effects;
-
 namespace Test
 {
     effect CubemapDisplayEffect
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx.cs
similarity index 99%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx.cs
index 68fb6224ae..c9a89f0fdb 100644
--- a/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.cs
+++ b/sources/engine/Xenko.Graphics.Tests/Compiler/CubemapEffect.xkfx.cs
@@ -14,8 +14,6 @@
 using Xenko.Core.Mathematics;
 using Buffer = Xenko.Graphics.Buffer;
 
-using Xenko.Effects.Data;
-using Xenko.Effects;
 namespace Test
 {
     internal static partial class ShaderMixins
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/CustomEffect.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/CustomEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/CustomEffect.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/CustomEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/CustomShader.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/CustomShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/CustomShader.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/CustomShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteEffect.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteEffect.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteShader.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteShader.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/MultiTexturesSpriteShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/SimpleEffect.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/SimpleEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/SimpleEffect.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/SimpleEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/SimpleShader.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/SimpleShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/SimpleShader.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/SimpleShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslEffect.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslEffect.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslShader.cs b/sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslShader.cs
rename to sources/engine/Xenko.Graphics.Tests/Compiler/ToGlslShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Graphics.Tests/Properties/AndroidManifest.xml
deleted file mode 100644
index 4f2aef41f9..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Properties/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Graphics.Tests" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
-  <application android:icon="@drawable/icon" android:label="Xenko.Graphics.Tests" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
-  <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-  <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
-  <uses-permission android:name="android.permission.INTERNET" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-</manifest>
diff --git a/sources/engine/Xenko.Graphics.Tests/Properties/AssemblyInfo.Android.cs b/sources/engine/Xenko.Graphics.Tests/Properties/AssemblyInfo.Android.cs
deleted file mode 100644
index 27a54ef326..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Properties/AssemblyInfo.Android.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using Android.App;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Graphics")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Xenko.Graphics")]
-[assembly: AssemblyCopyright("Copyright ©  2012")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("1ebcac74-0858-4b96-8979-f0ac6db3c2e7")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-
-// Add some common permissions, these can be removed if not needed
-[assembly: UsesPermission(Android.Manifest.Permission.Internet)]
-[assembly: UsesPermission(Android.Manifest.Permission.WriteExternalStorage)]
diff --git a/sources/engine/Xenko.Graphics.Tests/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Graphics.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8094c50b3e..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Resources;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Graphics.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Xenko.Graphics.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/sources/engine/Xenko.Graphics.Tests/Resources/Drawable/icon.png b/sources/engine/Xenko.Graphics.Tests/Resources/Drawable/icon.png
deleted file mode 100644
index d68a524f7d..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Resources/Drawable/icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c51544282fca0d3f04dead09d63f6b383055c10b4bee2578f19253880aa47dd9
-size 15950
diff --git a/sources/engine/Xenko.Graphics.Tests/Resources/Icon-60@2x.png b/sources/engine/Xenko.Graphics.Tests/Resources/Icon-60@2x.png
deleted file mode 100644
index f8a4b181af..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Resources/Icon-60@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e0d5fcd3786c0ff6a274d767ed7d6a6281989d422ba9c2abc543f77b0d0605ac
-size 14005
diff --git a/sources/engine/Xenko.Graphics.Tests/Resources/Icon.png b/sources/engine/Xenko.Graphics.Tests/Resources/Icon.png
deleted file mode 100644
index 7a12e35579..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Resources/Icon.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c669dbc80ab0f766aa49dd3f4cd5fa2d59f3c90de728630e7052013b20442cd2
-size 5451
diff --git a/sources/engine/Xenko.Graphics.Tests/Resources/Icon@2x.png b/sources/engine/Xenko.Graphics.Tests/Resources/Icon@2x.png
deleted file mode 100644
index 828dd63a8f..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Resources/Icon@2x.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:81c3034b0ecc3c5baa665b20f36bbd016f1b6c20135be38a5f16bc0688b9fde4
-size 13031
diff --git a/sources/engine/Xenko.Graphics.Tests/Resources/Resource.Designer.cs b/sources/engine/Xenko.Graphics.Tests/Resources/Resource.Designer.cs
deleted file mode 100644
index e0641c3dc5..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Resources/Resource.Designer.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-#pragma warning disable 1591
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: global::Android.Runtime.ResourceDesignerAttribute("Xenko.Graphics.Tests.Resource", IsApplication=true)]
-
-namespace Xenko.Graphics.Tests
-{
-	
-	
-	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
-	public partial class Resource
-	{
-		
-		static Resource()
-		{
-			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-		}
-		
-		public static void UpdateIdValues()
-		{
-			global::Xenko.Resource.Id.EditTextLayout = global::Xenko.Graphics.Tests.Resource.Id.EditTextLayout;
-			global::Xenko.Resource.Id.GameMainLayout = global::Xenko.Graphics.Tests.Resource.Id.GameMainLayout;
-			global::Xenko.Resource.Id.GameViewLayout = global::Xenko.Graphics.Tests.Resource.Id.GameViewLayout;
-			global::Xenko.Resource.Layout.Game = global::Xenko.Graphics.Tests.Resource.Layout.Game;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionHostName = global::Xenko.Graphics.Tests.Resource.Id.OptionHostName;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionPort = global::Xenko.Graphics.Tests.Resource.Id.OptionPort;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionRemoteServer = global::Xenko.Graphics.Tests.Resource.Id.OptionRemoteServer;
-			global::Xamarin.Android.NUnitLite.Resource.Id.OptionsButton = global::Xenko.Graphics.Tests.Resource.Id.OptionsButton;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::Xenko.Graphics.Tests.Resource.Id.ResultFullName;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::Xenko.Graphics.Tests.Resource.Id.ResultMessage;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::Xenko.Graphics.Tests.Resource.Id.ResultResultState;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultRunSingleMethodTest = global::Xenko.Graphics.Tests.Resource.Id.ResultRunSingleMethodTest;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::Xenko.Graphics.Tests.Resource.Id.ResultStackTrace;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::Xenko.Graphics.Tests.Resource.Id.ResultsFailed;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::Xenko.Graphics.Tests.Resource.Id.ResultsId;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsIgnored = global::Xenko.Graphics.Tests.Resource.Id.ResultsIgnored;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsInconclusive = global::Xenko.Graphics.Tests.Resource.Id.ResultsInconclusive;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsMessage = global::Xenko.Graphics.Tests.Resource.Id.ResultsMessage;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsPassed = global::Xenko.Graphics.Tests.Resource.Id.ResultsPassed;
-			global::Xamarin.Android.NUnitLite.Resource.Id.ResultsResult = global::Xenko.Graphics.Tests.Resource.Id.ResultsResult;
-			global::Xamarin.Android.NUnitLite.Resource.Id.RunTestsButton = global::Xenko.Graphics.Tests.Resource.Id.RunTestsButton;
-			global::Xamarin.Android.NUnitLite.Resource.Id.TestSuiteListView = global::Xenko.Graphics.Tests.Resource.Id.TestSuiteListView;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.options = global::Xenko.Graphics.Tests.Resource.Layout.options;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.results = global::Xenko.Graphics.Tests.Resource.Layout.results;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.test_result = global::Xenko.Graphics.Tests.Resource.Layout.test_result;
-			global::Xamarin.Android.NUnitLite.Resource.Layout.test_suite = global::Xenko.Graphics.Tests.Resource.Layout.test_suite;
-		}
-		
-		public partial class Attribute
-		{
-			
-			static Attribute()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Attribute()
-			{
-			}
-		}
-		
-		public partial class Drawable
-		{
-			
-			// aapt resource value: 0x7f020000
-			public const int dialog_disclosure = 2130837504;
-			
-			// aapt resource value: 0x7f020001
-			public const int dialog_expander_ic_minimized = 2130837505;
-			
-			// aapt resource value: 0x7f020002
-			public const int Icon = 2130837506;
-			
-			static Drawable()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Drawable()
-			{
-			}
-		}
-		
-		public partial class Id
-		{
-			
-			// aapt resource value: 0x7f04000f
-			public const int EditTextLayout = 2130968591;
-			
-			// aapt resource value: 0x7f04000d
-			public const int GameMainLayout = 2130968589;
-			
-			// aapt resource value: 0x7f04000e
-			public const int GameViewLayout = 2130968590;
-			
-			// aapt resource value: 0x7f040011
-			public const int OptionHostName = 2130968593;
-			
-			// aapt resource value: 0x7f040012
-			public const int OptionPort = 2130968594;
-			
-			// aapt resource value: 0x7f040010
-			public const int OptionRemoteServer = 2130968592;
-			
-			// aapt resource value: 0x7f040020
-			public const int OptionsButton = 2130968608;
-			
-			// aapt resource value: 0x7f04001b
-			public const int ResultFullName = 2130968603;
-			
-			// aapt resource value: 0x7f04001d
-			public const int ResultMessage = 2130968605;
-			
-			// aapt resource value: 0x7f04001c
-			public const int ResultResultState = 2130968604;
-			
-			// aapt resource value: 0x7f04001a
-			public const int ResultRunSingleMethodTest = 2130968602;
-			
-			// aapt resource value: 0x7f04001e
-			public const int ResultStackTrace = 2130968606;
-			
-			// aapt resource value: 0x7f040016
-			public const int ResultsFailed = 2130968598;
-			
-			// aapt resource value: 0x7f040013
-			public const int ResultsId = 2130968595;
-			
-			// aapt resource value: 0x7f040017
-			public const int ResultsIgnored = 2130968599;
-			
-			// aapt resource value: 0x7f040018
-			public const int ResultsInconclusive = 2130968600;
-			
-			// aapt resource value: 0x7f040019
-			public const int ResultsMessage = 2130968601;
-			
-			// aapt resource value: 0x7f040015
-			public const int ResultsPassed = 2130968597;
-			
-			// aapt resource value: 0x7f040014
-			public const int ResultsResult = 2130968596;
-			
-			// aapt resource value: 0x7f04001f
-			public const int RunTestsButton = 2130968607;
-			
-			// aapt resource value: 0x7f040021
-			public const int TestSuiteListView = 2130968609;
-			
-			// aapt resource value: 0x7f040002
-			public const int dialog_BoolField = 2130968578;
-			
-			// aapt resource value: 0x7f040003
-			public const int dialog_Button = 2130968579;
-			
-			// aapt resource value: 0x7f040009
-			public const int dialog_DisclosureField = 2130968585;
-			
-			// aapt resource value: 0x7f040005
-			public const int dialog_ImageLeft = 2130968581;
-			
-			// aapt resource value: 0x7f040007
-			public const int dialog_ImageRight = 2130968583;
-			
-			// aapt resource value: 0x7f040000
-			public const int dialog_LabelField = 2130968576;
-			
-			// aapt resource value: 0x7f040001
-			public const int dialog_LabelSubtextField = 2130968577;
-			
-			// aapt resource value: 0x7f040008
-			public const int dialog_Panel = 2130968584;
-			
-			// aapt resource value: 0x7f04000a
-			public const int dialog_RadioButtonList = 2130968586;
-			
-			// aapt resource value: 0x7f040006
-			public const int dialog_SliderField = 2130968582;
-			
-			// aapt resource value: 0x7f04000b
-			public const int dialog_Spinner = 2130968587;
-			
-			// aapt resource value: 0x7f040004
-			public const int dialog_ValueField = 2130968580;
-			
-			// aapt resource value: 0x7f04000c
-			public const int iFormFieldValue = 2130968588;
-			
-			static Id()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Id()
-			{
-			}
-		}
-		
-		public partial class Layout
-		{
-			
-			// aapt resource value: 0x7f030000
-			public const int dialog_achievements = 2130903040;
-			
-			// aapt resource value: 0x7f030001
-			public const int dialog_boolfieldleft = 2130903041;
-			
-			// aapt resource value: 0x7f030002
-			public const int dialog_boolfieldright = 2130903042;
-			
-			// aapt resource value: 0x7f030003
-			public const int dialog_boolfieldsubleft = 2130903043;
-			
-			// aapt resource value: 0x7f030004
-			public const int dialog_boolfieldsubright = 2130903044;
-			
-			// aapt resource value: 0x7f030005
-			public const int dialog_button = 2130903045;
-			
-			// aapt resource value: 0x7f030006
-			public const int dialog_datefield = 2130903046;
-			
-			// aapt resource value: 0x7f030007
-			public const int dialog_fieldsetlabel = 2130903047;
-			
-			// aapt resource value: 0x7f030008
-			public const int dialog_floatimage = 2130903048;
-			
-			// aapt resource value: 0x7f030009
-			public const int dialog_labelfieldbelow = 2130903049;
-			
-			// aapt resource value: 0x7f03000a
-			public const int dialog_labelfieldright = 2130903050;
-			
-			// aapt resource value: 0x7f03000b
-			public const int dialog_onofffieldright = 2130903051;
-			
-			// aapt resource value: 0x7f03000c
-			public const int dialog_panel = 2130903052;
-			
-			// aapt resource value: 0x7f03000d
-			public const int dialog_root = 2130903053;
-			
-			// aapt resource value: 0x7f03000e
-			public const int dialog_selectlist = 2130903054;
-			
-			// aapt resource value: 0x7f03000f
-			public const int dialog_selectlistfield = 2130903055;
-			
-			// aapt resource value: 0x7f030010
-			public const int dialog_textarea = 2130903056;
-			
-			// aapt resource value: 0x7f030011
-			public const int dialog_textfieldbelow = 2130903057;
-			
-			// aapt resource value: 0x7f030012
-			public const int dialog_textfieldright = 2130903058;
-			
-			// aapt resource value: 0x7f030013
-			public const int Game = 2130903059;
-			
-			// aapt resource value: 0x7f030014
-			public const int options = 2130903060;
-			
-			// aapt resource value: 0x7f030015
-			public const int results = 2130903061;
-			
-			// aapt resource value: 0x7f030016
-			public const int test_result = 2130903062;
-			
-			// aapt resource value: 0x7f030017
-			public const int test_suite = 2130903063;
-			
-			static Layout()
-			{
-				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
-			}
-			
-			private Layout()
-			{
-			}
-		}
-	}
-}
-#pragma warning restore 1591
diff --git a/sources/engine/Xenko.Graphics.Tests/TestCubemapDeferred.cs b/sources/engine/Xenko.Graphics.Tests/TestCubemapDeferred.cs
deleted file mode 100644
index 82a703ca18..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/TestCubemapDeferred.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-
-using Xunit;
-
-using Xenko.Core.Mathematics;
-using Xenko.Effects;
-using Xenko.Effects.Cubemap;
-using Xenko.Effects.Renderers;
-using Xenko.Engine;
-using Xenko.EntityModel;
-using Xenko.Extensions;
-
-namespace Xenko.Graphics.Tests
-{
-    public class TestCubemapDeferred : TestGameBase
-    {
-        private LightingIBLRenderer IBLRenderer;
-
-        private Entity teapotEntity;
-
-        private Entity dynamicCubemapEntity;
-
-        public TestCubemapDeferred()
-        {
-            GraphicsDeviceManager.PreferredGraphicsProfile = new[] { GraphicsProfile.Level_11_0 };
-        }
-
-        protected override async Task LoadContent()
-        {
-            await base.LoadContent();
-
-            // create pipeline
-            CreatePipeline();
-
-            // setup the scene
-            var material = Asset.Load<Material>("BasicMaterial");
-            teapotEntity = new Entity()
-            {
-                new ModelComponent()
-                {
-                    Model = new Model()
-                    {
-                        material,
-                        new Mesh()
-                        {
-                            Draw = GeometricPrimitive.Teapot.New(GraphicsDevice).ToMeshDraw(),
-                            MaterialIndex = 0,
-                        }
-                    }
-                }
-            };
-            Entities.Add(teapotEntity);
-
-            var textureCube = Asset.Load<Texture>("uv_cube");
-            var staticCubemapEntity = new Entity()
-            {
-                new CubemapSourceComponent(textureCube) { InfluenceRadius = 2f, IsDynamic = false },
-                new TransformationComponent() { Translation = Vector3.UnitZ }
-            };
-            Entities.Add(staticCubemapEntity);
-
-            dynamicCubemapEntity = new Entity()
-            {
-                new CubemapSourceComponent(textureCube) { InfluenceRadius = 0.5f, IsDynamic = false },
-                new TransformationComponent() { Translation = Vector3.Zero }
-            };
-            Entities.Add(dynamicCubemapEntity);
-
-            var mainCamera = new Entity()
-            {
-                new CameraComponent
-                {
-                    AspectRatio = 8/4.8f,
-                    FarPlane = 20,
-                    NearPlane = 1,
-                    VerticalFieldOfView = 0.6f,
-                    Target = teapotEntity,
-                    TargetUp = Vector3.UnitY,
-                },
-                new TransformationComponent
-                {
-                    Translation = new Vector3(4, 3, 0)
-                }
-            };
-            Entities.Add(mainCamera);
-
-            RenderSystem.Pipeline.SetCamera(mainCamera.Get<CameraComponent>());
-
-            Script.Add(GameScript1);
-        }
-
-        private void CreatePipeline()
-        {
-            // Processor
-            Entities.Processors.Add(new CubemapSourceProcessor(GraphicsDevice));
-
-            // Rendering pipeline
-            RenderSystem.Pipeline.Renderers.Add(new CameraSetter(Services));
-
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services)
-            {
-                ClearColor = Color.CornflowerBlue,
-                EnableClearDepth = true,
-                ClearDepth = 1f
-            });
-
-            // Create G-buffer pass
-            var gbufferPipeline = new RenderPipeline("GBuffer");
-            // Renders the G-buffer for opaque geometry.
-            gbufferPipeline.Renderers.Add(new ModelRenderer(Services, "CubemapIBLEffect.XenkoGBufferShaderPass"));
-            var gbufferProcessor = new GBufferRenderProcessor(Services, gbufferPipeline, GraphicsDevice.DepthStencilBuffer, false);
-
-            // Add sthe G-buffer pass to the pipeline.
-            RenderSystem.Pipeline.Renderers.Add(gbufferProcessor);
-
-            var readOnlyDepthBuffer = GraphicsDevice.DepthStencilBuffer; // TODO ToDepthStencilBuffer(true);
-            IBLRenderer = new LightingIBLRenderer(Services, "CubemapIBLSpecular", readOnlyDepthBuffer);
-            RenderSystem.Pipeline.Renderers.Add(IBLRenderer);
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services)
-            {
-                ClearColor = Color.CornflowerBlue,
-                EnableClearDepth = false,
-            });
-            RenderSystem.Pipeline.Renderers.Add(new DelegateRenderer(Services) { Render = ShowIBL });
-        }
-
-        private void ShowIBL(RenderContext context)
-        {
-            GraphicsDevice.DrawTexture(IBLRenderer.IBLTexture);
-        }
-
-        private async Task GameScript1()
-        {
-            while (IsRunning)
-            {
-                // Wait next rendering frame
-                await Script.NextFrame();
-
-                teapotEntity.Transform.Rotation = Quaternion.RotationY((float)(2 * Math.PI * UpdateTime.Total.TotalMilliseconds / 5000.0f));
-                dynamicCubemapEntity.Transform.Translation = new Vector3(2f * (float)Math.Sin(2 * Math.PI * UpdateTime.Total.TotalMilliseconds / 15000.0f), 0, 0);
-            }
-        }
-
-        public static void Main()
-        {
-            using (var game = new TestCubemapDeferred())
-                game.Run();
-        }
-
-        /// <summary>
-        /// Run the test
-        /// </summary>
-        [Fact]
-        public void RunCubemapRendering()
-        {
-            RunGameTest(new TestCubemapDeferred());
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests/TestCubemapDisplay.cs b/sources/engine/Xenko.Graphics.Tests/TestCubemapDisplay.cs
deleted file mode 100644
index 0f3b5934fd..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/TestCubemapDisplay.cs
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Threading.Tasks;
-
-using Xunit;
-
-using Xenko.Core.Mathematics;
-using Xenko.Effects;
-using Xenko.Engine;
-using Xenko.EntityModel;
-using Xenko.Extensions;
-
-namespace Xenko.Graphics.Tests
-{
-    public class TestCubemapDisplay : TestGameBase
-    {
-        private Entity mainCamera;
-        private float cameraDistance = 3;
-        private float cameraHeight = 3;
-        private Vector3 cameraUp = Vector3.UnitY;
-
-        public TestCubemapDisplay()
-        {
-            GraphicsDeviceManager.PreferredGraphicsProfile = new[] { GraphicsProfile.Level_9_1 };
-        }
-
-        protected override async Task LoadContent()
-        {
-            await base.LoadContent();
-
-            CreatePipeline();
-
-            var material = Asset.Load<Material>("BasicMaterial");
-            var textureCube = Asset.Load<Texture>("uv_cube");
-            material.Parameters.Set(TexturingKeys.TextureCube0, textureCube);
-            var mesh = new Mesh()
-            {
-                Draw = GeometricPrimitive.GeoSphere.New(GraphicsDevice).ToMeshDraw(),
-                Material = material
-            };
-            mesh.Parameters.Set(RenderingParameters.RenderGroup, RenderGroups.Group1);
-
-            var entity = new Entity()
-            {
-                new ModelComponent()
-                {
-                    Model = new Model() { mesh }
-                },
-                new TransformationComponent()
-            };
-            
-            Entities.Add(entity);
-
-            var mainCameraTargetEntity = new Entity(Vector3.Zero);
-            Entities.Add(mainCameraTargetEntity);
-            mainCamera = new Entity()
-            {
-                new CameraComponent
-                {
-                    AspectRatio = 8/4.8f,
-                    FarPlane = 1000,
-                    NearPlane = 1,
-                    VerticalFieldOfView = 0.6f,
-                    Target = mainCameraTargetEntity,
-                    TargetUp = cameraUp,
-                },
-                new TransformationComponent
-                {
-                    Translation = cameraDistance * Vector3.UnitX
-                }
-            };
-            Entities.Add(mainCamera);
-
-            RenderSystem.Pipeline.SetCamera(mainCamera.Get<CameraComponent>());
-
-            // Add a custom script
-            Script.Add(GameScript1);
-        }
-
-        private void CreatePipeline()
-        {
-            RenderSystem.Pipeline.Renderers.Add(new CameraSetter(Services));
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services) { ClearColor = Color.CornflowerBlue });
-            RenderSystem.Pipeline.Renderers.Add(new ModelRenderer(Services, "CubemapDisplayEffect"));
-        }
-
-        private async Task GameScript1()
-        {
-            while (IsRunning)
-            {
-                // Wait next rendering frame
-                await Script.NextFrame();
-
-                var angle = Math.PI * UpdateTime.Total.TotalMilliseconds / 5000;
-                mainCamera.Transform.Translation = new Vector3((float)(cameraDistance * Math.Cos(angle)), cameraHeight, (float)(cameraDistance * Math.Sin(angle)));
-            }
-        }
-
-        public static void Main()
-        {
-            using (var game = new TestCubemapDisplay())
-                game.Run();
-        }
-
-        /// <summary>
-        /// Run the test
-        /// </summary>
-        [Fact]
-        public void RunCubemapRendering()
-        {
-            RunGameTest(new TestCubemapDisplay());
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests/TestCubemapRendering.cs b/sources/engine/Xenko.Graphics.Tests/TestCubemapRendering.cs
deleted file mode 100644
index b10141aa81..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/TestCubemapRendering.cs
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-using Xenko.Core.Mathematics;
-using Xenko.Effects;
-using Xenko.Effects.Cubemap;
-using Xenko.Engine;
-using Xenko.EntityModel;
-using Xenko.Extensions;
-using Xenko.Input;
-
-namespace Xenko.Graphics.Tests
-{
-    public class TestCubemapRendering : TestGameBase
-    {
-        private Entity mainCamera;
-        private Vector3 cameraInitPos = new Vector3(10, 0, 0);
-        private Vector3 cameraUp = Vector3.UnitY;
-        private Entity[] primitiveEntities;
-        private Vector3[] rotationAxis;
-
-        public TestCubemapRendering()
-        {
-            // cannot render cubemap in level below 10.1
-            GraphicsDeviceManager.PreferredGraphicsProfile = new[] { GraphicsProfile.Level_11_0 };
-        }
-
-        protected override async Task LoadContent()
-        {
-            await base.LoadContent();
-
-            CreatePipeline(true);
-
-            IsMouseVisible = true;
-
-            //Input.ActivatedGestures.Add(new GestureConfigDrag());
-
-            // Creates all primitives
-            //                                     type           pos     axis
-            var primitives = new List<Tuple<GeometricPrimitive, Vector3, Vector3>>
-                             {
-                                 Tuple.Create(GeometricPrimitive.Cube.New(GraphicsDevice), 2 * Vector3.UnitX, new Vector3(1,1,1)),
-                                 Tuple.Create(GeometricPrimitive.Teapot.New(GraphicsDevice), -2 * Vector3.UnitX, new Vector3(-1,1,1)),
-                                 Tuple.Create(GeometricPrimitive.GeoSphere.New(GraphicsDevice), 2 * Vector3.UnitY, new Vector3(1,0,1)),
-                                 Tuple.Create(GeometricPrimitive.Cylinder.New(GraphicsDevice), -2 * Vector3.UnitY, new Vector3(-1,-1,1)),
-                                 Tuple.Create(GeometricPrimitive.Torus.New(GraphicsDevice), 2 * Vector3.UnitZ, new Vector3(1,-1,1)),
-                                 Tuple.Create(GeometricPrimitive.Sphere.New(GraphicsDevice), -2 * Vector3.UnitZ, new Vector3(0,1,1)),
-                             };
-
-            primitiveEntities = new Entity[primitives.Count];
-            rotationAxis = new Vector3[primitives.Count];
-            var material = Asset.Load<Material>("BasicMaterial");
-            for (var i =0; i < primitives.Count; ++i)
-            {
-                var mesh = new Mesh
-                {
-                    Draw = primitives[i].Item1.ToMeshDraw(),
-                    MaterialIndex = 0,
-                };
-                mesh.Parameters.Set(RenderingParameters.RenderGroup, RenderGroups.Group1);
-
-                var entity = new Entity
-                {
-                    new ModelComponent
-                    {
-                        Model = new Model { mesh, material }
-                    },
-                    new TransformationComponent { Translation = primitives[i].Item2 }
-                };
-                Entities.Add(entity);
-                primitiveEntities[i] = entity;
-                rotationAxis[i] = primitives[i].Item3;
-            }
-
-            var reflectivePrimitive = GeometricPrimitive.Sphere.New(GraphicsDevice);
-            var reflectiveMesh = new Mesh
-            {
-                Draw = reflectivePrimitive.ToMeshDraw(),
-            };
-            reflectiveMesh.Parameters.Set(RenderingParameters.RenderGroup, RenderGroups.Group2);
-
-            var reflectEntity = new Entity
-            {
-                new ModelComponent
-                {
-                    Model = new Model { reflectiveMesh }
-                },
-                new TransformationComponent(),
-                new CubemapSourceComponent { IsDynamic = true, Size = 128 }
-            };
-            Entities.Add(reflectEntity);
-            reflectEntity.Get<ModelComponent>().Parameters.Set(TexturingKeys.TextureCube0, reflectEntity.Get<CubemapSourceComponent>().Texture);
-
-            var mainCameraTargetEntity = new Entity(Vector3.Zero);
-            Entities.Add(mainCameraTargetEntity);
-            mainCamera = new Entity
-            {
-                new CameraComponent
-                {
-                    AspectRatio = 8/4.8f,
-                    FarPlane = 1000,
-                    NearPlane = 1,
-                    VerticalFieldOfView = 0.6f,
-                    Target = mainCameraTargetEntity,
-                    TargetUp = cameraUp,
-                },
-                new TransformationComponent
-                {
-                    Translation = cameraInitPos
-                }
-            };
-            Entities.Add(mainCamera);
-
-            RenderSystem.Pipeline.SetCamera(mainCamera.Get<CameraComponent>());
-
-            // Add a custom script
-            Script.Add(GameScript1);
-        }
-
-        private void CreatePipeline(bool renderInOnePass)
-        {
-            // Processor
-            Entities.Processors.Add(new CubemapSourceProcessor(GraphicsDevice));
-
-            // Rendering pipeline
-            var cubeMapPipeline = new RenderPipeline("CubeMap");
-            cubeMapPipeline.Renderers.Add(new ModelRenderer(Services, renderInOnePass ? "CubemapGeomEffect" : "CubemapEffect").AddLayerFilter(RenderGroups.Group1));
-            RenderSystem.Pipeline.Renderers.Add(new CubemapRenderer(Services, cubeMapPipeline, renderInOnePass));
-            RenderSystem.Pipeline.Renderers.Add(new CameraSetter(Services));
-            RenderSystem.Pipeline.Renderers.Add(new RenderTargetSetter(Services) { ClearColor = Color.CornflowerBlue });
-            RenderSystem.Pipeline.Renderers.Add(new ModelRenderer(Services, "CubemapEffect"));
-        }
-
-        private async Task GameScript1()
-        {
-            var dragValue = Vector2.Zero;
-            var rotationFactor = 0.125f;
-            var rotationUpFactor = 0.1f;
-            var rotate = true;
-            while (IsRunning)
-            {
-                // Wait next rendering frame
-                await Script.NextFrame();
-
-                if (Input.IsKeyPressed(Keys.Space))
-                    rotate = !rotate;
-
-                if (rotate)
-                {
-                    var rotationPrim = (float) (2*Math.PI*UpdateTime.Total.TotalMilliseconds/15000);
-                    for (var i = 0; i < primitiveEntities.Length; ++i)
-                    {
-                        primitiveEntities[i].Transform.Rotation = Quaternion.RotationAxis(rotationAxis[i], rotationPrim);
-                    }
-                }
-
-                // rotate camera
-                dragValue = 0.95f * dragValue;
-                if (Input.PointerEvents.Count > 0)
-                {
-                    dragValue = Input.PointerEvents.Aggregate(Vector2.Zero, (t, x) => x.DeltaPosition + t);
-                }
-                rotationFactor -= dragValue.X;
-                rotationUpFactor += dragValue.Y;
-                if (rotationUpFactor > 0.45f)
-                    rotationUpFactor = 0.45f;
-                else if (rotationUpFactor < -0.45f)
-                    rotationUpFactor = -0.45f;
-                mainCamera.Transform.Translation = Vector3.Transform(cameraInitPos, Quaternion.RotationZ((float)(Math.PI * rotationUpFactor)) * Quaternion.RotationY((float)(2 * Math.PI * rotationFactor)));
-            }
-        }
-
-        public static void Main()
-        {
-            using (var game = new TestCubemapRendering())
-                game.Run();
-        }
-
-        /// <summary>
-        /// Run the test
-        /// </summary>
-        [Fact]
-        public void RunCubemapRendering()
-        {
-            RunGameTest(new TestCubemapRendering());
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Android.csproj b/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Android.csproj
deleted file mode 100644
index a9485e8188..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Android.csproj
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}</ProjectGuid>
-    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AndroidApplication>true</AndroidApplication>
-    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
-    <AndroidUseLatestPlatformSdk></AndroidUseLatestPlatformSdk>
-    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
-    <AndroidSupportedAbis>armeabi,armeabi-v7a,x86</AndroidSupportedAbis>
-    <AndroidStoreUncompressedFileExtensions />
-    <MandroidI18n />
-    <JavaMaximumHeapSize />
-    <JavaOptions />
-    <AssemblyName>Xenko.Graphics.Tests</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <XenkoBuildProfile>$(XenkoPlatform)</XenkoBuildProfile>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''">OpenGLES</XenkoGraphicsApi>
-    <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
-    <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Graphics.Tests.xkpkg</XenkoCurrentPackagePath>
-    <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|Android' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|Android' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Testing|Android' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|Android' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Label="Xenko.DoNotSync" Include="Mono.Android" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Label="Xenko.DoNotSync" Include="Properties\AndroidManifest.xml" />
-    <AndroidResource Label="Xenko.DoNotSync" Include="Resources\Drawable\Icon.png" />
-    <Compile Label="Xenko.DoNotSync" Include="Resources\Resource.Designer.cs" />
-    <Compile Label="Xenko.DoNotSync" Include="..\..\..\sources\shared\tests\nunitlite\NUnitLiteLauncher.Android.cs">
-      <Link>NUnitLiteLauncher.Android.cs</Link>
-    </Compile>
-    <None Include="README.md" />
-    <Compile Include="Compiler\CustomEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CustomEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\CustomShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CustomShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="FixedAspectRatioTests.cs" />
-    <Compile Include="Compiler\MultiTexturesSpriteEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultiTexturesSpriteEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\MultiTexturesSpriteShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultiTexturesSpriteShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\SimpleEffect.cs">
-      <DependentUpon>SimpleEffect.xkfx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Compiler\SimpleShader.cs">
-      <DependentUpon>SimpleShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Compiler\ToGlslEffect.cs">
-      <DependentUpon>ToGlslEffect.xkfx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Compiler\ToGlslShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ToGlslShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Regression\TestMultipleTextures.cs" />
-    <Compile Include="Regression\TestSimpleTexture.cs" />
-    <Compile Include="TestBitmapSpriteFont.cs" />
-    <Compile Include="TestDynamicSpriteFont.cs" />
-    <Compile Include="TestDynamicSpriteFontJapanese.cs" />
-    <Compile Include="TestDynamicSpriteFontVarious.cs" />
-    <Compile Include="TestExternSpriteFont.cs" />
-    <Compile Include="TestFixedSizeUI.cs" />
-    <Compile Include="TestFontManager.cs" />
-    <Compile Include="TestImageLoad.cs" />
-    <Compile Include="TestPrecompiledSpriteFont.cs" />
-    <Compile Include="TestScene.cs" />
-    <Compile Include="TestSprite.cs" />
-    <Compile Include="TestSpriteBatch3D.cs" />
-    <Compile Include="TestSpriteBatchResolution.cs" />
-    <Compile Include="TestSpriteBatchToTexture.cs" />
-    <Compile Include="TestSpriteFont.cs" />
-    <Compile Include="TestSpriteFontAlignment.cs" />
-    <Compile Include="TestStaticSpriteFont.cs" />
-    <Compile Include="TestCustomEffect.cs" />
-    <Compile Include="TestDrawQuad.cs" />
-    <Compile Include="TestGeometricPrimitives.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <Compile Include="TestMultiTextures.cs" />
-    <Compile Include="TestSpriteBatch.cs" />
-    <Compile Include="TestEffect.cs" />
-    <Compile Include="TestImage.cs" />
-    <Compile Include="TestRenderToTexture.cs" />
-    <Compile Include="TestTexture.cs" />
-    <Compile Include="TestGraphicsApiCheck.cs" />
-    <Compile Include="TestTextureSampling.cs" />
-    <None Include="Compiler\CustomEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CustomEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\CustomShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CustomShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\MultiTexturesSpriteEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultiTexturesSpriteEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\MultiTexturesSpriteShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultiTexturesSpriteShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\SimpleEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\SimpleShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\ToGlslEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\ToGlslShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslShader.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.xkpkg" />
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
-    <ProjectReference Include="..\Xenko.UI\Xenko.UI.csproj" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
-  <Import Project="Xenko.Graphics.Tests.Shared.targets" />
-  <Import Project="$(XenkoPackageProps)" Condition="Exists('$(XenkoPackageProps)')" />
-  <Import Project="..\..\targets\Xenko.UnitTests.targets" Condition="Exists('..\..\targets\Xenko.UnitTests.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-    Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Shared.targets b/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Shared.targets
deleted file mode 100644
index 4e8aeccf5e..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Shared.targets
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\sources\core\Xenko.Core\Xenko.Core.csproj">
-      <Project>{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}</Project>
-      <Name>Xenko.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\core\Xenko.Core.IO\Xenko.Core.IO.csproj">
-      <Project>{1DE01410-22C9-489B-9796-1ADDAB1F64E5}</Project>
-      <Name>Xenko.Core.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\core\Xenko.Core.MicroThreading\Xenko.Core.MicroThreading.csproj">
-      <Project>{1320F627-EE43-4115-8E89-19D1753E51F2}</Project>
-      <Name>Xenko.Core.MicroThreading</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\core\Xenko.Core\Xenko.Core.csproj">
-      <Project>{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}</Project>
-      <Name>Xenko.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj">
-      <Project>{5210FB81-B807-49BB-AF0D-31FB6A83A572}</Project>
-      <Name>Xenko.Core.Serialization</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj">
-      <Project>{1677B922-CCF0-44DE-B57E-1CDD3D2B8E8A}</Project>
-      <Name>Xenko.Core.Mathematics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Input\Xenko.Input.csproj">
-      <Project>{84DEB606-77ED-49CD-9AED-D2B13C1F5A1E}</Project>
-      <Name>Xenko.Input</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Shaders\Xenko.Shaders.csproj">
-      <Project>{273BDD15-7392-4078-91F0-AF23594A3D7B}</Project>
-      <Name>Xenko.Shaders</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko\Xenko.csproj">
-      <Project>{72390339-b2a1-4f61-a800-31ed0975b515}</Project>
-      <Name>Xenko</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Engine\Xenko.Engine.csproj">
-      <Project>{C121A566-555E-42B9-9B0A-1696529A9088}</Project>
-      <Name>Xenko.Engine</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Graphics\Xenko.Graphics.csproj">
-      <Project>{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}</Project>
-      <Name>Xenko.Graphics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Games\Xenko.Games.csproj">
-      <Project>{42780CBD-3FE7-48E3-BD5B-59945EA20137}</Project>
-      <Name>Xenko.Games</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj">
-      <Project>{D002FEB1-00A6-4AB1-A83F-1F253465E64D}</Project>
-      <Name>Xenko.Graphics.Regression</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Particles\Xenko.Particles.csproj">
-      <Project>{f32fda80-b6dd-47a8-8681-437e2c0d3f31}</Project>
-      <Name>Xenko.Particles</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Physics\Xenko.Physics.csproj">
-      <Project>{dd592516-b341-40fe-9100-1b0fa784a060}</Project>
-      <Name>Xenko.Physics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.SpriteStudio.Runtime\Xenko.SpriteStudio.Runtime.csproj">
-      <Project>{9BC63BEC-F305-451D-BB31-262938EA964D}</Project>
-      <Name>Xenko.SpriteStudio.Runtime</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Navigation\Xenko.Navigation.csproj">
-      <Project>{fbe1fa7b-e699-4bb2-9c8f-41f4c9f3f088}</Project>
-      <Name>Xenko.Navigation</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <Choose>
-    <When Condition="'$(XenkoPlatform)' == 'Windows'">
-      <ItemGroup>
-        <ProjectReference Include="..\..\..\sources\engine\Xenko.Shaders.Compiler\Xenko.Shaders.Compiler.csproj">
-          <Project>{E8B3553F-A79F-4E50-B75B-ACEE771C320C}</Project>
-          <Name>Xenko.Shaders.Compiler</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\..\sources\engine\Xenko.Shaders.Parser\Xenko.Shaders.Parser.csproj">
-          <Project>{14A47447-2A24-4ECD-B24D-6571499DCD4C}</Project>
-          <Name>Xenko.Shaders.Parser</Name>
-        </ProjectReference>
-        <ProjectReference Include="..\..\..\sources\shaders\Xenko.Core.Shaders\Xenko.Core.Shaders.csproj">
-          <Project>{F2D52EDB-BC17-4243-B06D-33CD20F87A7F}</Project>
-          <Name>Xenko.Core.Shaders</Name>
-        </ProjectReference>
-      </ItemGroup>
-    </When>
-  </Choose>
-</Project>
diff --git a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Windows.csproj b/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Windows.csproj
index af7ab57b62..d718cc6096 100644
--- a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.Windows.csproj
@@ -1,13 +1,12 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <AssemblyName>Xenko.Graphics.Tests</AssemblyName>
     <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
     <TargetFramework>net461</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <EnableDefaultItems>false</EnableDefaultItems>
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoPlatform>Windows</XenkoPlatform>
     <XenkoBuildProfile>Windows</XenkoBuildProfile>
@@ -27,123 +26,10 @@
     <StartupObject>Xenko.Graphics.Tests.TestDynamicSpriteFont</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="README.md" />
+    <Compile Remove="Compiler\CubemapEffect.xkfx.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Compiler\CustomEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CustomEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\CustomShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CustomShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="FixedAspectRatioTests.cs" />
-    <Compile Include="Compiler\MultiTexturesSpriteEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultiTexturesSpriteEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\MultiTexturesSpriteShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultiTexturesSpriteShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\SimpleEffect.cs">
-      <DependentUpon>SimpleEffect.xkfx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Compiler\SimpleShader.cs">
-      <DependentUpon>SimpleShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Compiler\ToGlslEffect.cs">
-      <DependentUpon>ToGlslEffect.xkfx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Compiler\ToGlslShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ToGlslShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Regression\TestMultipleTextures.cs" />
-    <Compile Include="Regression\TestSimpleTexture.cs" />
-    <Compile Include="TestBitmapSpriteFont.cs" />
-    <Compile Include="TestDynamicSpriteFont.cs" />
-    <Compile Include="TestDynamicSpriteFontJapanese.cs" />
-    <Compile Include="TestDynamicSpriteFontVarious.cs" />
-    <Compile Include="TestExternSpriteFont.cs" />
-    <Compile Include="TestFixedSizeUI.cs" />
-    <Compile Include="TestFontManager.cs" />
-    <Compile Include="TestImageLoad.cs" />
-    <Compile Include="TestPrecompiledSpriteFont.cs" />
-    <Compile Include="TestScene.cs" />
-    <Compile Include="TestSprite.cs" />
-    <Compile Include="TestSpriteBatch3D.cs" />
-    <Compile Include="TestSpriteBatchResolution.cs" />
-    <Compile Include="TestSpriteBatchToTexture.cs" />
-    <Compile Include="TestSpriteFont.cs" />
-    <Compile Include="TestSpriteFontAlignment.cs" />
-    <Compile Include="TestStaticSpriteFont.cs" />
-    <Compile Include="TestCustomEffect.cs" />
-    <Compile Include="TestDrawQuad.cs" />
-    <Compile Include="TestGeometricPrimitives.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <Compile Include="TestMultiTextures.cs" />
-    <Compile Include="TestSpriteBatch.cs" />
-    <Compile Include="TestEffect.cs" />
-    <Compile Include="TestImage.cs" />
-    <Compile Include="TestRenderToTexture.cs" />
-    <Compile Include="TestTexture.cs" />
-    <Compile Include="TestGraphicsApiCheck.cs" />
-    <Compile Include="TestTextureSampling.cs" />
-    <None Include="Compiler\CustomEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CustomEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\CustomShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CustomShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\MultiTexturesSpriteEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultiTexturesSpriteEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\MultiTexturesSpriteShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultiTexturesSpriteShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\SimpleEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\SimpleShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\ToGlslEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\ToGlslShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslShader.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.xkpkg" />
+    <None Remove="Compiler\CubemapEffect.xkfx" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
@@ -153,6 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.iOS.csproj b/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.iOS.csproj
deleted file mode 100644
index 75965e34b3..0000000000
--- a/sources/engine/Xenko.Graphics.Tests/Xenko.Graphics.Tests.iOS.csproj
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <!--Import Local Pre Settings for the solution being loaded -->
-  <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9DE0AA56-0DE7-4ADC-BAAC-CD38B7139EBC}</ProjectGuid>
-    <ProjectTypeGuids>{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Exe</OutputType>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
-    <AssemblyName>XenkoGraphicsTests</AssemblyName>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xenko.Graphics.Tests</RootNamespace>
-    <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
-    <XenkoBuildProfile>$(XenkoPlatform)</XenkoBuildProfile>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-    <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''">OpenGLES</XenkoGraphicsApi>
-    <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
-    <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Graphics.Tests.xkpkg</XenkoCurrentPackagePath>
-    <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Developer</CodesignKey>
-    <MtouchUseSGen>True</MtouchUseSGen>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>
-    <CodesignKey>iPhone Developer</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Testing|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>
-    <MtouchDebug>True</MtouchDebug>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-    <BuildIpa>True</BuildIpa>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'AppStore|iPhone' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
-    <MtouchUseSGen>True</MtouchUseSGen>
-    <MtouchArch>ARMv7, ARMv7s, ARM64</MtouchArch>
-    <CodesignKey>iPhone Distribution</CodesignKey>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchDebug>True</MtouchDebug>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <MtouchLink>None</MtouchLink>
-    <MtouchArch>i386, x86_64</MtouchArch>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Xenko.Core.Tests.Application</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Label="Xenko.DoNotSync" Include="Xamarin.iOS" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Label="Xenko.DoNotSync" Include="Info.plist" />
-    <Compile Label="Xenko.DoNotSync" Include="..\..\..\sources\shared\tests\nunitlite\NUnitLiteLauncher.iPhone.cs">
-      <Link>NUnitLiteLauncher.iPhone.cs</Link>
-    </Compile>
-    <None Include="README.md" />
-    <Compile Include="Compiler\CustomEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CustomEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\CustomShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CustomShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="FixedAspectRatioTests.cs" />
-    <Compile Include="Compiler\MultiTexturesSpriteEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultiTexturesSpriteEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\MultiTexturesSpriteShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MultiTexturesSpriteShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="Compiler\SimpleEffect.cs">
-      <DependentUpon>SimpleEffect.xkfx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Compiler\SimpleShader.cs">
-      <DependentUpon>SimpleShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Compiler\ToGlslEffect.cs">
-      <DependentUpon>ToGlslEffect.xkfx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="Compiler\ToGlslShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ToGlslShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="XunitAttributes.cs" />
-    <Compile Include="Regression\TestMultipleTextures.cs" />
-    <Compile Include="Regression\TestSimpleTexture.cs" />
-    <Compile Include="TestBitmapSpriteFont.cs" />
-    <Compile Include="TestDynamicSpriteFont.cs" />
-    <Compile Include="TestDynamicSpriteFontJapanese.cs" />
-    <Compile Include="TestDynamicSpriteFontVarious.cs" />
-    <Compile Include="TestExternSpriteFont.cs" />
-    <Compile Include="TestFixedSizeUI.cs" />
-    <Compile Include="TestFontManager.cs" />
-    <Compile Include="TestImageLoad.cs" />
-    <Compile Include="TestPrecompiledSpriteFont.cs" />
-    <Compile Include="TestScene.cs" />
-    <Compile Include="TestSprite.cs" />
-    <Compile Include="TestSpriteBatch3D.cs" />
-    <Compile Include="TestSpriteBatchResolution.cs" />
-    <Compile Include="TestSpriteBatchToTexture.cs" />
-    <Compile Include="TestSpriteFont.cs" />
-    <Compile Include="TestSpriteFontAlignment.cs" />
-    <Compile Include="TestStaticSpriteFont.cs" />
-    <Compile Include="TestCustomEffect.cs" />
-    <Compile Include="TestDrawQuad.cs" />
-    <Compile Include="TestGeometricPrimitives.cs" />
-    <Compile Include="GraphicTestGameBase.cs" />
-    <Compile Include="TestMultiTextures.cs" />
-    <Compile Include="TestSpriteBatch.cs" />
-    <Compile Include="TestEffect.cs" />
-    <Compile Include="TestImage.cs" />
-    <Compile Include="TestRenderToTexture.cs" />
-    <Compile Include="TestTexture.cs" />
-    <Compile Include="TestGraphicsApiCheck.cs" />
-    <Compile Include="TestTextureSampling.cs" />
-    <None Include="Compiler\CustomEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CustomEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\CustomShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CustomShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\MultiTexturesSpriteEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultiTexturesSpriteEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\MultiTexturesSpriteShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MultiTexturesSpriteShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\SimpleEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\SimpleShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleShader.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\ToGlslEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Compiler\ToGlslShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslShader.cs</LastGenOutput>
-    </None>
-    <None Include="Xenko.Graphics.Tests.xkpkg" />
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
-    <ProjectReference Include="..\Xenko.UI\Xenko.UI.csproj" />
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-  <Import Project="Xenko.Graphics.Tests.Shared.targets" />
-  <Import Project="$(XenkoPackageProps)" Condition="Exists('$(XenkoPackageProps)')" />
-  <Import Project="..\..\targets\Xenko.UnitTests.targets" Condition="Exists('..\..\targets\Xenko.UnitTests.targets')" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
-    Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics/AppContextType.cs b/sources/engine/Xenko.Graphics/AppContextType.cs
index 5c6d343542..902060b40e 100644
--- a/sources/engine/Xenko.Graphics/AppContextType.cs
+++ b/sources/engine/Xenko.Graphics/AppContextType.cs
@@ -43,11 +43,6 @@ public enum AppContextType
         /// </summary>
         DesktopWpf,
 
-        /// <summary>
-        /// Game running on desktop in an OpenTK form.
-        /// </summary>
-        DesktopOpenTK,
-
         /// <summary>
         /// Game running on Android in an AndroidXenkoGameView.
         /// </summary>
diff --git a/sources/engine/Xenko.Graphics/BatchBase.cs b/sources/engine/Xenko.Graphics/BatchBase.cs
index c0537607c6..191ac9d774 100644
--- a/sources/engine/Xenko.Graphics/BatchBase.cs
+++ b/sources/engine/Xenko.Graphics/BatchBase.cs
@@ -111,7 +111,7 @@ public ElementInfo(int vertexCount, int indexCount, ref TDrawInfo drawInfo, floa
         protected QueueComparer<ElementInfo> BackToFrontComparer { get; set; }
         protected QueueComparer<ElementInfo> FrontToBackComparer { get; set; }
 
-        internal const float DepthBiasShiftOneUnit = 0.0001f;
+        internal const float DepthBiasShiftOneUnit = 0.000005f;
 
         protected BatchBase(GraphicsDevice device, EffectBytecode defaultEffectByteCode, EffectBytecode defaultEffectByteCodeSRgb, ResourceBufferInfo resourceBufferInfo, VertexDeclaration vertexDeclaration, int indexSize = sizeof(short))
         {
@@ -181,15 +181,15 @@ protected void Begin(GraphicsContext graphicsContext, EffectInstance effect, Spr
 
             textureUpdater = null;
             if (Effect.Effect.HasParameter(TexturingKeys.Texture0))
-                textureUpdater = Effect.Parameters.GetAccessor(TexturingKeys.Texture0);
+                textureUpdater = Effect.Parameters.GetObjectAccessor(TexturingKeys.Texture0);
             if (Effect.Effect.HasParameter(TexturingKeys.TextureCube0))
-                textureUpdater = Effect.Parameters.GetAccessor(TexturingKeys.TextureCube0);
+                textureUpdater = Effect.Parameters.GetObjectAccessor(TexturingKeys.TextureCube0);
             if (Effect.Effect.HasParameter(TexturingKeys.Texture3D0))
-                textureUpdater = Effect.Parameters.GetAccessor(TexturingKeys.Texture3D0);
+                textureUpdater = Effect.Parameters.GetObjectAccessor(TexturingKeys.Texture3D0);
 
             samplerUpdater = null;
             if (Effect.Effect.HasParameter(TexturingKeys.Sampler))
-                samplerUpdater = Effect.Parameters.GetAccessor(TexturingKeys.Sampler);
+                samplerUpdater = Effect.Parameters.GetObjectAccessor(TexturingKeys.Sampler);
 
             // Immediate mode, then prepare for rendering here instead of End()
             if (sessionSortMode == SpriteSortMode.Immediate)
@@ -417,13 +417,14 @@ private void DrawBatchPerTextureAndPass(ElementInfo[] sprites, int offset, int c
                 while (batchSize < count)
                 {
                     var spriteIndex = offset + batchSize;
+                    ref var spriteElementInfo = ref sprites[spriteIndex];
 
                     // How many sprites does the D3D vertex buffer have room for?
                     var remainingVertexSpace = ResourceContext.VertexCount - ResourceContext.VertexBufferPosition - vertexCount;
                     var remainingIndexSpace = ResourceContext.IndexCount - ResourceContext.IndexBufferPosition - indexCount;
 
-                    // if there is not enough place let for either the indices or vertices of the current element..., 
-                    if (sprites[spriteIndex].IndexCount > remainingIndexSpace || sprites[spriteIndex].VertexCount > remainingVertexSpace)
+                    // if there is not enough place left for either the indices or vertices of the current element...,
+                    if (spriteElementInfo.IndexCount > remainingIndexSpace || spriteElementInfo.VertexCount > remainingVertexSpace)
                     {
                         // if we haven't started the current batch yet, we restart at the beginning of the buffers.
                         if (batchSize == 0)
@@ -433,13 +434,13 @@ private void DrawBatchPerTextureAndPass(ElementInfo[] sprites, int offset, int c
                             continue;
                         }
 
-                        // else we perform the draw call and  batch remaining elements in next draw call.
+                        // else we perform the draw call and batch remaining elements in next draw call.
                         break;
                     }
 
                     ++batchSize;
-                    vertexCount += sprites[spriteIndex].VertexCount;
-                    indexCount += sprites[spriteIndex].IndexCount;
+                    vertexCount += spriteElementInfo.VertexCount;
+                    indexCount += spriteElementInfo.IndexCount;
                 }
 
                 // Sets the data directly to the buffer in memory
@@ -499,12 +500,13 @@ private void DrawBatchPerTextureAndPass(ElementInfo[] sprites, int offset, int c
                     for (var i = 0; i < batchSize; i++)
                     {
                         var spriteIndex = offset + i;
+                        ref var spriteElementInfo = ref sprites[spriteIndex];
 
-                        UpdateBufferValuesFromElementInfo(ref sprites[spriteIndex], vertexPointer, indexPointer, ResourceContext.VertexBufferPosition);
-                        
-                        ResourceContext.VertexBufferPosition += sprites[spriteIndex].VertexCount;
-                        vertexPointer += vertexStructSize * sprites[spriteIndex].VertexCount;
-                        indexPointer += indexStructSize * sprites[spriteIndex].IndexCount;
+                        UpdateBufferValuesFromElementInfo(ref spriteElementInfo, vertexPointer, indexPointer, ResourceContext.VertexBufferPosition);
+
+                        ResourceContext.VertexBufferPosition += spriteElementInfo.VertexCount;
+                        vertexPointer += vertexStructSize * spriteElementInfo.VertexCount;
+                        indexPointer += indexStructSize * spriteElementInfo.IndexCount;
                     }
 
                     GraphicsContext.CommandList.UnmapSubresource(mappedVertices);
diff --git a/sources/engine/Xenko.Graphics/BlendStateDescription.cs b/sources/engine/Xenko.Graphics/BlendStateDescription.cs
index 9c576a048e..f10a131357 100644
--- a/sources/engine/Xenko.Graphics/BlendStateDescription.cs
+++ b/sources/engine/Xenko.Graphics/BlendStateDescription.cs
@@ -43,16 +43,17 @@ public unsafe void SetDefaults()
             {
                 for (int i = 0; i < 8; i++)
                 {
-                    renderTargets[i].BlendEnable = false;
-                    renderTargets[i].ColorSourceBlend = Blend.One;
-                    renderTargets[i].ColorDestinationBlend = Blend.Zero;
-                    renderTargets[i].ColorBlendFunction = BlendFunction.Add;
+                    ref var renderTarget = ref renderTargets[i];
+                    renderTarget.BlendEnable = false;
+                    renderTarget.ColorSourceBlend = Blend.One;
+                    renderTarget.ColorDestinationBlend = Blend.Zero;
+                    renderTarget.ColorBlendFunction = BlendFunction.Add;
 
-                    renderTargets[i].AlphaSourceBlend = Blend.One;
-                    renderTargets[i].AlphaDestinationBlend = Blend.Zero;
-                    renderTargets[i].AlphaBlendFunction = BlendFunction.Add;
+                    renderTarget.AlphaSourceBlend = Blend.One;
+                    renderTarget.AlphaDestinationBlend = Blend.Zero;
+                    renderTarget.AlphaBlendFunction = BlendFunction.Add;
 
-                    renderTargets[i].ColorWriteChannels = ColorWriteChannels.All;
+                    renderTarget.ColorWriteChannels = ColorWriteChannels.All;
                 }
             }
         }
diff --git a/sources/engine/Xenko.Graphics/Buffer.cs b/sources/engine/Xenko.Graphics/Buffer.cs
index 9ac9745971..a5aa75e150 100644
--- a/sources/engine/Xenko.Graphics/Buffer.cs
+++ b/sources/engine/Xenko.Graphics/Buffer.cs
@@ -22,6 +22,7 @@
 // THE SOFTWARE.
 
 using System;
+using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Serialization;
 using Xenko.Core.Serialization.Contents;
@@ -40,9 +41,95 @@ namespace Xenko.Graphics
     [ContentSerializer(typeof(DataContentSerializer<Buffer>))]
     public partial class Buffer : GraphicsResource
     {
+        /// <summary>
+        /// If this is true, capture all vertex and index buffers regardless of size. Can be turned on and off as needed.
+        /// </summary>
+        [DataMemberIgnore]
+        public static bool CaptureAllModelBuffers = false;
+
+        /// <summary>
+        /// Register a model content url for storing buffer contents, regardless of size or value of CaptureAllModelBuffers. Should work whether loaded via GameStudio or code
+        /// </summary>
+        /// <param name="content_url">Content URL for the model asset</param>
+        public static void PreserveModelBufferForURL(string content_url)
+        {
+            // need to actually store generated urls for vertex/index buffer
+            ContentManager._captureModelBuffers.Add(content_url + "/gen/Buffer_1");
+            ContentManager._captureModelBuffers.Add(content_url + "/gen/Buffer_2");
+        }
+
+        /// <summary>
+        /// Capture easy-access data for all vertex buffers below this size. Can be useful for batching!
+        /// </summary>
+        [DataMemberIgnore]
+        public static int CaptureVertexBuffersOfSize = 32768;
+
+        /// <summary>
+        /// Capture easy-access data for all index buffers below this size. Can be useful for batching!
+        /// </summary>
+        [DataMemberIgnore]
+        public static int CaptureIndexBuffersOfSize = 8192;
+
+        /// <summary>
+        /// How big should the Vulkan upload buffer be in megabytes? It is ring recycled. Bigger buffers may be needed for very frequent large uploads. Defaults to 256.
+        /// </summary>
+        [DataMemberIgnore]
+        public static int UploadBufferSizeInMB = 256;
+
+        /// <summary>
+        /// How many small buffers to preallocate for StagedMeshDraws? Only gets created when StagedMeshDraws gets used.
+        /// </summary>
+        [DataMemberIgnore]
+        public static ulong SmallPooledBufferCount = 3000;
+
+        /// <summary>
+        /// How many large buffers to preallocate for StagedMeshDraws? Only gets created when StagedMeshDraws gets used.
+        /// </summary>
+        [DataMemberIgnore]
+        public static ulong LargePooledBufferCount = 1000;
+
+        /// <summary>
+        /// How big is each small StagedMeshBufferSize? Make it big enough to store your biggest StagedMeshDraw. Total size is StagedMeshBufferSize * StagedMeshBufferCount. Only gets created
+        /// when StageMeshDraws are used.
+        /// </summary>
+        [DataMemberIgnore]
+        public static ulong SmallPooledBufferSize = 90000;
+
+        /// <summary>
+        /// How big is each large StagedMeshBufferSize? Make it big enough to store your biggest StagedMeshDraw. Total size is StagedMeshBufferSize * StagedMeshBufferCount. Only gets created
+        /// when StageMeshDraws are used.
+        /// </summary>
+        [DataMemberIgnore]
+        public static ulong LargePooledBufferSize = 500000;
+
+        [DataMemberIgnore]
+        public static ulong LargestBufferSize { get; internal set; }
+
+        [DataMemberIgnore]
+        public static ulong PoolMissesDueToSize { get; internal set; }
+
+        [DataMemberIgnore]
+        public static ulong PoolMissesDueToExaustion { get; internal set; }
+
+        [DataMemberIgnore]
+        public static int CurrentFreeSmallPool { get; internal set; }
+
+        [DataMemberIgnore]
+        public static int CurrentFreeBigPool { get; internal set; }
+
         protected int elementCount;
         private BufferDescription bufferDescription;
 
+        /// <summary>
+        /// Is this buffer fully initialized and ready to go?
+        /// </summary>
+        public bool Ready { get; internal set; }
+
+        /// <summary>
+        /// If this is a vertex or index buffer, this stores the raw data. Only works in Vulkan
+        /// </summary>
+        public byte[] VertIndexData { get; private set; }
+
         public Buffer()
         {
         }
@@ -352,6 +439,15 @@ public void SetData(CommandList commandList, DataPointer fromData, int offsetInB
             }
         }
 
+        internal unsafe void FastRawSetData<TData>(CommandList commandList, TData[] data, int startIndex, int endIndex) where TData : struct
+        {
+            int structSize = Utilities.SizeOf<TData>();
+            int offsetInBytes = startIndex * structSize;
+            int endOffset = endIndex * structSize;
+            var destRegion = new ResourceRegion(offsetInBytes, 0, 0, endOffset, 1, 1);
+            commandList.UpdateSubresource(this, 0, new DataBox(new IntPtr(Interop.Fixed(ref data[startIndex])), 0, 0), destRegion);
+        }
+
         /// <summary>
         /// Creates a new <see cref="Buffer" /> instance.
         /// </summary>
diff --git a/sources/engine/Xenko.Graphics/BufferPool.cs b/sources/engine/Xenko.Graphics/BufferPool.cs
index 1c7a125919..be8d7ee096 100644
--- a/sources/engine/Xenko.Graphics/BufferPool.cs
+++ b/sources/engine/Xenko.Graphics/BufferPool.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Collections.Concurrent;
 
 namespace Xenko.Graphics
 {
@@ -12,21 +14,24 @@ public class BufferPool : IDisposable
 #elif XENKO_GRAPHICS_API_VULKAN
         private const bool UseBufferOffsets = true;
 #else
+        private int bufferIndex;
         private const bool UseBufferOffsets = false;
 #endif
 
+        private Buffer currentBuffer;
+
         private int constantBufferAlignment;
         public int Size;
         public IntPtr Data;
 
         private readonly GraphicsResourceAllocator allocator;
-        private Buffer constantBuffer;
         private MappedResource mappedConstantBuffer;
-        private CommandList commandList;
+        internal CommandList commandList;
+        private BufferDescription defaultDescription;
 
         private int bufferAllocationOffset;
 
-        internal BufferPool(GraphicsResourceAllocator allocator, GraphicsDevice graphicsDevice, int size)
+        internal BufferPool(GraphicsResourceAllocator allocator, GraphicsDevice graphicsDevice, int size, int initialCount, CommandList clist = null)
         {
             constantBufferAlignment = graphicsDevice.ConstantBufferDataPlacementAlignment;
             if (size % constantBufferAlignment != 0)
@@ -38,18 +43,35 @@ internal BufferPool(GraphicsResourceAllocator allocator, GraphicsDevice graphics
             if (!UseBufferOffsets)
                 Data = Marshal.AllocHGlobal(size);
 
+            this.commandList = clist;
+
+            defaultDescription = new BufferDescription(Size, BufferFlags.ConstantBuffer, GraphicsResourceUsage.Dynamic);
+
+            PrepareBuffers(initialCount);
+
             Reset();
         }
 
-        public static BufferPool New(GraphicsResourceAllocator allocator, GraphicsDevice graphicsDevice, int size)
+        private void PrepareBuffers(int count)
+        {
+            List<Buffer> toRelease = new List<Buffer>();
+
+            for (int i = 0; i < count; i++)
+                toRelease.Add(allocator.GetTemporaryBuffer(defaultDescription));
+
+            for (int i = 0; i < count; i++)
+                allocator.ReleaseReference(toRelease[i]);
+        }
+
+        public static BufferPool New(GraphicsResourceAllocator allocator, GraphicsDevice graphicsDevice, int size, int initialCount, CommandList clist = null)
         {
-            return new BufferPool(allocator, graphicsDevice, size);
+            return new BufferPool(allocator, graphicsDevice, size, initialCount, clist);
         }
 
         public void Dispose()
         {
             if (UseBufferOffsets)
-                allocator.ReleaseReference(constantBuffer);
+                allocator.ReleaseReference(currentBuffer);
             else
                 Marshal.FreeHGlobal(Data);
             Data = IntPtr.Zero;
@@ -62,7 +84,7 @@ public void Map(CommandList commandList)
                 using (new DefaultCommandListLock(commandList))
                 {
                     this.commandList = commandList;
-                    mappedConstantBuffer = commandList.MapSubresource(constantBuffer, 0, MapMode.WriteNoOverwrite);
+                    mappedConstantBuffer = commandList.MapSubresource(currentBuffer, 0, MapMode.WriteNoOverwrite);
                     Data = mappedConstantBuffer.DataBox.DataPointer;
                 }
             }
@@ -82,14 +104,11 @@ public void Unmap()
 
         public void Reset()
         {
-            if (UseBufferOffsets)
-            {
-                // Release previous buffer
-                if (constantBuffer != null)
-                    allocator.ReleaseReference(constantBuffer);
+            // Release previous buffer
+            if (currentBuffer != null)
+                allocator.ReleaseReference(currentBuffer);
 
-                constantBuffer = allocator.GetTemporaryBuffer(new BufferDescription(Size, BufferFlags.ConstantBuffer, GraphicsResourceUsage.Dynamic));
-            }
+            currentBuffer = allocator.GetTemporaryBuffer(defaultDescription);
 
             bufferAllocationOffset = 0;
         }
@@ -122,7 +141,7 @@ public void Allocate(GraphicsDevice graphicsDevice, int size, BufferPoolAllocati
             {
                 bufferPoolAllocationResult.Uploaded = true;
                 bufferPoolAllocationResult.Offset = result;
-                bufferPoolAllocationResult.Buffer = constantBuffer;
+                bufferPoolAllocationResult.Buffer = currentBuffer;
             }
             else
             {
diff --git a/sources/engine/Xenko.Graphics/CommandList.cs b/sources/engine/Xenko.Graphics/CommandList.cs
index e8c0ee99db..d4fc601432 100644
--- a/sources/engine/Xenko.Graphics/CommandList.cs
+++ b/sources/engine/Xenko.Graphics/CommandList.cs
@@ -75,7 +75,7 @@ public void ClearState()
 
             // Setup empty scissors
             scissorsDirty = true;
-            for (int i = 0; i < viewports.Length; i++)
+            for (int i = 0; i < scissors.Length; i++)
                 scissors[i] = new Rectangle();
 
             // Setup the default render target
diff --git a/sources/engine/Xenko.Graphics/Data/TextureContentSerializer.cs b/sources/engine/Xenko.Graphics/Data/TextureContentSerializer.cs
index e29813abe8..14346397bf 100644
--- a/sources/engine/Xenko.Graphics/Data/TextureContentSerializer.cs
+++ b/sources/engine/Xenko.Graphics/Data/TextureContentSerializer.cs
@@ -70,8 +70,8 @@ internal static void Serialize(ArchiveMode mode, SerializationStream stream, Tex
                     ContentStorageHeader storageHeader;
                     ContentStorageHeader.Read(stream, out storageHeader);
 
-                    // Check if streaming service is available
-                    if (texturesStreamingProvider != null)
+                    // Check if streaming service is available (disable for vulkan, which isn't really necessary [and kinda broken])
+                    if (texturesStreamingProvider != null && GraphicsDevice.Platform != GraphicsPlatform.Vulkan)
                     {
                         if (allowContentStreaming)
                         {
diff --git a/sources/engine/Xenko.Graphics/DeviceCreationFlags.cs b/sources/engine/Xenko.Graphics/DeviceCreationFlags.cs
index 7735e11889..09a2564b8b 100644
--- a/sources/engine/Xenko.Graphics/DeviceCreationFlags.cs
+++ b/sources/engine/Xenko.Graphics/DeviceCreationFlags.cs
@@ -10,6 +10,21 @@ namespace Xenko.Graphics
     [Flags]
     public enum DeviceCreationFlags : int
     {
+        /// <summary>
+        /// Creates a device that supports the debug layer, breaking only on unique errors
+        /// </summary>
+        DebugAndLogUnique = unchecked((int)16),
+
+        /// <summary>
+        /// Creates a device that supports the debug layer, breaking only on unique errors
+        /// </summary>
+        DebugAndBreakUnique = unchecked((int)8),
+
+        /// <summary>
+        /// Creates a device that supports the debug layer.
+        /// </summary>
+        DebugAndBreak = unchecked((int)4),
+
         /// <summary>
         /// Creates a device that supports the debug layer.
         /// </summary>
diff --git a/sources/engine/Xenko.Graphics/Direct3D/Buffer.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/Buffer.Direct3D.cs
index e91782fe42..412d2288c4 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/Buffer.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/Buffer.Direct3D.cs
@@ -47,12 +47,21 @@ protected Buffer InitializeFromImpl(BufferDescription description, BufferFlags v
                 GraphicsDevice.RegisterBufferMemoryUsage(SizeInBytes);
             }
 
+            Ready = true;
+
             return this;
         }
 
+        public void DestroyNow()
+        {
+            OnDestroyed();
+        }
+
         /// <inheritdoc/>
         protected internal override void OnDestroyed()
         {
+            Ready = false;
+
             if (GraphicsDevice != null)
             {
                 GraphicsDevice.RegisterBufferMemoryUsage(-SizeInBytes);
diff --git a/sources/engine/Xenko.Graphics/Direct3D/CommandList.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/CommandList.Direct3D.cs
index 222541ef97..625898ee9f 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/CommandList.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/CommandList.Direct3D.cs
@@ -26,6 +26,8 @@ public partial class CommandList
         private SharpDX.Direct3D11.OutputMergerStage outputMerger;
 
         private readonly SharpDX.Direct3D11.RenderTargetView[] currentRenderTargetViews = new SharpDX.Direct3D11.RenderTargetView[SimultaneousRenderTargetCount];
+        private          int currentRenderTargetViewsActiveCount = 0;
+        private readonly SharpDX.Direct3D11.UnorderedAccessView[] currentUARenderTargetViews = new SharpDX.Direct3D11.UnorderedAccessView[SimultaneousRenderTargetCount];
         private readonly SharpDX.Direct3D11.CommonShaderStage[] shaderStages = new SharpDX.Direct3D11.CommonShaderStage[StageCount];
         private readonly Buffer[] constantBuffers = new Buffer[StageCount * ConstantBufferCount];
         private readonly SamplerState[] samplerStates = new SamplerState[StageCount * SamplerStateCount];
@@ -89,6 +91,8 @@ private void ClearStateImpl()
                 unorderedAccessViews[i] = null;
             for (int i = 0; i < currentRenderTargetViews.Length; i++)
                 currentRenderTargetViews[i] = null;
+            for (int i = 0; i < currentUARenderTargetViews.Length; i++)
+                currentUARenderTargetViews[i] = null;
 
             // Since nothing can be drawn in default state, no need to set anything (another SetPipelineState should happen before)
             currentPipelineState = GraphicsDevice.DefaultPipelineState;
@@ -101,6 +105,8 @@ private void ResetTargetsImpl()
         {
             for (int i = 0; i < currentRenderTargetViews.Length; i++)
                 currentRenderTargetViews[i] = null;
+            for (int i = 0; i < currentUARenderTargetViews.Length; i++)
+                currentUARenderTargetViews[i] = null;
             outputMerger.ResetTargets();
         }
 
@@ -113,6 +119,8 @@ private void ResetTargetsImpl()
         /// <exception cref="System.ArgumentNullException">renderTargetViews</exception>
         private void SetRenderTargetsImpl(Texture depthStencilBuffer, int renderTargetCount, Texture[] renderTargets)
         {
+            currentRenderTargetViewsActiveCount = renderTargetCount;
+
             for (int i = 0; i < renderTargetCount; i++)
                 currentRenderTargetViews[i] = renderTargets[i].NativeRenderTargetView;
 
@@ -255,6 +263,30 @@ internal void SetShaderResourceView(ShaderStage stage, int slot, GraphicsResourc
             shaderStages[(int)stage - 1].SetShaderResource(slot, shaderResourceView != null ? shaderResourceView.NativeShaderResourceView : null);
         }
 
+        /// <summary>
+        ///     Sets an unordered access view to the shader pipeline, without affecting ones that are already set.
+        /// </summary>
+        /// <param name="slot">The binding slot.</param>
+        /// <param name="shaderResourceView">The shader resource view.</param>
+        /// <param name="view">The native unordered access view.</param>
+        /// <param name="uavInitialOffset">The Append/Consume buffer offset. See SetUnorderedAccessView for more details.</param>
+        internal void OMSetSingleUnorderedAccessView(int slot, SharpDX.Direct3D11.UnorderedAccessView view, int uavInitialOffset)
+        {
+            currentUARenderTargetViews[slot] = view;
+
+            int remainingSlots = currentUARenderTargetViews.Length - currentRenderTargetViewsActiveCount;
+
+            var uavs = new SharpDX.Direct3D11.UnorderedAccessView[remainingSlots];
+            Array.Copy(currentUARenderTargetViews, currentRenderTargetViewsActiveCount, uavs, 0, remainingSlots);
+
+            var uavInitialCounts = new int[remainingSlots];
+            for (int i = 0; i < remainingSlots; i++)
+                uavInitialCounts[i] = -1;
+            uavInitialCounts[slot - currentRenderTargetViewsActiveCount] = uavInitialOffset;
+
+            outputMerger.SetUnorderedAccessViews(currentRenderTargetViewsActiveCount, uavs, uavInitialCounts);
+        }
+
         /// <summary>
         /// Sets an unordered access view to the shader pipeline.
         /// </summary>
@@ -268,14 +300,24 @@ internal void SetShaderResourceView(ShaderStage stage, int slot, GraphicsResourc
         /// <exception cref="System.ArgumentException">Invalid stage.;stage</exception>
         internal void SetUnorderedAccessView(ShaderStage stage, int slot, GraphicsResource unorderedAccessView, int uavInitialOffset)
         {
-            if (stage != ShaderStage.Compute)
+            if (stage != ShaderStage.Compute && stage != ShaderStage.Pixel)
                 throw new ArgumentException("Invalid stage.", "stage");
 
             var view = unorderedAccessView?.NativeUnorderedAccessView;
-            if (unorderedAccessViews[slot] != view)
+            if (stage == ShaderStage.Compute)
             {
-                unorderedAccessViews[slot] = view;
-                NativeDeviceContext.ComputeShader.SetUnorderedAccessView(slot, view, uavInitialOffset);
+                if (unorderedAccessViews[slot] != view)
+                {
+                    unorderedAccessViews[slot] = view;
+                    NativeDeviceContext.ComputeShader.SetUnorderedAccessView(slot, view, uavInitialOffset);
+                }
+            }
+            else
+            {
+                if (currentUARenderTargetViews[slot] != view)
+                {
+                    OMSetSingleUnorderedAccessView(slot, view, uavInitialOffset);
+                }
             }
         }
 
@@ -297,6 +339,13 @@ internal void UnsetUnorderedAccessView(GraphicsResource unorderedAccessView)
                     NativeDeviceContext.ComputeShader.SetUnorderedAccessView(slot, null);
                 }
             }
+            for (int slot = 0; slot < SimultaneousRenderTargetCount; slot++)
+            {
+                if (currentUARenderTargetViews[slot] == view)
+                {
+                    OMSetSingleUnorderedAccessView(slot, null, -1);
+                }
+            }
         }
 
         /// <summary>
@@ -345,7 +394,7 @@ public void ResourceBarrierTransition(GraphicsResource resource, GraphicsResourc
             // Nothing to do
         }
 
-        public void SetDescriptorSets(int index, DescriptorSet[] descriptorSets)
+        public void SetDescriptorSets(DescriptorSet[] descriptorSets)
         {
             // Bind resources
             currentPipelineState?.ResourceBinder.BindResources(this, descriptorSets);
diff --git a/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapter.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapter.Direct3D.cs
index 8f7dfb5f33..c988c3015f 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapter.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapter.Direct3D.cs
@@ -110,38 +110,6 @@ internal Adapter1 NativeAdapter
                 return adapter;
             }
         }
-
-        /// <summary>
-        /// Tests to see if the adapter supports the requested profile.
-        /// </summary>
-        /// <param name="graphicsProfile">The graphics profile.</param>
-        /// <returns>true if the profile is supported</returns>
-        public bool IsProfileSupported(GraphicsProfile graphicsProfile)
-        {
-#if XENKO_GRAPHICS_API_DIRECT3D12
-            return true;
-#else
-            // Did we check fo this or a higher profile, and it was supported?
-            if (maximumSupportedProfile >= graphicsProfile)
-                return true;
-
-            // Did we check for this or a lower profile and it was unsupported?
-            if (minimumUnsupportedProfile <= graphicsProfile)
-                return false;
-
-            // Check and min/max cached values
-            if (SharpDX.Direct3D11.Device.IsSupportedFeatureLevel(this.NativeAdapter, (SharpDX.Direct3D.FeatureLevel)graphicsProfile))
-            {
-                maximumSupportedProfile = graphicsProfile;
-                return true;
-            }
-            else
-            {
-                minimumUnsupportedProfile = graphicsProfile;
-                return false;
-            }
-#endif
-        }
     }
 } 
 #endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapterFactory.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapterFactory.Direct3D.cs
index 86b1c13c01..87c068bfe3 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapterFactory.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/GraphicsAdapterFactory.Direct3D.cs
@@ -17,7 +17,7 @@ public static partial class GraphicsAdapterFactory
         /// <summary>
         /// Initializes all adapters with the specified factory.
         /// </summary>
-        internal static void InitializeInternal()
+        internal static void InitializeInternal(bool debug)
         {
             staticCollector.Dispose();
 
diff --git a/sources/engine/Xenko.Graphics/Direct3D/PipelineState.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/PipelineState.Direct3D.cs
index 4b793b4cb9..61356b7549 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/PipelineState.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/PipelineState.Direct3D.cs
@@ -1,76 +1,85 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Xenko.Core;
-using Xenko.Core.Storage;
-using Xenko.Shaders;
-
-namespace Xenko.Graphics
-{
-    public partial class PipelineState
-    {
-        // Effect
-        private readonly RootSignature rootSignature;
-        private readonly EffectBytecode effectBytecode;
-        internal ResourceBinder ResourceBinder;
-
-        private SharpDX.Direct3D11.VertexShader vertexShader;
-        private SharpDX.Direct3D11.GeometryShader geometryShader;
-        private SharpDX.Direct3D11.PixelShader pixelShader;
-        private SharpDX.Direct3D11.HullShader hullShader;
-        private SharpDX.Direct3D11.DomainShader domainShader;
-        private SharpDX.Direct3D11.ComputeShader computeShader;
-        private byte[] inputSignature;
-
-        private readonly SharpDX.Direct3D11.BlendState blendState;
-        private readonly uint sampleMask;
-        private readonly SharpDX.Direct3D11.RasterizerState rasterizerState;
-        private readonly SharpDX.Direct3D11.DepthStencilState depthStencilState;
-
-        private SharpDX.Direct3D11.InputLayout inputLayout;
-
-        private readonly SharpDX.Direct3D.PrimitiveTopology primitiveTopology;
-        // Note: no need to store RTV/DSV formats
-
-        internal PipelineState(GraphicsDevice graphicsDevice, PipelineStateDescription pipelineStateDescription) : base(graphicsDevice)
-        {
-            // First time, build caches
-            var pipelineStateCache = GetPipelineStateCache();
-
-            // Effect
-            this.rootSignature = pipelineStateDescription.RootSignature;
-            this.effectBytecode = pipelineStateDescription.EffectBytecode;
-            CreateShaders(pipelineStateCache);
-            if (rootSignature != null && effectBytecode != null)
-                ResourceBinder.Compile(graphicsDevice, rootSignature.EffectDescriptorSetReflection, this.effectBytecode);
-
-            // TODO: Cache over Effect|RootSignature to create binding operations
-
-            // States
-            blendState = pipelineStateCache.BlendStateCache.Instantiate(pipelineStateDescription.BlendState);
-
-            this.sampleMask = pipelineStateDescription.SampleMask;
-            rasterizerState = pipelineStateCache.RasterizerStateCache.Instantiate(pipelineStateDescription.RasterizerState);
-            depthStencilState = pipelineStateCache.DepthStencilStateCache.Instantiate(pipelineStateDescription.DepthStencilState);
-
-            CreateInputLayout(pipelineStateDescription.InputElements);
-
-            primitiveTopology = (SharpDX.Direct3D.PrimitiveTopology)pipelineStateDescription.PrimitiveType;
-        }
-
-        internal void Apply(CommandList commandList, PipelineState previousPipeline)
-        {
-            var nativeDeviceContext = commandList.NativeDeviceContext;
-
-            if (rootSignature != previousPipeline.rootSignature)
-            {
-                //rootSignature.Apply
-            }
-
-            if (effectBytecode != previousPipeline.effectBytecode)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+#if XENKO_GRAPHICS_API_DIRECT3D11
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xenko.Core;
+using Xenko.Core.Storage;
+using Xenko.Shaders;
+
+namespace Xenko.Graphics
+{
+    public partial class PipelineState
+    {
+        // Effect
+        private RootSignature rootSignature;
+        private EffectBytecode effectBytecode;
+        internal ResourceBinder ResourceBinder;
+
+        private SharpDX.Direct3D11.VertexShader vertexShader;
+        private SharpDX.Direct3D11.GeometryShader geometryShader;
+        private SharpDX.Direct3D11.PixelShader pixelShader;
+        private SharpDX.Direct3D11.HullShader hullShader;
+        private SharpDX.Direct3D11.DomainShader domainShader;
+        private SharpDX.Direct3D11.ComputeShader computeShader;
+        private byte[] inputSignature;
+
+        private SharpDX.Direct3D11.BlendState blendState;
+        private uint sampleMask;
+        private SharpDX.Direct3D11.RasterizerState rasterizerState;
+        private SharpDX.Direct3D11.DepthStencilState depthStencilState;
+
+        private SharpDX.Direct3D11.InputLayout inputLayout;
+
+        private SharpDX.Direct3D.PrimitiveTopology primitiveTopology = SharpDX.Direct3D.PrimitiveTopology.Undefined;
+        // Note: no need to store RTV/DSV formats
+
+        public PIPELINE_STATE CurrentState() {
+            if (primitiveTopology != SharpDX.Direct3D.PrimitiveTopology.Undefined) return PIPELINE_STATE.READY;
+            return PIPELINE_STATE.LOADING;
+        }
+
+        internal PipelineState(GraphicsDevice graphicsDevice) : base(graphicsDevice) {
+            // just return a memory address to Prepare later
+        }
+
+        internal void Prepare(PipelineStateDescription pipelineStateDescription)
+        {
+            // First time, build caches
+            var pipelineStateCache = GetPipelineStateCache();
+
+            // Effect
+            this.rootSignature = pipelineStateDescription.RootSignature;
+            this.effectBytecode = pipelineStateDescription.EffectBytecode;
+            CreateShaders(pipelineStateCache);
+            if (rootSignature != null && effectBytecode != null)
+                ResourceBinder.Compile(GraphicsDevice, rootSignature.EffectDescriptorSetReflection, this.effectBytecode);
+
+            // TODO: Cache over Effect|RootSignature to create binding operations
+
+            // States
+            blendState = pipelineStateCache.BlendStateCache.Instantiate(pipelineStateDescription.BlendState);
+
+            this.sampleMask = pipelineStateDescription.SampleMask;
+            rasterizerState = pipelineStateCache.RasterizerStateCache.Instantiate(pipelineStateDescription.RasterizerState);
+            depthStencilState = pipelineStateCache.DepthStencilStateCache.Instantiate(pipelineStateDescription.DepthStencilState);
+
+            CreateInputLayout(pipelineStateDescription.InputElements);
+
+            primitiveTopology = (SharpDX.Direct3D.PrimitiveTopology)pipelineStateDescription.PrimitiveType;
+        }
+
+        internal void Apply(CommandList commandList, PipelineState previousPipeline)
+        {
+            var nativeDeviceContext = commandList.NativeDeviceContext;
+
+            if (rootSignature != previousPipeline.rootSignature)
+            {
+                //rootSignature.Apply
+            }
+
+            if (effectBytecode != previousPipeline.effectBytecode)
             {
                 if (computeShader != previousPipeline.computeShader)
                     nativeDeviceContext.ComputeShader.Set(computeShader);
@@ -83,344 +92,344 @@ internal void Apply(CommandList commandList, PipelineState previousPipeline)
                 if (domainShader != previousPipeline.domainShader)
                     nativeDeviceContext.DomainShader.Set(domainShader);
                 if (geometryShader != previousPipeline.geometryShader)
-                    nativeDeviceContext.GeometryShader.Set(geometryShader);
-            }
-
-            if (blendState != previousPipeline.blendState || sampleMask != previousPipeline.sampleMask)
-            {
-                nativeDeviceContext.OutputMerger.SetBlendState(blendState, nativeDeviceContext.OutputMerger.BlendFactor, sampleMask);
-            }
-
-            if (rasterizerState != previousPipeline.rasterizerState)
-            {
-                nativeDeviceContext.Rasterizer.State = rasterizerState;
-            }
-
-            if (depthStencilState != previousPipeline.depthStencilState)
-            {
-                nativeDeviceContext.OutputMerger.DepthStencilState = depthStencilState;
-            }
-
-            if (inputLayout != previousPipeline.inputLayout)
-            {
-                nativeDeviceContext.InputAssembler.InputLayout = inputLayout;
-            }
-
-            if (primitiveTopology != previousPipeline.primitiveTopology)
-            {
-                nativeDeviceContext.InputAssembler.PrimitiveTopology = primitiveTopology;
-            }
-        }
-
-        protected internal override void OnDestroyed()
-        {
-            var pipelineStateCache = GetPipelineStateCache();
-
-            if (blendState != null)
-                pipelineStateCache.BlendStateCache.Release(blendState);
-            if (rasterizerState != null)
-                pipelineStateCache.RasterizerStateCache.Release(rasterizerState);
-            if (depthStencilState != null)
-                pipelineStateCache.DepthStencilStateCache.Release(depthStencilState);
-
-            if (vertexShader != null)
-                pipelineStateCache.VertexShaderCache.Release(vertexShader);
-            if (pixelShader != null)
-                pipelineStateCache.PixelShaderCache.Release(pixelShader);
-            if (geometryShader != null)
-                pipelineStateCache.GeometryShaderCache.Release(geometryShader);
-            if (hullShader != null)
-                pipelineStateCache.HullShaderCache.Release(hullShader);
-            if (domainShader != null)
-                pipelineStateCache.DomainShaderCache.Release(domainShader);
-            if (computeShader != null)
-                pipelineStateCache.ComputeShaderCache.Release(computeShader);
-
-            inputLayout?.Dispose();
-
-            base.OnDestroyed();
-        }
-
-        private void CreateInputLayout(InputElementDescription[] inputElements)
-        {
-            if (inputElements == null)
-                return;
-
-            var nativeInputElements = new SharpDX.Direct3D11.InputElement[inputElements.Length];
-            for (int index = 0; index < inputElements.Length; index++)
-            {
-                var inputElement = inputElements[index];
-                nativeInputElements[index] = new SharpDX.Direct3D11.InputElement
-                {
-                    Slot = inputElement.InputSlot,
-                    SemanticName = inputElement.SemanticName,
-                    SemanticIndex = inputElement.SemanticIndex,
-                    AlignedByteOffset = inputElement.AlignedByteOffset,
-                    Format = (SharpDX.DXGI.Format)inputElement.Format,
-                };
-            }
-            inputLayout = new SharpDX.Direct3D11.InputLayout(NativeDevice, inputSignature, nativeInputElements);
-        }
-
-        private void CreateShaders(DevicePipelineStateCache pipelineStateCache)
-        {
-            if (effectBytecode == null)
-                return;
-
-            foreach (var shaderBytecode in effectBytecode.Stages)
-            {
-                var reflection = effectBytecode.Reflection;
-
-                // TODO CACHE Shaders with a bytecode hash
-                switch (shaderBytecode.Stage)
-                {
-                    case ShaderStage.Vertex:
-                        vertexShader = pipelineStateCache.VertexShaderCache.Instantiate(shaderBytecode);
-                        // Note: input signature can be reused when reseting device since it only stores non-GPU data,
-                        // so just keep it if it has already been created before.
-                        if (inputSignature == null)
-                            inputSignature = shaderBytecode;
-                        break;
-                    case ShaderStage.Domain:
-                        domainShader = pipelineStateCache.DomainShaderCache.Instantiate(shaderBytecode);
-                        break;
-                    case ShaderStage.Hull:
-                        hullShader = pipelineStateCache.HullShaderCache.Instantiate(shaderBytecode);
-                        break;
-                    case ShaderStage.Geometry:
-                        if (reflection.ShaderStreamOutputDeclarations != null && reflection.ShaderStreamOutputDeclarations.Count > 0)
-                        {
-                            // stream out elements
-                            var soElements = new List<SharpDX.Direct3D11.StreamOutputElement>();
-                            foreach (var streamOutputElement in reflection.ShaderStreamOutputDeclarations)
-                            {
-                                var soElem = new SharpDX.Direct3D11.StreamOutputElement()
-                                {
-                                    Stream = streamOutputElement.Stream,
-                                    SemanticIndex = streamOutputElement.SemanticIndex,
-                                    SemanticName = streamOutputElement.SemanticName,
-                                    StartComponent = streamOutputElement.StartComponent,
-                                    ComponentCount = streamOutputElement.ComponentCount,
-                                    OutputSlot = streamOutputElement.OutputSlot
-                                };
-                                soElements.Add(soElem);
-                            }
-                            // TODO GRAPHICS REFACTOR better cache
-                            geometryShader = new SharpDX.Direct3D11.GeometryShader(GraphicsDevice.NativeDevice, shaderBytecode, soElements.ToArray(), reflection.StreamOutputStrides, reflection.StreamOutputRasterizedStream);
-                        }
-                        else
-                        {
-                            geometryShader = pipelineStateCache.GeometryShaderCache.Instantiate(shaderBytecode);
-                        }
-                        break;
-                    case ShaderStage.Pixel:
-                        pixelShader = pipelineStateCache.PixelShaderCache.Instantiate(shaderBytecode);
-                        break;
-                    case ShaderStage.Compute:
-                        computeShader = pipelineStateCache.ComputeShaderCache.Instantiate(shaderBytecode);
-                        break;
-                }
-            }
-        }
-
-        // Small helper to cache SharpDX graphics objects
-        private class GraphicsCache<TSource, TKey, TValue> : IDisposable where TValue : SharpDX.IUnknown
-        {
-            private object lockObject = new object();
-
-            // Store instantiated objects
-            private readonly Dictionary<TKey, TValue> storage = new Dictionary<TKey, TValue>();
-            // Used for quick removal
-            private readonly Dictionary<TValue, TKey> reverse = new Dictionary<TValue, TKey>();
-
-            private readonly Dictionary<TValue, int> counter = new Dictionary<TValue, int>();
-
-            private readonly Func<TSource, TKey> computeKey;
-            private readonly Func<TSource, TValue> computeValue;
-
-            public GraphicsCache(Func<TSource, TKey> computeKey, Func<TSource, TValue> computeValue)
-            {
-                this.computeKey = computeKey;
-                this.computeValue = computeValue;
-            }
-
-            public TValue Instantiate(TSource source)
-            {
-                lock (lockObject)
-                {
-                    TValue value;
-                    var key = computeKey(source);
-                    if (!storage.TryGetValue(key, out value))
-                    {
-                        value = computeValue(source);
-                        storage.Add(key, value);
-                        reverse.Add(value, key);
-                        counter.Add(value, 1);
-                    }
-                    else
-                    {
-                        counter[value] = counter[value] + 1;
-                    }
-
-                    return value;
-                }
-            }
-
-            public void Release(TValue value)
-            {
-                // Should we remove it from the cache?
-                lock (lockObject)
-                {
-                    int refCount;
-                    if (!counter.TryGetValue(value, out refCount))
-                        return;
-
-                    counter[value] = --refCount;
-                    if (refCount == 0)
-                    {
-                        counter.Remove(value);
-                        reverse.Remove(value);
-                        TKey key;
-                        if (reverse.TryGetValue(value, out key))
-                        {
-                            storage.Remove(key);
-                        }
-
-                        value.Release();
-                    }
-                }
-            }
-
-            public void Dispose()
-            {
-                lock (lockObject)
-                {
-                    // Release everything
-                    foreach (var entry in reverse)
-                    {
-                        entry.Key.Release();
-                    }
-
-                    reverse.Clear();
-                    storage.Clear();
-                    counter.Clear();
-                }
-            }
-        }
-
-        private DevicePipelineStateCache GetPipelineStateCache()
-        {
-            return GraphicsDevice.GetOrCreateSharedData(GraphicsDeviceSharedDataType.PerDevice, typeof(DevicePipelineStateCache), device => new DevicePipelineStateCache(device));
-        }
-
-        // Caches
-        private class DevicePipelineStateCache : IDisposable
-        {
-            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.VertexShader> VertexShaderCache;
-            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.PixelShader> PixelShaderCache;
-            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.GeometryShader> GeometryShaderCache;
-            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.HullShader> HullShaderCache;
-            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.DomainShader> DomainShaderCache;
-            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.ComputeShader> ComputeShaderCache;
-            public readonly GraphicsCache<BlendStateDescription, BlendStateDescription, SharpDX.Direct3D11.BlendState> BlendStateCache;
-            public readonly GraphicsCache<RasterizerStateDescription, RasterizerStateDescription, SharpDX.Direct3D11.RasterizerState> RasterizerStateCache;
-            public readonly GraphicsCache<DepthStencilStateDescription, DepthStencilStateDescription, SharpDX.Direct3D11.DepthStencilState> DepthStencilStateCache;
-
-            public DevicePipelineStateCache(GraphicsDevice graphicsDevice)
-            {
-                // Shaders
-                VertexShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.VertexShader>(source => source.Id, source => new SharpDX.Direct3D11.VertexShader(graphicsDevice.NativeDevice, source));
-                PixelShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.PixelShader>(source => source.Id, source => new SharpDX.Direct3D11.PixelShader(graphicsDevice.NativeDevice, source));
-                GeometryShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.GeometryShader>(source => source.Id, source => new SharpDX.Direct3D11.GeometryShader(graphicsDevice.NativeDevice, source));
-                HullShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.HullShader>(source => source.Id, source => new SharpDX.Direct3D11.HullShader(graphicsDevice.NativeDevice, source));
-                DomainShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.DomainShader>(source => source.Id, source => new SharpDX.Direct3D11.DomainShader(graphicsDevice.NativeDevice, source));
-                ComputeShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.ComputeShader>(source => source.Id, source => new SharpDX.Direct3D11.ComputeShader(graphicsDevice.NativeDevice, source));
-
-                // States
-                BlendStateCache = new GraphicsCache<BlendStateDescription, BlendStateDescription, SharpDX.Direct3D11.BlendState>(source => source, source => new SharpDX.Direct3D11.BlendState(graphicsDevice.NativeDevice, CreateBlendState(source)));
-                RasterizerStateCache = new GraphicsCache<RasterizerStateDescription, RasterizerStateDescription, SharpDX.Direct3D11.RasterizerState>(source => source, source => new SharpDX.Direct3D11.RasterizerState(graphicsDevice.NativeDevice, CreateRasterizerState(source)));
-                DepthStencilStateCache = new GraphicsCache<DepthStencilStateDescription, DepthStencilStateDescription, SharpDX.Direct3D11.DepthStencilState>(source => source, source => new SharpDX.Direct3D11.DepthStencilState(graphicsDevice.NativeDevice, CreateDepthStencilState(source)));
-            }
-
-            private unsafe SharpDX.Direct3D11.BlendStateDescription CreateBlendState(BlendStateDescription description)
-            {
-                var nativeDescription = new SharpDX.Direct3D11.BlendStateDescription();
-
-                nativeDescription.AlphaToCoverageEnable = description.AlphaToCoverageEnable;
-                nativeDescription.IndependentBlendEnable = description.IndependentBlendEnable;
-
-                var renderTargets = &description.RenderTarget0;
-                for (int i = 0; i < 8; i++)
-                {
-                    nativeDescription.RenderTarget[i].IsBlendEnabled = renderTargets[i].BlendEnable;
-                    nativeDescription.RenderTarget[i].SourceBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].ColorSourceBlend;
-                    nativeDescription.RenderTarget[i].DestinationBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].ColorDestinationBlend;
-                    nativeDescription.RenderTarget[i].BlendOperation = (SharpDX.Direct3D11.BlendOperation)renderTargets[i].ColorBlendFunction;
-                    nativeDescription.RenderTarget[i].SourceAlphaBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].AlphaSourceBlend;
-                    nativeDescription.RenderTarget[i].DestinationAlphaBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].AlphaDestinationBlend;
-                    nativeDescription.RenderTarget[i].AlphaBlendOperation = (SharpDX.Direct3D11.BlendOperation)renderTargets[i].AlphaBlendFunction;
-                    nativeDescription.RenderTarget[i].RenderTargetWriteMask = (SharpDX.Direct3D11.ColorWriteMaskFlags)renderTargets[i].ColorWriteChannels;
-                }
-
-                return nativeDescription;
-            }
-
-            private SharpDX.Direct3D11.RasterizerStateDescription CreateRasterizerState(RasterizerStateDescription description)
-            {
-                SharpDX.Direct3D11.RasterizerStateDescription nativeDescription;
-
-                nativeDescription.CullMode = (SharpDX.Direct3D11.CullMode)description.CullMode;
-                nativeDescription.FillMode = (SharpDX.Direct3D11.FillMode)description.FillMode;
-                nativeDescription.IsFrontCounterClockwise = description.FrontFaceCounterClockwise;
-                nativeDescription.DepthBias = description.DepthBias;
-                nativeDescription.SlopeScaledDepthBias = description.SlopeScaleDepthBias;
-                nativeDescription.DepthBiasClamp = description.DepthBiasClamp;
-                nativeDescription.IsDepthClipEnabled = description.DepthClipEnable;
-                nativeDescription.IsScissorEnabled = description.ScissorTestEnable;
-                nativeDescription.IsMultisampleEnabled = description.MultisampleCount > MultisampleCount.None;
-                nativeDescription.IsAntialiasedLineEnabled = description.MultisampleAntiAliasLine;
-
-                return nativeDescription;
-            }
-
-            private SharpDX.Direct3D11.DepthStencilStateDescription CreateDepthStencilState(DepthStencilStateDescription description)
-            {
-                SharpDX.Direct3D11.DepthStencilStateDescription nativeDescription;
-
-                nativeDescription.IsDepthEnabled = description.DepthBufferEnable;
-                nativeDescription.DepthComparison = (SharpDX.Direct3D11.Comparison)description.DepthBufferFunction;
-                nativeDescription.DepthWriteMask = description.DepthBufferWriteEnable ? SharpDX.Direct3D11.DepthWriteMask.All : SharpDX.Direct3D11.DepthWriteMask.Zero;
-
-                nativeDescription.IsStencilEnabled = description.StencilEnable;
-                nativeDescription.StencilReadMask = description.StencilMask;
-                nativeDescription.StencilWriteMask = description.StencilWriteMask;
-
-                nativeDescription.FrontFace.FailOperation = (SharpDX.Direct3D11.StencilOperation)description.FrontFace.StencilFail;
-                nativeDescription.FrontFace.PassOperation = (SharpDX.Direct3D11.StencilOperation)description.FrontFace.StencilPass;
-                nativeDescription.FrontFace.DepthFailOperation = (SharpDX.Direct3D11.StencilOperation)description.FrontFace.StencilDepthBufferFail;
-                nativeDescription.FrontFace.Comparison = (SharpDX.Direct3D11.Comparison)description.FrontFace.StencilFunction;
-
-                nativeDescription.BackFace.FailOperation = (SharpDX.Direct3D11.StencilOperation)description.BackFace.StencilFail;
-                nativeDescription.BackFace.PassOperation = (SharpDX.Direct3D11.StencilOperation)description.BackFace.StencilPass;
-                nativeDescription.BackFace.DepthFailOperation = (SharpDX.Direct3D11.StencilOperation)description.BackFace.StencilDepthBufferFail;
-                nativeDescription.BackFace.Comparison = (SharpDX.Direct3D11.Comparison)description.BackFace.StencilFunction;
-
-                return nativeDescription;
-            }
-
-            public void Dispose()
-            {
-                VertexShaderCache.Dispose();
-                PixelShaderCache.Dispose();
-                GeometryShaderCache.Dispose();
-                HullShaderCache.Dispose();
-                DomainShaderCache.Dispose();
-                ComputeShaderCache.Dispose();
-                BlendStateCache.Dispose();
-                RasterizerStateCache.Dispose();
-                DepthStencilStateCache.Dispose();
-            }
-        }
-    }
-}
-#endif
+                    nativeDeviceContext.GeometryShader.Set(geometryShader);
+            }
+
+            if (blendState != previousPipeline.blendState || sampleMask != previousPipeline.sampleMask)
+            {
+                nativeDeviceContext.OutputMerger.SetBlendState(blendState, nativeDeviceContext.OutputMerger.BlendFactor, sampleMask);
+            }
+
+            if (rasterizerState != previousPipeline.rasterizerState)
+            {
+                nativeDeviceContext.Rasterizer.State = rasterizerState;
+            }
+
+            if (depthStencilState != previousPipeline.depthStencilState)
+            {
+                nativeDeviceContext.OutputMerger.DepthStencilState = depthStencilState;
+            }
+
+            if (inputLayout != previousPipeline.inputLayout)
+            {
+                nativeDeviceContext.InputAssembler.InputLayout = inputLayout;
+            }
+
+            if (primitiveTopology != previousPipeline.primitiveTopology)
+            {
+                nativeDeviceContext.InputAssembler.PrimitiveTopology = primitiveTopology;
+            }
+        }
+
+        protected internal override void OnDestroyed()
+        {
+            var pipelineStateCache = GetPipelineStateCache();
+
+            if (blendState != null)
+                pipelineStateCache.BlendStateCache.Release(blendState);
+            if (rasterizerState != null)
+                pipelineStateCache.RasterizerStateCache.Release(rasterizerState);
+            if (depthStencilState != null)
+                pipelineStateCache.DepthStencilStateCache.Release(depthStencilState);
+
+            if (vertexShader != null)
+                pipelineStateCache.VertexShaderCache.Release(vertexShader);
+            if (pixelShader != null)
+                pipelineStateCache.PixelShaderCache.Release(pixelShader);
+            if (geometryShader != null)
+                pipelineStateCache.GeometryShaderCache.Release(geometryShader);
+            if (hullShader != null)
+                pipelineStateCache.HullShaderCache.Release(hullShader);
+            if (domainShader != null)
+                pipelineStateCache.DomainShaderCache.Release(domainShader);
+            if (computeShader != null)
+                pipelineStateCache.ComputeShaderCache.Release(computeShader);
+
+            inputLayout?.Dispose();
+
+            base.OnDestroyed();
+        }
+
+        private void CreateInputLayout(InputElementDescription[] inputElements)
+        {
+            if (inputElements == null)
+                return;
+
+            var nativeInputElements = new SharpDX.Direct3D11.InputElement[inputElements.Length];
+            for (int index = 0; index < inputElements.Length; index++)
+            {
+                var inputElement = inputElements[index];
+                nativeInputElements[index] = new SharpDX.Direct3D11.InputElement
+                {
+                    Slot = inputElement.InputSlot,
+                    SemanticName = inputElement.SemanticName,
+                    SemanticIndex = inputElement.SemanticIndex,
+                    AlignedByteOffset = inputElement.AlignedByteOffset,
+                    Format = (SharpDX.DXGI.Format)inputElement.Format,
+                };
+            }
+            inputLayout = new SharpDX.Direct3D11.InputLayout(NativeDevice, inputSignature, nativeInputElements);
+        }
+
+        private void CreateShaders(DevicePipelineStateCache pipelineStateCache)
+        {
+            if (effectBytecode == null)
+                return;
+
+            foreach (var shaderBytecode in effectBytecode.Stages)
+            {
+                var reflection = effectBytecode.Reflection;
+
+                // TODO CACHE Shaders with a bytecode hash
+                switch (shaderBytecode.Stage)
+                {
+                    case ShaderStage.Vertex:
+                        vertexShader = pipelineStateCache.VertexShaderCache.Instantiate(shaderBytecode);
+                        // Note: input signature can be reused when reseting device since it only stores non-GPU data,
+                        // so just keep it if it has already been created before.
+                        if (inputSignature == null)
+                            inputSignature = shaderBytecode;
+                        break;
+                    case ShaderStage.Domain:
+                        domainShader = pipelineStateCache.DomainShaderCache.Instantiate(shaderBytecode);
+                        break;
+                    case ShaderStage.Hull:
+                        hullShader = pipelineStateCache.HullShaderCache.Instantiate(shaderBytecode);
+                        break;
+                    case ShaderStage.Geometry:
+                        if (reflection.ShaderStreamOutputDeclarations != null && reflection.ShaderStreamOutputDeclarations.Count > 0)
+                        {
+                            // stream out elements
+                            var soElements = new List<SharpDX.Direct3D11.StreamOutputElement>();
+                            foreach (var streamOutputElement in reflection.ShaderStreamOutputDeclarations)
+                            {
+                                var soElem = new SharpDX.Direct3D11.StreamOutputElement()
+                                {
+                                    Stream = streamOutputElement.Stream,
+                                    SemanticIndex = streamOutputElement.SemanticIndex,
+                                    SemanticName = streamOutputElement.SemanticName,
+                                    StartComponent = streamOutputElement.StartComponent,
+                                    ComponentCount = streamOutputElement.ComponentCount,
+                                    OutputSlot = streamOutputElement.OutputSlot
+                                };
+                                soElements.Add(soElem);
+                            }
+                            // TODO GRAPHICS REFACTOR better cache
+                            geometryShader = new SharpDX.Direct3D11.GeometryShader(GraphicsDevice.NativeDevice, shaderBytecode, soElements.ToArray(), reflection.StreamOutputStrides, reflection.StreamOutputRasterizedStream);
+                        }
+                        else
+                        {
+                            geometryShader = pipelineStateCache.GeometryShaderCache.Instantiate(shaderBytecode);
+                        }
+                        break;
+                    case ShaderStage.Pixel:
+                        pixelShader = pipelineStateCache.PixelShaderCache.Instantiate(shaderBytecode);
+                        break;
+                    case ShaderStage.Compute:
+                        computeShader = pipelineStateCache.ComputeShaderCache.Instantiate(shaderBytecode);
+                        break;
+                }
+            }
+        }
+
+        // Small helper to cache SharpDX graphics objects
+        private class GraphicsCache<TSource, TKey, TValue> : IDisposable where TValue : SharpDX.IUnknown
+        {
+            private object lockObject = new object();
+
+            // Store instantiated objects
+            private readonly Dictionary<TKey, TValue> storage = new Dictionary<TKey, TValue>();
+            // Used for quick removal
+            private readonly Dictionary<TValue, TKey> reverse = new Dictionary<TValue, TKey>();
+
+            private readonly Dictionary<TValue, int> counter = new Dictionary<TValue, int>();
+
+            private readonly Func<TSource, TKey> computeKey;
+            private readonly Func<TSource, TValue> computeValue;
+
+            public GraphicsCache(Func<TSource, TKey> computeKey, Func<TSource, TValue> computeValue)
+            {
+                this.computeKey = computeKey;
+                this.computeValue = computeValue;
+            }
+
+            public TValue Instantiate(TSource source)
+            {
+                lock (lockObject)
+                {
+                    TValue value;
+                    var key = computeKey(source);
+                    if (!storage.TryGetValue(key, out value))
+                    {
+                        value = computeValue(source);
+                        storage.Add(key, value);
+                        reverse.Add(value, key);
+                        counter.Add(value, 1);
+                    }
+                    else
+                    {
+                        counter[value] = counter[value] + 1;
+                    }
+
+                    return value;
+                }
+            }
+
+            public void Release(TValue value)
+            {
+                // Should we remove it from the cache?
+                lock (lockObject)
+                {
+                    int refCount;
+                    if (!counter.TryGetValue(value, out refCount))
+                        return;
+
+                    counter[value] = --refCount;
+                    if (refCount == 0)
+                    {
+                        counter.Remove(value);
+                        reverse.Remove(value);
+                        TKey key;
+                        if (reverse.TryGetValue(value, out key))
+                        {
+                            storage.Remove(key);
+                        }
+
+                        value.Release();
+                    }
+                }
+            }
+
+            public void Dispose()
+            {
+                lock (lockObject)
+                {
+                    // Release everything
+                    foreach (var entry in reverse)
+                    {
+                        entry.Key.Release();
+                    }
+
+                    reverse.Clear();
+                    storage.Clear();
+                    counter.Clear();
+                }
+            }
+        }
+
+        private DevicePipelineStateCache GetPipelineStateCache()
+        {
+            return GraphicsDevice.GetOrCreateSharedData(GraphicsDeviceSharedDataType.PerDevice, typeof(DevicePipelineStateCache), device => new DevicePipelineStateCache(device));
+        }
+
+        // Caches
+        private class DevicePipelineStateCache : IDisposable
+        {
+            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.VertexShader> VertexShaderCache;
+            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.PixelShader> PixelShaderCache;
+            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.GeometryShader> GeometryShaderCache;
+            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.HullShader> HullShaderCache;
+            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.DomainShader> DomainShaderCache;
+            public readonly GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.ComputeShader> ComputeShaderCache;
+            public readonly GraphicsCache<BlendStateDescription, BlendStateDescription, SharpDX.Direct3D11.BlendState> BlendStateCache;
+            public readonly GraphicsCache<RasterizerStateDescription, RasterizerStateDescription, SharpDX.Direct3D11.RasterizerState> RasterizerStateCache;
+            public readonly GraphicsCache<DepthStencilStateDescription, DepthStencilStateDescription, SharpDX.Direct3D11.DepthStencilState> DepthStencilStateCache;
+
+            public DevicePipelineStateCache(GraphicsDevice graphicsDevice)
+            {
+                // Shaders
+                VertexShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.VertexShader>(source => source.Id, source => new SharpDX.Direct3D11.VertexShader(graphicsDevice.NativeDevice, source));
+                PixelShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.PixelShader>(source => source.Id, source => new SharpDX.Direct3D11.PixelShader(graphicsDevice.NativeDevice, source));
+                GeometryShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.GeometryShader>(source => source.Id, source => new SharpDX.Direct3D11.GeometryShader(graphicsDevice.NativeDevice, source));
+                HullShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.HullShader>(source => source.Id, source => new SharpDX.Direct3D11.HullShader(graphicsDevice.NativeDevice, source));
+                DomainShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.DomainShader>(source => source.Id, source => new SharpDX.Direct3D11.DomainShader(graphicsDevice.NativeDevice, source));
+                ComputeShaderCache = new GraphicsCache<ShaderBytecode, ObjectId, SharpDX.Direct3D11.ComputeShader>(source => source.Id, source => new SharpDX.Direct3D11.ComputeShader(graphicsDevice.NativeDevice, source));
+
+                // States
+                BlendStateCache = new GraphicsCache<BlendStateDescription, BlendStateDescription, SharpDX.Direct3D11.BlendState>(source => source, source => new SharpDX.Direct3D11.BlendState(graphicsDevice.NativeDevice, CreateBlendState(source)));
+                RasterizerStateCache = new GraphicsCache<RasterizerStateDescription, RasterizerStateDescription, SharpDX.Direct3D11.RasterizerState>(source => source, source => new SharpDX.Direct3D11.RasterizerState(graphicsDevice.NativeDevice, CreateRasterizerState(source)));
+                DepthStencilStateCache = new GraphicsCache<DepthStencilStateDescription, DepthStencilStateDescription, SharpDX.Direct3D11.DepthStencilState>(source => source, source => new SharpDX.Direct3D11.DepthStencilState(graphicsDevice.NativeDevice, CreateDepthStencilState(source)));
+            }
+
+            private unsafe SharpDX.Direct3D11.BlendStateDescription CreateBlendState(BlendStateDescription description)
+            {
+                var nativeDescription = new SharpDX.Direct3D11.BlendStateDescription();
+
+                nativeDescription.AlphaToCoverageEnable = description.AlphaToCoverageEnable;
+                nativeDescription.IndependentBlendEnable = description.IndependentBlendEnable;
+
+                var renderTargets = &description.RenderTarget0;
+                for (int i = 0; i < 8; i++)
+                {
+                    nativeDescription.RenderTarget[i].IsBlendEnabled = renderTargets[i].BlendEnable;
+                    nativeDescription.RenderTarget[i].SourceBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].ColorSourceBlend;
+                    nativeDescription.RenderTarget[i].DestinationBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].ColorDestinationBlend;
+                    nativeDescription.RenderTarget[i].BlendOperation = (SharpDX.Direct3D11.BlendOperation)renderTargets[i].ColorBlendFunction;
+                    nativeDescription.RenderTarget[i].SourceAlphaBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].AlphaSourceBlend;
+                    nativeDescription.RenderTarget[i].DestinationAlphaBlend = (SharpDX.Direct3D11.BlendOption)renderTargets[i].AlphaDestinationBlend;
+                    nativeDescription.RenderTarget[i].AlphaBlendOperation = (SharpDX.Direct3D11.BlendOperation)renderTargets[i].AlphaBlendFunction;
+                    nativeDescription.RenderTarget[i].RenderTargetWriteMask = (SharpDX.Direct3D11.ColorWriteMaskFlags)renderTargets[i].ColorWriteChannels;
+                }
+
+                return nativeDescription;
+            }
+
+            private SharpDX.Direct3D11.RasterizerStateDescription CreateRasterizerState(RasterizerStateDescription description)
+            {
+                SharpDX.Direct3D11.RasterizerStateDescription nativeDescription;
+
+                nativeDescription.CullMode = (SharpDX.Direct3D11.CullMode)description.CullMode;
+                nativeDescription.FillMode = (SharpDX.Direct3D11.FillMode)description.FillMode;
+                nativeDescription.IsFrontCounterClockwise = description.FrontFaceCounterClockwise;
+                nativeDescription.DepthBias = description.DepthBias;
+                nativeDescription.SlopeScaledDepthBias = description.SlopeScaleDepthBias;
+                nativeDescription.DepthBiasClamp = description.DepthBiasClamp;
+                nativeDescription.IsDepthClipEnabled = description.DepthClipEnable;
+                nativeDescription.IsScissorEnabled = description.ScissorTestEnable;
+                nativeDescription.IsMultisampleEnabled = description.MultisampleCount > MultisampleCount.None;
+                nativeDescription.IsAntialiasedLineEnabled = description.MultisampleAntiAliasLine;
+
+                return nativeDescription;
+            }
+
+            private SharpDX.Direct3D11.DepthStencilStateDescription CreateDepthStencilState(DepthStencilStateDescription description)
+            {
+                SharpDX.Direct3D11.DepthStencilStateDescription nativeDescription;
+
+                nativeDescription.IsDepthEnabled = description.DepthBufferEnable;
+                nativeDescription.DepthComparison = (SharpDX.Direct3D11.Comparison)description.DepthBufferFunction;
+                nativeDescription.DepthWriteMask = description.DepthBufferWriteEnable ? SharpDX.Direct3D11.DepthWriteMask.All : SharpDX.Direct3D11.DepthWriteMask.Zero;
+
+                nativeDescription.IsStencilEnabled = description.StencilEnable;
+                nativeDescription.StencilReadMask = description.StencilMask;
+                nativeDescription.StencilWriteMask = description.StencilWriteMask;
+
+                nativeDescription.FrontFace.FailOperation = (SharpDX.Direct3D11.StencilOperation)description.FrontFace.StencilFail;
+                nativeDescription.FrontFace.PassOperation = (SharpDX.Direct3D11.StencilOperation)description.FrontFace.StencilPass;
+                nativeDescription.FrontFace.DepthFailOperation = (SharpDX.Direct3D11.StencilOperation)description.FrontFace.StencilDepthBufferFail;
+                nativeDescription.FrontFace.Comparison = (SharpDX.Direct3D11.Comparison)description.FrontFace.StencilFunction;
+
+                nativeDescription.BackFace.FailOperation = (SharpDX.Direct3D11.StencilOperation)description.BackFace.StencilFail;
+                nativeDescription.BackFace.PassOperation = (SharpDX.Direct3D11.StencilOperation)description.BackFace.StencilPass;
+                nativeDescription.BackFace.DepthFailOperation = (SharpDX.Direct3D11.StencilOperation)description.BackFace.StencilDepthBufferFail;
+                nativeDescription.BackFace.Comparison = (SharpDX.Direct3D11.Comparison)description.BackFace.StencilFunction;
+
+                return nativeDescription;
+            }
+
+            public void Dispose()
+            {
+                VertexShaderCache.Dispose();
+                PixelShaderCache.Dispose();
+                GeometryShaderCache.Dispose();
+                HullShaderCache.Dispose();
+                DomainShaderCache.Dispose();
+                ComputeShaderCache.Dispose();
+                BlendStateCache.Dispose();
+                RasterizerStateCache.Dispose();
+                DepthStencilStateCache.Dispose();
+            }
+        }
+    }
+}
+#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D/SharpDXInterop.cs b/sources/engine/Xenko.Graphics/Direct3D/SharpDXInterop.cs
index b87ecfaf30..375ef388af 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/SharpDXInterop.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/SharpDXInterop.cs
@@ -71,13 +71,14 @@ public static object GetNativeRenderTargetView(Texture texture)
         /// <param name="device">The GraphicsDevice in use</param>
         /// <param name="dxTexture2D">The DX11 texture</param>
         /// <param name="takeOwnership">If false AddRef will be called on the texture, if true will not, effectively taking ownership</param>
+        /// <param name="isSRgb">Set the format to SRgb</param>
         /// <returns></returns>
-        public static Texture CreateTextureFromNative(GraphicsDevice device, object dxTexture2D, bool takeOwnership)
+        public static Texture CreateTextureFromNative(GraphicsDevice device, object dxTexture2D, bool takeOwnership, bool isSRgb = false)
         {
 #if XENKO_GRAPHICS_API_DIRECT3D11
-            return CreateTextureFromNativeImpl(device, (Texture2D)dxTexture2D, takeOwnership);
+            return CreateTextureFromNativeImpl(device, (Texture2D)dxTexture2D, takeOwnership, isSRgb);
 #elif XENKO_GRAPHICS_API_DIRECT3D12
-            return CreateTextureFromNativeImpl(device, (Resource)dxTexture2D, takeOwnership);
+            return CreateTextureFromNativeImpl(device, (Resource)dxTexture2D, takeOwnership, isSRgb);
 #endif
         }
 
@@ -129,8 +130,9 @@ private static RenderTargetView GetNativeRenderTargetViewImpl(Texture texture)
         /// <param name="device">The GraphicsDevice in use</param>
         /// <param name="dxTexture2D">The DX11 texture</param>
         /// <param name="takeOwnership">If false AddRef will be called on the texture, if true will not, effectively taking ownership</param>
+        /// <param name="isSRgb">Set the format to SRgb</param>
         /// <returns></returns>
-        private static Texture CreateTextureFromNativeImpl(GraphicsDevice device, Texture2D dxTexture2D, bool takeOwnership)
+        private static Texture CreateTextureFromNativeImpl(GraphicsDevice device, Texture2D dxTexture2D, bool takeOwnership, bool isSRgb = false)
         {
             var tex = new Texture(device);
 
@@ -140,7 +142,7 @@ private static Texture CreateTextureFromNativeImpl(GraphicsDevice device, Textur
                 unknown.AddReference();
             }
 
-            tex.InitializeFromImpl(dxTexture2D, false);
+            tex.InitializeFromImpl(dxTexture2D, isSRgb);
 
             return tex;
         }
@@ -193,8 +195,9 @@ private static CpuDescriptorHandle GetNativeRenderTargetViewImpl(Texture texture
         /// <param name="device">The GraphicsDevice in use</param>
         /// <param name="dxTexture2D">The DX11 texture</param>
         /// <param name="takeOwnership">If false AddRef will be called on the texture, if true will not, effectively taking ownership</param>
+        /// <param name="isSRgb">Set the format to SRgb</param>
         /// <returns></returns>
-        private static Texture CreateTextureFromNativeImpl(GraphicsDevice device, Resource dxTexture2D, bool takeOwnership)
+        private static Texture CreateTextureFromNativeImpl(GraphicsDevice device, Resource dxTexture2D, bool takeOwnership, bool isSRgb = false)
         {
             var tex = new Texture(device);
 
@@ -204,7 +207,7 @@ private static Texture CreateTextureFromNativeImpl(GraphicsDevice device, Resour
                 unknown.AddReference();
             }
 
-            tex.InitializeFromImpl(dxTexture2D, false);
+            tex.InitializeFromImpl(dxTexture2D, isSRgb);
 
             return tex;
         }
diff --git a/sources/engine/Xenko.Graphics/Direct3D/SwapChainGraphicsPresenter.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/SwapChainGraphicsPresenter.Direct3D.cs
index 2c73a7c414..1551ff2248 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/SwapChainGraphicsPresenter.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/SwapChainGraphicsPresenter.Direct3D.cs
@@ -69,7 +69,7 @@ public SwapChainGraphicsPresenter(GraphicsDevice device, PresentationParameters
 
         public override object NativePresenter => swapChain;
 
-        public override bool IsFullScreen
+        public override bool InternalFullscreen
         {
             get
             {
@@ -125,7 +125,7 @@ public override bool IsFullScreen
                     swapChain.IsFullScreen = false;
 
                     // call 1) SwapChain.IsFullScreen 2) SwapChain.Resize
-                    Resize(backBuffer.ViewWidth, backBuffer.ViewHeight, backBuffer.ViewFormat);
+                    InternalResize(backBuffer.ViewWidth, backBuffer.ViewHeight, backBuffer.ViewFormat);
                 }
 
                 // If going to window mode: 
@@ -271,13 +271,16 @@ protected override void ResizeDepthStencilBuffer(int width, int height, PixelFor
         private FastList<Texture> DestroyChildrenTextures(Texture parentTexture)
         {
             var fastList = new FastList<Texture>();
-            foreach (var resource in GraphicsDevice.Resources)
+            lock (GraphicsDevice.Resources)
             {
-                var texture = resource as Texture;
-                if (texture != null && texture.ParentTexture == parentTexture)
+                foreach (var resource in GraphicsDevice.Resources)
                 {
-                    texture.OnDestroyed();
-                    fastList.Add(texture);
+                    var texture = resource as Texture;
+                    if (texture != null && texture.ParentTexture == parentTexture)
+                    {
+                        texture.OnDestroyed();
+                        fastList.Add(texture);
+                    }
                 }
             }
 
diff --git a/sources/engine/Xenko.Graphics/Direct3D/Texture.Direct3D.cs b/sources/engine/Xenko.Graphics/Direct3D/Texture.Direct3D.cs
index 7fbe1f42f1..6f668b3ae7 100644
--- a/sources/engine/Xenko.Graphics/Direct3D/Texture.Direct3D.cs
+++ b/sources/engine/Xenko.Graphics/Direct3D/Texture.Direct3D.cs
@@ -103,7 +103,24 @@ internal Texture InitializeFromImpl(Texture2D texture, bool isSrgb)
 
         internal Texture InitializeFromImpl(ShaderResourceView srv)
         {
-            return InitializeFromImpl(new Texture2D(srv.Resource.NativePointer), false);
+            if (srv.Description.Dimension == ShaderResourceViewDimension.Texture2D)
+            {
+                (srv as SharpDX.IUnknown)?.AddReference();
+                NativeShaderResourceView = srv;
+                var dxTexture2D = new Texture2D(srv.Resource.NativePointer);
+                NativeDeviceChild = dxTexture2D;
+
+                var newTextureDescription = ConvertFromNativeDescription(dxTexture2D.Description);
+                var newTextureViewDescription = new TextureViewDescription();
+                newTextureViewDescription.Format = (PixelFormat)srv.Description.Format;
+                newTextureViewDescription.Flags = newTextureDescription.Flags;
+
+                return InitializeFrom(null, newTextureDescription, newTextureViewDescription, null);
+            }
+            else
+            {
+                throw new NotImplementedException("Creating a texture from a SRV with dimension " + srv.Description.Dimension + " is not implemented");
+            }
         }
 
         internal void SwapInternal(Texture other)
@@ -151,7 +168,8 @@ private void InitializeFromImpl(DataBox[] dataBoxes = null)
                 GraphicsDevice.RegisterTextureMemoryUsage(SizeInBytes);
             }
 
-            NativeShaderResourceView = GetShaderResourceView(ViewType, ArraySlice, MipLevel);
+            if (NativeShaderResourceView == null)
+                NativeShaderResourceView = GetShaderResourceView(ViewType, ArraySlice, MipLevel);
             NativeUnorderedAccessView = GetUnorderedAccessView(ViewType, ArraySlice, MipLevel);
             NativeRenderTargetView = GetRenderTargetView(ViewType, ArraySlice, MipLevel);
             NativeDepthStencilView = GetDepthStencilView(out HasStencil);
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/Buffer.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/Buffer.Direct3D12.cs
deleted file mode 100644
index fae5325c23..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/Buffer.Direct3D12.cs
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using System.Collections.Generic;
-
-using SharpDX;
-using SharpDX.DXGI;
-using SharpDX.Direct3D12;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.Graphics
-{
-    public partial class Buffer
-    {
-        private SharpDX.Direct3D12.ResourceDescription nativeDescription;
-        internal long GPUVirtualAddress;
-        
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer" /> class.
-        /// </summary>
-        /// <param name="description">The description.</param>
-        /// <param name="viewFlags">Type of the buffer.</param>
-        /// <param name="viewFormat">The view format.</param>
-        /// <param name="dataPointer">The data pointer.</param>
-        protected Buffer InitializeFromImpl(BufferDescription description, BufferFlags viewFlags, PixelFormat viewFormat, IntPtr dataPointer)
-        {
-            bufferDescription = description;
-            nativeDescription = ConvertToNativeDescription(GraphicsDevice, Description);
-            ViewFlags = viewFlags;
-            InitCountAndViewFormat(out this.elementCount, ref viewFormat);
-            ViewFormat = viewFormat;
-            Recreate(dataPointer);
-
-            if (GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterBufferMemoryUsage(SizeInBytes);
-            }
-
-            return this;
-        }
-
-        /// <inheritdoc/>
-        protected internal override void OnDestroyed()
-        {
-            if (GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterBufferMemoryUsage(-SizeInBytes);
-            }
-
-            base.OnDestroyed();
-        }
-
-        /// <inheritdoc/>
-        protected internal override bool OnRecreate()
-        {
-            base.OnRecreate();
-
-            if (Description.Usage == GraphicsResourceUsage.Immutable
-                || Description.Usage == GraphicsResourceUsage.Default)
-                return false;
-
-            Recreate(IntPtr.Zero);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Explicitly recreate buffer with given data. Usually called after a <see cref="GraphicsDevice"/> reset.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="dataPointer"></param>
-        public void Recreate(IntPtr dataPointer)
-        {
-            // TODO D3D12 where should that go longer term? should it be precomputed for future use? (cost would likely be additional check on SetDescriptorSets/Draw)
-            NativeResourceState = ResourceStates.Common;
-            var bufferFlags = bufferDescription.BufferFlags;
-
-            if ((bufferFlags & BufferFlags.ConstantBuffer) != 0)
-                NativeResourceState |= ResourceStates.VertexAndConstantBuffer;
-
-            if ((bufferFlags & BufferFlags.IndexBuffer) != 0)
-                NativeResourceState |= ResourceStates.IndexBuffer;
-
-            if ((bufferFlags & BufferFlags.VertexBuffer) != 0)
-                NativeResourceState |= ResourceStates.VertexAndConstantBuffer;
-
-            if ((bufferFlags & BufferFlags.ShaderResource) != 0)
-                NativeResourceState |= ResourceStates.PixelShaderResource | ResourceStates.NonPixelShaderResource;
-
-            if ((bufferFlags & BufferFlags.StructuredBuffer) != 0)
-            {
-                if (bufferDescription.StructureByteStride <= 0)
-                    throw new ArgumentException("Element size cannot be less or equal 0 for structured buffer");
-            }
-
-            if ((bufferFlags & BufferFlags.ArgumentBuffer) == BufferFlags.ArgumentBuffer)
-                NativeResourceState |= ResourceStates.IndirectArgument;
-
-            var heapType = HeapType.Default;
-            if (Usage == GraphicsResourceUsage.Staging)
-            {
-                if (dataPointer != IntPtr.Zero)
-                    throw new NotImplementedException("D3D12: Staging buffers can't be created with initial data.");
-
-                heapType = HeapType.Readback;
-                NativeResourceState = ResourceStates.CopyDestination;
-            }
-            else if (Usage == GraphicsResourceUsage.Dynamic)
-            {
-                heapType = HeapType.Upload;
-                NativeResourceState = ResourceStates.GenericRead;
-            }
-
-            // TODO D3D12 move that to a global allocator in bigger committed resources
-            NativeDeviceChild = GraphicsDevice.NativeDevice.CreateCommittedResource(new HeapProperties(heapType), HeapFlags.None, nativeDescription, dataPointer != IntPtr.Zero ? ResourceStates.CopyDestination : NativeResourceState);
-            GPUVirtualAddress = NativeResource.GPUVirtualAddress;
-
-            if (dataPointer != IntPtr.Zero)
-            {
-                if (heapType == HeapType.Upload)
-                {
-                    var uploadMemory = NativeResource.Map(0);
-                    Utilities.CopyMemory(uploadMemory, dataPointer, SizeInBytes);
-                    NativeResource.Unmap(0);
-                }
-                else
-                {
-                    // Copy data in upload heap for later copy
-                    // TODO D3D12 move that to a shared upload heap
-                    SharpDX.Direct3D12.Resource uploadResource;
-                    int uploadOffset;
-                    var uploadMemory = GraphicsDevice.AllocateUploadBuffer(SizeInBytes, out uploadResource, out uploadOffset);
-                    Utilities.CopyMemory(uploadMemory, dataPointer, SizeInBytes);
-
-                    // TODO D3D12 lock NativeCopyCommandList usages
-                    var commandList = GraphicsDevice.NativeCopyCommandList;
-                    commandList.Reset(GraphicsDevice.NativeCopyCommandAllocator, null);
-                    // Copy from upload heap to actual resource
-                    commandList.CopyBufferRegion(NativeResource, 0, uploadResource, uploadOffset, SizeInBytes);
-
-                    // Switch resource to proper read state
-                    commandList.ResourceBarrierTransition(NativeResource, 0, ResourceStates.CopyDestination, NativeResourceState);
-
-                    commandList.Close();
-
-                    GraphicsDevice.WaitCopyQueue();
-                }
-            }
-
-            NativeShaderResourceView = GetShaderResourceView(ViewFormat);
-            NativeUnorderedAccessView = GetUnorderedAccessView(ViewFormat);
-        }
-
-        /// <summary>
-        /// Gets a <see cref="ShaderResourceView"/> for a particular <see cref="PixelFormat"/>.
-        /// </summary>
-        /// <param name="viewFormat">The view format.</param>
-        /// <returns>A <see cref="ShaderResourceView"/> for the particular view format.</returns>
-        /// <remarks>
-        /// The buffer must have been declared with <see cref="Graphics.BufferFlags.ShaderResource"/>. 
-        /// The ShaderResourceView instance is kept by this buffer and will be disposed when this buffer is disposed.
-        /// </remarks>
-        internal CpuDescriptorHandle GetShaderResourceView(PixelFormat viewFormat)
-        {
-            var srv = new CpuDescriptorHandle();
-            if ((ViewFlags & BufferFlags.ShaderResource) != 0)
-            {
-                var description = new ShaderResourceViewDescription
-                {
-                    Shader4ComponentMapping = 0x00001688,
-                    Format = (SharpDX.DXGI.Format)viewFormat,
-                    Dimension = SharpDX.Direct3D12.ShaderResourceViewDimension.Buffer,
-                    Buffer =
-                    {
-                        ElementCount = this.ElementCount,
-                        FirstElement = 0,
-                        Flags = BufferShaderResourceViewFlags.None,
-                        StructureByteStride = StructureByteStride,
-                    }
-                };
-
-                if (((ViewFlags & BufferFlags.RawBuffer) == BufferFlags.RawBuffer))
-                    description.Buffer.Flags |= BufferShaderResourceViewFlags.Raw;
-
-                srv = GraphicsDevice.ShaderResourceViewAllocator.Allocate(1);
-                NativeDevice.CreateShaderResourceView(NativeResource, description, srv);
-            }
-            return srv;
-        }
-
-        internal CpuDescriptorHandle GetUnorderedAccessView(PixelFormat viewFormat)
-        {
-            var uav = new CpuDescriptorHandle();
-            if ((ViewFlags & BufferFlags.UnorderedAccess) != 0)
-            {
-                var description = new UnorderedAccessViewDescription
-                {
-                    Format = (SharpDX.DXGI.Format)viewFormat,
-                    Dimension = SharpDX.Direct3D12.UnorderedAccessViewDimension.Buffer,
-                    Buffer =
-                    {
-                        ElementCount = this.ElementCount,
-                        FirstElement = 0,
-                        Flags = BufferUnorderedAccessViewFlags.None,
-                        StructureByteStride = StructureByteStride,
-                        CounterOffsetInBytes = 0,
-                    }
-                };
-
-                if ((ViewFlags & BufferFlags.RawBuffer) == BufferFlags.RawBuffer)
-                {
-                    description.Buffer.Flags |= BufferUnorderedAccessViewFlags.Raw;
-                    description.Format = Format.R32_Typeless;
-                }
-
-                uav = GraphicsDevice.UnorderedAccessViewAllocator.Allocate(1);
-
-                // TODO: manage counter value here if buffer has 'Counter' or 'Append' flag
-                // if (Flags == BufferFlags.StructuredAppendBuffer || Flags == BufferFlags.StructuredCounterBuffer))
-                NativeDevice.CreateUnorderedAccessView(NativeResource, null, description, uav);
-            }
-            return uav;
-        }
-
-        private void InitCountAndViewFormat(out int count, ref PixelFormat viewFormat)
-        {
-            if (Description.StructureByteStride == 0)
-            {
-                // TODO: The way to calculate the count is not always correct depending on the ViewFlags...etc.
-                if ((ViewFlags & BufferFlags.RawBuffer) != 0)
-                {
-                    count = Description.SizeInBytes / sizeof(int);
-                }
-                else if ((ViewFlags & BufferFlags.ShaderResource) != 0)
-                {
-                    count = Description.SizeInBytes / viewFormat.SizeInBytes();
-                }
-                else
-                {
-                    count = 0;
-                }
-            }
-            else
-            {
-                // For structured buffer
-                count = Description.SizeInBytes / Description.StructureByteStride;
-                viewFormat = PixelFormat.None;
-            }
-        }
-
-        private static SharpDX.Direct3D12.ResourceDescription ConvertToNativeDescription(GraphicsDevice graphicsDevice, BufferDescription bufferDescription)
-        {
-            var flags = ResourceFlags.None;
-            var size = bufferDescription.SizeInBytes;
-
-            // TODO D3D12 for now, ensure size is multiple of ConstantBufferDataPlacementAlignment (for cbuffer views)
-            size = MathUtil.AlignUp(size, graphicsDevice.ConstantBufferDataPlacementAlignment);
-
-            if ((bufferDescription.BufferFlags & BufferFlags.UnorderedAccess) != 0)
-                flags |= ResourceFlags.AllowUnorderedAccess;
-
-            return SharpDX.Direct3D12.ResourceDescription.Buffer(size, flags);
-        }
-    }
-} 
-#endif 
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/CommandList.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/CommandList.Direct3D12.cs
deleted file mode 100644
index 4728db8d93..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/CommandList.Direct3D12.cs
+++ /dev/null
@@ -1,1115 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using SharpDX;
-using SharpDX.Direct3D12;
-using SharpDX.Mathematics.Interop;
-using Xenko.Core.Mathematics;
-using Utilities = Xenko.Core.Utilities;
-
-namespace Xenko.Graphics
-{
-    public partial class CommandList
-    {
-        private DescriptorHeapCache srvHeap;
-        private int srvHeapOffset = GraphicsDevice.SrvHeapSize;
-        private DescriptorHeapCache samplerHeap;
-        private int samplerHeapOffset = GraphicsDevice.SamplerHeapSize;
-
-        private PipelineState boundPipelineState;
-        private readonly DescriptorHeap[] descriptorHeaps = new DescriptorHeap[2];
-        private readonly List<ResourceBarrier> resourceBarriers = new List<ResourceBarrier>(16);
-
-        private readonly Dictionary<long, GpuDescriptorHandle> srvMapping = new Dictionary<long, GpuDescriptorHandle>();
-        private readonly Dictionary<long, GpuDescriptorHandle> samplerMapping = new Dictionary<long, GpuDescriptorHandle>();
-
-        internal readonly Queue<GraphicsCommandList> NativeCommandLists = new Queue<GraphicsCommandList>();
-
-        private CompiledCommandList currentCommandList;
-        
-        private bool IsComputePipelineStateBound => boundPipelineState != null && boundPipelineState.IsCompute;
-
-        public static CommandList New(GraphicsDevice device)
-        {
-            return new CommandList(device);
-        }
-
-        private CommandList(GraphicsDevice device) : base(device)
-        {
-            Reset();
-        }
-
-        private void ResetCommandList()
-        {
-            if (NativeCommandLists.Count > 0)
-            {
-                currentCommandList.NativeCommandList = NativeCommandLists.Dequeue();
-                currentCommandList.NativeCommandList.Reset(currentCommandList.NativeCommandAllocator, null);
-            }
-            else
-            {
-                currentCommandList.NativeCommandList = GraphicsDevice.NativeDevice.CreateCommandList(CommandListType.Direct, currentCommandList.NativeCommandAllocator, null);
-            }
-
-            currentCommandList.NativeCommandList.SetDescriptorHeaps(2, descriptorHeaps);
-        }
-
-        /// <inheritdoc/>
-        protected internal override void OnDestroyed()
-        {
-            // Recycle heaps
-            ResetSrvHeap(false);
-            ResetSamplerHeap(false);
-
-            // Available right now (NextFenceValue - 1)
-            // TODO: Note that it won't be available right away because CommandAllocators is currently not using a PriorityQueue but a simple Queue
-            if (currentCommandList.NativeCommandAllocator != null)
-            {
-                GraphicsDevice.CommandAllocators.RecycleObject(GraphicsDevice.NextFenceValue - 1, currentCommandList.NativeCommandAllocator);
-                currentCommandList.NativeCommandAllocator = null;
-            }
-
-            if (currentCommandList.NativeCommandList != null)
-            {
-                NativeCommandLists.Enqueue(currentCommandList.NativeCommandList);
-                currentCommandList.NativeCommandList = null;
-            }
-
-            while (NativeCommandLists.Count > 0)
-            {
-                NativeCommandLists.Dequeue().Dispose();
-            }
-
-            base.OnDestroyed();
-        }
-
-        public void Reset()
-        {
-            if (currentCommandList.Builder != null)
-                return;
-
-            FlushResourceBarriers();
-            ResetSrvHeap(true);
-            ResetSamplerHeap(true);
-
-            // Clear descriptor mappings
-            srvMapping.Clear();
-            samplerMapping.Clear();
-
-            currentCommandList.Builder = this;
-            currentCommandList.SrvHeaps = GraphicsDevice.DescriptorHeapLists.Acquire();
-            currentCommandList.SamplerHeaps = GraphicsDevice.DescriptorHeapLists.Acquire();
-            currentCommandList.StagingResources = GraphicsDevice.StagingResourceLists.Acquire();
-
-            // Get a new allocator and unused command list
-            currentCommandList.NativeCommandAllocator = GraphicsDevice.CommandAllocators.GetObject();
-            ResetCommandList();
-
-            boundPipelineState = null;
-        }
-
-        /// <summary>
-        /// Closes the command list for recording and returns an executable token.
-        /// </summary>
-        /// <returns>The executable command list.</returns>
-        public CompiledCommandList Close()
-        {
-            FlushResourceBarriers();
-
-            currentCommandList.NativeCommandList.Close();
-
-            // Staging resources not updated anymore
-            foreach (var stagingResource in currentCommandList.StagingResources)
-            {
-                stagingResource.StagingBuilder = null;
-            }
-
-            // Recycle heaps
-            ResetSrvHeap(false);
-            ResetSamplerHeap(false);
-
-            var result = currentCommandList;
-            currentCommandList = default(CompiledCommandList);
-            return result;
-        }
-
-        /// <summary>
-        /// Closes and executes the command list.
-        /// </summary>
-        public void Flush()
-        {
-            GraphicsDevice.ExecuteCommandList(Close());
-        }
-
-        private void FlushInternal(bool wait)
-        {
-            var fenceValue = GraphicsDevice.ExecuteCommandListInternal(Close());
-
-            if (wait)
-                GraphicsDevice.WaitForFenceInternal(fenceValue);
-
-            Reset();
-
-            // Restore states
-            if (boundPipelineState != null)
-                SetPipelineState(boundPipelineState);
-            currentCommandList.NativeCommandList.SetDescriptorHeaps(2, descriptorHeaps);
-            SetRenderTargetsImpl(depthStencilBuffer, renderTargetCount, renderTargets);
-        }
-
-        private void ClearStateImpl()
-        {
-        }
-
-        /// <summary>
-        /// Unbinds all depth-stencil buffer and render targets from the output-merger stage.
-        /// </summary>
-        private void ResetTargetsImpl()
-        {
-        }
-
-        /// <summary>
-        /// Binds a depth-stencil buffer and a set of render targets to the output-merger stage. See <see cref="Textures+and+render+targets"/> to learn how to use it.
-        /// </summary>
-        /// <param name="depthStencilBuffer">The depth stencil buffer.</param>
-        /// <param name="renderTargets">The render targets.</param>
-        /// <exception cref="System.ArgumentNullException">renderTargetViews</exception>
-        private void SetRenderTargetsImpl(Texture depthStencilBuffer, int renderTargetCount, Texture[] renderTargets)
-        {
-            var renderTargetHandles = new CpuDescriptorHandle[renderTargetCount];
-            for (int i = 0; i < renderTargetHandles.Length; ++i)
-            {
-                renderTargetHandles[i] = renderTargets[i].NativeRenderTargetView;
-            }
-            currentCommandList.NativeCommandList.SetRenderTargets(renderTargetHandles, depthStencilBuffer?.NativeDepthStencilView);
-        }
-
-        /// <summary>
-        /// Sets the stream targets.
-        /// </summary>
-        /// <param name="buffers">The buffers.</param>
-        public void SetStreamTargets(params Buffer[] buffers)
-        {
-        }
-
-        /// <summary>
-        ///     Gets or sets the 1st viewport. See <see cref="Render+states"/> to learn how to use it.
-        /// </summary>
-        /// <value>The viewport.</value>
-        private void SetViewportImpl()
-        {
-            if (!viewportDirty && !scissorsDirty)
-                return;
-
-            var viewport = viewports[0];
-            if (viewportDirty)
-            {
-                currentCommandList.NativeCommandList.SetViewport(new RawViewportF { Width = viewport.Width, Height = viewport.Height, X = viewport.X, Y = viewport.Y, MinDepth = viewport.MinDepth, MaxDepth = viewport.MaxDepth });
-                currentCommandList.NativeCommandList.SetScissorRectangles(new RawRectangle { Left = (int)viewport.X, Right = (int)viewport.X + (int)viewport.Width, Top = (int)viewport.Y, Bottom = (int)viewport.Y + (int)viewport.Height });
-                viewportDirty = false;
-            }
-
-            if (boundPipelineState?.HasScissorEnabled ?? false)
-            {
-                if (scissorsDirty)
-                {
-                    // Use manual scissor
-                    var scissor = scissors[0];
-                    currentCommandList.NativeCommandList.SetScissorRectangles(new RawRectangle { Left = scissor.Left, Right = scissor.Right, Top = scissor.Top, Bottom = scissor.Bottom });
-                }
-            }
-            else
-            {
-                // Use viewport
-                // Always update, because either scissor or viewport was dirty and we use viewport size
-                currentCommandList.NativeCommandList.SetScissorRectangles(new RawRectangle { Left = (int)viewport.X, Right = (int)viewport.X + (int)viewport.Width, Top = (int)viewport.Y, Bottom = (int)viewport.Y + (int)viewport.Height });
-            }
-
-            scissorsDirty = false;
-        }
-
-        /// <summary>
-        ///     Prepares a draw call. This method is called before each Draw() method to setup the correct Primitive, InputLayout and VertexBuffers.
-        /// </summary>
-        /// <exception cref="System.InvalidOperationException">Cannot GraphicsDevice.Draw*() without an effect being previously applied with Effect.Apply() method</exception>
-        private void PrepareDraw()
-        {
-            FlushResourceBarriers();
-            SetViewportImpl();
-        }
-
-        public void SetStencilReference(int stencilReference)
-        {
-            currentCommandList.NativeCommandList.StencilReference = stencilReference;
-        }
-
-        public void SetBlendFactor(Color4 blendFactor)
-        {
-            currentCommandList.NativeCommandList.BlendFactor = ColorHelper.ConvertToVector4(blendFactor);
-        }
-
-        public void SetPipelineState(PipelineState pipelineState)
-        {
-            if (boundPipelineState != pipelineState && pipelineState?.CompiledState != null)
-            {
-                // If scissor state changed, force a refresh
-                scissorsDirty |= (boundPipelineState?.HasScissorEnabled ?? false) != pipelineState.HasScissorEnabled;
-
-                currentCommandList.NativeCommandList.PipelineState = pipelineState.CompiledState;
-                if (pipelineState.IsCompute)
-                    currentCommandList.NativeCommandList.SetComputeRootSignature(pipelineState.RootSignature);
-                else
-                    currentCommandList.NativeCommandList.SetGraphicsRootSignature(pipelineState.RootSignature);
-                boundPipelineState = pipelineState;
-                currentCommandList.NativeCommandList.PrimitiveTopology = pipelineState.PrimitiveTopology;
-            }
-        }
-
-        public void SetVertexBuffer(int index, Buffer buffer, int offset, int stride)
-        {
-            currentCommandList.NativeCommandList.SetVertexBuffer(index, new VertexBufferView
-            {
-                BufferLocation = buffer.NativeResource.GPUVirtualAddress + offset,
-                StrideInBytes = stride,
-                SizeInBytes = buffer.SizeInBytes - offset
-            });
-        }
-
-        public void SetIndexBuffer(Buffer buffer, int offset, bool is32Bits)
-        {
-            currentCommandList.NativeCommandList.SetIndexBuffer(buffer != null ? (IndexBufferView?)new IndexBufferView
-            {
-                BufferLocation = buffer.NativeResource.GPUVirtualAddress + offset,
-                Format = is32Bits ? SharpDX.DXGI.Format.R32_UInt : SharpDX.DXGI.Format.R16_UInt,
-                SizeInBytes = buffer.SizeInBytes - offset
-            } : null);
-        }
-
-        public void ResourceBarrierTransition(GraphicsResource resource, GraphicsResourceState newState)
-        {
-            // Find parent resource
-            if (resource.ParentResource != null)
-                resource = resource.ParentResource;
-
-            var targetState = (ResourceStates)newState;
-            if (resource.IsTransitionNeeded(targetState))
-            {
-                resourceBarriers.Add(new ResourceTransitionBarrier(resource.NativeResource, -1, resource.NativeResourceState, targetState));
-                resource.NativeResourceState = targetState;
-            }
-        }
-        
-        private unsafe void FlushResourceBarriers()
-        {
-            int count = resourceBarriers.Count;
-            if (count == 0)
-                return;
-
-            var barriers = stackalloc ResourceBarrier[count];
-            for (int i = 0; i < count; i++)
-                barriers[i] = resourceBarriers[i];
-            resourceBarriers.Clear();
-
-            currentCommandList.NativeCommandList.ResourceBarrier(*barriers);
-        }
-
-        public void SetDescriptorSets(int index, DescriptorSet[] descriptorSets)
-        {
-        RestartWithNewHeap:
-            var descriptorTableIndex = 0;
-            for (int i = 0; i < descriptorSets.Length; ++i)
-            {
-                // Find what is already mapped
-                var descriptorSet = descriptorSets[i];
-
-                var srvBindCount = boundPipelineState.SrvBindCounts[i];
-                var samplerBindCount = boundPipelineState.SamplerBindCounts[i];
-
-                if (srvBindCount > 0 && (IntPtr)descriptorSet.SrvStart.Ptr != IntPtr.Zero)
-                {
-                    GpuDescriptorHandle gpuSrvStart;
-
-                    // Check if we need to copy them to shader visible descriptor heap
-                    if (!srvMapping.TryGetValue(descriptorSet.SrvStart.Ptr, out gpuSrvStart))
-                    {
-                        var srvCount = descriptorSet.Description.SrvCount;
-
-                        // Make sure heap is big enough
-                        if (srvHeapOffset + srvCount > GraphicsDevice.SrvHeapSize)
-                        {
-                            ResetSrvHeap(true);
-                            currentCommandList.NativeCommandList.SetDescriptorHeaps(2, descriptorHeaps);
-                            goto RestartWithNewHeap;
-                        }
-
-                        // Copy
-                        NativeDevice.CopyDescriptorsSimple(srvCount, srvHeap.CPUDescriptorHandleForHeapStart + srvHeapOffset * GraphicsDevice.SrvHandleIncrementSize, descriptorSet.SrvStart, DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-
-                        // Store mapping
-                        srvMapping.Add(descriptorSet.SrvStart.Ptr, gpuSrvStart = srvHeap.GPUDescriptorHandleForHeapStart + srvHeapOffset * GraphicsDevice.SrvHandleIncrementSize);
-
-                        // Bump
-                        srvHeapOffset += srvCount;
-                    }
-
-                    // Bind resource tables (note: once per using stage, until we solve how to choose shader registers effect-wide at compile time)
-                    if (IsComputePipelineStateBound)
-                    {
-                        for (int j = 0; j < srvBindCount; ++j)
-                            currentCommandList.NativeCommandList.SetComputeRootDescriptorTable(descriptorTableIndex++, gpuSrvStart);
-                    }
-                    else
-                    {
-                        for (int j = 0; j < srvBindCount; ++j)
-                            currentCommandList.NativeCommandList.SetGraphicsRootDescriptorTable(descriptorTableIndex++, gpuSrvStart);
-                    }
-                }
-
-                if (samplerBindCount > 0 && (IntPtr)descriptorSet.SamplerStart.Ptr != IntPtr.Zero)
-                {
-                    GpuDescriptorHandle gpuSamplerStart;
-
-                    // Check if we need to copy them to shader visible descriptor heap
-                    if (!samplerMapping.TryGetValue(descriptorSet.SamplerStart.Ptr, out gpuSamplerStart))
-                    {
-                        var samplerCount = descriptorSet.Description.SamplerCount;
-
-                        // Make sure heap is big enough
-                        if (samplerHeapOffset + samplerCount > GraphicsDevice.SamplerHeapSize)
-                        {
-                            ResetSamplerHeap(true);
-                            currentCommandList.NativeCommandList.SetDescriptorHeaps(2, descriptorHeaps);
-                            goto RestartWithNewHeap;
-                        }
-
-                        // Copy
-                        NativeDevice.CopyDescriptorsSimple(samplerCount, samplerHeap.CPUDescriptorHandleForHeapStart + samplerHeapOffset * GraphicsDevice.SamplerHandleIncrementSize, descriptorSet.SamplerStart, DescriptorHeapType.Sampler);
-
-                        // Store mapping
-                        samplerMapping.Add(descriptorSet.SamplerStart.Ptr, gpuSamplerStart = samplerHeap.GPUDescriptorHandleForHeapStart + samplerHeapOffset * GraphicsDevice.SamplerHandleIncrementSize);
-
-                        // Bump
-                        samplerHeapOffset += samplerCount;
-                    }
-
-                    // Bind resource tables (note: once per using stage, until we solve how to choose shader registers effect-wide at compile time)
-                    if (IsComputePipelineStateBound)
-                    {
-                        for (int j = 0; j < samplerBindCount; ++j)
-                            currentCommandList.NativeCommandList.SetComputeRootDescriptorTable(descriptorTableIndex++, gpuSamplerStart);
-                    }
-                    else
-                    {
-                        for (int j = 0; j < samplerBindCount; ++j)
-                            currentCommandList.NativeCommandList.SetGraphicsRootDescriptorTable(descriptorTableIndex++, gpuSamplerStart);
-                    }
-                }
-            }
-        }
-
-        private void ResetSrvHeap(bool createNewHeap)
-        {
-            if (srvHeap.Heap != null)
-            {
-                currentCommandList.SrvHeaps.Add(srvHeap.Heap);
-                srvHeap.Heap = null;
-            }
-
-            if (createNewHeap)
-            {
-                srvHeap = new DescriptorHeapCache(GraphicsDevice.SrvHeaps.GetObject());
-                srvHeapOffset = 0;
-                srvMapping.Clear();
-            }
-
-            descriptorHeaps[0] = srvHeap.Heap;
-        }
-
-        private void ResetSamplerHeap(bool createNewHeap)
-        {
-            if (samplerHeap.Heap != null)
-            {
-                currentCommandList.SamplerHeaps.Add(samplerHeap.Heap);
-                samplerHeap.Heap = null;
-            }
-
-            if (createNewHeap)
-            {
-                samplerHeap = new DescriptorHeapCache(GraphicsDevice.SamplerHeaps.GetObject());
-                samplerHeapOffset = 0;
-                samplerMapping.Clear();
-            }
-
-            descriptorHeaps[1] = samplerHeap.Heap;
-        }
-
-        /// <inheritdoc />
-        public void Dispatch(int threadCountX, int threadCountY, int threadCountZ)
-        {
-            PrepareDraw();
-
-            currentCommandList.NativeCommandList.Dispatch(threadCountX, threadCountY, threadCountZ);
-        }
-
-        /// <summary>
-        /// Dispatches the specified indirect buffer.
-        /// </summary>
-        /// <param name="indirectBuffer">The indirect buffer.</param>
-        /// <param name="offsetInBytes">The offset information bytes.</param>
-        public void Dispatch(Buffer indirectBuffer, int offsetInBytes)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Draw non-indexed, non-instanced primitives.
-        /// </summary>
-        /// <param name="vertexCount">Number of vertices to draw.</param>
-        /// <param name="startVertexLocation">Index of the first vertex, which is usually an offset in a vertex buffer; it could also be used as the first vertex id generated for a shader parameter marked with the <strong>SV_TargetId</strong> system-value semantic.</param>
-        public void Draw(int vertexCount, int startVertexLocation = 0)
-        {
-            PrepareDraw();
-
-            currentCommandList.NativeCommandList.DrawInstanced(vertexCount, 1, startVertexLocation, 0);
-
-            GraphicsDevice.FrameTriangleCount += (uint)vertexCount;
-            GraphicsDevice.FrameDrawCalls++;
-        }
-
-        /// <summary>
-        /// Draw geometry of an unknown size.
-        /// </summary>
-        public void DrawAuto()
-        {
-            PrepareDraw();
-            
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        /// Draw indexed, non-instanced primitives.
-        /// </summary>
-        /// <param name="indexCount">Number of indices to draw.</param>
-        /// <param name="startIndexLocation">The location of the first index read by the GPU from the index buffer.</param>
-        /// <param name="baseVertexLocation">A value added to each index before reading a vertex from the vertex buffer.</param>
-        public void DrawIndexed(int indexCount, int startIndexLocation = 0, int baseVertexLocation = 0)
-        {
-            PrepareDraw();
-
-            currentCommandList.NativeCommandList.DrawIndexedInstanced(indexCount, 1, startIndexLocation, baseVertexLocation, 0);
-
-            GraphicsDevice.FrameDrawCalls++;
-            GraphicsDevice.FrameTriangleCount += (uint)indexCount;
-        }
-
-        /// <summary>
-        /// Draw indexed, instanced primitives.
-        /// </summary>
-        /// <param name="indexCountPerInstance">Number of indices read from the index buffer for each instance.</param>
-        /// <param name="instanceCount">Number of instances to draw.</param>
-        /// <param name="startIndexLocation">The location of the first index read by the GPU from the index buffer.</param>
-        /// <param name="baseVertexLocation">A value added to each index before reading a vertex from the vertex buffer.</param>
-        /// <param name="startInstanceLocation">A value added to each index before reading per-instance data from a vertex buffer.</param>
-        public void DrawIndexedInstanced(int indexCountPerInstance, int instanceCount, int startIndexLocation = 0, int baseVertexLocation = 0, int startInstanceLocation = 0)
-        {
-            PrepareDraw();
-
-            currentCommandList.NativeCommandList.DrawIndexedInstanced(indexCountPerInstance, instanceCount, startIndexLocation, baseVertexLocation, startInstanceLocation);
-
-            GraphicsDevice.FrameDrawCalls++;
-            GraphicsDevice.FrameTriangleCount += (uint)(indexCountPerInstance * instanceCount);
-        }
-
-        /// <summary>
-        /// Draw indexed, instanced, GPU-generated primitives.
-        /// </summary>
-        /// <param name="argumentsBuffer">A buffer containing the GPU generated primitives.</param>
-        /// <param name="alignedByteOffsetForArgs">Offset in <em>pBufferForArgs</em> to the start of the GPU generated primitives.</param>
-        public void DrawIndexedInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs = 0)
-        {
-            if (argumentsBuffer == null) throw new ArgumentNullException("argumentsBuffer");
-
-            PrepareDraw();
-
-            //NativeDeviceContext.DrawIndexedInstancedIndirect(argumentsBuffer.NativeBuffer, alignedByteOffsetForArgs);
-            throw new NotImplementedException();
-
-            GraphicsDevice.FrameDrawCalls++;
-        }
-
-        /// <summary>
-        /// Draw non-indexed, instanced primitives.
-        /// </summary>
-        /// <param name="vertexCountPerInstance">Number of vertices to draw.</param>
-        /// <param name="instanceCount">Number of instances to draw.</param>
-        /// <param name="startVertexLocation">Index of the first vertex.</param>
-        /// <param name="startInstanceLocation">A value added to each index before reading per-instance data from a vertex buffer.</param>
-        public void DrawInstanced(int vertexCountPerInstance, int instanceCount, int startVertexLocation = 0, int startInstanceLocation = 0)
-        {
-            PrepareDraw();
-
-            currentCommandList.NativeCommandList.DrawInstanced(vertexCountPerInstance, instanceCount, startVertexLocation, startInstanceLocation);
-
-            GraphicsDevice.FrameDrawCalls++;
-            GraphicsDevice.FrameTriangleCount += (uint)(vertexCountPerInstance * instanceCount);
-        }
-
-        /// <summary>
-        /// Draw instanced, GPU-generated primitives.
-        /// </summary>
-        /// <param name="argumentsBuffer">An arguments buffer</param>
-        /// <param name="alignedByteOffsetForArgs">Offset in <em>pBufferForArgs</em> to the start of the GPU generated primitives.</param>
-        public void DrawInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs = 0)
-        {
-            if (argumentsBuffer == null) throw new ArgumentNullException("argumentsBuffer");
-
-            PrepareDraw();
-
-            //NativeDeviceContext.DrawIndexedInstancedIndirect(argumentsBuffer.NativeBuffer, alignedByteOffsetForArgs);
-            throw new NotImplementedException();
-
-            GraphicsDevice.FrameDrawCalls++;
-        }
-
-        /// <summary>
-        /// Begins profiling.
-        /// </summary>
-        /// <param name="profileColor">Color of the profile.</param>
-        /// <param name="name">The name.</param>
-        public void BeginProfile(Color4 profileColor, string name)
-        {
-            //currentCommandList.NativeCommandList.BeginEvent();
-        }
-
-        /// <summary>
-        /// Ends profiling.
-        /// </summary>
-        public void EndProfile()
-        {
-            //currentCommandList.NativeCommandList.EndEvent();
-        }
-
-        /// <summary>
-        /// Submit a timestamp query.
-        /// </summary>
-        /// <param name="queryPool">The QueryPool owning the query.</param>
-        /// <param name="index">The query index.</param>
-        public void WriteTimestamp(QueryPool queryPool, int index)
-        {
-            currentCommandList.NativeCommandList.EndQuery(queryPool.NativeQueryHeap, SharpDX.Direct3D12.QueryType.Timestamp, index);
-            queryPool.PendingValue = queryPool.CompletedValue + 1;
-        }
-
-        public void ResetQueryPool(QueryPool queryPool)
-        {
-        }
-
-        /// <summary>
-        /// Clears the specified depth stencil buffer. See <see cref="Textures+and+render+targets"/> to learn how to use it.
-        /// </summary>
-        /// <param name="depthStencilBuffer">The depth stencil buffer.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="depth">The depth.</param>
-        /// <param name="stencil">The stencil.</param>
-        /// <exception cref="System.InvalidOperationException"></exception>
-        public void Clear(Texture depthStencilBuffer, DepthStencilClearOptions options, float depth = 1, byte stencil = 0)
-        {
-            ResourceBarrierTransition(GraphicsDevice.Presenter.DepthStencilBuffer, GraphicsResourceState.DepthWrite);
-            FlushResourceBarriers();
-            currentCommandList.NativeCommandList.ClearDepthStencilView(depthStencilBuffer.NativeDepthStencilView, (ClearFlags)options, depth, stencil);
-        }
-
-        /// <summary>
-        /// Clears the specified render target. See <see cref="Textures+and+render+targets"/> to learn how to use it.
-        /// </summary>
-        /// <param name="renderTarget">The render target.</param>
-        /// <param name="color">The color.</param>
-        /// <exception cref="System.ArgumentNullException">renderTarget</exception>
-        public unsafe void Clear(Texture renderTarget, Color4 color)
-        {
-            ResourceBarrierTransition(renderTarget, GraphicsResourceState.RenderTarget);
-            FlushResourceBarriers();
-            currentCommandList.NativeCommandList.ClearRenderTargetView(renderTarget.NativeRenderTargetView, *(RawColor4*)&color);
-        }
-
-        /// <summary>
-        /// Clears a read-write Buffer. This buffer must have been created with read-write/unordered access.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="value">The value.</param>
-        /// <exception cref="System.ArgumentNullException">buffer</exception>
-        /// <exception cref="System.ArgumentException">Expecting buffer supporting UAV;buffer</exception>
-        public unsafe void ClearReadWrite(Buffer buffer, Vector4 value)
-        {
-            if (buffer == null) throw new ArgumentNullException(nameof(buffer));
-            if (buffer.NativeUnorderedAccessView.Ptr == PointerSize.Zero) throw new ArgumentException("Expecting buffer supporting UAV", nameof(buffer));
-
-            var cpuHandle = buffer.NativeUnorderedAccessView;
-            var gpuHandle = GetGpuDescriptorHandle(cpuHandle);
-            currentCommandList.NativeCommandList.ClearUnorderedAccessViewFloat(gpuHandle, cpuHandle, buffer.NativeResource, *(RawVector4*)&value, 0, null);
-        }
-
-        /// <summary>
-        /// Clears a read-write Buffer. This buffer must have been created with read-write/unordered access.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="value">The value.</param>
-        /// <exception cref="System.ArgumentNullException">buffer</exception>
-        /// <exception cref="System.ArgumentException">Expecting buffer supporting UAV;buffer</exception>
-        public unsafe void ClearReadWrite(Buffer buffer, Int4 value)
-        {
-            if (buffer == null) throw new ArgumentNullException(nameof(buffer));
-            if (buffer.NativeUnorderedAccessView.Ptr == PointerSize.Zero) throw new ArgumentException("Expecting buffer supporting UAV", nameof(buffer));
-
-            var cpuHandle = buffer.NativeUnorderedAccessView;
-            var gpuHandle = GetGpuDescriptorHandle(cpuHandle);
-            currentCommandList.NativeCommandList.ClearUnorderedAccessViewUint(gpuHandle, cpuHandle, buffer.NativeResource, *(RawInt4*)&value, 0, null);
-        }
-
-        /// <summary>
-        /// Clears a read-write Buffer. This buffer must have been created with read-write/unordered access.
-        /// </summary>
-        /// <param name="buffer">The buffer.</param>
-        /// <param name="value">The value.</param>
-        /// <exception cref="System.ArgumentNullException">buffer</exception>
-        /// <exception cref="System.ArgumentException">Expecting buffer supporting UAV;buffer</exception>
-        public unsafe void ClearReadWrite(Buffer buffer, UInt4 value)
-        {
-            if (buffer == null) throw new ArgumentNullException(nameof(buffer));
-            if (buffer.NativeUnorderedAccessView.Ptr == PointerSize.Zero) throw new ArgumentException("Expecting buffer supporting UAV", nameof(buffer));
-
-            var cpuHandle = buffer.NativeUnorderedAccessView;
-            var gpuHandle = GetGpuDescriptorHandle(cpuHandle);
-            currentCommandList.NativeCommandList.ClearUnorderedAccessViewUint(gpuHandle, cpuHandle, buffer.NativeResource, *(RawInt4*)&value, 0, null);
-        }
-
-        /// <summary>
-        /// Clears a read-write Texture. This texture must have been created with read-write/unordered access.
-        /// </summary>
-        /// <param name="texture">The texture.</param>
-        /// <param name="value">The value.</param>
-        /// <exception cref="System.ArgumentNullException">texture</exception>
-        /// <exception cref="System.ArgumentException">Expecting texture supporting UAV;texture</exception>
-        public unsafe void ClearReadWrite(Texture texture, Vector4 value)
-        {
-            if (texture == null) throw new ArgumentNullException(nameof(texture));
-            if (texture.NativeUnorderedAccessView.Ptr == PointerSize.Zero) throw new ArgumentException("Expecting texture supporting UAV", nameof(texture));
-
-            var cpuHandle = texture.NativeUnorderedAccessView;
-            var gpuHandle = GetGpuDescriptorHandle(cpuHandle);
-            currentCommandList.NativeCommandList.ClearUnorderedAccessViewFloat(gpuHandle, cpuHandle, texture.NativeResource, *(RawVector4*)&value, 0, null);
-        }
-
-        /// <summary>
-        /// Clears a read-write Texture. This texture must have been created with read-write/unordered access.
-        /// </summary>
-        /// <param name="texture">The texture.</param>
-        /// <param name="value">The value.</param>
-        /// <exception cref="System.ArgumentNullException">texture</exception>
-        /// <exception cref="System.ArgumentException">Expecting texture supporting UAV;texture</exception>
-        public unsafe void ClearReadWrite(Texture texture, Int4 value)
-        {
-            if (texture == null) throw new ArgumentNullException(nameof(texture));
-            if (texture.NativeUnorderedAccessView.Ptr == PointerSize.Zero) throw new ArgumentException("Expecting texture supporting UAV", nameof(texture));
-
-            var cpuHandle = texture.NativeUnorderedAccessView;
-            var gpuHandle = GetGpuDescriptorHandle(cpuHandle);
-            currentCommandList.NativeCommandList.ClearUnorderedAccessViewUint(gpuHandle, cpuHandle, texture.NativeResource, *(RawInt4*)&value, 0, null);
-        }
-
-        /// <summary>
-        /// Clears a read-write Texture. This texture must have been created with read-write/unordered access.
-        /// </summary>
-        /// <param name="texture">The texture.</param>
-        /// <param name="value">The value.</param>
-        /// <exception cref="System.ArgumentNullException">texture</exception>
-        /// <exception cref="System.ArgumentException">Expecting texture supporting UAV;texture</exception>
-        public unsafe void ClearReadWrite(Texture texture, UInt4 value)
-        {
-            if (texture == null) throw new ArgumentNullException(nameof(texture));
-            if (texture.NativeUnorderedAccessView.Ptr == PointerSize.Zero) throw new ArgumentException("Expecting texture supporting UAV", nameof(texture));
-
-            var cpuHandle = texture.NativeUnorderedAccessView;
-            var gpuHandle = GetGpuDescriptorHandle(cpuHandle);
-            currentCommandList.NativeCommandList.ClearUnorderedAccessViewUint(gpuHandle, cpuHandle, texture.NativeResource, *(RawInt4*)&value, 0, null);
-        }
-
-        private GpuDescriptorHandle GetGpuDescriptorHandle(CpuDescriptorHandle cpuHandle)
-        {
-            GpuDescriptorHandle result;
-            if (!srvMapping.TryGetValue(cpuHandle.Ptr, out result))
-            {
-                var srvCount = 1;
-
-                // Make sure heap is big enough
-                if (srvHeapOffset + srvCount > GraphicsDevice.SrvHeapSize)
-                {
-                    ResetSrvHeap(true);
-                    currentCommandList.NativeCommandList.SetDescriptorHeaps(2, descriptorHeaps);
-                }
-
-                // Copy
-                NativeDevice.CopyDescriptorsSimple(srvCount, srvHeap.CPUDescriptorHandleForHeapStart + srvHeapOffset * GraphicsDevice.SrvHandleIncrementSize, cpuHandle, DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-
-                // Store mapping
-                srvMapping.Add(cpuHandle.Ptr, result = srvHeap.GPUDescriptorHandleForHeapStart + srvHeapOffset * GraphicsDevice.SrvHandleIncrementSize);
-
-                // Bump
-                srvHeapOffset += srvCount;
-            }
-
-            return result;
-        }
-
-        public void Copy(GraphicsResource source, GraphicsResource destination)
-        {
-            // Copy texture -> texture
-            if (source is Texture sourceTexture && destination is Texture destinationTexture)
-            {
-                var sourceParent = sourceTexture.ParentTexture ?? sourceTexture;
-                var destinationParent = destinationTexture.ParentTexture ?? destinationTexture;
-                
-                if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
-                {
-                    // Copy staging texture -> staging texture
-                    if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
-                    {
-                        var size = destinationTexture.ComputeBufferTotalSize();
-                        var destinationMapped = destinationTexture.NativeResource.Map(0);
-                        var sourceMapped = sourceTexture.NativeResource.Map(0, new Range { Begin = 0, End = size });
-
-                        Utilities.CopyMemory(destinationMapped, sourceMapped, size);
-
-                        sourceTexture.NativeResource.Unmap(0);
-                        destinationTexture.NativeResource.Unmap(0);
-                    }
-                    else
-                    {
-                        ResourceBarrierTransition(sourceTexture, GraphicsResourceState.CopySource);
-                        ResourceBarrierTransition(destinationTexture, GraphicsResourceState.CopyDestination);
-                        FlushResourceBarriers();
-
-                        int copyOffset = 0;
-                        for (int arraySlice = 0; arraySlice < sourceParent.ArraySize; ++arraySlice)
-                        {
-                            for (int mipLevel = 0; mipLevel < sourceParent.MipLevels; ++mipLevel)
-                            {
-                                currentCommandList.NativeCommandList.CopyTextureRegion(new TextureCopyLocation(destinationTexture.NativeResource,
-                                    new PlacedSubResourceFootprint
-                                    {
-                                        Footprint =
-                                        {
-                                            Width = Texture.CalculateMipSize(destinationTexture.Width, mipLevel),
-                                            Height = Texture.CalculateMipSize(destinationTexture.Height, mipLevel),
-                                            Depth = Texture.CalculateMipSize(destinationTexture.Depth, mipLevel),
-                                            Format = (SharpDX.DXGI.Format)destinationTexture.Format,
-                                            RowPitch = destinationTexture.ComputeRowPitch(mipLevel),
-                                        },
-                                        Offset = copyOffset,
-                                    }), 0, 0, 0, new TextureCopyLocation(sourceTexture.NativeResource, arraySlice * sourceParent.MipLevels + mipLevel), null);
-
-                                copyOffset += destinationTexture.ComputeSubresourceSize(mipLevel);
-                            }
-                        }
-                    }
-
-                    // Fence for host access
-                    destinationParent.StagingFenceValue = null;
-                    destinationParent.StagingBuilder = this;
-                    currentCommandList.StagingResources.Add(destinationParent);
-                }
-                else
-                {
-                    ResourceBarrierTransition(sourceTexture, GraphicsResourceState.CopySource);
-                    ResourceBarrierTransition(destinationTexture, GraphicsResourceState.CopyDestination);
-                    FlushResourceBarriers();
-
-                    currentCommandList.NativeCommandList.CopyResource(destinationTexture.NativeResource, sourceTexture.NativeResource);
-                }
-            }
-            // Copy buffer -> buffer
-            else if (source is Buffer sourceBuffer && destination is Buffer destinationBuffer)
-            {
-                ResourceBarrierTransition(sourceBuffer, GraphicsResourceState.CopySource);
-                ResourceBarrierTransition(destinationBuffer, GraphicsResourceState.CopyDestination);
-                FlushResourceBarriers();
-
-                currentCommandList.NativeCommandList.CopyResource(destinationBuffer.NativeResource, sourceBuffer.NativeResource);
-
-                if (destinationBuffer.Usage == GraphicsResourceUsage.Staging)
-                {
-                    // Fence for host access
-                    destinationBuffer.StagingFenceValue = null;
-                    destinationBuffer.StagingBuilder = this;
-                    currentCommandList.StagingResources.Add(destinationBuffer);
-                }
-            }
-            else
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        public void CopyMultisample(Texture sourceMultisampleTexture, int sourceSubResource, Texture destTexture, int destSubResource, PixelFormat format = PixelFormat.None)
-        {
-            if (sourceMultisampleTexture == null) throw new ArgumentNullException(nameof(sourceMultisampleTexture));
-            if (destTexture == null) throw new ArgumentNullException(nameof(destTexture));
-            if (!sourceMultisampleTexture.IsMultisample) throw new ArgumentOutOfRangeException(nameof(sourceMultisampleTexture), "Source texture is not a MSAA texture");
-
-            currentCommandList.NativeCommandList.ResolveSubresource(sourceMultisampleTexture.NativeResource, sourceSubResource, destTexture.NativeResource, destSubResource, (SharpDX.DXGI.Format)(format == PixelFormat.None ? destTexture.Format : format));
-        }
-
-        public void CopyRegion(GraphicsResource source, int sourceSubresource, ResourceRegion? sourceRegion, GraphicsResource destination, int destinationSubResource, int dstX = 0, int dstY = 0, int dstZ = 0)
-        {
-            if (source is Texture sourceTexture && destination is Texture destinationTexture)
-            {
-                if (sourceTexture.Usage == GraphicsResourceUsage.Staging || destinationTexture.Usage == GraphicsResourceUsage.Staging)
-                {
-                    throw new NotImplementedException("Copy region of staging resources is not supported yet");
-                }
-
-                ResourceBarrierTransition(source, GraphicsResourceState.CopySource);
-                ResourceBarrierTransition(destination, GraphicsResourceState.CopyDestination);
-                FlushResourceBarriers();
-
-                currentCommandList.NativeCommandList.CopyTextureRegion(
-                    new TextureCopyLocation(destination.NativeResource, destinationSubResource),
-                    dstX, dstY, dstZ,
-                    new TextureCopyLocation(source.NativeResource, sourceSubresource),
-                    sourceRegion.HasValue
-                        ? (SharpDX.Direct3D12.ResourceRegion?)new SharpDX.Direct3D12.ResourceRegion
-                        {
-                            Left = sourceRegion.Value.Left,
-                            Top = sourceRegion.Value.Top,
-                            Front = sourceRegion.Value.Front,
-                            Right = sourceRegion.Value.Right,
-                            Bottom = sourceRegion.Value.Bottom,
-                            Back = sourceRegion.Value.Back
-                        }
-                        : null);
-            }
-            else if (source is Buffer && destination is Buffer)
-            {
-                ResourceBarrierTransition(source, GraphicsResourceState.CopySource);
-                ResourceBarrierTransition(destination, GraphicsResourceState.CopyDestination);
-                FlushResourceBarriers();
-
-                currentCommandList.NativeCommandList.CopyBufferRegion(destination.NativeResource, dstX,
-                    source.NativeResource, sourceRegion?.Left ?? 0, sourceRegion.HasValue ? sourceRegion.Value.Right - sourceRegion.Value.Left : ((Buffer)source).SizeInBytes);
-            }
-            else
-            {
-                throw new InvalidOperationException("Cannot copy data between buffer and texture.");
-            }
-        }
-
-        /// <inheritdoc />
-        public void CopyCount(Buffer sourceBuffer, Buffer destBuffer, int offsetInBytes)
-        {
-            if (sourceBuffer == null) throw new ArgumentNullException(nameof(sourceBuffer));
-            if (destBuffer == null) throw new ArgumentNullException(nameof(destBuffer));
-
-            currentCommandList.NativeCommandList.CopyBufferRegion(destBuffer.NativeResource, offsetInBytes, sourceBuffer.NativeResource, 0, 4);
-        }
-
-        internal void UpdateSubresource(GraphicsResource resource, int subResourceIndex, DataBox databox)
-        {
-            ResourceRegion region;
-            var texture = resource as Texture;
-            if (texture != null)
-            {
-                region = new ResourceRegion(0, 0, 0, texture.Width, texture.Height, texture.Depth);
-            }
-            else
-            {
-                var buffer = resource as Buffer;
-                if (buffer != null)
-                {
-                    region = new ResourceRegion(0, 0, 0, buffer.SizeInBytes, 1, 1);
-                }
-                else
-                {
-                    throw new InvalidOperationException("Unknown resource type");
-                }
-            }
-
-            UpdateSubresource(resource, subResourceIndex, databox, region);
-        }
-
-        internal void UpdateSubresource(GraphicsResource resource, int subResourceIndex, DataBox databox, ResourceRegion region)
-        {
-            var texture = resource as Texture;
-            if (texture != null)
-            {
-                var width = region.Right - region.Left;
-                var height = region.Bottom - region.Top;
-                var depth = region.Back - region.Front;
-
-                ResourceDescription resourceDescription;
-                switch (texture.Dimension)
-                {
-                    case TextureDimension.Texture1D:
-                        resourceDescription = ResourceDescription.Texture1D((SharpDX.DXGI.Format)texture.Format, width, 1, 1);
-                        break;
-                    case TextureDimension.Texture2D:
-                    case TextureDimension.TextureCube:
-                        resourceDescription = ResourceDescription.Texture2D((SharpDX.DXGI.Format)texture.Format, width, height, 1, 1);
-                        break;
-                    case TextureDimension.Texture3D:
-                        resourceDescription = ResourceDescription.Texture3D((SharpDX.DXGI.Format)texture.Format, width, height, (short)depth, 1);
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-
-                // TODO D3D12 allocate in upload heap (placed resources?)
-                var nativeUploadTexture = NativeDevice.CreateCommittedResource(new HeapProperties(CpuPageProperty.WriteBack, MemoryPool.L0), HeapFlags.None,
-                    resourceDescription,
-                    ResourceStates.GenericRead);
-                
-                GraphicsDevice.TemporaryResources.Enqueue(new KeyValuePair<long, object>(GraphicsDevice.NextFenceValue, nativeUploadTexture));
-
-                nativeUploadTexture.WriteToSubresource(0, null, databox.DataPointer, databox.RowPitch, databox.SlicePitch);
-                
-                // Trigger copy
-                ResourceBarrierTransition(resource, GraphicsResourceState.CopyDestination);
-                FlushResourceBarriers();
-                currentCommandList.NativeCommandList.CopyTextureRegion(new TextureCopyLocation(resource.NativeResource, subResourceIndex), region.Left, region.Top, region.Front, new TextureCopyLocation(nativeUploadTexture, 0), null);
-            }
-            else
-            {
-                var buffer = resource as Buffer;
-                if (buffer != null)
-                {
-                    Resource uploadResource;
-                    int uploadOffset;
-                    var uploadSize = region.Right - region.Left;
-                    var uploadMemory = GraphicsDevice.AllocateUploadBuffer(region.Right - region.Left, out uploadResource, out uploadOffset);
-
-                    Utilities.CopyMemory(uploadMemory, databox.DataPointer, uploadSize);
-
-                    ResourceBarrierTransition(resource, GraphicsResourceState.CopyDestination);
-                    FlushResourceBarriers();
-                    currentCommandList.NativeCommandList.CopyBufferRegion(resource.NativeResource, region.Left, uploadResource, uploadOffset, uploadSize);
-                }
-                else
-                {
-                    throw new InvalidOperationException("Unknown resource type");
-                }
-            }
-        }
-
-        // TODO GRAPHICS REFACTOR what should we do with this?
-        /// <summary>
-        /// Maps a subresource.
-        /// </summary>
-        /// <param name="resource">The resource.</param>
-        /// <param name="subResourceIndex">Index of the sub resource.</param>
-        /// <param name="mapMode">The map mode.</param>
-        /// <param name="doNotWait">if set to <c>true</c> this method will return immediately if the resource is still being used by the GPU for writing. Default is false</param>
-        /// <param name="offsetInBytes">The offset information in bytes.</param>
-        /// <param name="lengthInBytes">The length information in bytes.</param>
-        /// <returns>Pointer to the sub resource to map.</returns>
-        public MappedResource MapSubresource(GraphicsResource resource, int subResourceIndex, MapMode mapMode, bool doNotWait = false, int offsetInBytes = 0, int lengthInBytes = 0)
-        {
-            if (resource == null) throw new ArgumentNullException("resource");
-
-            var rowPitch = 0;
-            var depthStride = 0;
-            var usage = GraphicsResourceUsage.Default;
-
-            var texture = resource as Texture;
-            if (texture != null)
-            {
-                usage = texture.Usage;
-                if (lengthInBytes == 0)
-                    lengthInBytes = texture.ComputeSubresourceSize(subResourceIndex);
-
-                rowPitch = texture.ComputeRowPitch(subResourceIndex % texture.MipLevels);
-                depthStride = texture.ComputeSlicePitch(subResourceIndex % texture.MipLevels);
-
-                if (texture.Usage == GraphicsResourceUsage.Staging)
-                {
-                    // Internally it's a buffer, so adapt resource index and offset
-                    offsetInBytes = texture.ComputeBufferOffset(subResourceIndex, 0);
-                    subResourceIndex = 0;
-                }
-            }
-            else
-            {
-                var buffer = resource as Buffer;
-                if (buffer != null)
-                {
-                    usage = buffer.Usage;
-                    if (lengthInBytes == 0)
-                        lengthInBytes = buffer.SizeInBytes;
-                }
-            }
-
-            if (mapMode == MapMode.Read || mapMode == MapMode.ReadWrite || mapMode == MapMode.Write)
-            {
-                // Is non-staging ever possible for Read/Write?
-                if (usage != GraphicsResourceUsage.Staging)
-                    throw new InvalidOperationException();
-            }
-
-            if (mapMode == MapMode.WriteDiscard)
-            {
-                throw new InvalidOperationException("Can't use WriteDiscard on Graphics API that don't support renaming");
-            }
-
-            if (mapMode != MapMode.WriteNoOverwrite)
-            {
-                // Need to wait?
-                if (!resource.StagingFenceValue.HasValue || !GraphicsDevice.IsFenceCompleteInternal(resource.StagingFenceValue.Value))
-                {
-                    if (doNotWait)
-                    {
-                        return new MappedResource(resource, subResourceIndex, new DataBox(IntPtr.Zero, 0, 0));
-                    }
-
-                    // Need to flush? (i.e. part of)
-                    if (resource.StagingBuilder == this)
-                        FlushInternal(false);
-
-                    if (!resource.StagingFenceValue.HasValue)
-                        throw new InvalidOperationException("CommandList updating the staging resource has not been submitted");
-
-                    GraphicsDevice.WaitForFenceInternal(resource.StagingFenceValue.Value);
-                }
-            }
-
-            var mappedMemory = resource.NativeResource.Map(subResourceIndex) + offsetInBytes;
-            return new MappedResource(resource, subResourceIndex, new DataBox(mappedMemory, rowPitch, depthStride), offsetInBytes, lengthInBytes);
-        }
-
-        // TODO GRAPHICS REFACTOR what should we do with this?
-        public void UnmapSubresource(MappedResource unmapped)
-        {
-            unmapped.Resource.NativeResource.Unmap(unmapped.SubResourceIndex);
-        }
-
-        // Contains a DescriptorHeap and cache its GPU and CPU pointers
-        struct DescriptorHeapCache
-        {
-            public DescriptorHeapCache(DescriptorHeap heap) : this()
-            {
-                Heap = heap;
-                if (heap != null)
-                {
-                    CPUDescriptorHandleForHeapStart = heap.CPUDescriptorHandleForHeapStart;
-                    GPUDescriptorHandleForHeapStart = heap.GPUDescriptorHandleForHeapStart;
-                }
-            }
-
-            public DescriptorHeap Heap;
-            public CpuDescriptorHandle CPUDescriptorHandleForHeapStart;
-            public GpuDescriptorHandle GPUDescriptorHandleForHeapStart;
-        }
-    }
-}
-
-#endif 
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/CompiledCommandList.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/CompiledCommandList.Direct3D12.cs
deleted file mode 100644
index b47788bce2..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/CompiledCommandList.Direct3D12.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System.Collections.Generic;
-using SharpDX.Direct3D12;
-
-namespace Xenko.Graphics
-{
-    public partial struct CompiledCommandList
-    {
-        internal CommandList Builder;
-        internal GraphicsCommandList NativeCommandList;
-        internal CommandAllocator NativeCommandAllocator;
-        internal List<DescriptorHeap> SrvHeaps;
-        internal List<DescriptorHeap> SamplerHeaps;
-        internal List<GraphicsResource> StagingResources;
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/DescriptorPool.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/DescriptorPool.Direct3D12.cs
deleted file mode 100644
index 1cfc06744d..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/DescriptorPool.Direct3D12.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using SharpDX.Direct3D12;
-using Xenko.Shaders;
-
-namespace Xenko.Graphics
-{
-    public partial class DescriptorPool
-    {
-        internal DescriptorHeap SrvHeap;
-        internal DescriptorHeap SamplerHeap;
-
-        internal CpuDescriptorHandle SrvStart;
-        internal int SrvOffset;
-        internal int SrvCount;
-        internal CpuDescriptorHandle SamplerStart;
-        internal int SamplerOffset;
-        internal int SamplerCount;
-
-        public void Reset()
-        {
-            SrvOffset = 0;
-            SamplerOffset = 0;
-        }
-
-        private DescriptorPool(GraphicsDevice graphicsDevice, DescriptorTypeCount[] counts) : base(graphicsDevice)
-        {
-            // For now, we put everything together so let's compute total count
-            foreach (var count in counts)
-            {
-                if (count.Type == EffectParameterClass.Sampler)
-                    SamplerCount += count.Count;
-                else
-                    SrvCount += count.Count;
-            }
-
-            if (SrvCount > 0)
-            {
-                SrvHeap = graphicsDevice.NativeDevice.CreateDescriptorHeap(new DescriptorHeapDescription
-                {
-                    DescriptorCount = SrvCount,
-                    Flags = DescriptorHeapFlags.None,
-                    Type = DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView,
-                });
-                SrvStart = SrvHeap.CPUDescriptorHandleForHeapStart;
-            }
-
-            if (SamplerCount > 0)
-            {
-                SamplerHeap = graphicsDevice.NativeDevice.CreateDescriptorHeap(new DescriptorHeapDescription
-                {
-                    DescriptorCount = SamplerCount,
-                    Flags = DescriptorHeapFlags.None,
-                    Type = DescriptorHeapType.Sampler,
-                });
-                SamplerStart = SamplerHeap.CPUDescriptorHandleForHeapStart;
-            }
-        }
-
-        protected internal override void OnDestroyed()
-        {
-            ReleaseComObject(ref SrvHeap);
-            ReleaseComObject(ref SamplerHeap);
-
-            base.OnDestroyed();
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/DescriptorSet.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/DescriptorSet.Direct3D12.cs
deleted file mode 100644
index 40d4adb0ce..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/DescriptorSet.Direct3D12.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using SharpDX;
-using SharpDX.Direct3D12;
-using Xenko.Shaders;
-
-namespace Xenko.Graphics
-{
-    public partial struct DescriptorSet
-    {
-        internal readonly GraphicsDevice Device;
-        internal readonly int[] BindingOffsets;
-        internal readonly DescriptorSetLayout Description;
-
-        internal readonly CpuDescriptorHandle SrvStart;
-        internal readonly CpuDescriptorHandle SamplerStart;
-
-        public bool IsValid => Description != null;
-
-        private DescriptorSet(GraphicsDevice graphicsDevice, DescriptorPool pool, DescriptorSetLayout desc)
-        {
-            if (pool.SrvOffset + desc.SrvCount > pool.SrvCount || pool.SamplerOffset + desc.SamplerCount > pool.SamplerCount)
-            {
-                // Eearly exit if OOM, IsValid should return false (TODO: different mechanism?)
-                Device = null;
-                BindingOffsets = null;
-                Description = null;
-                SrvStart = new CpuDescriptorHandle();
-                SamplerStart = new CpuDescriptorHandle();
-                return;
-            }
-
-            Device = graphicsDevice;
-            BindingOffsets = desc.BindingOffsets;
-            Description = desc;
-
-            // Store start CpuDescriptorHandle
-            SrvStart = desc.SrvCount > 0 ? (pool.SrvStart + graphicsDevice.SrvHandleIncrementSize * pool.SrvOffset) : new CpuDescriptorHandle();
-            SamplerStart = desc.SamplerCount > 0 ? (pool.SamplerStart + graphicsDevice.SamplerHandleIncrementSize * pool.SamplerOffset) : new CpuDescriptorHandle();
-
-            // Allocation is done, bump offsets
-            // TODO D3D12 thread safety?
-            pool.SrvOffset += desc.SrvCount;
-            pool.SamplerOffset += desc.SamplerCount;
-        }
-
-        /// <summary>
-        /// Sets a descriptor.
-        /// </summary>
-        /// <param name="slot">The slot.</param>
-        /// <param name="value">The descriptor.</param>
-        public void SetValue(int slot, object value)
-        {
-            var srv = value as GraphicsResource;
-            if (srv != null)
-            {
-                SetShaderResourceView(slot, srv);
-            }
-            else
-            {
-                var sampler = value as SamplerState;
-                if (sampler != null)
-                {
-                    SetSamplerState(slot, sampler);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Sets a shader resource view descriptor.
-        /// </summary>
-        /// <param name="slot">The slot.</param>
-        /// <param name="shaderResourceView">The shader resource view.</param>
-        public void SetShaderResourceView(int slot, GraphicsResource shaderResourceView)
-        {
-            if (shaderResourceView.NativeShaderResourceView.Ptr == PointerSize.Zero)
-                return;
-            Device.NativeDevice.CopyDescriptorsSimple(1, SrvStart + BindingOffsets[slot], shaderResourceView.NativeShaderResourceView, DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-        }
-
-        /// <summary>
-        /// Sets a sampler state descriptor.
-        /// </summary>
-        /// <param name="slot">The slot.</param>
-        /// <param name="samplerState">The sampler state.</param>
-        public void SetSamplerState(int slot, SamplerState samplerState)
-        {
-            // For now, immutable samplers appears in the descriptor set and should be ignored
-            // TODO GRAPHICS REFACTOR can't we just hide them somehow?
-            var bindingSlot = BindingOffsets[slot];
-            if (bindingSlot == -1)
-                return;
-
-            Device.NativeDevice.CopyDescriptorsSimple(1, SamplerStart + BindingOffsets[slot], samplerState.NativeSampler, DescriptorHeapType.Sampler);
-        }
-
-        /// <summary>
-        /// Sets a constant buffer view descriptor.
-        /// </summary>
-        /// <param name="slot">The slot.</param>
-        /// <param name="buffer">The constant buffer.</param>
-        /// <param name="offset">The constant buffer view start offset.</param>
-        /// <param name="size">The constant buffer view size.</param>
-        public void SetConstantBuffer(int slot, Buffer buffer, int offset, int size)
-        {
-            var constantBufferDataPlacementAlignment = Device.ConstantBufferDataPlacementAlignment;
-            Device.NativeDevice.CreateConstantBufferView(new ConstantBufferViewDescription
-            {
-                BufferLocation = buffer.GPUVirtualAddress + offset,
-                SizeInBytes = (size + constantBufferDataPlacementAlignment) / constantBufferDataPlacementAlignment * constantBufferDataPlacementAlignment, // CB size needs to be 256-byte aligned
-            }, SrvStart + BindingOffsets[slot]);
-        }
-
-        /// <summary>
-        /// Sets an unordered access view descriptor.
-        /// </summary>
-        /// <param name="slot">The slot.</param>
-        /// <param name="unorderedAccessView">The unordered access view.</param>
-        public void SetUnorderedAccessView(int slot, GraphicsResource unorderedAccessView)
-        {
-            if (unorderedAccessView.NativeUnorderedAccessView.Ptr == PointerSize.Zero)
-                throw new ArgumentException($"Resource \'{unorderedAccessView}\' has missing Unordered Access View.");
-            Device.NativeDevice.CopyDescriptorsSimple(1, SrvStart + BindingOffsets[slot], unorderedAccessView.NativeUnorderedAccessView, DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/DescriptorSetLayout.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/DescriptorSetLayout.Direct3D12.cs
deleted file mode 100644
index 919d2ced53..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/DescriptorSetLayout.Direct3D12.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using Xenko.Shaders;
-
-#if XENKO_GRAPHICS_API_DIRECT3D12
-
-namespace Xenko.Graphics
-{
-    public partial class DescriptorSetLayout
-    {
-        internal int SrvCount;
-        internal int SamplerCount;
-
-        // Need to remap for proper separation of samplers from the rest
-        internal int[] BindingOffsets;
-
-        private DescriptorSetLayout(GraphicsDevice device, DescriptorSetLayoutBuilder builder)
-        {
-            BindingOffsets = new int[builder.ElementCount];
-            int currentBindingOffset = 0;
-            foreach (var entry in builder.Entries)
-            {
-                // We will both setup BindingOffsets and increment SamplerCount/SrvCount at the same time
-                if (entry.Class == EffectParameterClass.Sampler)
-                {
-                    for (int i = 0; i < entry.ArraySize; ++i)
-                        BindingOffsets[currentBindingOffset++] = entry.ImmutableSampler != null ? -1 : SamplerCount++ * device.SamplerHandleIncrementSize;
-                }
-                else
-                {
-                    for (int i = 0; i < entry.ArraySize; ++i)
-                        BindingOffsets[currentBindingOffset++] = SrvCount++ * device.SrvHandleIncrementSize;
-                }
-            }
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsDevice.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/GraphicsDevice.Direct3D12.cs
deleted file mode 100644
index bd7848cae8..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsDevice.Direct3D12.cs
+++ /dev/null
@@ -1,714 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Threading;
-using SharpDX.Direct3D12;
-using Xenko.Core.Collections;
-using Xenko.Core.Threading;
-
-namespace Xenko.Graphics
-{
-    public partial class GraphicsDevice
-    {
-        // D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT (not exposed by SharpDX)
-        internal readonly int ConstantBufferDataPlacementAlignment = 256;
-
-        private const GraphicsPlatform GraphicPlatform = GraphicsPlatform.Direct3D12;
-
-        internal readonly ConcurrentPool<List<GraphicsResource>> StagingResourceLists = new ConcurrentPool<List<GraphicsResource>>(() => new List<GraphicsResource>());
-        internal readonly ConcurrentPool<List<DescriptorHeap>> DescriptorHeapLists = new ConcurrentPool<List<DescriptorHeap>>(() => new List<DescriptorHeap>());
-
-        private bool simulateReset = false;
-        private string rendererName;
-
-        private SharpDX.Direct3D12.Device nativeDevice;
-        internal CommandQueue NativeCommandQueue;
-
-        internal GraphicsProfile RequestedProfile;
-        internal SharpDX.Direct3D.FeatureLevel CurrentFeatureLevel;
-
-        internal CommandQueue NativeCopyCommandQueue;
-        internal CommandAllocator NativeCopyCommandAllocator;
-        internal GraphicsCommandList NativeCopyCommandList;
-        private Fence nativeCopyFence;
-        private long nextCopyFenceValue = 1;
-
-        internal CommandAllocatorPool CommandAllocators;
-        internal HeapPool SrvHeaps;
-        internal HeapPool SamplerHeaps;
-        internal const int SrvHeapSize = 2048;
-        internal const int SamplerHeapSize = 64;
-
-        internal DescriptorAllocator SamplerAllocator;
-        internal DescriptorAllocator ShaderResourceViewAllocator;
-        internal DescriptorAllocator UnorderedAccessViewAllocator => ShaderResourceViewAllocator;
-        internal DescriptorAllocator DepthStencilViewAllocator;
-        internal DescriptorAllocator RenderTargetViewAllocator;
-
-        private SharpDX.Direct3D12.Resource nativeUploadBuffer;
-        private IntPtr nativeUploadBufferStart;
-        private int nativeUploadBufferOffset;
-
-        internal int SrvHandleIncrementSize;
-        internal int SamplerHandleIncrementSize;
-
-        private Fence nativeFence;
-        private long lastCompletedFence;
-        internal long NextFenceValue = 1;
-        private AutoResetEvent fenceEvent = new AutoResetEvent(false);
-
-        // Temporary or destroyed resources kept around until the GPU doesn't need them anymore
-        internal Queue<KeyValuePair<long, object>> TemporaryResources = new Queue<KeyValuePair<long, object>>();
-
-        private readonly FastList<SharpDX.Direct3D12.CommandList> nativeCommandLists = new FastList<SharpDX.Direct3D12.CommandList>();
-
-        /// <summary>
-        /// The tick frquency of timestamp queries in Hertz.
-        /// </summary>
-        public long TimestampFrequency { get; private set; }
-
-        /// <summary>
-        ///     Gets the status of this device.
-        /// </summary>
-        /// <value>The graphics device status.</value>
-        public GraphicsDeviceStatus GraphicsDeviceStatus
-        {
-            get
-            {
-                if (simulateReset)
-                {
-                    simulateReset = false;
-                    return GraphicsDeviceStatus.Reset;
-                }
-
-                var result = NativeDevice.DeviceRemovedReason;
-                if (result == SharpDX.DXGI.ResultCode.DeviceRemoved)
-                {
-                    return GraphicsDeviceStatus.Removed;
-                }
-
-                if (result == SharpDX.DXGI.ResultCode.DeviceReset)
-                {
-                    return GraphicsDeviceStatus.Reset;
-                }
-
-                if (result == SharpDX.DXGI.ResultCode.DeviceHung)
-                {
-                    return GraphicsDeviceStatus.Hung;
-                }
-
-                if (result == SharpDX.DXGI.ResultCode.DriverInternalError)
-                {
-                    return GraphicsDeviceStatus.InternalError;
-                }
-
-                if (result == SharpDX.DXGI.ResultCode.InvalidCall)
-                {
-                    return GraphicsDeviceStatus.InvalidCall;
-                }
-
-                if (result.Code < 0)
-                {
-                    return GraphicsDeviceStatus.Reset;
-                }
-
-                return GraphicsDeviceStatus.Normal;
-            }
-        }
-
-        /// <summary>
-        ///     Gets the native device.
-        /// </summary>
-        /// <value>The native device.</value>
-        internal SharpDX.Direct3D12.Device NativeDevice
-        {
-            get
-            {
-                return nativeDevice;
-            }
-        }
-
-        /// <summary>
-        ///     Marks context as active on the current thread.
-        /// </summary>
-        public void Begin()
-        {
-            FrameTriangleCount = 0;
-            FrameDrawCalls = 0;
-        }
-
-        /// <summary>
-        /// Enables profiling.
-        /// </summary>
-        /// <param name="enabledFlag">if set to <c>true</c> [enabled flag].</param>
-        public void EnableProfile(bool enabledFlag)
-        {
-        }
-
-        /// <summary>
-        ///     Unmarks context as active on the current thread.
-        /// </summary>
-        public void End()
-        {
-        }
-
-        /// <summary>
-        /// Executes a deferred command list.
-        /// </summary>
-        /// <param name="commandList">The deferred command list.</param>
-        public void ExecuteCommandList(CompiledCommandList commandList)
-        {
-            ExecuteCommandListInternal(commandList);
-        }
-
-        /// <summary>
-        /// Executes multiple deferred command lists.
-        /// </summary>
-        /// <param name="count">Number of command lists to execute.</param>
-        /// <param name="commandLists">The deferred command lists.</param>
-        public void ExecuteCommandLists(int count, CompiledCommandList[] commandLists)
-        {
-            if (commandLists == null) throw new ArgumentNullException(nameof(commandLists));
-            if (count > commandLists.Length) throw new ArgumentOutOfRangeException(nameof(count));
-
-            var fenceValue = NextFenceValue++;
-
-            // Recycle resources
-            for (int index = 0; index < count; index++)
-            {
-                var commandList = commandLists[index];
-                nativeCommandLists.Add(commandList.NativeCommandList);
-                RecycleCommandListResources(commandList, fenceValue);
-            }
-
-            // Submit and signal fence
-            NativeCommandQueue.ExecuteCommandLists(count, nativeCommandLists.Items);
-            NativeCommandQueue.Signal(nativeFence, fenceValue);
-
-            ReleaseTemporaryResources();
-
-            nativeCommandLists.Clear();
-        }
-
-        public void SimulateReset()
-        {
-            simulateReset = true;
-        }
-
-        private void InitializePostFeatures()
-        {
-        }
-
-        private string GetRendererName()
-        {
-            return rendererName;
-        }
-
-        /// <summary>
-        ///     Initializes the specified device.
-        /// </summary>
-        /// <param name="graphicsProfiles">The graphics profiles.</param>
-        /// <param name="deviceCreationFlags">The device creation flags.</param>
-        /// <param name="windowHandle">The window handle.</param>
-        private void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles, DeviceCreationFlags deviceCreationFlags, object windowHandle)
-        {
-            if (nativeDevice != null)
-            {
-                // Destroy previous device
-                ReleaseDevice();
-            }
-
-            rendererName = Adapter.NativeAdapter.Description.Description;
-
-            // Profiling is supported through pix markers
-            IsProfilingSupported = true;
-
-            // Command lists are thread-safe and execute deferred
-            IsDeferred = true;
-
-            bool isDebug = (deviceCreationFlags & DeviceCreationFlags.Debug) != 0;
-            if (isDebug)
-            {
-                SharpDX.Direct3D12.DebugInterface.Get().EnableDebugLayer();
-            }
-
-            // Default fallback
-            if (graphicsProfiles.Length == 0)
-                graphicsProfiles = new[] { GraphicsProfile.Level_11_0 };
-
-            // Create Device D3D12 with feature Level based on profile
-            for (int index = 0; index < graphicsProfiles.Length; index++)
-            {
-                var graphicsProfile = graphicsProfiles[index];
-                try
-                {
-                    // D3D12 supports only feature level 11+
-                    var level = graphicsProfile.ToFeatureLevel();
-                    if (level < SharpDX.Direct3D.FeatureLevel.Level_11_0)
-                        level = SharpDX.Direct3D.FeatureLevel.Level_11_0;
-
-                    nativeDevice = new SharpDX.Direct3D12.Device(Adapter.NativeAdapter, level);
-
-                    RequestedProfile = graphicsProfile;
-                    CurrentFeatureLevel = level;
-                    break;
-                }
-                catch (Exception)
-                {
-                    if (index == graphicsProfiles.Length - 1)
-                        throw;
-                }
-            }
-
-            // Describe and create the command queue.
-            var queueDesc = new SharpDX.Direct3D12.CommandQueueDescription(SharpDX.Direct3D12.CommandListType.Direct);
-            NativeCommandQueue = nativeDevice.CreateCommandQueue(queueDesc);
-            //queueDesc.Type = CommandListType.Copy;
-            NativeCopyCommandQueue = nativeDevice.CreateCommandQueue(queueDesc);
-            TimestampFrequency = NativeCommandQueue.TimestampFrequency;
-
-            SrvHandleIncrementSize = NativeDevice.GetDescriptorHandleIncrementSize(DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-            SamplerHandleIncrementSize = NativeDevice.GetDescriptorHandleIncrementSize(DescriptorHeapType.Sampler);
-
-            if (isDebug)
-            {
-                var debugDevice = nativeDevice.QueryInterfaceOrNull<DebugDevice>();
-                if (debugDevice != null)
-                {
-                    var infoQueue = debugDevice.QueryInterfaceOrNull<InfoQueue>();
-                    if (infoQueue != null)
-                    {
-                        MessageId[] disabledMessages =
-                        {
-                            // This happens when render target or depth stencil clear value is diffrent
-                            // than provided during resource allocation.
-                            MessageId.CleardepthstencilviewMismatchingclearvalue,
-                            MessageId.ClearrendertargetviewMismatchingclearvalue,
-
-                            // This occurs when there are uninitialized descriptors in a descriptor table,
-                            // even when a shader does not access the missing descriptors.
-                            MessageId.InvalidDescriptorHandle,
-                            
-                            // These happen when capturing with VS diagnostics
-                            MessageId.MapInvalidNullRange,
-                            MessageId.UnmapInvalidNullRange,
-                        };
-
-                        // Disable irrelevant debug layer warnings
-                        InfoQueueFilter filter = new InfoQueueFilter
-                        {
-                            DenyList = new InfoQueueFilterDescription
-                            {
-                                Ids = disabledMessages
-                            }
-                        };
-                        infoQueue.AddStorageFilterEntries(filter);
-
-                        //infoQueue.SetBreakOnSeverity(MessageSeverity.Error, true);
-                        //infoQueue.SetBreakOnSeverity(MessageSeverity.Warning, true);
-
-                        infoQueue.Dispose();
-                    }
-                    debugDevice.Dispose();
-                }
-            }
-
-            // Prepare pools
-            CommandAllocators = new CommandAllocatorPool(this);
-            SrvHeaps = new HeapPool(this, SrvHeapSize, DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-            SamplerHeaps = new HeapPool(this, SamplerHeapSize, DescriptorHeapType.Sampler);
-
-            // Prepare descriptor allocators
-            SamplerAllocator = new DescriptorAllocator(this, DescriptorHeapType.Sampler);
-            ShaderResourceViewAllocator = new DescriptorAllocator(this, DescriptorHeapType.ConstantBufferViewShaderResourceViewUnorderedAccessView);
-            DepthStencilViewAllocator = new DescriptorAllocator(this, DescriptorHeapType.DepthStencilView);
-            RenderTargetViewAllocator = new DescriptorAllocator(this, DescriptorHeapType.RenderTargetView);
-
-            // Prepare copy command list (start it closed, so that every new use start with a Reset)
-            NativeCopyCommandAllocator = NativeDevice.CreateCommandAllocator(CommandListType.Direct);
-            NativeCopyCommandList = NativeDevice.CreateCommandList(CommandListType.Direct, NativeCopyCommandAllocator, null);
-            NativeCopyCommandList.Close();
-
-            // Fence for next frame and resource cleaning
-            nativeFence = NativeDevice.CreateFence(0, FenceFlags.None);
-            nativeCopyFence = NativeDevice.CreateFence(0, FenceFlags.None);
-        }
-
-        internal IntPtr AllocateUploadBuffer(int size, out SharpDX.Direct3D12.Resource resource, out int offset, int alignment = 0)
-        {
-            // TODO D3D12 thread safety, should we simply use locks?
-
-            // Align
-            if (alignment > 0)
-                nativeUploadBufferOffset = (nativeUploadBufferOffset + alignment - 1) / alignment * alignment;
-
-            if (nativeUploadBuffer == null || nativeUploadBufferOffset + size > nativeUploadBuffer.Description.Width)
-            {
-                if (nativeUploadBuffer != null)
-                {
-                    nativeUploadBuffer.Unmap(0);
-                    TemporaryResources.Enqueue(new KeyValuePair<long, object>(NextFenceValue, nativeUploadBuffer));
-                }
-
-                // Allocate new buffer
-                // TODO D3D12 recycle old ones (using fences to know when GPU is done with them)
-                // TODO D3D12 ResourceStates.CopySource not working?
-                var bufferSize = Math.Max(4 * 1024*1024, size);
-                nativeUploadBuffer = NativeDevice.CreateCommittedResource(new HeapProperties(HeapType.Upload), HeapFlags.None, ResourceDescription.Buffer(bufferSize), ResourceStates.GenericRead);
-                nativeUploadBufferStart = nativeUploadBuffer.Map(0, new Range());
-                nativeUploadBufferOffset = 0;
-            }
-
-            // Bump allocate
-            resource = nativeUploadBuffer;
-            offset = nativeUploadBufferOffset;
-            nativeUploadBufferOffset += size;
-            return nativeUploadBufferStart + offset;
-        }
-
-        internal void WaitCopyQueue()
-        {
-            NativeCommandQueue.ExecuteCommandList(NativeCopyCommandList);
-            NativeCommandQueue.Signal(nativeCopyFence, nextCopyFenceValue);
-            NativeCommandQueue.Wait(nativeCopyFence, nextCopyFenceValue);
-            nextCopyFenceValue++;
-        }
-
-        internal void ReleaseTemporaryResources()
-        {
-            lock (TemporaryResources)
-            {
-                // Release previous frame resources
-                while (TemporaryResources.Count > 0 && IsFenceCompleteInternal(TemporaryResources.Peek().Key))
-                {
-                    var temporaryResource = TemporaryResources.Dequeue().Value;
-                    //temporaryResource.Value.Dispose();
-                    var comObject = temporaryResource as SharpDX.ComObject;
-                    if (comObject != null)
-                        ((SharpDX.IUnknown)comObject).Release();
-                    else
-                    {
-                        var referenceLink = temporaryResource as GraphicsResourceLink;
-                        if (referenceLink != null)
-                        {
-                            referenceLink.ReferenceCount--;
-                        }
-                    }
-                }
-            }
-        }
-
-        private void AdjustDefaultPipelineStateDescription(ref PipelineStateDescription pipelineStateDescription)
-        {
-        }
-
-        protected void DestroyPlatformDevice()
-        {
-            ReleaseDevice();
-        }
-
-        private void ReleaseDevice()
-        {
-            // Wait for completion of everything queued
-            NativeCommandQueue.Signal(nativeFence, NextFenceValue);
-            NativeCommandQueue.Wait(nativeFence, NextFenceValue);
-
-            // Release command queue
-            NativeCommandQueue.Dispose();
-            NativeCommandQueue = null;
-
-            NativeCopyCommandQueue.Dispose();
-            NativeCopyCommandQueue = null;
-
-            NativeCopyCommandAllocator.Dispose();
-            NativeCopyCommandList.Dispose();
-
-            nativeUploadBuffer.Dispose();
-
-            // Release temporary resources
-            ReleaseTemporaryResources();
-            nativeFence.Dispose();
-            nativeFence = null;
-            nativeCopyFence.Dispose();
-            nativeCopyFence = null;
-
-            // Release pools
-            CommandAllocators.Dispose();
-            SrvHeaps.Dispose();
-            SamplerHeaps.Dispose();
-
-            // Release allocators
-            SamplerAllocator.Dispose();
-            ShaderResourceViewAllocator.Dispose();
-            DepthStencilViewAllocator.Dispose();
-            RenderTargetViewAllocator.Dispose();
-
-            if (IsDebugMode)
-            {
-                var debugDevice = NativeDevice.QueryInterfaceOrNull<SharpDX.Direct3D12.DebugDevice>();
-                if (debugDevice != null)
-                {
-                    debugDevice.ReportLiveDeviceObjects(SharpDX.Direct3D12.RldoFlags.Detail);
-                    debugDevice.Dispose();
-                }
-            }
-
-            nativeDevice.Dispose();
-            nativeDevice = null;
-        }
-
-        internal void OnDestroyed()
-        {
-        }
-
-        internal long ExecuteCommandListInternal(CompiledCommandList commandList)
-        {
-            var fenceValue = NextFenceValue++;
-
-            // Submit and signal fence
-            NativeCommandQueue.ExecuteCommandList(commandList.NativeCommandList);
-            NativeCommandQueue.Signal(nativeFence, fenceValue);
-
-            // Recycle resources
-            RecycleCommandListResources(commandList, fenceValue);
-
-            return fenceValue;
-        }
-
-        private void RecycleCommandListResources(CompiledCommandList commandList, long fenceValue)
-        {
-            // Set fence on staging textures
-            foreach (var stagingResource in commandList.StagingResources)
-            {
-                stagingResource.StagingFenceValue = fenceValue;
-            }
-
-            StagingResourceLists.Release(commandList.StagingResources);
-            commandList.StagingResources.Clear();
-
-            // Recycle resources
-            foreach (var heap in commandList.SrvHeaps)
-            {
-                SrvHeaps.RecycleObject(fenceValue, heap);
-            }
-            commandList.SrvHeaps.Clear();
-            DescriptorHeapLists.Release(commandList.SrvHeaps);
-
-            foreach (var heap in commandList.SamplerHeaps)
-            {
-                SamplerHeaps.RecycleObject(fenceValue, heap);
-            }
-            commandList.SamplerHeaps.Clear();
-            DescriptorHeapLists.Release(commandList.SamplerHeaps);
-
-            commandList.Builder.NativeCommandLists.Enqueue(commandList.NativeCommandList);
-            CommandAllocators.RecycleObject(fenceValue, commandList.NativeCommandAllocator);
-        }
-
-        internal bool IsFenceCompleteInternal(long fenceValue)
-        {
-            // Try to avoid checking the fence if possible
-            if (fenceValue > lastCompletedFence)
-                lastCompletedFence = Math.Max(lastCompletedFence, nativeFence.CompletedValue); // Protect against race conditions
-
-            return fenceValue <= lastCompletedFence;
-        }
-
-        internal void WaitForFenceInternal(long fenceValue)
-        {
-            if (IsFenceCompleteInternal(fenceValue))
-                return;
-
-            // TODO D3D12 in case of concurrency, this lock could end up blocking too long a second thread with lower fenceValue then first one
-            lock (nativeFence)
-            {
-                nativeFence.SetEventOnCompletion(fenceValue, fenceEvent.SafeWaitHandle.DangerousGetHandle());
-                fenceEvent.WaitOne();
-                lastCompletedFence = fenceValue;
-            }
-        }
-
-        internal void TagResource(GraphicsResourceLink resourceLink)
-        {
-            var texture = resourceLink.Resource as Texture;
-            if (texture != null && texture.Usage == GraphicsResourceUsage.Dynamic)
-            {
-                // Increase the reference count until GPU is done with the resource
-                resourceLink.ReferenceCount++;
-                TemporaryResources.Enqueue(new KeyValuePair<long, object>(NextFenceValue, resourceLink));
-            }
-
-            var buffer = resourceLink.Resource as Buffer;
-            if (buffer != null && buffer.Usage == GraphicsResourceUsage.Dynamic)
-            {
-                // Increase the reference count until GPU is done with the resource
-                resourceLink.ReferenceCount++;
-                TemporaryResources.Enqueue(new KeyValuePair<long, object>(NextFenceValue, resourceLink));
-            }
-        }
-
-        internal abstract class ResourcePool<T> : IDisposable where T : Pageable
-        {
-            protected readonly GraphicsDevice GraphicsDevice;
-            private readonly Queue<KeyValuePair<long, T>> liveObjects = new Queue<KeyValuePair<long, T>>();
-
-            protected ResourcePool(GraphicsDevice graphicsDevice)
-            {
-                GraphicsDevice = graphicsDevice;
-            }
-
-            public void Dispose()
-            {
-                lock (liveObjects)
-                {
-                    foreach (var liveObject in liveObjects)
-                    {
-                        liveObject.Value.Dispose();
-                    }
-                    liveObjects.Clear();
-                }
-            }
-
-            public T GetObject()
-            {
-                // TODO D3D12: SpinLock
-                lock (liveObjects)
-                {
-                    // Check if first allocator is ready for reuse
-                    if (liveObjects.Count > 0)
-                    {
-                        var firstAllocator = liveObjects.Peek();
-                        if (firstAllocator.Key <= GraphicsDevice.nativeFence.CompletedValue)
-                        {
-                            liveObjects.Dequeue();
-                            ResetObject(firstAllocator.Value);
-
-                            if (firstAllocator.Value == null)
-                            {
-                                
-                            }
-
-                            return firstAllocator.Value;
-                        }
-                    }
-
-                    return CreateObject();
-                }
-            }
-
-            protected abstract T CreateObject();
-
-            protected abstract void ResetObject(T obj);
-
-            public void RecycleObject(long fenceValue, T obj)
-            {
-                // TODO D3D12: SpinLock
-                lock (liveObjects)
-                {
-                    liveObjects.Enqueue(new KeyValuePair<long, T>(fenceValue, obj));
-                }
-            }
-        }
-
-        internal class CommandAllocatorPool : ResourcePool<CommandAllocator>
-        {
-            public CommandAllocatorPool(GraphicsDevice graphicsDevice) : base(graphicsDevice)
-            {
-            }
-
-            protected override CommandAllocator CreateObject()
-            {
-                // No allocator ready to be used, let's create a new one
-               return GraphicsDevice.NativeDevice.CreateCommandAllocator(CommandListType.Direct);
-            }
-
-            protected override void ResetObject(CommandAllocator obj)
-            {
-                obj.Reset();
-            }
-        }
-
-        internal class HeapPool : ResourcePool<DescriptorHeap>
-        {
-            private readonly int heapSize;
-            private readonly DescriptorHeapType heapType;
-
-            public HeapPool(GraphicsDevice graphicsDevice, int heapSize, DescriptorHeapType heapType) : base(graphicsDevice)
-            {
-                this.heapSize = heapSize;
-                this.heapType = heapType;
-            }
-
-            protected override DescriptorHeap CreateObject()
-            {
-                // No allocator ready to be used, let's create a new one
-                return GraphicsDevice.NativeDevice.CreateDescriptorHeap(new DescriptorHeapDescription
-                {
-                    DescriptorCount = heapSize,
-                    Flags = DescriptorHeapFlags.ShaderVisible,
-                    Type = heapType,
-                });
-            }
-
-            protected override void ResetObject(DescriptorHeap obj)
-            {
-            }
-        }
-
-        /// <summary>
-        /// Allocate descriptor handles. For now a simple bump alloc, but at some point we will have to make a real allocator with free
-        /// </summary>
-        internal class DescriptorAllocator : IDisposable
-        {
-            private const int DescriptorPerHeap = 256;
-
-            private GraphicsDevice device;
-            private DescriptorHeapType descriptorHeapType;
-            private DescriptorHeap currentHeap;
-            private CpuDescriptorHandle currentHandle;
-            private int remainingHandles;
-            private readonly int descriptorSize;
-
-            public DescriptorAllocator(GraphicsDevice device, DescriptorHeapType descriptorHeapType)
-            {
-                this.device = device;
-                this.descriptorHeapType = descriptorHeapType;
-                this.descriptorSize = device.NativeDevice.GetDescriptorHandleIncrementSize(descriptorHeapType);
-            }
-
-            public void Dispose()
-            {
-                currentHeap?.Dispose();
-                currentHeap = null;
-            }
-
-            public CpuDescriptorHandle Allocate(int count)
-            {
-                if (currentHeap == null || remainingHandles < count)
-                {
-                    currentHeap = device.NativeDevice.CreateDescriptorHeap(new DescriptorHeapDescription
-                    {
-                        Flags = DescriptorHeapFlags.None,
-                        Type = descriptorHeapType,
-                        DescriptorCount = DescriptorPerHeap,
-                        NodeMask = 1,
-                    });
-                    remainingHandles = DescriptorPerHeap;
-                    currentHandle = currentHeap.CPUDescriptorHandleForHeapStart;
-                }
-
-                var result = currentHandle;
-
-                currentHandle.Ptr += descriptorSize;
-                remainingHandles -= count;
-
-                return result;
-            }
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsDeviceFeatures.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/GraphicsDeviceFeatures.Direct3D12.cs
deleted file mode 100644
index b4909754b5..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsDeviceFeatures.Direct3D12.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-// Copyright (c) 2010-2012 SharpDX - Alexandre Mutel
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using SharpDX.DXGI;
-using SharpDX.Direct3D;
-using SharpDX.Direct3D11;
-using SharpDX.Direct3D12;
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Features supported by a <see cref="GraphicsDevice"/>.
-    /// </summary>
-    /// <remarks>
-    /// This class gives also features for a particular format, using the operator this[dxgiFormat] on this structure.
-    /// </remarks>
-    public partial struct GraphicsDeviceFeatures
-    {
-        private static readonly List<SharpDX.DXGI.Format> ObsoleteFormatToExcludes = new List<SharpDX.DXGI.Format>() { Format.R1_UNorm, Format.B5G6R5_UNorm, Format.B5G5R5A1_UNorm };
-
-        internal GraphicsDeviceFeatures(GraphicsDevice deviceRoot)
-        {
-            var nativeDevice = deviceRoot.NativeDevice;
-
-            HasSRgb = true;
-
-            mapFeaturesPerFormat = new FeaturesPerFormat[256];
-
-            // Set back the real GraphicsProfile that is used
-            // TODO D3D12
-            RequestedProfile = deviceRoot.RequestedProfile;
-            CurrentProfile = GraphicsProfileHelper.FromFeatureLevel(deviceRoot.CurrentFeatureLevel);
-
-            // TODO D3D12
-            HasComputeShaders = true;
-            HasDoublePrecision = nativeDevice.D3D12Options.DoublePrecisionFloatShaderOps;
-
-            // TODO D3D12 Confirm these are correct
-            // Some docs: https://msdn.microsoft.com/en-us/library/windows/desktop/ff476876(v=vs.85).aspx
-            HasDepthAsSRV = true;
-            HasDepthAsReadOnlyRT = true;
-            HasMultisampleDepthAsSRV = true;
-
-            HasResourceRenaming = false;
-
-            HasMultiThreadingConcurrentResources = true;
-            HasDriverCommandLists = true;
-
-            // Check features for each DXGI.Format
-            foreach (var format in Enum.GetValues(typeof(SharpDX.DXGI.Format)))
-            {
-                var dxgiFormat = (SharpDX.DXGI.Format)format;
-                var maximumMultisampleCount = MultisampleCount.None;
-                var formatSupport = FormatSupport.None;
-
-                if (!ObsoleteFormatToExcludes.Contains(dxgiFormat))
-                {
-                    SharpDX.Direct3D12.FeatureDataFormatSupport formatSupportData;
-                    formatSupportData.Format = dxgiFormat;
-                    formatSupportData.Support1 = FormatSupport1.None;
-                    formatSupportData.Support2 = FormatSupport2.None;
-                    if (nativeDevice.CheckFeatureSupport(SharpDX.Direct3D12.Feature.FormatSupport, ref formatSupportData))
-                        formatSupport = (FormatSupport)formatSupportData.Support1;
-                    maximumMultisampleCount = GetMaximumMultisampleCount(nativeDevice, dxgiFormat);
-                }
-
-                mapFeaturesPerFormat[(int)dxgiFormat] = new FeaturesPerFormat((PixelFormat)dxgiFormat, maximumMultisampleCount, formatSupport);
-            }
-        }
-
-        /// <summary>
-        /// Gets the maximum multisample count for a particular <see cref="PixelFormat" />.
-        /// </summary>
-        /// <param name="device">The device.</param>
-        /// <param name="pixelFormat">The pixelFormat.</param>
-        /// <returns>The maximum multisample count for this pixel pixelFormat</returns>
-        private static MultisampleCount GetMaximumMultisampleCount(SharpDX.Direct3D12.Device device, SharpDX.DXGI.Format pixelFormat)
-        {
-            SharpDX.Direct3D12.FeatureDataMultisampleQualityLevels qualityLevels;
-            qualityLevels.Format = pixelFormat;
-            qualityLevels.Flags = MultisampleQualityLevelFlags.None;
-            qualityLevels.QualityLevelCount = 0;
-
-            int maxCount = 1;
-            for (int i = 8; i >= 1; i /= 2)
-            {
-                qualityLevels.SampleCount = i;
-                if (device.CheckFeatureSupport(SharpDX.Direct3D12.Feature.MultisampleQualityLevels, ref qualityLevels))
-                {
-                    maxCount = i;
-                    break;
-                }
-            }
-            return (MultisampleCount)maxCount;
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsOutput.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/GraphicsOutput.Direct3D12.cs
deleted file mode 100644
index 1a6f041ff3..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsOutput.Direct3D12.cs
+++ /dev/null
@@ -1,232 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-
-// Copyright (c) 2010-2014 SharpDX - Alexandre Mutel
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using System;
-using System.Collections.Generic;
-using SharpDX.Direct3D;
-using SharpDX.Direct3D11;
-using SharpDX.DXGI;
-
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-
-using ResultCode = SharpDX.DXGI.ResultCode;
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Provides methods to retrieve and manipulate an graphics output (a monitor), it is equivalent to <see cref="Output"/>.
-    /// </summary>
-    /// <msdn-id>bb174546</msdn-id>	
-    /// <unmanaged>IDXGIOutput</unmanaged>	
-    /// <unmanaged-short>IDXGIOutput</unmanaged-short>	
-    public partial class GraphicsOutput
-    {
-        private readonly int outputIndex;
-        private readonly Output output;
-        private readonly OutputDescription outputDescription;
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="GraphicsOutput" />.
-        /// </summary>
-        /// <param name="adapter">The adapter.</param>
-        /// <param name="outputIndex">Index of the output.</param>
-        /// <exception cref="System.ArgumentNullException">output</exception>
-        /// <exception cref="ArgumentOutOfRangeException">output</exception>
-        internal GraphicsOutput(GraphicsAdapter adapter, int outputIndex)
-        {
-            if (adapter == null) throw new ArgumentNullException("adapter");
-
-            this.outputIndex = outputIndex;
-            this.adapter = adapter;
-            this.output = adapter.NativeAdapter.GetOutput(outputIndex).DisposeBy(this);
-            outputDescription = output.Description;
-
-            unsafe
-            {
-                var rectangle = outputDescription.DesktopBounds;
-                desktopBounds = *(Rectangle*)&rectangle;
-            }
-        }
-
-        /// <summary>
-        /// Find the display mode that most closely matches the requested display mode.
-        /// </summary>
-        /// <param name="targetProfiles">The target profile, as available formats are different depending on the feature level..</param>
-        /// <param name="mode">The mode.</param>
-        /// <returns>Returns the closes display mode.</returns>
-        /// <unmanaged>HRESULT IDXGIOutput::FindClosestMatchingMode([In] const DXGI_MODE_DESC* pModeToMatch,[Out] DXGI_MODE_DESC* pClosestMatch,[In, Optional] IUnknown* pConcernedDevice)</unmanaged>
-        /// <remarks>Direct3D devices require UNORM formats. This method finds the closest matching available display mode to the mode specified in pModeToMatch. Similarly ranked fields (i.e. all specified, or all unspecified, etc) are resolved in the following order.  ScanlineOrdering Scaling Format Resolution RefreshRate  When determining the closest value for a particular field, previously matched fields are used to filter the display mode list choices, and  other fields are ignored. For example, when matching Resolution, the display mode list will have already been filtered by a certain ScanlineOrdering,  Scaling, and Format, while RefreshRate is ignored. This ordering doesn't define the absolute ordering for every usage scenario of FindClosestMatchingMode, because  the application can choose some values initially, effectively changing the order that fields are chosen. Fields of the display mode are matched one at a time, generally in a specified order. If a field is unspecified, FindClosestMatchingMode gravitates toward the values for the desktop related to this output.  If this output is not part of the desktop, then the default desktop output is used to find values. If an application uses a fully unspecified  display mode, FindClosestMatchingMode will typically return a display mode that matches the desktop settings for this output.   Unspecified fields are lower priority than specified fields and will be resolved later than specified fields.</remarks>
-        public DisplayMode FindClosestMatchingDisplayMode(GraphicsProfile[] targetProfiles, DisplayMode mode)
-        {
-            if (targetProfiles == null) throw new ArgumentNullException("targetProfiles");
-
-            ModeDescription closestDescription;
-            SharpDX.Direct3D12.Device deviceTemp = null;
-            for (int i = 0; i < targetProfiles.Length; i++)
-            {
-                // Create Device D3D12 with feature Level based on profile
-                try
-                {
-                    deviceTemp = new SharpDX.Direct3D12.Device(Adapter.NativeAdapter, (FeatureLevel)targetProfiles[i]);
-                    break;
-                }
-                catch (Exception)
-                {
-                }
-            }
-
-            if (deviceTemp == null)
-                throw new InvalidOperationException("Could not create D3D12 graphics device");
-
-            var description = new SharpDX.DXGI.ModeDescription()
-            {
-                Width = mode.Width,
-                Height = mode.Height,
-                RefreshRate = mode.RefreshRate.ToSharpDX(),
-                Format = (SharpDX.DXGI.Format)mode.Format,
-                Scaling = DisplayModeScaling.Unspecified,
-                ScanlineOrdering = DisplayModeScanlineOrder.Unspecified
-            };
-            using (var device = deviceTemp)
-                output.GetClosestMatchingMode(device, description, out closestDescription);
-
-            return DisplayMode.FromDescription(closestDescription);
-        }
-
-        /// <summary>
-        /// Retrieves the handle of the monitor associated with this <see cref="GraphicsOutput"/>.
-        /// </summary>
-        /// <msdn-id>bb173068</msdn-id>	
-        /// <unmanaged>HMONITOR Monitor</unmanaged>	
-        /// <unmanaged-short>HMONITOR Monitor</unmanaged-short>	
-        public IntPtr MonitorHandle { get { return outputDescription.MonitorHandle; } }
-
-        /// <summary>
-        /// Gets the native output.
-        /// </summary>
-        /// <value>The native output.</value>
-        internal Output NativeOutput
-        {
-            get
-            {
-                return output;
-            }
-        }
-
-        /// <summary>
-        /// Enumerates all available display modes for this output and stores them in <see cref="SupportedDisplayModes"/>.
-        /// </summary>
-        private void InitializeSupportedDisplayModes()
-        {
-            var modesAvailable = new List<DisplayMode>();
-            var modesMap = new Dictionary<string, DisplayMode>();
-
-#if DIRECTX11_1
-            var output1 = output.QueryInterface<Output1>();
-#endif
-
-            try
-            {
-                const DisplayModeEnumerationFlags displayModeEnumerationFlags = DisplayModeEnumerationFlags.Interlaced | DisplayModeEnumerationFlags.Scaling;
-
-                foreach (var format in Enum.GetValues(typeof(SharpDX.DXGI.Format)))
-                {
-                    var dxgiFormat = (Format)format;
-#if DIRECTX11_1
-                    var modes = output1.GetDisplayModeList1(dxgiFormat, displayModeEnumerationFlags);
-#else
-                    var modes = output.GetDisplayModeList(dxgiFormat, displayModeEnumerationFlags);
-#endif
-
-                    foreach (var mode in modes)
-                    {
-                        if (mode.Scaling == DisplayModeScaling.Unspecified)
-                        {
-                            var key = format + ";" + mode.Width + ";" + mode.Height + ";" + mode.RefreshRate.Numerator + ";" + mode.RefreshRate.Denominator;
-
-                            DisplayMode oldMode;
-                            if (!modesMap.TryGetValue(key, out oldMode))
-                            {
-                                var displayMode = DisplayMode.FromDescription(mode);
-
-                                modesMap.Add(key, displayMode);
-                                modesAvailable.Add(displayMode);
-                            }
-                        }
-                    }
-                }
-            }
-            catch (SharpDX.SharpDXException dxgiException)
-            {
-                if (dxgiException.ResultCode != ResultCode.NotCurrentlyAvailable)
-                    throw;
-            }
-
-#if DIRECTX11_1
-            output1.Dispose();
-#endif
-            supportedDisplayModes = modesAvailable.ToArray();
-        }
-
-        /// <summary>
-        /// Initializes <see cref="CurrentDisplayMode"/> with the most appropiate mode from <see cref="SupportedDisplayModes"/>.
-        /// </summary>
-        /// <remarks>It checks first for a mode with <see cref="Format.R8G8B8A8_UNorm"/>,
-        /// if it is not found - it checks for <see cref="Format.B8G8R8A8_UNorm"/>.</remarks>
-        private void InitializeCurrentDisplayMode()
-        {
-            currentDisplayMode = TryFindMatchingDisplayMode(Format.R8G8B8A8_UNorm)
-                                 ?? TryFindMatchingDisplayMode(Format.B8G8R8A8_UNorm);
-        }
-
-        /// <summary>
-        /// Tries to find a display mode that has the same size as the current <see cref="OutputDescription"/> associated with this instance
-        /// of the specified format.
-        /// </summary>
-        /// <param name="format">The format to match with.</param>
-        /// <returns>A matched <see cref="DisplayMode"/> or null if nothing is found.</returns>
-        private DisplayMode TryFindMatchingDisplayMode(Format format)
-        {
-            var desktopBounds = outputDescription.DesktopBounds;
-
-            foreach (var supportedDisplayMode in SupportedDisplayModes)
-            {
-                var width = desktopBounds.Right - desktopBounds.Left;
-                var height = desktopBounds.Bottom - desktopBounds.Top;
-
-                if (supportedDisplayMode.Width == width
-                    && supportedDisplayMode.Height == height
-                    && (Format)supportedDisplayMode.Format == format)
-                {
-                    // Stupid DXGI, there is no way to get the DXGI.Format, nor the refresh rate.
-                    return new DisplayMode((PixelFormat)format, width, height, supportedDisplayMode.RefreshRate);
-                }
-            }
-
-            return null;
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsResource.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/GraphicsResource.Direct3D12.cs
deleted file mode 100644
index e5d4b8d6e7..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsResource.Direct3D12.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using SharpDX.Direct3D12;
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// GraphicsResource class
-    /// </summary>
-    public abstract partial class GraphicsResource
-    {
-        internal GraphicsResource ParentResource;
-
-        internal long? StagingFenceValue;
-        internal CommandList StagingBuilder;
-        internal CpuDescriptorHandle NativeShaderResourceView;
-        internal CpuDescriptorHandle NativeUnorderedAccessView;
-        internal ResourceStates NativeResourceState;
-
-        protected bool IsDebugMode => GraphicsDevice != null && GraphicsDevice.IsDebugMode;
-
-        /// <summary>
-        /// Returns true if resource state transition is needed in order to use resource in given state
-        /// </summary>
-        /// <param name="targeState">Destination resource state</param>
-        /// <returns>True if need to perform a transition, otherwsie false</returns>
-        internal bool IsTransitionNeeded(ResourceStates targeState)
-        {
-            // If 'targeState' is a subset of 'before', then there's no need for a transition
-            // Note: COMMON is an oddball state that doesn't follow the RESOURE_STATE pattern of 
-            // having exactly one bit set so we need to special case these
-            return NativeResourceState != targeState && ((NativeResourceState | targeState) != NativeResourceState || targeState == ResourceStates.Common);
-        }
-    }
-}
- 
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsResourceBase.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/GraphicsResourceBase.Direct3D12.cs
deleted file mode 100644
index eaa455cbd5..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/GraphicsResourceBase.Direct3D12.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-using SharpDX;
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// GraphicsResource class
-    /// </summary>
-    public abstract partial class GraphicsResourceBase
-    {
-        private SharpDX.Direct3D12.DeviceChild nativeDeviceChild;
-
-        protected internal SharpDX.Direct3D12.Resource NativeResource { get; private set; }
-
-        private void Initialize()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets the device child.
-        /// </summary>
-        /// <value>The device child.</value>
-        protected internal SharpDX.Direct3D12.DeviceChild NativeDeviceChild
-        {
-            get
-            {
-                return nativeDeviceChild;
-            }
-            set
-            {
-                nativeDeviceChild = value;
-                NativeResource = nativeDeviceChild as SharpDX.Direct3D12.Resource;
-                // Associate PrivateData to this DeviceResource
-                SetDebugName(GraphicsDevice, nativeDeviceChild, Name);
-            }
-        }
-
-        /// <summary>
-        /// Associates the private data to the device child, useful to get the name in PIX debugger.
-        /// </summary>
-        internal static void SetDebugName(GraphicsDevice graphicsDevice, SharpDX.Direct3D12.DeviceChild deviceChild, string name)
-        {
-        }
-
-        /// <summary>
-        /// Called when graphics device has been detected to be internally destroyed.
-        /// </summary>
-        protected internal virtual void OnDestroyed()
-        {
-            if (nativeDeviceChild != null)
-            {
-                // Schedule the resource for destruction (as soon as we are done with it)
-                GraphicsDevice.TemporaryResources.Enqueue(new KeyValuePair<long, object>(GraphicsDevice.NextFenceValue, nativeDeviceChild));
-                nativeDeviceChild = null;
-            }
-            NativeResource = null;
-        }
-
-        /// <summary>
-        /// Called when graphics device has been recreated.
-        /// </summary>
-        /// <returns>True if item transitioned to a <see cref="GraphicsResourceLifetimeState.Active"/> state.</returns>
-        protected internal virtual bool OnRecreate()
-        {
-            return false;
-        }
-
-        protected SharpDX.Direct3D12.Device NativeDevice
-        {
-            get
-            {
-                return GraphicsDevice != null ? GraphicsDevice.NativeDevice : null;
-            }
-        }
-        
-        internal static void ReleaseComObject<T>(ref T comObject) where T : class, IUnknown
-        {
-            // We can't put IUnknown as a constraint on the generic as it would break compilation (trying to import SharpDX in projects with InternalVisibleTo)
-            var refCountResult = comObject.Release();
-            comObject = null;
-        }
-    }
-}
- 
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/PipelineState.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/PipelineState.Direct3D12.cs
deleted file mode 100644
index b28029a742..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/PipelineState.Direct3D12.cs
+++ /dev/null
@@ -1,372 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SharpDX.Direct3D;
-using SharpDX.Direct3D12;
-using SharpDX.DXGI;
-using Xenko.Core;
-using Xenko.Core.Storage;
-using Xenko.Shaders;
-
-namespace Xenko.Graphics
-{
-    public partial class PipelineState
-    {
-        internal SharpDX.Direct3D12.PipelineState CompiledState;
-        internal SharpDX.Direct3D12.RootSignature RootSignature;
-        internal PrimitiveTopology PrimitiveTopology;
-        internal bool HasScissorEnabled;
-        internal bool IsCompute;
-        internal int[] SrvBindCounts;
-        internal int[] SamplerBindCounts;
-
-        internal unsafe PipelineState(GraphicsDevice graphicsDevice, PipelineStateDescription pipelineStateDescription) : base(graphicsDevice)
-        {
-            if (pipelineStateDescription.RootSignature != null)
-            {
-                var effectReflection = pipelineStateDescription.EffectBytecode.Reflection;
-
-                var computeShader = pipelineStateDescription.EffectBytecode.Stages.FirstOrDefault(e => e.Stage == ShaderStage.Compute);
-                IsCompute = computeShader != null;
-
-                var rootSignatureParameters = new List<RootParameter>();
-                var immutableSamplers = new List<StaticSamplerDescription>();
-                SrvBindCounts = new int[pipelineStateDescription.RootSignature.EffectDescriptorSetReflection.Layouts.Count];
-                SamplerBindCounts = new int[pipelineStateDescription.RootSignature.EffectDescriptorSetReflection.Layouts.Count];
-                for (int layoutIndex = 0; layoutIndex < pipelineStateDescription.RootSignature.EffectDescriptorSetReflection.Layouts.Count; layoutIndex++)
-                {
-                    var layout = pipelineStateDescription.RootSignature.EffectDescriptorSetReflection.Layouts[layoutIndex];
-                    if (layout.Layout == null)
-                        continue;
-
-                    // TODO D3D12 for now, we don't control register so we simply generate one resource table per shader stage and per descriptor set layout
-                    //            we should switch to a model where we make sure VS/PS don't overlap for common descriptors so that they can be shared
-                    var srvDescriptorRanges = new Dictionary<ShaderStage, List<DescriptorRange>>();
-                    var samplerDescriptorRanges = new Dictionary<ShaderStage, List<DescriptorRange>>();
-                    
-                    int descriptorSrvOffset = 0;
-                    int descriptorSamplerOffset = 0;
-                    foreach (var item in layout.Layout.Entries)
-                    {
-                        var isSampler = item.Class == EffectParameterClass.Sampler;
-
-                        // Find matching resource bindings
-                        foreach (var binding in effectReflection.ResourceBindings)
-                        {
-                            if (binding.Stage == ShaderStage.None || binding.KeyInfo.Key != item.Key)
-                                continue;
-
-                            List<DescriptorRange> descriptorRanges;
-                            {
-                                var dictionary = isSampler ? samplerDescriptorRanges : srvDescriptorRanges;
-                                if (dictionary.TryGetValue(binding.Stage, out descriptorRanges) == false)
-                                {
-                                    descriptorRanges = dictionary[binding.Stage] = new List<DescriptorRange>();
-                                }
-                            }
-
-                            if (isSampler)
-                            {
-                                if (item.ImmutableSampler != null)
-                                {
-                                    immutableSamplers.Add(new StaticSamplerDescription(ShaderStage2ShaderVisibility(binding.Stage), binding.SlotStart, 0)
-                                    {
-                                        // TODO D3D12 ImmutableSampler should only be a state description instead of a GPU object?
-                                        Filter = (Filter)item.ImmutableSampler.Description.Filter,
-                                        ComparisonFunc = (Comparison)item.ImmutableSampler.Description.CompareFunction,
-                                        BorderColor = ColorHelper.ConvertStatic(item.ImmutableSampler.Description.BorderColor),
-                                        AddressU = (SharpDX.Direct3D12.TextureAddressMode)item.ImmutableSampler.Description.AddressU,
-                                        AddressV = (SharpDX.Direct3D12.TextureAddressMode)item.ImmutableSampler.Description.AddressV,
-                                        AddressW = (SharpDX.Direct3D12.TextureAddressMode)item.ImmutableSampler.Description.AddressW,
-                                        MinLOD = item.ImmutableSampler.Description.MinMipLevel,
-                                        MaxLOD = item.ImmutableSampler.Description.MaxMipLevel,
-                                        MipLODBias = item.ImmutableSampler.Description.MipMapLevelOfDetailBias,
-                                        MaxAnisotropy = item.ImmutableSampler.Description.MaxAnisotropy,
-                                    });
-                                }
-                                else
-                                {
-                                    // Add descriptor range
-                                    descriptorRanges.Add(new DescriptorRange(DescriptorRangeType.Sampler, item.ArraySize, binding.SlotStart, 0, descriptorSamplerOffset));
-                                }
-                            }
-                            else
-                            {
-                                DescriptorRangeType descriptorRangeType;
-                                switch (binding.Class)
-                                {
-                                    case EffectParameterClass.ConstantBuffer:
-                                        descriptorRangeType = DescriptorRangeType.ConstantBufferView;
-                                        break;
-                                    case EffectParameterClass.ShaderResourceView:
-                                        descriptorRangeType = DescriptorRangeType.ShaderResourceView;
-                                        break;
-                                    case EffectParameterClass.UnorderedAccessView:
-                                        descriptorRangeType = DescriptorRangeType.UnorderedAccessView;
-                                        break;
-                                    default:
-                                        throw new NotImplementedException();
-                                }
-
-                                // Add descriptor range
-                                descriptorRanges.Add(new DescriptorRange(descriptorRangeType, item.ArraySize, binding.SlotStart, 0, descriptorSrvOffset));
-                            }
-                        }
-
-                        // Move to next element (mirror what is done in DescriptorSetLayout)
-                        if (isSampler)
-                        {
-                            if (item.ImmutableSampler == null)
-                                descriptorSamplerOffset += item.ArraySize;
-                        }
-                        else
-                        {
-                            descriptorSrvOffset += item.ArraySize;
-                        }
-                    }
-
-                    foreach (var stage in srvDescriptorRanges)
-                    {
-                        if (stage.Value.Count > 0)
-                        {
-                            rootSignatureParameters.Add(new RootParameter(ShaderStage2ShaderVisibility(stage.Key), stage.Value.ToArray()));
-                            SrvBindCounts[layoutIndex]++;
-                        }
-                    }
-                    foreach (var stage in samplerDescriptorRanges)
-                    {
-                        if (stage.Value.Count > 0)
-                        {
-                            rootSignatureParameters.Add(new RootParameter(ShaderStage2ShaderVisibility(stage.Key), stage.Value.ToArray()));
-                            SamplerBindCounts[layoutIndex]++;
-                        }
-                    }
-                }
-                var rootSignatureDesc = new RootSignatureDescription(RootSignatureFlags.AllowInputAssemblerInputLayout, rootSignatureParameters.ToArray(), immutableSamplers.ToArray());
-
-                var rootSignature = NativeDevice.CreateRootSignature(0, rootSignatureDesc.Serialize());
-
-                InputElement[] inputElements = null;
-                if (pipelineStateDescription.InputElements != null)
-                {
-                    inputElements = new InputElement[pipelineStateDescription.InputElements.Length];
-                    for (int i = 0; i < inputElements.Length; ++i)
-                    {
-                        var inputElement = pipelineStateDescription.InputElements[i];
-                        inputElements[i] = new InputElement
-                        {
-                            Format = (SharpDX.DXGI.Format)inputElement.Format,
-                            AlignedByteOffset = inputElement.AlignedByteOffset,
-                            SemanticName = inputElement.SemanticName,
-                            SemanticIndex = inputElement.SemanticIndex,
-                            Slot = inputElement.InputSlot,
-                            Classification = (SharpDX.Direct3D12.InputClassification)inputElement.InputSlotClass,
-                            InstanceDataStepRate = inputElement.InstanceDataStepRate,
-                        };
-                    }
-                }
-
-                PrimitiveTopologyType primitiveTopologyType;
-                switch (pipelineStateDescription.PrimitiveType)
-                {
-                    case PrimitiveType.Undefined:
-                        primitiveTopologyType = PrimitiveTopologyType.Undefined;
-                        break;
-                    case PrimitiveType.PointList:
-                        primitiveTopologyType = PrimitiveTopologyType.Point;
-                        break;
-                    case PrimitiveType.LineList:
-                    case PrimitiveType.LineStrip:
-                    case PrimitiveType.LineListWithAdjacency:
-                    case PrimitiveType.LineStripWithAdjacency:
-                        primitiveTopologyType = PrimitiveTopologyType.Line;
-                        break;
-                    case PrimitiveType.TriangleList:
-                    case PrimitiveType.TriangleStrip:
-                    case PrimitiveType.TriangleListWithAdjacency:
-                    case PrimitiveType.TriangleStripWithAdjacency:
-                        primitiveTopologyType = PrimitiveTopologyType.Triangle;
-                        break;
-                    default:
-                        if (pipelineStateDescription.PrimitiveType >= PrimitiveType.PatchList && pipelineStateDescription.PrimitiveType < PrimitiveType.PatchList + 32)
-                            primitiveTopologyType = PrimitiveTopologyType.Patch;
-                        else
-                            throw new ArgumentOutOfRangeException("pipelineStateDescription.PrimitiveType");
-                        break;
-                }
-
-                // Check if it should use compute pipeline state
-                if (IsCompute)
-                {
-                    var nativePipelineStateDescription = new ComputePipelineStateDescription
-                    {
-                        ComputeShader = computeShader.Data,
-                        Flags =  PipelineStateFlags.None,
-                        RootSignature = rootSignature,
-                    };
-
-                    CompiledState = NativeDevice.CreateComputePipelineState(nativePipelineStateDescription);
-                }
-                else
-                {
-                    var nativePipelineStateDescription = new GraphicsPipelineStateDescription
-                    {
-                        InputLayout = new InputLayoutDescription(inputElements),
-                        RootSignature = rootSignature,
-                        RasterizerState = CreateRasterizerState(pipelineStateDescription.RasterizerState),
-                        BlendState = CreateBlendState(pipelineStateDescription.BlendState),
-                        SampleMask = (int)pipelineStateDescription.SampleMask,
-                        DepthStencilFormat = (SharpDX.DXGI.Format)pipelineStateDescription.Output.DepthStencilFormat,
-                        DepthStencilState = CreateDepthStencilState(pipelineStateDescription.DepthStencilState),
-                        RenderTargetCount = pipelineStateDescription.Output.RenderTargetCount,
-                        // TODO D3D12 hardcoded
-                        StreamOutput = new StreamOutputDescription(),
-                        PrimitiveTopologyType = primitiveTopologyType,
-                        // TODO D3D12 hardcoded
-                        SampleDescription = new SharpDX.DXGI.SampleDescription(1, 0),
-                    };
-
-                    // Disable depth buffer if no format specified
-                    if (nativePipelineStateDescription.DepthStencilFormat == Format.Unknown)
-                        nativePipelineStateDescription.DepthStencilState.IsDepthEnabled = false;
-
-                    fixed (PixelFormat* renderTargetFormats = &pipelineStateDescription.Output.RenderTargetFormat0)
-                    {
-                        for (int i = 0; i < pipelineStateDescription.Output.RenderTargetCount; ++i)
-                            nativePipelineStateDescription.RenderTargetFormats[i] = (SharpDX.DXGI.Format)renderTargetFormats[i];
-                    }
-
-                    foreach (var stage in pipelineStateDescription.EffectBytecode.Stages)
-                    {
-                        switch (stage.Stage)
-                        {
-                            case ShaderStage.Vertex:
-                                nativePipelineStateDescription.VertexShader = stage.Data;
-                                break;
-                            case ShaderStage.Hull:
-                                nativePipelineStateDescription.HullShader = stage.Data;
-                                break;
-                            case ShaderStage.Domain:
-                                nativePipelineStateDescription.DomainShader = stage.Data;
-                                break;
-                            case ShaderStage.Geometry:
-                                nativePipelineStateDescription.GeometryShader = stage.Data;
-                                break;
-                            case ShaderStage.Pixel:
-                                nativePipelineStateDescription.PixelShader = stage.Data;
-                                break;
-                            default:
-                                throw new ArgumentOutOfRangeException();
-                        }
-                    }
-
-                    CompiledState = NativeDevice.CreateGraphicsPipelineState(nativePipelineStateDescription);
-                }
-
-                RootSignature = rootSignature;
-                PrimitiveTopology = (PrimitiveTopology)pipelineStateDescription.PrimitiveType;
-                HasScissorEnabled = pipelineStateDescription.RasterizerState.ScissorTestEnable;
-            }
-        }
-
-        protected internal override void OnDestroyed()
-        {
-            RootSignature?.Dispose();
-            RootSignature = null;
-
-            CompiledState?.Dispose();
-            CompiledState = null;
-
-            base.OnDestroyed();
-        }
-
-        private unsafe SharpDX.Direct3D12.BlendStateDescription CreateBlendState(BlendStateDescription description)
-        {
-            var nativeDescription = new SharpDX.Direct3D12.BlendStateDescription();
-
-            nativeDescription.AlphaToCoverageEnable = description.AlphaToCoverageEnable;
-            nativeDescription.IndependentBlendEnable = description.IndependentBlendEnable;
-
-            var renderTargets = &description.RenderTarget0;
-            for (int i = 0; i < 8; ++i)
-            {
-                nativeDescription.RenderTarget[i].IsBlendEnabled = renderTargets[i].BlendEnable;
-                nativeDescription.RenderTarget[i].SourceBlend = (BlendOption)renderTargets[i].ColorSourceBlend;
-                nativeDescription.RenderTarget[i].DestinationBlend = (BlendOption)renderTargets[i].ColorDestinationBlend;
-                nativeDescription.RenderTarget[i].BlendOperation = (BlendOperation)renderTargets[i].ColorBlendFunction;
-                nativeDescription.RenderTarget[i].SourceAlphaBlend = (BlendOption)renderTargets[i].AlphaSourceBlend;
-                nativeDescription.RenderTarget[i].DestinationAlphaBlend = (BlendOption)renderTargets[i].AlphaDestinationBlend;
-                nativeDescription.RenderTarget[i].AlphaBlendOperation = (BlendOperation)renderTargets[i].AlphaBlendFunction;
-                nativeDescription.RenderTarget[i].RenderTargetWriteMask = (ColorWriteMaskFlags)renderTargets[i].ColorWriteChannels;
-            }
-
-            return nativeDescription;
-        }
-
-        private SharpDX.Direct3D12.RasterizerStateDescription CreateRasterizerState(RasterizerStateDescription description)
-        {
-            SharpDX.Direct3D12.RasterizerStateDescription nativeDescription;
-
-            nativeDescription.CullMode = (SharpDX.Direct3D12.CullMode)description.CullMode;
-            nativeDescription.FillMode = (SharpDX.Direct3D12.FillMode)description.FillMode;
-            nativeDescription.IsFrontCounterClockwise = description.FrontFaceCounterClockwise;
-            nativeDescription.DepthBias = description.DepthBias;
-            nativeDescription.SlopeScaledDepthBias = description.SlopeScaleDepthBias;
-            nativeDescription.DepthBiasClamp = description.DepthBiasClamp;
-            nativeDescription.IsDepthClipEnabled = description.DepthClipEnable;
-            //nativeDescription.IsScissorEnabled = description.ScissorTestEnable;
-            nativeDescription.IsMultisampleEnabled = description.MultisampleCount >= MultisampleCount.None;
-            nativeDescription.IsAntialiasedLineEnabled = description.MultisampleAntiAliasLine;
-
-            nativeDescription.ConservativeRaster = ConservativeRasterizationMode.Off;
-            nativeDescription.ForcedSampleCount = 0;
-
-            return nativeDescription;
-        }
-
-        private SharpDX.Direct3D12.DepthStencilStateDescription CreateDepthStencilState(DepthStencilStateDescription description)
-        {
-            SharpDX.Direct3D12.DepthStencilStateDescription nativeDescription;
-
-            nativeDescription.IsDepthEnabled = description.DepthBufferEnable;
-            nativeDescription.DepthComparison = (Comparison)description.DepthBufferFunction;
-            nativeDescription.DepthWriteMask = description.DepthBufferWriteEnable ? SharpDX.Direct3D12.DepthWriteMask.All : SharpDX.Direct3D12.DepthWriteMask.Zero;
-
-            nativeDescription.IsStencilEnabled = description.StencilEnable;
-            nativeDescription.StencilReadMask = description.StencilMask;
-            nativeDescription.StencilWriteMask = description.StencilWriteMask;
-
-            nativeDescription.FrontFace.FailOperation = (SharpDX.Direct3D12.StencilOperation)description.FrontFace.StencilFail;
-            nativeDescription.FrontFace.PassOperation = (SharpDX.Direct3D12.StencilOperation)description.FrontFace.StencilPass;
-            nativeDescription.FrontFace.DepthFailOperation = (SharpDX.Direct3D12.StencilOperation)description.FrontFace.StencilDepthBufferFail;
-            nativeDescription.FrontFace.Comparison = (SharpDX.Direct3D12.Comparison)description.FrontFace.StencilFunction;
-
-            nativeDescription.BackFace.FailOperation = (SharpDX.Direct3D12.StencilOperation)description.BackFace.StencilFail;
-            nativeDescription.BackFace.PassOperation = (SharpDX.Direct3D12.StencilOperation)description.BackFace.StencilPass;
-            nativeDescription.BackFace.DepthFailOperation = (SharpDX.Direct3D12.StencilOperation)description.BackFace.StencilDepthBufferFail;
-            nativeDescription.BackFace.Comparison = (SharpDX.Direct3D12.Comparison)description.BackFace.StencilFunction;
-
-            return nativeDescription;
-        }
-
-        private static ShaderVisibility ShaderStage2ShaderVisibility(ShaderStage stage)
-        {
-            switch (stage)
-            {
-                case ShaderStage.Vertex: return ShaderVisibility.Vertex;
-                case ShaderStage.Hull: return ShaderVisibility.Hull;
-                case ShaderStage.Domain: return ShaderVisibility.Domain;
-                case ShaderStage.Geometry: return ShaderVisibility.Geometry;
-                case ShaderStage.Pixel: return ShaderVisibility.Pixel;
-                case ShaderStage.Compute: return ShaderVisibility.All;
-                default:
-                    throw new ArgumentOutOfRangeException(nameof(stage), stage, null);
-            }
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/QueryPool.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/QueryPool.Direct3D12.cs
deleted file mode 100644
index 9ebccbd4e7..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/QueryPool.Direct3D12.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using SharpDX.Direct3D12;
-using Xenko.Core;
-
-namespace Xenko.Graphics
-{
-    public partial class QueryPool
-    {
-        private Resource readbackBuffer;
-        private Fence readbackFence;
-
-        internal long CompletedValue;
-        internal long PendingValue;
-        internal QueryHeap NativeQueryHeap;
-
-        public unsafe bool TryGetData(long[] dataArray)
-        {
-            // If readback has completed, return the data from the staging buffer
-            if (readbackFence.CompletedValue == PendingValue)
-            {
-                CompletedValue = PendingValue;
-
-                var mappedData = readbackBuffer.Map(0);
-                fixed (long* dataPointer = &dataArray[0])
-                {
-                    Utilities.CopyMemory(new IntPtr(dataPointer), mappedData, QueryCount * 8);
-                }
-                readbackBuffer.Unmap(0);
-                return true;
-            }
-
-            // Otherwise, queue readback
-            var commandList = GraphicsDevice.NativeCopyCommandList;
-
-            commandList.Reset(GraphicsDevice.NativeCopyCommandAllocator, null);
-            commandList.ResolveQueryData(NativeQueryHeap, SharpDX.Direct3D12.QueryType.Timestamp, 0, QueryCount, readbackBuffer, 0);
-            commandList.Close();
-
-            GraphicsDevice.NativeCommandQueue.ExecuteCommandList(GraphicsDevice.NativeCopyCommandList);
-            GraphicsDevice.NativeCommandQueue.Signal(readbackFence, PendingValue);
-
-            return false;
-        }
-
-        private void Recreate()
-        {
-            var description = new QueryHeapDescription { Count = QueryCount };
-
-            switch (QueryType)
-            {
-                case QueryType.Timestamp:
-                    description.Type = QueryHeapType.Timestamp;
-                    break;
-
-                default:
-                    throw new NotImplementedException();
-            }
-           
-            NativeQueryHeap = NativeDevice.CreateQueryHeap(description);
-            readbackBuffer = NativeDevice.CreateCommittedResource(new HeapProperties(HeapType.Readback), HeapFlags.None, ResourceDescription.Buffer(QueryCount * 8), ResourceStates.CopyDestination);
-            readbackFence = NativeDevice.CreateFence(0, FenceFlags.None);
-            CompletedValue = 0;
-            PendingValue = 0;
-        }
-
-        /// <inheritdoc/>
-        protected internal override void OnDestroyed()
-        {
-            NativeQueryHeap.Dispose();
-            readbackBuffer.Dispose();
-            readbackFence.Dispose();
-
-            base.OnDestroyed();
-        }
-
-        internal void ResetInternal()
-        {
-            if (CompletedValue <= readbackFence.CompletedValue)
-                CompletedValue = readbackFence.CompletedValue + 1;
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/SamplerState.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/SamplerState.Direct3D12.cs
deleted file mode 100644
index 090706986a..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/SamplerState.Direct3D12.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D12
-using System;
-using SharpDX;
-using SharpDX.Direct3D12;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Describes a sampler state used for texture sampling.
-    /// </summary>
-    public partial class SamplerState
-    {
-        internal CpuDescriptorHandle NativeSampler;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SamplerState"/> class.
-        /// </summary>
-        /// <param name="device">The device.</param>
-        /// <param name="name">The name.</param>
-        /// <param name="samplerStateDescription">The sampler state description.</param>
-        private SamplerState(GraphicsDevice device, SamplerStateDescription samplerStateDescription) : base(device)
-        {
-            Description = samplerStateDescription;
-
-            CreateNativeDeviceChild();
-        }
-
-        /// <inheritdoc/>
-        protected internal override bool OnRecreate()
-        {
-            base.OnRecreate();
-            CreateNativeDeviceChild();
-            return true;
-        }
-
-        private void CreateNativeDeviceChild()
-        {
-            SharpDX.Direct3D12.SamplerStateDescription nativeDescription;
-
-            nativeDescription.AddressU = (SharpDX.Direct3D12.TextureAddressMode)Description.AddressU;
-            nativeDescription.AddressV = (SharpDX.Direct3D12.TextureAddressMode)Description.AddressV;
-            nativeDescription.AddressW = (SharpDX.Direct3D12.TextureAddressMode)Description.AddressW;
-            nativeDescription.BorderColor = ColorHelper.Convert(Description.BorderColor);
-            nativeDescription.ComparisonFunction = (SharpDX.Direct3D12.Comparison)Description.CompareFunction;
-            nativeDescription.Filter = (SharpDX.Direct3D12.Filter)Description.Filter;
-            nativeDescription.MaximumAnisotropy = Description.MaxAnisotropy;
-            nativeDescription.MaximumLod = Description.MaxMipLevel;
-            nativeDescription.MinimumLod = Description.MinMipLevel;
-            nativeDescription.MipLodBias = Description.MipMapLevelOfDetailBias;
-
-            NativeSampler = GraphicsDevice.SamplerAllocator.Allocate(1);
-            GraphicsDevice.NativeDevice.CreateSampler(nativeDescription, NativeSampler);
-        }
-    }
-} 
-#endif
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/Texture.Direct3D12.cs b/sources/engine/Xenko.Graphics/Direct3D12/Texture.Direct3D12.cs
deleted file mode 100644
index 1e7f5243ec..0000000000
--- a/sources/engine/Xenko.Graphics/Direct3D12/Texture.Direct3D12.cs
+++ /dev/null
@@ -1,891 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_DIRECT3D12
-// Copyright (c) 2010-2012 SharpDX - Alexandre Mutel
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SharpDX.Direct3D12;
-using SharpDX.Mathematics.Interop;
-using Xenko.Core;
-
-namespace Xenko.Graphics
-{
-    public partial class Texture
-    {
-        internal CpuDescriptorHandle NativeRenderTargetView;
-        internal CpuDescriptorHandle NativeDepthStencilView;
-        public bool HasStencil;
-
-        private int TexturePixelSize => Format.SizeInBytes();
-        // D3D12_TEXTURE_DATA_PITCH_ALIGNMENT (not exposed by SharpDX)
-        private const int TextureRowPitchAlignment = 256;
-        // D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT (not exposed by SharpDX)
-        private const int TextureSubresourceAlignment = 512;
-
-        public void Recreate(DataBox[] dataBoxes = null)
-        {
-            InitializeFromImpl(dataBoxes);
-        }
-
-        public static bool IsDepthStencilReadOnlySupported(GraphicsDevice device)
-        {
-            return device.Features.CurrentProfile >= GraphicsProfile.Level_11_0;
-        }
-
-        internal void SwapInternal(Texture other)
-        {
-            var deviceChild = NativeDeviceChild;
-            NativeDeviceChild = other.NativeDeviceChild;
-            other.NativeDeviceChild = deviceChild;
-            //
-            var srv = NativeShaderResourceView;
-            NativeShaderResourceView = other.NativeShaderResourceView;
-            other.NativeShaderResourceView = srv;
-            //
-            var uav = NativeUnorderedAccessView;
-            NativeUnorderedAccessView = other.NativeUnorderedAccessView;
-            other.NativeUnorderedAccessView = uav;
-            //
-            Utilities.Swap(ref StagingFenceValue, ref other.StagingFenceValue);
-            Utilities.Swap(ref StagingBuilder, ref other.StagingBuilder);
-            Utilities.Swap(ref NativeResourceState, ref other.NativeResourceState);
-            Utilities.Swap(ref NativeRenderTargetView, ref other.NativeRenderTargetView);
-            Utilities.Swap(ref NativeDepthStencilView, ref other.NativeDepthStencilView);
-            Utilities.Swap(ref HasStencil, ref other.HasStencil);
-        }
-
-        /// <summary>
-        /// Initializes from a native SharpDX.Texture
-        /// </summary>
-        /// <param name="texture">The texture.</param>
-        internal Texture InitializeFromImpl(SharpDX.Direct3D12.Resource texture, bool isSrgb)
-        {
-            NativeDeviceChild = texture;
-            var newTextureDescription = ConvertFromNativeDescription(texture.Description);
-
-            // We might have created the swapchain as a non-srgb format (esp on Win10&RT) but we want it to behave like it is (esp. for the view and render target)
-            if (isSrgb)
-                newTextureDescription.Format = newTextureDescription.Format.ToSRgb();
-
-            return InitializeFrom(newTextureDescription);
-        }
-
-        private void InitializeFromImpl(DataBox[] dataBoxes = null)
-        {
-            bool hasInitData = dataBoxes != null && dataBoxes.Length > 0;
-
-            if (ParentTexture != null)
-            {
-                ParentResource = ParentTexture;
-                NativeDeviceChild = ParentTexture.NativeDeviceChild;
-            }
-
-            if (NativeDeviceChild == null)
-            {
-                ClearValue? clearValue = GetClearValue();
-
-                ResourceDescription nativeDescription;
-                switch (Dimension)
-                {
-                    case TextureDimension.Texture1D:
-                        nativeDescription = ConvertToNativeDescription1D();
-                        break;
-                    case TextureDimension.Texture2D:
-                    case TextureDimension.TextureCube:
-                        nativeDescription = ConvertToNativeDescription2D();
-                        break;
-                    case TextureDimension.Texture3D:
-                        nativeDescription = ConvertToNativeDescription3D();
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
-                }
-
-                var initialResourceState = ResourceStates.GenericRead;
-
-                var heapType = HeapType.Default;
-                var currentResourceState = initialResourceState;
-                if (Usage == GraphicsResourceUsage.Staging)
-                {
-                    heapType = HeapType.Readback;
-                    NativeResourceState = ResourceStates.CopyDestination;
-                    int totalSize = ComputeBufferTotalSize();
-                    nativeDescription = ResourceDescription.Buffer(totalSize);
-
-                    // Staging textures on DirectX 12 use buffer internally
-                    NativeDeviceChild = GraphicsDevice.NativeDevice.CreateCommittedResource(new HeapProperties(heapType), HeapFlags.None, nativeDescription, NativeResourceState);
-
-                    if (hasInitData)
-                    {
-                        var commandList = GraphicsDevice.NativeCopyCommandList;
-                        commandList.Reset(GraphicsDevice.NativeCopyCommandAllocator, null);
-                        
-                        Resource uploadResource;
-                        int uploadOffset;
-                        var uploadMemory = GraphicsDevice.AllocateUploadBuffer(totalSize, out uploadResource, out uploadOffset, TextureSubresourceAlignment);
-                        
-                        // Copy data to the upload buffer
-                        int dataBoxIndex = 0;
-                        var uploadMemoryMipStart = uploadMemory;
-                        for (int arraySlice = 0; arraySlice < ArraySize; arraySlice++)
-                        {
-                            for (int mipLevel = 0; mipLevel < MipLevels; mipLevel++)
-                            {
-                                var databox = dataBoxes[dataBoxIndex++];
-                                var mipHeight = CalculateMipSize(Width, mipLevel);
-                                var mipRowPitch = ComputeRowPitch(mipLevel);
-
-                                var uploadMemoryCurrent = uploadMemoryMipStart;
-                                var dataPointerCurrent = databox.DataPointer;
-                                for (int rowIndex = 0; rowIndex < mipHeight; rowIndex++)
-                                {
-                                    Utilities.CopyMemory(uploadMemoryCurrent, dataPointerCurrent, mipRowPitch);
-                                    uploadMemoryCurrent += mipRowPitch;
-                                    dataPointerCurrent += databox.RowPitch;
-                                }
-
-                                uploadMemoryMipStart += ComputeSubresourceSize(mipLevel);
-                            }
-                        }
-                        
-                        // Copy from upload heap to actual resource
-                        commandList.CopyBufferRegion(NativeResource, 0, uploadResource, uploadOffset, totalSize);
-                        
-                        commandList.Close();
-
-                        StagingFenceValue = 0;
-                        GraphicsDevice.WaitCopyQueue();
-                    }
-
-                    return;
-                }
-
-                if (hasInitData)
-                    currentResourceState = ResourceStates.CopyDestination;
-
-                // TODO D3D12 move that to a global allocator in bigger committed resources
-                NativeDeviceChild = GraphicsDevice.NativeDevice.CreateCommittedResource(new HeapProperties(heapType), HeapFlags.None, nativeDescription, currentResourceState, clearValue);
-                GraphicsDevice.RegisterTextureMemoryUsage(SizeInBytes);
-
-                if (hasInitData)
-                {
-                    // Trigger copy
-                    var commandList = GraphicsDevice.NativeCopyCommandList;
-                    commandList.Reset(GraphicsDevice.NativeCopyCommandAllocator, null);
-
-                    long textureCopySize;
-                    var placedSubresources = new PlacedSubResourceFootprint[dataBoxes.Length];
-                    var rowCounts = new int[dataBoxes.Length];
-                    var rowSizeInBytes = new long[dataBoxes.Length];
-                    GraphicsDevice.NativeDevice.GetCopyableFootprints(ref nativeDescription, 0, dataBoxes.Length, 0, placedSubresources, rowCounts, rowSizeInBytes, out textureCopySize);
-
-                    SharpDX.Direct3D12.Resource uploadResource;
-                    int uploadOffset;
-                    var uploadMemory = GraphicsDevice.AllocateUploadBuffer((int)textureCopySize, out uploadResource, out uploadOffset, TextureSubresourceAlignment);
-
-                    for (int i = 0; i < dataBoxes.Length; ++i)
-                    {
-                        var databox = dataBoxes[i];
-                        var dataPointer = databox.DataPointer;
-
-                        var rowCount = rowCounts[i];
-                        var sliceCount = placedSubresources[i].Footprint.Depth;
-                        var rowSize = (int)rowSizeInBytes[i];
-                        var destRowPitch = placedSubresources[i].Footprint.RowPitch;
-
-                        // Memcpy data
-                        for (int z = 0; z < sliceCount; ++z)
-                        {
-                            var uploadMemoryCurrent = uploadMemory + (int)placedSubresources[i].Offset + z * destRowPitch * rowCount;
-                            var dataPointerCurrent = dataPointer + z * databox.SlicePitch;
-                            for (int y = 0; y < rowCount; ++y)
-                            {
-                                Utilities.CopyMemory(uploadMemoryCurrent, dataPointerCurrent, rowSize);
-                                uploadMemoryCurrent += destRowPitch;
-                                dataPointerCurrent += databox.RowPitch;
-                            }
-                        }
-
-                        // Adjust upload offset (circular dependency between GetCopyableFootprints and AllocateUploadBuffer)
-                        placedSubresources[i].Offset += uploadOffset;
-
-                        commandList.CopyTextureRegion(new TextureCopyLocation(NativeResource, i), 0, 0, 0, new TextureCopyLocation(uploadResource, placedSubresources[i]), null);
-                    }
-
-                    commandList.ResourceBarrierTransition(NativeResource, ResourceStates.CopyDestination, initialResourceState);
-                    commandList.Close();
-
-                    GraphicsDevice.WaitCopyQueue();
-                }
-
-                NativeResourceState = initialResourceState;
-            }
-
-            NativeShaderResourceView = GetShaderResourceView(ViewType, ArraySlice, MipLevel);
-            NativeRenderTargetView = GetRenderTargetView(ViewType, ArraySlice, MipLevel);
-            NativeDepthStencilView = GetDepthStencilView(out HasStencil);
-            NativeUnorderedAccessView = GetUnorderedAccessView(ViewType, ArraySlice, MipLevel);
-        }
-
-        protected internal override void OnDestroyed()
-        {
-            // If it was a View, do not release reference
-            if (ParentTexture != null)
-            {
-                NativeDeviceChild = null;
-            }
-            else if (GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterTextureMemoryUsage(-SizeInBytes);
-            }
-
-            base.OnDestroyed();
-        }
-
-        private void OnRecreateImpl()
-        {
-            // Dependency: wait for underlying texture to be recreated
-            if (ParentTexture != null && ParentTexture.LifetimeState != GraphicsResourceLifetimeState.Active)
-                return;
-
-            // Render Target / Depth Stencil are considered as "dynamic"
-            if ((Usage == GraphicsResourceUsage.Immutable
-                    || Usage == GraphicsResourceUsage.Default)
-                && !IsRenderTarget && !IsDepthStencil)
-                return;
-
-            if (ParentTexture == null && GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterTextureMemoryUsage(-SizeInBytes);
-            }
-
-            InitializeFromImpl();
-        }
-
-        /// <summary>
-        /// Gets a specific <see cref="ShaderResourceView" /> from this texture.
-        /// </summary>
-        /// <param name="viewType">Type of the view slice.</param>
-        /// <param name="arrayOrDepthSlice">The texture array slice index.</param>
-        /// <param name="mipIndex">The mip map slice index.</param>
-        /// <returns>An <see cref="ShaderResourceView" /></returns>
-        private CpuDescriptorHandle GetShaderResourceView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
-        {
-            if (!IsShaderResource)
-                return new CpuDescriptorHandle();
-
-            int arrayCount;
-            int mipCount;
-            GetViewSliceBounds(viewType, ref arrayOrDepthSlice, ref mipIndex, out arrayCount, out mipCount);
-
-            // Create the view
-            // TODO D3D12 Shader4ComponentMapping is now set to default value D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING (0x00001688); need better control
-            var srvDescription = new ShaderResourceViewDescription() { Shader4ComponentMapping = 0x00001688, Format = ComputeShaderResourceViewFormat() };
-
-            // Initialize for texture arrays or texture cube
-            if (this.ArraySize > 1)
-            {
-                // If texture cube
-                if (this.Dimension == TextureDimension.TextureCube && viewType == ViewType.Full)
-                {
-                    srvDescription.Dimension = ShaderResourceViewDimension.TextureCube;
-                    srvDescription.TextureCube.MipLevels = mipCount;
-                    srvDescription.TextureCube.MostDetailedMip = mipIndex;
-                }
-                else
-                {
-                    // Else regular Texture array
-                    // Multisample?
-                    if (IsMultisample)
-                    {
-                        if (Dimension != TextureDimension.Texture2D)
-                        {
-                            throw new NotSupportedException("Multisample is only supported for 2D Textures");
-                        }
-
-                        srvDescription.Dimension = ShaderResourceViewDimension.Texture2DMultisampledArray;
-                        srvDescription.Texture2DMSArray.ArraySize = arrayCount;
-                        srvDescription.Texture2DMSArray.FirstArraySlice = arrayOrDepthSlice;
-                    }
-                    else
-                    {
-                        srvDescription.Dimension = Dimension == TextureDimension.Texture2D || Dimension == TextureDimension.TextureCube ? ShaderResourceViewDimension.Texture2DArray : ShaderResourceViewDimension.Texture1DArray;
-                        srvDescription.Texture2DArray.ArraySize = arrayCount;
-                        srvDescription.Texture2DArray.FirstArraySlice = arrayOrDepthSlice;
-                        srvDescription.Texture2DArray.MipLevels = mipCount;
-                        srvDescription.Texture2DArray.MostDetailedMip = mipIndex;
-                    }
-                }
-            }
-            else
-            {
-                if (IsMultisample)
-                {
-                    if (Dimension != TextureDimension.Texture2D)
-                    {
-                        throw new NotSupportedException("Multisample is only supported for 2D Textures");
-                    }
-
-                    srvDescription.Dimension = ShaderResourceViewDimension.Texture2DMultisampled;
-                }
-                else
-                {
-                    switch (Dimension)
-                    {
-                        case TextureDimension.Texture1D:
-                            srvDescription.Dimension = ShaderResourceViewDimension.Texture1D;
-                            break;
-                        case TextureDimension.Texture2D:
-                            srvDescription.Dimension = ShaderResourceViewDimension.Texture2D;
-                            break;
-                        case TextureDimension.Texture3D:
-                            srvDescription.Dimension = ShaderResourceViewDimension.Texture3D;
-                            break;
-                        case TextureDimension.TextureCube:
-                            throw new NotSupportedException("TextureCube dimension is expecting an arraysize > 1");
-                    }
-                    // Use srvDescription.Texture as it matches also Texture and Texture3D memory layout
-                    srvDescription.Texture1D.MipLevels = mipCount;
-                    srvDescription.Texture1D.MostDetailedMip = mipIndex;
-                }
-            }
-
-            // Default ShaderResourceView
-            var descriptorHandle = GraphicsDevice.ShaderResourceViewAllocator.Allocate(1);
-            NativeDevice.CreateShaderResourceView(NativeResource, srvDescription, descriptorHandle);
-            return descriptorHandle;
-        }
-
-        /// <summary>
-        /// Gets a specific <see cref="RenderTargetView" /> from this texture.
-        /// </summary>
-        /// <param name="viewType">Type of the view slice.</param>
-        /// <param name="arrayOrDepthSlice">The texture array slice index.</param>
-        /// <param name="mipIndex">Index of the mip.</param>
-        /// <returns>An <see cref="RenderTargetView" /></returns>
-        /// <exception cref="System.NotSupportedException">ViewSlice.MipBand is not supported for render targets</exception>
-        private CpuDescriptorHandle GetRenderTargetView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
-        {
-            if (!IsRenderTarget)
-                return new CpuDescriptorHandle();
-
-            if (viewType == ViewType.MipBand)
-                throw new NotSupportedException("ViewSlice.MipBand is not supported for render targets");
-
-            int arrayCount;
-            int mipCount;
-            GetViewSliceBounds(viewType, ref arrayOrDepthSlice, ref mipIndex, out arrayCount, out mipCount);
-
-            // Create the render target view
-            var rtvDescription = new RenderTargetViewDescription() { Format = (SharpDX.DXGI.Format)ViewFormat };
-
-            if (this.ArraySize > 1)
-            {
-                if (this.MultisampleCount > MultisampleCount.None)
-                {
-                    if (Dimension != TextureDimension.Texture2D)
-                    {
-                        throw new NotSupportedException("Multisample is only supported for 2D Textures");
-                    }
-
-                    rtvDescription.Dimension = RenderTargetViewDimension.Texture2DMultisampledArray;
-                    rtvDescription.Texture2DMSArray.ArraySize = arrayCount;
-                    rtvDescription.Texture2DMSArray.FirstArraySlice = arrayOrDepthSlice;
-                }
-                else
-                {
-                    if (Dimension == TextureDimension.Texture3D)
-                    {
-                        throw new NotSupportedException("Texture Array is not supported for Texture3D");
-                    }
-
-                    rtvDescription.Dimension = Dimension == TextureDimension.Texture2D || Dimension == TextureDimension.TextureCube ? RenderTargetViewDimension.Texture2DArray : RenderTargetViewDimension.Texture1DArray;
-
-                    // Use rtvDescription.Texture1DArray as it matches also Texture memory layout
-                    rtvDescription.Texture1DArray.ArraySize = arrayCount;
-                    rtvDescription.Texture1DArray.FirstArraySlice = arrayOrDepthSlice;
-                    rtvDescription.Texture1DArray.MipSlice = mipIndex;
-                }
-            }
-            else
-            {
-                if (IsMultisample)
-                {
-                    if (Dimension != TextureDimension.Texture2D)
-                    {
-                        throw new NotSupportedException("Multisample is only supported for 2D RenderTarget Textures");
-                    }
-
-                    rtvDescription.Dimension = RenderTargetViewDimension.Texture2DMultisampled;
-                }
-                else
-                {
-                    switch (Dimension)
-                    {
-                        case TextureDimension.Texture1D:
-                            rtvDescription.Dimension = RenderTargetViewDimension.Texture1D;
-                            rtvDescription.Texture1D.MipSlice = mipIndex;
-                            break;
-                        case TextureDimension.Texture2D:
-                            rtvDescription.Dimension = RenderTargetViewDimension.Texture2D;
-                            rtvDescription.Texture2D.MipSlice = mipIndex;
-                            break;
-                        case TextureDimension.Texture3D:
-                            rtvDescription.Dimension = RenderTargetViewDimension.Texture3D;
-                            rtvDescription.Texture3D.DepthSliceCount = arrayCount;
-                            rtvDescription.Texture3D.FirstDepthSlice = arrayOrDepthSlice;
-                            rtvDescription.Texture3D.MipSlice = mipIndex;
-                            break;
-                        case TextureDimension.TextureCube:
-                            throw new NotSupportedException("TextureCube dimension is expecting an arraysize > 1");
-                    }
-                }
-            }
-
-            var descriptorHandle = GraphicsDevice.RenderTargetViewAllocator.Allocate(1);
-            NativeDevice.CreateRenderTargetView(NativeResource, rtvDescription, descriptorHandle);
-            return descriptorHandle;
-        }
-
-        private CpuDescriptorHandle GetDepthStencilView(out bool hasStencil)
-        {
-            hasStencil = false;
-            if (!IsDepthStencil)
-                return new CpuDescriptorHandle();
-
-            // Check that the format is supported
-            if (ComputeShaderResourceFormatFromDepthFormat(ViewFormat) == PixelFormat.None)
-                throw new NotSupportedException("Depth stencil format [{0}] not supported".ToFormat(ViewFormat));
-
-            // Setup the HasStencil flag
-            hasStencil = IsStencilFormat(ViewFormat);
-
-            // Create a Depth stencil view on this texture2D
-            var depthStencilViewDescription = new DepthStencilViewDescription
-            {
-                Format = ComputeDepthViewFormatFromTextureFormat(ViewFormat),
-                Flags = DepthStencilViewFlags.None,
-            };
-
-            if (ArraySize > 1)
-            {
-                depthStencilViewDescription.Dimension = DepthStencilViewDimension.Texture2DArray;
-                depthStencilViewDescription.Texture2DArray.ArraySize = ArraySize;
-                depthStencilViewDescription.Texture2DArray.FirstArraySlice = 0;
-                depthStencilViewDescription.Texture2DArray.MipSlice = 0;
-            }
-            else
-            {
-                depthStencilViewDescription.Dimension = DepthStencilViewDimension.Texture2D;
-                depthStencilViewDescription.Texture2D.MipSlice = 0;
-            }
-
-            if (MultisampleCount > MultisampleCount.None)
-                depthStencilViewDescription.Dimension = DepthStencilViewDimension.Texture2DMultisampled;
-
-            if (IsDepthStencilReadOnly)
-            {
-                if (!IsDepthStencilReadOnlySupported(GraphicsDevice))
-                    throw new NotSupportedException("Cannot instantiate ReadOnly DepthStencilBuffer. Not supported on this device.");
-
-                // Create a Depth stencil view on this texture2D
-                depthStencilViewDescription.Flags = DepthStencilViewFlags.ReadOnlyDepth;
-                if (HasStencil)
-                    depthStencilViewDescription.Flags |= DepthStencilViewFlags.ReadOnlyStencil;
-            }
-
-            var descriptorHandle = GraphicsDevice.DepthStencilViewAllocator.Allocate(1);
-            NativeDevice.CreateDepthStencilView(NativeResource, depthStencilViewDescription, descriptorHandle);
-            return descriptorHandle;
-        }
-
-        private CpuDescriptorHandle GetUnorderedAccessView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
-        {
-            if (!IsUnorderedAccess)
-                return new CpuDescriptorHandle();
-
-            if (IsMultisample)
-                throw new NotSupportedException("Multisampling is not supported for unordered access views");
-            
-            int arrayCount;
-            int mipCount;
-            GetViewSliceBounds(viewType, ref arrayOrDepthSlice, ref mipIndex, out arrayCount, out mipCount);
-
-            // Create a Unordered Access view on this texture2D
-            var uavDescription = new UnorderedAccessViewDescription
-            {
-                Format = (SharpDX.DXGI.Format)ViewFormat
-            };
-
-            if (ArraySize > 1)
-            {
-                switch (Dimension)
-                {
-                    case TextureDimension.Texture1D:
-                        uavDescription.Dimension = UnorderedAccessViewDimension.Texture1DArray;
-                        break;
-                    case TextureDimension.TextureCube:
-                    case TextureDimension.Texture2D:
-                        uavDescription.Dimension = UnorderedAccessViewDimension.Texture2DArray;
-                        break;
-                    case TextureDimension.Texture3D:
-                        throw new NotSupportedException("Texture 3D is not supported for Texture Arrays");
-
-                }
-
-                uavDescription.Texture2DArray.ArraySize = arrayCount;
-                uavDescription.Texture2DArray.FirstArraySlice = arrayOrDepthSlice;
-                uavDescription.Texture2DArray.MipSlice = mipIndex;
-            }
-            else
-            {
-                switch (Dimension)
-                {
-                    case TextureDimension.Texture1D:
-                        uavDescription.Dimension = UnorderedAccessViewDimension.Texture1D;
-                        uavDescription.Texture1D.MipSlice = mipIndex;
-                        break;
-                    case TextureDimension.Texture2D:
-                        uavDescription.Dimension = UnorderedAccessViewDimension.Texture2D;
-                        uavDescription.Texture2D.MipSlice = mipIndex;
-                        break;
-                    case TextureDimension.Texture3D:
-                        uavDescription.Dimension = UnorderedAccessViewDimension.Texture3D;
-                        uavDescription.Texture3D.FirstWSlice = arrayOrDepthSlice;
-                        uavDescription.Texture3D.MipSlice = mipIndex;
-                        uavDescription.Texture3D.WSize = arrayCount;
-                        break;
-                    case TextureDimension.TextureCube:
-                        throw new NotSupportedException("TextureCube dimension is expecting an array size > 1");
-                }
-            }
-            
-            var descriptorHandle = GraphicsDevice.UnorderedAccessViewAllocator.Allocate(1);
-            NativeDevice.CreateUnorderedAccessView(NativeResource, null, uavDescription, descriptorHandle);
-            return descriptorHandle;
-        }
-
-        internal static ResourceFlags GetBindFlagsFromTextureFlags(TextureFlags flags)
-        {
-            var result = ResourceFlags.None;
-
-            if ((flags & TextureFlags.RenderTarget) != 0)
-                result |= ResourceFlags.AllowRenderTarget;
-
-            if ((flags & TextureFlags.UnorderedAccess) != 0)
-                result |= ResourceFlags.AllowUnorderedAccess;
-
-            if ((flags & TextureFlags.DepthStencil) != 0)
-            {
-                result |= ResourceFlags.AllowDepthStencil;
-                if ((flags & TextureFlags.ShaderResource) == 0)
-                    result |= ResourceFlags.DenyShaderResource;
-            }
-
-            return result;
-        }
-
-        internal static unsafe SharpDX.DataBox[] ConvertDataBoxes(DataBox[] dataBoxes)
-        {
-            if (dataBoxes == null || dataBoxes.Length == 0)
-                return null;
-
-            var sharpDXDataBoxes = new SharpDX.DataBox[dataBoxes.Length];
-            fixed (void* pDataBoxes = sharpDXDataBoxes)
-                Utilities.Write((IntPtr)pDataBoxes, dataBoxes, 0, dataBoxes.Length);
-
-            return sharpDXDataBoxes;
-        }
-
-        private bool IsFlipped()
-        {
-            return false;
-        }
-
-        private ResourceDescription ConvertToNativeDescription1D()
-        {
-            return ResourceDescription.Texture1D((SharpDX.DXGI.Format)textureDescription.Format, textureDescription.Width, (short)textureDescription.ArraySize, (short)textureDescription.MipLevels, GetBindFlagsFromTextureFlags(textureDescription.Flags));
-        }
-
-        private SharpDX.DXGI.Format ComputeShaderResourceViewFormat()
-        {
-            // Special case for DepthStencil ShaderResourceView that are bound as Float
-            var viewFormat = (SharpDX.DXGI.Format)ViewFormat;
-            if (IsDepthStencil)
-            {
-                viewFormat = (SharpDX.DXGI.Format)ComputeShaderResourceFormatFromDepthFormat(ViewFormat);
-            }
-
-            return viewFormat;
-        }
-
-        private static TextureDescription ConvertFromNativeDescription(ResourceDescription description, bool isShaderResource = false)
-        {
-            var desc = new TextureDescription()
-            {
-                Dimension = TextureDimension.Texture2D,
-                Width = (int)description.Width,
-                Height = description.Height,
-                Depth = 1,
-                MultisampleCount = (MultisampleCount)description.SampleDescription.Count,
-                Format = (PixelFormat)description.Format,
-                MipLevels = description.MipLevels,
-                Usage = GraphicsResourceUsage.Default,
-                ArraySize = description.DepthOrArraySize,
-                Flags = TextureFlags.None
-            };
-
-            if ((description.Flags & ResourceFlags.AllowRenderTarget) != 0)
-                desc.Flags |= TextureFlags.RenderTarget;
-            if ((description.Flags & ResourceFlags.AllowUnorderedAccess) != 0)
-                desc.Flags |= TextureFlags.UnorderedAccess;
-            if ((description.Flags & ResourceFlags.AllowDepthStencil) != 0)
-                desc.Flags |= TextureFlags.DepthStencil;
-            if ((description.Flags & ResourceFlags.DenyShaderResource) == 0 && isShaderResource)
-                desc.Flags |= TextureFlags.ShaderResource;
-
-            return desc;
-        }
-
-        private ResourceDescription ConvertToNativeDescription2D()
-        {
-            var format = (SharpDX.DXGI.Format)textureDescription.Format;
-            var flags = textureDescription.Flags;
-
-            // If the texture is going to be bound on the depth stencil, for to use TypeLess format
-            if (IsDepthStencil)
-            {
-                if (IsShaderResource && GraphicsDevice.Features.CurrentProfile < GraphicsProfile.Level_10_0)
-                {
-                    throw new NotSupportedException(String.Format("ShaderResourceView for DepthStencil Textures are not supported for Graphics profile < 10.0 (Current: [{0}])", GraphicsDevice.Features.CurrentProfile));
-                }
-                else
-                {
-                    // Determine TypeLess Format and ShaderResourceView Format
-                    if (GraphicsDevice.Features.CurrentProfile < GraphicsProfile.Level_10_0)
-                    {
-                        switch (textureDescription.Format)
-                        {
-                            case PixelFormat.D16_UNorm:
-                                format = SharpDX.DXGI.Format.D16_UNorm;
-                                break;
-                            case PixelFormat.D32_Float:
-                                format = SharpDX.DXGI.Format.D32_Float;
-                                break;
-                            case PixelFormat.D24_UNorm_S8_UInt:
-                                format = SharpDX.DXGI.Format.D24_UNorm_S8_UInt;
-                                break;
-                            case PixelFormat.D32_Float_S8X24_UInt:
-                                format = SharpDX.DXGI.Format.D32_Float_S8X24_UInt;
-                                break;
-                            default:
-                                throw new NotSupportedException(String.Format("Unsupported DepthFormat [{0}] for depth buffer", textureDescription.Format));
-                        }
-                    }
-                    else
-                    {
-                        switch (textureDescription.Format)
-                        {
-                            case PixelFormat.D16_UNorm:
-                                format = SharpDX.DXGI.Format.R16_Typeless;
-                                break;
-                            case PixelFormat.D32_Float:
-                                format = SharpDX.DXGI.Format.R32_Typeless;
-                                break;
-                            case PixelFormat.D24_UNorm_S8_UInt:
-                                //format = SharpDX.DXGI.Format.D24_UNorm_S8_UInt;
-                                format = SharpDX.DXGI.Format.R24G8_Typeless;
-                                break;
-                            case PixelFormat.D32_Float_S8X24_UInt:
-                                format = SharpDX.DXGI.Format.R32G8X24_Typeless;
-                                break;
-                            default:
-                                throw new NotSupportedException(String.Format("Unsupported DepthFormat [{0}] for depth buffer", textureDescription.Format));
-                        }
-                    }
-                }
-            }
-
-            return ResourceDescription.Texture2D(format, textureDescription.Width, textureDescription.Height, (short)textureDescription.ArraySize, (short)textureDescription.MipLevels, (short)textureDescription.MultisampleCount, 0, GetBindFlagsFromTextureFlags(flags));
-        }
-
-        internal ClearValue? GetClearValue()
-        {
-            if (IsDepthStencil)
-            {
-                return new ClearValue
-                {
-                    Format = ComputeDepthViewFormatFromTextureFormat(ViewFormat),
-                    DepthStencil = new DepthStencilValue
-                    {
-                        Depth = 1.0f,
-                        Stencil = 0,
-                    }
-                };
-            }
-
-            if (IsRenderTarget)
-            {
-                return new ClearValue
-                {
-                    Format = (SharpDX.DXGI.Format)textureDescription.Format,
-                    Color = new RawVector4(0, 0, 0, 1),
-                };
-            }
-
-            return null;
-        }
-
-        internal static PixelFormat ComputeShaderResourceFormatFromDepthFormat(PixelFormat format)
-        {
-            PixelFormat viewFormat;
-
-            // Determine TypeLess Format and ShaderResourceView Format
-            switch (format)
-            {
-                case PixelFormat.D16_UNorm:
-                    viewFormat = PixelFormat.R16_Float;
-                    break;
-                case PixelFormat.D32_Float:
-                    viewFormat = PixelFormat.R32_Float;
-                    break;
-                case PixelFormat.D24_UNorm_S8_UInt:
-                    viewFormat = PixelFormat.R24_UNorm_X8_Typeless;
-                    break;
-                case PixelFormat.D32_Float_S8X24_UInt:
-                    viewFormat = PixelFormat.R32_Float_X8X24_Typeless;
-                    break;
-                default:
-                    viewFormat = PixelFormat.None;
-                    break;
-            }
-
-            return viewFormat;
-        }
-
-        internal static SharpDX.DXGI.Format ComputeDepthViewFormatFromTextureFormat(PixelFormat format)
-        {
-            SharpDX.DXGI.Format viewFormat;
-
-            switch (format)
-            {
-                case PixelFormat.R16_Typeless:
-                case PixelFormat.D16_UNorm:
-                    viewFormat = SharpDX.DXGI.Format.D16_UNorm;
-                    break;
-                case PixelFormat.R32_Typeless:
-                case PixelFormat.D32_Float:
-                    viewFormat = SharpDX.DXGI.Format.D32_Float;
-                    break;
-                case PixelFormat.R24G8_Typeless:
-                case PixelFormat.D24_UNorm_S8_UInt:
-                    viewFormat = SharpDX.DXGI.Format.D24_UNorm_S8_UInt;
-                    break;
-                case PixelFormat.R32G8X24_Typeless:
-                case PixelFormat.D32_Float_S8X24_UInt:
-                    viewFormat = SharpDX.DXGI.Format.D32_Float_S8X24_UInt;
-                    break;
-                default:
-                    throw new NotSupportedException(String.Format("Unsupported depth format [{0}]", format));
-            }
-
-            return viewFormat;
-        }
-
-        private ResourceDescription ConvertToNativeDescription3D()
-        {
-            return ResourceDescription.Texture3D((SharpDX.DXGI.Format)textureDescription.Format, textureDescription.Width, textureDescription.Height, (short)textureDescription.Depth, (short)textureDescription.MipLevels, GetBindFlagsFromTextureFlags(textureDescription.Flags));
-        }
-
-        /// <summary>
-        /// Check and modify if necessary the mipmap levels of the image (Troubles with DXT images whose resolution in less than 4x4 in DX9.x).
-        /// </summary>
-        /// <param name="device">The graphics device.</param>
-        /// <param name="description">The texture description.</param>
-        /// <returns>The updated texture description.</returns>
-        private static TextureDescription CheckMipLevels(GraphicsDevice device, ref TextureDescription description)
-        {
-            if (device.Features.CurrentProfile < GraphicsProfile.Level_10_0 && (description.Flags & TextureFlags.DepthStencil) == 0 && description.Format.IsCompressed())
-            {
-                description.MipLevels = Math.Min(CalculateMipCount(description.Width, description.Height), description.MipLevels);
-            }
-            return description;
-        }
-
-        /// <summary>
-        /// Calculates the mip level from a specified size.
-        /// </summary>
-        /// <param name="size">The size.</param>
-        /// <param name="minimumSizeLastMip">The minimum size of the last mip.</param>
-        /// <returns>The mip level.</returns>
-        /// <exception cref="System.ArgumentOutOfRangeException">Value must be > 0;size</exception>
-        private static int CalculateMipCountFromSize(int size, int minimumSizeLastMip = 4)
-        {
-            if (size <= 0)
-            {
-                throw new ArgumentOutOfRangeException("Value must be > 0", "size");
-            }
-
-            if (minimumSizeLastMip <= 0)
-            {
-                throw new ArgumentOutOfRangeException("Value must be > 0", "minimumSizeLastMip");
-            }
-
-            int level = 1;
-            while ((size / 2) >= minimumSizeLastMip)
-            {
-                size = Math.Max(1, size / 2);
-                level++;
-            }
-            return level;
-        }
-
-        /// <summary>
-        /// Calculates the mip level from a specified width,height,depth.
-        /// </summary>
-        /// <param name="width">The width.</param>
-        /// <param name="height">The height.</param>
-        /// <param name="minimumSizeLastMip">The minimum size of the last mip.</param>
-        /// <returns>The mip level.</returns>
-        /// <exception cref="System.ArgumentOutOfRangeException">Value must be &gt; 0;size</exception>
-        private static int CalculateMipCount(int width, int height, int minimumSizeLastMip = 4)
-        {
-            return Math.Min(CalculateMipCountFromSize(width, minimumSizeLastMip), CalculateMipCountFromSize(height, minimumSizeLastMip));
-        }
-
-        internal static bool IsStencilFormat(PixelFormat format)
-        {
-            switch (format)
-            {
-                case PixelFormat.R24G8_Typeless:
-                case PixelFormat.D24_UNorm_S8_UInt:
-                case PixelFormat.R32G8X24_Typeless:
-                case PixelFormat.D32_Float_S8X24_UInt:
-                    return true;
-            }
-
-            return false;
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Effects/Effect.cs b/sources/engine/Xenko.Graphics/Effects/Effect.cs
index 60466a57f6..35fb5b117b 100644
--- a/sources/engine/Xenko.Graphics/Effects/Effect.cs
+++ b/sources/engine/Xenko.Graphics/Effects/Effect.cs
@@ -227,16 +227,19 @@ private static void UpdateValueBindingKey(ref EffectValueDescription binding)
                     switch (binding.Type.Type)
                     {
                         case EffectParameterType.Bool:
-                            binding.KeyInfo.Key = FindOrCreateValueKey<bool>(binding);
+                            binding.KeyInfo.Key = FindOrCreateValueKey<bool>(ref binding);
                             break;
                         case EffectParameterType.Int:
-                            binding.KeyInfo.Key = FindOrCreateValueKey<int>(binding);
+                            binding.KeyInfo.Key = FindOrCreateValueKey<int>(ref binding);
                             break;
                         case EffectParameterType.UInt:
-                            binding.KeyInfo.Key = FindOrCreateValueKey<uint>(binding);
+                            binding.KeyInfo.Key = FindOrCreateValueKey<uint>(ref binding);
                             break;
                         case EffectParameterType.Float:
-                            binding.KeyInfo.Key = FindOrCreateValueKey<float>(binding);
+                            binding.KeyInfo.Key = FindOrCreateValueKey<float>(ref binding);
+                            break;
+                        case EffectParameterType.Double:
+                            binding.KeyInfo.Key = FindOrCreateValueKey<double>(ref binding);
                             break;
                     }
                     break;
@@ -246,9 +249,9 @@ private static void UpdateValueBindingKey(ref EffectValueDescription binding)
                         switch (binding.Type.Type)
                         {
                             case EffectParameterType.Float:
-                                binding.KeyInfo.Key = componentCount == 4
-                                                        ? FindOrCreateValueKey<Color4>(binding)
-                                                        : (componentCount == 3 ? FindOrCreateValueKey<Color3>(binding) : null);
+                                binding.KeyInfo.Key = 
+                                    componentCount == 4 ? FindOrCreateValueKey<Color4>(ref binding) :
+                                    componentCount == 3 ? FindOrCreateValueKey<Color3>(ref binding) : null;
                                 break;
                         }
                     }
@@ -260,22 +263,33 @@ private static void UpdateValueBindingKey(ref EffectValueDescription binding)
                         {
                             case EffectParameterType.Bool:
                             case EffectParameterType.Int:
-                                binding.KeyInfo.Key = componentCount == 4 ? (ParameterKey)FindOrCreateValueKey<Int4>(binding) : (componentCount == 3 ? FindOrCreateValueKey<Int3>(binding) : null);
+                                binding.KeyInfo.Key =
+                                    componentCount == 4 ? FindOrCreateValueKey<Int4>(ref binding) :
+                                    componentCount == 3 ? FindOrCreateValueKey<Int3>(ref binding) :
+                                    componentCount == 2 ? FindOrCreateValueKey<Int2>(ref binding) : null;
                                 break;
                             case EffectParameterType.UInt:
-                                binding.KeyInfo.Key = componentCount == 4 ? FindOrCreateValueKey<UInt4>(binding) : null;
+                                binding.KeyInfo.Key = 
+                                    componentCount == 4 ? FindOrCreateValueKey<UInt4>(ref binding) : null;
                                 break;
                             case EffectParameterType.Float:
-                                binding.KeyInfo.Key = componentCount == 4
-                                                        ? FindOrCreateValueKey<Vector4>(binding)
-                                                        : (componentCount == 3 ? (ParameterKey)FindOrCreateValueKey<Vector3>(binding) : (componentCount == 2 ? FindOrCreateValueKey<Vector2>(binding) : null));
+                                binding.KeyInfo.Key = 
+                                    componentCount == 4 ? FindOrCreateValueKey<Vector4>(ref binding) :
+                                    componentCount == 3 ? FindOrCreateValueKey<Vector3>(ref binding) : 
+                                    componentCount == 2 ? FindOrCreateValueKey<Vector2>(ref binding) : null;
+                                break;
+                            case EffectParameterType.Double:
+                                binding.KeyInfo.Key =
+                                    componentCount == 4 ? FindOrCreateValueKey<Double4>(ref binding) :
+                                    componentCount == 3 ? FindOrCreateValueKey<Double3>(ref binding) :
+                                    componentCount == 2 ? FindOrCreateValueKey<Double2>(ref binding) : null;
                                 break;
                         }
                     }
                     break;
                 case EffectParameterClass.MatrixRows:
                 case EffectParameterClass.MatrixColumns:
-                    binding.KeyInfo.Key = FindOrCreateValueKey<Matrix>(binding);
+                    binding.KeyInfo.Key = FindOrCreateValueKey<Matrix>(ref binding);
                     break;
                 case EffectParameterClass.Struct:
                     binding.KeyInfo.Key = ParameterKeys.FindByName(binding.KeyInfo.KeyName);
@@ -293,10 +307,14 @@ private static ParameterKey FindOrCreateResourceKey<T>(string name)
             return ParameterKeys.FindByName(name) ?? ParameterKeys.NewObject<T>(default(T), name);
         }
 
-        private static ParameterKey FindOrCreateValueKey<T>(EffectValueDescription binding) where T : struct
+        private static ParameterKey FindOrCreateValueKey<T>(ref EffectValueDescription binding) where T : struct
         {
             var name = binding.KeyInfo.KeyName;
-            return ParameterKeys.FindByName(name) ?? ParameterKeys.NewValue<T>(default(T), name);
+            var key = ParameterKeys.FindByName(name) as ValueParameterKey<T> ?? ParameterKeys.NewValue<T>(name: name);
+            // Update the default value with the one from the shader
+            if (binding.DefaultValue is T defaultValue)
+                key.DefaultValueMetadataT.DefaultValue = defaultValue;
+            return key;
         }
 
         private static void UpdateConstantBufferHashes(EffectReflection reflection)
diff --git a/sources/engine/Xenko.Graphics/Font/FontCacheManager.cs b/sources/engine/Xenko.Graphics/Font/FontCacheManager.cs
index 4caa85eb49..6ef06fcae3 100644
--- a/sources/engine/Xenko.Graphics/Font/FontCacheManager.cs
+++ b/sources/engine/Xenko.Graphics/Font/FontCacheManager.cs
@@ -76,6 +76,7 @@ public void UploadCharacterBitmap(CommandList commandList, CharacterSpecificatio
                 if (!packer.Insert(targetSize.X, targetSize.Y, ref character.Glyph.Subrect))
                 {
                     // memory is too fragmented in order to place the new character -> clear all the characters and restart.
+                    // TODO: This is invalid, we might delete character from current frame!
                     ClearCache();
                     if (!packer.Insert(targetSize.X, targetSize.Y, ref character.Glyph.Subrect))
                         throw new InvalidOperationException("The rendered character is too big for the cache texture");
diff --git a/sources/engine/Xenko.Graphics/Font/FontDataFactory.cs b/sources/engine/Xenko.Graphics/Font/FontDataFactory.cs
index 69b7d2c317..a66d9d3761 100644
--- a/sources/engine/Xenko.Graphics/Font/FontDataFactory.cs
+++ b/sources/engine/Xenko.Graphics/Font/FontDataFactory.cs
@@ -14,14 +14,14 @@ namespace Xenko.Graphics.Font
     /// </summary>
     public class FontDataFactory : IFontFactory
     {
-        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ')
+        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ', int margin = 0)
         {
             if (textures == null) throw new ArgumentNullException("textures");
 
-            return new OfflineRasterizedSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter);
+            return new OfflineRasterizedSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter, margin);
         }
 
-        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ')
+        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ', int margin = 0)
         {
             // creates the textures from the images if any.
             Texture[] textures = null;
@@ -32,13 +32,14 @@ public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images
                     textures[i] = images[i].ToSerializableVersion();
             }
             
-            return new OfflineRasterizedSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter);
+            return new OfflineRasterizedSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter, margin);
         }
 
-        public SpriteFont NewDynamic(float defaultSize, string fontName, FontStyle style, FontAntiAliasMode antiAliasMode, bool useKerning, float extraSpacing, float extraLineSpacing, char defaultCharacter)
+        public SpriteFont NewDynamic(float defaultSize, string fontName, FontStyle style, FontAntiAliasMode antiAliasMode, bool useKerning, float extraSpacing, float extraLineSpacing, char defaultCharacter, float YOffset)
         {
             return new RuntimeRasterizedSpriteFont
             {
+                BaseOffsetY = YOffset,
                 Size = defaultSize,
                 DefaultCharacter = defaultCharacter,
                 FontName = fontName,
diff --git a/sources/engine/Xenko.Graphics/Font/FontSystem.cs b/sources/engine/Xenko.Graphics/Font/FontSystem.cs
index 0275d3703c..4807460f98 100644
--- a/sources/engine/Xenko.Graphics/Font/FontSystem.cs
+++ b/sources/engine/Xenko.Graphics/Font/FontSystem.cs
@@ -58,9 +58,9 @@ public void Unload()
                 allocatedSpriteFont.Dispose();
         }
 
-        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ')
+        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ', int margin = 10)
         {
-            var font = new OfflineRasterizedSpriteFont(size, glyphs, null, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter) { FontSystem = this };
+            var font = new OfflineRasterizedSpriteFont(size, glyphs, null, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter, margin) { FontSystem = this };
 
             // affects the textures from the images.
             foreach (var image in images)
@@ -80,9 +80,9 @@ public SpriteFont NewScalable(float size, IList<Glyph> glyphs, IList<Image> imag
             return font;
         }
 
-        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ')
+        public SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ', int margin = 0)
         {
-            return new OfflineRasterizedSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter) { FontSystem = this };
+            return new OfflineRasterizedSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter, margin) { FontSystem = this };
         }
 
         public SpriteFont NewScalable(float size, IList<Glyph> glyphs, IList<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings = null, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ')
@@ -90,10 +90,11 @@ public SpriteFont NewScalable(float size, IList<Glyph> glyphs, IList<Texture> te
             return new SignedDistanceFieldSpriteFont(size, glyphs, textures, baseOffset, defaultLineSpacing, kernings, extraSpacing, extraLineSpacing, defaultCharacter) { FontSystem = this };
         }
 
-        public SpriteFont NewDynamic(float defaultSize, string fontName, FontStyle style, FontAntiAliasMode antiAliasMode = FontAntiAliasMode.Default, bool useKerning = false, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ')
+        public SpriteFont NewDynamic(float defaultSize, string fontName, FontStyle style, FontAntiAliasMode antiAliasMode = FontAntiAliasMode.Default, bool useKerning = false, float extraSpacing = 0, float extraLineSpacing = 0, char defaultCharacter = ' ', float YOffset = 0f)
         {
             var font = new RuntimeRasterizedSpriteFont
             {
+                BaseOffsetY = YOffset,
                 Size = defaultSize,
                 FontName = fontName,
                 Style = style,
diff --git a/sources/engine/Xenko.Graphics/Font/IFontFactory.cs b/sources/engine/Xenko.Graphics/Font/IFontFactory.cs
index 39127fa4eb..b6c31ba1f0 100644
--- a/sources/engine/Xenko.Graphics/Font/IFontFactory.cs
+++ b/sources/engine/Xenko.Graphics/Font/IFontFactory.cs
@@ -27,7 +27,7 @@ public interface IFontFactory
         /// The textures should be disposed manually (if useless) after that the sprite font is not used anymore.</remarks>
         /// <returns>The newly created static font</returns>
         SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Texture> textures, float baseOffset, float defaultLineSpacing,
-                             IList<Kerning> kernings = null, float extraSpacing = 0f, float extraLineSpacing = 0f, char defaultCharacter = ' ');
+                             IList<Kerning> kernings = null, float extraSpacing = 0f, float extraLineSpacing = 0f, char defaultCharacter = ' ', int margin = 0);
 
         /// <summary>
         /// Create a new instance of a static font.
@@ -44,7 +44,7 @@ SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Texture> textures, f
         /// <remarks>The font does not copy the provided glyphs information. Provided glyphs should not be modified after the creation of the font.</remarks>
         /// <returns>The newly created static font</returns>
         SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images, float baseOffset, float defaultLineSpacing,
-                             IList<Kerning> kernings = null, float extraSpacing = 0f, float extraLineSpacing = 0f, char defaultCharacter = ' ');
+                             IList<Kerning> kernings = null, float extraSpacing = 0f, float extraLineSpacing = 0f, char defaultCharacter = ' ', int margin = 0);
 
         /// <summary>
         /// Create a new instance of a dynamic font.
@@ -59,7 +59,7 @@ SpriteFont NewStatic(float size, IList<Glyph> glyphs, IList<Image> images, float
         /// <param name="defaultCharacter">The default character fall-back.</param>
         /// <returns>The newly created dynamic font</returns>
         SpriteFont NewDynamic(float defaultSize, string fontName, FontStyle style, FontAntiAliasMode antiAliasMode = FontAntiAliasMode.Default,
-                              bool useKerning = false, float extraSpacing = 0f, float extraLineSpacing = 0f, char defaultCharacter = ' ');
+                              bool useKerning = false, float extraSpacing = 0f, float extraLineSpacing = 0f, char defaultCharacter = ' ', float YOffset = 0f);
 
         /// <summary>
         /// Create a new instance of a scalable font.
diff --git a/sources/engine/Xenko.Graphics/Font/OfflineRasterizedSpriteFont.cs b/sources/engine/Xenko.Graphics/Font/OfflineRasterizedSpriteFont.cs
index f378b8541b..f5a4273a2c 100644
--- a/sources/engine/Xenko.Graphics/Font/OfflineRasterizedSpriteFont.cs
+++ b/sources/engine/Xenko.Graphics/Font/OfflineRasterizedSpriteFont.cs
@@ -22,7 +22,7 @@ internal OfflineRasterizedSpriteFont()
         {
         }
 
-        internal OfflineRasterizedSpriteFont(float size, IList<Glyph> glyphs, IEnumerable<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings, float extraSpacing, float extraLineSpacing, char defaultCharacter)
+        internal OfflineRasterizedSpriteFont(float size, IList<Glyph> glyphs, IEnumerable<Texture> textures, float baseOffset, float defaultLineSpacing, IList<Kerning> kernings, float extraSpacing, float extraLineSpacing, char defaultCharacter, int margin = 0)
         {
             Size = size;
             StaticTextures = new List<Texture>();
@@ -38,6 +38,15 @@ internal OfflineRasterizedSpriteFont(float size, IList<Glyph> glyphs, IEnumerabl
             foreach (var glyph in glyphs)
             {
                 var character = (char)glyph.Character;
+                if (margin > 0)
+                {
+                    glyph.Subrect.Width += margin;
+                    glyph.Subrect.Height += margin;
+                    glyph.Subrect.X -= margin / 2;
+                    glyph.Subrect.Y -= margin / 2;
+                    glyph.Offset.Y -= margin / 2;
+                    glyph.Offset.X -= margin / 2;
+                }
                 CharacterToGlyph[character] = glyph;
             }
 
@@ -89,7 +98,7 @@ public override bool IsCharPresent(char c)
         protected override Glyph GetGlyph(CommandList commandList, char character, ref Vector2 fontSize, bool dumb, out Vector2 fixScaling)
         {
             Glyph glyph = null;
-            fixScaling = new Vector2(1, 1);
+            fixScaling = Vector2.One;
 
             if (!CharacterToGlyph.ContainsKey(character))
                 Logger.Warning($"Character '{character}' is not available in the static font character map");
diff --git a/sources/engine/Xenko.Graphics/Font/RuntimeRasterizedSpriteFont.cs b/sources/engine/Xenko.Graphics/Font/RuntimeRasterizedSpriteFont.cs
index d416ca7e25..c741be7485 100644
--- a/sources/engine/Xenko.Graphics/Font/RuntimeRasterizedSpriteFont.cs
+++ b/sources/engine/Xenko.Graphics/Font/RuntimeRasterizedSpriteFont.cs
@@ -100,16 +100,20 @@ public override bool IsCharPresent(char c)
         protected override Glyph GetGlyph(CommandList commandList, char character, ref Vector2 fontSize, bool uploadGpuResources, out Vector2 fixScaling)
         {
             // Add a safe guard to prevent the system to generate characters too big for the dynamic font cache texture
-            fontSize.X = Math.Min(fontSize.X, 1024);
-            fontSize.Y = Math.Min(fontSize.Y, 1024);
+            fontSize.X = Math.Min(fontSize.X, 256);
+            fontSize.Y = Math.Min(fontSize.Y, 256);
 
             // get the character data associated to the provided character and size
             var characterData = GetOrCreateCharacterData(fontSize, character);
-            
+
             // generate the bitmap if it does not exist
             if (characterData.Bitmap == null)
+            {
                 FontManager.GenerateBitmap(characterData, false);
 
+                // TODO: try to find a fallback from different size in the meantime (currently character disappear)
+            }
+
             // upload the character to the GPU font texture and create the glyph if does not exists
             if (uploadGpuResources && characterData.Bitmap != null && !characterData.IsBitmapUploaded)
                 FontCacheManager.UploadCharacterBitmap(commandList, characterData);
diff --git a/sources/engine/Xenko.Graphics/Font/SignedDistanceFieldSpriteFont.cs b/sources/engine/Xenko.Graphics/Font/SignedDistanceFieldSpriteFont.cs
index 15dee366be..a1757f2da7 100644
--- a/sources/engine/Xenko.Graphics/Font/SignedDistanceFieldSpriteFont.cs
+++ b/sources/engine/Xenko.Graphics/Font/SignedDistanceFieldSpriteFont.cs
@@ -92,7 +92,7 @@ public override bool IsCharPresent(char c)
         protected override Glyph GetGlyph(CommandList commandList, char character, ref Vector2 fontSize, bool dumb, out Vector2 fixScaling)
         {
             Glyph glyph = null;
-            fixScaling = new Vector2(1, 1);
+            fixScaling = Vector2.One;
 
             if (!CharacterToGlyph.ContainsKey(character))
                 Logger.Warning($"Character '{character}' is not available in the static font character map");
diff --git a/sources/engine/Xenko.Graphics/GraphicsAdapterFactory.cs b/sources/engine/Xenko.Graphics/GraphicsAdapterFactory.cs
index 9c2f72d87e..57b6b16923 100644
--- a/sources/engine/Xenko.Graphics/GraphicsAdapterFactory.cs
+++ b/sources/engine/Xenko.Graphics/GraphicsAdapterFactory.cs
@@ -14,6 +14,7 @@ public static partial class GraphicsAdapterFactory
         private static bool isInitialized = false;
         private static GraphicsAdapter[] adapters;
         private static GraphicsAdapter defaultAdapter;
+        internal static DeviceCreationFlags adapterFlags;
 
         /// <summary>
         /// Initializes the GraphicsAdapter. On Desktop and WinRT, this is done statically.
@@ -24,7 +25,8 @@ public static void Initialize()
             {
                 if (!isInitialized)
                 {
-                    InitializeInternal();
+                    InitializeInternal(adapterFlags == DeviceCreationFlags.Debug || adapterFlags == DeviceCreationFlags.DebugAndBreak ||
+                                       adapterFlags == DeviceCreationFlags.DebugAndBreakUnique || adapterFlags == DeviceCreationFlags.DebugAndLogUnique);
                     isInitialized = true;
                 }
             }
diff --git a/sources/engine/Xenko.Graphics/GraphicsContext.cs b/sources/engine/Xenko.Graphics/GraphicsContext.cs
index c953d0cfb2..360fde302d 100644
--- a/sources/engine/Xenko.Graphics/GraphicsContext.cs
+++ b/sources/engine/Xenko.Graphics/GraphicsContext.cs
@@ -1,6 +1,8 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System.Collections;
+using System.Collections.Generic;
 using Xenko.Core;
 
 namespace Xenko.Graphics
@@ -22,11 +24,27 @@ public class GraphicsContext
 
         public GraphicsResourceAllocator Allocator { get; private set; }
 
+        public static int PrepareVulkanAllocatorCount = 32;
+        private static Queue<ResourceGroupAllocator> AvailableAllocators;
+
         public GraphicsContext(GraphicsDevice graphicsDevice, GraphicsResourceAllocator allocator = null, CommandList commandList = null)
         {
             CommandList = commandList ?? graphicsDevice.InternalMainCommandList ?? CommandList.New(graphicsDevice).DisposeBy(graphicsDevice);
             Allocator = allocator ?? new GraphicsResourceAllocator(graphicsDevice).DisposeBy(graphicsDevice);
-            ResourceGroupAllocator = new ResourceGroupAllocator(Allocator, CommandList).DisposeBy(graphicsDevice);
+
+            // prepare some resources now, so we don't need to do it during runtime (which can cause lag spikes or worse)
+            // DirectX doesn't seem to like this very much, though
+            if (GraphicsDevice.Platform == GraphicsPlatform.Vulkan && AvailableAllocators == null && PrepareVulkanAllocatorCount > 0)
+            {
+                AvailableAllocators = new Queue<ResourceGroupAllocator>();
+                while (AvailableAllocators.Count < PrepareVulkanAllocatorCount)
+                    AvailableAllocators.Enqueue(new ResourceGroupAllocator(Allocator, CommandList, 2).DisposeBy(graphicsDevice));
+            }
+
+            if (AvailableAllocators?.Count > 0)
+                ResourceGroupAllocator = AvailableAllocators.Dequeue();
+            else
+                ResourceGroupAllocator = new ResourceGroupAllocator(Allocator, CommandList, 2).DisposeBy(graphicsDevice);
         }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/GraphicsDevice.cs b/sources/engine/Xenko.Graphics/GraphicsDevice.cs
index d3ffc9d9c8..ac6b95d25a 100644
--- a/sources/engine/Xenko.Graphics/GraphicsDevice.cs
+++ b/sources/engine/Xenko.Graphics/GraphicsDevice.cs
@@ -1,8 +1,10 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
+using System.Threading.Tasks;
 using Xenko.Core;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.Mathematics;
@@ -15,11 +17,9 @@ namespace Xenko.Graphics
     /// </summary>
     public partial class GraphicsDevice : ComponentBase
     {
-        public static readonly int ThreadCount = 1; //AppConfig.GetConfiguration<Config>("RenderSystem").ThreadCount;
+        internal readonly Dictionary<long, PipelineState> CachedPipelineStates = new Dictionary<long, PipelineState>();
 
-        internal readonly Dictionary<PipelineStateDescriptionWithHash, PipelineState> CachedPipelineStates = new Dictionary<PipelineStateDescriptionWithHash, PipelineState>();
-
-        internal readonly Dictionary<SamplerStateDescription, SamplerState> CachedSamplerStates = new Dictionary<SamplerStateDescription, SamplerState>();
+        internal readonly ConcurrentDictionary<SamplerStateDescription, SamplerState> CachedSamplerStates = new ConcurrentDictionary<SamplerStateDescription, SamplerState>();
 
         /// <summary>
         ///     Gets the features supported by this graphics device.
@@ -89,7 +89,8 @@ public void Recreate(GraphicsAdapter adapter, GraphicsProfile[] profile, DeviceC
             if (profile == null) throw new ArgumentNullException("profile");
 
             Adapter = adapter;
-            IsDebugMode = (deviceCreationFlags & DeviceCreationFlags.Debug) != 0;
+            IsDebugMode = deviceCreationFlags == DeviceCreationFlags.Debug || deviceCreationFlags == DeviceCreationFlags.DebugAndBreak ||
+                          deviceCreationFlags == DeviceCreationFlags.DebugAndBreakUnique || deviceCreationFlags == DeviceCreationFlags.DebugAndLogUnique;
 
             // Initialize this instance
             InitializePlatformDevice(profile, deviceCreationFlags, windowHandle);
@@ -102,7 +103,7 @@ public void Recreate(GraphicsAdapter adapter, GraphicsProfile[] profile, DeviceC
             var defaultPipelineStateDescription = new PipelineStateDescription();
             defaultPipelineStateDescription.SetDefaults();
             AdjustDefaultPipelineStateDescription(ref defaultPipelineStateDescription);
-            DefaultPipelineState = PipelineState.New(this, ref defaultPipelineStateDescription);
+            DefaultPipelineState = PipelineState.New(this, defaultPipelineStateDescription, null, true);
 
             InitializePostFeatures();
         }
diff --git a/sources/engine/Xenko.Graphics/GraphicsPresenter.cs b/sources/engine/Xenko.Graphics/GraphicsPresenter.cs
index a04fcfac0b..2ced9c4b00 100644
--- a/sources/engine/Xenko.Graphics/GraphicsPresenter.cs
+++ b/sources/engine/Xenko.Graphics/GraphicsPresenter.cs
@@ -120,11 +120,11 @@ protected set
         public abstract object NativePresenter { get; }
 
         /// <summary>
-        /// Gets or sets fullscreen mode for this presenter.
+        /// Gets or sets fullscreen mode for this presenter. Use Game.Window.IsFullscreen publically to set fullscreen mode.
         /// </summary>
         /// <value><c>true</c> if this instance is full screen; otherwise, <c>false</c>.</value>
         /// <remarks>This method is only valid on Windows Desktop and has no effect on Windows Metro.</remarks>
-        public abstract bool IsFullScreen { get; set; }
+        public abstract bool InternalFullscreen { get; set; }
 
         /// <summary>
         /// Gets or sets the <see cref="PresentInterval"/>. Default is to wait for one vertical blanking.
@@ -151,11 +151,12 @@ public virtual void EndDraw(CommandList commandList, bool present)
 
         /// <summary>
         /// Resizes the current presenter, by resizing the back buffer and the depth stencil buffer.
+        /// Use Game.Window publically to resize the game.
         /// </summary>
         /// <param name="width"></param>
         /// <param name="height"></param>
         /// <param name="format"></param>
-        public void Resize(int width, int height, PixelFormat format)
+        public void InternalResize(int width, int height, PixelFormat format)
         {
             GraphicsDevice.Begin();
 
diff --git a/sources/engine/Xenko.Graphics/GraphicsResourceAllocator.cs b/sources/engine/Xenko.Graphics/GraphicsResourceAllocator.cs
index 0423656896..39b1645527 100644
--- a/sources/engine/Xenko.Graphics/GraphicsResourceAllocator.cs
+++ b/sources/engine/Xenko.Graphics/GraphicsResourceAllocator.cs
@@ -3,8 +3,9 @@
 
 using System;
 using System.Collections.Generic;
-
+using System.Threading;
 using Xenko.Core;
+using Xenko.Core.Threading;
 
 namespace Xenko.Graphics
 {
@@ -19,7 +20,7 @@ public class GraphicsResourceAllocator : ComponentBase
         // TODO: Check if we should introduce an enum for the kind of scope (per DrawCore, per Frame...etc.)
         // TODO: Add statistics method (number of objects allocated...etc.)
 
-        private readonly object thisLock = new object();
+        private ReaderWriterLockSlim thisLock = new ReaderWriterLockSlim();
         private readonly Dictionary<TextureDescription, List<GraphicsResourceLink>> textureCache = new Dictionary<TextureDescription, List<GraphicsResourceLink>>();
         private readonly Dictionary<BufferDescription, List<GraphicsResourceLink>> bufferCache = new Dictionary<BufferDescription, List<GraphicsResourceLink>>();
         private readonly Dictionary<QueryPoolDescription, List<GraphicsResourceLink>> queryPoolCache = new Dictionary<QueryPoolDescription, List<GraphicsResourceLink>>();
@@ -86,7 +87,7 @@ public void Recycle(GraphicsResourceRecyclePolicyDelegate recyclePolicy)
             if (recyclePolicy == null) throw new ArgumentNullException("recyclePolicy");
 
             // Global lock to be threadsafe. 
-            lock (thisLock)
+            using (thisLock.WriteLock())
             {
                 Recycle(textureCache, recyclePolicy);
                 Recycle(bufferCache, recyclePolicy);
@@ -100,11 +101,7 @@ public void Recycle(GraphicsResourceRecyclePolicyDelegate recyclePolicy)
         /// <returns>A texture</returns>
         public Texture GetTemporaryTexture(TextureDescription description)
         {
-            // Global lock to be threadsafe. 
-            lock (thisLock)
-            {
-                return GetTemporaryResource(textureCache, description, createTextureDelegate, getTextureDefinitionDelegate, PixelFormat.None);
-            }
+            return GetTemporaryResource(textureCache, description, createTextureDelegate, getTextureDefinitionDelegate, PixelFormat.None);
         }
 
         /// <summary>
@@ -115,20 +112,12 @@ public Texture GetTemporaryTexture(TextureDescription description)
         /// <returns>A texture</returns>
         public Buffer GetTemporaryBuffer(BufferDescription description, PixelFormat viewFormat = PixelFormat.None)
         {
-            // Global lock to be threadsafe. 
-            lock (thisLock)
-            {
-                return GetTemporaryResource(bufferCache, description, createBufferDelegate, getBufferDescriptionDelegate, viewFormat);
-            }
+            return GetTemporaryResource(bufferCache, description, createBufferDelegate, getBufferDescriptionDelegate, viewFormat);
         }
 
         public QueryPool GetQueryPool(QueryType queryType, int queryCount)
         {
-            // Global lock to be threadsafe. 
-            lock (thisLock)
-            {
-                return GetTemporaryResource(queryPoolCache, new QueryPoolDescription(queryType, queryCount), createQueryPoolDelegate, getQueryPoolDescriptionDelegate, PixelFormat.None);
-            }
+            return GetTemporaryResource(queryPoolCache, new QueryPoolDescription(queryType, queryCount), createQueryPoolDelegate, getQueryPoolDescriptionDelegate, PixelFormat.None);
         }
 
         /// <summary>
@@ -137,11 +126,7 @@ public QueryPool GetQueryPool(QueryType queryType, int queryCount)
         /// <param name="resource"></param>
         public void AddReference(GraphicsResource resource)
         {
-            // Global lock to be threadsafe. 
-            lock (thisLock)
-            {
-                UpdateReference(resource, 1);
-            }
+            UpdateReference(resource, 1);
         }
 
         /// <summary>
@@ -150,11 +135,7 @@ public void AddReference(GraphicsResource resource)
         /// <param name="resource"></param>
         public void ReleaseReference(GraphicsResourceBase resource)
         {
-            // Global lock to be threadsafe. 
-            lock (thisLock)
-            {
-                UpdateReference(resource, -1);
-            }
+            UpdateReference(resource, -1);
         }
 
         /// <summary>
@@ -186,7 +167,7 @@ protected virtual QueryPool CreateQueryPool(QueryPoolDescription description, Pi
 
         protected override void Destroy()
         {
-            lock (thisLock)
+            using (thisLock.WriteLock())
             {
                 DisposeCache(textureCache, true);
                 DisposeCache(bufferCache, true);
@@ -236,19 +217,28 @@ private TResource GetTemporaryResource<TResource, TKey>(Dictionary<TKey, List<Gr
         {
             // For a specific description, get allocated textures
             List<GraphicsResourceLink> resourceLinks;
-            if (!cache.TryGetValue(description, out resourceLinks))
+            using (thisLock.UpgradableReadLock())
             {
-                resourceLinks = new List<GraphicsResourceLink>();
-                cache.Add(description, resourceLinks);
-            }
+                if (!cache.TryGetValue(description, out resourceLinks))
+                {
+                    resourceLinks = new List<GraphicsResourceLink>();
+                    using (thisLock.WriteLock())
+                    {
+                        cache.Add(description, resourceLinks);
+                    }
+                }
 
-            // Find a texture available
-            foreach (var resourceLink in resourceLinks)
-            {
-                if (resourceLink.ReferenceCount == 0)
+                // Find a texture available without locking
+                for (int i = 0; i < resourceLinks.Count; i++)
                 {
-                    UpdateCounter(resourceLink, 1);
-                    return (TResource)resourceLink.Resource;
+                    int rc = Interlocked.CompareExchange(ref resourceLinks[i].ReferenceCount, 1, 0);
+                    if (rc == 0)
+                    {
+                        resourceLinks[i].AccessTotalCount++;
+                        resourceLinks[i].AccessCountSinceLastRecycle++;
+                        resourceLinks[i].LastAccessTime = DateTime.Now;
+                        return (TResource)resourceLinks[i].Resource;
+                    }
                 }
             }
 
@@ -260,17 +250,28 @@ private TResource GetTemporaryResource<TResource, TKey>(Dictionary<TKey, List<Gr
             var realDescription = getDefinition(newResource);
 
             // For a specific description, get allocated textures
-            if (!cache.TryGetValue(realDescription, out resourceLinks))
+            using (thisLock.UpgradableReadLock())
             {
-                resourceLinks = new List<GraphicsResourceLink>();
-                cache.Add(description, resourceLinks);
+                if (!cache.TryGetValue(realDescription, out resourceLinks))
+                {
+                    resourceLinks = new List<GraphicsResourceLink>();
+                    using (thisLock.WriteLock())
+                    {
+                        cache.Add(description, resourceLinks);
+                    }
+                }
+
+                // Add the texture to the allocated textures
+                // Start RefCount == 1, because we don't want this texture to be available if a post FxProcessor is calling
+                // several times this GetTemporaryTexture method.
+                var newResourceLink = new GraphicsResourceLink(newResource) { ReferenceCount = 1 };
+
+                using (thisLock.WriteLock())
+                {
+                    resourceLinks.Add(newResourceLink);
+                }
             }
 
-            // Add the texture to the allocated textures
-            // Start RefCount == 1, because we don't want this texture to be available if a post FxProcessor is calling
-            // several times this GetTemporaryTexture method.
-            var newResourceLink = new GraphicsResourceLink(newResource) { ReferenceCount = 1 };
-            resourceLinks.Add(newResourceLink);
 
             return newResource;
         }
@@ -361,18 +362,14 @@ private bool UpdateReferenceCount<TKey, TResource>(Dictionary<TKey, List<Graphic
 
         private void UpdateCounter(GraphicsResourceLink resourceLink, int deltaCount)
         {
-            if ((resourceLink.ReferenceCount + deltaCount) < 0)
-            {
-                throw new InvalidOperationException("Invalid decrement on reference count (must be >=0 after decrement). Current reference count: [{0}] Decrement: [{1}]".ToFormat(resourceLink.ReferenceCount, deltaCount));
-            }
+            int newVal = Interlocked.Add(ref resourceLink.ReferenceCount, deltaCount);
+
+            if (newVal == 0)
+                GraphicsDevice.TagResource(resourceLink);
 
-            resourceLink.ReferenceCount += deltaCount;
             resourceLink.AccessTotalCount++;
             resourceLink.AccessCountSinceLastRecycle++;
             resourceLink.LastAccessTime = DateTime.Now;
-
-            if (resourceLink.ReferenceCount == 0)
-                GraphicsDevice.TagResource(resourceLink);
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Graphics/GraphicsResourceLink.cs b/sources/engine/Xenko.Graphics/GraphicsResourceLink.cs
index 83b760247d..df5b2a12ec 100644
--- a/sources/engine/Xenko.Graphics/GraphicsResourceLink.cs
+++ b/sources/engine/Xenko.Graphics/GraphicsResourceLink.cs
@@ -46,6 +46,6 @@ internal GraphicsResourceLink(GraphicsResourceBase resource)
         /// <summary>
         /// The number of active reference to this resource.
         /// </summary>
-        public int ReferenceCount { get; internal set; }
+        public int ReferenceCount;
     }
 }
diff --git a/sources/engine/Xenko.Graphics/MutablePipelineState.cs b/sources/engine/Xenko.Graphics/MutablePipelineState.cs
index 4a4ba96f7c..349143ccc7 100644
--- a/sources/engine/Xenko.Graphics/MutablePipelineState.cs
+++ b/sources/engine/Xenko.Graphics/MutablePipelineState.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using Xenko.Core;
 
@@ -9,7 +10,6 @@ namespace Xenko.Graphics
     public class MutablePipelineState
     {
         private readonly GraphicsDevice graphicsDevice;
-        private readonly Dictionary<PipelineStateDescriptionWithHash, PipelineState> cache;
         public PipelineStateDescription State;
 
         /// <summary>
@@ -21,8 +21,6 @@ public MutablePipelineState(GraphicsDevice graphicsDevice)
         {
             this.graphicsDevice = graphicsDevice;
 
-            cache = graphicsDevice.GetOrCreateSharedData(GraphicsDeviceSharedDataType.PerDevice, typeof(MutablePipelineStateCache), device => new MutablePipelineStateCache()).Cache;
-
             State = new PipelineStateDescription();
             State.SetDefaults();
         }
@@ -30,42 +28,9 @@ public MutablePipelineState(GraphicsDevice graphicsDevice)
         /// <summary>
         /// Determine and updates <see cref="CurrentState"/> from <see cref="State"/>.
         /// </summary>
-        public void Update()
-        {
-            // Hash current state
-            var hashedState = new PipelineStateDescriptionWithHash(State);
-
-            // Find existing PipelineState object
-            PipelineState pipelineState;
-
-            // TODO GRAPHICS REFACTOR We could avoid lock by adding them to a ThreadLocal (or RenderContext) and merge at end of frame
-            lock (cache)
-            {
-                if (!cache.TryGetValue(hashedState, out pipelineState))
-                {
-                    // Otherwise, instantiate it
-                    // First, make an copy
-                    hashedState = new PipelineStateDescriptionWithHash(State.Clone());
-                    cache.Add(hashedState, pipelineState = PipelineState.New(graphicsDevice, ref State));
-                }
-            }
-
-            CurrentState = pipelineState;
-        }
-
-        private class MutablePipelineStateCache : IDisposable
+        public void Update(bool wait = true)
         {
-            public readonly Dictionary<PipelineStateDescriptionWithHash, PipelineState> Cache = new Dictionary<PipelineStateDescriptionWithHash, PipelineState>();
-
-            public void Dispose()
-            {
-                foreach (var pipelineState in Cache)
-                {
-                    ((IReferencable)pipelineState.Value).Release();
-                }
-
-                Cache.Clear();
-            }
-        }
+            CurrentState = PipelineState.New(graphicsDevice, State, CurrentState, wait);
+       }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/Null/PipelineState.Null.cs b/sources/engine/Xenko.Graphics/Null/PipelineState.Null.cs
index 53946e84f1..98fe343426 100644
--- a/sources/engine/Xenko.Graphics/Null/PipelineState.Null.cs
+++ b/sources/engine/Xenko.Graphics/Null/PipelineState.Null.cs
@@ -7,15 +7,23 @@ namespace Xenko.Graphics
 {
     public partial class PipelineState
     {
+        internal PipelineState(GraphicsDevice device) : base(device) {
+            // just return a memory address to Prepare later
+        }
+
         /// <summary>
         /// Initializes new instance of <see cref="PipelineState"/> for <param name="device"/>
         /// </summary>
         /// <param name="device">The graphics device.</param>
         /// <param name="pipelineStateDescription">The pipeline state description.</param>
-        private PipelineState(GraphicsDevice device, PipelineStateDescription pipelineStateDescription) : base(device)
+        internal void Prepare(PipelineStateDescription pipelineStateDescription) : base(device)
         {
             NullHelper.ToImplement();
         }
+
+        public PIPELINE_STATE CurrentState() {
+            return PIPELINE_STATE.READY;
+        }
     }
 }
 
diff --git a/sources/engine/Xenko.Graphics/OpenGL/BlendState.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/BlendState.OpenGL.cs
deleted file mode 100644
index 64d5fd2920..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/BlendState.OpenGL.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-using System;
-using OpenTK.Graphics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    class BlendState
-    {
-        internal readonly ColorWriteChannels ColorWriteChannels;
-
-        private readonly bool blendEnable;
-        private readonly BlendEquationMode blendEquationModeColor;
-        private readonly BlendEquationMode blendEquationModeAlpha;
-        private readonly BlendingFactorSrc blendFactorSrcColor;
-        private readonly BlendingFactorSrc blendFactorSrcAlpha;
-        private readonly BlendingFactorDest blendFactorDestColor;
-        private readonly BlendingFactorDest blendFactorDestAlpha;
-        private readonly uint blendEquationHash;
-        private readonly uint blendFuncHash;
-
-        internal unsafe BlendState(BlendStateDescription blendStateDescription, bool hasRenderTarget)
-        {
-            var renderTargets = &blendStateDescription.RenderTarget0;
-            for (int i = 1; i < 8; ++i)
-            {
-                if (renderTargets[i].BlendEnable || renderTargets[i].ColorWriteChannels != ColorWriteChannels.All)
-                    throw new NotSupportedException();
-            }
-
-            ColorWriteChannels = blendStateDescription.RenderTarget0.ColorWriteChannels;
-            if (!hasRenderTarget)
-                ColorWriteChannels = 0;
-
-            blendEnable = blendStateDescription.RenderTarget0.BlendEnable;
-
-            blendEquationModeColor = ToOpenGL(blendStateDescription.RenderTarget0.ColorBlendFunction);
-            blendEquationModeAlpha = ToOpenGL(blendStateDescription.RenderTarget0.AlphaBlendFunction);
-            blendFactorSrcColor = ToOpenGL(blendStateDescription.RenderTarget0.ColorSourceBlend);
-            blendFactorSrcAlpha = ToOpenGL(blendStateDescription.RenderTarget0.AlphaSourceBlend);
-            blendFactorDestColor = (BlendingFactorDest)ToOpenGL(blendStateDescription.RenderTarget0.ColorDestinationBlend);
-            blendFactorDestAlpha = (BlendingFactorDest)ToOpenGL(blendStateDescription.RenderTarget0.AlphaDestinationBlend);
-
-            blendEquationHash = (uint)blendStateDescription.RenderTarget0.ColorBlendFunction
-                             | ((uint)blendStateDescription.RenderTarget0.AlphaBlendFunction << 8);
-
-            blendFuncHash = (uint)blendStateDescription.RenderTarget0.ColorSourceBlend
-                         | ((uint)blendStateDescription.RenderTarget0.AlphaSourceBlend << 8)
-                         | ((uint)blendStateDescription.RenderTarget0.ColorDestinationBlend << 16)
-                         | ((uint)blendStateDescription.RenderTarget0.AlphaDestinationBlend << 24);
-        }
-
-        public static BlendEquationMode ToOpenGL(BlendFunction blendFunction)
-        {
-            switch (blendFunction)
-            {
-                case BlendFunction.Subtract:
-                    return BlendEquationMode.FuncSubtract;
-                case BlendFunction.Add:
-                    return BlendEquationMode.FuncAdd;
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case BlendFunction.Max:
-                    return BlendEquationMode.Max;
-                case BlendFunction.Min:
-                    return BlendEquationMode.Min;
-#endif
-                case BlendFunction.ReverseSubtract:
-                    return BlendEquationMode.FuncReverseSubtract;
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-
-        public static BlendingFactorSrc ToOpenGL(Blend blend)
-        {
-            switch (blend)
-            {
-                case Blend.Zero:
-                    return BlendingFactorSrc.Zero;
-                case Blend.One:
-                    return BlendingFactorSrc.One;
-                case Blend.SourceColor:
-                    return (BlendingFactorSrc)BlendingFactorDest.SrcColor;
-                case Blend.InverseSourceColor:
-                    return (BlendingFactorSrc)BlendingFactorDest.OneMinusSrcColor;
-                case Blend.SourceAlpha:
-                    return BlendingFactorSrc.SrcAlpha;
-                case Blend.InverseSourceAlpha:
-                    return BlendingFactorSrc.OneMinusSrcAlpha;
-                case Blend.DestinationAlpha:
-                    return BlendingFactorSrc.DstAlpha;
-                case Blend.InverseDestinationAlpha:
-                    return BlendingFactorSrc.OneMinusDstAlpha;
-                case Blend.DestinationColor:
-                    return BlendingFactorSrc.DstColor;
-                case Blend.InverseDestinationColor:
-                    return BlendingFactorSrc.OneMinusDstColor;
-                case Blend.SourceAlphaSaturate:
-                    return BlendingFactorSrc.SrcAlphaSaturate;
-                case Blend.BlendFactor:
-                    return BlendingFactorSrc.ConstantColor;
-                case Blend.InverseBlendFactor:
-                    return BlendingFactorSrc.OneMinusConstantColor;
-                case Blend.SecondarySourceColor:
-                case Blend.InverseSecondarySourceColor:
-                case Blend.SecondarySourceAlpha:
-                case Blend.InverseSecondarySourceAlpha:
-                    throw new NotSupportedException();
-                default:
-                    throw new ArgumentOutOfRangeException("blend");
-            }
-        }
-
-        public void Apply(CommandList commandList, BlendState oldBlendState)
-        {
-            // note: need to update blend equation, blend function and color mask even when the blend state is disable in order to keep the hash based caching system valid
-
-            if (blendEnable && !oldBlendState.blendEnable)
-                GL.Enable(EnableCap.Blend);
-
-            if (blendEquationHash != oldBlendState.blendEquationHash)
-                GL.BlendEquationSeparate(blendEquationModeColor, blendEquationModeAlpha);
-
-            if (blendFuncHash != oldBlendState.blendFuncHash)
-                GL.BlendFuncSeparate(blendFactorSrcColor, blendFactorDestColor, blendFactorSrcAlpha, blendFactorDestAlpha);
-
-            if (commandList.NewBlendFactor != commandList.BoundBlendFactor)
-            {
-                commandList.BoundBlendFactor = commandList.NewBlendFactor;
-                GL.BlendColor(commandList.NewBlendFactor.R, commandList.NewBlendFactor.G, commandList.NewBlendFactor.B, commandList.NewBlendFactor.A);
-            }
-
-            if (ColorWriteChannels != oldBlendState.ColorWriteChannels)
-            {
-                RestoreColorMask();
-            }
-
-            if (!blendEnable && oldBlendState.blendEnable)
-                GL.Disable(EnableCap.Blend);
-        }
-
-        internal void RestoreColorMask()
-        {
-            GL.ColorMask(
-                (ColorWriteChannels & ColorWriteChannels.Red) != 0,
-                (ColorWriteChannels & ColorWriteChannels.Green) != 0,
-                (ColorWriteChannels & ColorWriteChannels.Blue) != 0,
-                (ColorWriteChannels & ColorWriteChannels.Alpha) != 0);
-        }
-    }
-} 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/Buffer.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/Buffer.OpenGL.cs
deleted file mode 100644
index 288d41cc4b..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/Buffer.OpenGL.cs
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using Xenko.Core;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-using PixelFormatGl = OpenTK.Graphics.OpenGL.PixelFormat;
-using TextureTarget2d = OpenTK.Graphics.OpenGL.TextureTarget;
-#endif
-
-namespace Xenko.Graphics
-{
-    public partial class Buffer
-    {
-        internal const int BufferTextureEmulatedWidth = 4096;
-
-        internal int BufferId;
-        internal BufferTarget BufferTarget;
-        internal BufferUsageHint BufferUsageHint;
-
-        private int bufferTextureElementSize;
-
-        // Special case: ConstantBuffer are faked with a byte array on OpenGL ES 2.0.
-        internal IntPtr StagingData { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Buffer" /> class.
-        /// </summary>
-        /// <param name="description">The description.</param>
-        /// <param name="viewFlags">Type of the buffer.</param>
-        /// <param name="viewFormat">The view format.</param>
-        /// <param name="dataPointer">The data pointer.</param>
-        protected Buffer InitializeFromImpl(BufferDescription description, BufferFlags viewFlags, PixelFormat viewFormat, IntPtr dataPointer)
-        {
-            bufferDescription = description;
-            ViewFlags = viewFlags;
-
-            bool isCompressed;
-            OpenGLConvertExtensions.ConvertPixelFormat(GraphicsDevice, ref viewFormat, out TextureInternalFormat, out TextureFormat, out TextureType, out bufferTextureElementSize, out isCompressed);
-
-            ViewFormat = viewFormat;
-
-            Recreate(dataPointer);
-
-            if (GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterBufferMemoryUsage(SizeInBytes);
-            }
-
-            return this;
-        }
-
-        public void Recreate(IntPtr dataPointer)
-        {
-            if ((ViewFlags & BufferFlags.VertexBuffer) == BufferFlags.VertexBuffer)
-            {
-                BufferTarget = BufferTarget.ArrayBuffer;
-            }
-            else if ((ViewFlags & BufferFlags.IndexBuffer) == BufferFlags.IndexBuffer)
-            {
-                BufferTarget = BufferTarget.ElementArrayBuffer;
-            }
-            else if ((ViewFlags & BufferFlags.UnorderedAccess) == BufferFlags.UnorderedAccess)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                throw new NotSupportedException("GLES not support UnorderedAccess buffer");
-#else
-                BufferTarget = BufferTarget.ShaderStorageBuffer;
-#endif
-            }
-            else if ((ViewFlags & BufferFlags.ShaderResource) == BufferFlags.ShaderResource && GraphicsDevice.HasTextureBuffers)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                Internal.Refactor.ThrowNotImplementedException();
-#else
-                BufferTarget = BufferTarget.TextureBuffer;
-#endif
-            }
-
-            if ((ViewFlags & BufferFlags.ConstantBuffer) == BufferFlags.ConstantBuffer)
-            {
-                BufferTarget = BufferTarget.UniformBuffer;
-
-                // Special case: ConstantBuffer are stored CPU side
-                StagingData = Marshal.AllocHGlobal(Description.SizeInBytes);
-            }
-            else if (Description.Usage == GraphicsResourceUsage.Dynamic)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                if (GraphicsDevice.IsOpenGLES2)
-                {
-                    // OpenGL ES might not always support MapBuffer (TODO: Use MapBufferOES if available)
-                    StagingData = Marshal.AllocHGlobal(Description.SizeInBytes);
-                }
-#endif
-            }
-
-            Init(dataPointer);
-        }
-
-        /// <inheritdoc/>
-        protected internal override bool OnRecreate()
-        {
-            base.OnRecreate();
-
-            if (Description.Usage == GraphicsResourceUsage.Immutable
-                || Description.Usage == GraphicsResourceUsage.Default)
-                return false;
-
-            Recreate(IntPtr.Zero);
-
-            return true;
-        }
-
-        /// <inheritdoc/>
-        protected internal override void OnDestroyed()
-        {
-            if (StagingData != IntPtr.Zero)
-            {
-                Marshal.FreeHGlobal(StagingData);
-                StagingData = IntPtr.Zero;
-            }
-
-            using (GraphicsDevice.UseOpenGLCreationContext())
-            {
-                GL.DeleteTextures(1, ref TextureId);
-                GL.DeleteBuffers(1, ref BufferId);
-            }
-
-            BufferId = 0;
-
-            if (GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterBufferMemoryUsage(-SizeInBytes);
-            }
-
-            base.OnDestroyed();
-        }
-
-        protected void Init(IntPtr dataPointer)
-        {
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (GraphicsDevice.IsOpenGLES2 
-                && ((Description.BufferFlags & BufferFlags.ConstantBuffer) == BufferFlags.ConstantBuffer
-                    || Description.Usage == GraphicsResourceUsage.Dynamic))
-            {
-                if (dataPointer != IntPtr.Zero)
-                {
-                    // Special case: ConstantBuffer are faked with a byte array on OpenGL ES 2.0.
-                    unsafe
-                    {
-                        Utilities.CopyMemory(StagingData, dataPointer, Description.SizeInBytes);
-                    }
-                }
-                return;
-            }
-#endif
-            switch (Description.Usage)
-            {
-                case GraphicsResourceUsage.Default:
-                case GraphicsResourceUsage.Immutable:
-                    BufferUsageHint = BufferUsageHint.StaticDraw;
-                    break;
-                case GraphicsResourceUsage.Dynamic:
-                case GraphicsResourceUsage.Staging:
-                    BufferUsageHint = BufferUsageHint.DynamicDraw;
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException("description.Usage");
-            }
-
-            using (var openglContext = GraphicsDevice.UseOpenGLCreationContext())
-            {
-                if ((Flags & BufferFlags.ShaderResource) != 0 && !GraphicsDevice.HasTextureBuffers)
-                {
-                    // Create a texture instead of a buffer on platforms where it's not supported
-                    elementCount = SizeInBytes / bufferTextureElementSize;
-                    TextureTarget = TextureTarget.Texture2D;
-                    GL.GenTextures(1, out TextureId);
-                    GL.BindTexture(TextureTarget, TextureId);
-
-                    GL.TexParameter(TextureTarget, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);
-                    GL.TexParameter(TextureTarget, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);
-                    GL.TexParameter(TextureTarget, TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToEdge);
-                    GL.TexParameter(TextureTarget, TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToEdge);
-
-                    UpdateTextureSubresource(dataPointer, 0, 0, SizeInBytes);
-
-                    GL.BindTexture(TextureTarget, 0);
-
-                    if (openglContext.CommandList != null)
-                    {
-                        // If we messed up with some states of a command list, mark dirty states
-                        openglContext.CommandList.boundShaderResourceViews[openglContext.CommandList.activeTexture] = null;
-                    }
-                }
-                else
-                {
-                    // If we're on main context, unbind VAO before binding context.
-                    // It will be bound again on next draw.
-                    //if (!creationContext.UseDeviceCreationContext)
-                    //    GraphicsDevice.UnbindVertexArrayObject();
-
-                    GL.GenBuffers(1, out BufferId);
-                    GL.BindBuffer(BufferTarget, BufferId);
-                    GL.BufferData(BufferTarget, (IntPtr)Description.SizeInBytes, dataPointer, BufferUsageHint);
-                    GL.BindBuffer(BufferTarget, 0);
-
-                    if ((Flags & BufferFlags.ShaderResource) != 0)
-                    {
-#if XENKO_GRAPHICS_API_OPENGLES
-                        Internal.Refactor.ThrowNotImplementedException();
-#else
-                        TextureTarget = TextureTarget.TextureBuffer;
-                        GL.GenTextures(1, out TextureId);
-                        GL.BindTexture(TextureTarget, TextureId);
-                        // TODO: Check if this is really valid to cast PixelInternalFormat to SizedInternalFormat in all cases?
-                        GL.TexBuffer(TextureBufferTarget.TextureBuffer, (SizedInternalFormat)TextureInternalFormat, BufferId);
-#endif
-                    }
-                }
-            }
-        }
-
-        internal void UpdateTextureSubresource(IntPtr dataPointer, int subresouceLevel, int offset, int count)
-        {
-            // If overwriting everything, create a new texture
-            if (offset == 0 && count == SizeInBytes)
-                GL.TexImage2D((TextureTarget2d)TextureTarget, subresouceLevel, TextureInternalFormat, Math.Min(BufferTextureEmulatedWidth, elementCount), (elementCount + BufferTextureEmulatedWidth - 1) / BufferTextureEmulatedWidth, 0, TextureFormat, TextureType, IntPtr.Zero);
-
-            // Work with full elements
-            Debug.Assert(offset % bufferTextureElementSize == 0 && count % bufferTextureElementSize == 0, "When updating a buffer texture, offset and count should be a multiple of the element size");
-            offset /= bufferTextureElementSize;
-            count /= bufferTextureElementSize;
-
-            // Upload data
-            if (dataPointer != IntPtr.Zero)
-            {
-                // First line
-                if (offset % BufferTextureEmulatedWidth != 0)
-                {
-                    var firstLineSize = Math.Min(count, BufferTextureEmulatedWidth - (offset % BufferTextureEmulatedWidth));
-
-                    GL.TexSubImage2D((TextureTarget2d)TextureTarget, 0,
-                        offset % BufferTextureEmulatedWidth, offset / BufferTextureEmulatedWidth, // coordinates
-                        BufferTextureEmulatedWidth - (offset % BufferTextureEmulatedWidth), 1, // size
-                        TextureFormat, TextureType, dataPointer);
-
-                    offset += firstLineSize;
-                    count -= firstLineSize;
-                    dataPointer += firstLineSize * bufferTextureElementSize;
-                }
-
-                // Middle lines
-                if (count / BufferTextureEmulatedWidth > 0)
-                    GL.TexSubImage2D((TextureTarget2d)TextureTarget, 0,
-                        0, offset / BufferTextureEmulatedWidth, // coordinates
-                        BufferTextureEmulatedWidth, count / BufferTextureEmulatedWidth, // size
-                        TextureFormat, TextureType, dataPointer);
-
-                // Last line is done separately (to avoid buffer overrun if last line is not multiple of BufferTextureEmulatedWidth)
-                if (count % BufferTextureEmulatedWidth != 0)
-                    GL.TexSubImage2D((TextureTarget2d)TextureTarget, 0,
-                        0, count / BufferTextureEmulatedWidth, // coordinates
-                        count % BufferTextureEmulatedWidth, 1, // size
-                        TextureFormat, TextureType, dataPointer + (count/ BufferTextureEmulatedWidth * BufferTextureEmulatedWidth) * bufferTextureElementSize);
-            }
-        }
-    }
-} 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/CommandList.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/CommandList.OpenGL.cs
deleted file mode 100644
index b56134fc79..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/CommandList.OpenGL.cs
+++ /dev/null
@@ -1,2011 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-
-using System;
-using System.Threading;
-using OpenTK.Graphics;
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-using Xenko;
-using Xenko.Shaders;
-using Color4 = Xenko.Core.Mathematics.Color4;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using PixelFormatGl = OpenTK.Graphics.ES30.PixelFormat;
-using PrimitiveTypeGl = OpenTK.Graphics.ES30.PrimitiveType;
-using DebugSourceExternal = OpenTK.Graphics.ES30.All;
-using QueryCounterTarget = OpenTK.Graphics.ES30.All;
-#else
-using OpenTK.Graphics.OpenGL;
-using PrimitiveTypeGl = OpenTK.Graphics.OpenGL.PrimitiveType;
-using TextureTarget2d = OpenTK.Graphics.OpenGL.TextureTarget;
-using TextureTarget3d = OpenTK.Graphics.OpenGL.TextureTarget;
-#endif
-
-namespace Xenko.Graphics
-{
-    public partial class CommandList
-    {
-        // How many frames to wait before allowing non-blocking texture readbacks
-        private const int ReadbackFrameDelay = 2;
-        private const int MaxBoundRenderTargets = 16;
-
-        internal uint enabledVertexAttribArrays;
-        private int boundProgram = 0;
-
-        internal int BoundStencilReference;
-        internal int NewStencilReference;
-        internal Color4 BoundBlendFactor;
-        internal Color4 NewBlendFactor;
-
-        private bool vboDirty = true;
-
-        private GraphicsDevice.FBOTexture boundDepthStencilBuffer;
-        private int boundRenderTargetCount = 0;
-        private GraphicsDevice.FBOTexture[] boundRenderTargets = new GraphicsDevice.FBOTexture[MaxBoundRenderTargets];
-        internal GraphicsResource[] boundShaderResourceViews = new GraphicsResource[64];
-        private GraphicsResource[] shaderResourceViews = new GraphicsResource[64];
-        private SamplerState[] samplerStates = new SamplerState[64];
-
-        internal DepthStencilBoundState DepthStencilBoundState;
-        internal RasterizerBoundState RasterizerBoundState;
-
-        private Buffer[] constantBuffers = new Buffer[64];
-
-        private int boundFBO;
-        private bool needUpdateFBO = true;
-
-        private PipelineState newPipelineState;
-        private PipelineState currentPipelineState;
-
-        private DescriptorSet[] currentDescriptorSets = new DescriptorSet[32];
-
-        internal int activeTexture = 0;
-
-        private IndexBufferView indexBuffer;
-
-        private VertexBufferView[] vertexBuffers = new VertexBufferView[8];
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-        private readonly float[] nativeViewports = new float[4 * MaxViewportAndScissorRectangleCount];
-        private readonly int[] nativeScissorRectangles = new int[4 * MaxViewportAndScissorRectangleCount];
-#endif
-
-        public static CommandList New(GraphicsDevice device)
-        {
-            if (device.InternalMainCommandList != null)
-            {
-                throw new InvalidOperationException("Can't create multiple command lists with OpenGL");
-            }
-            return new CommandList(device);
-        }
-
-        private CommandList(GraphicsDevice device) : base(device)
-        {
-            device.InternalMainCommandList = this;
-
-            // Default state
-            DepthStencilBoundState.DepthBufferWriteEnable = true;
-            DepthStencilBoundState.StencilWriteMask = 0xFF;
-            RasterizerBoundState.FrontFaceDirection = FrontFaceDirection.Ccw;
-#if !XENKO_GRAPHICS_API_OPENGLES
-            RasterizerBoundState.PolygonMode = PolygonMode.Fill;
-#endif
-
-            ClearState();
-        }
-
-        public void Reset()
-        {
-        }
-
-        public void Flush()
-        {
-            
-        }
-
-        public CompiledCommandList Close()
-        {
-            return default(CompiledCommandList);
-        }
-
-        public void Clear(Texture depthStencilBuffer, DepthStencilClearOptions options, float depth = 1, byte stencil = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_PLATFORM_ANDROID
-            // Device with no background loading context: check if some loading is pending
-            if (GraphicsDevice.AsyncPendingTaskWaiting)
-                GraphicsDevice.ExecutePendingTasks();
-#endif
-
-            var clearFBO = GraphicsDevice.FindOrCreateFBO(depthStencilBuffer);
-            if (clearFBO != boundFBO)
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, clearFBO);
-
-            ClearBufferMask clearBufferMask =
-                ((options & DepthStencilClearOptions.DepthBuffer) == DepthStencilClearOptions.DepthBuffer ? ClearBufferMask.DepthBufferBit : 0)
-                | ((options & DepthStencilClearOptions.Stencil) == DepthStencilClearOptions.Stencil ? ClearBufferMask.StencilBufferBit : 0);
-            GL.ClearDepth(depth);
-            GL.ClearStencil(stencil);
-
-            // Check if we need to change depth mask
-            var currentDepthMask = DepthStencilBoundState.DepthBufferWriteEnable;
-
-            if (!currentDepthMask)
-                GL.DepthMask(true);
-            GL.Clear(clearBufferMask);
-            if (!currentDepthMask)
-                GL.DepthMask(false);
-
-            if (clearFBO != boundFBO)
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-        }
-
-        public void Clear(Texture renderTarget, Color4 color)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            var clearFBO = GraphicsDevice.FindOrCreateFBO(renderTarget);
-            if (clearFBO != boundFBO)
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, clearFBO);
-
-            // Check if we need to change color mask
-            var blendState = currentPipelineState.BlendState;
-            var needColorMaskOverride = blendState.ColorWriteChannels != ColorWriteChannels.All;
-
-            if (needColorMaskOverride)
-                GL.ColorMask(true, true, true, true);
-
-            GL.ClearColor(color.R, color.G, color.B, color.A);
-            GL.Clear(ClearBufferMask.ColorBufferBit);
-
-            // revert the color mask value as it was before
-            if (needColorMaskOverride)
-                blendState.RestoreColorMask();
-
-            if (clearFBO != boundFBO)
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-        }
-
-        public unsafe void ClearReadWrite(Buffer buffer, Vector4 value)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            if ((buffer.ViewFlags & BufferFlags.UnorderedAccess) != BufferFlags.UnorderedAccess)
-                throw new ArgumentException("Buffer does not support unordered access");
-
-            GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-            GL.ClearBufferData(buffer.BufferTarget, buffer.TextureInternalFormat, buffer.TextureFormat, All.UnsignedInt8888, ref value);
-            GL.BindBuffer(buffer.BufferTarget, 0);
-#endif
-        }
-
-        public unsafe void ClearReadWrite(Buffer buffer, Int4 value)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            if ((buffer.ViewFlags & BufferFlags.UnorderedAccess) != BufferFlags.UnorderedAccess)
-                throw new ArgumentException("Buffer does not support unordered access");
-
-            GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-            GL.ClearBufferData(buffer.BufferTarget, buffer.TextureInternalFormat, buffer.TextureFormat, All.UnsignedInt8888, ref value);
-            GL.BindBuffer(buffer.BufferTarget, 0);
-#endif
-        }
-
-        public unsafe void ClearReadWrite(Buffer buffer, UInt4 value)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            if ((buffer.ViewFlags & BufferFlags.UnorderedAccess) != BufferFlags.UnorderedAccess)
-                throw new ArgumentException("Buffer does not support unordered access");
-
-            GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-            GL.ClearBufferData(buffer.BufferTarget, buffer.TextureInternalFormat, buffer.TextureFormat, All.UnsignedInt8888, ref value);
-            GL.BindBuffer(buffer.BufferTarget, 0);
-#endif
-        }
-
-        public unsafe void ClearReadWrite(Texture texture, Vector4 value)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            if (activeTexture != 0)
-            {
-                activeTexture = 0;
-                GL.ActiveTexture(TextureUnit.Texture0);
-            }
-
-            GL.BindTexture(texture.TextureTarget, texture.TextureId);
-
-            GL.ClearTexImage(texture.TextureId, 0, texture.TextureFormat, texture.TextureType, ref value);
-
-            GL.BindTexture(texture.TextureTarget, 0);
-            boundShaderResourceViews[0] = null;
-#endif
-        }
-
-        public unsafe void ClearReadWrite(Texture texture, Int4 value)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            if (activeTexture != 0)
-            {
-                activeTexture = 0;
-                GL.ActiveTexture(TextureUnit.Texture0);
-            }
-
-            GL.BindTexture(texture.TextureTarget, texture.TextureId);
-
-            GL.ClearTexImage(texture.TextureId, 0, texture.TextureFormat, texture.TextureType, ref value);
-
-            GL.BindTexture(texture.TextureTarget, 0);
-            boundShaderResourceViews[0] = null;
-#endif
-        }
-
-        public unsafe void ClearReadWrite(Texture texture, UInt4 value)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            if (activeTexture != 0)
-            {
-                activeTexture = 0;
-                GL.ActiveTexture(TextureUnit.Texture0);
-            }
-
-            GL.BindTexture(texture.TextureTarget, texture.TextureId);
-
-            GL.ClearTexImage(texture.TextureId, 0, texture.TextureFormat, texture.TextureType, ref value);
-
-            GL.BindTexture(texture.TextureTarget, 0);
-            boundShaderResourceViews[0] = null;
-#endif
-        }
-
-        private void ClearStateImpl()
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            // Clear sampler states
-            for (int i = 0; i < samplerStates.Length; ++i)
-                samplerStates[i] = null;
-
-            for (int i = 0; i < boundShaderResourceViews.Length; ++i)
-            {
-                shaderResourceViews[i] = null;
-            }
-
-            // Clear active texture state
-            activeTexture = 0;
-            GL.ActiveTexture(TextureUnit.Texture0);
-
-            // set default states
-            currentPipelineState = GraphicsDevice.DefaultPipelineState;
-            newPipelineState = GraphicsDevice.DefaultPipelineState;
-
-            // Actually reset states
-            //currentPipelineState.BlendState.Apply();
-            GL.Disable(EnableCap.Blend);
-            GL.ColorMask(true, true, true, true);
-            currentPipelineState.DepthStencilState.Apply(this);
-            currentPipelineState.RasterizerState.Apply(this);
-
-#if XENKO_GRAPHICS_API_OPENGLCORE
-            GL.Enable(EnableCap.FramebufferSrgb);
-#endif
-        }
-
-        /// <summary>
-        /// Copy a region of a <see cref="GraphicsResource"/> into another.
-        /// </summary>
-        /// <param name="source">The source from which to copy the data</param>
-        /// <param name="regionSource">The region of the source <see cref="GraphicsResource"/> to copy.</param>
-        /// <param name="destination">The destination into which to copy the data</param>
-        /// <remarks>This might alter some states such as currently bound texture.</remarks>
-        public void CopyRegion(GraphicsResource source, int sourceSubresource, ResourceRegion? regionSource, GraphicsResource destination, int destinationSubResource, int dstX = 0, int dstY = 0, int dstZ = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            var sourceTexture = source as Texture;
-            var destTexture = destination as Texture;
-
-            if (sourceTexture == null || destTexture == null)
-            {
-                throw Internal.Refactor.NewNotImplementedException("Copy is only implemented for Texture objects.");
-            }
-
-            // Get parent texture
-            if (sourceTexture.ParentTexture != null)
-                sourceTexture = sourceTexture.ParentTexture;
-            if (destTexture.ParentTexture != null)
-                destTexture = sourceTexture.ParentTexture;
-
-            var sourceWidth = Texture.CalculateMipSize(sourceTexture.Description.Width, sourceSubresource % sourceTexture.MipLevels);
-            var sourceHeight = Texture.CalculateMipSize(sourceTexture.Description.Height, sourceSubresource % sourceTexture.MipLevels);
-            var sourceDepth = Texture.CalculateMipSize(sourceTexture.Description.Depth, sourceSubresource % sourceTexture.MipLevels);
-
-            var sourceRegion = regionSource.HasValue ? regionSource.Value : new ResourceRegion(0, 0, 0, sourceWidth, sourceHeight, sourceDepth);
-            var sourceRectangle = new Rectangle(sourceRegion.Left, sourceRegion.Top, sourceRegion.Right - sourceRegion.Left, sourceRegion.Bottom - sourceRegion.Top);
-
-            if (sourceRectangle.Width == 0 || sourceRectangle.Height == 0)
-                return;
-
-
-            if (destTexture.Description.Usage == GraphicsResourceUsage.Staging)
-            {
-                if (sourceTexture.Description.Usage == GraphicsResourceUsage.Staging)
-                {
-                    // Staging => Staging
-                    if (sourceRegion.Left != 0 || sourceRegion.Top != 0 || sourceRegion.Front != 0
-                        || sourceRegion.Right != sourceWidth || sourceRegion.Bottom != sourceHeight || sourceRegion.Back != sourceDepth)
-                    {
-                        throw new NotSupportedException("ReadPixels from staging texture to staging texture only support full copy of subresource");
-                    }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (GraphicsDevice.IsOpenGLES2)
-                    {
-                        Utilities.CopyMemory(destTexture.StagingData + destTexture.ComputeBufferOffset(destinationSubResource, 0),
-                            sourceTexture.StagingData + sourceTexture.ComputeBufferOffset(sourceSubresource, 0),
-                            destTexture.ComputeSubresourceSize(destinationSubResource));
-                    }
-                    else
-#endif
-                    {
-                        GL.BindBuffer(BufferTarget.CopyReadBuffer, sourceTexture.PixelBufferObjectId);
-                        GL.BindBuffer(BufferTarget.CopyWriteBuffer, destTexture.PixelBufferObjectId);
-                        GL.CopyBufferSubData(BufferTarget.CopyReadBuffer, BufferTarget.CopyWriteBuffer,
-                            (IntPtr)sourceTexture.ComputeBufferOffset(sourceSubresource, 0),
-                            (IntPtr)destTexture.ComputeBufferOffset(destinationSubResource, 0),
-                            (IntPtr)destTexture.ComputeSubresourceSize(destinationSubResource));
-                    }
-                }
-                else
-                {
-                    // GPU => Staging
-                    if (dstX != 0 || dstY != 0 || dstZ != 0)
-                        throw new NotSupportedException("ReadPixels from staging texture using non-zero destination is not supported");
-
-                    GL.Viewport(0, 0, sourceWidth, sourceHeight);
-
-                    var isDepthBuffer = Texture.InternalIsDepthStencilFormat(sourceTexture.Format);
-
-                    GL.BindFramebuffer(FramebufferTarget.Framebuffer, isDepthBuffer ? GraphicsDevice.CopyDepthSourceFBO : GraphicsDevice.CopyColorSourceFBO);
-                    var attachmentType = FramebufferAttachment.ColorAttachment0;
-
-                    for (int depthSlice = sourceRegion.Front; depthSlice < sourceRegion.Back; ++depthSlice)
-                    {
-                        attachmentType = GraphicsDevice.UpdateFBO(FramebufferTarget.Framebuffer, new GraphicsDevice.FBOTexture(sourceTexture, sourceSubresource / sourceTexture.MipLevels + depthSlice, sourceSubresource % sourceTexture.MipLevels));
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                        if (GraphicsDevice.IsOpenGLES2)
-                        {
-                            var format = destTexture.TextureFormat;
-                            var type = destTexture.TextureType;
-
-                            var srcFormat = sourceTexture.Description.Format;
-                            var destFormat = destTexture.Description.Format;
-
-                            if (srcFormat == destFormat && destFormat.SizeInBytes() == 4)   // in this case we just want to copy the data we don't care about format conversion. 
-                            {                                                               // RGBA/Unsigned-byte is always a working combination whatever is the internal format (sRGB, etc...)
-                                format = PixelFormatGl.Rgba;
-                                type = PixelType.UnsignedByte;
-                            }
-
-                            GL.ReadPixels(sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width, sourceRectangle.Height, format, type, destTexture.StagingData + destTexture.ComputeBufferOffset(destinationSubResource, depthSlice));
-                        }
-                        else
-#endif
-                        {
-                            GL.BindBuffer(BufferTarget.PixelPackBuffer, destTexture.PixelBufferObjectId);
-                            GL.ReadPixels(sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width, sourceRectangle.Height, destTexture.TextureFormat, destTexture.TextureType, (IntPtr)destTexture.ComputeBufferOffset(destinationSubResource, depthSlice));
-                            GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
-
-                            destTexture.PixelBufferFrame = GraphicsDevice.FrameCounter;
-                        }
-                    }
-
-                    // Unbind attachment
-                    GL.FramebufferTexture2D(FramebufferTarget.Framebuffer, attachmentType, TextureTarget2d.Texture2D, 0, 0);
-
-                    // Restore FBO and viewport
-                    GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-                    GL.Viewport((int)viewports[0].X, (int)viewports[0].Y, (int)viewports[0].Width, (int)viewports[0].Height);
-                }
-                return;
-            }
-
-            // GPU => GPU
-            {
-                var isDepthBuffer = Texture.InternalIsDepthStencilFormat(sourceTexture.Format);
-
-                // Use our temporary mutable FBO
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, isDepthBuffer ? GraphicsDevice.CopyDepthSourceFBO : GraphicsDevice.CopyColorSourceFBO);
-
-                var attachmentType = FramebufferAttachment.ColorAttachment0;
-
-                if (activeTexture != 0)
-                {
-                    activeTexture = 0;
-                    GL.ActiveTexture(TextureUnit.Texture0);
-                }
-
-                GL.Viewport(0, 0, sourceWidth, sourceHeight);
-
-                GL.BindTexture(destTexture.TextureTarget, destTexture.TextureId);
-
-                for (int depthSlice = sourceRegion.Front; depthSlice < sourceRegion.Back; ++depthSlice)
-                {
-                    // Note: In practice, either it's a 2D texture array and its arrayslice can be non zero, or it's a 3D texture and it's depthslice can be non-zero, but not both at the same time
-                    attachmentType = GraphicsDevice.UpdateFBO(FramebufferTarget.Framebuffer, new GraphicsDevice.FBOTexture(sourceTexture, sourceSubresource / sourceTexture.MipLevels + depthSlice, sourceSubresource % sourceTexture.MipLevels));
-
-                    var arraySlice = destinationSubResource / destTexture.MipLevels;
-                    var mipLevel = destinationSubResource % destTexture.MipLevels;
-
-                    switch (destTexture.TextureTarget)
-                    {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                        case TextureTarget.Texture1D:
-                            GL.CopyTexSubImage1D(TextureTarget2d.Texture1D, mipLevel, dstX, sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width);
-                            break;
-#endif
-                        case TextureTarget.Texture2D:
-                            GL.CopyTexSubImage2D(TextureTarget2d.Texture2D, mipLevel, dstX, dstY, sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width, sourceRectangle.Height);
-                            break;
-                        case TextureTarget.Texture2DArray:
-                            GL.CopyTexSubImage3D(TextureTarget3d.Texture2DArray, mipLevel, dstX, dstY, arraySlice, sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width, sourceRectangle.Height);
-                            break;
-                        case TextureTarget.Texture3D:
-                            GL.CopyTexSubImage3D(TextureTarget3d.Texture3D, mipLevel, dstX, dstY, depthSlice, sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width, sourceRectangle.Height);
-                            break;
-                        case TextureTarget.TextureCubeMap:
-                            GL.CopyTexSubImage2D(Texture.GetTextureTargetForDataSet2D(destTexture.TextureTarget, arraySlice), mipLevel, dstX, dstY, sourceRectangle.Left, sourceRectangle.Top, sourceRectangle.Width, sourceRectangle.Height);
-                            break;
-                        default:
-                            throw new NotSupportedException("Invalid texture target: " + destTexture.TextureTarget);
-                    }
-                }
-
-                // Unbind texture and force it to be set again next draw call
-                GL.BindTexture(destTexture.TextureTarget, 0);
-                boundShaderResourceViews[0] = null;
-
-                // Unbind attachment
-                GL.FramebufferTexture2D(FramebufferTarget.Framebuffer, attachmentType, TextureTarget2d.Texture2D, 0, 0);
-
-                // Restore FBO and viewport
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-                GL.Viewport((int)viewports[0].X, (int)viewports[0].Y, (int)viewports[0].Width, (int)viewports[0].Height);
-            }
-        }
-
-        internal void CopyScaler2D(Texture sourceTexture, Texture destTexture, Rectangle sourceRectangle, Rectangle destRectangle, bool flipY = false)
-        {
-            // Use rendering
-            GL.Viewport(0, 0, destTexture.Description.Width, destTexture.Description.Height);
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, GraphicsDevice.FindOrCreateFBO(destTexture));
-
-            var sourceRegionSize = new Vector2(sourceRectangle.Width, sourceRectangle.Height);
-            var destRegionSize = new Vector2(destRectangle.Width, destRectangle.Height);
-
-            // Source
-            var sourceSize = new Vector2(sourceTexture.Width, sourceTexture.Height);
-            var sourceRegionLeftTop = new Vector2(sourceRectangle.Left, sourceRectangle.Top);
-            var sourceScale = new Vector2(sourceRegionSize.X / sourceSize.X, sourceRegionSize.Y / sourceSize.Y);
-            var sourceOffset = new Vector2(sourceRegionLeftTop.X / sourceSize.X, sourceRegionLeftTop.Y / sourceSize.Y);
-
-            // Dest
-            var destSize = new Vector2(destTexture.Width, destTexture.Height);
-            var destRegionLeftTop = new Vector2(destRectangle.X, flipY ? destRectangle.Bottom : destRectangle.Y);
-            var destScale = new Vector2(destRegionSize.X / destSize.X, destRegionSize.Y / destSize.Y);
-            var destOffset = new Vector2(destRegionLeftTop.X / destSize.X, destRegionLeftTop.Y / destSize.Y);
-
-            if (flipY)
-                destScale.Y = -destScale.Y;
-
-            var enabledColors = new bool[4];
-            GL.GetBoolean(GetPName.ColorWritemask, enabledColors);
-            var isDepthTestEnabled = GL.IsEnabled(EnableCap.DepthTest);
-            var isCullFaceEnabled = GL.IsEnabled(EnableCap.CullFace);
-            var isBlendEnabled = GL.IsEnabled(EnableCap.Blend);
-            var isStencilEnabled = GL.IsEnabled(EnableCap.StencilTest);
-            GL.Disable(EnableCap.DepthTest);
-            GL.Disable(EnableCap.CullFace);
-            GL.Disable(EnableCap.Blend);
-            GL.Disable(EnableCap.StencilTest);
-            GL.ColorMask(true, true, true, true);
-
-            // TODO find a better way to detect if sRGB conversion is needed (need to detect if main frame buffer is sRGB or not at init time)
-#if XENKO_GRAPHICS_API_OPENGLES
-            // If we are copying from an SRgb texture to a non SRgb texture, we use a special SRGb copy shader
-            bool needSRgbConversion = sourceTexture.Description.Format.IsSRgb() && destTexture == GraphicsDevice.WindowProvidedRenderTexture;
-#else
-            bool needSRgbConversion = false;
-#endif
-            int offsetLocation, scaleLocation;
-            var program = GraphicsDevice.GetCopyProgram(needSRgbConversion, out offsetLocation, out scaleLocation);
-
-            GL.UseProgram(program);
-
-            activeTexture = 0;
-            GL.ActiveTexture(TextureUnit.Texture0);
-            GL.BindTexture(TextureTarget.Texture2D, sourceTexture.TextureId);
-            boundShaderResourceViews[0] = null;
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToEdge);
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToEdge);
-            sourceTexture.BoundSamplerState = GraphicsDevice.SamplerStates.PointClamp;
-
-            vboDirty = true;
-            enabledVertexAttribArrays |= 1 << 0;
-            GL.EnableVertexAttribArray(0);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, GraphicsDevice.GetSquareBuffer().BufferId);
-            GL.VertexAttribPointer(0, 2, VertexAttribPointerType.Float, false, 0, 0);
-            GL.Uniform4(offsetLocation, sourceOffset.X, sourceOffset.Y, destOffset.X, destOffset.Y);
-            GL.Uniform4(scaleLocation, sourceScale.X, sourceScale.Y, destScale.X, destScale.Y);
-            GL.Viewport(0, 0, destTexture.Width, destTexture.Height);
-            GL.DrawArrays(PrimitiveTypeGl.TriangleStrip, 0, 4);
-            GL.UseProgram(boundProgram);
-
-            // Restore context
-            if (isDepthTestEnabled)
-                GL.Enable(EnableCap.DepthTest);
-            if (isCullFaceEnabled)
-                GL.Enable(EnableCap.CullFace);
-            if (isBlendEnabled)
-                GL.Enable(EnableCap.Blend);
-            if (isStencilEnabled)
-                GL.Enable(EnableCap.StencilTest);
-            GL.ColorMask(enabledColors[0], enabledColors[1], enabledColors[2], enabledColors[3]);
-
-            // Restore FBO and viewport
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-            GL.Viewport((int)viewports[0].X, (int)viewports[0].Y, (int)viewports[0].Width, (int)viewports[0].Height);
-        }
-
-        internal void CopyScaler2D(Texture sourceTexture, Rectangle sourceRectangle, Rectangle destRectangle, bool needSRgbConversion = false, bool flipY = false)
-        {
-            // Use rendering
-            GL.Viewport(0, 0, sourceTexture.Description.Width, sourceTexture.Description.Height);
-
-            var sourceRegionSize = new Vector2(sourceRectangle.Width, sourceRectangle.Height);
-            var destRegionSize = new Vector2(destRectangle.Width, destRectangle.Height);
-
-            // Source
-            var sourceSize = new Vector2(sourceTexture.Width, sourceTexture.Height);
-            var sourceRegionLeftTop = new Vector2(sourceRectangle.Left, sourceRectangle.Top);
-            var sourceScale = new Vector2(sourceRegionSize.X / sourceSize.X, sourceRegionSize.Y / sourceSize.Y);
-            var sourceOffset = new Vector2(sourceRegionLeftTop.X / sourceSize.X, sourceRegionLeftTop.Y / sourceSize.Y);
-
-            // Dest
-            var destSize = new Vector2(sourceTexture.Width, sourceTexture.Height);
-            var destRegionLeftTop = new Vector2(destRectangle.X, flipY ? destRectangle.Bottom : destRectangle.Y);
-            var destScale = new Vector2(destRegionSize.X / destSize.X, destRegionSize.Y / destSize.Y);
-            var destOffset = new Vector2(destRegionLeftTop.X / destSize.X, destRegionLeftTop.Y / destSize.Y);
-
-            if (flipY)
-                destScale.Y = -destScale.Y;
-
-            var enabledColors = new bool[4];
-            GL.GetBoolean(GetPName.ColorWritemask, enabledColors);
-            var isDepthTestEnabled = GL.IsEnabled(EnableCap.DepthTest);
-            var isCullFaceEnabled = GL.IsEnabled(EnableCap.CullFace);
-            var isBlendEnabled = GL.IsEnabled(EnableCap.Blend);
-            var isStencilEnabled = GL.IsEnabled(EnableCap.StencilTest);
-            GL.Disable(EnableCap.DepthTest);
-            GL.Disable(EnableCap.CullFace);
-            GL.Disable(EnableCap.Blend);
-            GL.Disable(EnableCap.StencilTest);
-            GL.ColorMask(true, true, true, true);
-
-            int offsetLocation, scaleLocation;
-            var program = GraphicsDevice.GetCopyProgram(needSRgbConversion, out offsetLocation, out scaleLocation);
-
-            GL.UseProgram(program);
-
-            activeTexture = 0;
-            GL.ActiveTexture(TextureUnit.Texture0);
-            GL.BindTexture(TextureTarget.Texture2D, sourceTexture.TextureId);
-            boundShaderResourceViews[0] = null;
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToEdge);
-            GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToEdge);
-            sourceTexture.BoundSamplerState = GraphicsDevice.SamplerStates.PointClamp;
-
-            vboDirty = true;
-            enabledVertexAttribArrays |= 1 << 0;
-            GL.EnableVertexAttribArray(0);
-            GL.BindBuffer(BufferTarget.ArrayBuffer, GraphicsDevice.GetSquareBuffer().BufferId);
-            GL.VertexAttribPointer(0, 2, VertexAttribPointerType.Float, false, 0, 0);
-            GL.Uniform4(offsetLocation, sourceOffset.X, sourceOffset.Y, destOffset.X, destOffset.Y);
-            GL.Uniform4(scaleLocation, sourceScale.X, sourceScale.Y, destScale.X, destScale.Y);
-            GL.Viewport(0, 0, sourceTexture.Width, sourceTexture.Height);
-            GL.DrawArrays(PrimitiveTypeGl.TriangleStrip, 0, 4);
-            GL.UseProgram(boundProgram);
-
-            // Restore context
-            if (isDepthTestEnabled)
-                GL.Enable(EnableCap.DepthTest);
-            if (isCullFaceEnabled)
-                GL.Enable(EnableCap.CullFace);
-            if (isBlendEnabled)
-                GL.Enable(EnableCap.Blend);
-            if (isStencilEnabled)
-                GL.Enable(EnableCap.StencilTest);
-            GL.ColorMask(enabledColors[0], enabledColors[1], enabledColors[2], enabledColors[3]);
-
-            // Restore viewport
-            GL.Viewport((int)viewports[0].X, (int)viewports[0].Y, (int)viewports[0].Width, (int)viewports[0].Height);
-        }
-
-        /// <summary>
-        /// Copy a <see cref="GraphicsResource"/> into another.
-        /// </summary>
-        /// <param name="source">The source from which to copy the data</param>
-        /// <param name="destination">The destination into which to copy the data</param>
-        /// <remarks>This might alter some states such as currently bound texture.</remarks>
-        public void Copy(GraphicsResource source, GraphicsResource destination)
-        {
-            // Count subresources
-            var subresourceCount = 1;
-            var sourceTexture = source as Texture;
-            if (sourceTexture != null)
-            {
-                subresourceCount = sourceTexture.ArraySize * sourceTexture.MipLevels;
-            }
-
-            // Copy each subresource
-            for (int i = 0; i < subresourceCount; ++i)
-            {
-                CopyRegion(source, i, null, destination, i);
-            }
-        }
-
-        public void CopyMultisample(Texture sourceMultisampleTexture, int sourceSubResource, Texture destTexture, int destSubResource, PixelFormat format = PixelFormat.None)
-        {
-            // Check if the source and destination are compatible:
-            if (sourceMultisampleTexture.Width != destTexture.Width &&
-                sourceMultisampleTexture.Height != destTexture.Height &&
-                sourceMultisampleTexture.Format != destTexture.Format)  // TODO: Blitting seems to be okay even if the sizes don't match, but only in case of non-MSAA buffers.
-            {
-                throw new InvalidOperationException("sourceMultisampleTexture and destTexture don't match in size and format!");
-            }
-
-            // Set up the read (source) buffer to use for the blitting operation:
-            int readFBOID = GraphicsDevice.FindOrCreateFBO(sourceMultisampleTexture);   // Find the FBO that the sourceMultisampleTexture is bound to.
-            GL.BindFramebuffer(FramebufferTarget.ReadFramebuffer, readFBOID);
-
-            // Set up the draw (destination) buffer to use for the blitting operation:
-            int drawFBOID = GraphicsDevice.FindOrCreateFBO(destTexture);   // Find the FBO that the destTexture is bound to.
-            GL.BindFramebuffer(FramebufferTarget.DrawFramebuffer, drawFBOID);
-
-            ClearBufferMask clearBufferMask;
-            BlitFramebufferFilter blitFramebufferFilter;
-
-            // TODO: PERFORMANCE: We could copy the depth buffer AND color buffer at the same time by doing "ClearBufferMask.DepthBufferBit | ClearBufferMask.ColorBufferBit".
-            if (sourceMultisampleTexture.IsDepthBuffer && destTexture.IsDepthBuffer)
-            {
-                clearBufferMask = ClearBufferMask.DepthBufferBit;
-                blitFramebufferFilter = BlitFramebufferFilter.Nearest;  // Must be set to nearest for depth buffers according to the spec: "GL_INVALID_OPERATION is generated if mask contains any of the GL_DEPTH_BUFFER_BIT or GL_STENCIL_BUFFER_BIT and filter is not GL_NEAREST."
-            }
-            else
-            {
-                clearBufferMask = ClearBufferMask.ColorBufferBit;
-                blitFramebufferFilter = BlitFramebufferFilter.Linear;   // TODO: STABILITY: For integer formats this has to be set to Nearest.
-            }
-
-#if !XENKO_PLATFORM_IOS
-            // MSAA is not supported on iOS currently because OpenTK doesn't expose "GL.BlitFramebuffer()" on iOS for some reason.
-            // Do the actual blitting operation:
-            GL.BlitFramebuffer(0, 0, sourceMultisampleTexture.Width, sourceMultisampleTexture.Height, 0, 0, destTexture.Width, destTexture.Height, clearBufferMask, blitFramebufferFilter);
-#endif
-        }
-
-        public void CopyCount(Buffer sourceBuffer, Buffer destBuffer, int offsetToDest)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            Internal.Refactor.ThrowNotImplementedException();
-        }
-
-        public void Dispatch(int threadCountX, int threadCountY, int threadCountZ)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-            GL.DispatchCompute(threadCountX, threadCountY, threadCountZ);
-#else
-            Internal.Refactor.ThrowNotImplementedException();
-#endif
-        }
-
-        public void Dispatch(Buffer indirectBuffer, int offsetInBytes)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-            GL.BindBuffer(BufferTarget.DispatchIndirectBuffer, indirectBuffer.BufferId);
-
-            GL.DispatchComputeIndirect((IntPtr)offsetInBytes);
-
-            GL.BindBuffer(BufferTarget.DispatchIndirectBuffer, 0);
-#else
-            Internal.Refactor.ThrowNotImplementedException();
-#endif
-        }
-
-        public void Draw(int vertexCount, int startVertex = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            PreDraw();
-
-            GL.DrawArrays(newPipelineState.PrimitiveType, startVertex, vertexCount);
-
-            GraphicsDevice.FrameTriangleCount += (uint)vertexCount;
-            GraphicsDevice.FrameDrawCalls++;
-        }
-
-        public void DrawAuto(PrimitiveType primitiveType)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            PreDraw();
-
-            //GL.DrawArraysIndirect(newPipelineState.PrimitiveType, (IntPtr)0);
-            //GraphicsDevice.FrameDrawCalls++;
-            Internal.Refactor.ThrowNotImplementedException();
-        }
-
-        /// <summary>
-        /// Draw indexed, non-instanced primitives.
-        /// </summary>
-        /// <param name="indexCount">Number of indices to draw.</param>
-        /// <param name="startIndexLocation">The location of the first index read by the GPU from the index buffer.</param>
-        /// <param name="baseVertexLocation">A value added to each index before reading a vertex from the vertex buffer.</param>
-        public void DrawIndexed(int indexCount, int startIndexLocation = 0, int baseVertexLocation = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            PreDraw();
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (baseVertexLocation != 0)
-                throw new NotSupportedException("DrawIndexed with no null baseVertexLocation is not supported on OpenGL ES.");
-            GL.DrawElements(newPipelineState.PrimitiveType, indexCount, indexBuffer.Type, indexBuffer.Buffer.StagingData + indexBuffer.Offset + (startIndexLocation * indexBuffer.ElementSize)); // conversion to IntPtr required on Android
-#else
-            GL.DrawElementsBaseVertex(newPipelineState.PrimitiveType, indexCount, indexBuffer.Type, indexBuffer.Buffer.StagingData + indexBuffer.Offset + (startIndexLocation * indexBuffer.ElementSize), baseVertexLocation);
-#endif
-
-            GraphicsDevice.FrameDrawCalls++;
-            GraphicsDevice.FrameTriangleCount += (uint)indexCount;
-        }
-
-        /// <summary>
-        /// Draw indexed, instanced primitives.
-        /// </summary>
-        /// <param name="indexCountPerInstance">Number of indices read from the index buffer for each instance.</param>
-        /// <param name="instanceCount">Number of instances to draw.</param>
-        /// <param name="startIndexLocation">The location of the first index read by the GPU from the index buffer.</param>
-        /// <param name="baseVertexLocation">A value added to each index before reading a vertex from the vertex buffer.</param>
-        /// <param name="startInstanceLocation">A value added to each index before reading per-instance data from a vertex buffer.</param>
-        public void DrawIndexedInstanced(int indexCountPerInstance, int instanceCount, int startIndexLocation = 0, int baseVertexLocation = 0, int startInstanceLocation = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            PreDraw();
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            GL.DrawElementsInstancedBaseVertex(newPipelineState.PrimitiveType, indexCountPerInstance, indexBuffer.Type, indexBuffer.Buffer.StagingData + indexBuffer.Offset + (startIndexLocation * indexBuffer.ElementSize), instanceCount, baseVertexLocation);
-#endif
-
-            GraphicsDevice.FrameDrawCalls++;
-            GraphicsDevice.FrameTriangleCount += (uint)(indexCountPerInstance * instanceCount);
-        }
-
-        /// <summary>
-        /// Draw indexed, instanced, GPU-generated primitives.
-        /// </summary>
-        /// <param name="argumentsBuffer">A buffer containing the GPU generated primitives.</param>
-        /// <param name="alignedByteOffsetForArgs">Offset in <em>pBufferForArgs</em> to the start of the GPU generated primitives.</param>
-        public void DrawIndexedInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs = 0)
-        {
-
-            if (argumentsBuffer == null) throw new ArgumentNullException(nameof(argumentsBuffer));
-
-#if DEBUG
-            //GraphicsDevice.EnsureContextActive();
-#endif
-            //PreDraw();
-
-            //GraphicsDevice.FrameDrawCalls++;
-
-            Internal.Refactor.ThrowNotImplementedException();
-        }
-
-        /// <summary>
-        /// Draw non-indexed, instanced primitives.
-        /// </summary>
-        /// <param name="vertexCountPerInstance">Number of vertices to draw.</param>
-        /// <param name="instanceCount">Number of instances to draw.</param>
-        /// <param name="startVertexLocation">Index of the first vertex.</param>
-        /// <param name="startInstanceLocation">A value added to each index before reading per-instance data from a vertex buffer.</param>
-        public void DrawInstanced(int vertexCountPerInstance, int instanceCount, int startVertexLocation = 0, int startInstanceLocation = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            PreDraw();
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (GraphicsDevice.IsOpenGLES2)
-                throw new NotSupportedException("DrawArraysInstanced is not supported on OpenGL ES 2");
-#endif
-            GL.DrawArraysInstanced(newPipelineState.PrimitiveType, startVertexLocation, vertexCountPerInstance, instanceCount);
-
-            GraphicsDevice.FrameDrawCalls++;
-            GraphicsDevice.FrameTriangleCount += (uint)(vertexCountPerInstance * instanceCount);
-        }
-
-        /// <summary>
-        /// Draw instanced, GPU-generated primitives.
-        /// </summary>
-        /// <param name="argumentsBuffer">An arguments buffer</param>
-        /// <param name="alignedByteOffsetForArgs">Offset in <em>pBufferForArgs</em> to the start of the GPU generated primitives.</param>
-        public void DrawInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs = 0)
-        {
-            if (argumentsBuffer == null)
-                throw new ArgumentNullException(nameof(argumentsBuffer));
-
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            PreDraw();
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            GraphicsDevice.FrameDrawCalls++;
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            GL.BindBuffer(BufferTarget.DrawIndirectBuffer, argumentsBuffer.BufferId);
-
-            GL.DrawArraysIndirect(newPipelineState.PrimitiveType, (IntPtr)alignedByteOffsetForArgs);
-
-            GL.BindBuffer(BufferTarget.DrawIndirectBuffer, 0);
-
-            GraphicsDevice.FrameDrawCalls++;
-#endif
-        }
-
-        public void BeginProfile(Color4 profileColor, string name)
-        {
-#if !XENKO_PLATFORM_IOS
-            if (GraphicsDevice.ProfileEnabled)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                if (GraphicsDevice.HasKhronosDebugKHR)
-                    GL.Khr.PushDebugGroup(DebugSourceExternal.DebugSourceApplication, 1, -1, name);
-                else
-#endif
-                    GL.PushDebugGroup(DebugSourceExternal.DebugSourceApplication, 1, -1, name);
-            }
-#endif
-        }
-
-        public void EndProfile()
-        {
-#if !XENKO_PLATFORM_IOS
-            if (GraphicsDevice.ProfileEnabled)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                if (GraphicsDevice.HasKhronosDebugKHR)
-                    GL.Khr.PopDebugGroup();
-                else
-#endif
-                    GL.PopDebugGroup();
-            }
-#endif
-        }
-
-        /// <summary>
-        /// Submit a timestamp query.
-        /// </summary>
-        /// <param name="queryPool">The QueryPool owning the query.</param>
-        /// <param name="index">The query index.</param>
-        public void WriteTimestamp(QueryPool queryPool, int index)
-        {
-#if XENKO_GRAPHICS_API_OPENGLES && !XENKO_PLATFORM_IOS
-            GL.Ext.QueryCounter(queryPool.NativeQueries[index], QueryCounterTarget.TimestampExt);
-#elif !XENKO_PLATFORM_IOS
-            GL.QueryCounter(queryPool.NativeQueries[index], QueryCounterTarget.Timestamp);
-#endif
-        }
-
-        public void ResetQueryPool(QueryPool queryPool)
-        {
-        }
-
-        public MappedResource MapSubresource(GraphicsResource resource, int subResourceIndex, MapMode mapMode, bool doNotWait = false, int offsetInBytes = 0, int lengthInBytes = 0)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            // This resource has just been recycled by the GraphicsResourceAllocator, we force a rename to avoid GPU=>GPU sync point
-            if (resource.DiscardNextMap && mapMode == MapMode.WriteNoOverwrite)
-                mapMode = MapMode.WriteDiscard;
-
-
-            var buffer = resource as Buffer;
-            if (buffer != null)
-            {
-                if (lengthInBytes == 0)
-                    lengthInBytes = buffer.Description.SizeInBytes;
-
-                if (buffer.StagingData != IntPtr.Zero)
-                {
-                    // Specific case for constant buffers
-                    return new MappedResource(resource, subResourceIndex, new DataBox { DataPointer = buffer.StagingData + offsetInBytes, SlicePitch = 0, RowPitch = 0 }, offsetInBytes, lengthInBytes);
-                }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                // OpenGL ES 2 needs Staging Data
-                if (GraphicsDevice.IsOpenGLES2)
-                {
-                    Internal.Refactor.ThrowNotImplementedException();
-                }
-#endif
-
-                IntPtr mapResult = IntPtr.Zero;
-
-                //UnbindVertexArrayObject();
-                GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-                //if (mapMode != MapMode.WriteDiscard && mapMode != MapMode.WriteNoOverwrite)
-                //    mapResult = GL.MapBuffer(buffer.bufferTarget, mapMode.ToOpenGL());
-                //else
-#endif
-                {
-                    // Orphan the buffer (let driver knows we don't need it anymore)
-                    if (mapMode == MapMode.WriteDiscard)
-                    {
-                        doNotWait = true;
-                        GL.BufferData(buffer.BufferTarget, (IntPtr)buffer.Description.SizeInBytes, IntPtr.Zero, buffer.BufferUsageHint);
-                    }
-
-                    var unsynchronized = doNotWait && mapMode != MapMode.Read && mapMode != MapMode.ReadWrite;
-
-                    mapResult = GL.MapBufferRange(buffer.BufferTarget, (IntPtr)offsetInBytes, (IntPtr)lengthInBytes, mapMode.ToOpenGLMask() | (unsynchronized ? BufferAccessMask.MapUnsynchronizedBit : 0));
-                }
-
-                return new MappedResource(resource, subResourceIndex, new DataBox { DataPointer = mapResult, SlicePitch = 0, RowPitch = 0 });
-            }
-
-            var texture = resource as Texture;
-            if (texture != null)
-            {
-                if (lengthInBytes == 0)
-                    lengthInBytes = texture.ComputeSubresourceSize(subResourceIndex);
-
-                if (mapMode == MapMode.Read)
-                {
-                    if (texture.Description.Usage != GraphicsResourceUsage.Staging)
-                        throw new NotSupportedException("Only staging textures can be mapped.");
-
-                    var mipLevel = subResourceIndex % texture.MipLevels;
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (GraphicsDevice.IsOpenGLES2 || texture.StagingData != IntPtr.Zero)
-                    {
-                        return new MappedResource(resource, subResourceIndex, new DataBox { DataPointer = texture.StagingData + offsetInBytes + texture.ComputeBufferOffset(subResourceIndex, 0), SlicePitch = texture.ComputeSlicePitch(mipLevel), RowPitch = texture.ComputeRowPitch(mipLevel) }, offsetInBytes, lengthInBytes);
-                    }
-                    else
-#endif
-                    {
-                        if (doNotWait)
-                        {
-                            // Wait at least 2 frames after last operation
-                            if (GraphicsDevice.FrameCounter < texture.PixelBufferFrame + ReadbackFrameDelay)
-                            {
-                                return new MappedResource(resource, subResourceIndex, new DataBox(), offsetInBytes, lengthInBytes);
-                            }
-                        }
-
-                        return MapTexture(texture, true, BufferTarget.PixelPackBuffer, texture.PixelBufferObjectId, subResourceIndex, mapMode, offsetInBytes, lengthInBytes);
-                    }
-                }
-                else if (mapMode == MapMode.WriteDiscard)
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (GraphicsDevice.IsOpenGLES2)
-                    {
-                        Internal.Refactor.ThrowNotImplementedException();
-                    }
-#endif
-                    if (texture.Description.Usage != GraphicsResourceUsage.Dynamic)
-                        throw new NotSupportedException("Only dynamic texture can be mapped.");
-
-                    // Create a temporary unpack pixel buffer
-                    // TODO: Pool/allocator? (it's an upload buffer basically)
-                    var pixelBufferObjectId = texture.GeneratePixelBufferObject(BufferTarget.PixelUnpackBuffer, PixelStoreParameter.UnpackAlignment, BufferUsageHint.DynamicCopy, texture.ComputeSubresourceSize(subResourceIndex));
-
-                    return MapTexture(texture, false, BufferTarget.PixelUnpackBuffer, pixelBufferObjectId, subResourceIndex, mapMode, offsetInBytes, lengthInBytes);
-                }
-            }
-
-            throw Internal.Refactor.NewNotImplementedException("MapSubresource not implemented for type " + resource.GetType());
-        }
-
-        public void UnmapSubresource(MappedResource unmapped)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            var texture = unmapped.Resource as Texture;
-            if (texture != null)
-            {
-                if (texture.Description.Usage == GraphicsResourceUsage.Staging)
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    // unmapping on OpenGL ES 2 means doing nothing since the buffer is on the CPU memory
-                    if (!GraphicsDevice.IsOpenGLES2)
-#endif
-                    {
-                        GL.BindBuffer(BufferTarget.PixelPackBuffer, texture.PixelBufferObjectId);
-                        GL.UnmapBuffer(BufferTarget.PixelPackBuffer);
-                        GL.BindBuffer(BufferTarget.PixelPackBuffer, 0);
-                    }
-                }
-#if XENKO_GRAPHICS_API_OPENGLES
-                else if (!GraphicsDevice.IsOpenGLES2 && texture.Description.Usage == GraphicsResourceUsage.Dynamic)
-#else
-                else if (texture.Description.Usage == GraphicsResourceUsage.Dynamic)
-#endif
-                {
-                    GL.BindBuffer(BufferTarget.PixelUnpackBuffer, unmapped.PixelBufferObjectId);
-                    GL.UnmapBuffer(BufferTarget.PixelUnpackBuffer);
-
-                    if (activeTexture != 0)
-                    {
-                        activeTexture = 0;
-                        GL.ActiveTexture(TextureUnit.Texture0);
-                    }
-
-                    GL.BindTexture(texture.TextureTarget, texture.TextureId);
-
-                    var mipLevel = unmapped.SubResourceIndex % texture.MipLevels;
-                    var arraySlice = unmapped.SubResourceIndex / texture.MipLevels;
-
-                    // Bind buffer to texture
-                    switch (texture.TextureTarget)
-                    {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                        case TextureTarget.Texture1D:
-                            GL.TexSubImage1D(TextureTarget.Texture1D, mipLevel, 0, texture.Width, texture.TextureFormat, texture.TextureType, IntPtr.Zero);
-                            break;
-#endif
-                        case TextureTarget.Texture2D:
-                            GL.TexSubImage2D(TextureTarget2d.Texture2D, mipLevel, 0, 0, texture.Width, texture.Height, texture.TextureFormat, texture.TextureType, IntPtr.Zero);
-                            break;
-                        case TextureTarget.Texture2DArray:
-                            GL.TexSubImage3D(TextureTarget3d.Texture2DArray, mipLevel, 0, 0, arraySlice, texture.Width, texture.Height, 1, texture.TextureFormat, texture.TextureType, IntPtr.Zero);
-                            break;
-                        case TextureTarget.Texture3D:
-                            GL.TexSubImage3D(TextureTarget3d.Texture3D, mipLevel, 0, 0, 0, texture.Width, texture.Height, texture.Depth, texture.TextureFormat, texture.TextureType, IntPtr.Zero);
-                            break;
-                        case TextureTarget.TextureCubeMap:
-                            GL.TexSubImage2D(Texture.GetTextureTargetForDataSet2D(texture.TextureTarget, arraySlice), mipLevel, 0, 0, texture.Width, texture.Height, texture.TextureFormat, texture.TextureType, IntPtr.Zero);
-                            break;
-                        default:
-                            throw new NotSupportedException("Invalid texture target: " + texture.TextureTarget);
-                    }
-                    GL.BindTexture(texture.TextureTarget, 0);
-                    boundShaderResourceViews[0] = null;
-                    GL.BindBuffer(BufferTarget.PixelUnpackBuffer, 0);
-                    GL.DeleteBuffer(unmapped.PixelBufferObjectId);
-                }
-                else
-                {
-                    throw new NotSupportedException("Not supported mapper operation for Usage: " + texture.Description.Usage);
-                }
-            }
-            else
-            {
-                var buffer = unmapped.Resource as Buffer;
-                if (buffer != null)
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (GraphicsDevice.IsOpenGLES2 || buffer.StagingData != IntPtr.Zero)
-#else
-                    if (buffer.StagingData != IntPtr.Zero)
-#endif
-                    {
-                        // Only buffer with StagingData (fake cbuffer) could be mapped
-                        if (buffer.StagingData == IntPtr.Zero)
-                            throw new InvalidOperationException();
-
-                        // Is it a real buffer? (fake cbuffer have no real GPU counter-part in OpenGL ES 2.0
-                        if (buffer.BufferId != 0)
-                        {
-                            //UnbindVertexArrayObject();
-                            GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-                            if (unmapped.OffsetInBytes == 0 && unmapped.SizeInBytes == buffer.SizeInBytes)
-                                GL.BufferData(buffer.BufferTarget, unmapped.SizeInBytes, unmapped.DataBox.DataPointer, buffer.BufferUsageHint);
-                            else
-                                GL.BufferSubData(buffer.BufferTarget, (IntPtr)unmapped.OffsetInBytes, (IntPtr)unmapped.SizeInBytes, unmapped.DataBox.DataPointer);
-                        }
-                    }
-                    else
-                    {
-                        //UnbindVertexArrayObject();
-                        GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-                        GL.UnmapBuffer(buffer.BufferTarget);
-                    }
-                }
-                else // neither texture nor buffer
-                {
-                    Internal.Refactor.ThrowNotImplementedException("UnmapSubresource not implemented for type " + unmapped.Resource.GetType());
-                }
-            }
-        }
-
-        private MappedResource MapTexture(Texture texture, bool adjustOffsetForSubresource, BufferTarget bufferTarget, int pixelBufferObjectId, int subResourceIndex, MapMode mapMode, int offsetInBytes, int lengthInBytes)
-        {
-            int mipLevel = subResourceIndex % texture.MipLevels;
-
-            GL.BindBuffer(bufferTarget, pixelBufferObjectId);
-            var mapResult = GL.MapBufferRange(bufferTarget, (IntPtr)offsetInBytes + (adjustOffsetForSubresource ? texture.ComputeBufferOffset(subResourceIndex, 0) : 0), (IntPtr)lengthInBytes, mapMode.ToOpenGLMask());
-            GL.BindBuffer(bufferTarget, 0);
-
-            return new MappedResource(texture, subResourceIndex, new DataBox { DataPointer = mapResult, SlicePitch = texture.ComputeSlicePitch(mipLevel), RowPitch = texture.ComputeRowPitch(mipLevel) }, offsetInBytes, lengthInBytes)
-            {
-                PixelBufferObjectId = pixelBufferObjectId,
-            };
-        }
-
-        internal unsafe void PreDraw()
-        {
-#if XENKO_PLATFORM_ANDROID
-            // Device with no background loading context: check if some loading is pending
-            if (GraphicsDevice.AsyncPendingTaskWaiting)
-                GraphicsDevice.ExecutePendingTasks();
-#endif
-            // Bind program
-            var program = newPipelineState.EffectProgram.ProgramId;
-            if (program != boundProgram)
-            {
-                boundProgram = program;
-                GL.UseProgram(boundProgram);
-            }
-
-            int vertexBufferSlot = -1;
-            var vertexBufferView = default(VertexBufferView);
-            Buffer vertexBuffer = null;
-            var vertexBufferBase = IntPtr.Zero;
-
-            // TODO OPENGL compare newPipelineState.VertexAttribs directly
-            if (newPipelineState.VertexAttribs != currentPipelineState.VertexAttribs)
-            {
-                vboDirty = true;
-            }
-
-            // Setup vertex buffers and vertex attributes
-            if (vboDirty)
-            {
-                foreach (var vertexAttrib in newPipelineState.VertexAttribs)
-                {
-                    if (vertexAttrib.VertexBufferSlot != vertexBufferSlot)
-                    {
-                        vertexBufferSlot = vertexAttrib.VertexBufferSlot;
-                        vertexBufferView = vertexBuffers[vertexBufferSlot];
-                        vertexBuffer = vertexBufferView.Buffer;
-                        if (vertexBuffer != null)
-                        {
-                            var vertexBufferResource = vertexBufferView.Buffer.BufferId;
-                            GL.BindBuffer(BufferTarget.ArrayBuffer, vertexBufferResource);
-
-                            vertexBufferBase = vertexBufferView.Buffer.StagingData;
-                        }
-                    }
-
-                    var vertexAttribMask = 1U << vertexAttrib.AttributeIndex;
-
-                    // A stride of zero causes automatic stride calculation. To not use the attribute, unbind it in that case
-                    if (vertexBuffer == null || vertexBufferView.Stride == 0)
-                    {
-                        // No VB bound, turn off this attribute
-                        if ((enabledVertexAttribArrays & vertexAttribMask) != 0)
-                        {
-                            enabledVertexAttribArrays &= ~vertexAttribMask;
-                            GL.DisableVertexAttribArray(vertexAttrib.AttributeIndex);
-                        }
-                        continue;
-                    }
-
-                    // Enable this attribute if not previously enabled
-                    if ((enabledVertexAttribArrays & vertexAttribMask) == 0)
-                    {
-                        enabledVertexAttribArrays |= vertexAttribMask;
-                        GL.EnableVertexAttribArray(vertexAttrib.AttributeIndex);
-                    }
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-                    if (vertexAttrib.IsInteger && !vertexAttrib.Normalized)
-                        GL.VertexAttribIPointer(vertexAttrib.AttributeIndex, vertexAttrib.Size, (VertexAttribIntegerType)vertexAttrib.Type, vertexBufferView.Stride, vertexBufferBase + vertexBufferView.Offset + vertexAttrib.Offset);
-                    else
-#endif
-                        GL.VertexAttribPointer(vertexAttrib.AttributeIndex, vertexAttrib.Size, vertexAttrib.Type, vertexAttrib.Normalized, vertexBufferView.Stride, vertexBufferBase + vertexBufferView.Offset + vertexAttrib.Offset);
-                }
-
-                vboDirty = false;
-            }
-
-            // Resources
-            newPipelineState.ResourceBinder.BindResources(this, currentDescriptorSets);
-
-            // States
-            newPipelineState.Apply(this, currentPipelineState);
-
-            foreach (var textureInfo in newPipelineState.EffectProgram.Textures)
-            {
-                var boundTexture = boundShaderResourceViews[textureInfo.TextureUnit];
-                var shaderResourceView = shaderResourceViews[textureInfo.TextureUnit];
-                if (shaderResourceView != null)
-                {
-                    var texture = shaderResourceView as Texture;
-                    var boundSamplerState = texture?.BoundSamplerState ?? GraphicsDevice.DefaultSamplerState;
-                    var samplerState = samplerStates[textureInfo.TextureUnit] ?? GraphicsDevice.SamplerStates.LinearClamp;
-
-                    bool textureChanged = shaderResourceView != boundTexture;
-                    bool samplerStateChanged = texture != null && samplerState != boundSamplerState;
-
-                    if (textureChanged || samplerStateChanged)
-                    {
-                        if (activeTexture != textureInfo.TextureUnit)
-                        {
-                            activeTexture = textureInfo.TextureUnit;
-                            GL.ActiveTexture(TextureUnit.Texture0 + textureInfo.TextureUnit);
-                        }
-
-                        // Lazy update for texture
-                        if (textureChanged)
-                        {
-                            boundShaderResourceViews[textureInfo.TextureUnit] = shaderResourceView;
-                            GL.BindTexture(shaderResourceView.TextureTarget, shaderResourceView.TextureId);
-                        }
-
-                        // Lazy update for sampler state
-                        if (samplerStateChanged && texture != null)
-                        {
-                            // TODO: Include hasMipmap in samplerStateChanged
-                            bool hasMipmap = texture.Description.MipLevels > 1;
-
-                            samplerState.Apply(hasMipmap, boundSamplerState, texture.TextureTarget);
-                            texture.BoundSamplerState = samplerState;
-                        }
-                    }
-                }
-            }
-
-            // Update viewports
-            SetViewportImpl();
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (GraphicsDevice.IsOpenGLES2)
-            {
-                fixed(byte* boundUniforms = newPipelineState.EffectProgram.BoundUniforms)
-                {
-                    foreach (var uniform in newPipelineState.EffectProgram.Uniforms)
-                    {
-                        var constantBuffer = constantBuffers[uniform.ConstantBufferSlot];
-                        if (constantBuffer == null)
-                            continue;
-
-                        var constantBufferOffsetStart = newPipelineState.EffectProgram.ConstantBufferOffsets[uniform.ConstantBufferSlot];
-
-                        var constantBufferData = constantBuffer.StagingData;
-                        var firstUniformIndex = uniform.UniformIndex;
-                        var lastUniformIndex = firstUniformIndex + uniform.Count;
-                        var offset = uniform.Offset;
-                        var boundData = (IntPtr)boundUniforms + offset + constantBufferOffsetStart;
-                        var currentData = constantBufferData + offset;
-
-                        // Already updated? Early exit.
-                        // TODO: Not optimal for float1/float2 arrays (rare?)
-                        // Better to do "sparse" comparison, not sure if C# code would behave well though
-                        if (Xenko.Core.Utilities.CompareMemory(boundData, currentData, uniform.CompareSize))
-                            continue;
-
-                        // Update bound cache for early exit
-                        Xenko.Core.Utilities.CopyMemory(boundData, currentData, uniform.CompareSize);
-
-                        switch (uniform.Type)
-                        {
-                            case ActiveUniformType.Float:
-                                for (int uniformIndex = firstUniformIndex; uniformIndex < lastUniformIndex; ++uniformIndex)
-                                {
-                                    GL.Uniform1(uniformIndex, 1, (float*)currentData);
-                                    currentData += 16; // Each array element is spaced by 16 bytes
-                                }
-                                break;
-                            case ActiveUniformType.FloatVec2:
-                                for (int uniformIndex = firstUniformIndex; uniformIndex < lastUniformIndex; ++uniformIndex)
-                                {
-                                    GL.Uniform2(uniformIndex, 1, (float*)currentData);
-                                    currentData += 16; // Each array element is spaced by 16 bytes
-                                }
-                                break;
-                            case ActiveUniformType.FloatVec3:
-                                for (int uniformIndex = firstUniformIndex; uniformIndex < lastUniformIndex; ++uniformIndex)
-                                {
-                                    GL.Uniform3(uniformIndex, 1, (float*)currentData);
-                                    currentData += 16; // Each array element is spaced by 16 bytes
-                                }
-                                break;
-                            case ActiveUniformType.FloatVec4:
-                                GL.Uniform4(firstUniformIndex, uniform.Count, (float*)currentData);
-                                break;
-                            case ActiveUniformType.FloatMat4:
-                                GL.UniformMatrix4(uniform.UniformIndex, uniform.Count, false, (float*)currentData);
-                                break;
-                            case ActiveUniformType.Bool:
-                            case ActiveUniformType.Int:
-                                for (int uniformIndex = firstUniformIndex; uniformIndex < lastUniformIndex; ++uniformIndex)
-                                {
-                                    GL.Uniform1(uniformIndex, 1, (int*)currentData);
-                                    currentData += 16; // Each array element is spaced by 16 bytes
-                                }
-                                break;
-                            case ActiveUniformType.BoolVec2:
-                            case ActiveUniformType.IntVec2:
-                                for (int uniformIndex = firstUniformIndex; uniformIndex < lastUniformIndex; ++uniformIndex)
-                                {
-                                    GL.Uniform2(uniformIndex, 1, (int*)currentData);
-                                    currentData += 16; // Each array element is spaced by 16 bytes
-                                }
-                                break;
-                            case ActiveUniformType.BoolVec3:
-                            case ActiveUniformType.IntVec3:
-                                for (int uniformIndex = firstUniformIndex; uniformIndex < lastUniformIndex; ++uniformIndex)
-                                {
-                                    GL.Uniform3(uniformIndex, 1, (int*)currentData);
-                                    currentData += 16; // Each array element is spaced by 16 bytes
-                                }
-                                break;
-                            case ActiveUniformType.BoolVec4:
-                            case ActiveUniformType.IntVec4:
-                                GL.Uniform4(firstUniformIndex, uniform.Count, (int*)currentData);
-                                break;
-                            default:
-                                Internal.Refactor.ThrowNotImplementedException();
-                                break;
-                        }
-                    }
-                }                
-            }
-#endif
-
-            currentPipelineState = newPipelineState;
-        }
-
-        /// <summary>
-        /// Sets a constant buffer to the shader pipeline.
-        /// </summary>
-        /// <param name="stage">The shader stage.</param>
-        /// <param name="slot">The binding slot.</param>
-        /// <param name="buffer">The constant buffer to set.</param>
-        internal void SetConstantBuffer(ShaderStage stage, int slot, Buffer buffer)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            if (constantBuffers[slot] != buffer)
-            {
-                // TODO OPENGL if OpenGL ES 2, might be good to have some dirty flags to explain if cbuffer changed
-                constantBuffers[slot] = buffer;
-                GL.BindBufferBase(BufferRangeTarget.UniformBuffer, slot, buffer != null ? buffer.BufferId : 0);
-            }
-        }
-
-        private void SetRenderTargetsImpl(Texture depthStencilBuffer, int renderTargetCount, params Texture[] renderTargets)
-        {
-            if (renderTargetCount > 0)
-            {
-                // ensure size is coherent
-                var expectedWidth = renderTargets[0].Width;
-                var expectedHeight = renderTargets[0].Height;
-                if (depthStencilBuffer != null)
-                {
-                    if (expectedWidth != depthStencilBuffer.Width || expectedHeight != depthStencilBuffer.Height)
-                        throw new Exception("Depth buffer is not the same size as the render target");
-                }
-                for (int i = 1; i < renderTargetCount; ++i)
-                {
-                    if (renderTargets[i] != null && (expectedWidth != renderTargets[i].Width || expectedHeight != renderTargets[i].Height))
-                        throw new Exception("Render targets do not have the same size");
-                }
-            }
-
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            boundRenderTargetCount = renderTargetCount;
-            for (int i = 0; i < renderTargetCount; ++i)
-                boundRenderTargets[i] = renderTargets[i];
-
-            boundDepthStencilBuffer = depthStencilBuffer;
-
-            needUpdateFBO = true;
-
-            SetupTargets();
-        }
-
-        private void ResetTargetsImpl()
-        {
-            boundRenderTargetCount = 0;
-        }
-
-        /// <summary>
-        /// Sets a sampler state to the shader pipeline.
-        /// </summary>
-        /// <param name="stage">The shader stage.</param>
-        /// <param name="slot">The binding slot.</param>
-        /// <param name="samplerState">The sampler state to set.</param>
-        public void SetSamplerState(ShaderStage stage, int slot, SamplerState samplerState)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            samplerStates[slot] = samplerState;
-        }
-
-        unsafe partial void SetScissorRectangleImpl(ref Rectangle scissorRectangle)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            GL.Scissor(scissorRectangle.Left, scissorRectangle.Top, scissorRectangle.Width, scissorRectangle.Height);
-        }
-
-        unsafe partial void SetScissorRectanglesImpl(int scissorCount, Rectangle[] scissorRectangles)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            Internal.Refactor.ThrowNotImplementedException();
-#else
-            for (int i = 0; i < scissorCount; ++i)
-            {
-                nativeScissorRectangles[4 * i] = scissorRectangles[i].X;
-                nativeScissorRectangles[4 * i + 1] = scissorRectangles[i].Y;
-                nativeScissorRectangles[4 * i + 2] = scissorRectangles[i].Width;
-                nativeScissorRectangles[4 * i + 3] = scissorRectangles[i].Height;
-            }
-
-            GL.ScissorArray(0, scissorCount, nativeScissorRectangles);
-#endif
-        }
-
-        /// <summary>
-        /// Sets a shader resource view to the shader pipeline.
-        /// </summary>
-        /// <param name="stage">The shader stage.</param>
-        /// <param name="slot">The binding slot.</param>
-        /// <param name="shaderResourceView">The shader resource view.</param>
-        internal void SetShaderResourceView(ShaderStage stage, int slot, GraphicsResource shaderResourceView)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            shaderResourceViews[slot] = shaderResourceView;
-        }
-
-        /// <inheritdoc/>
-        public void SetStreamTargets(params Buffer[] buffers)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            Internal.Refactor.ThrowNotImplementedException();
-        }
-
-        /// <summary>
-        /// Sets an unordered access view to the shader pipeline.
-        /// </summary>
-        /// <param name="stage">The stage.</param>
-        /// <param name="slot">The slot.</param>
-        /// <param name="unorderedAccessView">The unordered access view.</param>
-        /// <param name="uavInitialOffset">The Append/Consume buffer offset. A value of -1 indicates the current offset
-        ///     should be kept. Any other values set the hidden counter for that Appendable/Consumable
-        ///     UAV. uavInitialCount is only relevant for UAVs which have the 'Append' or 'Counter' buffer
-        ///     flag, otherwise the argument is ignored.</param>
-        /// <exception cref="System.ArgumentException">Invalid stage.;stage</exception>
-        internal void SetUnorderedAccessView(ShaderStage stage, int slot, GraphicsResource unorderedAccessView, int uavInitialOffset)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            if (stage != ShaderStage.Compute)
-                throw new ArgumentException("Invalid stage.", nameof(stage));
-
-            Internal.Refactor.ThrowNotImplementedException();
-        }
-        
-        /// <summary>
-        /// Unsets an unordered access view from the shader pipeline.
-        /// </summary>
-        /// <param name="unorderedAccessView">The unordered access view.</param>
-        internal void UnsetUnorderedAccessView(GraphicsResource unorderedAccessView)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            
-            //Internal.Refactor.ThrowNotImplementedException();
-        }
-
-        internal void SetupTargets()
-        {
-            if (needUpdateFBO)
-            {
-                boundFBO = GraphicsDevice.FindOrCreateFBO(boundDepthStencilBuffer, boundRenderTargets, boundRenderTargetCount);
-            }
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-        }
-
-        public void SetPipelineState(PipelineState pipelineState)
-        {
-            newPipelineState = pipelineState ?? GraphicsDevice.DefaultPipelineState;
-        }
-
-        public void SetVertexBuffer(int index, Buffer buffer, int offset, int stride)
-        {
-            var newVertexBuffer = new VertexBufferView(buffer, offset, stride);
-            if (vertexBuffers[index] != newVertexBuffer)
-            {
-                vboDirty = true;
-                vertexBuffers[index] = newVertexBuffer;
-            }
-        }
-
-        public void SetIndexBuffer(Buffer buffer, int offset, bool is32bits)
-        {
-            var newIndexBuffer = new IndexBufferView(buffer, offset, is32bits);
-            if (indexBuffer != newIndexBuffer)
-            {
-                // Setup index buffer
-                indexBuffer = newIndexBuffer;
-
-                // Setup index buffer
-                GL.BindBuffer(BufferTarget.ElementArrayBuffer, indexBuffer.Buffer != null ? indexBuffer.Buffer.BufferId : 0);
-            }
-        }
-
-        public void ResourceBarrierTransition(GraphicsResource resource, GraphicsResourceState newState)
-        {
-            // Nothing to do
-        }
-
-        public void SetDescriptorSets(int index, DescriptorSet[] descriptorSets)
-        {
-            for (int i = 0; i < descriptorSets.Length; ++i)
-            {
-                currentDescriptorSets[index++] = descriptorSets[i];
-            }
-        }
-
-        public void SetStencilReference(int stencilReference)
-        {
-            NewStencilReference = stencilReference;
-        }
-
-        public void SetBlendFactor(Color4 blendFactor)
-        {
-            NewBlendFactor = blendFactor;
-        }
-
-        private void SetViewportImpl()
-        {
-            if (!viewportDirty)
-                return;
-
-            viewportDirty = false;
-
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            // TODO: Check all non-empty viewports are identical and match what is active in FBO!
-            UpdateViewport(viewports[0]);
-#else
-            UpdateViewports();
-#endif
-        }
-
-        private void UpdateViewport(Viewport viewport)
-        {
-            GL.DepthRange(viewport.MinDepth, viewport.MaxDepth);
-            GL.Viewport((int)viewport.X, (int)viewport.Y, (int)viewport.Width, (int)viewport.Height);
-        }
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-        private void UpdateViewports()
-        {
-            int nbViewports = viewports.Length;
-            for (int i = 0; i < boundViewportCount; ++i)
-            {
-                var currViewport = viewports[i];
-                nativeViewports[4 * i] = currViewport.X;
-                nativeViewports[4 * i + 1] = currViewport.Y;
-                nativeViewports[4 * i + 2] = currViewport.Width;
-                nativeViewports[4 * i + 3] = currViewport.Height;
-            }
-            GL.DepthRange(viewports[0].MinDepth, viewports[0].MaxDepth);
-            GL.ViewportArray(0, boundViewportCount, nativeViewports);
-        }
-#endif
-
-        public void UnsetReadWriteBuffers()
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-        }
-
-        public void UnsetRenderTargets()
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-
-            SetRenderTargets(null, null);
-        }
-
-        internal void UpdateSubresource(GraphicsResource resource, int subResourceIndex, DataBox databox)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            var buffer = resource as Buffer;
-            if (buffer != null)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                if (buffer.StagingData != IntPtr.Zero)
-                {
-                    // Specific case for constant buffers
-                    Xenko.Core.Utilities.CopyMemory(buffer.StagingData, databox.DataPointer, buffer.Description.SizeInBytes);
-                    return;
-                }
-#endif
-
-                //UnbindVertexArrayObject();
-
-                if (!GraphicsDevice.HasTextureBuffers && buffer.BufferId == 0)
-                {
-                    if (activeTexture != 0)
-                    {
-                        activeTexture = 0;
-                        GL.ActiveTexture(TextureUnit.Texture0);
-                    }
-
-                    // On platforms where it's not supported, we use a texture instead of a buffer
-                    GL.BindTexture(buffer.TextureTarget, buffer.TextureId);
-                    boundShaderResourceViews[0] = null; // bound active texture 0 has changed
-
-                    buffer.UpdateTextureSubresource(databox.DataPointer, 0, 0, buffer.ElementCount);
-                }
-                else
-                {
-                    GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-                    GL.BufferData(buffer.BufferTarget, buffer.Description.SizeInBytes, databox.DataPointer, buffer.BufferUsageHint);
-                }
-            }
-            else
-            {
-                var texture = resource as Texture;
-                if (texture != null)
-                {
-                    if (activeTexture != 0)
-                    {
-                        activeTexture = 0;
-                        GL.ActiveTexture(TextureUnit.Texture0);
-                    }
-
-                    // TODO: Handle pitchs
-                    // TODO: handle other texture formats
-                    GL.BindTexture(texture.TextureTarget, texture.TextureId);
-                    boundShaderResourceViews[0] = null; // bound active texture 0 has changed
-
-                    var desc = texture.Description;
-                    var mipLevel = subResourceIndex % texture.MipLevels;
-                    var arraySlice = subResourceIndex / texture.MipLevels;
-                    switch (texture.TextureTarget)
-                    {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                        case TextureTarget.Texture1D:
-                            GL.TexSubImage1D(TextureTarget.Texture1D, mipLevel, 0, desc.Width, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                            break;
-#endif
-                        case TextureTarget.Texture2D:
-                            GL.TexSubImage2D(TextureTarget2d.Texture2D, mipLevel, 0, 0, desc.Width, desc.Height, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                            break;
-                        case TextureTarget.Texture2DArray:
-                            GL.TexSubImage3D(TextureTarget3d.Texture2DArray, mipLevel, 0, 0, arraySlice, desc.Width, desc.Height, 1, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                            break;
-                        case TextureTarget.Texture3D:
-                            GL.TexSubImage3D(TextureTarget3d.Texture3D, mipLevel, 0, 0, 0, desc.Width, desc.Height, desc.Depth, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                            break;
-                        case TextureTarget.TextureCubeMap:
-                            GL.TexSubImage2D(Texture.GetTextureTargetForDataSet2D(texture.TextureTarget, arraySlice), mipLevel, 0, 0, desc.Width, desc.Height, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                            break;
-                        default:
-                            Internal.Refactor.ThrowNotImplementedException("UpdateSubresource not implemented for texture target " + texture.TextureTarget);
-                            break;
-                    }
-                }
-                else // neither texture nor buffer
-                {
-                    Internal.Refactor.ThrowNotImplementedException("UpdateSubresource not implemented for type " + resource.GetType());
-                }
-            }
-        }
-
-        internal void UpdateSubresource(GraphicsResource resource, int subResourceIndex, DataBox databox, ResourceRegion region)
-        {
-#if DEBUG
-            GraphicsDevice.EnsureContextActive();
-#endif
-            var texture = resource as Texture;
-
-            if (texture != null)
-            {
-                var width = region.Right - region.Left;
-                var height = region.Bottom - region.Top;
-                var depth = region.Back - region.Front;
-
-                var expectedRowPitch = width * texture.TexturePixelSize;
-
-                // determine the opengl read Unpack Alignment
-                var packAlignment = 0;
-                if ((databox.RowPitch & 1) != 0)
-                {
-                    if (databox.RowPitch == expectedRowPitch)
-                        packAlignment = 1;
-                }
-                else if ((databox.RowPitch & 2) != 0)
-                {
-                    var diff = databox.RowPitch - expectedRowPitch;
-                    if (diff >= 0 && diff < 2)
-                        packAlignment = 2;
-                }
-                else if ((databox.RowPitch & 4) != 0)
-                {
-                    var diff = databox.RowPitch - expectedRowPitch;
-                    if (diff >= 0 && diff < 4)
-                        packAlignment = 4;
-                }
-                else if ((databox.RowPitch & 8) != 0)
-                {
-                    var diff = databox.RowPitch - expectedRowPitch;
-                    if (diff >= 0 && diff < 8)
-                        packAlignment = 8;
-                }
-                else if (databox.RowPitch == expectedRowPitch)
-                {
-                    packAlignment = 4;
-                }
-                if (packAlignment == 0)
-                    Internal.Refactor.ThrowNotImplementedException("The data box RowPitch is not compatible with the region width. This requires additional copy to be implemented.");
-
-                // change the Unpack Alignment
-                int previousPackAlignment;
-                GL.GetInteger(GetPName.UnpackAlignment, out previousPackAlignment);
-                GL.PixelStore(PixelStoreParameter.UnpackAlignment, packAlignment);
-
-                if (activeTexture != 0)
-                {
-                    activeTexture = 0;
-                    GL.ActiveTexture(TextureUnit.Texture0);
-                }
-
-                // Update the texture region
-                GL.BindTexture(texture.TextureTarget, texture.TextureId);
-                if (texture.Dimension == TextureDimension.Texture3D)
-                    GL.TexSubImage3D((TextureTarget3d)texture.TextureTarget, subResourceIndex, region.Left, region.Top, region.Front, width, height, depth, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                else
-                    GL.TexSubImage2D((TextureTarget2d)texture.TextureTarget, subResourceIndex, region.Left, region.Top, width, height, texture.TextureFormat, texture.TextureType, databox.DataPointer);
-                boundShaderResourceViews[0] = null; // bound active texture 0 has changed
-
-                // reset the Unpack Alignment
-                GL.PixelStore(PixelStoreParameter.UnpackAlignment, previousPackAlignment);
-            }
-            else
-            {
-                var buffer = resource as Buffer;
-                if (buffer != null)
-                {
-                    if (!GraphicsDevice.HasTextureBuffers && buffer.BufferId == 0)
-                    {
-                        if (activeTexture != 0)
-                        {
-                            activeTexture = 0;
-                            GL.ActiveTexture(TextureUnit.Texture0);
-                        }
-
-                        // On platforms where it's not supported, we use a texture instead of a buffer
-                        GL.BindTexture(buffer.TextureTarget, buffer.TextureId);
-                        boundShaderResourceViews[0] = null; // bound active texture 0 has changed
-
-                        buffer.UpdateTextureSubresource(databox.DataPointer, 0, region.Left, region.Right - region.Left);
-                    }
-                    else
-                    {
-                        GL.BindBuffer(buffer.BufferTarget, buffer.BufferId);
-                        if (region.Left == 0 && region.Right == buffer.SizeInBytes)
-                            GL.BufferData(buffer.BufferTarget, (IntPtr)region.Right, databox.DataPointer, buffer.BufferUsageHint);
-                        else
-                            GL.BufferSubData(buffer.BufferTarget, (IntPtr)region.Left, (IntPtr)(region.Right - region.Left), databox.DataPointer);
-                        GL.BindBuffer(buffer.BufferTarget, 0);
-                    }
-                }
-            }
-        }
-
-        struct VertexBufferView
-        {
-            public readonly Buffer Buffer;
-            public readonly int Offset;
-            public readonly int Stride;
-
-            public VertexBufferView(Buffer buffer, int offset, int stride)
-            {
-                Buffer = buffer;
-                Offset = offset;
-                Stride = stride;
-            }
-
-            public static bool operator ==(VertexBufferView left, VertexBufferView right)
-            {
-                return Equals(left.Buffer, right.Buffer) && left.Offset == right.Offset && left.Stride == right.Stride;
-            }
-
-            public static bool operator !=(VertexBufferView left, VertexBufferView right)
-            {
-                return !(left == right);
-            }
-
-            public override bool Equals(object other)
-            {
-                if (other is VertexBufferView)
-                {
-                    VertexBufferView p = (VertexBufferView) other;
-                    return Equals(Buffer, p.Buffer) && Offset == p.Offset && Stride == p.Stride;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                int result = Buffer.GetHashCode();
-                result = (result * 397) ^ Offset;
-                result = (result * 397) ^ Stride;
-                return result;
-            }
-        }
-
-        struct IndexBufferView
-        {
-            public readonly Buffer Buffer;
-            public readonly int Offset;
-            public readonly DrawElementsType Type;
-            public readonly int ElementSize;
-
-            public IndexBufferView(Buffer buffer, int offset, bool is32Bits)
-            {
-                Buffer = buffer;
-                Offset = offset;
-                Type = is32Bits ? DrawElementsType.UnsignedInt : DrawElementsType.UnsignedShort;
-                ElementSize = is32Bits ? 4 : 2;
-            }
-
-            public static bool operator ==(IndexBufferView left, IndexBufferView right)
-            {
-                return Equals(left.Buffer, right.Buffer) && left.Offset == right.Offset && left.Type == right.Type && left.ElementSize == right.ElementSize;
-            }
-
-            public static bool operator !=(IndexBufferView left, IndexBufferView right)
-            {
-                return !(left == right);
-            }
-
-            public override bool Equals(object other)
-            {
-                if (other is IndexBufferView)
-                {
-                    IndexBufferView p = (IndexBufferView)other;
-                    return Equals(Buffer, p.Buffer) && Offset == p.Offset && Type == p.Type && ElementSize == p.ElementSize;
-                }
-                else
-                {
-                    return false;
-                }
-            }
-
-            public override int GetHashCode()
-            {
-                int result = Buffer.GetHashCode();
-                result = (result * 397) ^ Offset;
-                result = (result * 397) ^ Type.GetHashCode();
-                result = (result * 397) ^ ElementSize;
-                return result;
-            }
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/DepthStencilState.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/DepthStencilState.OpenGL.cs
deleted file mode 100644
index 8822df3a4f..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/DepthStencilState.OpenGL.cs
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-using System;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    struct DepthStencilBoundState
-    {
-        // Depth
-        public bool DepthBufferEnable;
-        public bool DepthBufferWriteEnable;
-        public DepthFunction DepthFunction;
-
-        // Stencil
-        public bool StencilEnable;
-        public byte StencilWriteMask;
-        public byte StencilMask;
-
-        public StencilFaceState Faces;
-    }
-
-    struct StencilFaceState
-    {
-        public StencilFunction FrontFaceStencilFunction;
-        public StencilOp FrontFaceDepthFailOp;
-        public StencilOp FrontFaceFailOp;
-        public StencilOp FrontFacePassOp;
-
-        public StencilFunction BackFaceStencilFunction;
-        public StencilOp BackFaceDepthFailOp;
-        public StencilOp BackFaceFailOp;
-        public StencilOp BackFacePassOp;
-
-        public bool Equals(StencilFaceState other)
-        {
-            return FrontFaceStencilFunction == other.FrontFaceStencilFunction && FrontFaceDepthFailOp == other.FrontFaceDepthFailOp && FrontFaceFailOp == other.FrontFaceFailOp && FrontFacePassOp == other.FrontFacePassOp && BackFaceStencilFunction == other.BackFaceStencilFunction && BackFaceDepthFailOp == other.BackFaceDepthFailOp && BackFaceFailOp == other.BackFaceFailOp && BackFacePassOp == other.BackFacePassOp;
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is StencilFaceState && Equals((StencilFaceState)obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                var hashCode = (int)FrontFaceStencilFunction;
-                hashCode = (hashCode * 397) ^ (int)FrontFaceDepthFailOp;
-                hashCode = (hashCode * 397) ^ (int)FrontFaceFailOp;
-                hashCode = (hashCode * 397) ^ (int)FrontFacePassOp;
-                hashCode = (hashCode * 397) ^ (int)BackFaceStencilFunction;
-                hashCode = (hashCode * 397) ^ (int)BackFaceDepthFailOp;
-                hashCode = (hashCode * 397) ^ (int)BackFaceFailOp;
-                hashCode = (hashCode * 397) ^ (int)BackFacePassOp;
-                return hashCode;
-            }
-        }
-
-        public static bool operator ==(StencilFaceState left, StencilFaceState right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(StencilFaceState left, StencilFaceState right)
-        {
-            return !left.Equals(right);
-        }
-    }
-
-    public class DepthStencilState
-    {
-        DepthStencilBoundState state;
-
-        internal DepthStencilState(DepthStencilStateDescription depthStencilStateDescription, bool hasDepthStencilBuffer)
-        {
-            state.DepthBufferEnable = depthStencilStateDescription.DepthBufferEnable;
-            state.DepthBufferWriteEnable = depthStencilStateDescription.DepthBufferWriteEnable && hasDepthStencilBuffer;
-
-            state.StencilEnable = depthStencilStateDescription.StencilEnable;
-            state.StencilMask = depthStencilStateDescription.StencilMask;
-            state.StencilWriteMask = depthStencilStateDescription.StencilWriteMask;
-
-            state.DepthFunction = depthStencilStateDescription.DepthBufferFunction.ToOpenGLDepthFunction();
-
-            state.Faces.FrontFaceStencilFunction = depthStencilStateDescription.FrontFace.StencilFunction.ToOpenGLStencilFunction();
-            state.Faces.FrontFaceDepthFailOp = depthStencilStateDescription.FrontFace.StencilDepthBufferFail.ToOpenGL();
-            state.Faces.FrontFaceFailOp = depthStencilStateDescription.FrontFace.StencilFail.ToOpenGL();
-            state.Faces.FrontFacePassOp = depthStencilStateDescription.FrontFace.StencilPass.ToOpenGL();
-
-            state.Faces.BackFaceStencilFunction = depthStencilStateDescription.BackFace.StencilFunction.ToOpenGLStencilFunction();
-            state.Faces.BackFaceDepthFailOp = depthStencilStateDescription.BackFace.StencilDepthBufferFail.ToOpenGL();
-            state.Faces.BackFaceFailOp = depthStencilStateDescription.BackFace.StencilFail.ToOpenGL();
-            state.Faces.BackFacePassOp = depthStencilStateDescription.BackFace.StencilPass.ToOpenGL();
-        }
-
-        public void Apply(CommandList commandList)
-        {
-            if (commandList.DepthStencilBoundState.DepthBufferEnable != state.DepthBufferEnable)
-            {
-                commandList.DepthStencilBoundState.DepthBufferEnable = state.DepthBufferEnable;
-
-                if (state.DepthBufferEnable)
-                    GL.Enable(EnableCap.DepthTest);
-                else
-                    GL.Disable(EnableCap.DepthTest);
-            }
-
-            if (state.DepthBufferEnable && commandList.DepthStencilBoundState.DepthFunction != state.DepthFunction)
-            {
-                commandList.DepthStencilBoundState.DepthFunction = state.DepthFunction;
-                GL.DepthFunc(state.DepthFunction);
-            }
-
-            if (commandList.DepthStencilBoundState.DepthBufferWriteEnable != state.DepthBufferWriteEnable)
-            {
-                commandList.DepthStencilBoundState.DepthBufferWriteEnable = state.DepthBufferWriteEnable;
-                GL.DepthMask(state.DepthBufferWriteEnable);
-            }
-
-            if (commandList.DepthStencilBoundState.StencilEnable != state.StencilEnable)
-            {
-                commandList.DepthStencilBoundState.StencilEnable = state.StencilEnable;
-
-                if (state.StencilEnable)
-                    GL.Enable(EnableCap.StencilTest);
-                else
-                    GL.Disable(EnableCap.StencilTest);
-            }
-
-            if (state.StencilEnable && commandList.DepthStencilBoundState.StencilWriteMask != state.StencilWriteMask)
-            {
-                commandList.DepthStencilBoundState.StencilWriteMask = state.StencilWriteMask;
-                GL.StencilMask(state.StencilWriteMask);
-            }
-
-            // TODO: Properly handle stencil reference
-            if (state.StencilEnable && (commandList.DepthStencilBoundState.Faces != state.Faces || commandList.NewStencilReference != commandList.BoundStencilReference))
-            {
-                commandList.DepthStencilBoundState.Faces = state.Faces;
-                commandList.BoundStencilReference = commandList.NewStencilReference;
-
-                GL.StencilFuncSeparate(StencilFace.Front, state.Faces.FrontFaceStencilFunction, commandList.BoundStencilReference, state.StencilWriteMask); // set both faces
-                GL.StencilFuncSeparate(StencilFace.Back, state.Faces.BackFaceStencilFunction, commandList.BoundStencilReference, state.StencilWriteMask); // override back face
-                GL.StencilOpSeparate(StencilFace.Front, state.Faces.FrontFaceDepthFailOp, state.Faces.FrontFaceFailOp, state.Faces.FrontFacePassOp);
-                GL.StencilOpSeparate(StencilFace.Back, state.Faces.BackFaceDepthFailOp, state.Faces.BackFaceFailOp, state.Faces.BackFacePassOp);
-            }
-        }
-    }
-} 
-#endif 
diff --git a/sources/engine/Xenko.Graphics/OpenGL/EffectProgram.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/EffectProgram.OpenGL.cs
deleted file mode 100644
index 68a5e99100..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/EffectProgram.OpenGL.cs
+++ /dev/null
@@ -1,1043 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using OpenTK.Graphics;
-using Xenko.Core;
-using Xenko.Core.Collections;
-using Xenko.Core.Diagnostics;
-using Xenko.Core.Extensions;
-using Xenko.Core.Serialization;
-using Xenko.Shaders;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-
-namespace Xenko.Graphics
-{
-    class EffectProgram : GraphicsResourceBase
-    {
-#if XENKO_GRAPHICS_API_OPENGLES
-        // The ProgramParameter.ActiveUniformBlocks enum is not defined in OpenTK for OpenGL ES
-        private const GetProgramParameterName XkActiveUniformBlocks = (GetProgramParameterName)0x8A36;
-        private const ActiveUniformType FloatMat3x2 = (ActiveUniformType)0x8B67;
-#else
-        private const GetProgramParameterName XkActiveUniformBlocks = GetProgramParameterName.ActiveUniformBlocks;
-        private const ActiveUniformType FloatMat3x2 = ActiveUniformType.FloatMat3x2;
-#endif
-
-        internal int ProgramId;
-
-        const string VertexShaderDepthClamp = @"
-out float _edc_z;
-void main()
-{
-    _edc_main();
-
-    // transform z to window coordinates
-    _edc_z = gl_Position.z / gl_Position.w;
-    _edc_z = (gl_DepthRange.diff * _edc_z + gl_DepthRange.near + gl_DepthRange.far) * 0.5;
-
-    // prevent z-clipping
-    gl_Position.z = clamp(_edc_z, 0.0, 1.0);
-}
-";
-
-        const string FragmentShaderDepthClamp = @"
-in float _edc_z;
-void main()
-{
-    gl_FragDepth = clamp(_edc_z, 0.0, 1.0);
-
-    _edc_main();
-}
-";
-
-        private readonly LoggerResult reflectionResult = new LoggerResult();
-
-        private readonly EffectBytecode effectBytecode;
-
-        public Dictionary<string, int> Attributes { get; } = new Dictionary<string, int>();
-
-#if XENKO_GRAPHICS_API_OPENGLES
-        // Fake cbuffer emulation binding
-        internal struct Uniform
-        {
-            public ActiveUniformType Type;
-            public int UniformIndex;
-            public int ConstantBufferSlot;
-            public int Offset;
-            public int Count;
-            public int CompareSize;
-        }
-
-        // Start offsets for cbuffer
-        private static readonly int[] EmptyConstantBufferOffsets = { 0 };
-        internal int[] ConstantBufferOffsets = EmptyConstantBufferOffsets;
-
-        internal byte[] BoundUniforms;
-        internal List<Uniform> Uniforms = new List<Uniform>();
-#endif
-
-        internal struct Texture
-        {
-            public int TextureUnit;
-
-            public Texture(int textureUnit)
-            {
-                TextureUnit = textureUnit;
-            }
-        }
-
-        internal EffectReflection Reflection;
-
-        internal List<Texture> Textures = new List<Texture>();
-
-        private readonly bool emulateDepthClamp;
-
-        internal EffectProgram(GraphicsDevice device, EffectBytecode bytecode, bool emulateDepthClamp) : base(device)
-        {
-            effectBytecode = bytecode;
-            this.emulateDepthClamp = emulateDepthClamp;
-
-            // TODO OPENGL currently we modify the reflection info; need to find a better way to deal with that
-            Reflection = effectBytecode.Reflection;
-            CreateShaders();
-        }
-
-        protected internal override void OnDestroyed()
-        {
-            using (GraphicsDevice.UseOpenGLCreationContext())
-            {
-                GL.DeleteProgram(ProgramId);
-            }
-
-            ProgramId = 0;
-
-            base.OnDestroyed();
-        }
-
-        private void CreateShaders()
-        {
-            using (GraphicsDevice.UseOpenGLCreationContext())
-            {
-                ProgramId = GL.CreateProgram();
-
-                // Attach shaders
-                foreach (var shader in effectBytecode.Stages)
-                {
-                    ShaderType shaderStage;
-                    switch (shader.Stage)
-                    {
-                        case ShaderStage.Vertex:
-                            shaderStage = ShaderType.VertexShader;
-                            break;
-                        case ShaderStage.Pixel:
-                            shaderStage = ShaderType.FragmentShader;
-                            break;
-                        default:
-                            throw new Exception("Unsupported shader stage");
-                    }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                    var shaderSources = BinarySerialization.Read<ShaderLevelBytecode>(shader.Data);
-                    var shaderSource = GraphicsDevice.IsOpenGLES2 ? shaderSources.DataES2 : shaderSources.DataES3;
-#else
-                    var shaderSource = shader.GetDataAsString();
-#endif
-                    //edit the source a little to emulateDepthClamp
-                    if (emulateDepthClamp)
-                    {
-                        var mainPattern = new Regex(@"void\s+main\s*\(\)");
-                        if (shaderStage == ShaderType.VertexShader)
-                        {
-                            //bypass our regular main
-                            shaderSource = mainPattern.Replace(shaderSource, @"void _edc_main()");
-                            shaderSource += VertexShaderDepthClamp;
-                        }
-                        else if (shaderStage == ShaderType.FragmentShader)
-                        {
-                            //bypass our regular main
-                            shaderSource = mainPattern.Replace(shaderSource, @"void _edc_main()");
-                            shaderSource += FragmentShaderDepthClamp;
-                        }
-                    }
-
-                    // On OpenGL ES 3.1 and before, texture buffers are likely not supported so we have a fallback using textures
-                    shaderSource = shaderSource.Replace("#define texelFetchBufferPlaceholder",
-                        GraphicsDevice.HasTextureBuffers
-                            ? "#define texelFetchBuffer(sampler, P) texelFetch(sampler, P)"
-                            : ("#define samplerBuffer sampler2D\n"
-                            + "#define isamplerBuffer isampler2D\n"
-                            + "#define usamplerBuffer usampler2D\n"
-                            + "#define texelFetchBuffer(sampler, P) texelFetch(sampler, ivec2((P) & 0xFFF, (P) >> 12), 0)\n"));
-
-                    var shaderId = GL.CreateShader(shaderStage);
-                    GL.ShaderSource(shaderId, shaderSource);
-                    GL.CompileShader(shaderId);
-
-                    int compileStatus;
-                    GL.GetShader(shaderId, ShaderParameter.CompileStatus, out compileStatus);
-                    if (compileStatus != 1)
-                    {
-                        var glErrorMessage = GL.GetShaderInfoLog(shaderId);
-                        throw new InvalidOperationException("Error while compiling GLSL shader. [{0}]".ToFormat(glErrorMessage));
-                    }
-
-                    GL.AttachShader(ProgramId, shaderId);
-                }
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-                // Mark program as retrievable (necessary for later GL.GetProgramBinary).
-                GL.ProgramParameter(ProgramId, ProgramParameterName.ProgramBinaryRetrievableHint, 1);
-#endif
-
-                // Link OpenGL program
-                GL.LinkProgram(ProgramId);
-
-                // Check link results
-                int linkStatus;
-                GL.GetProgram(ProgramId, GetProgramParameterName.LinkStatus, out linkStatus);
-                if (linkStatus != 1)
-                {
-                    var infoLog = GL.GetProgramInfoLog(ProgramId);
-                    throw new InvalidOperationException("Error while linking GLSL shaders.\n" + infoLog);
-                }
-
-                if (Attributes.Count == 0) // the shader wasn't analyzed yet // TODO Is it possible?
-                {
-                    // Build attributes list for shader signature
-                    int activeAttribCount;
-                    GL.GetProgram(ProgramId, GetProgramParameterName.ActiveAttributes, out activeAttribCount);
-
-                    for (int activeAttribIndex = 0; activeAttribIndex < activeAttribCount; ++activeAttribIndex)
-                    {
-                        int size;
-                        ActiveAttribType type;
-                        var attribName = GL.GetActiveAttrib(ProgramId, activeAttribIndex, out size, out type);
-                        var attribIndex = GL.GetAttribLocation(ProgramId, attribName);
-                        Attributes.Add(attribName, attribIndex);
-                    }
-                }
-
-                CreateReflection(Reflection, effectBytecode.Stages[0].Stage); // need to regenerate the Uniforms on OpenGL ES
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                // Allocate a buffer that can cache all the bound parameters
-                BoundUniforms = new byte[ConstantBufferOffsets[ConstantBufferOffsets.Length - 1]];
-#endif
-            }
-
-            // output the gathered errors
-            foreach (var message in reflectionResult.Messages)
-                Console.WriteLine(message);
-            if (reflectionResult.HasErrors)
-                throw new Exception(reflectionResult.Messages.Select(x=>x.ToString()).Aggregate((x,y)=>x+"\n"+y));
-        }
-
-        /// <inheritdoc/>
-        protected internal override bool OnRecreate()
-        {
-            base.OnRecreate();
-            CreateShaders();
-            return true;
-        }
-
-        /// <inheritdoc/>
-        protected override void Destroy()
-        {
-            using (GraphicsDevice.UseOpenGLCreationContext())
-            {
-                GL.DeleteProgram(ProgramId);
-            }
-
-            ProgramId = 0;
-
-            base.Destroy();
-        }
-
-        /// <summary>
-        /// Create or updates the reflection for this shader
-        /// </summary>
-        /// <param name="effectReflection">the reflection from the hlsl</param>
-        /// <param name="stage">the shader pipeline stage</param>
-        private void CreateReflection(EffectReflection effectReflection, ShaderStage stage)
-        {
-            int currentProgram;
-            GL.GetInteger(GetPName.CurrentProgram, out currentProgram);
-            GL.UseProgram(ProgramId);
-
-            int uniformBlockCount;
-            GL.GetProgram(ProgramId, XkActiveUniformBlocks, out uniformBlockCount);
-
-            var validConstantBuffers = new bool[effectReflection.ConstantBuffers.Count];
-            for (int uniformBlockIndex = 0; uniformBlockIndex < uniformBlockCount; ++uniformBlockIndex)
-            {
-                // TODO: get previous name to find te actual constant buffer in the reflexion
-#if XENKO_GRAPHICS_API_OPENGLES
-                const int sbCapacity = 128;
-                int length;
-                var sb = new StringBuilder(sbCapacity);
-                GL.GetActiveUniformBlockName(ProgramId, uniformBlockIndex, sbCapacity, out length, sb);
-                var constantBufferName = sb.ToString();
-#else
-                var constantBufferName = GL.GetActiveUniformBlockName(ProgramId, uniformBlockIndex);
-#endif
-
-                var constantBufferDescriptionIndex = effectReflection.ConstantBuffers.FindIndex(x => x.Name == constantBufferName);
-                if (constantBufferDescriptionIndex == -1)
-                {
-                    reflectionResult.Error($"Unable to find the constant buffer description [{constantBufferName}]");
-                    return;
-                }
-                var constantBufferIndex = effectReflection.ResourceBindings.FindIndex(x => x.RawName == constantBufferName);
-                if (constantBufferIndex == -1)
-                {
-                    reflectionResult.Error($"Unable to find the constant buffer [{constantBufferName}]");
-                    return;
-                }
-
-                var constantBufferDescription = effectReflection.ConstantBuffers[constantBufferDescriptionIndex];
-                var constantBuffer = effectReflection.ResourceBindings[constantBufferIndex];
-
-                GL.GetActiveUniformBlock(ProgramId, uniformBlockIndex, ActiveUniformBlockParameter.UniformBlockDataSize, out constantBufferDescription.Size);
-                
-                int uniformCount;
-                GL.GetActiveUniformBlock(ProgramId, uniformBlockIndex, ActiveUniformBlockParameter.UniformBlockActiveUniforms, out uniformCount);
-
-                // set the binding
-                GL.UniformBlockBinding(ProgramId, uniformBlockIndex, uniformBlockIndex);
-
-                // Read uniforms desc
-                var uniformIndices = new int[uniformCount];
-                var uniformOffsets = new int[uniformCount];
-                var uniformTypes = new int[uniformCount];
-                var uniformNames = new string[uniformCount];
-                GL.GetActiveUniformBlock(ProgramId, uniformBlockIndex, ActiveUniformBlockParameter.UniformBlockActiveUniformIndices, uniformIndices);
-                GL.GetActiveUniforms(ProgramId, uniformIndices.Length, uniformIndices, ActiveUniformParameter.UniformOffset, uniformOffsets);
-                GL.GetActiveUniforms(ProgramId, uniformIndices.Length, uniformIndices, ActiveUniformParameter.UniformType, uniformTypes);
-                
-                for (int uniformIndex = 0; uniformIndex < uniformIndices.Length; ++uniformIndex)
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    int size;
-                    ActiveUniformType aut;
-                    GL.GetActiveUniform(ProgramId, uniformIndices[uniformIndex], sbCapacity, out length, out size, out aut, sb);
-                    uniformNames[uniformIndex] = sb.ToString();
-#else
-                    uniformNames[uniformIndex] = GL.GetActiveUniformName(ProgramId, uniformIndices[uniformIndex]);
-#endif
-                }
-
-                // Reoder by offset
-                var indexMapping = uniformIndices.Select((x, i) => new UniformMergeInfo { Offset = uniformOffsets[i], Type = (ActiveUniformType)uniformTypes[i], Name = uniformNames[i], NextOffset = 0 }).OrderBy(x => x.Offset).ToArray();
-                indexMapping.Last().NextOffset = constantBufferDescription.Size;
-
-                // Fill next offsets
-                for (int i = 1; i < indexMapping.Length; ++i)
-                {
-                    indexMapping[i - 1].NextOffset = indexMapping[i].Offset;
-                }
-
-                // Group arrays/structures into one variable (std140 layout is enough for offset determinism inside arrays/structures)
-                indexMapping = indexMapping.GroupBy(x =>
-                    {
-                        // Use only first part of name (ignore structure/array part)
-                        var name = x.Name;
-                        if (name.Contains(".")) { name = name.Substring(0, name.IndexOf('.')); }
-                        if (name.Contains("[")) { name = name.Substring(0, name.IndexOf('[')); }
-                        return name;
-                    })
-                                           .Select(x =>
-                                               {
-                                                   var result = x.First();
-                                                   result.NextOffset = x.Last().NextOffset;
-
-                                                   // Check weither it's an array or a struct
-                                                   int dotIndex = result.Name.IndexOf('.');
-                                                   int arrayIndex = result.Name.IndexOf('[');
-
-                                                   if (x.Count() > 1 && arrayIndex == -1 && dotIndex == -1)
-                                                       throw new InvalidOperationException();
-
-                                                   // TODO: Type processing
-
-                                                   result.Name = x.Key;
-                                                   return result;
-                                               }).ToArray();
-
-                foreach (var variableIndexGroup in indexMapping)
-                {
-                    var variableIndex = -1;
-                    for (var tentativeIndex = 0; tentativeIndex < constantBufferDescription.Members.Length; ++tentativeIndex)
-                    {
-                        if (constantBufferDescription.Members[tentativeIndex].RawName == variableIndexGroup.Name)
-                        {
-                            variableIndex = tentativeIndex;
-                            break;
-                        }
-                    }
-
-                    if (variableIndex == -1)
-                    {
-                        reflectionResult.Error($"Unable to find uniform [{variableIndexGroup.Name}] in constant buffer [{constantBufferName}]");
-                        continue;
-                    }
-                    var variable = constantBufferDescription.Members[variableIndex];
-                    variable.Type.Type = GetTypeFromActiveUniformType(variableIndexGroup.Type);
-                    variable.Offset = variableIndexGroup.Offset;
-                    variable.Size = variableIndexGroup.NextOffset - variableIndexGroup.Offset;
-
-                    constantBufferDescription.Members[variableIndex] = variable;
-                }
-
-                constantBufferDescription.Type = ConstantBufferType.ConstantBuffer;
-
-                constantBuffer.SlotCount = 1; // constant buffers are not arrays
-                constantBuffer.SlotStart = uniformBlockIndex;
-                constantBuffer.Stage = stage;
-
-                // store the new values
-                validConstantBuffers[constantBufferDescriptionIndex] = true;
-                effectReflection.ConstantBuffers[constantBufferDescriptionIndex] = constantBufferDescription;
-                effectReflection.ResourceBindings[constantBufferIndex] = constantBuffer;
-            }
-//#endif
-
-            // Remove unecessary cbuffer and resource bindings
-
-            // Register textures, samplers, etc...
-            //TODO: (?) non texture/buffer uniform outside of a block
-            {
-                // Register "NoSampler", required by HLSL=>GLSL translation to support HLSL such as texture.Load().
-                var noSampler = new EffectResourceBindingDescription { KeyInfo = { KeyName = "NoSampler" }, RawName = "NoSampler", Class = EffectParameterClass.Sampler, SlotStart = -1, SlotCount = 1 };
-                Reflection.ResourceBindings.Add(noSampler);
-
-                int activeUniformCount;
-                GL.GetProgram(ProgramId, GetProgramParameterName.ActiveUniforms, out activeUniformCount);
-#if !XENKO_GRAPHICS_API_OPENGLES
-                var uniformTypes = new int[activeUniformCount];
-                GL.GetActiveUniforms(ProgramId, activeUniformCount, Enumerable.Range(0, activeUniformCount).ToArray(), ActiveUniformParameter.UniformType, uniformTypes);
-#endif
-
-                int textureUnitCount = 0;
-
-                const int sbCapacity = 128;
-                var sb = new StringBuilder(sbCapacity);
-
-                for (int activeUniformIndex = 0; activeUniformIndex < activeUniformCount; ++activeUniformIndex)
-                {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                    var uniformType = (ActiveUniformType)uniformTypes[activeUniformIndex];
-                    var uniformName = GL.GetActiveUniformName(ProgramId, activeUniformIndex);
-#else
-                    ActiveUniformType uniformType;
-                    int uniformCount;
-                    int length;
-                    GL.GetActiveUniform(ProgramId, activeUniformIndex, sbCapacity, out length, out uniformCount, out uniformType, sb);
-                    var uniformName = sb.ToString();
-
-                    //this is a special OpenglES case , it is declared as built in uniform, and the driver will take care of it, we just need to ignore it here
-                    if (uniformName.StartsWith("gl_DepthRange"))
-                    {
-                        continue;
-                    }
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                    // Process uniforms
-                    if (GraphicsDevice.IsOpenGLES2)
-                    {
-                        switch (uniformType)
-                        {
-                            case ActiveUniformType.Bool:
-                            case ActiveUniformType.Int:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(int)*1, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.BoolVec2:
-                            case ActiveUniformType.IntVec2:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(int)*2, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.BoolVec3:
-                            case ActiveUniformType.IntVec3:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(int)*3, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.BoolVec4:
-                            case ActiveUniformType.IntVec4:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(int)*4, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.Float:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(float)*1, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.FloatVec2:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(float)*2, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.FloatVec3:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(float)*3, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.FloatVec4:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(float)*4, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.FloatMat4:
-                                AddUniform(effectReflection, validConstantBuffers, sizeof(float)*4*4, uniformCount, uniformName, uniformType);
-                                break;
-                            case ActiveUniformType.FloatMat2:
-                            case ActiveUniformType.FloatMat3:
-                                throw new NotImplementedException();
-                        }
-                    }
-#endif
-
-                    switch (uniformType)
-                    {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                        case ActiveUniformType.Sampler1D:
-                        case ActiveUniformType.Sampler1DShadow:
-                        case ActiveUniformType.IntSampler1D:
-                        case ActiveUniformType.UnsignedIntSampler1D:
-
-                        case ActiveUniformType.SamplerBuffer:
-                        case ActiveUniformType.UnsignedIntSamplerBuffer:
-                        case ActiveUniformType.IntSamplerBuffer:
-#endif
-                        case ActiveUniformType.Sampler2D:
-                        case ActiveUniformType.Sampler2DShadow:
-                        case ActiveUniformType.Sampler3D: // TODO: remove Texture3D that is not available in OpenGL ES 2
-                        case ActiveUniformType.SamplerCube:
-                        case ActiveUniformType.IntSampler2D:
-                        case ActiveUniformType.IntSampler3D:
-                        case ActiveUniformType.IntSamplerCube:
-                        case ActiveUniformType.UnsignedIntSampler2D:
-                        case ActiveUniformType.UnsignedIntSampler3D:
-                        case ActiveUniformType.UnsignedIntSamplerCube:
-                            var uniformIndex = GL.GetUniformLocation(ProgramId, uniformName);
-
-                            // Temporary way to scan which texture and sampler created this texture_sampler variable (to fix with new HLSL2GLSL converter)
-
-                            var startIndex = -1;
-                            var textureReflectionIndex = -1;
-                            var samplerReflectionIndex = -1;
-                            do
-                            {
-                                int middlePart = uniformName.IndexOf('_', startIndex + 1);
-                                var textureName = middlePart != -1 ? uniformName.Substring(0, middlePart) : uniformName;
-                                var samplerName = middlePart != -1 ? uniformName.Substring(middlePart + 1) : null;
-
-                                textureReflectionIndex =
-                                    effectReflection.ResourceBindings.FindIndex(x => x.RawName == textureName);
-                                samplerReflectionIndex =
-                                    effectReflection.ResourceBindings.FindIndex(x => x.RawName == samplerName);
-
-                                if (textureReflectionIndex != -1 && samplerReflectionIndex != -1)
-                                    break;
-
-                                startIndex = middlePart;
-                            } while (startIndex != -1);
-
-                            if (startIndex == -1 || textureReflectionIndex == -1 || samplerReflectionIndex == -1)
-                            {
-                                reflectionResult.Error($"Unable to find sampler and texture corresponding to [{uniformName}]");
-                                continue; // Error
-                            }
-
-                            var textureReflection = effectReflection.ResourceBindings[textureReflectionIndex];
-                            var samplerReflection = effectReflection.ResourceBindings[samplerReflectionIndex];
-
-                            // Contrary to Direct3D, samplers and textures are part of the same object in OpenGL
-                            // Since we are exposing the Direct3D representation, a single sampler parameter key can be used for several textures, a single texture can be used with several samplers.
-                            // When such a case is detected, we need to duplicate the resource binding.
-                            textureReflectionIndex = GetReflexionIndex(textureReflection, textureReflectionIndex, effectReflection.ResourceBindings);
-                            samplerReflectionIndex = GetReflexionIndex(samplerReflection, samplerReflectionIndex, effectReflection.ResourceBindings);
-
-                            // Update texture uniform mapping
-                            GL.Uniform1(uniformIndex, textureUnitCount);
-                            
-                            textureReflection.Stage = stage;
-                            //textureReflection.Param.RawName = uniformName;
-                            textureReflection.Type = GetTypeFromActiveUniformType(uniformType);
-                            textureReflection.Class = EffectParameterClass.ShaderResourceView;
-                            textureReflection.SlotStart = textureUnitCount;
-                            textureReflection.SlotCount = 1; // TODO: texture arrays
-
-                            samplerReflection.Stage = stage;
-                            samplerReflection.Class = EffectParameterClass.Sampler;
-                            samplerReflection.SlotStart = textureUnitCount;
-                            samplerReflection.SlotCount = 1; // TODO: texture arrays
-
-                            effectReflection.ResourceBindings[textureReflectionIndex] = textureReflection;
-                            effectReflection.ResourceBindings[samplerReflectionIndex] = samplerReflection;
-
-                            Textures.Add(new Texture(textureUnitCount));
-                            
-                            textureUnitCount++;
-                            break;
-                    }
-                }
-
-                // Remove any optimized resource binding
-                effectReflection.ResourceBindings.RemoveAll(x => x.SlotStart == -1);
-                effectReflection.ConstantBuffers = effectReflection.ConstantBuffers.Where((cb, i) => validConstantBuffers[i]).ToList();
-            }
-
-            GL.UseProgram(currentProgram);
-        }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-        struct UniformPart
-        {
-            public int Start;
-            public int Count;
-            public int Indexer;
-        }
-
-        private void AddUniform(EffectReflection effectReflection, bool[] validConstantBuffers, int uniformSize, int uniformCount, string uniformName, ActiveUniformType uniformType)
-        {
-            // OpenGL ES 2 is adding uniform for each cbuffer member, so we need to remove array and struct indexers so that we can identify it in cbuffer and find offset
-            var uniformParts = new List<UniformPart>(8);
-            var uniformLastStart = 0;
-            for (var index = 0; index <= uniformName.Length; index++)
-            {
-                char c = index == uniformName.Length ? '.' : uniformName[index]; // Treat string end same as '.'
-                if (c == '.' || c == '[')
-                {
-                    var uniformPart = new UniformPart { Start = uniformLastStart, Count = index - uniformLastStart, Indexer = -1 };
-
-                    // Read array index (if any)
-                    if (c == '[')
-                    {
-                        var indexerStart = ++index;
-                        while (uniformName[index] != ']')
-                            index++;
-                        // TODO: Avoid substring
-                        uniformPart.Indexer = int.Parse(uniformName.Substring(indexerStart, index - indexerStart));
-                        index++;
-                    }
-
-                    uniformParts.Add(uniformPart);
-                    uniformLastStart = index + 1;
-                }
-            }
-
-            var variableName = uniformName.Substring(0, uniformParts[0].Count);
-
-            // check that this uniform is in a constant buffer
-            int indexOfConstantBuffer = -1;
-            int indexOfMember = -1;
-            EffectConstantBufferDescription constantBufferDescription = null;
-            for (int cbIndex = 0; cbIndex < effectReflection.ConstantBuffers.Count; cbIndex++)
-            {
-                var currentConstantBuffer = effectReflection.ConstantBuffers[cbIndex];
-                for (int index = 0; index < currentConstantBuffer.Members.Length; index++)
-                {
-                    var member = currentConstantBuffer.Members[index];
-                    if (member.RawName.Equals(variableName))
-                    {
-                        indexOfConstantBuffer = cbIndex;
-                        indexOfMember = index;
-                        constantBufferDescription = currentConstantBuffer;
-                        break;
-                    }
-                }
-                if (constantBufferDescription != null)
-                    break;
-            }
-
-            if (constantBufferDescription == null)
-            {
-                throw new Exception("The uniform value " + variableName + " is defined outside of a uniform block, which is not supported by the engine.");
-            }
-
-            var indexOfResource = effectReflection.ResourceBindings.FindIndex(x => x.RawName == constantBufferDescription.Name);
-            if (indexOfResource == -1)
-            {
-                reflectionResult.Error($"Unable to find uniform [{uniformName}] in any constant buffer");
-                return;
-            }
-
-            //var constantBufferDescription = effectReflection.ConstantBuffers[indexOfConstantBufferDescription];
-            var constantBuffer = effectReflection.ResourceBindings[indexOfResource];
-
-            // First time we encounter this cbuffer?
-            if (!validConstantBuffers[indexOfConstantBuffer])
-            {
-                constantBuffer.SlotStart = ConstantBufferOffsets.Length - 1;
-
-                // Find next cbuffer slot
-                Array.Resize(ref ConstantBufferOffsets, ConstantBufferOffsets.Length + 1);
-
-                effectReflection.ResourceBindings[indexOfResource] = constantBuffer;
-
-                ConstantBufferOffsets[constantBuffer.SlotStart + 1] = ConstantBufferOffsets[constantBuffer.SlotStart] + constantBufferDescription.Size;
-
-                validConstantBuffers[indexOfConstantBuffer] = true;
-            }
-
-            //var elementSize = uniformSize;
-
-            // For array, each element is rounded to register size
-            //if (uniformSize%16 != 0 && uniformCount > 1)
-            //{
-            //    constantBufferDescription.Size = (constantBufferDescription.Size + 15)/16*16;
-            //    uniformSize = (uniformSize + 15)/16*16;
-            //}
-
-            // Check if it can fits in the same register, otherwise starts at the next one
-            //if (uniformCount == 1 && constantBufferDescription.Size/16 != (constantBufferDescription.Size + uniformSize - 1)/16)
-            //    constantBufferDescription.Size = (constantBufferDescription.Size + 15)/16*16;
-
-            var variable = constantBufferDescription.Members[indexOfMember];
-
-            // Resolve array/member
-            var offset = variable.Offset;
-            var type = variable.Type;
-
-            for (int i = 0; i < uniformParts.Count; ++i)
-            {
-                var uniformPart = uniformParts[i];
-
-                // Apply member
-                if (i > 0)
-                {
-                    if (type.Members == null)
-                        throw new InvalidOperationException($"Tried to find member \"{uniformName.Substring(uniformPart.Start, uniformPart.Count)}\" on a non-struct type when processing \"{uniformName}\"");
-
-                    bool memberFound = false;
-                    for (int memberIndex = 0; memberIndex < type.Members.Length; ++memberIndex)
-                    {
-                        var member = type.Members[memberIndex];
-                        if (string.Compare(member.Name, 0, uniformName, uniformPart.Start, uniformPart.Count) == 0)
-                        {
-                            // Adjust offset and set new type
-                            offset += member.Offset;
-                            type = member.Type;
-
-                            memberFound = true;
-                            break;
-                        }
-                    }
-
-                    if (!memberFound)
-                        throw new InvalidOperationException($"Couldn't find member \"{uniformName.Substring(uniformPart.Start, uniformPart.Count)}\" on struct type \"{type.Name}\" when processing \"{uniformName}\"");
-                }
-                   
-                // Apply indexer for arrays
-                if (uniformPart.Indexer != -1)
-                {
-                    offset += (type.ElementSize + 15) / 16 * 16 * uniformPart.Indexer;
-                }
-            }
-
-            // Check type
-            if (type.Type != GetTypeFromActiveUniformType(uniformType))
-                throw new InvalidOperationException($"Uniform [{uniformName}] of type [{variable.Type.Type}] doesn't match OpenGL shader expected type [{GetTypeFromActiveUniformType(uniformType)}]");
-
-            // No need to compare last element padding.
-            // TODO: In case of float1/float2 arrays (rare) it is quite non-optimal to do a CompareMemory
-            //variable.Size = uniformSize * (uniformCount - 1) + elementSize;
-            //constantBufferDescription.Members[indexOfUniform] = variable;
-
-            Uniforms.Add(new Uniform
-            {
-                Type = uniformType,
-                Count = uniformCount,
-                CompareSize = uniformSize + (uniformSize + 15)/16*16 * (uniformCount - 1),
-                ConstantBufferSlot = constantBuffer.SlotStart,
-                Offset = offset,
-                UniformIndex = GL.GetUniformLocation(ProgramId, uniformName)
-            });
-        }
-#endif
-
-        /// <summary>
-        /// Inserts the data in the list if this is a copy of a previously set one.
-        /// </summary>
-        /// <param name="data">The  data.</param>
-        /// <param name="index">The index in the list.</param>
-        /// <param name="bindings">The list of bindings.</param>
-        /// <returns>The new index of the data.</returns>
-        private static int GetReflexionIndex(EffectResourceBindingDescription data, int index, FastList<EffectResourceBindingDescription> bindings)
-        {
-            if (data.SlotCount != 0)
-            {
-                // slot count has been specified, this means that this resource was already configured
-                // We have to create a new entry for the data
-                var newIndex = bindings.Count;
-                bindings.Add(data);
-                return newIndex;
-            }
-            return index;
-        }
-
-        private static int GetCountFromActiveUniformType(ActiveUniformType type)
-        {
-            switch (type)
-            {
-                case ActiveUniformType.Int:
-                case ActiveUniformType.Float:
-                case ActiveUniformType.Bool:
-                    return 1;
-                case ActiveUniformType.IntVec2:
-                case ActiveUniformType.UnsignedIntVec2:
-                case ActiveUniformType.FloatVec2:
-                case ActiveUniformType.BoolVec2:
-                    return 2;
-                case ActiveUniformType.IntVec3:
-                case ActiveUniformType.UnsignedIntVec3:
-                case ActiveUniformType.FloatVec3:
-                case ActiveUniformType.BoolVec3:
-                    return 3;
-                case ActiveUniformType.IntVec4:
-                case ActiveUniformType.UnsignedIntVec4:
-                case ActiveUniformType.FloatVec4:
-                case ActiveUniformType.BoolVec4:
-                case ActiveUniformType.FloatMat2:
-                    return 4;
-                case ActiveUniformType.FloatMat2x3:
-                case FloatMat3x2:
-                    return 6;
-                case ActiveUniformType.FloatMat2x4:
-                case ActiveUniformType.FloatMat4x2:
-                    return 8;
-                case ActiveUniformType.FloatMat3:
-                    return 9;
-                case ActiveUniformType.FloatMat3x4:
-                case ActiveUniformType.FloatMat4x3:
-                    return 12;
-                case ActiveUniformType.FloatMat4:
-                    return 16;
-                
-                case ActiveUniformType.Sampler2D:
-                case ActiveUniformType.SamplerCube:
-                case ActiveUniformType.Sampler3D:
-                case ActiveUniformType.Sampler2DShadow:
-                case ActiveUniformType.SamplerCubeShadow:
-                case ActiveUniformType.IntSampler2D:
-                case ActiveUniformType.IntSampler3D:
-                case ActiveUniformType.IntSamplerCube:
-                case ActiveUniformType.UnsignedIntSampler2D:
-                case ActiveUniformType.UnsignedIntSampler3D:
-                case ActiveUniformType.UnsignedIntSamplerCube:
-                case ActiveUniformType.Sampler2DArray:
-                case ActiveUniformType.Sampler2DArrayShadow:
-                case ActiveUniformType.IntSampler2DArray:
-                case ActiveUniformType.UnsignedIntSampler2DArray:
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case ActiveUniformType.Sampler1D:
-                case ActiveUniformType.Sampler1DShadow:
-                case ActiveUniformType.Sampler2DRect:
-                case ActiveUniformType.Sampler2DRectShadow:
-                case ActiveUniformType.IntSampler1D:
-                case ActiveUniformType.IntSampler2DRect:
-                case ActiveUniformType.UnsignedIntSampler1D:
-                case ActiveUniformType.UnsignedIntSampler2DRect:
-                case ActiveUniformType.Sampler1DArray:
-                case ActiveUniformType.Sampler1DArrayShadow:
-                case ActiveUniformType.IntSampler1DArray:
-                case ActiveUniformType.UnsignedIntSampler1DArray:
-#endif
-                    return 1;
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case ActiveUniformType.SamplerBuffer:
-                case ActiveUniformType.IntSamplerBuffer:
-                case ActiveUniformType.UnsignedIntSamplerBuffer:
-                    return 1;
-                case ActiveUniformType.Sampler2DMultisample:
-                case ActiveUniformType.IntSampler2DMultisample:
-                case ActiveUniformType.UnsignedIntSampler2DMultisample:
-                    return 1;
-                case ActiveUniformType.Sampler2DMultisampleArray:
-                case ActiveUniformType.IntSampler2DMultisampleArray:
-                case ActiveUniformType.UnsignedIntSampler2DMultisampleArray:
-#endif
-                    return 1;
-                default:
-                    //TODO: log error ?
-                    return 0;
-            }
-        }
-
-        private static EffectParameterClass GetClassFromActiveUniformType(ActiveUniformType type)
-        {
-            switch (type)
-            {
-                case ActiveUniformType.Int:
-                case ActiveUniformType.Float:
-                case ActiveUniformType.Bool:
-                    return EffectParameterClass.Scalar;
-                case ActiveUniformType.FloatVec2:
-                case ActiveUniformType.FloatVec3:
-                case ActiveUniformType.FloatVec4:
-                case ActiveUniformType.IntVec2:
-                case ActiveUniformType.IntVec3:
-                case ActiveUniformType.IntVec4:
-                case ActiveUniformType.BoolVec2:
-                case ActiveUniformType.BoolVec3:
-                case ActiveUniformType.BoolVec4:
-                case ActiveUniformType.UnsignedIntVec2:
-                case ActiveUniformType.UnsignedIntVec3:
-                case ActiveUniformType.UnsignedIntVec4:
-                    return EffectParameterClass.Vector;
-                case ActiveUniformType.FloatMat2:
-                case ActiveUniformType.FloatMat3:
-                case ActiveUniformType.FloatMat4:
-                case ActiveUniformType.FloatMat2x3:
-                case ActiveUniformType.FloatMat2x4:
-                case FloatMat3x2:
-                case ActiveUniformType.FloatMat3x4:
-                case ActiveUniformType.FloatMat4x2:
-                case ActiveUniformType.FloatMat4x3:
-                    return EffectParameterClass.MatrixColumns;
-                    //return EffectParameterClass.MatrixRows;
-                    //return EffectParameterClass.Vector;
-                case ActiveUniformType.Sampler2D:
-                case ActiveUniformType.SamplerCube:
-                case ActiveUniformType.Sampler3D:
-                case ActiveUniformType.Sampler2DShadow:
-                case ActiveUniformType.Sampler2DArray:
-                case ActiveUniformType.Sampler2DArrayShadow:
-                case ActiveUniformType.SamplerCubeShadow:
-                case ActiveUniformType.IntSampler2D:
-                case ActiveUniformType.IntSampler3D:
-                case ActiveUniformType.IntSamplerCube:
-                case ActiveUniformType.IntSampler2DArray:
-                case ActiveUniformType.UnsignedIntSampler2D:
-                case ActiveUniformType.UnsignedIntSampler3D:
-                case ActiveUniformType.UnsignedIntSamplerCube:
-                case ActiveUniformType.UnsignedIntSampler2DArray:
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case ActiveUniformType.Sampler1D:
-                case ActiveUniformType.Sampler1DShadow:
-                case ActiveUniformType.Sampler2DRect:
-                case ActiveUniformType.Sampler2DRectShadow:
-                case ActiveUniformType.Sampler1DArray:
-                case ActiveUniformType.SamplerBuffer:
-                case ActiveUniformType.Sampler1DArrayShadow:
-                case ActiveUniformType.IntSampler1D:
-                case ActiveUniformType.IntSampler2DRect:
-                case ActiveUniformType.IntSampler1DArray:
-                case ActiveUniformType.IntSamplerBuffer:
-                case ActiveUniformType.UnsignedIntSampler1D:
-                case ActiveUniformType.UnsignedIntSampler2DRect:
-                case ActiveUniformType.UnsignedIntSampler1DArray:
-                case ActiveUniformType.UnsignedIntSamplerBuffer:
-                case ActiveUniformType.Sampler2DMultisample:
-                case ActiveUniformType.IntSampler2DMultisample:
-                case ActiveUniformType.UnsignedIntSampler2DMultisample:
-                case ActiveUniformType.Sampler2DMultisampleArray:
-                case ActiveUniformType.IntSampler2DMultisampleArray:
-                case ActiveUniformType.UnsignedIntSampler2DMultisampleArray:
-#endif
-                    return EffectParameterClass.TextureBuffer;
-                default:
-                    //TODO: log error ?
-                    return EffectParameterClass.Object;
-            }
-        }
-
-        private static EffectParameterType GetTypeFromActiveUniformType(ActiveUniformType type)
-        {
-            switch (type)
-            {
-                case ActiveUniformType.Int:
-                case ActiveUniformType.IntVec2:
-                case ActiveUniformType.IntVec3:
-                case ActiveUniformType.IntVec4:
-                    return EffectParameterType.Int;
-                case ActiveUniformType.Float:
-                case ActiveUniformType.FloatVec2:
-                case ActiveUniformType.FloatVec3:
-                case ActiveUniformType.FloatVec4:
-                case ActiveUniformType.FloatMat2:
-                case ActiveUniformType.FloatMat3:
-                case ActiveUniformType.FloatMat4:
-                case ActiveUniformType.FloatMat2x3:
-                case ActiveUniformType.FloatMat2x4:
-                case FloatMat3x2:
-                case ActiveUniformType.FloatMat3x4:
-                case ActiveUniformType.FloatMat4x2:
-                case ActiveUniformType.FloatMat4x3:
-                    return EffectParameterType.Float;
-                case ActiveUniformType.Bool:
-                case ActiveUniformType.BoolVec2:
-                case ActiveUniformType.BoolVec3:
-                case ActiveUniformType.BoolVec4:
-                    return EffectParameterType.Bool;
-                case ActiveUniformType.UnsignedIntVec2:
-                case ActiveUniformType.UnsignedIntVec3:
-                case ActiveUniformType.UnsignedIntVec4:
-                    return EffectParameterType.UInt;
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case ActiveUniformType.Sampler1D:
-                case ActiveUniformType.Sampler1DShadow:
-                case ActiveUniformType.IntSampler1D:
-                case ActiveUniformType.UnsignedIntSampler1D:
-                    return EffectParameterType.Texture1D;
-#endif
-                case ActiveUniformType.Sampler2D:
-                case ActiveUniformType.Sampler2DShadow:
-                case ActiveUniformType.IntSampler2D:
-                case ActiveUniformType.UnsignedIntSampler2D:
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case ActiveUniformType.Sampler2DRect:
-                case ActiveUniformType.Sampler2DRectShadow:
-                case ActiveUniformType.IntSampler2DRect:
-                case ActiveUniformType.UnsignedIntSampler2DRect:
-#endif
-                    return EffectParameterType.Texture2D;
-                case ActiveUniformType.Sampler3D:
-                case ActiveUniformType.IntSampler3D:
-                case ActiveUniformType.UnsignedIntSampler3D:
-                    return EffectParameterType.Texture3D;
-                case ActiveUniformType.SamplerCube:
-                case ActiveUniformType.SamplerCubeShadow:
-                case ActiveUniformType.IntSamplerCube:
-                case ActiveUniformType.UnsignedIntSamplerCube:
-                    return EffectParameterType.TextureCube;
-                case ActiveUniformType.Sampler2DArray:
-                case ActiveUniformType.Sampler2DArrayShadow:
-                case ActiveUniformType.IntSampler2DArray:
-                case ActiveUniformType.UnsignedIntSampler2DArray:
-                    return EffectParameterType.Texture2DArray;
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case ActiveUniformType.Sampler1DArray:
-                case ActiveUniformType.Sampler1DArrayShadow:
-                case ActiveUniformType.IntSampler1DArray:
-                case ActiveUniformType.UnsignedIntSampler1DArray:
-                    return EffectParameterType.Texture1DArray;
-                case ActiveUniformType.SamplerBuffer:
-                case ActiveUniformType.IntSamplerBuffer:
-                case ActiveUniformType.UnsignedIntSamplerBuffer:
-                    return EffectParameterType.TextureBuffer;
-                case ActiveUniformType.Sampler2DMultisample:
-                case ActiveUniformType.IntSampler2DMultisample:
-                case ActiveUniformType.UnsignedIntSampler2DMultisample:
-                    return EffectParameterType.Texture2DMultisampled;
-                case ActiveUniformType.Sampler2DMultisampleArray:
-                case ActiveUniformType.IntSampler2DMultisampleArray:
-                case ActiveUniformType.UnsignedIntSampler2DMultisampleArray:
-                    return EffectParameterType.Texture2DMultisampledArray;
-#endif
-                default:
-                    //TODO: log error ?
-                    return EffectParameterType.Void;
-            }
-        }
-
-        class UniformMergeInfo
-        {
-            public ActiveUniformType Type;
-            public int Offset;
-            public int NextOffset;
-            public string Name;
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsAdapter.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsAdapter.OpenGL.cs
deleted file mode 100644
index 1dc0c0124e..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsAdapter.OpenGL.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_OPENGL
-using System.Linq;
-using Xenko.Graphics.OpenGL;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Provides methods to retrieve and manipulate graphics adapters.
-    /// </summary>
-    public partial class GraphicsAdapter
-    {
-        private GraphicsProfile supportedGraphicsProfile;
-
-        internal GraphicsAdapter()
-        {
-            outputs = new [] { new GraphicsOutput() };
-
-            // set default values
-            int detectedVersion = 100;
-
-            var renderer = GL.GetString(StringName.Renderer);
-            var vendor = GL.GetString(StringName.Vendor);
-
-            // Stay close to D3D: Cut renderer after first / (ex: "GeForce 670/PCIe/SSE2")
-            var rendererSlash = renderer.IndexOf('/');
-            if (rendererSlash != -1)
-                renderer = renderer.Substring(0, rendererSlash);
-
-            // Stay close to D3D: Remove "Corporation" from vendor
-            vendor = vendor.Replace(" Corporation", string.Empty);
-
-            // Generate adapter Description
-            Description = $"{vendor} {renderer}";
-
-            // get real values
-            // using glGetIntegerv(GL_MAJOR_VERSION / GL_MINOR_VERSION) only works on opengl (es) > 3.0
-            var version = GL.GetString(StringName.Version);
-            if (version != null)
-            {
-                var splitVersion = version.Split(new char[] { '.', ' ' });
-                // find first number occurrence because:
-                //   - on OpenGL, "<major>.<minor>"
-                //   - on OpenGL ES, "OpenGL ES <profile> <major>.<minor>"
-                for (var i = 0; i < splitVersion.Length - 1; ++i)
-                {
-                    int versionMajor, versionMinor;
-                    if (int.TryParse(splitVersion[i], out versionMajor))
-                    {
-                        // Note: minor version might have stuff concat, take only until not digits
-                        var versionMinorString = splitVersion[i + 1];
-                        versionMinorString = new string(versionMinorString.TakeWhile(c => char.IsDigit(c)).ToArray());
-
-                        int.TryParse(versionMinorString, out versionMinor);
-
-                        detectedVersion = versionMajor * 100 + versionMinor * 10;
-                        break;
-                    }
-                }
-            }
-
-            supportedGraphicsProfile = OpenGLUtils.GetFeatureLevel(detectedVersion);
-        }
-
-        public bool IsProfileSupported(GraphicsProfile graphicsProfile)
-        {
-            // TODO: Check OpenGL version?
-            // TODO: ES specific code?
-            return graphicsProfile <= supportedGraphicsProfile;
-        }
-
-        /// <summary>
-        /// Gets the description of this adapter.
-        /// </summary>
-        /// <value>The description.</value>
-        public string Description { get; }
-
-        /// <summary>
-        /// Determines if this instance of GraphicsAdapter is the default adapter.
-        /// </summary>
-        public bool IsDefaultAdapter
-        {
-            get { return true; }
-        }
-
-        /// <summary>
-        /// Gets or sets the vendor identifier.
-        /// </summary>
-        /// <value>
-        /// The vendor identifier.
-        /// </value>
-        public int VendorId
-        {
-            get { return 0; }
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsAdapterFactory.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsAdapterFactory.OpenGL.cs
deleted file mode 100644
index 193fd9bec5..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsAdapterFactory.OpenGL.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-namespace Xenko.Graphics
-{
-    public partial class GraphicsAdapterFactory
-    {
-        private static void InitializeInternal()
-        {
-            defaultAdapter = new GraphicsAdapter();
-            adapters = new [] { defaultAdapter };
-        }
-    }
-} 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsDevice.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsDevice.OpenGL.cs
deleted file mode 100644
index c739551b62..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsDevice.OpenGL.cs
+++ /dev/null
@@ -1,1292 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using OpenTK.Graphics;
-using OpenTK.Platform;
-using Xenko.Core;
-using Xenko.Core.Diagnostics;
-using Xenko.Core.Mathematics;
-using Xenko.Rendering;
-using Xenko.Shaders;
-using Xenko.Graphics.OpenGL;
-using Color4 = Xenko.Core.Mathematics.Color4;
-#if XENKO_PLATFORM_ANDROID
-using System.Text;
-using System.Runtime.InteropServices;
-using OpenTK.Platform.Android;
-#elif XENKO_PLATFORM_IOS
-using OpenTK.Platform.iPhoneOS;
-#endif
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using DrawBuffersEnum = OpenTK.Graphics.ES30.DrawBufferMode;
-using FramebufferAttachmentObjectType = OpenTK.Graphics.ES30.All;
-#else
-using OpenTK.Graphics.OpenGL;
-using TextureTarget2d = OpenTK.Graphics.OpenGL.TextureTarget;
-using TextureTarget3d = OpenTK.Graphics.OpenGL.TextureTarget;
-#endif
-
-#if XENKO_UI_SDL
-using WindowState = Xenko.Graphics.SDL.FormWindowState;
-#else
-using WindowState = OpenTK.WindowState;
-#endif
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Performs primitive-based rendering, creates resources, handles system-level variables, adjusts gamma ramp levels, and creates shaders.
-    /// </summary>
-    public partial class GraphicsDevice
-    {
-        internal readonly int ConstantBufferDataPlacementAlignment = 16;
-
-        private static readonly Logger Log = GlobalLogger.GetLogger("GraphicsDevice");
-
-        internal int FrameCounter;
-
-        // Used when locking asyncCreationLockObject
-        private bool asyncCreationLockTaken;
-
-        internal bool ApplicationPaused = false;
-        internal bool ProfileEnabled = false;
-
-        internal IWindowInfo deviceCreationWindowInfo;
-        internal object asyncCreationLockObject = new object();
-        internal OpenTK.Graphics.IGraphicsContext deviceCreationContext;
-
-        internal int defaultVAO;
-
-        internal int CopyColorSourceFBO, CopyDepthSourceFBO;
-
-        DebugProc debugCallbackInstance;
-#if XENKO_GRAPHICS_API_OPENGLES
-        DebugProcKhr debugCallbackInstanceKHR;
-#endif
-
-        private const GraphicsPlatform GraphicPlatform =
-#if XENKO_GRAPHICS_API_OPENGLES
-                                                            GraphicsPlatform.OpenGLES;
-#else
-                                                            GraphicsPlatform.OpenGL;
-#endif
-
-#if XENKO_PLATFORM_ANDROID
-        // If context was set before Begin(), try to keep it after End()
-        // (otherwise devices with no backbuffer flicker)
-        private bool keepContextOnEnd;
-
-        private IntPtr graphicsContextEglPtr;
-        internal bool AsyncPendingTaskWaiting; // Used when Workaround_Context_Tegra2_Tegra3
-
-        // Workarounds for specific GPUs
-        internal bool Workaround_Context_Tegra2_Tegra3;
-#endif
-
-        internal SamplerState DefaultSamplerState;
-        internal DepthStencilState defaultDepthStencilState;
-        internal BlendState defaultBlendState;
-        internal GraphicsProfile requestedGraphicsProfile;
-        internal int version; // queried version
-        internal int currentVersion; // glGetVersion
-        internal Texture WindowProvidedRenderTexture;
-        internal int WindowProvidedFrameBuffer;
-
-        internal bool HasVAO;
-
-        internal bool HasDXT;
-
-        internal bool HasDepthClamp;
-
-        internal bool HasAnisotropicFiltering;
-
-        internal bool HasTextureBuffers;
-        internal bool HasKhronosDebug;
-        internal bool HasTimerQueries;
-
-#if XENKO_GRAPHICS_API_OPENGLES
-        internal bool HasKhronosDebugKHR;
-        internal bool HasDepth24;
-        internal bool HasPackedDepthStencilExtension;
-        internal bool HasExtTextureFormatBGRA8888;
-        internal bool HasTextureFloat;
-        internal bool HasTextureHalf;
-        internal bool HasRenderTargetFloat;
-        internal bool HasRenderTargetHalf;
-        internal bool HasTextureRG;
-#endif
-
-        private bool isFramebufferSRGB;
-
-        private int contextBeginCounter = 0;
-
-        // TODO: Use some LRU scheme to clean up FBOs if not used frequently anymore.
-        internal Dictionary<FBOKey, int> existingFBOs = new Dictionary<FBOKey,int>(); 
-
-        private static GraphicsDevice _currentGraphicsDevice = null;
-
-        [ThreadStatic] private static List<GraphicsDevice> _graphicsDevicesInUse;
-
-        public static GraphicsDevice Current
-        {
-            get
-            {
-                if (_graphicsDevicesInUse != null && _graphicsDevicesInUse.Count > 0)
-                    return _graphicsDevicesInUse[_graphicsDevicesInUse.Count - 1];
-
-                return _currentGraphicsDevice;
-            }
-
-            set
-            {
-                _currentGraphicsDevice = value;
-            }
-        }
-
-        private OpenTK.Graphics.IGraphicsContext graphicsContext;
-        private OpenTK.Platform.IWindowInfo windowInfo;
-
-#if XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX
-#if XENKO_UI_SDL
-        private Xenko.Graphics.SDL.Window gameWindow;
-#else
-        private OpenTK.GameWindow gameWindow;
-#endif
-#elif XENKO_PLATFORM_ANDROID
-        private AndroidGameView gameWindow;
-#elif XENKO_PLATFORM_IOS
-        private iPhoneOSGameView gameWindow;
-        public ThreadLocal<OpenGLES.EAGLContext> ThreadLocalContext { get; private set; }
-#endif
-
-#if XENKO_PLATFORM_ANDROID
-        [DllImport("libEGL.dll", EntryPoint = "eglGetCurrentContext")]
-        internal static extern IntPtr EglGetCurrentContext();
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-        public bool IsOpenGLES2 { get; private set; }
-
-        // Need to change sampler state depending on if texture has mipmap or not during PreDraw
-        private bool[] hasMipmaps = new bool[64];
-#endif
-
-        private int copyProgram = -1;
-        private int copyProgramOffsetLocation = -1;
-        private int copyProgramScaleLocation = -1;
-
-        private int copyProgramSRgb = -1;
-        private int copyProgramSRgbOffsetLocation = -1;
-        private int copyProgramSRgbScaleLocation = -1;
-
-        internal float[] SquareVertices = {
-            0.0f, 0.0f,
-            1.0f, 0.0f,
-            0.0f, 1.0f, 
-            1.0f, 1.0f,
-        };
-
-        internal Buffer SquareBuffer;
-
-        /// <summary>
-        /// The tick frquency of timestamp queries in Hertz.
-        /// </summary>
-        public long TimestampFrequency { get; } = 1000_000_000L;
-
-        /// <summary>
-        /// Gets the status of this device.
-        /// </summary>
-        public GraphicsDeviceStatus GraphicsDeviceStatus
-        {
-            get
-            {
-#if XENKO_PLATFORM_ANDROID
-                if (graphicsContext != gameWindow.GraphicsContext)
-                {
-                    return GraphicsDeviceStatus.Reset;
-                }
-#endif
-
-                // TODO implement GraphicsDeviceStatus for OpenGL
-                return GraphicsDeviceStatus.Normal;
-            }
-        }
-
-        public void Use()
-        {
-            if (_graphicsDevicesInUse == null)
-                _graphicsDevicesInUse = new List<GraphicsDevice>();
-
-            if (!_graphicsDevicesInUse.Contains(this))
-                _graphicsDevicesInUse.Add(this);
-        }
-
-        public void Unuse()
-        {
-            if (_graphicsDevicesInUse == null)
-                return;
-
-            _graphicsDevicesInUse.Remove(this);
-
-            if (_graphicsDevicesInUse.Count == 0)
-                _graphicsDevicesInUse = null;
-        }
-
-        internal UseOpenGLCreationContext UseOpenGLCreationContext()
-        {
-            return new UseOpenGLCreationContext(this);
-        }
-
-        /// <summary>
-        /// Marks context as active on the current thread.
-        /// </summary>
-        public void Begin()
-        {
-            ++contextBeginCounter;
-
-            if (contextBeginCounter == 1)
-            {
-                FrameCounter++;
-
-#if XENKO_PLATFORM_ANDROID
-                if (Workaround_Context_Tegra2_Tegra3)
-                {
-                    Monitor.Enter(asyncCreationLockObject, ref asyncCreationLockTaken);
-                }
-                else
-                {
-                    // On first set, check if context was not already set before,
-                    // in which case we won't unset it during End().
-                    keepContextOnEnd = graphicsContextEglPtr == GraphicsDevice.EglGetCurrentContext();
-
-                    if (keepContextOnEnd)
-                    {
-                        return;
-                    }
-                }
-#endif
-                graphicsContext.MakeCurrent(windowInfo);
-            }
-        }
-
-        /// <summary>
-        /// Unmarks context as active on the current thread.
-        /// </summary>
-        public void End()
-        {
-#if DEBUG
-            EnsureContextActive();
-#endif
-
-            --contextBeginCounter;
-            if (contextBeginCounter == 0)
-            {
-                //UnbindVertexArrayObject();
-
-#if XENKO_PLATFORM_ANDROID
-                if (Workaround_Context_Tegra2_Tegra3)
-                {
-                    graphicsContext.MakeCurrent(null);
-
-                    // Notify that main context can be used from now on
-                    if (asyncCreationLockTaken)
-                    {
-                        Monitor.Exit(asyncCreationLockObject);
-                        asyncCreationLockTaken = false;
-                    }
-                }
-                else if (!keepContextOnEnd)
-                {
-                    GraphicsDevice.UnbindGraphicsContext(graphicsContext);
-                }
-#else
-                UnbindGraphicsContext(graphicsContext);
-#endif
-            }
-            else if (contextBeginCounter < 0)
-            {
-                throw new Exception("End context was called more than Begin");
-            }
-        }
-
-        internal Buffer GetSquareBuffer()
-        {
-            if (SquareBuffer == null)
-            {
-                SquareBuffer = Buffer.New(this, SquareVertices, BufferFlags.VertexBuffer);
-            }
-
-            return SquareBuffer;
-        }
-
-        internal int GetCopyProgram(bool srgb, out int offsetLocation, out int scaleLocation)
-        {
-            if (srgb)
-            {
-                if (copyProgramSRgb == -1)
-                {
-                    copyProgramSRgb = CreateCopyProgram(true, out copyProgramSRgbOffsetLocation, out copyProgramSRgbScaleLocation);
-                }
-                offsetLocation = copyProgramSRgbOffsetLocation;
-                scaleLocation = copyProgramSRgbScaleLocation;
-                return copyProgramSRgb;
-            }
-            else
-            {
-                if (copyProgram == -1)
-                {
-                    copyProgram = CreateCopyProgram(false, out copyProgramOffsetLocation, out copyProgramScaleLocation);
-                }
-                offsetLocation = copyProgramOffsetLocation;
-                scaleLocation = copyProgramScaleLocation;
-                return copyProgram;
-            }
-        }
-
-        private int CreateCopyProgram(bool srgb, out int offsetLocation, out int scaleLocation)
-        {
-            string shaderVersion, inAttribute, outAttribute, varyingFragment, fragColorDeclaration, fragColorVariable, textureAPI;
-#if XENKO_GRAPHICS_API_OPENGLES
-            // We aim at OpenGLES 3.0 or greater.
-            shaderVersion = "#version 300 es";
-#else
-            shaderVersion = "#version 410";
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (currentVersion < 300)
-            {
-                // Override the version
-                shaderVersion = "#version 100";
-                inAttribute = "attribute";
-                outAttribute = "varying";
-                varyingFragment = "varying";
-                fragColorDeclaration = "";
-                fragColorVariable = "gl_FragColor";
-                textureAPI = "texture2D";
-            }
-            else
-#endif
-            {
-                inAttribute = "in";
-                outAttribute = "out";
-                varyingFragment = "in";
-                fragColorDeclaration = "out vec4 gFragColor;\n";
-                fragColorVariable = "gFragColor";
-                textureAPI = "texture";
-            }
-
-            string copyVertexShaderSource =
-                shaderVersion + "\n" +
-                inAttribute + " vec2 aPosition;   \n" +
-                outAttribute + " vec2 vTexCoord;  \n" +
-                "uniform vec4 uScale;     \n" +
-                "uniform vec4 uOffset;     \n" +
-                "void main()                 \n" +
-                "{                           \n" +
-                "   vec4 transformedPosition = aPosition.xyxy * uScale + uOffset;" +
-                "   gl_Position = vec4(transformedPosition.zw * 2.0 - 1.0, 0.0, 1.0); \n" +
-                "   vTexCoord = transformedPosition.xy;   \n" +
-                "}                           \n";
-
-            string copyFragmentShaderSource =
-                shaderVersion + "\n" +
-                "precision mediump float;                            \n" +
-                varyingFragment + " vec2 vTexCoord;                  \n" +
-                fragColorDeclaration +
-                "uniform sampler2D s_texture;                        \n" +
-                "void main()                                         \n" +
-                "{                                                   \n" +
-                "    " + fragColorVariable + " = " + textureAPI + "(s_texture, vTexCoord); \n" +
-                "}                                                   \n";
-
-            string copyFragmentShaderSourceSRgb =
-                shaderVersion + "\n" +
-                "precision mediump float;                            \n" +
-                varyingFragment + " vec2 vTexCoord;                  \n" +
-                fragColorDeclaration +
-                "uniform sampler2D s_texture;                        \n" +
-                "void main()                                         \n" +
-                "{                                                   \n" +
-                "    vec4 color = " + textureAPI + "(s_texture, vTexCoord);   \n" +
-                "    " + fragColorVariable + " = vec4(sqrt(color.rgb), color.a); \n" +  // approximation of linear to SRgb
-                "}                                                   \n";
-
-            // First initialization of shader program
-            int vertexShader = TryCompileShader(ShaderType.VertexShader, copyVertexShaderSource);
-            int fragmentShader = TryCompileShader(ShaderType.FragmentShader, srgb ? copyFragmentShaderSourceSRgb : copyFragmentShaderSource);
-
-            int program = GL.CreateProgram();
-            GL.AttachShader(program, vertexShader);
-            GL.AttachShader(program, fragmentShader);
-            GL.BindAttribLocation(program, 0, "aPosition");
-            GL.LinkProgram(program);
-
-            int linkStatus;
-            GL.GetProgram(program, GetProgramParameterName.LinkStatus, out linkStatus);
-
-            if (linkStatus != 1)
-                throw new InvalidOperationException("Error while linking GLSL shaders.");
-
-            GL.UseProgram(program);
-            var textureLocation = GL.GetUniformLocation(program, "s_texture");
-            offsetLocation = GL.GetUniformLocation(program, "uOffset");
-            scaleLocation = GL.GetUniformLocation(program, "uScale");
-            GL.Uniform1(textureLocation, 0);
-
-            return program;
-        }
-
-        public void EnableProfile(bool enabledFlag)
-        {
-            ProfileEnabled = true;
-        }
-
-        internal void EnsureContextActive()
-        {
-            // TODO: Better checks (is active context the expected one?)
-#if XENKO_PLATFORM_ANDROID
-            if (EglGetCurrentContext() == IntPtr.Zero)
-                throw new InvalidOperationException("No OpenGL context bound.");
-#else
-            var context = OpenTK.Graphics.GraphicsContext.CurrentContext; //static cannot be debugged easy
-            if (context == null)
-                throw new InvalidOperationException("No OpenGL context bound.");
-#endif
-        }
-
-        public void ExecuteCommandList(CompiledCommandList commandList)
-        {
-#if DEBUG
-            EnsureContextActive();
-#endif
-
-            throw new NotImplementedException();
-        }
-
-        public void ExecuteCommandLists(int count, CompiledCommandList[] commandList)
-        {
-#if DEBUG
-            EnsureContextActive();
-#endif
-
-            throw new NotImplementedException();
-        }
-
-        internal int FindOrCreateFBO(GraphicsResourceBase graphicsResource, int subresource)
-        {
-            if (graphicsResource == WindowProvidedRenderTexture)
-                return WindowProvidedFrameBuffer;
-
-            var texture = graphicsResource as Texture;
-            if (texture != null)
-            {
-                return FindOrCreateFBO(new FBOTexture(texture, subresource / texture.MipLevels, subresource % texture.MipLevels));
-            }
-
-            throw new NotSupportedException();
-        }
-
-        internal int FindOrCreateFBO(FBOTexture texture)
-        {
-            var isDepthBuffer = ((texture.Texture.Flags & TextureFlags.DepthStencil) != 0);
-            lock (existingFBOs)
-            {
-                foreach (var key in existingFBOs)
-                {
-                    if ((isDepthBuffer && key.Key.DepthStencilBuffer == texture)
-                        || !isDepthBuffer && key.Key.RenderTargetCount == 1 && key.Key.RenderTargets[0] == texture)
-                        return key.Value;
-                }
-            }
-
-            if (isDepthBuffer)
-                return FindOrCreateFBO(texture, null, 0);
-            return FindOrCreateFBO(null, new FBOTexture[] { texture }, 1);
-        }
-
-        // TODO: I think having a class for FBOs would simplify some stuff. We could implement methods like "Bind()" for it.
-        int GenerateFBO(FBOTexture depthStencilBuffer, FBOTexture[] renderTargets, int renderTargetCount)
-        {
-            int fboID;
-
-            GL.GenFramebuffers(1, out fboID);
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, fboID);
-            UpdateFBO(FramebufferTarget.Framebuffer, depthStencilBuffer, renderTargets, renderTargetCount);
-
-            var framebufferStatus = GL.CheckFramebufferStatus(FramebufferTarget.Framebuffer);
-            if (framebufferStatus != FramebufferErrorCode.FramebufferComplete)
-            {
-                throw new InvalidOperationException(string.Format("FBO is incomplete: {0} RTs: [RT0: {1}]; Depth {2} (error: {3})",
-                                                                  renderTargetCount,
-                                                                  renderTargets != null && renderTargets.Length > 0 && renderTargets[0].Texture != null ? renderTargets[0].Texture.TextureId : 0,
-                                                                  depthStencilBuffer.Texture != null ? depthStencilBuffer.Texture.TextureId : 0,
-                                                                  framebufferStatus));
-            }
-
-            FBOTexture[] newFBOTextures = null;
-            if (renderTargets != null)
-            {
-                newFBOTextures = (FBOTexture[])renderTargets.Clone();
-            }
-
-            FBOKey newFBOKey = new FBOKey(depthStencilBuffer, newFBOTextures, renderTargetCount);
-            existingFBOs.Add(newFBOKey, fboID);
-
-            return fboID;
-        }
-
-        internal int FindOrCreateFBO(FBOTexture depthStencilBuffer, FBOTexture[] renderTargets, int renderTargetCount)  // TODO: What's the point of passing an array that has reduntant elements? This could probably be reduced to only the "renderTargets" parameter.
-        {
-            // Check for existing FBO matching this configuration
-            lock (existingFBOs) // TODO: PERFORMANCE: Why is this lock here? Do we ever run this from multiple threads? If so, why?
-            {
-                // Check if the default-provided render target was requested:
-                // TODO: Need to disable some part of rendering if either is null
-                var isProvidedRenderTarget = (renderTargetCount == 1 && renderTargets[0] == WindowProvidedRenderTexture);
-                if (isProvidedRenderTarget && depthStencilBuffer.Texture != null)
-                {
-                    throw new InvalidOperationException("It is impossible to bind device provided and user created buffers with OpenGL");
-                }
-                if (depthStencilBuffer.Texture == null && (isProvidedRenderTarget || renderTargetCount == 0)) // device provided framebuffer
-                {
-                    return WindowProvidedFrameBuffer;
-                }
-
-                // Check if there is an already existing FBO:
-                var fboKey = new FBOKey(depthStencilBuffer, renderTargets, renderTargetCount);
-
-                int fboID;
-                if (existingFBOs.TryGetValue(fboKey, out fboID))
-                    return fboID;
-
-                // Since the desired FBO doesn't already exist, we generate it:
-                return GenerateFBO(depthStencilBuffer, renderTargets, renderTargetCount);
-            }
-        }
-
-        internal FramebufferAttachment UpdateFBO(FramebufferTarget framebufferTarget, FBOTexture renderTarget)
-        {
-            var texture = renderTarget.Texture;
-            var isDepthBuffer = Texture.InternalIsDepthStencilFormat(texture.Format);
-            if (isDepthBuffer)
-            {
-                return UpdateFBODepthStencilAttachment(framebufferTarget, renderTarget);
-            }
-            else
-            {
-                UpdateFBOColorAttachment(framebufferTarget, 0, renderTarget);
-                return FramebufferAttachment.ColorAttachment0;
-            }
-        }
-
-        internal void UpdateFBO(FramebufferTarget framebufferTarget, FBOTexture depthStencilBuffer, FBOTexture[] renderTargets, int renderTargetCount)  // TODO: What's the point of passing an array that has reduntant elements? This could probably be reduced to only the "renderTargets" parameter.
-        {
-            for (int i = 0; i < renderTargetCount; ++i)
-            {
-                UpdateFBOColorAttachment(framebufferTarget, i, renderTargets[i]);
-            }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (!IsOpenGLES2)
-#endif
-            {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                if (renderTargetCount <= 1)
-                {
-                    GL.DrawBuffer(renderTargetCount != 0 ? DrawBufferMode.ColorAttachment0 : DrawBufferMode.None);
-                }
-                else
-#endif
-                {
-                    // Specify which attachments to render to (all of them in our case):
-                    var drawBuffers = new DrawBuffersEnum[renderTargetCount];
-                    for (var i = 0; i < renderTargetCount; ++i)
-                        drawBuffers[i] = DrawBuffersEnum.ColorAttachment0 + i;
-                    GL.DrawBuffers(renderTargetCount, drawBuffers);
-                }
-            }
-
-            if (depthStencilBuffer.Texture != null)
-            {
-                UpdateFBODepthStencilAttachment(framebufferTarget, depthStencilBuffer);
-            }
-        }
-
-        void BindColorAttachment(FramebufferTarget framebufferTarget, int i, FBOTexture renderTarget)
-        {
-            FramebufferAttachment attachment = FramebufferAttachment.ColorAttachment0 + i;
-
-            if (renderTarget.Texture.IsMultisample)
-            {
-                if (renderTarget.Texture.IsRenderbuffer)
-                {
-                    GL.FramebufferRenderbuffer(framebufferTarget, attachment, RenderbufferTarget.Renderbuffer, renderTarget.Texture.TextureId);
-                }
-                else
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    throw new NotSupportedException("Multisample textures are not supported on OpenGL ES.");
-#else
-                    GL.FramebufferTexture2D(framebufferTarget, attachment, renderTarget.Texture.TextureTarget, renderTarget.Texture.TextureId, renderTarget.MipLevel);
-#endif
-                }
-            }
-            else
-            {
-                TextureTarget2d textureTarget = Texture.GetTextureTargetForDataSet2D(renderTarget.Texture.TextureTarget, renderTarget.ArraySlice % 6);
-                GL.FramebufferTexture2D(framebufferTarget, attachment, textureTarget, renderTarget.Texture.TextureId, renderTarget.MipLevel);
-            }
-        }
-
-        internal void UpdateFBOColorAttachment(FramebufferTarget framebufferTarget, int i, FBOTexture renderTarget)
-        {
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (IsOpenGLES2 && renderTarget.MipLevel != 0)
-                throw new PlatformNotSupportedException("Can't read from mipmap level other than 0 on OpenGL ES 2");
-#endif
-
-            switch (renderTarget.Texture.TextureTarget)
-            {
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case TextureTarget.Texture1D:
-                    GL.FramebufferTexture1D(framebufferTarget, FramebufferAttachment.ColorAttachment0 + i, TextureTarget.Texture1D, renderTarget.Texture.TextureId, renderTarget.MipLevel);
-                    break;
-#endif
-                case TextureTarget.Texture2D:
-                case TextureTarget.TextureCubeMap:
-                    // We don't make use of the "TextureTarget.Texture2DMultisample" enum value on purpose, because it
-                    // allows for better code sharing between OpenGL ES and OpenGL. We simply use "TextureTarget.Texture2D"
-                    // and check the value of "IsMultisample" instead. This is because OpenGL ES doesn't support
-                    // multisample textures, but only multisample renderbuffers.
-                    BindColorAttachment(framebufferTarget, i, renderTarget);
-                    break;
-                case TextureTarget.Texture2DArray:
-                case TextureTarget.Texture3D:
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (IsOpenGLES2)
-                        throw new PlatformNotSupportedException($"Can't bind FBO with target [{renderTarget.Texture.TextureTarget}]. Reason: 3D textures are not supported on OpenGL ES 2.");   // TODO: If not supported on OpenGL ES, why is the texture even allocated? This should be catched earlier.
-#endif
-                    GL.FramebufferTextureLayer(framebufferTarget, FramebufferAttachment.ColorAttachment0 + i, renderTarget.Texture.TextureId, renderTarget.MipLevel, renderTarget.ArraySlice);
-                    break;
-                default:
-                    throw new NotImplementedException($"Can't bind FBO with target [{renderTarget.Texture.TextureTarget}]");
-            }
-        }
-
-        internal FramebufferAttachment UpdateFBODepthStencilAttachment(FramebufferTarget framebufferTarget, FBOTexture depthStencilBuffer)
-        {
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (IsOpenGLES2 && depthStencilBuffer.MipLevel != 0)
-                throw new PlatformNotSupportedException("Can't read from mipmap level other than 0 on OpenGL ES 2");
-#endif
-
-            bool useSharedAttachment = depthStencilBuffer.Texture.StencilId == depthStencilBuffer.Texture.TextureId;
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (IsOpenGLES2)  // FramebufferAttachment.DepthStencilAttachment is not supported in ES 2  // TODO: Wouldn't it make more sense to check the value of "depthStencilBuffer.Texture.StencilId" instead?
-                useSharedAttachment = false;
-#endif
-            var attachmentType = useSharedAttachment ? FramebufferAttachment.DepthStencilAttachment : FramebufferAttachment.DepthAttachment;
-
-            if (depthStencilBuffer.Texture.IsRenderbuffer)
-            {
-                // Bind depth-only or packed depth-stencil buffer
-                GL.FramebufferRenderbuffer(framebufferTarget, attachmentType, RenderbufferTarget.Renderbuffer, depthStencilBuffer.Texture.TextureId);
-
-                // If stencil buffer is separate, it's resource id might be stored in depthStencilBuffer.Texture.StencilId
-                if (depthStencilBuffer.Texture.HasStencil && !useSharedAttachment)
-                {
-                    GL.FramebufferRenderbuffer(framebufferTarget, FramebufferAttachment.StencilAttachment, RenderbufferTarget.Renderbuffer, depthStencilBuffer.Texture.StencilId);
-                }
-            }
-            else
-            {
-                TextureTarget2d textureTarget2d = TextureTarget2d.Texture2D;
-                if (depthStencilBuffer.Texture.IsMultisample)
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    throw new NotSupportedException("Multisample textures are not supported on OpenGL ES.");
-#else
-                    textureTarget2d = TextureTarget2d.Texture2DMultisample;
-#endif
-                }
-
-                // Bind depth-only or packed depth-stencil buffer   // TODO: What about separate depth and stencil?
-                GL.FramebufferTexture2D(framebufferTarget, attachmentType, textureTarget2d, depthStencilBuffer.Texture.TextureId, depthStencilBuffer.MipLevel);
-            }
-
-            return attachmentType;
-        }
-
-        internal int TryCompileShader(ShaderType shaderType, string sourceCode)
-        {
-            int shaderGL = GL.CreateShader(shaderType);
-            GL.ShaderSource(shaderGL, sourceCode);
-            GL.CompileShader(shaderGL);
-
-            var log = GL.GetShaderInfoLog(shaderGL);
-
-            int compileStatus;
-            GL.GetShader(shaderGL, ShaderParameter.CompileStatus, out compileStatus);
-
-            if (compileStatus != 1)
-                throw new InvalidOperationException("Error while compiling GLSL shader: \n" + log);
-
-            return shaderGL;
-        }
-
-        internal static void UnbindGraphicsContext(IGraphicsContext graphicsContext)
-        {
-            graphicsContext.MakeCurrent(null);
-        }
-
-        private void OnApplicationPaused(object sender, EventArgs e)
-        {
-            // Block async resource creation
-            Monitor.Enter(asyncCreationLockObject, ref asyncCreationLockTaken);
-
-            ApplicationPaused = true;
-
-            using (UseOpenGLCreationContext())
-            {
-                GL.Finish();
-            }
-
-            // Unset graphics context
-            UnbindGraphicsContext(graphicsContext);
-        }
-
-        private void OnApplicationResumed(object sender, EventArgs e)
-        {
-            windowInfo = gameWindow.WindowInfo;
-
-            // Reenable graphics context
-            graphicsContext.MakeCurrent(windowInfo);
-
-            ApplicationPaused = false;
-
-            // Reenable async resource creation
-            if (asyncCreationLockTaken)
-            {
-                Monitor.Exit(asyncCreationLockObject);
-                asyncCreationLockTaken = false;
-            }
-        }
-
-        private string renderer;
-
-        private string GetRendererName()
-        {
-            return renderer;
-        }
-
-        protected void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles, DeviceCreationFlags deviceCreationFlags, WindowHandle windowHandle)
-        {
-            // Enable OpenGL context sharing
-            OpenTK.Graphics.GraphicsContext.ShareContexts = true;
-
-            // TODO: How to control Debug flags?
-            var creationFlags = GraphicsContextFlags.Default;
-
-            if (IsDebugMode)
-            {
-                creationFlags |= GraphicsContextFlags.Debug;
-            }
-
-            // set default values
-            version = 100;
-
-            requestedGraphicsProfile = GraphicsProfile.Level_9_1;
-
-            // Find the first profile that is compatible with current GL version
-            foreach (var graphicsProfile in graphicsProfiles)
-            {
-                if (Adapter.IsProfileSupported(graphicsProfile))
-                {
-                    requestedGraphicsProfile = graphicsProfile;
-                    break;
-                }
-            }
-
-            // Find back OpenGL version from requested version
-            OpenGLUtils.GetGLVersion(requestedGraphicsProfile, out version);
-
-            // check what is actually created
-            if (!OpenGLUtils.GetCurrentGLVersion(out currentVersion))
-            {
-                currentVersion = version;
-            }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            IsOpenGLES2 = version < 300;
-            creationFlags |= GraphicsContextFlags.Embedded;
-#endif
-
-            renderer = GL.GetString(StringName.Renderer);
-
-#if XENKO_PLATFORM_UNIX || XENKO_PLATFORM_WINDOWS_DESKTOP
-#if XENKO_UI_SDL
-            gameWindow = (Xenko.Graphics.SDL.Window)windowHandle.NativeWindow;
-#else
-            gameWindow = (OpenTK.GameWindow)windowHandle.NativeWindow;
-#endif
-#elif XENKO_PLATFORM_ANDROID
-            gameWindow = (AndroidGameView)windowHandle.NativeWindow;
-#elif XENKO_PLATFORM_IOS
-            gameWindow = (iPhoneOSGameView)windowHandle.NativeWindow;
-            ThreadLocalContext = new ThreadLocal<OpenGLES.EAGLContext>(() => new OpenGLES.EAGLContext(IsOpenGLES2 ? OpenGLES.EAGLRenderingAPI.OpenGLES2 : OpenGLES.EAGLRenderingAPI.OpenGLES3, gameWindow.EAGLContext.ShareGroup));
-#endif
-
-            windowInfo = gameWindow.WindowInfo;
-
-            // Doesn't seems to be working on Android
-#if XENKO_PLATFORM_ANDROID
-            graphicsContext = gameWindow.GraphicsContext;
-            gameWindow.Load += OnApplicationResumed;
-            gameWindow.Unload += OnApplicationPaused;
-            
-            Workaround_Context_Tegra2_Tegra3 = renderer == "NVIDIA Tegra 3" || renderer == "NVIDIA Tegra 2";
-
-            if (Workaround_Context_Tegra2_Tegra3)
-            {
-                // On Tegra2/Tegra3, we can't do any background context
-                // As a result, we reuse main graphics context even when loading.
-                // Of course, main graphics context need to be either available, or we register ourself for next ExecutePendingTasks().
-                deviceCreationContext = graphicsContext;
-                deviceCreationWindowInfo = windowInfo;
-
-                // We don't want context to be set or it might collide with our internal use to create async resources
-                // TODO: Reenabled, since the context seems to change otherwise. Do we need this in the first place, since we only want a single context?
-                //gameWindow.AutoSetContextOnRenderFrame = false;
-            }
-            else
-            {
-                if (deviceCreationContext != null)
-                {
-                    deviceCreationContext.Dispose();
-                    deviceCreationWindowInfo.Dispose();
-                }
-
-                // Create PBuffer
-                deviceCreationWindowInfo = new AndroidWindow(null);
-                ((AndroidWindow)deviceCreationWindowInfo).CreateSurface(graphicsContext.GraphicsMode.Index.Value);
-
-                deviceCreationContext = new OpenTK.Graphics.GraphicsContext(graphicsContext.GraphicsMode, deviceCreationWindowInfo, version / 100, (version % 100) / 10, creationFlags);
-            }
-
-            graphicsContextEglPtr = EglGetCurrentContext();
-#elif XENKO_PLATFORM_IOS
-            graphicsContext = gameWindow.GraphicsContext;
-            gameWindow.Load += OnApplicationResumed;
-            gameWindow.Unload += OnApplicationPaused;
-
-            var asyncContext = new OpenGLES.EAGLContext(IsOpenGLES2 ? OpenGLES.EAGLRenderingAPI.OpenGLES2 : OpenGLES.EAGLRenderingAPI.OpenGLES3, gameWindow.EAGLContext.ShareGroup);
-            OpenGLES.EAGLContext.SetCurrentContext(asyncContext);
-            deviceCreationContext = new OpenTK.Graphics.GraphicsContext(new OpenTK.ContextHandle(asyncContext.Handle), null, graphicsContext, version / 100, (version % 100) / 10, creationFlags);
-            deviceCreationWindowInfo = windowInfo;
-            gameWindow.MakeCurrent();
-#else
-#if XENKO_UI_SDL
-            // Because OpenTK really wants a Sdl2GraphicsContext and not a dummy one, we will create
-            // a new one using the dummy one and invalidate the dummy one.
-            graphicsContext = new OpenTK.Graphics.GraphicsContext(gameWindow.DummyGLContext.GraphicsMode, windowInfo, version / 100, (version % 100) / 10, creationFlags);
-            gameWindow.DummyGLContext.Dispose();
-#else
-            graphicsContext = gameWindow.Context;
-#endif
-            deviceCreationWindowInfo = windowInfo;
-            deviceCreationContext = new OpenTK.Graphics.GraphicsContext(graphicsContext.GraphicsMode, deviceCreationWindowInfo, version/100, (version%100)/10, creationFlags);
-#endif
-
-            // Restore main context
-            graphicsContext.MakeCurrent(windowInfo);
-
-            // Create default OpenGL State objects
-            DefaultSamplerState = SamplerState.New(this, new SamplerStateDescription(TextureFilter.MinPointMagMipLinear, TextureAddressMode.Wrap) { MaxAnisotropy = 1 }).DisposeBy(this);
-        }
-
-        private void InitializePostFeatures()
-        {
-            // Create and bind default VAO
-            if (HasVAO)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                if (!IsOpenGLES2)
-#endif
-                {
-                    GL.GenVertexArrays(1, out defaultVAO);
-                    GL.BindVertexArray(defaultVAO);
-                }
-            }
-
-            // Save current FBO aside
-            int boundFBO;
-            GL.GetInteger(GetPName.FramebufferBinding, out boundFBO);
-
-            // Create FBO that will be used for copy operations
-            CopyColorSourceFBO = GL.GenFramebuffer();
-            CopyDepthSourceFBO = GL.GenFramebuffer();
-
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, CopyDepthSourceFBO);
-            GL.ReadBuffer(ReadBufferMode.None);
-
-            // Restore FBO
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, boundFBO);
-
-#if !XENKO_PLATFORM_IOS
-            if (IsDebugMode && HasKhronosDebug)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                HasKhronosDebugKHR = false;
-                try
-                {
-                    // If properly implemented, we should use that one before ES 3.2 otherwise the other one without KHR prefix
-                    // Unfortunately, many ES implementations don't respect this so we just try both
-                    GL.Khr.DebugMessageCallback(debugCallbackInstanceKHR ?? (debugCallbackInstanceKHR = DebugCallback), IntPtr.Zero);
-                    HasKhronosDebugKHR = true;
-                }
-                catch (EntryPointNotFoundException)
-#endif
-                {
-                    GL.DebugMessageCallback(debugCallbackInstance ?? (debugCallbackInstance = DebugCallback), IntPtr.Zero);
-                }
-                GL.Enable((EnableCap)KhrDebug.DebugOutputSynchronous);
-                ProfileEnabled = true;
-
-                // Also do it on async creation context
-                deviceCreationContext.MakeCurrent(deviceCreationWindowInfo);
-#if XENKO_GRAPHICS_API_OPENGLES
-                if (HasKhronosDebugKHR)
-                {
-                    // If properly implemented, we should use that one before ES 3.2 otherwise the other one without KHR prefix
-                    // Unfortunately, many ES implementations don't respect this so we just try both
-                    GL.Khr.DebugMessageCallback(debugCallbackInstanceKHR, IntPtr.Zero);
-                }
-                else
-#endif
-                {
-                    GL.DebugMessageCallback(debugCallbackInstance, IntPtr.Zero);
-                }
-                GL.Enable((EnableCap)KhrDebug.DebugOutputSynchronous);
-                graphicsContext.MakeCurrent(windowInfo);
-            }
-#endif
-
-            // Create the main command list
-            InternalMainCommandList = CommandList.New(this);
-        }
-
-        private void AdjustDefaultPipelineStateDescription(ref PipelineStateDescription pipelineStateDescription)
-        {
-        }
-
-        private static void DebugCallback(DebugSource source, DebugType type, int id, DebugSeverity severity, int length, IntPtr message, IntPtr userparam)
-        {
-            if (severity == DebugSeverity.DebugSeverityHigh)
-            {
-                string msg = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(message);
-                Log.Error($"[GL] {source}; {type}; {id}; {severity}; {msg}");
-            }
-        }
-
-        protected void DestroyPlatformDevice()
-        {
-            // Hack: Reset the lock so that UseOpenGLCreationContext works (even if locked by previously called OnApplicationPaused, which might have been done in an unaccessible event thread)
-            // TODO: Does it work with Tegra3?
-            if (ApplicationPaused)
-            {
-                asyncCreationLockObject = new object();
-            }
-
-#if XENKO_PLATFORM_ANDROID || XENKO_PLATFORM_IOS
-            gameWindow.Load -= OnApplicationResumed;
-            gameWindow.Unload -= OnApplicationPaused;
-#endif
-        }
-
-        internal void OnDestroyed()
-        {
-            // Clear existing FBOs
-            lock (existingFBOs)
-            {
-                existingFBOs.Clear();
-                existingFBOs[new FBOKey(null, new FBOTexture[] { WindowProvidedRenderTexture }, 1)] = WindowProvidedFrameBuffer;
-            }
-
-            //// Clear bound states
-            //for (int i = 0; i < boundTextures.Length; ++i)
-            //boundTextures[i] = null;
-
-            //boundFrontFace = FrontFaceDirection.Ccw;
-
-            //boundVertexArrayObject = null;
-            //enabledVertexAttribArrays = 0;
-            //boundDepthStencilState = null;
-            //boundStencilReference = 0;
-            //boundBlendState = null;
-            //boundRasterizerState = null;
-            //boundDepthStencilBuffer = null;
-
-            //for (int i = 0; i < boundRenderTargets.Length; ++i)
-            //boundRenderTargets[i] = null;
-
-            //boundFBO = 0;
-            //boundFBOHeight = 0;
-            //boundProgram = 0;
-        }
-
-        internal void TagResource(GraphicsResourceLink resourceLink)
-        {
-            if (resourceLink.Resource is GraphicsResource resource)
-                resource.DiscardNextMap = true;
-        }
-
-        internal void InitDefaultRenderTarget(PresentationParameters presentationParameters)
-        {
-#if DEBUG
-            EnsureContextActive();
-#endif
-
-            // TODO: Provide unified ClientSize from GameWindow
-#if XENKO_PLATFORM_IOS
-            WindowProvidedFrameBuffer = gameWindow.Framebuffer;
-
-            // Scale for Retina display
-            var width = (int)(gameWindow.Size.Width * gameWindow.ContentScaleFactor);
-            var height = (int)(gameWindow.Size.Height * gameWindow.ContentScaleFactor);
-#else
-#if XENKO_GRAPHICS_API_OPENGLCORE
-            var width = gameWindow.ClientSize.Width;
-            var height = gameWindow.ClientSize.Height;
-#else
-            var width = gameWindow.Size.Width;
-            var height = gameWindow.Size.Height;
-#endif
-            WindowProvidedFrameBuffer = 0;
-#endif
-
-            // TODO OPENGL detect if created framebuffer is sRGB or not (note: improperly reported by FramebufferParameterName.FramebufferAttachmentColorEncoding)
-            isFramebufferSRGB = true;
-
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, WindowProvidedFrameBuffer);
-
-            // TODO: iOS (and possibly other platforms): get real render buffer ID for color/depth?
-            WindowProvidedRenderTexture = Texture.New2D(this, width, height, 1,
-                // TODO: As a workaround, because OpenTK(+OpenGLES) doesn't support to create SRgb backbuffer, we fake it by creating a non-SRgb here and CopyScaler2D is responsible to transform it to non SRgb
-                isFramebufferSRGB ? presentationParameters.BackBufferFormat : presentationParameters.BackBufferFormat.ToNonSRgb(), TextureFlags.RenderTarget | Texture.TextureFlagsCustomResourceId);
-            WindowProvidedRenderTexture.Reload = graphicsResource => { };
-
-            // Extract FBO render target
-            if (WindowProvidedFrameBuffer != 0)
-            {
-                int framebufferAttachmentType;
-                GL.GetFramebufferAttachmentParameter(FramebufferTarget.Framebuffer, FramebufferAttachment.ColorAttachment0, FramebufferParameterName.FramebufferAttachmentObjectType, out framebufferAttachmentType);
-                if (framebufferAttachmentType == (int)FramebufferAttachmentObjectType.Texture)
-                {
-                    int renderTargetTextureId;
-                    GL.GetFramebufferAttachmentParameter(FramebufferTarget.Framebuffer, FramebufferAttachment.ColorAttachment0, FramebufferParameterName.FramebufferAttachmentObjectName, out renderTargetTextureId);
-                    WindowProvidedRenderTexture.TextureId = renderTargetTextureId;
-                }
-            }
-
-            existingFBOs[new FBOKey(null, new FBOTexture[] { WindowProvidedRenderTexture }, 1)] = WindowProvidedFrameBuffer;
-        }
-
-        private class SwapChainBackend
-        {
-            /// <summary>
-            /// Default constructor to initialize fields that are not explicitly set to avoid warnings at compile time.
-            /// </summary>
-            internal SwapChainBackend()
-            {
-                PresentationParameters = null;
-                PresentCount = 0;
-            }
-
-            public PresentationParameters PresentationParameters;
-            public int PresentCount;
-        }
-
-        /// <summary>
-        /// Creates a swap chain from presentation parameters.
-        /// </summary>
-        /// <param name="presentationParameters">The presentation parameters.</param>
-        /// <returns></returns>
-        private SwapChainBackend CreateSwapChainBackend(PresentationParameters presentationParameters)
-        {
-            var swapChainBackend = new SwapChainBackend();
-            return swapChainBackend;
-        }
-
-        /// <summary>
-        /// Gets the default presentation parameters associated with this graphics device.
-        /// </summary>
-        public PresentationParameters PresentationParameters
-        {
-            get { throw new InvalidOperationException(FrameworkResources.NoDefaultRenterTarget); }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether this GraphicsDevice is in fullscreen.
-        /// </summary>
-        /// <value>
-        /// 	<c>true</c> if this GraphicsDevice is fullscreen; otherwise, <c>false</c>.
-        /// </value>
-        public bool IsFullScreen
-        {
-            get
-            {
-#if XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX
-                return gameWindow.WindowState == WindowState.Fullscreen;
-#else
-                throw new NotImplementedException();
-#endif
-            }
-
-            set
-            {
-#if XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX
-                if (value ^ (gameWindow.WindowState == WindowState.Fullscreen))
-                    gameWindow.WindowState = value ? WindowState.Fullscreen : WindowState.Normal;
-#else
-                throw new NotImplementedException();
-#endif
-            }
-        }
-
-#if XENKO_PLATFORM_ANDROID
-    // Execute pending asynchronous object creation
-    // (on android devices where we can't create background context such as Tegra2/Tegra3)
-        internal void ExecutePendingTasks()
-        {
-            // Unbind context
-            graphicsContext.MakeCurrent(null);
-
-            // Release and reacquire lock
-            Monitor.Wait(asyncCreationLockObject);
-
-            // Rebind context
-            graphicsContext.MakeCurrent(windowInfo);
-        }
-#endif
-
-        internal struct FBOTexture : IEquatable<FBOTexture>
-        {
-            public readonly Texture Texture;
-            public readonly short ArraySlice;
-            public readonly short MipLevel;
-
-            public FBOTexture(Texture texture, int arraySlice = 0, int mipLevel = 0)
-            {
-                Texture = texture;
-                ArraySlice = (short)arraySlice;
-                MipLevel = (short)mipLevel;
-            }
-
-            public static implicit operator FBOTexture(Texture texture)
-            {
-                int arraySlice = 0;
-                int mipLevel = 0;
-                if (texture != null)
-                {
-                    mipLevel = texture.MipLevel;
-                    arraySlice = texture.ArraySlice;
-                }
-
-                return new FBOTexture(texture, arraySlice, mipLevel);
-            }
-            
-            public bool Equals(FBOTexture other)
-            {
-                return Texture == other.Texture && ArraySlice == other.ArraySlice && MipLevel == other.MipLevel;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(null, obj)) return false;
-                return obj is FBOTexture && Equals((FBOTexture)obj);
-            }
-
-            public override int GetHashCode()
-            {
-                unchecked
-                {
-                    var hashCode = (Texture != null ? Texture.GetHashCode() : 0);
-                    hashCode = (hashCode * 397) ^ ArraySlice.GetHashCode();
-                    hashCode = (hashCode * 397) ^ MipLevel.GetHashCode();
-                    return hashCode;
-                }
-            }
-
-            public static bool operator ==(FBOTexture left, FBOTexture right)
-            {
-                return left.Equals(right);
-            }
-
-            public static bool operator !=(FBOTexture left, FBOTexture right)
-            {
-                return !left.Equals(right);
-            }
-        }
-
-        internal struct FBOKey : IEquatable<FBOKey>
-        {
-            public readonly FBOTexture DepthStencilBuffer;
-            public readonly FBOTexture[] RenderTargets;
-            public readonly int RenderTargetCount;
-
-            public FBOKey(FBOTexture depthStencilBuffer, FBOTexture[] renderTargets, int renderTargetCount)
-            {
-                DepthStencilBuffer = depthStencilBuffer;
-                RenderTargetCount = renderTargetCount;
-                RenderTargets = RenderTargetCount != 0 ? renderTargets : null;
-            }
-
-            public bool Equals(FBOKey obj2)
-            {
-                if (obj2.DepthStencilBuffer != DepthStencilBuffer) return false;
-
-                // Should have same number of render targets
-                if (RenderTargetCount != obj2.RenderTargetCount)
-                    return false;
-
-                // Since both object have same LastRenderTarget, array is valid at least until this spot.
-                for (int i = 0; i < RenderTargetCount; ++i)
-                    if (obj2.RenderTargets[i] != RenderTargets[i])
-                        return false;
-
-                return true;
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (!(obj is FBOKey)) return false;
-
-                var obj2 = (FBOKey)obj;
-
-                return Equals(obj2);
-            }
-
-            public override int GetHashCode()
-            {
-                var result = DepthStencilBuffer != null ? DepthStencilBuffer.GetHashCode() : 0;
-                if (RenderTargets != null)
-                {
-                    for (int index = 0; index < RenderTargetCount; index++)
-                    {
-                        var renderTarget = RenderTargets[index];
-                        result ^= renderTarget != null ? renderTarget.GetHashCode() : 0;
-                    }
-                }
-                return result;
-            }
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsDeviceFeatures.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsDeviceFeatures.OpenGL.cs
deleted file mode 100644
index 67f65fec73..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsDeviceFeatures.OpenGL.cs
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-// Copyright (c) 2010-2012 SharpDX - Alexandre Mutel
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-using System;
-using System.Collections.Generic;
-using Xenko.Graphics.OpenGL;
-using Xenko.Core.Diagnostics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Features supported by a <see cref="GraphicsDevice"/>.
-    /// </summary>
-    /// <remarks>
-    /// This class gives also features for a particular format, using the operator this[dxgiFormat] on this structure.
-    /// </remarks>
-    public partial struct GraphicsDeviceFeatures
-    {
-        private const GetPName GL_MAX_SAMPLES = (GetPName)36183;    // We define this constant here because it is not contained within OpenTK...
-    
-        private static Logger logger = GlobalLogger.GetLogger(nameof(GraphicsDeviceFeatures));
-
-        private void EnumerateMSAASupportPerFormat(GraphicsDevice deviceRoot)
-        {
-            // Query OpenGL for the highest supported multisample count:
-            int globalMaxMSAASamples;
-            GL.GetInteger(GL_MAX_SAMPLES, out globalMaxMSAASamples);
-
-            // Now select the highest engine-supported multisample mode:    // TODO: Adjust comment.
-            MultisampleCount actualMultisampleCount = MultisampleCount.None;
-
-            // Technically we could just cast "globalMaxMSAASamples" to "actualMultisampleCount",
-            // but AFAIK nothing prevents an implementation from exposing things like 6x MSAA or some other uncommon mode.
-            if (globalMaxMSAASamples >= 8)
-            {
-                // If the maximum supported MSAA mode by the OpenGL implementation is higher than the maximum supported by the engine (8xMSAA), we clamp it.
-                actualMultisampleCount = MultisampleCount.X8;
-            }
-            else if (globalMaxMSAASamples >= 4)
-            {
-                // If the maximum supported MSAA mode by the OpenGL implementation is between 4 and 7 samples, we fall back to the next lowest engine-supported one (4x).
-                actualMultisampleCount = MultisampleCount.X4; // 4-7 x MSAA => 4 x MSAA (next lowest)
-            }
-            else if (globalMaxMSAASamples == 2)
-            {
-                // If the maximum supported MSAA mode by the OpenGL implementation is between 2 and 3 samples, we fall back to the next lowest engine-supported one (2x).
-                actualMultisampleCount = MultisampleCount.X2;
-            }
-
-            if (GraphicsDevice.Platform == GraphicsPlatform.OpenGLES
-#if XENKO_GRAPHICS_API_OPENGLES
-                && deviceRoot.IsOpenGLES2   // No MSAA support on OpenGL ES 2.
-#endif
-                )
-            {
-                actualMultisampleCount = MultisampleCount.None;
-                logger.Error("Multisampling is not supported on OpenGL ES 2.");
-            }
-
-            for (int i = 0; i < mapFeaturesPerFormat.Length; i++)
-            {
-                // TODO: This ignores the supported multisample capabilities of each render target format. But I don't know how to query this in OpenGL (assuming it's even possible at all).
-                mapFeaturesPerFormat[i] = new FeaturesPerFormat((PixelFormat)i, actualMultisampleCount, FormatSupport.None);
-            }
-        }
-
-        internal GraphicsDeviceFeatures(GraphicsDevice deviceRoot)
-        {
-            mapFeaturesPerFormat = new FeaturesPerFormat[256];
-
-            HasSRgb = true;
-
-            using (deviceRoot.UseOpenGLCreationContext())
-            {
-                Vendor = GL.GetString(StringName.Vendor);
-                Renderer = GL.GetString(StringName.Renderer);
-#if XENKO_GRAPHICS_API_OPENGLES
-                SupportedExtensions = GL.GetString(StringName.Extensions).Split(' ');
-#else
-                int numExtensions;
-                GL.GetInteger(GetPName.NumExtensions, out numExtensions);
-                SupportedExtensions = new string[numExtensions];
-                for (int extensionIndex = 0; extensionIndex < numExtensions; ++extensionIndex)
-                {
-                    SupportedExtensions[extensionIndex] = GL.GetString(StringNameIndexed.Extensions, extensionIndex);
-                }
-#endif
-            }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            var isOpenGLES3 = deviceRoot.currentVersion >= 300;
-
-            deviceRoot.HasDepth24 = isOpenGLES3 || SupportedExtensions.Contains("GL_OES_depth24");
-            deviceRoot.HasPackedDepthStencilExtension = isOpenGLES3 || SupportedExtensions.Contains("GL_OES_packed_depth_stencil");
-            deviceRoot.HasExtTextureFormatBGRA8888 = SupportedExtensions.Contains("GL_EXT_texture_format_BGRA8888")
-                                       || SupportedExtensions.Contains("GL_APPLE_texture_format_BGRA8888");
-            deviceRoot.HasTextureFloat = isOpenGLES3 || SupportedExtensions.Contains("GL_OES_texture_float");
-            deviceRoot.HasTextureHalf = isOpenGLES3 || SupportedExtensions.Contains("GL_OES_texture_half_float");
-            deviceRoot.HasRenderTargetFloat = isOpenGLES3 || SupportedExtensions.Contains("GL_EXT_color_buffer_float");
-            deviceRoot.HasRenderTargetHalf = isOpenGLES3 || SupportedExtensions.Contains("GL_EXT_color_buffer_half_float");
-            deviceRoot.HasVAO = isOpenGLES3 || SupportedExtensions.Contains("GL_OES_vertex_array_object");
-            deviceRoot.HasTextureRG = isOpenGLES3 || SupportedExtensions.Contains("GL_EXT_texture_rg");
-            deviceRoot.HasKhronosDebug = deviceRoot.currentVersion >= 320 || SupportedExtensions.Contains("GL_KHR_debug");
-            deviceRoot.HasTimerQueries = SupportedExtensions.Contains("GL_EXT_disjoint_timer_query");
-
-            // Either 3.2+, or 3.1+ with GL_EXT_texture_buffer
-            // TODO: For now we don't have proper ES3 bindings on Android (and possibly iOS)
-            deviceRoot.HasTextureBuffers = false;
-            //deviceRoot.HasTextureBuffers = (deviceRoot.version >= 320)
-            //                            || (deviceRoot.version >= 310 && SupportedExtensions.Contains("GL_EXT_texture_buffer"));
-
-            HasSRgb = isOpenGLES3 || SupportedExtensions.Contains("GL_EXT_sRGB");
-
-            // Compute shaders available in OpenGL ES 3.1
-            HasComputeShaders = isOpenGLES3 && deviceRoot.currentVersion >= 1;
-            HasDoublePrecision = false;
-
-            HasDepthAsSRV = isOpenGLES3;
-            HasDepthAsReadOnlyRT = isOpenGLES3;
-            HasMultisampleDepthAsSRV = isOpenGLES3;
-
-            deviceRoot.HasDepthClamp = SupportedExtensions.Contains("GL_ARB_depth_clamp");
-  
-            // TODO: from 3.1: draw indirect, separate shader object
-            // TODO: check tessellation & geometry shaders: GL_ANDROID_extension_pack_es31a
-#else
-            deviceRoot.HasVAO = true;
-
-            deviceRoot.HasDXT = SupportedExtensions.Contains("GL_EXT_texture_compression_s3tc");
-            deviceRoot.HasTextureBuffers = true;
-            deviceRoot.HasKhronosDebug = deviceRoot.currentVersion >= 430 || SupportedExtensions.Contains("GL_KHR_debug");
-            deviceRoot.HasTimerQueries = deviceRoot.version >= 320;
-
-            // Compute shaders available in OpenGL 4.3
-            HasComputeShaders = deviceRoot.version >= 430;
-            HasDoublePrecision = SupportedExtensions.Contains("GL_ARB_vertex_attrib_64bit");
-
-            HasDepthAsSRV = deviceRoot.version >= 300;
-            HasDepthAsReadOnlyRT = deviceRoot.version >= 300;
-            HasMultisampleDepthAsSRV = deviceRoot.version >= 300;
-
-            deviceRoot.HasDepthClamp = deviceRoot.version >= 300;
-
-            // TODO: from 4.0: tessellation, draw indirect
-            // TODO: from 4.1: separate shader object
-#endif
-
-            deviceRoot.HasAnisotropicFiltering = SupportedExtensions.Contains("GL_EXT_texture_filter_anisotropic");
-
-            HasResourceRenaming = true;
-
-            HasDriverCommandLists = false;
-            HasMultiThreadingConcurrentResources = false;
-
-            // Find shader model based on OpenGL version (might need to check extensions more carefully)
-            RequestedProfile = deviceRoot.requestedGraphicsProfile;
-            CurrentProfile = OpenGLUtils.GetFeatureLevel(deviceRoot.currentVersion);
-
-            EnumerateMSAASupportPerFormat(deviceRoot);
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsOutput.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsOutput.OpenGL.cs
deleted file mode 100644
index 7e3160e68c..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsOutput.OpenGL.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-
-using System;
-
-namespace Xenko.Graphics
-{
-    public partial class GraphicsOutput
-    {
-        public DisplayMode FindClosestMatchingDisplayMode(GraphicsProfile[] targetProfiles, DisplayMode mode)
-        {
-            return mode;
-        }
-
-        public IntPtr MonitorHandle
-        {
-            get { return IntPtr.Zero; }
-        }
-
-        private void InitializeSupportedDisplayModes()
-        {
-        }
-
-        private void InitializeCurrentDisplayMode()
-        {
-            currentDisplayMode = null;
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsResource.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsResource.OpenGL.cs
deleted file mode 100644
index b16b56b6f6..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsResource.OpenGL.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_OPENGL 
-
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using PixelFormatGl = OpenTK.Graphics.ES30.PixelFormat;
-using PixelInternalFormat = OpenTK.Graphics.ES30.TextureComponentCount;
-#else
-using OpenTK.Graphics.OpenGL;
-using PixelFormatGl = OpenTK.Graphics.OpenGL.PixelFormat;
-#endif
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// GraphicsResource class
-    /// </summary>
-    public partial class GraphicsResource
-    {
-        internal bool DiscardNextMap; // Used to internally force a WriteDiscard (to force a rename) with the GraphicsResourceAllocator
-
-        // Shaader resource view (Texture or Texture Buffer)
-        internal int TextureId;
-        internal TextureTarget TextureTarget;
-        internal PixelInternalFormat TextureInternalFormat;
-        internal PixelFormatGl TextureFormat;
-        internal PixelType TextureType;
-        internal int TexturePixelSize;
-    }
-}
- 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/GraphicsResourceBase.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/GraphicsResourceBase.OpenGL.cs
deleted file mode 100644
index 10be554208..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/GraphicsResourceBase.OpenGL.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// GraphicsResource class
-    /// </summary>
-    public partial class GraphicsResourceBase
-    {
-        private void Initialize()
-        {
-        }
-        
-        /// <summary>
-        /// Called when graphics device has been detected to be internally destroyed.
-        /// </summary>
-        /// <inheritdoc/>
-        protected internal virtual void OnDestroyed()
-        {
-        }
-
-        /// <summary>
-        /// Called when graphics device has been recreated.
-        /// </summary>
-        /// <returns>True if item transitioned to a <see cref="GraphicsResourceLifetimeState.Active"/> state.</returns>
-        protected internal virtual bool OnRecreate()
-        {
-            return false;
-        }
-    }
-}
- 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/OpenGLConvertExtensions.cs b/sources/engine/Xenko.Graphics/OpenGL/OpenGLConvertExtensions.cs
deleted file mode 100644
index b5f7b414b9..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/OpenGLConvertExtensions.cs
+++ /dev/null
@@ -1,728 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-using System;
-using OpenTK.Graphics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using ES30 = OpenTK.Graphics.ES30;
-using PixelFormatGl = OpenTK.Graphics.ES30.PixelFormat;
-using PixelInternalFormat = OpenTK.Graphics.ES30.TextureComponentCount;
-using PrimitiveTypeGl = OpenTK.Graphics.ES30.PrimitiveType;
-#else
-using OpenTK.Graphics.OpenGL;
-using PixelFormatGl = OpenTK.Graphics.OpenGL.PixelFormat;
-using PrimitiveTypeGl = OpenTK.Graphics.OpenGL.PrimitiveType;
-#endif
-
-namespace Xenko.Graphics
-{
-    internal static class OpenGLConvertExtensions
-    {
-        public static ErrorCode GetErrorCode()
-        {
-            return GL.GetError();
-        }
-
-        public static unsafe Color4 ToOpenGL(Core.Mathematics.Color4 color)
-        {
-            return *(Color4*)&color;
-        }
-
-        public static PrimitiveTypeGl ToOpenGL(this PrimitiveType primitiveType)
-        {
-            switch (primitiveType)
-            {
-                case PrimitiveType.PointList:
-                    return PrimitiveTypeGl.Points;
-                case PrimitiveType.LineList:
-                    return PrimitiveTypeGl.Lines;
-                case PrimitiveType.LineStrip:
-                    return PrimitiveTypeGl.LineStrip;
-                case PrimitiveType.TriangleList:
-                    return PrimitiveTypeGl.Triangles;
-                case PrimitiveType.TriangleStrip:
-                    return PrimitiveTypeGl.TriangleStrip;
-                default:
-                    // Undefined
-                    return PrimitiveTypeGl.Triangles;
-            }
-        }
-
-        public static BufferAccessMask ToOpenGLMask(this MapMode mapMode)
-        {
-            switch (mapMode)
-            {
-                case MapMode.Read:
-                    return BufferAccessMask.MapReadBit;
-                case MapMode.Write:
-                    return BufferAccessMask.MapWriteBit;
-                case MapMode.ReadWrite:
-                    return BufferAccessMask.MapReadBit | BufferAccessMask.MapWriteBit;
-                case MapMode.WriteDiscard:
-                    return BufferAccessMask.MapWriteBit | BufferAccessMask.MapInvalidateBufferBit;
-                case MapMode.WriteNoOverwrite:
-                    return BufferAccessMask.MapWriteBit | BufferAccessMask.MapUnsynchronizedBit;
-                default:
-                    throw new ArgumentOutOfRangeException("mapMode");
-            }
-        }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-        public static ES30.PrimitiveType ToOpenGLES(this PrimitiveType primitiveType)
-        {
-            switch (primitiveType)
-            {
-                case PrimitiveType.PointList:
-                    return ES30.PrimitiveType.Points;
-                case PrimitiveType.LineList:
-                    return ES30.PrimitiveType.Lines;
-                case PrimitiveType.LineStrip:
-                    return ES30.PrimitiveType.LineStrip;
-                case PrimitiveType.TriangleList:
-                    return ES30.PrimitiveType.Triangles;
-                case PrimitiveType.TriangleStrip:
-                    return ES30.PrimitiveType.TriangleStrip;
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-#else
-        public static BufferAccess ToOpenGL(this MapMode mapMode)
-        {
-            switch (mapMode)
-            {
-                case MapMode.Read:
-                    return BufferAccess.ReadOnly;
-                case MapMode.Write:
-                case MapMode.WriteDiscard:
-                case MapMode.WriteNoOverwrite:
-                    return BufferAccess.WriteOnly;
-                case MapMode.ReadWrite:
-                    return BufferAccess.ReadWrite;
-                default:
-                    throw new ArgumentOutOfRangeException("mapMode");
-            }
-        }
-#endif
-
-        public static TextureWrapMode ToOpenGL(this TextureAddressMode addressMode)
-        {
-            switch (addressMode)
-            {
-                case TextureAddressMode.Border:
-#if !XENKO_GRAPHICS_API_OPENGLES
-                    return TextureWrapMode.ClampToBorder;
-#endif
-                case TextureAddressMode.Clamp:
-                    return TextureWrapMode.ClampToEdge;
-                case TextureAddressMode.Mirror:
-#if XENKO_GRAPHICS_API_OPENGLES
-                    return (TextureWrapMode)EsVersion20.MirroredRepeat;
-#else
-                    return TextureWrapMode.MirroredRepeat;
-#endif
-                case TextureAddressMode.Wrap:
-                    return TextureWrapMode.Repeat;
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        public static DepthFunction ToOpenGLDepthFunction(this CompareFunction function)
-        {
-            switch (function)
-            {
-                case CompareFunction.Always:
-                    return DepthFunction.Always;
-                case CompareFunction.Equal:
-                    return DepthFunction.Equal;
-                case CompareFunction.GreaterEqual:
-                    return DepthFunction.Gequal;
-                case CompareFunction.Greater:
-                    return DepthFunction.Greater;
-                case CompareFunction.LessEqual:
-                    return DepthFunction.Lequal;
-                case CompareFunction.Less:
-                    return DepthFunction.Less;
-                case CompareFunction.Never:
-                    return DepthFunction.Never;
-                case CompareFunction.NotEqual:
-                    return DepthFunction.Notequal;
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        public static StencilFunction ToOpenGLStencilFunction(this CompareFunction function)
-        {
-            switch (function)
-            {
-                case CompareFunction.Always:
-                    return StencilFunction.Always;
-                case CompareFunction.Equal:
-                    return StencilFunction.Equal;
-                case CompareFunction.GreaterEqual:
-                    return StencilFunction.Gequal;
-                case CompareFunction.Greater:
-                    return StencilFunction.Greater;
-                case CompareFunction.LessEqual:
-                    return StencilFunction.Lequal;
-                case CompareFunction.Less:
-                    return StencilFunction.Less;
-                case CompareFunction.Never:
-                    return StencilFunction.Never;
-                case CompareFunction.NotEqual:
-                    return StencilFunction.Notequal;
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        public static StencilOp ToOpenGL(this StencilOperation operation)
-        {
-            switch (operation)
-            {
-                case StencilOperation.Keep:
-                    return StencilOp.Keep;
-                case StencilOperation.Zero:
-                    return StencilOp.Zero;
-                case StencilOperation.Replace:
-                    return StencilOp.Replace;
-                case StencilOperation.IncrementSaturation:
-                    return StencilOp.Incr;
-                case StencilOperation.DecrementSaturation:
-                    return StencilOp.Decr;
-                case StencilOperation.Invert:
-                    return StencilOp.Invert;
-                case StencilOperation.Increment:
-                    return StencilOp.IncrWrap;
-                case StencilOperation.Decrement:
-                    return StencilOp.DecrWrap;
-                default:
-                    throw new ArgumentOutOfRangeException("operation");
-            }
-        }
-
-        public static void ConvertPixelFormat(GraphicsDevice graphicsDevice, ref PixelFormat inputFormat, out PixelInternalFormat internalFormat, out PixelFormatGl format, out PixelType type,
-            out int pixelSize, out bool compressed)
-        {
-            compressed = false;
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            // check formats more carefully if the device is initialized with OpenGL ES 2
-            if (graphicsDevice.currentVersion < 300)
-            {
-                switch (inputFormat)
-                {
-                    case PixelFormat.R16_Float:
-                    case PixelFormat.R16G16_Float:
-                        if (!graphicsDevice.HasTextureRG || !graphicsDevice.HasTextureHalf)
-                            goto unsupported;
-                        break;
-                    case PixelFormat.R16G16B16A16_Float:
-                        if (!graphicsDevice.HasTextureHalf)
-                            goto unsupported;
-                        break;
-                    case PixelFormat.R16_UInt:
-                    case PixelFormat.R16_SInt:
-                    case PixelFormat.R16G16_UInt:
-                    case PixelFormat.R16G16_SInt:
-                    case PixelFormat.R16G16B16A16_UInt:
-                    case PixelFormat.R16G16B16A16_SInt:
-                        goto unsupported;
-                    case PixelFormat.R32_Float:
-                    case PixelFormat.R32G32_Float:
-                    case PixelFormat.R32G32B32_Float:
-                        if (!graphicsDevice.HasTextureRG || !graphicsDevice.HasTextureFloat)
-                            goto unsupported;
-                        break;
-                    case PixelFormat.R32G32B32A32_Float:
-                        if (!graphicsDevice.HasTextureFloat)
-                            goto unsupported;
-                        break;
-                    case PixelFormat.R32_UInt:
-                    case PixelFormat.R32_SInt:
-                    case PixelFormat.R32G32_UInt:
-                    case PixelFormat.R32G32_SInt:
-                    case PixelFormat.R32G32B32_UInt:
-                    case PixelFormat.R32G32B32_SInt:
-                    case PixelFormat.R32G32B32A32_UInt:
-                    case PixelFormat.R32G32B32A32_SInt:
-                        goto unsupported;
-                    case PixelFormat.D32_Float:
-                        goto unsupported;
-                    unsupported:
-                        throw new NotSupportedException($"Texture format {inputFormat} not supported with OpenGL ES 2.0");
-
-                    // NOTE: We always allow PixelFormat.D24_UNorm_S8_UInt.
-                    // If it is not supported we will fall back to separate D24/D16 and S8 resources when creating a texture.
-                }
-            }
-#endif
-
-            // If the Device doesn't support SRGB, we remap automatically the format to non-srgb
-            if (!graphicsDevice.Features.HasSRgb)
-            {
-                switch (inputFormat)
-                {
-                    case PixelFormat.PVRTC_2bpp_RGB_SRgb:
-                        inputFormat = PixelFormat.PVRTC_2bpp_RGB;
-                        break;
-                    case PixelFormat.PVRTC_2bpp_RGBA_SRgb:
-                        inputFormat = PixelFormat.PVRTC_2bpp_RGBA;
-                        break;
-                    case PixelFormat.PVRTC_4bpp_RGB_SRgb:
-                        inputFormat = PixelFormat.PVRTC_4bpp_RGB;
-                        break;
-                    case PixelFormat.PVRTC_4bpp_RGBA_SRgb:
-                        inputFormat = PixelFormat.PVRTC_4bpp_RGBA;
-                        break;
-                    case PixelFormat.ETC2_RGB_SRgb:
-                        inputFormat = PixelFormat.ETC2_RGB;
-                        break;
-                    case PixelFormat.ETC2_RGBA_SRgb:
-                        inputFormat = PixelFormat.ETC2_RGBA;
-                        break;
-                    case PixelFormat.R8G8B8A8_UNorm_SRgb:
-                        inputFormat = PixelFormat.R8G8B8A8_UNorm;
-                        break;
-                    case PixelFormat.B8G8R8A8_UNorm_SRgb:
-                        inputFormat = PixelFormat.B8G8R8A8_UNorm;
-                        break;
-                }
-            }
-
-            switch (inputFormat)
-            {
-                case PixelFormat.A8_UNorm:
-                    internalFormat = PixelInternalFormat.Alpha;
-                    format = PixelFormatGl.Alpha;
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 1;
-                    break;
-                case PixelFormat.R8_UNorm:
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (!graphicsDevice.HasTextureRG && graphicsDevice.currentVersion < 300)
-                    {
-                        internalFormat = PixelInternalFormat.Luminance;
-                        format = PixelFormatGl.Luminance;
-                    }
-                    else
-#endif
-                    {
-                        internalFormat = PixelInternalFormat.R8;
-                        format = PixelFormatGl.Red;
-                    }
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 1;
-                    break;
-                case PixelFormat.R8G8B8A8_UNorm:
-                    internalFormat = PixelInternalFormat.Rgba;
-                    format = PixelFormatGl.Rgba;
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.B8G8R8A8_UNorm:
-#if XENKO_GRAPHICS_API_OPENGLES
-                    if (!graphicsDevice.HasExtTextureFormatBGRA8888)
-                        throw new NotSupportedException();
-
-                    // It seems iOS and Android expects different things
-#if XENKO_PLATFORM_IOS
-                    internalFormat = PixelInternalFormat.Rgba;
-#else
-                    internalFormat = (PixelInternalFormat)ExtTextureFormatBgra8888.BgraExt;
-#endif
-                    format = (PixelFormatGl)ExtTextureFormatBgra8888.BgraExt;
-#else
-                    internalFormat = PixelInternalFormat.Rgba;
-                    format = PixelFormatGl.Bgra;
-#endif
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R8G8B8A8_UNorm_SRgb:
-                    internalFormat = PixelInternalFormat.Srgb8Alpha8;
-                    format = PixelFormatGl.Rgba;
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 4;
-                    break;
-#if XENKO_GRAPHICS_API_OPENGLCORE
-                case PixelFormat.B8G8R8A8_UNorm_SRgb:
-                    // TODO: Check on iOS/Android and OpenGL 3
-                    internalFormat = PixelInternalFormat.Srgb8Alpha8;
-                    format = PixelFormatGl.Bgra;
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.BC1_UNorm:
-                    if (!graphicsDevice.HasDXT)
-                        throw new NotSupportedException();
-                    internalFormat = PixelInternalFormat.CompressedRgbaS3tcDxt1Ext;
-                    format = (PixelFormatGl)PixelInternalFormat.CompressedRgbaS3tcDxt1Ext;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    compressed = true;
-                    break;
-                case PixelFormat.BC1_UNorm_SRgb:
-                    if (!graphicsDevice.HasDXT)
-                        throw new NotSupportedException();
-                    internalFormat = PixelInternalFormat.CompressedSrgbAlphaS3tcDxt1Ext;
-                    format = (PixelFormatGl)PixelInternalFormat.CompressedSrgbAlphaS3tcDxt1Ext;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    compressed = true;
-                    break;
-                case PixelFormat.BC2_UNorm:
-                    if (!graphicsDevice.HasDXT)
-                        throw new NotSupportedException();
-                    internalFormat = PixelInternalFormat.CompressedRgbaS3tcDxt3Ext;
-                    format = (PixelFormatGl)PixelInternalFormat.CompressedRgbaS3tcDxt3Ext;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    compressed = true;
-                    break;
-                case PixelFormat.BC2_UNorm_SRgb:
-                    if (!graphicsDevice.HasDXT)
-                        throw new NotSupportedException();
-                    internalFormat = PixelInternalFormat.CompressedSrgbAlphaS3tcDxt3Ext;
-                    format = (PixelFormatGl)PixelInternalFormat.CompressedSrgbAlphaS3tcDxt3Ext;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    compressed = true;
-                    break;
-                case PixelFormat.BC3_UNorm:
-                    if (!graphicsDevice.HasDXT)
-                        throw new NotSupportedException();
-                    internalFormat = PixelInternalFormat.CompressedRgbaS3tcDxt5Ext;
-                    format = (PixelFormatGl)PixelInternalFormat.CompressedRgbaS3tcDxt5Ext;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    compressed = true;
-                    break;
-                case PixelFormat.BC3_UNorm_SRgb:
-                    if (!graphicsDevice.HasDXT)
-                        throw new NotSupportedException();
-                    internalFormat = PixelInternalFormat.CompressedSrgbAlphaS3tcDxt5Ext;
-                    format = (PixelFormatGl)PixelInternalFormat.CompressedSrgbAlphaS3tcDxt5Ext;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    compressed = true;
-                    break;
-#endif
-                case PixelFormat.R16_SInt:
-                    internalFormat = PixelInternalFormat.R16i;
-                    format = PixelFormatGl.RedInteger;
-                    type = PixelType.Short;
-                    pixelSize = 2;
-                    break;
-                case PixelFormat.R16_UInt:
-                    internalFormat = PixelInternalFormat.R16ui;
-                    format = PixelFormatGl.RedInteger;
-                    type = PixelType.UnsignedShort;
-                    pixelSize = 2;
-                    break;
-                case PixelFormat.R16_Float:
-                    internalFormat = PixelInternalFormat.R16f;
-                    format = PixelFormatGl.Red;
-                    type = PixelType.HalfFloat;
-                    pixelSize = 2;
-                    break;
-                case PixelFormat.R16G16_SInt:
-                    internalFormat = PixelInternalFormat.Rg16i;
-                    format = PixelFormatGl.RgInteger;
-                    type = PixelType.Short;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R16G16_UInt:
-                    internalFormat = PixelInternalFormat.Rg16ui;
-                    format = PixelFormatGl.RgInteger;
-                    type = PixelType.UnsignedShort;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R16G16_Float:
-                    internalFormat = PixelInternalFormat.Rg16f;
-                    format = PixelFormatGl.Rg;
-                    type = PixelType.HalfFloat;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R16G16B16A16_SInt:
-                    internalFormat = PixelInternalFormat.Rgba16i;
-                    format = PixelFormatGl.RgbaInteger;
-                    type = PixelType.Short;
-                    pixelSize = 8;
-                    break;
-                case PixelFormat.R16G16B16A16_UInt:
-                    internalFormat = PixelInternalFormat.Rgba16ui;
-                    format = PixelFormatGl.RgbaInteger;
-                    type = PixelType.UnsignedShort;
-                    pixelSize = 8;
-                    break;
-                case PixelFormat.R16G16B16A16_Float:
-                    internalFormat = PixelInternalFormat.Rgba16f;
-                    format = PixelFormatGl.Rgba;
-                    type = PixelType.HalfFloat;
-                    pixelSize = 8;
-                    break;
-                case PixelFormat.R10G10B10A2_UNorm:
-                    internalFormat = PixelInternalFormat.Rgb10A2;
-                    format = PixelFormatGl.Rgba;
-                    type = PixelType.UnsignedInt1010102;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R11G11B10_Float:
-                    internalFormat = PixelInternalFormat.R11fG11fB10f;
-                    format = PixelFormatGl.Rgb;
-                    type = PixelType.HalfFloat;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R32_SInt:
-                    internalFormat = PixelInternalFormat.R32i;
-                    format = PixelFormatGl.RedInteger;
-                    type = PixelType.Int;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R32_UInt:
-                    internalFormat = PixelInternalFormat.R32ui;
-                    format = PixelFormatGl.RedInteger;
-                    type = PixelType.UnsignedInt;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R32_Float:
-                    internalFormat = PixelInternalFormat.R32f;
-                    format = PixelFormatGl.Red;
-                    type = PixelType.Float;
-                    pixelSize = 4;
-                    break;
-                case PixelFormat.R32G32_SInt:
-                    internalFormat = PixelInternalFormat.Rg32i;
-                    format = PixelFormatGl.RgInteger;
-                    type = PixelType.Int;
-                    pixelSize = 8;
-                    break;
-                case PixelFormat.R32G32_UInt:
-                    internalFormat = PixelInternalFormat.Rg32ui;
-                    format = PixelFormatGl.RgInteger;
-                    type = PixelType.UnsignedInt;
-                    pixelSize = 8;
-                    break;
-                case PixelFormat.R32G32_Float:
-                    internalFormat = PixelInternalFormat.Rg32f;
-                    format = PixelFormatGl.Rg;
-                    type = PixelType.Float;
-                    pixelSize = 8;
-                    break;
-                case PixelFormat.R32G32B32_SInt:
-                    internalFormat = PixelInternalFormat.Rgb32i;
-                    format = PixelFormatGl.RgbInteger;
-                    type = PixelType.Int;
-                    pixelSize = 12;
-                    break;
-                case PixelFormat.R32G32B32_UInt:
-                    internalFormat = PixelInternalFormat.Rgb32ui;
-                    format = PixelFormatGl.RgbInteger;
-                    type = PixelType.UnsignedInt;
-                    pixelSize = 12;
-                    break;
-                case PixelFormat.R32G32B32_Float:
-                    internalFormat = PixelInternalFormat.Rgb32f;
-                    format = PixelFormatGl.Rgb;
-                    type = PixelType.Float;
-                    pixelSize = 12;
-                    break;
-                case PixelFormat.R32G32B32A32_SInt:
-                    internalFormat = PixelInternalFormat.Rgba32i;
-                    format = PixelFormatGl.RgbaInteger;
-                    type = PixelType.Int;
-                    pixelSize = 16;
-                    break;
-                case PixelFormat.R32G32B32A32_UInt:
-                    internalFormat = PixelInternalFormat.Rgba32ui;
-                    format = PixelFormatGl.RgbaInteger;
-                    type = PixelType.UnsignedInt;
-                    pixelSize = 16;
-                    break;
-                case PixelFormat.R32G32B32A32_Float:
-                    internalFormat = PixelInternalFormat.Rgba32f;
-                    format = PixelFormatGl.Rgba;
-                    type = PixelType.Float;
-                    pixelSize = 16;
-                    break;
-                case PixelFormat.D16_UNorm:
-                    internalFormat = PixelInternalFormat.DepthComponent16;
-                    format = PixelFormatGl.DepthComponent;
-                    type = PixelType.UnsignedShort;
-                    pixelSize = 2;
-                    break;
-                case PixelFormat.D24_UNorm_S8_UInt:
-                    internalFormat = PixelInternalFormat.Depth24Stencil8;
-                    format = PixelFormatGl.DepthStencil;
-                    type = PixelType.UnsignedInt248;
-                    pixelSize = 4;
-                    break;
-                // TODO: Temporary depth format (need to decide relation between RenderTarget1D and Texture)
-                case PixelFormat.D32_Float:
-                    internalFormat = PixelInternalFormat.DepthComponent32f;
-                    format = PixelFormatGl.DepthComponent;
-                    type = PixelType.Float;
-                    pixelSize = 4;
-                    break;
-#if XENKO_PLATFORM_IOS
-                case PixelFormat.PVRTC_4bpp_RGB:
-                    internalFormat = (PixelInternalFormat)ImgTextureCompressionPvrtc.CompressedRgbPvrtc4Bppv1Img;
-                    format = (PixelFormatGl)ImgTextureCompressionPvrtc.CompressedRgbPvrtc4Bppv1Img;
-                    compressed = true;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_2bpp_RGB:
-                    internalFormat = (PixelInternalFormat)ImgTextureCompressionPvrtc.CompressedRgbPvrtc2Bppv1Img;
-                    format = (PixelFormatGl)ImgTextureCompressionPvrtc.CompressedRgbPvrtc2Bppv1Img;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_4bpp_RGBA:
-                    internalFormat = (PixelInternalFormat)ImgTextureCompressionPvrtc.CompressedRgbaPvrtc4Bppv1Img;
-                    format = (PixelFormatGl)ImgTextureCompressionPvrtc.CompressedRgbaPvrtc4Bppv1Img;
-                    compressed = true;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_2bpp_RGBA:
-                    internalFormat = (PixelInternalFormat)ImgTextureCompressionPvrtc.CompressedRgbaPvrtc2Bppv1Img;
-                    format = (PixelFormatGl)ImgTextureCompressionPvrtc.CompressedRgbaPvrtc2Bppv1Img;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_4bpp_RGB_SRgb:
-                    internalFormat = (PixelInternalFormat)ExtPvrtcSrgb.CompressedSrgbPvrtc4Bppv1Ext;
-                    format = (PixelFormatGl)ExtPvrtcSrgb.CompressedSrgbPvrtc4Bppv1Ext;
-                    compressed = true;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_2bpp_RGB_SRgb:
-                    internalFormat = (PixelInternalFormat)ExtPvrtcSrgb.CompressedSrgbPvrtc2Bppv1Ext;
-                    format = (PixelFormatGl)ExtPvrtcSrgb.CompressedSrgbPvrtc2Bppv1Ext;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_4bpp_RGBA_SRgb:
-                    internalFormat = (PixelInternalFormat)ExtPvrtcSrgb.CompressedSrgbAlphaPvrtc4Bppv1Ext;
-                    format = (PixelFormatGl)ExtPvrtcSrgb.CompressedSrgbAlphaPvrtc4Bppv1Ext;
-                    compressed = true;
-                    pixelSize = 4;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.PVRTC_2bpp_RGBA_SRgb:
-                    internalFormat = (PixelInternalFormat)ExtPvrtcSrgb.CompressedSrgbAlphaPvrtc2Bppv1Ext;
-                    format = (PixelFormatGl)ExtPvrtcSrgb.CompressedSrgbAlphaPvrtc2Bppv1Ext;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-#elif XENKO_GRAPHICS_API_OPENGLES
-                // Desktop OpenGLES
-                case PixelFormat.ETC1:
-                    // TODO: Runtime check for extension?
-                    internalFormat = (PixelInternalFormat)OesCompressedEtc1Rgb8Texture.Etc1Rgb8Oes;
-                    format = (PixelFormatGl)OesCompressedEtc1Rgb8Texture.Etc1Rgb8Oes;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.ETC2_RGBA:
-                    internalFormat = (PixelInternalFormat)CompressedInternalFormat.CompressedRgba8Etc2Eac;
-                    format = (PixelFormatGl)CompressedInternalFormat.CompressedRgba8Etc2Eac;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-                case PixelFormat.ETC2_RGBA_SRgb:
-                    internalFormat = (PixelInternalFormat)CompressedInternalFormat.CompressedSrgb8Alpha8Etc2Eac;
-                    format = (PixelFormatGl)CompressedInternalFormat.CompressedSrgb8Alpha8Etc2Eac;
-                    compressed = true;
-                    pixelSize = 2;
-                    type = PixelType.UnsignedByte;
-                    break;
-#endif
-                case PixelFormat.None: // TODO: remove this - this is only for buffers used in compute shaders
-                    internalFormat = PixelInternalFormat.Rgba;
-                    format = PixelFormatGl.Red;
-                    type = PixelType.UnsignedByte;
-                    pixelSize = 1;
-                    break;
-                default:
-                    throw new InvalidOperationException("Unsupported texture format: " + inputFormat);
-            }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            // override some formats for ES2.0
-            if (graphicsDevice.currentVersion < 300)
-            {
-                switch (inputFormat)
-                {
-                    case PixelFormat.R8G8B8A8_UNorm_SRgb:
-                        // HasSRgb was true because we have GL_EXT_sRGB
-                        // Note: Qualcomm Adreno 4xx fails to use GL_EXT_sRGB with FBO,
-                        // but they will report a currentVersion >= 300 (ES 3.0) anyway
-                        internalFormat = (PixelInternalFormat)ExtSrgb.SrgbAlphaExt;
-                        format = (PixelFormatGl)ExtSrgb.SrgbAlphaExt;
-                        break;
-                    case PixelFormat.R8_UNorm:
-                    case PixelFormat.R8_SNorm:
-                    case PixelFormat.R8_UInt:
-                    case PixelFormat.R8_SInt:
-                    case PixelFormat.R16_Float:
-                    case PixelFormat.R16_UNorm:
-                    case PixelFormat.R16_SNorm:
-                    case PixelFormat.R16_UInt:
-                    case PixelFormat.R16_SInt:
-                    case PixelFormat.R32_Float:
-                    case PixelFormat.R32_UInt:
-                    case PixelFormat.R32_SInt:
-                        if (inputFormat == PixelFormat.R16_Float)
-                            type = (PixelType)OesTextureHalfFloat.HalfFloatOes;
-                        if (graphicsDevice.HasTextureRG)
-                            internalFormat = (PixelInternalFormat)ExtTextureRg.RedExt;
-                        break;
-                    case PixelFormat.R16G16_Float:
-                    case PixelFormat.R16G16_UNorm:
-                    case PixelFormat.R16G16_SNorm:
-                    case PixelFormat.R16G16_UInt:
-                    case PixelFormat.R16G16_SInt:
-                    case PixelFormat.R32G32_Float:
-                    case PixelFormat.R32G32_UInt:
-                    case PixelFormat.R32G32_SInt:
-                        if (inputFormat == PixelFormat.R16G16_Float)
-                            type = (PixelType)OesTextureHalfFloat.HalfFloatOes;
-                        if (graphicsDevice.HasTextureRG)
-                            internalFormat = (PixelInternalFormat)ExtTextureRg.RgExt;
-                        break;
-                    case PixelFormat.R32G32B32_Float:
-                    case PixelFormat.R32G32B32_UInt:
-                    case PixelFormat.R32G32B32_SInt:
-                        internalFormat = PixelInternalFormat.Rgb;
-                        break;
-                    case PixelFormat.R16G16B16A16_Float:
-                    case PixelFormat.R32G32B32A32_Float:
-                    case PixelFormat.R16G16B16A16_UInt:
-                    case PixelFormat.R32G32B32A32_UInt:
-                    case PixelFormat.R16G16B16A16_SInt:
-                    case PixelFormat.R32G32B32A32_SInt:
-                        if (inputFormat == PixelFormat.R16G16B16A16_Float)
-                            type = (PixelType)OesTextureHalfFloat.HalfFloatOes;
-                        internalFormat = PixelInternalFormat.Rgba;
-                        break;
-                }
-            }
-#endif
-        }
-    }
-}
- 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/OpenGLShaderBytecodeData.cs b/sources/engine/Xenko.Graphics/OpenGL/OpenGLShaderBytecodeData.cs
deleted file mode 100644
index 57c0ef488e..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/OpenGLShaderBytecodeData.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using Xenko.Core.Serialization;
-
-namespace Xenko.Graphics
-{
-    internal struct OpenGLShaderBytecodeData
-    {
-        public bool IsBinary;
-
-        public string Profile;
-        public string EntryPoint;
-        public string Source;
-
-        public int BinaryFormat;
-        public byte[] Binary;
-
-        public void Serialize(SerializationStream stream, ArchiveMode mode)
-        {
-            // Check version number (should be 0 for now, for future use)
-            if (mode == ArchiveMode.Serialize)
-            {
-                stream.Write(0);
-            }
-            else if (mode == ArchiveMode.Deserialize)
-            {
-                if (stream.ReadInt32() != 0)
-                    throw new InvalidOperationException("Unexpected version number.");
-            }
-
-            // Serialize content
-            stream.Serialize(ref IsBinary);
-            if (IsBinary)
-            {
-                stream.Serialize(ref BinaryFormat);
-                stream.Serialize(ref Binary, mode);
-            }
-            else
-            {
-                stream.Serialize(ref Profile);
-                stream.Serialize(ref EntryPoint);
-                stream.Serialize(ref Source);
-            }
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics/OpenGL/OpenGLUtils.cs b/sources/engine/Xenko.Graphics/OpenGL/OpenGLUtils.cs
deleted file mode 100644
index 2c076c621d..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/OpenGLUtils.cs
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using OpenTK.Graphics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics.OpenGL
-{
-    /// <summary>
-    /// Converts between feature level and opengl versions
-    /// </summary>
-    internal static class OpenGLUtils
-    {
-#if XENKO_GRAPHICS_API_OPENGLES
-        public static IEnumerable<int> GetGLVersions(GraphicsProfile[] graphicsProfiles)
-        {
-            if (graphicsProfiles != null && graphicsProfiles.Length > 0)
-            {
-                foreach (var profile in graphicsProfiles)
-                {
-                    if (profile >= GraphicsProfile.Level_10_0)
-                        yield return 3;
-                    else
-                        yield return 2;
-                }
-            }
-            else
-            {
-                yield return 2;
-            }
-        }
-
-        public static void GetGLVersion(GraphicsProfile graphicsProfile, out int version)
-        {
-            switch (graphicsProfile)
-            {
-                case GraphicsProfile.Level_9_1:
-                case GraphicsProfile.Level_9_2:
-                case GraphicsProfile.Level_9_3:
-                    version = 200;
-                    return;
-                case GraphicsProfile.Level_10_0:
-                case GraphicsProfile.Level_10_1:
-                    version = 300;
-                    return;
-                case GraphicsProfile.Level_11_0:
-                case GraphicsProfile.Level_11_1:
-                case GraphicsProfile.Level_11_2:
-                    version = 310;
-                    return;
-                default:
-                    throw new ArgumentOutOfRangeException("graphicsProfile");
-            }
-        }
-
-        public static GraphicsProfile GetFeatureLevel(int version)
-        {
-            if (version >= 300)
-            {
-                if (version >= 310)
-                    return GraphicsProfile.Level_11_0; // missing tessellation and geometry shaders
-                return GraphicsProfile.Level_10_0;
-            }
-            return GraphicsProfile.Level_9_3;
-        }
-#else
-        public static void GetGLVersion(GraphicsProfile graphicsProfile, out int version)
-        {
-            switch (graphicsProfile)
-            {
-                case GraphicsProfile.Level_9_1:
-                case GraphicsProfile.Level_9_2:
-                case GraphicsProfile.Level_9_3:
-                    version = 330;
-                    return;
-                case GraphicsProfile.Level_10_0:
-                case GraphicsProfile.Level_10_1:
-                    version = 410;
-                    return;
-                case GraphicsProfile.Level_11_0:
-                case GraphicsProfile.Level_11_1:
-                case GraphicsProfile.Level_11_2:
-                    version = 440;
-                    return;
-                default:
-                    throw new ArgumentOutOfRangeException("graphicsProfile");
-            }
-        }
-
-        public static GraphicsProfile GetFeatureLevel(int version)
-        {
-            if (version >= 400)
-            {
-                if (version >= 440)
-                    return GraphicsProfile.Level_11_0;
-                if (version >= 410)
-                    return GraphicsProfile.Level_10_0;
-            }
-            return GraphicsProfile.Level_9_1;
-        }
-#endif
-#if XENKO_PLATFORM_ANDROID
-        public static GLVersion GetGLVersion(GraphicsProfile graphicsProfile)
-        {
-            switch (graphicsProfile)
-            {
-                case GraphicsProfile.Level_9_1:
-                case GraphicsProfile.Level_9_2:
-                case GraphicsProfile.Level_9_3:
-                    return GLVersion.ES2;
-                case GraphicsProfile.Level_10_0:
-                case GraphicsProfile.Level_10_1:
-                case GraphicsProfile.Level_11_0:
-                case GraphicsProfile.Level_11_1:
-                case GraphicsProfile.Level_11_2:
-                    return GLVersion.ES3;
-                default:
-                    throw new ArgumentOutOfRangeException("graphicsProfile");
-            }
-        }
-#endif
-
-        private static readonly Regex MatchOpenGLVersion = new Regex(@"OpenGL\s+ES\s+([0-9\.]+)");
-
-        /// <summary>
-        /// Gets current GL version.
-        /// </summary>
-        /// <param name="version">OpenGL version encoded as major * 100 + minor * 10.</param>
-        /// <returns></returns>
-        public static bool GetCurrentGLVersion(out int version)
-        {
-            version = 0;
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            var versionVendorText = GL.GetString(StringName.Version);
-            var match = MatchOpenGLVersion.Match(versionVendorText);
-            if (!match.Success)
-                return false;
-
-            var versionText = match.Groups[1].Value;
-            var dotIndex = versionText.IndexOf(".");
-
-            int versionMajor = 0;
-            int versionMinor = 0;
-            if (!int.TryParse(dotIndex != -1 ? versionText.Substring(0, dotIndex) : versionText, out versionMajor))
-            {
-                return false;
-            }
-
-            if (dotIndex == -1)
-            {
-                version = versionMajor * 100;
-                return true;
-            }
-            if (!int.TryParse(versionText.Substring(dotIndex + 1), out versionMinor))
-                return false;
-
-            version = versionMajor * 100 + versionMinor * 10;
-            return true;
-#else
-            int versionMajor = 0;
-            int versionMinor = 0;
-
-            GL.GetInteger(GetPName.MajorVersion, out versionMajor);
-            GL.GetInteger(GetPName.MinorVersion, out versionMinor);
-
-            version = versionMajor * 100 + versionMinor * 10;
-            return true;
-#endif
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/PipelineState.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/PipelineState.OpenGL.cs
deleted file mode 100644
index 7844f84375..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/PipelineState.OpenGL.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-using System.Collections.Generic;
-using Xenko.Core;
-using Xenko.Core.Storage;
-using Xenko.Shaders;
-using Xenko.Core.Extensions;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using PrimitiveTypeGl = OpenTK.Graphics.ES30.PrimitiveType;
-#else
-using OpenTK.Graphics.OpenGL;
-using PrimitiveTypeGl = OpenTK.Graphics.OpenGL.PrimitiveType;
-#endif
-
-namespace Xenko.Graphics
-{
-    public partial class PipelineState
-    {
-        internal readonly BlendState BlendState;
-        internal readonly DepthStencilState DepthStencilState;
-
-        internal readonly RasterizerState RasterizerState;
-
-        internal readonly EffectProgram EffectProgram;
-
-        internal readonly PrimitiveTypeGl PrimitiveType;
-        internal readonly VertexAttrib[] VertexAttribs;
-        internal ResourceBinder ResourceBinder;
-
-        private PipelineState(GraphicsDevice graphicsDevice, PipelineStateDescription pipelineStateDescription) : base(graphicsDevice)
-        {
-            // First time, build caches
-            var pipelineStateCache = GetPipelineStateCache();
-
-            var depthClampEmulation = !pipelineStateDescription.RasterizerState.DepthClipEnable && !graphicsDevice.HasDepthClamp;
-#if XENKO_GRAPHICS_API_OPENGLES
-            // Depth Clamp can't be emulated on OpenGL ES 2 (TODO: warning?)
-            if (graphicsDevice.IsOpenGLES2)
-                depthClampEmulation = false;
-#endif
-
-            // Store states
-            BlendState = new BlendState(pipelineStateDescription.BlendState, pipelineStateDescription.Output.RenderTargetCount > 0);
-            RasterizerState = new RasterizerState(pipelineStateDescription.RasterizerState);
-            DepthStencilState = new DepthStencilState(pipelineStateDescription.DepthStencilState, pipelineStateDescription.Output.DepthStencilFormat != PixelFormat.None);
-
-            PrimitiveType = pipelineStateDescription.PrimitiveType.ToOpenGL();
-
-            // Compile effect
-            var effectBytecode = pipelineStateDescription.EffectBytecode;
-            EffectProgram = effectBytecode != null ? pipelineStateCache.EffectProgramCache.Instantiate(Tuple.Create(effectBytecode, depthClampEmulation)) : null;
-
-            var rootSignature = pipelineStateDescription.RootSignature;
-            if (rootSignature != null && effectBytecode != null)
-                ResourceBinder.Compile(graphicsDevice, rootSignature.EffectDescriptorSetReflection, effectBytecode);
-
-            // Vertex attributes
-            if (pipelineStateDescription.InputElements != null)
-            {
-                var vertexAttribs = new List<VertexAttrib>();
-                foreach (var inputElement in pipelineStateDescription.InputElements)
-                {
-                    // Query attribute name from effect
-                    var attributeName = "a_" + inputElement.SemanticName + inputElement.SemanticIndex;
-                    int attributeIndex;
-                    if (!EffectProgram.Attributes.TryGetValue(attributeName, out attributeIndex))
-                        continue;
-
-                    var vertexElementFormat = VertexAttrib.ConvertVertexElementFormat(inputElement.Format);
-                    vertexAttribs.Add(new VertexAttrib(
-                        inputElement.InputSlot,
-                        attributeIndex,
-                        vertexElementFormat.Size,
-                        vertexElementFormat.Type,
-                        vertexElementFormat.Normalized,
-                        inputElement.AlignedByteOffset));
-                }
-
-                VertexAttribs = pipelineStateCache.VertexAttribsCache.Instantiate(vertexAttribs.ToArray());
-            }
-        }
-
-        internal void Apply(CommandList commandList, PipelineState previousPipeline)
-        {
-            // Apply states
-            if (BlendState != previousPipeline.BlendState || commandList.NewBlendFactor != commandList.BoundBlendFactor)
-                BlendState.Apply(commandList, previousPipeline.BlendState);
-            if (RasterizerState != previousPipeline.RasterizerState)
-                RasterizerState.Apply(commandList);
-            if (DepthStencilState != previousPipeline.DepthStencilState || commandList.NewStencilReference != commandList.BoundStencilReference)
-                DepthStencilState.Apply(commandList);
-        }
-
-        protected internal override void OnDestroyed()
-        {
-            var pipelineStateCache = GetPipelineStateCache();
-
-            if (EffectProgram != null)
-                pipelineStateCache.EffectProgramCache.Release(EffectProgram);
-            if (VertexAttribs != null)
-                pipelineStateCache.VertexAttribsCache.Release(VertexAttribs);
-
-            base.OnDestroyed();
-        }
-
-        struct VertexAttribsKey
-        {
-            public VertexAttrib[] Attribs;
-            public int Hash;
-
-            public VertexAttribsKey(VertexAttrib[] attribs)
-            {
-                Attribs = attribs;
-                Hash = ArrayExtensions.ComputeHash(attribs);
-            }
-
-            public bool Equals(VertexAttribsKey other)
-            {
-                return Hash == other.Hash && ArrayExtensions.ArraysEqual(Attribs, other.Attribs);
-            }
-
-            public override bool Equals(object obj)
-            {
-                if (ReferenceEquals(null, obj)) return false;
-                return obj is VertexAttribsKey && Equals((VertexAttribsKey)obj);
-            }
-
-            public override int GetHashCode()
-            {
-                return Hash;
-            }
-
-            public static bool operator ==(VertexAttribsKey left, VertexAttribsKey right)
-            {
-                return left.Equals(right);
-            }
-
-            public static bool operator !=(VertexAttribsKey left, VertexAttribsKey right)
-            {
-                return !left.Equals(right);
-            }
-        }
-
-        // Small helper to cache SharpDX graphics objects
-        class GraphicsCache<TSource, TKey, TValue>
-        {
-            private object lockObject = new object();
-
-            // Store instantiated objects
-            private readonly Dictionary<TKey, TValue> storage = new Dictionary<TKey, TValue>();
-            // Used for quick removal
-            private readonly Dictionary<TValue, TKey> reverse = new Dictionary<TValue, TKey>();
-
-            private readonly Dictionary<TValue, int> counter = new Dictionary<TValue, int>();
-
-            private readonly Func<TSource, TKey> computeKey;
-            private readonly Func<TSource, TValue> computeValue;
-
-            public GraphicsCache(Func<TSource, TKey> computeKey, Func<TSource, TValue> computeValue)
-            {
-                this.computeKey = computeKey;
-                this.computeValue = computeValue;
-            }
-
-            public TValue Instantiate(TSource source)
-            {
-                lock (lockObject)
-                {
-                    TValue value;
-                    var key = computeKey(source);
-                    if (!storage.TryGetValue(key, out value))
-                    {
-                        value = computeValue(source);
-                        storage.Add(key, value);
-                        reverse.Add(value, key);
-                        counter.Add(value, 1);
-                    }
-                    else
-                    {
-                        counter[value] = counter[value] + 1;
-                    }
-
-                    return value;
-                }
-            }
-
-            public void Release(TValue value)
-            {
-                // Should we remove it from the cache?
-                lock (lockObject)
-                {
-                    int refCount;
-                    if (!counter.TryGetValue(value, out refCount))
-                        return;
-
-                    counter[value] = --refCount;
-                    if (refCount == 0)
-                    {
-                        counter.Remove(value);
-                        reverse.Remove(value);
-                        TKey key;
-                        if (reverse.TryGetValue(value, out key))
-                        {
-                            storage.Remove(key);
-                        }
-
-                        var graphicsResource = value as IReferencable;
-                        graphicsResource?.Release();
-                    }
-                }
-            }
-
-            public void Dispose()
-            {
-                lock (lockObject)
-                {
-                    // Release everything
-                    foreach (var entry in reverse)
-                    {
-                        var graphicsResource = entry.Key as IReferencable;
-                        graphicsResource?.Release();
-                    }
-
-                    reverse.Clear();
-                    storage.Clear();
-                    counter.Clear();
-                }
-            }
-        }
-
-        private DevicePipelineStateCache GetPipelineStateCache()
-        {
-            return GraphicsDevice.GetOrCreateSharedData(GraphicsDeviceSharedDataType.PerDevice, typeof(DevicePipelineStateCache), device => new DevicePipelineStateCache(device));
-        }
-
-        // Caches
-        private class DevicePipelineStateCache : IDisposable
-        {
-            public readonly GraphicsCache<Tuple<EffectBytecode, bool>, EffectBytecode, EffectProgram> EffectProgramCache;
-            public readonly GraphicsCache<VertexAttrib[], VertexAttribsKey, VertexAttrib[]> VertexAttribsCache;
-
-            public DevicePipelineStateCache(GraphicsDevice graphicsDevice)
-            {
-                EffectProgramCache = new GraphicsCache<Tuple<EffectBytecode, bool>, EffectBytecode, EffectProgram>(source => source.Item1, source => new EffectProgram(graphicsDevice, source.Item1, source.Item2));
-                VertexAttribsCache = new GraphicsCache<VertexAttrib[], VertexAttribsKey, VertexAttrib[]>(source => new VertexAttribsKey(source), source => source);
-            }
-
-            public void Dispose()
-            {
-                EffectProgramCache.Dispose();
-                VertexAttribsCache.Dispose();
-            }
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/QueryPool.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/QueryPool.OpenGL.cs
deleted file mode 100644
index 729d921782..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/QueryPool.OpenGL.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-
-using System;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    public partial class QueryPool
-    {
-        internal int[] NativeQueries;
-
-        public bool TryGetData(long[] dataArray)
-        {
-#if XENKO_PLATFORM_IOS
-            return false;
-#else
-            for (var index = 0; index < NativeQueries.Length; index++)
-            {
-#if XENKO_GRAPHICS_API_OPENGLES
-                GL.Ext.GetQueryObject(NativeQueries[index], GetQueryObjectParam.QueryResultAvailable, out long availability);
-#else
-                GL.GetQueryObject(NativeQueries[index], GetQueryObjectParam.QueryResultAvailable, out long availability);
-#endif
-                if (availability == 0)
-                    return false;
-
-#if XENKO_GRAPHICS_API_OPENGLES
-                GL.Ext.GetQueryObject(NativeQueries[index], GetQueryObjectParam.QueryResult, out dataArray[index]);
-#else
-                GL.GetQueryObject(NativeQueries[index], GetQueryObjectParam.QueryResult, out dataArray[index]);
-#endif
-            }
-
-            return true;
-#endif
-        }
-
-        /// <inheritdoc/>
-        protected internal override void OnDestroyed()
-        {
-#if !XENKO_PLATFORM_IOS
-            GL.DeleteQueries(QueryCount, NativeQueries);
-            NativeQueries = null;
-#endif
-            base.OnDestroyed();
-        }
-
-        private void Recreate()
-        {
-            switch (QueryType)
-            {
-                case QueryType.Timestamp:
-                    break;
-
-                default:
-                    throw new NotImplementedException();
-            }
-
-            NativeQueries = new int[QueryCount];
-#if !XENKO_PLATFORM_IOS
-            GL.GenQueries(QueryCount, NativeQueries);
-#endif
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/RasterizerState.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/RasterizerState.OpenGL.cs
deleted file mode 100644
index 7fcd7c5412..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/RasterizerState.OpenGL.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-using System;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    struct RasterizerBoundState
-    {
-        public bool ScissorTestEnable;
-
-        public bool DepthClamp;
-
-        public bool NeedCulling;
-        public CullFaceMode CullMode;
-        public int DepthBias;
-        public float SlopeScaleDepthBias;
-        public FrontFaceDirection FrontFaceDirection;
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-        public PolygonMode PolygonMode;
-#endif
-    }
-
-    class RasterizerState
-    {
-#if XENKO_GRAPHICS_API_OPENGLES
-        private const EnableCap DepthClamp = (EnableCap)0x864F;
-#else
-        private const EnableCap DepthClamp = (EnableCap)ArbDepthClamp.DepthClamp;
-#endif
-
-        RasterizerBoundState State;
-
-        internal RasterizerState(RasterizerStateDescription rasterizerStateDescription)
-        {
-            State.ScissorTestEnable = rasterizerStateDescription.ScissorTestEnable;
-
-            State.DepthClamp = !rasterizerStateDescription.DepthClipEnable;
-
-            State.NeedCulling = rasterizerStateDescription.CullMode != CullMode.None;
-            State.CullMode = GetCullMode(rasterizerStateDescription.CullMode);
-
-            State.FrontFaceDirection =
-                rasterizerStateDescription.FrontFaceCounterClockwise
-                ? FrontFaceDirection.Cw
-                : FrontFaceDirection.Ccw;
-
-            State.DepthBias = rasterizerStateDescription.DepthBias;
-            State.SlopeScaleDepthBias = rasterizerStateDescription.SlopeScaleDepthBias;
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-            State.PolygonMode = rasterizerStateDescription.FillMode == FillMode.Solid ? PolygonMode.Fill : PolygonMode.Line;
-#endif
-
-            // TODO: DepthBiasClamp and various other properties are not fully supported yet
-            if (rasterizerStateDescription.DepthBiasClamp != 0.0f) throw new NotSupportedException();
-        }
-
-        public void Apply(CommandList commandList)
-        {
-#if !XENKO_GRAPHICS_API_OPENGLES
-            if (commandList.RasterizerBoundState.PolygonMode != State.PolygonMode)
-            {
-                commandList.RasterizerBoundState.PolygonMode = State.PolygonMode;
-                GL.PolygonMode(MaterialFace.FrontAndBack, State.PolygonMode);
-            }
-#endif
-
-            if (commandList.RasterizerBoundState.DepthBias != State.DepthBias || commandList.RasterizerBoundState.SlopeScaleDepthBias != State.SlopeScaleDepthBias)
-            {
-                commandList.RasterizerBoundState.DepthBias = State.DepthBias;
-                commandList.RasterizerBoundState.SlopeScaleDepthBias = State.SlopeScaleDepthBias;
-                GL.PolygonOffset(State.DepthBias, State.SlopeScaleDepthBias);
-            }
-
-            if (commandList.RasterizerBoundState.FrontFaceDirection != State.FrontFaceDirection)
-            {
-                commandList.RasterizerBoundState.FrontFaceDirection = State.FrontFaceDirection;
-                GL.FrontFace(State.FrontFaceDirection);
-            }
-
-            if (commandList.GraphicsDevice.HasDepthClamp)
-            {
-                if (commandList.RasterizerBoundState.DepthClamp != State.DepthClamp)
-                {
-                    commandList.RasterizerBoundState.DepthClamp = State.DepthClamp;
-                    if (State.DepthClamp)
-                        GL.Enable(DepthClamp);
-                    else
-                        GL.Disable(DepthClamp);
-                }
-            }
-
-            if (commandList.RasterizerBoundState.NeedCulling != State.NeedCulling)
-            {
-                commandList.RasterizerBoundState.NeedCulling = State.NeedCulling;
-                if (State.NeedCulling)
-                {
-                    GL.Enable(EnableCap.CullFace);
-                }
-                else
-                {
-                    GL.Disable(EnableCap.CullFace);
-                }
-            }
-
-            if (commandList.RasterizerBoundState.CullMode != State.CullMode)
-            {
-                commandList.RasterizerBoundState.CullMode = State.CullMode;
-                GL.CullFace(State.CullMode);
-            }
-
-            if (commandList.RasterizerBoundState.ScissorTestEnable != State.ScissorTestEnable)
-            {
-                commandList.RasterizerBoundState.ScissorTestEnable = State.ScissorTestEnable;
-
-                if (State.ScissorTestEnable)
-                    GL.Enable(EnableCap.ScissorTest);
-                else
-                    GL.Disable(EnableCap.ScissorTest);
-            }
-        }
-
-        private static CullFaceMode GetCullMode(CullMode cullMode)
-        {
-            switch (cullMode)
-            {
-                case CullMode.Front:
-                    return CullFaceMode.Front;
-                case CullMode.Back:
-                    return CullFaceMode.Back;
-                default:
-                    return CullFaceMode.Back; // not used if CullMode.None
-            }
-        }
-    }
-} 
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/SamplerState.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/SamplerState.OpenGL.cs
deleted file mode 100644
index 24dfaa820e..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/SamplerState.OpenGL.cs
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL 
-using System;
-using Xenko.Core.Mathematics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using TextureCompareMode = OpenTK.Graphics.ES30.All;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    public partial class SamplerState
-    {
-        private const TextureFilter AnisotropicMask = TextureFilter.Anisotropic & ~TextureFilter.Linear;
-        private const TextureFilter ComparisonMask = TextureFilter.ComparisonLinear & ~TextureFilter.Linear;
-
-        private TextureWrapMode textureWrapS;
-        private TextureWrapMode textureWrapT;
-        private TextureWrapMode textureWrapR;
-
-        private TextureMinFilter minFilter;
-        private TextureMagFilter magFilter;
-#if XENKO_GRAPHICS_API_OPENGLES
-        private TextureMinFilter minFilterNoMipmap;
-#endif
-
-        private int maxAnisotropy;
-
-        private float[] borderColor;
-
-        private DepthFunction compareFunc;
-        private TextureCompareMode compareMode;
-
-        private SamplerState(GraphicsDevice device, SamplerStateDescription samplerStateDescription) : base(device)
-        {
-            Description = samplerStateDescription;
-
-            textureWrapS = samplerStateDescription.AddressU.ToOpenGL();
-            textureWrapT = samplerStateDescription.AddressV.ToOpenGL();
-            textureWrapR = samplerStateDescription.AddressW.ToOpenGL();
-
-            compareMode = TextureCompareMode.None;
-
-            // ComparisonPoint can act as a mask for Comparison filters (0x80)
-            if ((samplerStateDescription.Filter & ComparisonMask) != 0)
-                compareMode = TextureCompareMode.CompareRefToTexture;
-
-            compareFunc = samplerStateDescription.CompareFunction.ToOpenGLDepthFunction();
-            borderColor = samplerStateDescription.BorderColor.ToArray();
-            // TODO: How to do MipLinear vs MipPoint?
-            switch (samplerStateDescription.Filter & ~(ComparisonMask | AnisotropicMask)) // Ignore comparison (128) and anisotropic (64) part
-            {
-                case TextureFilter.MinMagLinearMipPoint:
-                    minFilter = TextureMinFilter.LinearMipmapNearest;
-                    magFilter = TextureMagFilter.Linear;
-                    break;
-                case TextureFilter.Linear:
-                    minFilter = TextureMinFilter.LinearMipmapLinear;
-                    magFilter = TextureMagFilter.Linear;
-                    break;
-                case TextureFilter.MinPointMagMipLinear:
-                    minFilter = TextureMinFilter.NearestMipmapLinear;
-                    magFilter = TextureMagFilter.Linear;
-                    break;
-                case TextureFilter.Point:
-                    minFilter = TextureMinFilter.NearestMipmapNearest;
-                    magFilter = TextureMagFilter.Nearest;
-                    break;
-                case TextureFilter.MinPointMagLinearMipPoint:
-                    minFilter = TextureMinFilter.NearestMipmapNearest;
-                    magFilter = TextureMagFilter.Linear;
-                    break;
-                case TextureFilter.MinLinearMagMipPoint:
-                    minFilter = TextureMinFilter.LinearMipmapNearest;
-                    magFilter = TextureMagFilter.Nearest;
-                    break;
-                case TextureFilter.MinMagPointMipLinear:
-                    minFilter = TextureMinFilter.NearestMipmapLinear;
-                    magFilter = TextureMagFilter.Nearest;
-                    break;
-                case TextureFilter.MinLinearMagPointMipLinear:
-                    minFilter = TextureMinFilter.LinearMipmapLinear;
-                    magFilter = TextureMagFilter.Nearest;
-                    break;
-                default:
-                    throw new NotImplementedException();
-            }
-
-            maxAnisotropy = ((samplerStateDescription.Filter & AnisotropicMask) != 0) ? Description.MaxAnisotropy : 1;
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            // On OpenGL ES, we need to choose the appropriate min filter ourself if the texture doesn't contain mipmaps (done at PreDraw)
-            minFilterNoMipmap = minFilter;
-            if (minFilterNoMipmap == TextureMinFilter.LinearMipmapLinear)
-                minFilterNoMipmap = TextureMinFilter.Linear;
-            else if (minFilterNoMipmap == TextureMinFilter.NearestMipmapLinear)
-                minFilterNoMipmap = TextureMinFilter.Nearest;
-#endif
-        }
-
-        /// <inheritdoc/>
-        protected internal override bool OnRecreate()
-        {
-            base.OnRecreate();
-            return true;
-        }
-
-        internal void Apply(bool hasMipmap, SamplerState oldSamplerState, TextureTarget target)
-        {
-#if XENKO_GRAPHICS_API_OPENGLES
-            // TODO: support texture array, 3d and cube
-            if (!GraphicsDevice.IsOpenGLES2)
-#endif
-            {
-                if (Description.MinMipLevel != oldSamplerState.Description.MinMipLevel)
-                    GL.TexParameter(target, TextureParameterName.TextureMinLod, Description.MinMipLevel);
-                if (Description.MaxMipLevel != oldSamplerState.Description.MaxMipLevel)
-                    GL.TexParameter(target, TextureParameterName.TextureMaxLod, Description.MaxMipLevel);
-                if (textureWrapR != oldSamplerState.textureWrapR)
-                    GL.TexParameter(target, TextureParameterName.TextureWrapR, (int)textureWrapR);
-                if (compareMode != oldSamplerState.compareMode)
-                    GL.TexParameter(target, TextureParameterName.TextureCompareMode, (int)compareMode);
-                if (compareFunc != oldSamplerState.compareFunc)
-                    GL.TexParameter(target, TextureParameterName.TextureCompareFunc, (int)compareFunc);
-            }
-
-#if !XENKO_GRAPHICS_API_OPENGLES
-            if (borderColor != oldSamplerState.borderColor)
-                GL.TexParameter(target, TextureParameterName.TextureBorderColor, borderColor);
-            if (Description.MipMapLevelOfDetailBias != oldSamplerState.Description.MipMapLevelOfDetailBias)
-                GL.TexParameter(target, TextureParameterName.TextureLodBias, Description.MipMapLevelOfDetailBias);
-            if (minFilter != oldSamplerState.minFilter)
-                GL.TexParameter(target, TextureParameterName.TextureMinFilter, (int)minFilter);
-#else
-            // On OpenGL ES, we need to choose the appropriate min filter ourself if the texture doesn't contain mipmaps (done at PreDraw)
-            if (minFilter != oldSamplerState.minFilter)
-                GL.TexParameter(target, TextureParameterName.TextureMinFilter, hasMipmap ? (int)minFilter : (int)minFilterNoMipmap);
-#endif
-
-#if !XENKO_PLATFORM_IOS
-            if (maxAnisotropy != oldSamplerState.maxAnisotropy && GraphicsDevice.HasAnisotropicFiltering)
-                GL.TexParameter(target, (TextureParameterName)OpenTK.Graphics.ES20.ExtTextureFilterAnisotropic.TextureMaxAnisotropyExt, Description.MaxAnisotropy);
-#endif
-            if (magFilter != oldSamplerState.magFilter)
-                GL.TexParameter(target, TextureParameterName.TextureMagFilter, (int)magFilter);
-            if (textureWrapS != oldSamplerState.textureWrapS)
-                GL.TexParameter(target, TextureParameterName.TextureWrapS, (int)textureWrapS);
-            if (textureWrapT != oldSamplerState.textureWrapT)
-                GL.TexParameter(target, TextureParameterName.TextureWrapT, (int)textureWrapT);
-        }
-    }
-}
-
-#endif 
diff --git a/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.Android.cs b/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.Android.cs
deleted file mode 100644
index 185e991415..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.Android.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_PLATFORM_ANDROID
-using System;
-using Xenko.Core.Mathematics;
-using OpenTK;
-using OpenTK.Platform.Android;
-
-namespace Xenko.Graphics
-{
-    public class SwapChainGraphicsPresenter : GraphicsPresenter
-    {
-        internal static Action<int, int, PresentationParameters> ProcessPresentationParametersOverride;
-
-        private AndroidGameView gameWindow;
-        private readonly Texture backBuffer;
-        private readonly GraphicsDevice graphicsDevice;
-        private readonly PresentationParameters startingPresentationParameters;
-
-        public SwapChainGraphicsPresenter(GraphicsDevice device, PresentationParameters presentationParameters) : base(device, presentationParameters)
-        {
-            gameWindow = (AndroidGameView)Description.DeviceWindowHandle.NativeWindow;
-
-            graphicsDevice = device;
-            startingPresentationParameters = presentationParameters;
-            device.InitDefaultRenderTarget(Description);
-
-            backBuffer = Texture.New2D(device, Description.BackBufferWidth, Description.BackBufferHeight, presentationParameters.BackBufferFormat, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-        }
-
-        public override Texture BackBuffer => backBuffer;
-
-        public override object NativePresenter => null;
-
-        public override bool IsFullScreen
-        {
-            get
-            {
-                return gameWindow.WindowState == WindowState.Fullscreen;
-            }
-            set
-            {
-                gameWindow.WindowState = value ? WindowState.Fullscreen : WindowState.Normal;
-            }
-        }
-
-        public override void EndDraw(CommandList commandList, bool present)
-        {
-            if (present)
-            {
-                GraphicsDevice.WindowProvidedRenderTexture.InternalSetSize(gameWindow.Width, gameWindow.Height);
-
-                // If we made a fake render target to avoid OpenGL limitations on window-provided back buffer, let's copy the rendering result to it
-                commandList.CopyScaler2D(backBuffer, GraphicsDevice.WindowProvidedRenderTexture,
-                    new Rectangle(0, 0, backBuffer.Width, backBuffer.Height),
-                    new Rectangle(0, 0, GraphicsDevice.WindowProvidedRenderTexture.Width, GraphicsDevice.WindowProvidedRenderTexture.Height), true);
-
-                gameWindow.GraphicsContext.SwapBuffers();
-            }
-        }
-
-        public override void Present()
-        {
-        }
-
-        protected override void ResizeBackBuffer(int width, int height, PixelFormat format)
-        {
-            graphicsDevice.OnDestroyed();
-
-            startingPresentationParameters.BackBufferWidth = width;
-            startingPresentationParameters.BackBufferHeight = height;
-
-            graphicsDevice.InitDefaultRenderTarget(startingPresentationParameters);
-
-            var newTextureDescrition = backBuffer.Description;
-            newTextureDescrition.Width = width;
-            newTextureDescrition.Height = height;
-
-            // Manually update the texture
-            backBuffer.OnDestroyed();
-
-            // Put it in our back buffer texture
-            backBuffer.InitializeFrom(newTextureDescrition);
-        }
-
-        protected override void ResizeDepthStencilBuffer(int width, int height, PixelFormat format)
-        {
-            var newTextureDescrition = DepthStencilBuffer.Description;
-            newTextureDescrition.Width = width;
-            newTextureDescrition.Height = height;
-
-            // Manually update the texture
-            DepthStencilBuffer.OnDestroyed();
-
-            // Put it in our back buffer texture
-            DepthStencilBuffer.InitializeFrom(newTextureDescrition);
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.OpenTK.cs b/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.OpenTK.cs
deleted file mode 100644
index 5bcd22b4d5..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.OpenTK.cs
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if (XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX) && XENKO_GRAPHICS_API_OPENGL
-using Xenko.Core.Mathematics;
-using OpenTK;
-using Rectangle = Xenko.Core.Mathematics.Rectangle;
-#if XENKO_UI_SDL
-using WindowState = Xenko.Graphics.SDL.FormWindowState;
-using OpenGLWindow = Xenko.Graphics.SDL.Window;
-#else
-using WindowState = OpenTK.WindowState;
-using OpenGLWindow = OpenTK.GameWindow;
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    public class SwapChainGraphicsPresenter : GraphicsPresenter
-    {
-        private Texture backBuffer;
-
-        public SwapChainGraphicsPresenter(GraphicsDevice device, PresentationParameters presentationParameters) : base(device, presentationParameters)
-        {
-            device.InitDefaultRenderTarget(presentationParameters);
-            backBuffer = Texture.New2D(device, Description.BackBufferWidth, Description.BackBufferHeight, presentationParameters.BackBufferFormat, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-        }
-
-        public override Texture BackBuffer
-        {
-            get { return backBuffer; }
-        }
-
-        public override object NativePresenter
-        {
-            get { return null; }
-        }
-
-        public override bool IsFullScreen
-        {
-            get
-            {
-                return ((OpenGLWindow)Description.DeviceWindowHandle.NativeWindow).WindowState == WindowState.Fullscreen;
-            }
-            set
-            {
-                var gameWindow = (OpenGLWindow)Description.DeviceWindowHandle.NativeWindow;
-                if (gameWindow.Exists)
-                    gameWindow.WindowState = value ? WindowState.Fullscreen : WindowState.Normal;
-            }
-        }
-
-        public override void EndDraw(CommandList commandList, bool present)
-        {
-            if (present)
-            {
-                // If we made a fake render target to avoid OpenGL limitations on window-provided back buffer, let's copy the rendering result to it
-                commandList.CopyScaler2D(backBuffer, GraphicsDevice.WindowProvidedRenderTexture,
-                    new Rectangle(0, 0, backBuffer.Width, backBuffer.Height),
-                    new Rectangle(0, 0, GraphicsDevice.WindowProvidedRenderTexture.Width, GraphicsDevice.WindowProvidedRenderTexture.Height), true);
-
-                // On macOS, `SwapBuffers` will swap whatever framebuffer is active and in our case it is not the window provided
-                // framebuffer, and in addition if the active framebuffer is single buffered, it won't do anything. Forcing a bind
-                // will ensure the window is updated.
-                GL.BindFramebuffer(FramebufferTarget.Framebuffer, GraphicsDevice.WindowProvidedFrameBuffer);
-                OpenTK.Graphics.GraphicsContext.CurrentContext.SwapBuffers();
-            }
-        }
-
-        public override void Present()
-        {
-        }
-        
-        protected override void ResizeBackBuffer(int width, int height, PixelFormat format)
-        {
-        }
-
-        protected override void ResizeDepthStencilBuffer(int width, int height, PixelFormat format)
-        {
-            ReleaseCurrentDepthStencilBuffer();
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.iOS.cs b/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.iOS.cs
deleted file mode 100644
index ba45612332..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/SwapChainGraphicsPresenter.iOS.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_PLATFORM_IOS
-using System.Drawing;
-using OpenTK;
-using OpenTK.Platform.iPhoneOS;
-using Rectangle = Xenko.Core.Mathematics.Rectangle;
-
-
-namespace Xenko.Graphics
-{
-    public class SwapChainGraphicsPresenter : GraphicsPresenter
-    {
-        private readonly iPhoneOSGameView gameWindow;
-        private readonly Texture backBuffer;
-        private readonly GraphicsDevice graphicsDevice;
-        private readonly PresentationParameters startingPresentationParameters;
-
-        public SwapChainGraphicsPresenter(GraphicsDevice device, PresentationParameters presentationParameters) : base(device, presentationParameters)
-        {
-            graphicsDevice = device;
-            startingPresentationParameters = presentationParameters;
-            gameWindow = (iPhoneOSGameView)Description.DeviceWindowHandle.NativeWindow;
-            device.InitDefaultRenderTarget(presentationParameters);
-
-            backBuffer = Texture.New2D(device, Description.BackBufferWidth, Description.BackBufferHeight, presentationParameters.BackBufferFormat, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-        }
-
-        public override Texture BackBuffer => backBuffer;
-
-        public override object NativePresenter => null;
-
-        public override bool IsFullScreen
-        {
-            get
-            {
-                return gameWindow.WindowState == WindowState.Fullscreen;
-            }
-            set
-            {
-                gameWindow.WindowState = value ? WindowState.Fullscreen : WindowState.Normal;
-            }
-        }
-
-        public override void EndDraw(CommandList commandList, bool present)
-        {
-            if (present)
-            {
-                // If we made a fake render target to avoid OpenGL limitations on window-provided back buffer, let's copy the rendering result to it
-                commandList.CopyScaler2D(backBuffer, GraphicsDevice.WindowProvidedRenderTexture,
-                    new Rectangle(0, 0, backBuffer.Width, backBuffer.Height),
-                    new Rectangle(0, 0, GraphicsDevice.WindowProvidedRenderTexture.Width, GraphicsDevice.WindowProvidedRenderTexture.Height), true);
-
-                gameWindow.SwapBuffers();
-            }
-        }
-
-        public override void Present()
-        {
-        }
-
-        protected override void ResizeBackBuffer(int width, int height, PixelFormat format)
-        {
-            graphicsDevice.OnDestroyed();
-
-            startingPresentationParameters.BackBufferWidth = width;
-            startingPresentationParameters.BackBufferHeight = height;
-
-            graphicsDevice.InitDefaultRenderTarget(startingPresentationParameters);
-
-            var newTextureDescrition = backBuffer.Description;
-            newTextureDescrition.Width = width;
-            newTextureDescrition.Height = height;
-
-            // Manually update the texture
-            backBuffer.OnDestroyed();
-
-            // Put it in our back buffer texture
-            backBuffer.InitializeFrom(newTextureDescrition);
-        }
-
-        protected override void ResizeDepthStencilBuffer(int width, int height, PixelFormat format)
-        {
-            var newTextureDescrition = DepthStencilBuffer.Description;
-            newTextureDescrition.Width = width;
-            newTextureDescrition.Height = height;
-
-            // Manually update the texture
-            DepthStencilBuffer.OnDestroyed();
-
-            // Put it in our back buffer texture
-            DepthStencilBuffer.InitializeFrom(newTextureDescrition);
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/Texture.OpenGL.cs b/sources/engine/Xenko.Graphics/OpenGL/Texture.OpenGL.cs
deleted file mode 100644
index 71030546aa..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/Texture.OpenGL.cs
+++ /dev/null
@@ -1,743 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-using System.Runtime.InteropServices;
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-using RenderbufferStorage = OpenTK.Graphics.ES30.RenderbufferInternalFormat;
-using PixelFormatGl = OpenTK.Graphics.ES30.PixelFormat;
-using PixelInternalFormat = OpenTK.Graphics.ES30.TextureComponentCount;
-#else
-using OpenTK.Graphics.OpenGL;
-using PixelFormatGl = OpenTK.Graphics.OpenGL.PixelFormat;
-#endif
-
-// TODO: remove these when OpenTK API is consistent between OpenGL, mobile OpenGL ES and desktop OpenGL ES
-#if XENKO_GRAPHICS_API_OPENGLES
-using CompressedInternalFormat2D = OpenTK.Graphics.ES30.CompressedInternalFormat;
-using CompressedInternalFormat3D = OpenTK.Graphics.ES30.CompressedInternalFormat;
-using TextureComponentCount2D = OpenTK.Graphics.ES30.TextureComponentCount;
-using TextureComponentCount3D = OpenTK.Graphics.ES30.TextureComponentCount;
-#else
-using CompressedInternalFormat2D = OpenTK.Graphics.OpenGL.PixelInternalFormat;
-using CompressedInternalFormat3D = OpenTK.Graphics.OpenGL.PixelInternalFormat;
-using TextureComponentCount2D = OpenTK.Graphics.OpenGL.PixelInternalFormat;
-using TextureComponentCount3D = OpenTK.Graphics.OpenGL.PixelInternalFormat;
-using TextureTarget2d = OpenTK.Graphics.OpenGL.TextureTarget;
-using TextureTarget3d = OpenTK.Graphics.OpenGL.TextureTarget;
-#endif
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Abstract class for all textures
-    /// </summary>
-    public partial class Texture
-    {
-        private const int TextureRowPitchAlignment = 1;
-        private const int TextureSubresourceAlignment = 1;
-
-        internal const TextureFlags TextureFlagsCustomResourceId = (TextureFlags)0x1000;
-
-        internal SamplerState BoundSamplerState;
-        internal int PixelBufferFrame;
-        internal int TextureTotalSize;
-        private int pixelBufferObjectId;
-        private int stencilId;
-
-        internal int DepthPitch { get; set; }
-        internal int RowPitch { get; set; }
-        internal bool IsDepthBuffer { get; private set; }   // TODO: Isn't this redundant? This gets set to the same value as IsDepthStencil...
-        internal bool HasStencil { get; private set; }
-        internal bool IsRenderbuffer { get; private set; }
-        
-        internal int PixelBufferObjectId
-        {
-            get { return pixelBufferObjectId; }
-        }
-
-        internal int StencilId
-        {
-            get { return stencilId; }
-        }
-
-#if XENKO_GRAPHICS_API_OPENGLES
-        internal IntPtr StagingData { get; set; }
-#endif
-
-        public static bool IsDepthStencilReadOnlySupported(GraphicsDevice device)
-        {
-            // always true on OpenGL
-            return true;
-        }
-
-        internal void SwapInternal(Texture other)
-        {
-            var tmp = DepthPitch;
-            DepthPitch = other.DepthPitch;
-            other.DepthPitch = tmp;
-            //
-            tmp = RowPitch;
-            RowPitch = other.RowPitch;
-            other.RowPitch = tmp;
-            //
-            var tmp2 = IsDepthBuffer;
-            IsDepthBuffer = other.IsDepthBuffer;
-            other.IsDepthBuffer = tmp2;
-            //
-            tmp2 = HasStencil;
-            HasStencil = other.HasStencil;
-            other.HasStencil = tmp2;
-            //
-            tmp2 = IsRenderbuffer;
-            HasStencil = other.IsRenderbuffer;
-            other.IsRenderbuffer = tmp2;
-#if XENKO_GRAPHICS_API_OPENGLES
-            var tmp3 = StagingData;
-            StagingData = other.StagingData;
-            other.StagingData = tmp3;
-#endif
-            //
-            Utilities.Swap(ref BoundSamplerState, ref other.BoundSamplerState);
-            Utilities.Swap(ref PixelBufferFrame, ref other.PixelBufferFrame);
-            Utilities.Swap(ref TextureTotalSize, ref other.TextureTotalSize);
-            Utilities.Swap(ref pixelBufferObjectId, ref other.pixelBufferObjectId);
-            Utilities.Swap(ref stencilId, ref other.stencilId);
-            //
-            Utilities.Swap(ref DiscardNextMap, ref other.DiscardNextMap);
-            Utilities.Swap(ref TextureId, ref other.TextureId);
-            Utilities.Swap(ref TextureTarget, ref other.TextureTarget);
-            Utilities.Swap(ref TextureInternalFormat, ref other.TextureInternalFormat);
-            Utilities.Swap(ref TextureFormat, ref other.TextureFormat);
-            Utilities.Swap(ref TextureType, ref other.TextureType);
-            Utilities.Swap(ref TexturePixelSize, ref other.TexturePixelSize);
-        }
-
-        public void Recreate(DataBox[] dataBoxes = null)
-        {
-            InitializeFromImpl(dataBoxes);
-        }
-
-        private void OnRecreateImpl()
-        {
-            // Dependency: wait for underlying texture to be recreated
-            if (ParentTexture != null && ParentTexture.LifetimeState != GraphicsResourceLifetimeState.Active)
-                return;
-
-            // Render Target / Depth Stencil are considered as "dynamic"
-            if ((Usage == GraphicsResourceUsage.Immutable
-                    || Usage == GraphicsResourceUsage.Default)
-                && !IsRenderTarget && !IsDepthStencil)
-                return;
-
-            if (ParentTexture == null && GraphicsDevice != null)
-            {
-                GraphicsDevice.RegisterTextureMemoryUsage(-SizeInBytes);
-            }
-
-            InitializeFromImpl();
-        }
-
-#if XENKO_PLATFORM_ANDROID //&& USE_GLES_EXT_OES_TEXTURE
-        //Prototype: experiment creating GlTextureExternalOes texture
-        private void InitializeForExternalOESImpl()
-        {
-            // TODO: We should probably also set the other parameters if possible, because otherwise we end up with a texture whose metadata says it's of 0x0x0 size and has no format.
-
-            if (TextureId == 0)
-            {
-                GL.GenTextures(1, out TextureId);
-
-                //Android.Opengl.GLES20.GlBindTexture(Android.Opengl.GLES11Ext.GlTextureExternalOes, TextureId);
-
-                //Any "proper" way to do this? (GLES20 could directly accept it, not GLES30 anymore)
-                TextureTarget = (TextureTarget)Android.Opengl.GLES11Ext.GlTextureExternalOes;
-                GL.BindTexture(TextureTarget, TextureId);
-                
-                //GL.BindTexture(TextureTarget, 0);
-            }
-        }
-#endif
-
-        private TextureTarget GetTextureTarget(TextureDimension dimension)
-        {
-            switch (Dimension)
-        	{
-                case TextureDimension.Texture1D:
-#if !XENKO_GRAPHICS_API_OPENGLES
-                        if (ArraySize > 1)
-                            throw new PlatformNotSupportedException("Texture1DArray is not implemented under OpenGL");
-                        return TextureTarget.Texture1D;
-#endif
-                case TextureDimension.Texture2D:
-                    return ArraySize > 1 ? TextureTarget.Texture2DArray : TextureTarget.Texture2D;
-                case TextureDimension.Texture3D:
-                    return TextureTarget.Texture3D;
-                case TextureDimension.TextureCube:
-                    if (ArraySize > 6)
-                        throw new PlatformNotSupportedException("TextureCubeArray is not implemented under OpenGL");
-                    return TextureTarget.TextureCubeMap;
-            }
-
-            throw new ArgumentOutOfRangeException("TextureDimension couldn't be converted to a TextureTarget.");
-        }
-
-        private void CopyParentAttributes()
-        {
-            TextureId = ParentTexture.TextureId;
-
-            TextureInternalFormat = ParentTexture.TextureInternalFormat;
-            TextureFormat = ParentTexture.TextureFormat;
-            TextureType = ParentTexture.TextureType;
-            TextureTarget = ParentTexture.TextureTarget;
-            DepthPitch = ParentTexture.DepthPitch;
-            RowPitch = ParentTexture.RowPitch;
-            IsDepthBuffer = ParentTexture.IsDepthBuffer;
-            HasStencil = ParentTexture.HasStencil;
-            IsRenderbuffer = ParentTexture.IsRenderbuffer;
-
-            stencilId = ParentTexture.StencilId;
-            pixelBufferObjectId = ParentTexture.PixelBufferObjectId;
-        }
-
-        private void InitializeFromImpl(DataBox[] dataBoxes = null)
-        {
-            if (ParentTexture != null)
-            {
-                CopyParentAttributes();
-            }
-
-            if (TextureId == 0)
-            {
-                TextureTarget = GetTextureTarget(Dimension);
-
-                bool compressed;
-                OpenGLConvertExtensions.ConvertPixelFormat(GraphicsDevice, ref textureDescription.Format, out TextureInternalFormat, out TextureFormat, out TextureType, out TexturePixelSize, out compressed);
-
-                DepthPitch = Description.Width * Description.Height * TexturePixelSize;
-                RowPitch = Description.Width * TexturePixelSize;
-
-                IsDepthBuffer = ((Description.Flags & TextureFlags.DepthStencil) != 0);
-                if (IsDepthBuffer)
-                {
-                    HasStencil = InternalHasStencil(Format);
-                }
-                else
-                {
-                    HasStencil = false;
-                }
-
-                if ((Description.Flags & TextureFlagsCustomResourceId) != 0)
-                    return;
-
-                using (var openglContext = GraphicsDevice.UseOpenGLCreationContext())
-                {
-                    TextureTotalSize = ComputeBufferTotalSize();
-
-                    if (Description.Usage == GraphicsResourceUsage.Staging)
-                    {
-                        InitializeStagingPixelBufferObject(dataBoxes);
-                        return; // TODO: This return causes "GraphicsDevice.RegisterTextureMemoryUsage(SizeInBytes);" not to get entered. Is that okay?
-                    }
-
-                    // Depth textures are renderbuffers for now // TODO: PERFORMANCE: Why? I think we should change that so we can sample them directly.
-                    // TODO: enable switch  // TODO: What does this comment even mean?
-
-                    IsRenderbuffer = !Description.IsShaderResource;
-
-                    // Force to renderbuffer if MSAA is on because we don't support MSAA textures ATM (and they don't exist on OpenGL ES).
-                    if (Description.IsMultisample)
-                    {
-                        // TODO: Ideally the caller of this method should be aware of this "force to renderbuffer",
-                        //       because the caller won't be able to bind it as a texture.
-                        IsRenderbuffer = true;
-                    }
-
-                    if (IsRenderbuffer)
-                    {
-                        CreateRenderbuffer();
-                        return; // TODO: This return causes "GraphicsDevice.RegisterTextureMemoryUsage(SizeInBytes);" not to get entered. Is that okay?
-                    }
-
-                    GL.GenTextures(1, out TextureId);
-                    GL.BindTexture(TextureTarget, TextureId);
-                    SetFilterMode();
-
-                    if (Description.MipLevels == 0)
-                        throw new NotImplementedException();
-
-                    var setSize = TextureSetSize(TextureTarget);
-
-                    for (var arrayIndex = 0; arrayIndex < Description.ArraySize; ++arrayIndex)
-                    {
-                        int offsetArray = arrayIndex * Description.MipLevels;
-
-                        for (int mipLevel = 0; mipLevel < Description.MipLevels; ++mipLevel)
-                        {
-                            DataBox dataBox;
-                            Int3 dimensions = new Int3(CalculateMipSize(Description.Width, mipLevel),
-                                                       CalculateMipSize(Description.Height, mipLevel),
-                                                       CalculateMipSize(Description.Depth, mipLevel));
-                            if (dataBoxes != null && mipLevel < dataBoxes.Length)
-                            {
-                                if (setSize > 1 && !compressed && dataBoxes[mipLevel].RowPitch != dimensions.X * TexturePixelSize)
-                                    throw new NotSupportedException("Can't upload texture with pitch in glTexImage2D/3D.");
-                                // Might be possible, need to check API better.
-                                dataBox = dataBoxes[offsetArray + mipLevel];
-                            }
-                            else
-                        {
-                                dataBox = new DataBox();
-                        }
-
-                            switch (TextureTarget)
-                        {
-                                case TextureTarget.Texture1D:
-                                    CreateTexture1D(compressed, dimensions.X, mipLevel, dataBox);
-                                    break;
-                                case TextureTarget.Texture2D:
-                                case TextureTarget.TextureCubeMap:
-                                    CreateTexture2D(compressed, dimensions.X, dimensions.Y, mipLevel, arrayIndex, dataBox);
-                                    break;
-                                case TextureTarget.Texture3D:
-                                    CreateTexture3D(compressed, dimensions.X, dimensions.Y, dimensions.Z, mipLevel, dataBox);
-                                    break;
-                                case TextureTarget.Texture2DArray:
-                                    CreateTexture2DArray(compressed, dimensions.X, dimensions.Y, mipLevel, arrayIndex, dataBox);
-                                    break;
-                            }
-                        }
-                    }
-
-                    GL.BindTexture(TextureTarget, 0);   // This unbinds the texture.
-                    if (openglContext.CommandList != null)
-                    {
-                        // If we messed up with some states of a command list, mark dirty states
-                        openglContext.CommandList.boundShaderResourceViews[openglContext.CommandList.activeTexture] = null;
-                    }
-                }
-
-                GraphicsDevice.RegisterTextureMemoryUsage(SizeInBytes);
-            }
-        }
-
-        private void CreateRenderbuffer()
-        {
-            if (Description.IsDepthStencil) // If it is a depth/stencil attachment:
-            {
-                RenderbufferStorage depthRenderbufferFormat;
-                RenderbufferStorage stencilRenderbufferFormat;
-                ConvertDepthFormat(GraphicsDevice, Description.Format, out depthRenderbufferFormat, out stencilRenderbufferFormat);
-
-                CreateRenderbuffer(Width, Height, (int)Description.MultisampleCount, depthRenderbufferFormat, out TextureId);
-
-                if (stencilRenderbufferFormat != 0)   // If we have a separate stencil attachment:
-                {
-                    CreateRenderbuffer(Width, Height, (int)Description.MultisampleCount, stencilRenderbufferFormat, out stencilId);
-                }
-                else if (HasStencil)    // If depth and stencil are stored inside the same renderbuffer:
-                {
-                    stencilId = TextureId;
-                }
-            }
-            else if (Description.IsRenderTarget)    // If it is a color attachment:
-            {
-                CreateRenderbuffer(Width, Height, (int)Description.MultisampleCount, (RenderbufferStorage)TextureInternalFormat, out TextureId);
-            }
-            else
-            {
-                throw new NotSupportedException("Requested renderbuffer is neither a render target nor a depth/stencil attachment.");
-            }
-
-            GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, 0);    // Unbinds the renderbuffer.
-        }
-
-        private void SetFilterMode()
-        {
-            if (Description.IsDepthStencil || Description.IsRenderTarget)   // Set the filtering mode of depth, stencil and color FBO attachments:
-            {
-                // Disable filtering on FBO attachments:
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);   // TODO: Do we enter this for MSAA buffers too? Is this an issue?
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);   // TODO: Why would we force the filter to "nearest"?
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToEdge);
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToEdge);
-                BoundSamplerState = GraphicsDevice.SamplerStates.PointClamp;
-
-                if (HasStencil)
-                {
-                    // Since we store depth and stencil in a single texture, we assign the depth buffer's texture ID as the stencil texture ID.
-                    stencilId = TextureId;
-                }
-            }
-#if XENKO_GRAPHICS_API_OPENGLES
-            else if (Description.MipLevels <= 1)
-            {
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);   // TODO: Why does this use the nearest filter for minification? Using Linear filtering would result in a smoother appearance for minified textures.
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
-            }
-#endif
-
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (!GraphicsDevice.IsOpenGLES2)
-#endif
-            {
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureBaseLevel, 0);
-                GL.TexParameter(TextureTarget, TextureParameterName.TextureMaxLevel, Description.MipLevels - 1);
-            }
-        }
-
-        private void CreateRenderbuffer(int width, int height, int multisampleCount, RenderbufferStorage internalFormat, out int textureID)
-        {
-            GL.GenRenderbuffers(1, out textureID);
-            GL.BindRenderbuffer(RenderbufferTarget.Renderbuffer, textureID);
-
-            if (Description.IsMultisample)
-            {
-#if !XENKO_PLATFORM_IOS
-                // MSAA is not supported on iOS currently because OpenTK doesn't expose "GL.BlitFramebuffer()" on iOS for some reason.
-                GL.RenderbufferStorageMultisample(RenderbufferTarget.Renderbuffer, multisampleCount, internalFormat, width, height);
-#endif
-            }
-            else
-            {
-                GL.RenderbufferStorage(RenderbufferTarget.Renderbuffer, internalFormat, width, height);
-            }
-        }
-
-        private void CreateTexture1D(bool compressed, int width, int mipLevel, DataBox dataBox)
-        {
-            // TODO: STABILITY: Since 1D textures are not supported on OpenGL ES, what should we do in this case? Throw an exception? I mean currently we just silently ignore that case on OpenGL ES.
-#if !XENKO_GRAPHICS_API_OPENGLES
-            if (compressed)
-            {
-                GL.CompressedTexImage1D(TextureTarget, mipLevel, TextureInternalFormat, width, 0, dataBox.SlicePitch, dataBox.DataPointer);
-            }
-            else
-            {
-                GL.TexImage1D(TextureTarget, mipLevel, TextureInternalFormat, width, 0, TextureFormat, TextureType, dataBox.DataPointer);
-            }
-#endif
-        }
-
-        private void CreateTexture2D(bool compressed, int width, int height, int mipLevel, int arrayIndex, DataBox dataBox)
-        {
-            if (IsMultisample)
-            {
-                throw new InvalidOperationException("Currently if multisampling is on, a renderbuffer will be created (not a texture) in any case and this code will not be reached." +
-                                                    "Therefore if this place is reached, it means something went wrong. Once multisampling has been implemented for OpenGL textures, you can remove this exception.");
-
-                if (IsRenderbuffer)
-                {
-#if !XENKO_PLATFORM_IOS
-                    // MSAA is not supported on iOS currently because OpenTK doesn't expose "GL.BlitFramebuffer()" on iOS for some reason.
-                    GL.RenderbufferStorageMultisample(RenderbufferTarget.Renderbuffer, (int)Description.MultisampleCount, (RenderbufferStorage)TextureInternalFormat, width, height);
-#endif
-                }
-                else
-                {
-#if XENKO_GRAPHICS_API_OPENGLES
-                    throw new NotSupportedException("Multisample textures are not supported on OpenGL ES.");
-#else
-                    GL.TexImage2DMultisample(TextureTargetMultisample.Texture2DMultisample, (int)Description.MultisampleCount, (TextureComponentCount2D)TextureInternalFormat, width, height, false);
-#endif
-                }
-            }
-            else
-            {
-                var dataSetTarget = GetTextureTargetForDataSet2D(TextureTarget, arrayIndex);
-                if (compressed)
-                {
-                    GL.CompressedTexImage2D(dataSetTarget, mipLevel, (CompressedInternalFormat2D)TextureInternalFormat, width, height, 0, dataBox.SlicePitch, dataBox.DataPointer);
-                }
-                else
-                {
-                    GL.TexImage2D(dataSetTarget, mipLevel, (TextureComponentCount2D)TextureInternalFormat, width, height, 0, TextureFormat, TextureType, dataBox.DataPointer);
-                }
-            }
-        }
-
-        private void CreateTexture3D(bool compressed, int width, int height, int depth, int mipLevel, DataBox dataBox)
-        {
-            if (compressed)
-            {
-                GL.CompressedTexImage3D((TextureTarget3d)TextureTarget, mipLevel, (CompressedInternalFormat3D)TextureInternalFormat, width, height, depth, 0, dataBox.SlicePitch, dataBox.DataPointer);
-            }
-            else
-            {
-                GL.TexImage3D((TextureTarget3d)TextureTarget, mipLevel, (TextureComponentCount3D)TextureInternalFormat, width, height, depth, 0, TextureFormat, TextureType, dataBox.DataPointer);
-            }
-        }
-
-        private void CreateTexture2DArray(bool compressed, int width, int height, int mipLevel, int arrayIndex, DataBox dataBox)
-        {
-            // We create all array slices at once, but upload them one by one
-            if (arrayIndex == 0)
-            {
-                if (compressed)
-                {
-                    GL.CompressedTexImage3D((TextureTarget3d)TextureTarget, mipLevel, (CompressedInternalFormat3D)TextureInternalFormat, width, height, ArraySize, 0, 0, IntPtr.Zero);
-                }
-                else
-                {
-                    GL.TexImage3D((TextureTarget3d)TextureTarget, mipLevel, (TextureComponentCount3D)TextureInternalFormat, width, height, ArraySize, 0, TextureFormat, TextureType, IntPtr.Zero);
-                }
-            }
-
-            if (dataBox.DataPointer != IntPtr.Zero)
-            {
-                if (compressed)
-                {
-                    GL.CompressedTexSubImage3D((TextureTarget3d)TextureTarget, mipLevel, 0, 0, arrayIndex, width, height, 1, TextureFormat, dataBox.SlicePitch, dataBox.DataPointer);
-                }
-                else
-                {
-                    GL.TexSubImage3D((TextureTarget3d)TextureTarget, mipLevel, 0, 0, arrayIndex, width, height, 1, TextureFormat, TextureType, dataBox.DataPointer);
-                }
-            }
-        }
-
-        /// <inheritdoc/>
-        protected internal override void OnDestroyed()
-        {
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (StagingData != IntPtr.Zero)
-            {
-                Marshal.FreeHGlobal(StagingData);
-                StagingData = IntPtr.Zero;
-            }
-#endif
-            using (GraphicsDevice.UseOpenGLCreationContext())
-            {
-                if (TextureId != 0 && ParentTexture == null)
-                {
-                    if (IsRenderbuffer)
-                        GL.DeleteRenderbuffers(1, ref TextureId);
-                    else
-                        GL.DeleteTextures(1, ref TextureId);
-
-                GraphicsDevice.RegisterTextureMemoryUsage(-SizeInBytes);
-                }
-
-                if (stencilId != 0)
-                    GL.DeleteRenderbuffers(1, ref stencilId);
-
-                if (pixelBufferObjectId != 0)
-                    GL.DeleteBuffers(1, ref pixelBufferObjectId);
-            }
-
-            TextureTotalSize = 0;
-            TextureId = 0;
-            stencilId = 0;
-            pixelBufferObjectId = 0;
-
-            base.OnDestroyed();
-        }
-
-        private static void ConvertDepthFormat(GraphicsDevice graphicsDevice, PixelFormat requestedFormat, out RenderbufferStorage depthFormat, out RenderbufferStorage stencilFormat)
-        {
-            // Default: non-separate depth/stencil
-            stencilFormat = 0;
-
-            switch (requestedFormat)
-            {
-                case PixelFormat.D16_UNorm:
-                    depthFormat = RenderbufferStorage.DepthComponent16;
-                    break;
-#if !XENKO_GRAPHICS_API_OPENGLES
-                case PixelFormat.D24_UNorm_S8_UInt:
-                    depthFormat = RenderbufferStorage.Depth24Stencil8;
-                    break;
-                case PixelFormat.D32_Float:
-                    depthFormat = RenderbufferStorage.DepthComponent32;
-                    break;
-                case PixelFormat.D32_Float_S8X24_UInt:
-                    depthFormat = RenderbufferStorage.Depth32fStencil8;
-                    break;
-#else
-                case PixelFormat.D24_UNorm_S8_UInt:
-                    if (graphicsDevice.HasPackedDepthStencilExtension)
-                    {
-                        depthFormat = RenderbufferStorage.Depth24Stencil8;
-                    }
-                    else
-                    {
-                        depthFormat = graphicsDevice.HasDepth24 ? RenderbufferStorage.DepthComponent24 : RenderbufferStorage.DepthComponent16;
-                        stencilFormat = RenderbufferStorage.StencilIndex8;
-                    }
-                    break;
-                case PixelFormat.D32_Float:
-                    if (graphicsDevice.IsOpenGLES2)
-                        throw new NotSupportedException("Only 16 bits depth buffer or 24-8 bits depth-stencil buffer is supported on OpenGLES2");
-                    depthFormat = RenderbufferInternalFormat.DepthComponent32f;
-                    break;
-                case PixelFormat.D32_Float_S8X24_UInt:
-                    if (graphicsDevice.IsOpenGLES2)
-                        throw new NotSupportedException("Only 16 bits depth buffer or 24-8 bits depth-stencil buffer is supported on OpenGLES2");
-                    // no need to check graphicsDevice.HasPackedDepthStencilExtension since supported 32F depth means OpenGL ES 3, so packing is available.
-                    depthFormat = RenderbufferInternalFormat.Depth32fStencil8;
-                    break;
-#endif
-                default:
-                    throw new NotImplementedException();
-            }
-        }
-
-        private static bool InternalHasStencil(PixelFormat format)
-        {
-            switch (format)
-            {
-                case PixelFormat.D32_Float_S8X24_UInt:
-                case PixelFormat.R32_Float_X8X24_Typeless:
-                case PixelFormat.X32_Typeless_G8X24_UInt:
-                case PixelFormat.D24_UNorm_S8_UInt:
-                case PixelFormat.R24_UNorm_X8_Typeless:
-                case PixelFormat.X24_Typeless_G8_UInt:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        internal static bool InternalIsDepthStencilFormat(PixelFormat format)
-        {
-            switch (format)
-            {
-                case PixelFormat.D16_UNorm:
-                case PixelFormat.D32_Float:
-                case PixelFormat.D32_Float_S8X24_UInt:
-                case PixelFormat.R32_Float_X8X24_Typeless:
-                case PixelFormat.X32_Typeless_G8X24_UInt:
-                case PixelFormat.D24_UNorm_S8_UInt:
-                case PixelFormat.R24_UNorm_X8_Typeless:
-                case PixelFormat.X24_Typeless_G8_UInt:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        internal static TextureTarget2d GetTextureTargetForDataSet2D(TextureTarget target, int arrayIndex)
-        {
-            // TODO: Proxy from ES 3.1?
-            if (target == TextureTarget.TextureCubeMap)
-                return TextureTarget2d.TextureCubeMapPositiveX + arrayIndex;
-            return (TextureTarget2d)target;
-        }
-
-        internal static TextureTarget3d GetTextureTargetForDataSet3D(TextureTarget target)
-        {
-            return (TextureTarget3d)target;
-        }
-
-        private static int TextureSetSize(TextureTarget target)
-        {
-            // TODO: improve that
-#if !XENKO_GRAPHICS_API_OPENGLES
-            if (target == TextureTarget.Texture1D)
-                return 1;
-#endif
-            if (target == TextureTarget.Texture3D || target == TextureTarget.Texture2DArray)
-                return 3;
-            return 2;
-        }
-
-        internal void InternalSetSize(int width, int height)
-        {
-            // Set backbuffer actual size
-            textureDescription.Width = width;
-            textureDescription.Height = height;
-        }
-
-        internal static PixelFormat ComputeShaderResourceFormatFromDepthFormat(PixelFormat format)
-        {
-            return format;
-        }
-
-        private bool IsFlipped()
-        {
-            return GraphicsDevice.WindowProvidedRenderTexture == this;
-        }
-
-        private void InitializeStagingPixelBufferObject(DataBox[] dataBoxes)
-        {
-#if XENKO_GRAPHICS_API_OPENGLES
-            if (GraphicsDevice.IsOpenGLES2)
-            {
-                StagingData = Marshal.AllocHGlobal(TextureTotalSize);
-            }
-            else
-#endif
-            {
-                pixelBufferObjectId = GeneratePixelBufferObject(BufferTarget.PixelPackBuffer, PixelStoreParameter.PackAlignment, BufferUsageHint.StreamRead, TextureTotalSize);
-            }
-            UploadInitialData(BufferTarget.PixelPackBuffer, dataBoxes);
-        }
-
-        private void UploadInitialData(BufferTarget bufferTarget, DataBox[] dataBoxes)
-        {
-            // Upload initial data
-            int offset = 0;
-            var bufferData = IntPtr.Zero;
-#if XENKO_GRAPHICS_API_OPENGLES
-            bufferData = StagingData;
-#endif
-
-            if (PixelBufferObjectId != 0)
-            {
-                GL.BindBuffer(bufferTarget, PixelBufferObjectId);
-                bufferData = GL.MapBufferRange(bufferTarget, (IntPtr)0, (IntPtr)TextureTotalSize, BufferAccessMask.MapWriteBit | BufferAccessMask.MapUnsynchronizedBit);
-            }
-
-            if (bufferData != IntPtr.Zero)
-            {
-                for (var arrayIndex = 0; arrayIndex < Description.ArraySize; ++arrayIndex)
-                {
-                    var offsetArray = arrayIndex * Description.MipLevels;
-                    for (int i = 0; i < Description.MipLevels; ++i)
-                    {
-                        IntPtr data = IntPtr.Zero;
-                        var width = CalculateMipSize(Description.Width, i);
-                        var height = CalculateMipSize(Description.Height, i);
-                        var depth = CalculateMipSize(Description.Depth, i);
-                        if (dataBoxes != null && i < dataBoxes.Length)
-                        {
-                            data = dataBoxes[offsetArray + i].DataPointer;
-                        }
-
-                        if (data != IntPtr.Zero)
-                        {
-                            Utilities.CopyMemory(bufferData + offset, data, width * height * depth * TexturePixelSize);
-                        }
-
-                        offset += width*height*TexturePixelSize;
-                    }
-                }
-
-                if (PixelBufferObjectId != 0)
-                {
-                    GL.UnmapBuffer(bufferTarget);
-                    GL.BindBuffer(bufferTarget, 0);
-                }
-            }
-        }
-
-        internal int GeneratePixelBufferObject(BufferTarget target, PixelStoreParameter alignment, BufferUsageHint bufferUsage, int totalSize)
-        {
-            int result;
-
-            GL.GenBuffers(1, out result);
-            GL.BindBuffer(target, result);
-            if (RowPitch < 4)
-                GL.PixelStore(alignment, 1);
-            GL.BufferData(target, totalSize, IntPtr.Zero, bufferUsage);
-            GL.BindBuffer(target, 0);
-
-            return result;
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/UseOpenGLCreationContext.cs b/sources/engine/Xenko.Graphics/OpenGL/UseOpenGLCreationContext.cs
deleted file mode 100644
index 2356980c77..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/UseOpenGLCreationContext.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using OpenTK.Graphics;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    /// <summary>
-    /// Used internally to provide a context for async resource creation
-    /// (such as texture or buffer created on a thread where no context is active).
-    /// </summary>
-    internal struct UseOpenGLCreationContext : IDisposable
-    {
-        public readonly CommandList CommandList;
-
-        private readonly bool useDeviceCreationContext;
-        private readonly bool needUnbindContext;
-
-        private readonly bool asyncCreationLockTaken;
-        private readonly object asyncCreationLockObject;
-
-        private readonly IGraphicsContext deviceCreationContext;
-
-#if XENKO_PLATFORM_ANDROID
-        private readonly bool tegraWorkaround;
-#endif
-
-#if XENKO_PLATFORM_IOS
-        private OpenGLES.EAGLContext previousContext;
-#endif
-
-        public bool UseDeviceCreationContext => useDeviceCreationContext;
-
-        public UseOpenGLCreationContext(GraphicsDevice graphicsDevice)
-            : this()
-        {
-            if (OpenTK.Graphics.GraphicsContext.CurrentContextHandle.Handle == IntPtr.Zero)
-            {
-                needUnbindContext = true;
-                useDeviceCreationContext = true;
-
-#if XENKO_PLATFORM_ANDROID
-                tegraWorkaround = graphicsDevice.Workaround_Context_Tegra2_Tegra3;
-
-                // Notify main rendering thread there is some pending async work to do
-                if (tegraWorkaround)
-                {
-                    useDeviceCreationContext = false; // We actually use real main context, so states will be kept
-                    graphicsDevice.AsyncPendingTaskWaiting = true;
-                }
-#endif
-
-                // Lock, since there is only one deviceCreationContext.
-                // TODO: Support multiple deviceCreationContext (TLS creation of context was crashing, need to investigate why)
-                asyncCreationLockObject = graphicsDevice.asyncCreationLockObject;
-                Monitor.Enter(graphicsDevice.asyncCreationLockObject, ref asyncCreationLockTaken);
-
-#if XENKO_PLATFORM_ANDROID
-                if (tegraWorkaround)
-                    graphicsDevice.AsyncPendingTaskWaiting = false;
-#endif
-
-
-#if XENKO_PLATFORM_IOS
-                previousContext = OpenGLES.EAGLContext.CurrentContext;
-                var localContext = graphicsDevice.ThreadLocalContext.Value;
-                OpenGLES.EAGLContext.SetCurrentContext(localContext);
-#else
-                // Bind the context
-                deviceCreationContext = graphicsDevice.deviceCreationContext;
-                deviceCreationContext.MakeCurrent(graphicsDevice.deviceCreationWindowInfo);
-#endif
-            }
-            else
-            {
-                // TODO Hardcoded to the fact it uses only one command list, this should be fixed
-                CommandList = graphicsDevice.InternalMainCommandList;
-            }
-        }
-
-        public void Dispose()
-        {
-            try
-            {
-                if (needUnbindContext)
-                {
-                    GL.Flush();
-
-#if XENKO_PLATFORM_IOS
-                    if (previousContext != null)
-                        OpenGLES.EAGLContext.SetCurrentContext(previousContext);
-#else
-                    // Restore graphics context
-                    GraphicsDevice.UnbindGraphicsContext(deviceCreationContext);
-#endif
-                }
-            }
-            finally
-            {
-                // Unlock
-                if (asyncCreationLockTaken)
-                {
-#if XENKO_PLATFORM_ANDROID
-                    if (tegraWorkaround)
-                    {
-                        // Notify GraphicsDevice.ExecutePendingTasks() that we are done.
-                        Monitor.Pulse(asyncCreationLockObject);
-                    }
-#endif
-                    Monitor.Exit(asyncCreationLockObject);
-                }
-            }
-        }
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/VertexAttrib.cs b/sources/engine/Xenko.Graphics/OpenGL/VertexAttrib.cs
deleted file mode 100644
index cbee690029..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/VertexAttrib.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_OPENGL
-using System;
-#if XENKO_GRAPHICS_API_OPENGLES
-using OpenTK.Graphics.ES30;
-#else
-using OpenTK.Graphics.OpenGL;
-#endif
-
-namespace Xenko.Graphics
-{
-    internal struct VertexAttrib : IEquatable<VertexAttrib>
-    {
-        public readonly int VertexBufferSlot;
-        public readonly int AttributeIndex;
-        public readonly int Size;
-        public readonly bool IsInteger;
-        public readonly VertexAttribPointerType Type;
-        public readonly bool Normalized;
-        public readonly int Offset;
-
-        public VertexAttrib(int vertexBufferSlot, int attributeIndex, int size, VertexAttribPointerType type, bool normalized, int offset)
-        {
-            VertexBufferSlot = vertexBufferSlot;
-            AttributeIndex = attributeIndex;
-            Size = size;
-            IsInteger = IsIntegerHelper(type);
-            Type = type;
-            Normalized = normalized;
-            Offset = offset;
-        }
-
-        public bool Equals(VertexAttrib other)
-        {
-            return VertexBufferSlot == other.VertexBufferSlot && AttributeIndex == other.AttributeIndex && Size == other.Size && IsInteger.Equals(other.IsInteger) && Type == other.Type && Normalized.Equals(other.Normalized) && Offset.Equals(other.Offset);
-        }
-
-        public override bool Equals(object obj)
-        {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is VertexAttrib && Equals((VertexAttrib) obj);
-        }
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = VertexBufferSlot;
-                hashCode = (hashCode * 397) ^ AttributeIndex;
-                hashCode = (hashCode * 397) ^ Size;
-                hashCode = (hashCode * 397) ^ IsInteger.GetHashCode();
-                hashCode = (hashCode * 397) ^ (int) Type;
-                hashCode = (hashCode * 397) ^ Normalized.GetHashCode();
-                hashCode = (hashCode * 397) ^ Offset;
-                return hashCode;
-            }
-        }
-
-        public static bool operator ==(VertexAttrib left, VertexAttrib right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(VertexAttrib left, VertexAttrib right)
-        {
-            return !left.Equals(right);
-        }
-
-        private static bool IsIntegerHelper(VertexAttribPointerType type)
-        {
-            switch (type)
-            {
-                case VertexAttribPointerType.Byte:
-                case VertexAttribPointerType.UnsignedByte:
-                case VertexAttribPointerType.Short:
-                case VertexAttribPointerType.UnsignedShort:
-                case VertexAttribPointerType.Int:
-                case VertexAttribPointerType.UnsignedInt:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        internal struct ElementFormat
-        {
-            public readonly VertexAttribPointerType Type;
-            public readonly byte Size;
-            public readonly bool Normalized;
-
-            public ElementFormat(VertexAttribPointerType type, byte size, bool normalized = false)
-            {
-                Type = type;
-                Size = size;
-                Normalized = normalized;
-            }
-        }
-
-        internal static ElementFormat ConvertVertexElementFormat(PixelFormat format)
-        {
-            switch (format)
-            {
-                case PixelFormat.R8_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Byte, 1);
-                case PixelFormat.R8_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedByte, 1);
-                case PixelFormat.R16_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Short, 1);
-                case PixelFormat.R16_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedShort, 1);
-                case PixelFormat.R32_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Int, 4);
-                case PixelFormat.R32_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedInt, 4);
-                case PixelFormat.R8G8_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Byte, 2);
-                case PixelFormat.R8G8_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedByte, 2);
-                case PixelFormat.R16G16_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Short, 2);
-                case PixelFormat.R16G16_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedShort, 2);
-                case PixelFormat.R8G8B8A8_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Byte, 4);
-                case PixelFormat.R8G8B8A8_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedByte, 4);
-                case PixelFormat.R16G16B16A16_SInt:
-                    return new ElementFormat(VertexAttribPointerType.Short, 4);
-                case PixelFormat.R16G16B16A16_UInt:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedShort, 4);
-                case PixelFormat.R32_Float:
-                    return new ElementFormat(VertexAttribPointerType.Float, 1);
-                case PixelFormat.R32G32_Float:
-                    return new ElementFormat(VertexAttribPointerType.Float, 2);
-                case PixelFormat.R32G32B32_Float:
-                    return new ElementFormat(VertexAttribPointerType.Float, 3);
-                case PixelFormat.R32G32B32A32_Float:
-                    return new ElementFormat(VertexAttribPointerType.Float, 4);
-                case PixelFormat.R8_UNorm:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedByte, 1, true);
-                case PixelFormat.R8G8_UNorm:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedByte, 2, true);
-                case PixelFormat.R8G8B8A8_UNorm:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedByte, 4, true);
-                case PixelFormat.R8_SNorm:
-                    return new ElementFormat(VertexAttribPointerType.Byte, 1, true);
-                case PixelFormat.R8G8_SNorm:
-                    return new ElementFormat(VertexAttribPointerType.Byte, 2, true);
-                case PixelFormat.R8G8B8A8_SNorm:
-                    return new ElementFormat(VertexAttribPointerType.Byte, 4, true);
-                case PixelFormat.R16_UNorm:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedShort, 1, true);
-                case PixelFormat.R16G16_UNorm:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedShort, 2, true);
-                case PixelFormat.R16G16B16A16_UNorm:
-                    return new ElementFormat(VertexAttribPointerType.UnsignedShort, 4, true);
-                case PixelFormat.R16_SNorm:
-                    return new ElementFormat(VertexAttribPointerType.Short, 1, true);
-                case PixelFormat.R16G16_SNorm:
-                    return new ElementFormat(VertexAttribPointerType.Short, 2, true);
-                case PixelFormat.R16G16B16A16_SNorm:
-                    return new ElementFormat(VertexAttribPointerType.Short, 4, true);
-#if XENKO_GRAPHICS_API_OPENGLES
-                // HALF_FLOAT for OpenGL ES 2.x (OES extension)
-                case PixelFormat.R16G16B16A16_Float:
-                    return new ElementFormat((VertexAttribPointerType)0x8D61, 4); // HALF_FLOAT_OES
-                case PixelFormat.R16G16_Float:
-                    return new ElementFormat((VertexAttribPointerType)0x8D61, 2); // HALF_FLOAT_OES
-#else
-                // HALF_FLOAT for OpenGL and OpenGL ES 3.x (also used for OpenGL ES 2.0 under 3.0 emulator)
-                case PixelFormat.R16G16B16A16_Float:
-                    return new ElementFormat((VertexAttribPointerType)0x8D61, 4); // HALF_FLOAT
-                case PixelFormat.R16G16_Float:
-                    return new ElementFormat((VertexAttribPointerType)0x8D61, 2); // HALF_FLOAT
-#endif
-                default:
-                    throw new NotSupportedException();
-            }
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.Graphics/OpenGL/apply.bat b/sources/engine/Xenko.Graphics/OpenGL/apply.bat
deleted file mode 100644
index db54ae7118..0000000000
--- a/sources/engine/Xenko.Graphics/OpenGL/apply.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-for %%f in (*.cs) do (
-    echo %%f
-    copy %%f temp.txt
-    echo #if %1 > %%f
-    copy %%f+temp.txt %%f
-    echo. >> %%f
-    echo #endif >> %%f
-    del temp.txt
-)
\ No newline at end of file
diff --git a/sources/engine/Xenko.Graphics/PipelineState.cs b/sources/engine/Xenko.Graphics/PipelineState.cs
index ed006b97d3..4c4aac617a 100644
--- a/sources/engine/Xenko.Graphics/PipelineState.cs
+++ b/sources/engine/Xenko.Graphics/PipelineState.cs
@@ -2,33 +2,76 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using Xenko.Core.ReferenceCounting;
+using System.Threading;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Xenko.Graphics
 {
     public partial class PipelineState : GraphicsResourceBase
     {
+        public enum PIPELINE_STATE {
+            LOADING = 0,
+            READY = 1,
+            ERROR = 2
+        };
+
         public int InputBindingCount { get; private set; }
+        internal long storedHash;
 
-        public static PipelineState New(GraphicsDevice graphicsDevice, ref PipelineStateDescription pipelineStateDescription)
+        public static PipelineState New(GraphicsDevice graphicsDevice, PipelineStateDescription pipelineStateDescription, PipelineState existingState, bool forcewait = false)
         {
             // Hash the current state
-            var hashedState = new PipelineStateDescriptionWithHash(pipelineStateDescription);
+            long hashedState = pipelineStateDescription.GetLongHashCode();
 
-            // Store SamplerState in a cache (D3D seems to have quite bad concurrency when using CreateSampler while rendering)
-            PipelineState pipelineState;
-            lock (graphicsDevice.CachedPipelineStates)
-            {
-                if (graphicsDevice.CachedPipelineStates.TryGetValue(hashedState, out pipelineState))
-                {
-                    // TODO: Appropriate destroy
-                    pipelineState.AddReferenceInternal();
+            // do we even need to check the cache? We already have this?
+            if (existingState != null && existingState.storedHash == hashedState)
+                return existingState;
+
+            PipelineState pipelineState = null;
+
+            // check if it is in the cache, or being worked on...
+            bool foundInCache = false;
+
+            lock (graphicsDevice.CachedPipelineStates) {
+                foundInCache = graphicsDevice.CachedPipelineStates.TryGetValue(hashedState, out pipelineState);
+                if (!foundInCache) {
+                    pipelineState = new PipelineState(graphicsDevice); // mark we will work on this pipeline (which is just blank right now)
+                    pipelineState.storedHash = hashedState;
+                    graphicsDevice.CachedPipelineStates[hashedState] = pipelineState;
                 }
-                else
+            }
+
+            // if we have this cached, wait until it is ready to return
+            if (foundInCache) {
+                pipelineState.AddReferenceInternal();
+                return pipelineState;
+            }
+
+            if (GraphicsDevice.Platform == GraphicsPlatform.Vulkan) {
+                // if we are in vulkan, do it in a task to not hold up the rendering thread
+                var cloned = pipelineStateDescription.Clone();
+
+                if (forcewait)
                 {
-                    pipelineState = new PipelineState(graphicsDevice, pipelineStateDescription);
-                    graphicsDevice.CachedPipelineStates.Add(hashedState, pipelineState);
+                    pipelineState.Prepare(cloned);
+                    return pipelineState;
                 }
+
+                // do it as a task for later
+                Xenko.Core.Threading.ThreadPool.Instance.QueueWorkItem(() =>
+                {
+                    pipelineState.Prepare(cloned);
+                });
+
+                return pipelineState;
+            }
+            
+            // D3D seems to have quite bad concurrency when using CreateSampler while rendering
+            lock (graphicsDevice.CachedPipelineStates) {
+                pipelineState.Prepare(pipelineStateDescription);
             }
+
             return pipelineState;
         }
     }
diff --git a/sources/engine/Xenko.Graphics/PipelineStateDescription.cs b/sources/engine/Xenko.Graphics/PipelineStateDescription.cs
index 2502eb9aec..6b50d76c6b 100644
--- a/sources/engine/Xenko.Graphics/PipelineStateDescription.cs
+++ b/sources/engine/Xenko.Graphics/PipelineStateDescription.cs
@@ -79,16 +79,25 @@ public bool Equals(PipelineStateDescription other)
                 && Output == other.Output))
                 return false;
 
-            if ((InputElements != null) != (other.InputElements != null))
-                return false;
-            if (InputElements != null)
+            recheck: if (InputElements != null && other.InputElements != null)
             {
-                for (int i = 0; i < InputElements.Length; ++i)
+                if (InputElements.Length != other.InputElements.Length) return false;
+                try
                 {
-                    if (!InputElements[i].Equals(other.InputElements[i]))
-                        return false;
+                    for (int i = 0; i < InputElements.Length && i < other.InputElements.Length; i++)
+                    {
+                        if (!InputElements[i].Equals(other.InputElements[i]))
+                            return false;
+                    }
+                } catch(Exception e)
+                {
+                    // input elements changed during processing, which should be extremely rare
+                    // but we don't want the engine to die, so lets just recheck
+                    goto recheck;
                 }
             }
+            else if ((InputElements != null) != (other.InputElements != null))
+                return false;
 
             return true;
         }
@@ -113,8 +122,8 @@ public override int GetHashCode()
                 hashCode = (hashCode * 397) ^ DepthStencilState.GetHashCode();
                 if (InputElements != null)
                 {
-                    foreach (var inputElement in InputElements)
-                        hashCode = (hashCode * 397) ^ inputElement.GetHashCode();
+                    for (int i=0; i<InputElements.Length; i++)
+                        hashCode = (hashCode * 397) ^ InputElements[i].GetHashCode();
                 }
 
                 hashCode = (hashCode * 397) ^ (int)PrimitiveType;
@@ -123,6 +132,28 @@ public override int GetHashCode()
             }
         }
 
+        public long GetLongHashCode()
+        {
+            unchecked
+            {
+                long hashCode = RootSignature != null ? RootSignature.GetHashCode() : 271;
+                hashCode = (hashCode * 397) ^ (EffectBytecode != null ? EffectBytecode.GetHashCode() : 541);
+                hashCode = (hashCode * 503) ^ BlendState.GetHashCode();
+                hashCode = (hashCode * 641) ^ (long)SampleMask;
+                hashCode = (hashCode * 773) ^ RasterizerState.GetHashCode();
+                hashCode = (hashCode * 997) ^ DepthStencilState.GetHashCode();
+                if (InputElements != null)
+                {
+                    for (int i = 0; i < InputElements.Length; i++)
+                        hashCode = (hashCode * 127) ^ InputElements[i].GetHashCode();
+                }
+
+                hashCode = (hashCode * 1021) ^ (long)PrimitiveType;
+                hashCode = (hashCode * 1213) ^ Output.GetHashCode();
+                return hashCode;
+            }
+        }
+
         public static bool operator ==(PipelineStateDescription left, PipelineStateDescription right)
         {
             return Equals(left, right);
diff --git a/sources/engine/Xenko.Graphics/PipelineStateDescriptionWithHash.cs b/sources/engine/Xenko.Graphics/PipelineStateDescriptionWithHash.cs
deleted file mode 100644
index 838f0a5c54..0000000000
--- a/sources/engine/Xenko.Graphics/PipelineStateDescriptionWithHash.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-
-namespace Xenko.Graphics
-{
-    internal struct PipelineStateDescriptionWithHash : IEquatable<PipelineStateDescriptionWithHash>
-    {
-        public readonly int Hash;
-        public readonly PipelineStateDescription State;
-
-        public PipelineStateDescriptionWithHash(PipelineStateDescription state)
-        {
-            Hash = state.GetHashCode();
-            State = state;
-        }
-
-        public bool Equals(PipelineStateDescriptionWithHash other)
-        {
-            return Hash == other.Hash && (State == null) == (other.State == null) && (State?.Equals(other.State) ?? true);
-        }
-
-        public override bool Equals(object obj)
-        {
-            return obj is PipelineStateDescriptionWithHash other && Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            return Hash;
-        }
-
-        public static bool operator ==(PipelineStateDescriptionWithHash left, PipelineStateDescriptionWithHash right)
-        {
-            return left.Equals(right);
-        }
-
-        public static bool operator !=(PipelineStateDescriptionWithHash left, PipelineStateDescriptionWithHash right)
-        {
-            return !left.Equals(right);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Graphics/QueryPool.cs b/sources/engine/Xenko.Graphics/QueryPool.cs
index 8630123490..2179dec45e 100644
--- a/sources/engine/Xenko.Graphics/QueryPool.cs
+++ b/sources/engine/Xenko.Graphics/QueryPool.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 namespace Xenko.Graphics
@@ -47,4 +47,4 @@ protected internal override bool OnRecreate()
             return true;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Graphics/RenderTargetGraphicsPresenter.cs b/sources/engine/Xenko.Graphics/RenderTargetGraphicsPresenter.cs
index e7695c5f9b..7b8c0dc281 100644
--- a/sources/engine/Xenko.Graphics/RenderTargetGraphicsPresenter.cs
+++ b/sources/engine/Xenko.Graphics/RenderTargetGraphicsPresenter.cs
@@ -79,7 +79,7 @@ public override object NativePresenter
             }
         }
 
-        public override bool IsFullScreen
+        public override bool InternalFullscreen
         {
             get
             {
diff --git a/sources/engine/Xenko.Graphics/Rendering/EffectInstance.cs b/sources/engine/Xenko.Graphics/Rendering/EffectInstance.cs
index dffb034c02..4aa8656ce2 100644
--- a/sources/engine/Xenko.Graphics/Rendering/EffectInstance.cs
+++ b/sources/engine/Xenko.Graphics/Rendering/EffectInstance.cs
@@ -110,7 +110,7 @@ public void Apply(GraphicsContext graphicsContext)
             for (int i = 0; i < descriptorSets.Length; ++i)
                 descriptorSets[i] = resourceGroups[i].DescriptorSet;
 
-            commandList.SetDescriptorSets(0, descriptorSets);
+            commandList.SetDescriptorSets(descriptorSets);
         }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/RenderingSettings.cs b/sources/engine/Xenko.Graphics/RenderingSettings.cs
index a27364c95b..b771a83b67 100644
--- a/sources/engine/Xenko.Graphics/RenderingSettings.cs
+++ b/sources/engine/Xenko.Graphics/RenderingSettings.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.ComponentModel;
 using Xenko.Core;
 using Xenko.Data;
 
@@ -65,7 +66,7 @@ public enum PreferredGraphicsPlatform
     }
 
     [DataContract]
-    [Display("Rendering")]
+    [Display("Core/Rendering")]
     public class RenderingSettings : Configuration
     {
         /// <summary>
@@ -104,7 +105,7 @@ public class RenderingSettings : Configuration
         /// </summary>
         /// <userdoc>The graphics feature level this game require.</userdoc>
         [DataMember(20)]
-        public GraphicsProfile DefaultGraphicsProfile = GraphicsProfile.Level_10_0;
+        public GraphicsProfile DefaultGraphicsProfile => GraphicsProfile.Level_11_2;
 
         /// <summary>
         /// Gets or sets the colorspace.
@@ -120,5 +121,82 @@ public class RenderingSettings : Configuration
         /// <userdoc>The display orientations this game support.</userdoc>
         [DataMember(40)]
         public RequiredDisplayOrientation DisplayOrientation = RequiredDisplayOrientation.Default;
+
+        /// <summary>
+        /// Are mesh models by default shadow casters? Used for initialization of value only.
+        /// </summary>
+        [DataMember(50)]
+        [DefaultValue(true)]
+        public bool DefaultShadowCasters { get; set; } = true;
+
+        /// <summary>
+        /// Store vertex buffers for later use (like batching) that are less than this size. Used for initialization of value only.
+        /// </summary>
+        [DataMember(60)]
+        [DefaultValue(32768)]
+        public int CaptureVertexBufferOfSize { get; set; } = 32768;
+
+        /// <summary>
+        /// Store index buffers for later use (like batching) that are less than this size. Used for initialization of value only.
+        /// </summary>
+        [DataMember(70)]
+        [DefaultValue(8192)]
+        public int CaptureIndexBufferOfSize { get; set; } = 8192;
+
+        /// <summary>
+        /// How big should the Vulkan upload buffer be in megabytes? It is ring recycled. Bigger buffers may be needed for very frequent large uploads. Defaults to 256.
+        /// </summary>
+        [DataMember(75)]
+        [DefaultValue(256)]
+        public int UploadBufferSizeInMB { get; set; } = 256;
+
+        /// <summary>
+        /// How big should the Vulkan "Large" StagedMeshBuffer be
+        /// </summary>
+        [DataMember(76)]
+        [DefaultValue(500000)]
+        public int LargePooledBufferSize { get; set; } = 500000;
+
+        /// <summary>
+        /// How big should the Vulkan upload buffer be in megabytes? It is ring recycled. Bigger buffers may be needed for very frequent large uploads. Defaults to 128.
+        /// </summary>
+        [DataMember(77)]
+        [DefaultValue(1000)]
+        public int LargedPooledBufferCount { get; set; } = 1000;
+
+        /// <summary>
+        /// How big should the Vulkan upload buffer be in megabytes? It is ring recycled. Bigger buffers may be needed for very frequent large uploads. Defaults to 128.
+        /// </summary>
+        [DataMember(78)]
+        [DefaultValue(90000)]
+        public int SmallPooledBufferSize { get; set; } = 90000;
+
+        /// <summary>
+        /// How big should the Vulkan upload buffer be in megabytes? It is ring recycled. Bigger buffers may be needed for very frequent large uploads. Defaults to 128.
+        /// </summary>
+        [DataMember(79)]
+        [DefaultValue(3000)]
+        public int SmallPooledBufferCount { get; set; } = 3000;
+
+        /// <summary>
+        /// Disable generating error log files in My Documents (default location)? Can be configured via ErrorFileLogger class
+        /// </summary>
+        [DataMember(80)]
+        [DefaultValue(false)]
+        public bool DisableErrorFileLog { get; set; } = false;
+
+        /// <summary>
+        /// Cull small things? 0f (the default) disables this feature. Higher numbers cull more things from being rendered.
+        /// </summary>
+        [DataMember(90)]
+        [DefaultValue(0.002f)]
+        public float SmallCullFactor { get; set; } = 0.002f;
+
+        /// <summary>
+        /// Cull small things from casting shadows? 0f disables this feature. Higher numbers cull more things from being shadowed.
+        /// </summary>
+        [DataMember(100)]
+        [DefaultValue(0.2f)]
+        public float SmallShadowCullFactor { get; set; } = 0.2f;
     }
 }
diff --git a/sources/engine/Xenko.Graphics/ResourceGroupAllocator.cs b/sources/engine/Xenko.Graphics/ResourceGroupAllocator.cs
index a7c807cf65..3469a71b5f 100644
--- a/sources/engine/Xenko.Graphics/ResourceGroupAllocator.cs
+++ b/sources/engine/Xenko.Graphics/ResourceGroupAllocator.cs
@@ -30,13 +30,18 @@ public class ResourceGroupAllocator : ComponentBase
 
         private CommandList commandList;
 
-        public ResourceGroupAllocator(GraphicsResourceAllocator allocator, CommandList commandList)
+        private const int POOLSIZE = 1024 * 1024 * 4;
+
+        public ResourceGroupAllocator(GraphicsResourceAllocator allocator, CommandList commandList, int initialCount)
         {
             this.allocator = allocator;
             this.commandList = commandList;
             this.graphicsDevice = commandList.GraphicsDevice;
 
             SetupNextDescriptorPool();
+
+            for (int i=0; i<initialCount; i++)
+                bufferPools.Add(currentBufferPool = BufferPool.New(allocator, graphicsDevice, POOLSIZE, 4, commandList));
         }
 
         protected override void Destroy()
@@ -125,19 +130,17 @@ public void PrepareResourceGroup(ResourceGroupLayout resourceGroupLayout, Buffer
 
         private void SetupNextBufferPool()
         {
-            Flush();
-
             currentBufferPoolIndex++;
             if (currentBufferPoolIndex >= bufferPools.Count)
             {
-                bufferPools.Add(currentBufferPool = BufferPool.New(allocator, graphicsDevice, 1024 * 1024));
+                bufferPools.Add(currentBufferPool = BufferPool.New(allocator, graphicsDevice, POOLSIZE, 4));
+                currentBufferPool.Map(commandList);
             }
             else
             {
                 currentBufferPool = bufferPools[currentBufferPoolIndex];
+                currentBufferPool.commandList = commandList;
             }
-
-            currentBufferPool.Map(commandList);
         }
 
         private void SetupNextDescriptorPool()
diff --git a/sources/engine/Xenko.Graphics/SDL/Application.cs b/sources/engine/Xenko.Graphics/SDL/Application.cs
index fbb90895fe..9ab3ac8b7f 100644
--- a/sources/engine/Xenko.Graphics/SDL/Application.cs
+++ b/sources/engine/Xenko.Graphics/SDL/Application.cs
@@ -160,6 +160,12 @@ public static void ProcessEvent(SDL.SDL_Event e)
                     ctrl = WindowFromSdlHandle(SDL.SDL_GetWindowFromID(e.text.windowID));
                     break;
 
+                case SDL.SDL_EventType.SDL_FINGERMOTION:
+                case SDL.SDL_EventType.SDL_FINGERDOWN:
+                case SDL.SDL_EventType.SDL_FINGERUP:
+                    ctrl = WindowWithFocus;
+                    break;
+
                 case SDL.SDL_EventType.SDL_WINDOWEVENT:
                 {
                     ctrl = WindowFromSdlHandle(SDL.SDL_GetWindowFromID(e.window.windowID));
diff --git a/sources/engine/Xenko.Graphics/SDL/Window.cs b/sources/engine/Xenko.Graphics/SDL/Window.cs
index ff9d2570a4..8a3b6840b7 100644
--- a/sources/engine/Xenko.Graphics/SDL/Window.cs
+++ b/sources/engine/Xenko.Graphics/SDL/Window.cs
@@ -6,6 +6,9 @@
 
 namespace Xenko.Graphics.SDL
 {
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Reflection;
 #pragma warning disable SA1200 // Using directives must be placed correctly
     // Using is here otherwise it would conflict with the current namespace that also defines SDL.
     using SDL2;
@@ -18,11 +21,18 @@ public class Window : IDisposable
 
         #region Initialization
 
+        private SDL.SDL_Rect displayBounds;
+
+        internal static bool _makeDefaultResolutionOnCrash = true;
+
         /// <summary>
         /// Initializes static members of the <see cref="Window"/> class.
         /// </summary>
         static Window()
         {
+            // Preload proper SDL native library (depending on CPU type)
+            Core.NativeLibrary.PreloadLibrary("SDL2.dll", typeof(Window));
+
             SDL.SDL_Init(SDL.SDL_INIT_EVERYTHING);
 #if XENKO_GRAPHICS_API_OPENGL
             // Set our OpenGL version. It has to be done before any SDL window creation
@@ -39,62 +49,180 @@ static Window()
 #endif
         }
 
+        /// <summary>
+        /// Get the current display information of the display (defaults to 0, the first display).
+        /// </summary>
+        public static void GetDisplayInformation(out int width, out int height, out int refresh_rate, int display = 0) {
+            SDL.SDL_GetDesktopDisplayMode(display, out SDL.SDL_DisplayMode mode);
+            width = mode.w;
+            height = mode.h;
+            refresh_rate = mode.refresh_rate;
+        }
+
+        /// <summary>
+        /// Gets which display index this window is on.
+        /// </summary>
+        /// <returns></returns>
+        public int GetWindowDisplay() {
+            return SDL.SDL_GetWindowDisplayIndex(SdlHandle);
+        }
+
+        /// <summary>
+        /// Debug method of generating a Vulkan crash report
+        /// </summary>
+        public static bool _GenerateVulkanDeviceLostCrash = false;
+
+        /// <summary>
+        /// Returns a list of supported resolutions and refresh rates.
+        /// </summary>
+        /// <returns>List of width, height and refresh rates</returns>
+        public static List<Vector3> GetDisplayModes(bool maxRefreshOnly = true, int display = 0)
+        {
+            int modes = SDL.SDL_GetNumDisplayModes(display);
+            List<Vector3> modeList = new List<Vector3>();
+            for (int i=0; i<modes; i++)
+            {
+                SDL.SDL_GetDisplayMode(display, i, out var mode);
+                if (maxRefreshOnly)
+                {
+                    for (int j=0; j<modeList.Count; j++)
+                    {
+                        if (modeList[j].X == mode.w &&
+                            modeList[j].Y == mode.h &&
+                            modeList[j].Z < mode.refresh_rate)
+                        {
+                            modeList[j] = new Vector3(mode.w, mode.h, mode.refresh_rate);
+                            goto next_mode;
+                        }
+                    }
+                }
+                modeList.Add(new Vector3(mode.w, mode.h, mode.refresh_rate));
+                next_mode:;
+            }
+            return modeList;
+        }
+
+        internal static void GenerateGenericError(Exception e = null, string msg = null, string title = "Error in Application")
+        {
+            string error = msg ?? "There was an error!";
+            if (e != null) error += "\n\nException: " + e.ToString();
+            SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR, title, error, IntPtr.Zero);
+            Console.Error.WriteLine(error);
+            Console.Out.WriteLine(error);
+            throw new Exception(error);
+        }
+
+        internal static void GenerateGenericInfo(string msg = null, string title = "Info")
+        {
+            string error = msg ?? "No info proivded!";
+            SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_INFORMATION, title, error, IntPtr.Zero);
+            Console.Error.WriteLine(error);
+            Console.Out.WriteLine(error);
+        }
+
+        internal static void GenerateCreationError(Exception e = null)
+        {
+            string error = "There was an error making the game window. Does your video card support Vulkan?\nMake sure your video drivers are up to date and check Vulkan compatibility.\n\nError: " + SDL.SDL_GetError();
+            if (e != null) error += "\n\nException: " + e.ToString();
+            SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR, "Failed to make Game Window", error, IntPtr.Zero);
+            Console.Error.WriteLine(error);
+            Console.Out.WriteLine(error);
+            throw new Exception(error);
+        }
+
+        internal static void GenerateSwapchainError(string err)
+        {
+            string error = "There was an error rendering to the screen. This is usually caused by ALT+TAB or switching desktops.\nOtherwise, try these things to fix it:\n\n1) Update your video drivers to latest\n2) Turn off 'fix apps that are blurry' in Windows 10\n3) Disable display scaling (use 100% display scale)\n4) Use a lower resolution or windowed-mode\n\nMonitor configurations or invalid resolution settings may also be to blame." + (_makeDefaultResolutionOnCrash ? "\nResolution settings have been set to default for the next run." : "");
+            if (err != null) error += "\n\nDetails: " + err;
+            if (_makeDefaultResolutionOnCrash)
+            {
+                try
+                {
+                    System.IO.File.WriteAllText(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location) + "/DefaultResolution.txt",
+                                                "1280\n" +
+                                                "720\n" +
+                                                "window\n" +
+                                                "-1\n" +
+                                                "0");
+                }
+                catch (Exception e2) { }
+            }
+            SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR, "Failed to Render To Screen", error, IntPtr.Zero);
+            Console.Error.WriteLine(error);
+            Console.Out.WriteLine(error);
+            throw new Exception(error);
+        }
+
+        internal static void GeneratePresentError()
+        {
+            string error = "There was an error drawing to the screen. This is very likely due to old video drivers.\n\nPlease visit NVIDIA's, AMD's or Intel's website to update to the latest video drivers available.\nIf that doesn't help, report this issue in a forum or Discord server.";
+            SDL.SDL_ShowSimpleMessageBox(SDL.SDL_MessageBoxFlags.SDL_MESSAGEBOX_ERROR, "Present Error! Try updating Video Drivers", error, IntPtr.Zero);
+            Console.Error.WriteLine(error);
+            throw new Exception(error);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Window"/> class with <paramref name="title"/> as the title of the Window.
         /// </summary>
         /// <param name="title">Title of the window, see Text property.</param>
-        public Window(string title)
+        public Window(string title, int width, int height, bool fullscreen, int display_index)
         {
-#if XENKO_GRAPHICS_API_OPENGL
-            var flags = SDL.SDL_WindowFlags.SDL_WINDOW_HIDDEN | SDL.SDL_WindowFlags.SDL_WINDOW_OPENGL;
-#elif XENKO_GRAPHICS_API_VULKAN
-            var flags = SDL.SDL_WindowFlags.SDL_WINDOW_HIDDEN | SDL.SDL_WindowFlags.SDL_WINDOW_VULKAN;
-#else
-            var flags = SDL.SDL_WindowFlags.SDL_WINDOW_HIDDEN;
-#endif
-            // Create the SDL window and then extract the native handle.
-            SdlHandle = SDL.SDL_CreateWindow(title, SDL.SDL_WINDOWPOS_UNDEFINED, SDL.SDL_WINDOWPOS_UNDEFINED, 640, 480, flags);
+            var flags = SDL.SDL_WindowFlags.SDL_WINDOW_VULKAN | SDL.SDL_WindowFlags.SDL_WINDOW_ALLOW_HIGHDPI;
+
+            // don't try using a resolution too large
+            SDL.SDL_GetDesktopDisplayMode(display_index, out SDL.SDL_DisplayMode mode);
+            if (mode.w <= width || mode.h <= height)
+            {
+                flags |= SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
+                width = mode.w;
+                height = mode.h;
+            }
+            else if (fullscreen)
+                flags |= SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN;
+
+            OriginalSize = new Size2(width, height);
+
+            // bounds so we know where this display is
+            SDL.SDL_GetDisplayBounds(display_index, out displayBounds);
+
+            try
+            {
+                // Create the SDL window and then extract the native handle.
+                SdlHandle = SDL.SDL_CreateWindow(title, displayBounds.x + (displayBounds.w / 2) - (width / 2), displayBounds.y + (displayBounds.h / 2) - (height / 2), width, height, flags);
+            }
+            catch(Exception e)
+            {
+                GenerateCreationError(e);
+            }
 
             if (SdlHandle == IntPtr.Zero)
             {
-                throw new Exception("Cannot allocate SDL Window: " + SDL.SDL_GetError()); 
+                GenerateCreationError();
             }
             else
             {
                 SDL.SDL_SysWMinfo info = default(SDL.SDL_SysWMinfo);
-                SDL.SDL_VERSION(out info.version);
-                if (SDL.SDL_GetWindowWMInfo(SdlHandle, ref info) == SDL.SDL_bool.SDL_FALSE)
+
+                try
                 {
-                    throw new Exception("Cannot get Window information: " + SDL.SDL_GetError());
-                }
-                else
+                    SDL.SDL_VERSION(out info.version);
+                    if (SDL.SDL_GetWindowWMInfo(SdlHandle, ref info) == SDL.SDL_bool.SDL_FALSE)
+                        GenerateCreationError();
+                } catch (Exception e)
                 {
+                    GenerateCreationError(e);
+                }
+
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
-                    Handle = info.info.win.window;
+                Handle = info.info.win.window;
 #elif XENKO_PLATFORM_LINUX
-                    Handle = info.info.x11.window;
-                    Display = info.info.x11.display;
+                Handle = info.info.x11.window;
+                Display = info.info.x11.display;
 #elif XENKO_PLATFORM_MACOS
-                    Handle = info.info.cocoa.window;
+                Handle = info.info.cocoa.window;
 #endif
-                }
                 Application.RegisterWindow(this);
                 Application.ProcessEvents();
-
-#if XENKO_GRAPHICS_API_OPENGL
-                glContext = SDL.SDL_GL_CreateContext(SdlHandle);
-                if (glContext == IntPtr.Zero)
-                {
-                    throw new Exception("Cannot create OpenGL context: " + SDL.SDL_GetError());
-                }
-
-                // The external context must be made current to initialize OpenGL
-                SDL.SDL_GL_MakeCurrent(SdlHandle, glContext);
-
-                // Create a dummy OpenTK context, that will be used to call some OpenGL features
-                // we need to later create the various context in GraphicsDevice.OpenGL.
-                DummyGLContext = new OpenTK.Graphics.GraphicsContext(new OpenTK.ContextHandle(glContext), SDL.SDL_GL_GetProcAddress, () => new OpenTK.ContextHandle(SDL.SDL_GL_GetCurrentContext()));
-#endif
             }
         }
         #endregion
@@ -172,6 +300,11 @@ public void Show()
             SDL.SDL_ShowWindow(SdlHandle);
         }
 
+        public static int GetNumberOfDisplays()
+        {
+            return SDL.SDL_GetNumVideoDisplays();
+        }
+
         /// <summary>
         /// Are we showing the window in full screen mode?
         /// </summary>
@@ -179,14 +312,38 @@ public bool IsFullScreen
         {
             get
             {
-                return (SDL.SDL_GetWindowFlags(SdlHandle) & (uint)SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN) != 0;
+                uint flags = SDL.SDL_GetWindowFlags(SdlHandle);
+                return (flags & (uint)SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN) != 0 ||
+                       (flags & (uint)SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP) != 0;
+
             }
             set
             {
-                SDL.SDL_SetWindowFullscreen(SdlHandle, (uint)(value ? SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN : 0));
+                if (IsFullScreen == value) return;
+                int displayIndex = SDL.SDL_GetWindowDisplayIndex(SdlHandle);
+                SDL.SDL_GetDesktopDisplayMode(displayIndex, out SDL.SDL_DisplayMode nativemode);
+                SDL.SDL_GetDisplayBounds(displayIndex, out displayBounds);
+                if (value) {
+                    Location = new Point(displayBounds.x, displayBounds.y);
+                    SDL.SDL_SetWindowFullscreen(SdlHandle, nativemode.w <= ClientSize.Width || nativemode.h <= ClientSize.Height ? (uint)SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP : (uint)SDL.SDL_WindowFlags.SDL_WINDOW_FULLSCREEN);
+                }
+                else {
+                    Location = new Point(displayBounds.x + (int)((nativemode.w - ClientSize.Width) * 0.5f),
+                                         displayBounds.y + (int)((nativemode.h - ClientSize.Height) * 0.5));
+                    SDL.SDL_SetWindowFullscreen(SdlHandle, 0);
+                }
             }
         }
 
+        public void RecenterWindow()
+        {
+            int displayIndex = SDL.SDL_GetWindowDisplayIndex(SdlHandle);
+            SDL.SDL_GetDesktopDisplayMode(displayIndex, out SDL.SDL_DisplayMode nativemode);
+            SDL.SDL_GetDisplayBounds(displayIndex, out displayBounds);
+            Location = new Point(displayBounds.x + (int)((nativemode.w - ClientSize.Width) * 0.5f),
+                                 displayBounds.y + (int)((nativemode.h - ClientSize.Height) * 0.5));
+        }
+
         /// <summary>
         /// Is current window visible?
         /// </summary>
@@ -278,6 +435,8 @@ public bool MaximizeBox
             }
         }
 
+        public Size2? OriginalSize { get; private set; }
+
         /// <summary>
         /// Size of window.
         /// </summary>
@@ -289,7 +448,11 @@ public Size2 Size
                 SDL.SDL_GetWindowSize(SdlHandle, out w, out h);
                 return new Size2(w, h);
             }
-            set { SDL.SDL_SetWindowSize(SdlHandle, value.Width, value.Height); }
+            set 
+            {
+                if (Size != value)
+                    SDL.SDL_SetWindowSize(SdlHandle, value.Width, value.Height);
+            }
         }
 
         /// <summary>
@@ -299,20 +462,11 @@ public unsafe Size2 ClientSize
         {
             get
             {
-#if XENKO_GRAPHICS_API_OPENGL || XENKO_GRAPHICS_API_VULKAN
-                int w, h;
-                SDL.SDL_GL_GetDrawableSize(SdlHandle, out w, out h);
-                return new Size2(w, h);
-#else
-                SDL.SDL_Surface *surfPtr = (SDL.SDL_Surface*)SDL.SDL_GetWindowSurface(SdlHandle);
-                return new Size2(surfPtr->w, surfPtr->h);
-#endif
+                return Size;
             }
             set
             {
-                    // FIXME: We need to adapt the ClientSize to an actual Size to take into account borders.
-                    // FIXME: On Windows you do this by using AdjustWindowRect.
-                SDL.SDL_SetWindowSize(SdlHandle, value.Width, value.Height);
+                Size = value;
             }
         }
 
@@ -390,6 +544,11 @@ public FormBorderStyle FormBorderStyle
             }
         }
 
+        public void SetRelativeMouseMode(bool enabled)
+        {
+            SDL.SDL_SetRelativeMouseMode(enabled ? SDL.SDL_bool.SDL_TRUE : SDL.SDL_bool.SDL_FALSE);
+        }
+
         // Events that one can hook up.
         public delegate void MouseButtonDelegate(SDL.SDL_MouseButtonEvent e);
         public delegate void MouseMoveDelegate(SDL.SDL_MouseMotionEvent e);
@@ -399,6 +558,7 @@ public FormBorderStyle FormBorderStyle
         public delegate void WindowEventDelegate(SDL.SDL_WindowEvent e);
         public delegate void KeyDelegate(SDL.SDL_KeyboardEvent e);
         public delegate void JoystickDeviceChangedDelegate(int which);
+        public delegate void TouchFingerDelegate(SDL.SDL_TouchFingerEvent e);
         public delegate void NotificationDelegate();
 
         public event MouseButtonDelegate PointerButtonPressActions;
@@ -412,6 +572,9 @@ public FormBorderStyle FormBorderStyle
         public event NotificationDelegate CloseActions;
         public event JoystickDeviceChangedDelegate JoystickDeviceAdded;
         public event JoystickDeviceChangedDelegate JoystickDeviceRemoved;
+        public event TouchFingerDelegate FingerMoveActions;
+        public event TouchFingerDelegate FingerPressActions;
+        public event TouchFingerDelegate FingerReleaseActions;
         public event WindowEventDelegate ResizeBeginActions;
         public event WindowEventDelegate ResizeEndActions;
         public event WindowEventDelegate ActivateActions;
@@ -476,6 +639,18 @@ public virtual void ProcessEvent(SDL.SDL_Event e)
                     JoystickDeviceRemoved?.Invoke(e.jdevice.which);
                     break;
 
+                case SDL.SDL_EventType.SDL_FINGERMOTION:
+                    FingerMoveActions?.Invoke(e.tfinger);
+                    break;
+
+                case SDL.SDL_EventType.SDL_FINGERDOWN:
+                    FingerPressActions?.Invoke(e.tfinger);
+                    break;
+
+                case SDL.SDL_EventType.SDL_FINGERUP:
+                    FingerReleaseActions?.Invoke(e.tfinger);
+                    break;
+
                 case SDL.SDL_EventType.SDL_WINDOWEVENT:
                 {
                     switch (e.window.windowEvent)
@@ -521,10 +696,12 @@ public virtual void ProcessEvent(SDL.SDL_Event e)
                             break;
 
                         case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_FOCUS_GAINED:
+                            e.window.data1 = IsFullScreen ? 1 : 0;
                             FocusGainedActions?.Invoke(e.window);
                             break;
 
                         case SDL.SDL_WindowEventID.SDL_WINDOWEVENT_FOCUS_LOST:
+                            e.window.data1 = IsFullScreen ? 2 : 0;
                             FocusLostActions?.Invoke(e.window);
                             break;
                     }
diff --git a/sources/engine/Xenko.Graphics/SamplerState.cs b/sources/engine/Xenko.Graphics/SamplerState.cs
index 9c40699056..0db2368e2b 100644
--- a/sources/engine/Xenko.Graphics/SamplerState.cs
+++ b/sources/engine/Xenko.Graphics/SamplerState.cs
@@ -26,19 +26,26 @@ public static SamplerState New(GraphicsDevice graphicsDevice, SamplerStateDescri
         {
             // Store SamplerState in a cache (D3D seems to have quite bad concurrency when using CreateSampler while rendering)
             SamplerState samplerState;
-            lock (graphicsDevice.CachedSamplerStates)
-            {
-                if (graphicsDevice.CachedSamplerStates.TryGetValue(samplerStateDescription, out samplerState))
-                {
+
+            if (GraphicsDevice.Platform == GraphicsPlatform.Vulkan) {
+                if (graphicsDevice.CachedSamplerStates.TryGetValue(samplerStateDescription, out samplerState)) {
                     // TODO: Appropriate destroy
                     samplerState.AddReferenceInternal();
+                } else {
+                    graphicsDevice.CachedSamplerStates.TryAdd(samplerStateDescription, samplerState = new SamplerState(graphicsDevice, samplerStateDescription));
                 }
-                else
-                {
-                    samplerState = new SamplerState(graphicsDevice, samplerStateDescription);
-                    graphicsDevice.CachedSamplerStates.Add(samplerStateDescription, samplerState);
+            } else {
+                lock (graphicsDevice.CachedSamplerStates) {
+                    if (graphicsDevice.CachedSamplerStates.TryGetValue(samplerStateDescription, out samplerState)) {
+                        // TODO: Appropriate destroy
+                        samplerState.AddReferenceInternal();
+                    } else {
+                        samplerState = new SamplerState(graphicsDevice, samplerStateDescription);
+                        graphicsDevice.CachedSamplerStates.TryAdd(samplerStateDescription, samplerState);
+                    }
                 }
             }
+
             return samplerState;
         }
         
@@ -54,9 +61,12 @@ public static SamplerState NewFake(SamplerStateDescription description)
 
         protected override void Destroy()
         {
-            lock (GraphicsDevice.CachedSamplerStates)
-            {
-                GraphicsDevice.CachedSamplerStates.Remove(Description);
+            if (GraphicsDevice.Platform == GraphicsPlatform.Vulkan) {
+                GraphicsDevice.CachedSamplerStates.TryRemove(Description, out SamplerState junk);
+            } else {
+                lock (GraphicsDevice.CachedSamplerStates) {
+                    GraphicsDevice.CachedSamplerStates.TryRemove(Description, out SamplerState junk);
+                }
             }
 
             base.Destroy();
diff --git a/sources/engine/Xenko.Graphics/Shaders.Bytecodes/CompileShaders.cmd b/sources/engine/Xenko.Graphics/Shaders.Bytecodes/CompileShaders.cmd
index afe866fe97..2470dceff8 100644
--- a/sources/engine/Xenko.Graphics/Shaders.Bytecodes/CompileShaders.cmd
+++ b/sources/engine/Xenko.Graphics/Shaders.Bytecodes/CompileShaders.cmd
@@ -1,8 +1,8 @@
 @echo off
 setlocal
 set XenkoSdkDir=%~dp0..\..\..\..\
-set XenkoSdkBinDir=%XenkoSdkDir%Bin\Windows\
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows-OpenGL --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows-OpenGLES --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows-Vulkan --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
\ No newline at end of file
+set XenkoAssetCompiler=%XenkoSdkDir%sources\assets\Xenko.Core.Assets.CompilerApp\bin\Debug\net48\Xenko.Core.Assets.CompilerApp.exe
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win-opengl --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win-opengles --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win-vulkan --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
diff --git a/sources/engine/Xenko.Graphics/Shaders.Bytecodes/GameSettings.xkgamesettings b/sources/engine/Xenko.Graphics/Shaders.Bytecodes/GameSettings.xkgamesettings
index b61e79b76e..066f5484f7 100644
--- a/sources/engine/Xenko.Graphics/Shaders.Bytecodes/GameSettings.xkgamesettings
+++ b/sources/engine/Xenko.Graphics/Shaders.Bytecodes/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 6B842923-F59C-4216-BD5C-A44F2A656E3C
-SerializedVersion: {Xenko: 1.6.0-beta}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Defaults:
     - !Xenko.Assets.EditorSettings,Xenko.Assets
diff --git a/sources/engine/Xenko.Graphics/Shaders.Bytecodes/Graphics.xkpkg b/sources/engine/Xenko.Graphics/Shaders.Bytecodes/Graphics.xkpkg
index 71667ed208..eafb3483da 100644
--- a/sources/engine/Xenko.Graphics/Shaders.Bytecodes/Graphics.xkpkg
+++ b/sources/engine/Xenko.Graphics/Shaders.Bytecodes/Graphics.xkpkg
@@ -1,18 +1,9 @@
 !Package
 Id: 889FEA71-A58F-4415-98C6-92DE24737BE4
+SerializedVersion: {Assets: 3.1.0.0}
 Meta:
     Name: Xenko.Graphics
     Version: 1.0.0
-Profiles:
-    -   Name: Shared
-        AssetFolders:
-            - Path: ../Shaders
-            - Path: .
-    -   Name: Windows
-        Platform: Windows
-    -   Name: Windows-OpenGL
-        Platform: Windows
-    -   Name: Windows-OpenGLES
-        Platform: Windows
-    -   Name: Windows-Vulkan
-        Platform: Windows
+AssetFolders:
+    - Path: ../Shaders
+    - Path: .
diff --git a/sources/engine/Xenko.Graphics/Shaders/ColorUtility.cs b/sources/engine/Xenko.Graphics/Shaders/ColorUtility.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/ColorUtility.cs
rename to sources/engine/Xenko.Graphics/Shaders/ColorUtility.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/ShaderBase.cs b/sources/engine/Xenko.Graphics/Shaders/ShaderBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/ShaderBase.cs
rename to sources/engine/Xenko.Graphics/Shaders/ShaderBase.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.xksl b/sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.xksl
index 4c7ce7b33c..b0fc2ef189 100644
--- a/sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.xksl
+++ b/sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.xksl
@@ -31,5 +31,9 @@ shader ShaderBaseStream
     stage stream float DepthLessEqual : SV_DepthLessEqual; // Special output after PS
 
     // Default InstanceId for VS/GS shaders
+#if XENKO_GRAPHICS_API_DIRECT3D
     stage stream uint InstanceID : SV_InstanceID;
+#else
+    stage stream uint InstanceID : gl_InstanceIndex; // Vulkan term
+#endif
 };
diff --git a/sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.cs b/sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.cs
rename to sources/engine/Xenko.Graphics/Shaders/ShaderBaseStream.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFont.cs b/sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFont.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFont.cs
rename to sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFont.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFontShader.cs b/sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFontShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFontShader.cs
rename to sources/engine/Xenko.Graphics/Shaders/SignedDistanceFieldFontShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteAlphaCutoff.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteAlphaCutoff.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteAlphaCutoff.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteAlphaCutoff.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteBase.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteBase.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteBase.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteBatch.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteBatch.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteBatch.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteBatch.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteBatchShader.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteBatchShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteBatchShader.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteBatchShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteEffect.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteEffect.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteEffect.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteEffect.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTexture.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTexture.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTexture.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTexture.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTextureRegular.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTextureRegular.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTextureRegular.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteEffectExtTextureRegular.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.xksl b/sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.xksl
index e4cf1b8110..6ef84d95bd 100644
--- a/sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.xksl
+++ b/sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.xksl
@@ -2,13 +2,11 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 shader SpriteSignedDistanceFieldFontShader : SpriteBase, SignedDistanceFieldFont
 {
-    // Color used to tint the sprite
-    [Color]
-    stage float4 Color = float4(1,1,1,1);
+    stage stream float4 Color : COLOR;
 
     // Shading of the sprite
     stage override float4 Shading()
     {
-        return FontColor(base.Shading(), Color, float4(0,0,0,1), 0.f);
+        return FontColor(base.Shading(), streams.Color, float4(0,0,0,1), 0.f);
     }
 };
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteSignedDistanceFieldFontShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/SpriteSuperSampler.cs b/sources/engine/Xenko.Graphics/Shaders/SpriteSuperSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/SpriteSuperSampler.cs
rename to sources/engine/Xenko.Graphics/Shaders/SpriteSuperSampler.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/Texturing.cs b/sources/engine/Xenko.Graphics/Shaders/Texturing.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/Texturing.cs
rename to sources/engine/Xenko.Graphics/Shaders/Texturing.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/UIEffect.cs b/sources/engine/Xenko.Graphics/Shaders/UIEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/UIEffect.cs
rename to sources/engine/Xenko.Graphics/Shaders/UIEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders/UIEffectShader.cs b/sources/engine/Xenko.Graphics/Shaders/UIEffectShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Graphics/Shaders/UIEffectShader.cs
rename to sources/engine/Xenko.Graphics/Shaders/UIEffectShader.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/CompileShaders.cmd b/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/CompileShaders.cmd
index afe866fe97..2470dceff8 100644
--- a/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/CompileShaders.cmd
+++ b/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/CompileShaders.cmd
@@ -1,8 +1,8 @@
 @echo off
 setlocal
 set XenkoSdkDir=%~dp0..\..\..\..\
-set XenkoSdkBinDir=%XenkoSdkDir%Bin\Windows\
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows-OpenGL --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows-OpenGLES --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
-%XenkoSdkBinDir%Xenko.Core.Assets.CompilerApp.exe --profile=Windows-Vulkan --platform=Windows --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
\ No newline at end of file
+set XenkoAssetCompiler=%XenkoSdkDir%sources\assets\Xenko.Core.Assets.CompilerApp\bin\Debug\net48\Xenko.Core.Assets.CompilerApp.exe
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win-opengl --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win-opengles --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
+%XenkoAssetCompiler% --platform=Windows --property:RuntimeIdentifier=win-vulkan --output-path=%~dp0obj\app_data --build-path=%~dp0obj\build_app_data --package-file=Graphics.xkpkg
diff --git a/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/GameSettings.xkgamesettings b/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/GameSettings.xkgamesettings
index 10dbe01b44..290de08bb8 100644
--- a/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/GameSettings.xkgamesettings
+++ b/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/GameSettings.xkgamesettings
@@ -1,6 +1,6 @@
 !GameSettingsAsset
 Id: 1A2E7C71-8DC5-4610-9F02-821605E48AB6
-SerializedVersion: {Xenko: 1.6.0-beta}
+SerializedVersion: {Xenko: 3.1.0.1}
 Tags: []
 Defaults:
     - !Xenko.Assets.EditorSettings,Xenko.Assets
diff --git a/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/Graphics.xkpkg b/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/Graphics.xkpkg
index f52537e907..c9f871d4c8 100644
--- a/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/Graphics.xkpkg
+++ b/sources/engine/Xenko.Graphics/Shaders093.Bytecodes/Graphics.xkpkg
@@ -1,18 +1,9 @@
 !Package
 Id: E3D56692-1439-494F-B6B3-C37C15F0451E
+SerializedVersion: {Assets: 3.1.0.0}
 Meta:
     Name: Xenko.Graphics
     Version: 1.0.0
-Profiles:
-    -   Name: Shared
-        AssetFolders:
-            - Path: ../Shaders
-            - Path: .
-    -   Name: Windows
-        Platform: Windows
-    -   Name: Windows-OpenGL
-        Platform: Windows
-    -   Name: Windows-OpenGLES
-        Platform: Windows
-    -   Name: Windows-Vulkan
-        Platform: Windows
+AssetFolders:
+    - Path: ../Shaders
+    - Path: .
diff --git a/sources/engine/Xenko.Graphics/Sprite3DBatch.cs b/sources/engine/Xenko.Graphics/Sprite3DBatch.cs
index 7f9d32357e..5a0bc99839 100644
--- a/sources/engine/Xenko.Graphics/Sprite3DBatch.cs
+++ b/sources/engine/Xenko.Graphics/Sprite3DBatch.cs
@@ -71,7 +71,7 @@ public void Draw(Texture texture, ref Matrix worldMatrix, ref RectangleF sourceR
                 throw new ArgumentNullException("texture");
 
             // Skip items with null size
-            if (elementSize.Length() < MathUtil.ZeroTolerance)
+            if (elementSize.LengthSquared() < MathUtil.ZeroTolerance)
                 return;
             
             // Calculate the information needed to draw.
@@ -132,7 +132,7 @@ public void Draw(Texture texture, ref Matrix worldMatrix, ref RectangleF sourceR
         protected override void PrepareForRendering()
         {
             // Setup the Transformation matrix of the shader
-            Parameters.Set(SpriteBaseKeys.MatrixTransform, transformationMatrix);
+            Parameters.Set(SpriteBaseKeys.MatrixTransform, ref transformationMatrix);
 
             base.PrepareForRendering();
         }
diff --git a/sources/engine/Xenko.Graphics/SpriteBatch.cs b/sources/engine/Xenko.Graphics/SpriteBatch.cs
index afcc5865ec..7c94d75e94 100644
--- a/sources/engine/Xenko.Graphics/SpriteBatch.cs
+++ b/sources/engine/Xenko.Graphics/SpriteBatch.cs
@@ -478,7 +478,8 @@ private void DrawString(SpriteFont spriteFont, ref SpriteFont.StringProxy text,
             DrawString(spriteFont, ref text, fontSize, ref position, ref color, rotation, ref origin, ref scale, effects, layerDepth, alignment);
         }
 
-        private void DrawString(SpriteFont spriteFont, ref SpriteFont.StringProxy text, float fontSize, ref Vector2 position, ref Color4 color, float rotation, ref Vector2 origin, ref Vector2 scale, SpriteEffects effects, float layerDepth, TextAlignment alignment)
+        private void DrawString(SpriteFont spriteFont, ref SpriteFont.StringProxy text, float fontSize, ref Vector2 position, ref Color4 color, float rotation, ref Vector2 origin,
+                                ref Vector2 scale, SpriteEffects effects, float layerDepth, TextAlignment alignment, TextVerticalAlignment vert_alignment = TextVerticalAlignment.Top, float lineAdjustment = 0f)
         {
             if (spriteFont == null)
             {
@@ -509,7 +510,7 @@ private void DrawString(SpriteFont spriteFont, ref SpriteFont.StringProxy text,
             drawCommand.Position.X /= resolutionRatio.X;
             drawCommand.Position.Y /= resolutionRatio.Y;
 
-            spriteFont.InternalDraw(commandList, ref text, ref drawCommand, alignment);
+            spriteFont.InternalDraw(commandList, ref text, ref drawCommand, alignment, vert_alignment, lineAdjustment);
         }
         
         internal unsafe void DrawSprite(Texture texture, ref RectangleF destination, bool scaleDestination, ref RectangleF? sourceRectangle, Color4 color, Color4 colorAdd,
@@ -603,7 +604,7 @@ protected override void PrepareForRendering()
 
             // Setup effect states and parameters: SamplerState and MatrixTransform
             // Sets the sampler state
-            Parameters.Set(SpriteBaseKeys.MatrixTransform, viewProjection);
+            Parameters.Set(SpriteBaseKeys.MatrixTransform, ref viewProjection);
 
             base.PrepareForRendering();
         }
diff --git a/sources/engine/Xenko.Graphics/SpriteFont.cs b/sources/engine/Xenko.Graphics/SpriteFont.cs
index 18dcb13f20..467cc70914 100644
--- a/sources/engine/Xenko.Graphics/SpriteFont.cs
+++ b/sources/engine/Xenko.Graphics/SpriteFont.cs
@@ -2,7 +2,9 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -156,6 +158,7 @@ public interface IFontManager
         /// <returns>The value of the character spacing</returns>
         public virtual float GetExtraSpacing(float fontSize)
         {
+            if (Size == 0f) return ExtraSpacing == 0f ? 1f : ExtraSpacing;
             return fontSize / Size * ExtraSpacing;
         }
 
@@ -166,6 +169,7 @@ public virtual float GetExtraSpacing(float fontSize)
         /// <returns>The value of the character spacing</returns>
         public virtual float GetExtraLineSpacing(float fontSize)
         {
+            if (Size == 0f) return ExtraLineSpacing == 0f ? 1f : ExtraLineSpacing;
             return fontSize / Size * ExtraLineSpacing;
         }
 
@@ -176,6 +180,7 @@ public virtual float GetExtraLineSpacing(float fontSize)
         /// <returns>The value of the default line spacing</returns>
         public virtual float GetFontDefaultLineSpacing(float fontSize)
         {
+            if (Size == 0f) return DefaultLineSpacing == 0f ? 1f : DefaultLineSpacing;
             return fontSize / Size * DefaultLineSpacing;
         }
 
@@ -186,6 +191,7 @@ public virtual float GetFontDefaultLineSpacing(float fontSize)
         /// <returns>The value of the base offset</returns>
         protected virtual float GetBaseOffsetY(float fontSize)
         {
+            if (Size == 0f) return BaseOffsetY;
             return fontSize / Size * BaseOffsetY;
         }
 
@@ -198,16 +204,16 @@ public float GetTotalLineSpacing(float fontSize)
             return GetExtraLineSpacing(fontSize) + GetFontDefaultLineSpacing(fontSize);
         }
         
-        internal void InternalDraw(CommandList commandList, ref StringProxy text, ref InternalDrawCommand drawCommand, TextAlignment alignment)
+        internal void InternalDraw(CommandList commandList, ref StringProxy text, ref InternalDrawCommand drawCommand, TextAlignment alignment, TextVerticalAlignment vert_alignment, float lineAdjustment)
         {
             // If the text is mirrored, offset the start position accordingly.
             if (drawCommand.SpriteEffects != SpriteEffects.None)
             {
-                drawCommand.Origin -= MeasureString(ref text, ref drawCommand.FontSize) * AxisIsMirroredTable[(int)drawCommand.SpriteEffects & 3];
+                drawCommand.Origin -= MeasureString(ref text, ref drawCommand.FontSize, lineAdjustment) * AxisIsMirroredTable[(int)drawCommand.SpriteEffects & 3];
             }
 
             // Draw each character in turn.
-            ForEachGlyph(commandList, ref text, ref drawCommand.FontSize, internalDrawGlyphAction, ref drawCommand, alignment, true);
+            ForEachGlyph(commandList, ref text, ref drawCommand.FontSize, internalDrawGlyphAction, ref drawCommand, alignment, vert_alignment, true, null, lineAdjustment);
         }        
         
         /// <summary>
@@ -255,7 +261,8 @@ internal void InternalUIDraw(CommandList commandList, ref StringProxy text, ref
             var requestedFontSize = new Vector2(drawCommand.RequestedFontSize * drawCommand.RealVirtualResolutionRatio.Y);
 
             var textBoxSize = drawCommand.TextBoxSize * drawCommand.RealVirtualResolutionRatio;
-            ForEachGlyph(commandList, ref text, ref requestedFontSize, internalUIDrawGlyphAction, ref drawCommand, drawCommand.Alignment, true, textBoxSize);
+            ForEachGlyph(commandList, ref text, ref requestedFontSize, internalUIDrawGlyphAction,
+                         ref drawCommand, drawCommand.Alignment, drawCommand.VertAlignment, true, textBoxSize, drawCommand.LineSpacingAdjustment);
         }
 
         internal void InternalUIDrawGlyph(ref InternalUIDrawCommand parameters, ref Vector2 requestedFontSize, ref Glyph glyph, float x, float y, float nextx, ref Vector2 auxiliaryScaling)
@@ -263,11 +270,13 @@ internal void InternalUIDrawGlyph(ref InternalUIDrawCommand parameters, ref Vect
             if (char.IsWhiteSpace((char)glyph.Character))
                 return;
 
+            var realVirtualResolutionRatio = requestedFontSize / parameters.RequestedFontSize;
+
             // Skip items with null size
             var elementSize = new Vector2(
-                auxiliaryScaling.X * glyph.Subrect.Width / parameters.RealVirtualResolutionRatio.X,
-                auxiliaryScaling.Y * glyph.Subrect.Height / parameters.RealVirtualResolutionRatio.Y);
-            if (elementSize.Length() < MathUtil.ZeroTolerance) 
+                auxiliaryScaling.X * glyph.Subrect.Width / realVirtualResolutionRatio.X,
+                auxiliaryScaling.Y * glyph.Subrect.Height / realVirtualResolutionRatio.Y);
+            if (elementSize.LengthSquared() < MathUtil.ZeroTolerance) 
                 return;
 
             var xShift = x;
@@ -277,20 +286,24 @@ internal void InternalUIDrawGlyph(ref InternalUIDrawCommand parameters, ref Vect
                 xShift = (float)Math.Round(xShift);
                 yShift = (float)Math.Round(yShift);
             }
-            var xScaledShift = xShift / parameters.RealVirtualResolutionRatio.X;
-            var yScaledShift = yShift / parameters.RealVirtualResolutionRatio.Y;
+            var xScaledShift = xShift / realVirtualResolutionRatio.X;
+            var yScaledShift = yShift / realVirtualResolutionRatio.Y;
 
             var worldMatrix = parameters.Matrix;
+
             worldMatrix.M41 += worldMatrix.M11 * xScaledShift + worldMatrix.M21 * yScaledShift;
             worldMatrix.M42 += worldMatrix.M12 * xScaledShift + worldMatrix.M22 * yScaledShift;
             worldMatrix.M43 += worldMatrix.M13 * xScaledShift + worldMatrix.M23 * yScaledShift;
-
+            worldMatrix.M44 += worldMatrix.M14 * xScaledShift + worldMatrix.M24 * yScaledShift;
+            
             worldMatrix.M11 *= elementSize.X;
             worldMatrix.M12 *= elementSize.X;
             worldMatrix.M13 *= elementSize.X;
+            worldMatrix.M14 *= elementSize.X;
             worldMatrix.M21 *= elementSize.Y;
             worldMatrix.M22 *= elementSize.Y;
             worldMatrix.M23 *= elementSize.Y;
+            worldMatrix.M24 *= elementSize.Y;
 
             RectangleF sourceRectangle = glyph.Subrect;
             parameters.Batch.DrawCharacter(Textures[glyph.BitmapIndex], ref worldMatrix, ref sourceRectangle, ref parameters.Color, parameters.DepthBias, swizzle);
@@ -440,10 +453,10 @@ public Vector2 MeasureString(StringBuilder text, ref Vector2 fontSize, int lengt
             return MeasureString(ref proxy, ref fontSize);
         }
 
-        internal Vector2 MeasureString(ref StringProxy text, ref Vector2 size)
+        internal Vector2 MeasureString(ref StringProxy text, ref Vector2 size, float lineSpaceAdjustment = 0f)
         {
             var result = Vector2.Zero;
-            ForEachGlyph(null, ref text, ref size, measureStringGlyphAction, ref result, TextAlignment.Left, false); // text size is independent from the text alignment
+            ForEachGlyph(null, ref text, ref size, measureStringGlyphAction, ref result, TextAlignment.Left, TextVerticalAlignment.Top, false, null, GetTotalLineSpacing(size.Y) + lineSpaceAdjustment); // text size is independent from the text alignment
             return result;
         }
 
@@ -468,7 +481,7 @@ public virtual bool IsCharPresent(char c)
         /// <returns>The glyph corresponding to the request or null if not existing</returns>
         protected virtual Glyph GetGlyph(CommandList commandList, char character, ref Vector2 fontSize, bool uploadGpuResources, out Vector2 auxiliaryScaling)
         {
-            auxiliaryScaling = new Vector2(1, 1);
+            auxiliaryScaling = Vector2.One;
             return null;
         }
         
@@ -498,12 +511,31 @@ private static int FindCariageReturn(ref StringProxy text, int startIndex)
             return index;
         }
 
-        private void ForEachGlyph<T>(CommandList commandList, ref StringProxy text, ref Vector2 requestedFontSize, GlyphAction<T> action, ref T parameters, TextAlignment scanOrder, bool updateGpuResources, Vector2? textBoxSize = null)
+        private void ForEachGlyph<T>(CommandList commandList, ref StringProxy text, ref Vector2 requestedFontSize, GlyphAction<T> action, ref T parameters,
+                                     TextAlignment scanOrder, TextVerticalAlignment vertAlign, bool updateGpuResources, Vector2? textBoxSize = null, float lineSpaceAdjustment = 0f)
         {
+            float rawYSpacing = GetTotalLineSpacing(requestedFontSize.Y);
+            float yStart, ySpacing = rawYSpacing + lineSpaceAdjustment;
+            if (textBoxSize.HasValue && vertAlign != TextVerticalAlignment.Top) {
+                float lineHeight = requestedFontSize.Y + (text.LineCount - 1) * ySpacing;
+                switch (vertAlign) {
+                    default:
+                    case TextVerticalAlignment.Center:
+                        yStart = textBoxSize.Value.Y * 0.5f - (lineHeight * 0.5f);
+                        break;
+                    case TextVerticalAlignment.Bottom:
+                        yStart = textBoxSize.Value.Y - lineHeight;
+                        break;
+                }
+            } else yStart = 0f;
+
+            // prepare color tag stack, if needed
+            Stack<Color4> colorstack = null;
+
             if (scanOrder == TextAlignment.Left)
             {
                 // scan the whole text only one time following the text letter order
-                ForGlyph(commandList, ref text, ref requestedFontSize, action, ref parameters, 0, text.Length, updateGpuResources);
+                ForGlyph(commandList, ref text, ref requestedFontSize, action, ref parameters, 0, text.Length, updateGpuResources, ref colorstack, 0f, yStart, vertAlign, ySpacing);
             }
             else
             {
@@ -513,82 +545,256 @@ private void ForEachGlyph<T>(CommandList commandList, ref StringProxy text, ref
                 var wholeSize = textBoxSize ?? MeasureString(ref text, ref requestedFontSize);
 
                 // scan the text line by line
-                var yStart = 0f;
                 var startIndex = 0;
                 var endIndex = FindCariageReturn(ref text, 0);
                 while (startIndex < text.Length)
                 {
                     // measure the size of the current line
                     var lineSize = Vector2.Zero;
-                    ForGlyph(commandList, ref text, ref requestedFontSize, MeasureStringGlyph, ref lineSize, startIndex, endIndex, updateGpuResources);
+                    ForGlyph(commandList, ref text, ref requestedFontSize, MeasureStringGlyph, ref lineSize, startIndex, endIndex, updateGpuResources, ref colorstack, 0f, 0f, vertAlign, ySpacing, true);
 
                     // Determine the start position of the line along the x axis
                     // We round this value to the closest integer to force alignment of all characters to the same pixels
                     // Otherwise the starting offset can fall just in between two pixels and due to float imprecision 
                     // some characters can be aligned to the pixel before and others to the pixel after, resulting in gaps and character overlapping
                     var xStart = (scanOrder == TextAlignment.Center) ? (wholeSize.X - lineSize.X) / 2 : wholeSize.X - lineSize.X;
-                    xStart = (float)Math.Round(xStart); 
+                    xStart = (float)Math.Round(xStart);
 
                     // scan the line
-                    ForGlyph(commandList, ref text, ref requestedFontSize, action, ref parameters, startIndex, endIndex, updateGpuResources, xStart, yStart);
+                    ForGlyph(commandList, ref text, ref requestedFontSize, action, ref parameters, startIndex, endIndex, updateGpuResources, ref colorstack, xStart, yStart, vertAlign, ySpacing);
                     
                     // update variable before going to next line
-                    yStart += GetTotalLineSpacing(requestedFontSize.Y);
+                    yStart += ySpacing;
                     startIndex = endIndex + 1;
                     endIndex = FindCariageReturn(ref text, startIndex);
                 }
             }
         }
 
-        private void ForGlyph<T>(CommandList commandList, ref StringProxy text, ref Vector2 fontSize, GlyphAction<T> action, ref T parameters, int forStart, int forEnd, bool updateGpuResources, float startX = 0, float startY = 0)
+        private void ForGlyph<T>(CommandList commandList, ref StringProxy text, ref Vector2 fontSize, GlyphAction<T> action, 
+                                 ref T parameters, int forStart, int forEnd, bool updateGpuResources, ref Stack<Color4> colorStack, float startX = 0, float startY = 0,
+                                 TextVerticalAlignment vertAlign = TextVerticalAlignment.Top, float fontSizeY = 0f, bool skipTags = false)
         {
             var key = 0;
             var x = startX;
             var y = startY;
+
+            // tag management
+            var escaping = false;
             for (var i = forStart; i < forEnd; i++)
             {
                 var character = text[i];
 
-                switch (character)
+                if (!escaping && character == '<') {
+                    // check tags?
+                    if(CheckAndProcessColorTag(ref text, ref i, out Color4 color)) {
+                        if (skipTags == false)
+                        {
+                            if (colorStack == null) colorStack = new Stack<Color4>();
+                            colorStack.Push(color);
+                        }
+                    } else if(EndsTag("</color>", ref text, ref i)) {
+                        if (skipTags == false && colorStack != null && colorStack.Count > 0)
+                            colorStack.Pop();
+                    }
+                }
+                else
                 {
-                    case '\r':
-                        // Skip carriage returns.
-                        key |= character;
-                        continue;
-
-                    case '\n':
-                        // New line.
-                        x = 0;
-                        y += GetTotalLineSpacing(fontSize.Y);
-                        key |= character;
-                        break;
-
-                    default:
-                        // Output this character.
-                        Vector2 auxiliaryScaling;
-                        var glyph = GetGlyph(commandList, character, ref fontSize, updateGpuResources, out auxiliaryScaling);
-                        if (glyph == null && !IgnoreUnkownCharacters && DefaultCharacter.HasValue)
-                            glyph = GetGlyph(commandList, DefaultCharacter.Value, ref fontSize, updateGpuResources, out auxiliaryScaling);
-                        if (glyph == null)
+                    switch (character)
+                    {
+                        case '\r':
+                            // Skip carriage returns.
+                            key |= character;
                             continue;
 
-                        key |= character;
-
-                        var dx = glyph.Offset.X;
+                        case '\n':
+                            // New line.
+                            x = 0;
+                            y += fontSizeY;
+                            key |= character;
+                            break;
+
+                        case '\\':
+                            // Skip next escapable character.
+                            if (escaping) goto default;
+                            escaping = true;
+                            key |= character; //? what is this for
+                            break;
+
+                        default:
+                            // Output this character.
+                            escaping = false;
+                            Vector2 auxiliaryScaling;
+                            var glyph = GetGlyph(commandList, character, ref fontSize, updateGpuResources, out auxiliaryScaling);
+                            if (glyph == null && !IgnoreUnkownCharacters && DefaultCharacter.HasValue)
+                                glyph = GetGlyph(commandList, DefaultCharacter.Value, ref fontSize, updateGpuResources, out auxiliaryScaling);
+                            if (glyph == null)
+                                continue;
+
+                            key |= character;
+
+                            var dx = glyph.Offset.X;
+
+                            float kerningOffset;
+                            if (KerningMap != null && KerningMap.TryGetValue(key, out kerningOffset))
+                                dx += kerningOffset;
+
+                            float nextX = x + (glyph.XAdvance + GetExtraSpacing(fontSize.X)) * auxiliaryScaling.X;
+
+                            // process color we will use, if any
+                            if (colorStack != null && colorStack.Count > 0) {
+                                // we have colors, but what kind of command do we have?
+                                if (parameters is InternalDrawCommand) {
+                                    var idc = (InternalDrawCommand)(object)parameters;
+                                    idc.Color = colorStack.Peek();
+                                    var idcT = (T)(object)idc;
+                                    action(ref idcT, ref fontSize, ref glyph, x + dx * auxiliaryScaling.X, y, nextX, ref auxiliaryScaling);
+                                } else if (parameters is InternalUIDrawCommand) {
+                                    var idc = (InternalUIDrawCommand)(object)parameters;
+                                    idc.Color = Color.FromRgba(colorStack.Peek().ToRgba());
+                                    var idcT = (T)(object)idc;
+                                    action(ref idcT, ref fontSize, ref glyph, x + dx * auxiliaryScaling.X, y, nextX, ref auxiliaryScaling);
+                                } else action(ref parameters, ref fontSize, ref glyph, x + dx * auxiliaryScaling.X, y, nextX, ref auxiliaryScaling);
+                            } else action(ref parameters, ref fontSize, ref glyph, x + dx * auxiliaryScaling.X, y, nextX, ref auxiliaryScaling);
+
+                            x = nextX;
+                            break;
+                    }
+
+                    // Shift the kerning key
+                    key = (key << 16);
+                }
+            }
+        }
 
-                        float kerningOffset;
-                        if (KerningMap != null && KerningMap.TryGetValue(key, out kerningOffset))
-                            dx += kerningOffset;
+        private bool HasTag(string tag, ref StringProxy text, ref int pos) {
+            if (text.Length - pos <= tag.Length) return false;
+            for (int i=0; i<tag.Length;i++) {
+                if (text[i + pos + 1] != tag[i]) return false;
+            }
+            pos += tag.Length + 2;
+            return true;
+        }
 
-                        float nextX = x + (glyph.XAdvance + GetExtraSpacing(fontSize.X)) * auxiliaryScaling.X;
-                        action(ref parameters, ref fontSize, ref glyph, x + dx * auxiliaryScaling.X, y, nextX, ref auxiliaryScaling);
-                        x = nextX;
-                        break;
+        private bool EndsTag(string tagEnd, ref StringProxy text, ref int pos) {
+            if (text.Length - pos < tagEnd.Length) return false;
+            for (int i = 0; i < tagEnd.Length; i++) {
+                if (text[i + pos] != tagEnd[i]) {
+                    return false;
                 }
+            }
+            pos += tagEnd.Length - 1;
+            return true;
+        }
 
-                // Shift the kerning key
-                key = (key << 16);
+        private bool CheckAndProcessColorTag(ref StringProxy text, ref int pos, out Color4 color)
+        {
+            color = Color4.Black;
+            if (HasTag("color", ref text, ref pos) == false) return false;
+            StringBuilder colorValue = new StringBuilder();
+            for (int i = pos; i < text.Length; i++)
+            {
+                var curChar = text[i];
+                if (curChar != '>')
+                {
+                    colorValue.Append(curChar);
+                }
+                else
+                {
+                    if (colorValue.Length > 0)
+                    {
+                        if (colorValue[0] == '#')
+                        {
+                            // read as hex
+                            if (colorValue.Length == 7)
+                            {
+                                // rgb
+                                if (uint.TryParse(colorValue.Substring(1, 6), NumberStyles.HexNumber, null, out uint rgb))
+                                {
+                                    color.R = (rgb >> 16 & 0xff) / 255f;
+                                    color.G = (rgb >>  8 & 0xff) / 255f;
+                                    color.B = (rgb >>  0 & 0xff) / 255f;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
+                            else if (colorValue.Length == 9)
+                            {
+                                // rgba
+                                if (uint.TryParse(colorValue.Substring(1, 8), NumberStyles.HexNumber, null, out uint rgba))
+                                {
+                                    color.R = (rgba >> 24 & 0xff) / 255f;
+                                    color.G = (rgba >> 16 & 0xff) / 255f;
+                                    color.B = (rgba >>  8 & 0xff) / 255f;
+                                    color.A = (rgba >>  0 & 0xff) / 255f;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        else
+                        {
+                            // read as comma separated color ints
+                            string[] colorValues = colorValue.ToString().Split(',');
+                            if (colorValues.Length == 3)
+                            {
+                                // rgb
+                                if (byte.TryParse(colorValues[0], out byte r) &&
+                                    byte.TryParse(colorValues[1], out byte g) &&
+                                    byte.TryParse(colorValues[2], out byte b))
+                                {
+                                    color.R = r / 255f;
+                                    color.G = g / 255f;
+                                    color.B = b / 255f;
+                                    color.A = 1f;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
+                            else if (colorValues.Length == 4)
+                            {
+                                // rgba
+                                if (byte.TryParse(colorValues[0], out byte r) &&
+                                    byte.TryParse(colorValues[1], out byte g) &&
+                                    byte.TryParse(colorValues[2], out byte b) &&
+                                    byte.TryParse(colorValues[3], out byte a))
+                                {
+                                    color.R = r / 255f;
+                                    color.G = g / 255f;
+                                    color.B = b / 255f;
+                                    color.A = a / 255f;
+                                }
+                                else
+                                {
+                                    return false;
+                                }
+                            }
+                            else
+                            {
+                                return false;
+                            }
+                        }
+                        // TODO: add color names? (what identifier for comma separated colors?)
+                        pos = i;
+                        return true;
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
             }
+            return false;
         }
 
         [StructLayout(LayoutKind.Sequential)]
@@ -597,33 +803,50 @@ internal struct StringProxy
             private readonly string textString;
             private readonly StringBuilder textBuilder;
             public readonly int Length;
+            private int linecount;
+
+            public int LineCount {
+                get {
+                    if (linecount == -1 && textString != null)
+                    {
+                        linecount = textString.Length > 0 ? 1 : 0;
+                        for (int i = 0; i < textString.Length; i++)
+                            if (textString[i] == '\n') linecount++;
+                    }
+                    return linecount;
+                }
+            }
 
             public StringProxy(string text)
             {
-                textString = text;
+                linecount = -1;
+                textString = text?.Replace("<br>", "\n");
                 textBuilder = null;
-                Length = text.Length;
+                Length = textString.Length;
             }
 
             public StringProxy(StringBuilder text)
             {
-                textBuilder = text;
+                linecount = -1;
+                textBuilder = text?.Replace("<br>", "\n");
                 textString = null;
-                Length = text.Length;
+                Length = textBuilder.Length;
             }
             
             public StringProxy(string text, int length)
             {
-                textString = text;
+                linecount = -1;
+                textString = text?.Replace("<br>", "\n");
                 textBuilder = null;
-                Length = Math.Max(0, Math.Min(length, text.Length));
+                Length = Math.Max(0, Math.Min(length, textString.Length));
             }
 
             public StringProxy(StringBuilder text, int length)
             {
-                textBuilder = text;
+                linecount = -1;
+                textBuilder = text?.Replace("<br>", "\n");
                 textString = null;
-                Length = Math.Max(0, Math.Min(length, text.Length));
+                Length = Math.Max(0, Math.Min(length, textBuilder.Length));
             }
 
             public bool IsNull => textString == null && textBuilder == null;
@@ -692,10 +915,14 @@ internal struct InternalUIDrawCommand
             /// </summary>
             public Vector2 TextBoxSize;
 
+            public float LineSpacingAdjustment;
+
             public Color Color;
 
             public TextAlignment Alignment;
 
+            public TextVerticalAlignment VertAlignment;
+
             public int DepthBias;
 
             public bool SnapText;
diff --git a/sources/engine/Xenko.Graphics/TextAlignment.cs b/sources/engine/Xenko.Graphics/TextAlignment.cs
index d79cd2ad0b..a2cfc0b791 100644
--- a/sources/engine/Xenko.Graphics/TextAlignment.cs
+++ b/sources/engine/Xenko.Graphics/TextAlignment.cs
@@ -22,4 +22,21 @@ public enum TextAlignment
         /// </summary>
         Right,
     }
+
+    public enum TextVerticalAlignment {
+        /// <summary>
+        /// Aligned at the top
+        /// </summary>
+        Top,
+
+        /// <summary>
+        /// Aligned in the center
+        /// </summary>
+        Center,
+
+        /// <summary>
+        /// Aligned at the bottom
+        /// </summary>
+        Bottom
+    }
 }
diff --git a/sources/engine/Xenko.Graphics/Texture.cs b/sources/engine/Xenko.Graphics/Texture.cs
index 0b8fbeaa15..060047fde2 100644
--- a/sources/engine/Xenko.Graphics/Texture.cs
+++ b/sources/engine/Xenko.Graphics/Texture.cs
@@ -431,6 +431,14 @@ internal Texture(GraphicsDevice device) : base(device)
         {
         }
 
+        public Texture(GraphicsDevice device, TextureDescription fromDescription) : base(device)
+        {
+            textureDescription = fromDescription;
+            ViewWidth = textureDescription.Width;
+            ViewHeight = textureDescription.Height;
+            ViewDepth = textureDescription.Depth;
+        }
+
         protected override void Destroy()
         {
             base.Destroy();
@@ -506,9 +514,8 @@ internal Texture InitializeFrom(Texture parentTexture, TextureDescription descri
 
             if (IsMultisample)
             {
-                var maxCount = GraphicsDevice.Features[Format].MultisampleCountMax;
-                if (maxCount < MultisampleCount)
-                    throw new NotSupportedException($"Cannot create a texture with format {Format} and multisample level {MultisampleCount}. Maximum supported level is {maxCount}");
+                // limit multisample count to graphic device max
+                textureDescription.MultisampleCount = (MultisampleCount)Math.Min((int)GraphicsDevice.Features[Format].MultisampleCountMax, (int)MultisampleCount);
             }
 
             InitializeFromImpl(textureDatas);
@@ -1217,7 +1224,8 @@ private static DataBox GetDataBox<T>(PixelFormat format, int width, int height,
             // Check that the textureData size is correct
             if (textureData == null) throw new ArgumentNullException("textureData");
             Image.ComputePitch(format, width, height, out var rowPitch, out var slicePitch, out _, out _);
-            if (Utilities.SizeOf(textureData) != (slicePitch * depth)) throw new ArgumentException("Invalid size for Image");
+            if (Utilities.SizeOf(textureData) != (slicePitch * depth))
+                throw new ArgumentException("Invalid size for Image. TextureData size is " + Utilities.SizeOf(textureData) + ", slicepitch is " + slicePitch + ", depth is " + depth + ". SlicePitch*Depth != size");
 
             return new DataBox(fixedPointer, rowPitch, slicePitch);
         }
diff --git a/sources/engine/Xenko.Graphics/UIBatch.cs b/sources/engine/Xenko.Graphics/UIBatch.cs
index aad6f7f00f..166f4c1214 100644
--- a/sources/engine/Xenko.Graphics/UIBatch.cs
+++ b/sources/engine/Xenko.Graphics/UIBatch.cs
@@ -15,7 +15,7 @@ namespace Xenko.Graphics
     /// </summary>
     public class UIBatch : BatchBase<UIBatch.UIImageDrawInfo>
     {
-        private static readonly List<short[]> PrimiteTypeToIndices = new List<short[]>(4);
+        private static readonly short[][] PrimitiveTypeToIndices;
 
         private const int MaxVerticesPerElement = 16;
         private const int MaxIndicesPerElement = 54;
@@ -26,7 +26,7 @@ public class UIBatch : BatchBase<UIBatch.UIImageDrawInfo>
         /// <summary>
         /// The view projection matrix that will be used for the current begin/end draw calls.
         /// </summary>
-        private Matrix viewProjectionMatrix;
+        public Matrix viewProjectionMatrix;
 
         // Cached states
         private BlendStateDescription? currentBlendState;
@@ -37,6 +37,8 @@ public class UIBatch : BatchBase<UIBatch.UIImageDrawInfo>
 
         private Vector4 vector4LeftTop = new Vector4(-0.5f, -0.5f, -0.5f, 1);
 
+        public object renderingContext, layoutingContext;
+
         private readonly Vector4[] shiftVectorX = new Vector4[4];
         private readonly Vector4[] shiftVectorY = new Vector4[4];
 
@@ -50,13 +52,15 @@ public class UIBatch : BatchBase<UIBatch.UIImageDrawInfo>
 
         static UIBatch()
         {
-            PrimiteTypeToIndices.Add(new short[6]);  // rectangle
-            PrimiteTypeToIndices.Add(new short[54]); // border rectangle
-            PrimiteTypeToIndices.Add(new short[36]); // cube
-            PrimiteTypeToIndices.Add(new short[36]); // reverse cube
-
+            PrimitiveTypeToIndices = new[]
+            {
+                new short[6],  // rectangle
+                new short[54], // border rectangle
+                new short[36], // cube
+                new short[36], // reverse cube
+            };
             // rectangle
-            var indices = PrimiteTypeToIndices[(int)PrimitiveType.Rectangle];
+            var indices = PrimitiveTypeToIndices[(int)PrimitiveType.Rectangle];
             indices[0] = 0;
             indices[1] = 1;
             indices[2] = 2;
@@ -65,7 +69,7 @@ static UIBatch()
             indices[5] = 2;
 
             // border rectangle
-            indices = PrimiteTypeToIndices[(int)PrimitiveType.BorderRectangle];
+            indices = PrimitiveTypeToIndices[(int)PrimitiveType.BorderRectangle];
             var count = 0;
             for (var j = 0; j < 3; ++j)
             {
@@ -83,7 +87,7 @@ static UIBatch()
 
             // cube
             count = 0;
-            indices = PrimiteTypeToIndices[(int)PrimitiveType.Cube];
+            indices = PrimitiveTypeToIndices[(int)PrimitiveType.Cube];
             indices[count++] = 0; //front
             indices[count++] = 1;
             indices[count++] = 2;
@@ -127,8 +131,8 @@ static UIBatch()
             indices[count] = 6;
 
             // reverse cube
-            var cubeIndices = PrimiteTypeToIndices[(int)PrimitiveType.Cube];
-            indices = PrimiteTypeToIndices[(int)PrimitiveType.ReverseCube];
+            var cubeIndices = PrimitiveTypeToIndices[(int)PrimitiveType.Cube];
+            indices = PrimitiveTypeToIndices[(int)PrimitiveType.ReverseCube];
             for (var i = 0; i < cubeIndices.Length; i += 3)
             {
                 indices[i + 0] = cubeIndices[i + 0];
@@ -141,7 +145,7 @@ static UIBatch()
         /// Initializes a new instance of the <see cref="UIBatch"/> class.
         /// </summary>
         /// <param name="device">A valid instance of <see cref="GraphicsDevice"/>.</param>
-        public UIBatch(GraphicsDevice device)
+        public UIBatch(GraphicsDevice device, object context, object layout)
             : base(device, UIEffect.Bytecode, UIEffect.BytecodeSRgb,
             ResourceBufferInfo.CreateDynamicIndexBufferInfo("UIBatch.VertexIndexBuffers", MaxIndicesCount, MaxVerticesCount), 
             VertexPositionColorTextureSwizzle.Layout)
@@ -149,6 +153,9 @@ public UIBatch(GraphicsDevice device)
             // Create a 1x1 pixel white texture
             whiteTexture = graphicsDevice.GetSharedWhiteTexture();
 
+            renderingContext = context;
+            layoutingContext = layout;
+
             //  Load custom font rendering effects here
 
             // For signed distance field font rendering
@@ -214,7 +221,7 @@ public void BeginCustom(GraphicsContext graphicsContext, int overrideEffect)
         public void DrawRectangle(ref Matrix worldMatrix, ref Vector3 elementSize, ref Color color, int depthBias)
         {
             // Skip items with null size
-            if (elementSize.Length() < MathUtil.ZeroTolerance)
+            if (elementSize.LengthSquared() < MathUtil.ZeroTolerance)
                 return;
 
             // Calculate the information needed to draw.
@@ -222,7 +229,6 @@ public void DrawRectangle(ref Matrix worldMatrix, ref Vector3 elementSize, ref C
             {
                 DepthBias = depthBias,
                 ColorScale = color,
-                ColorAdd = new Color(0, 0, 0, 0),
                 Primitive = PrimitiveType.Rectangle,
             };
 
@@ -276,7 +282,7 @@ public void DrawBackground(ref Matrix worldMatrix, ref Vector3 elementSize, ref
         private void DrawCube(ref Matrix worldMatrix, ref Vector3 elementSize, ref Color color, int depthBias, bool isReverse)
         {
             // Skip items with null size
-            if (elementSize.Length() < MathUtil.ZeroTolerance)
+            if (elementSize.LengthSquared() < MathUtil.ZeroTolerance)
                 return;
 
             // Calculate the information needed to draw.
@@ -284,7 +290,6 @@ private void DrawCube(ref Matrix worldMatrix, ref Vector3 elementSize, ref Color
             {
                 DepthBias = depthBias,
                 ColorScale = color,
-                ColorAdd = new Color(0, 0, 0, 0),
                 Primitive = isReverse ? PrimitiveType.ReverseCube : PrimitiveType.Cube,
             };
 
@@ -325,12 +330,12 @@ private void DrawCube(ref Matrix worldMatrix, ref Vector3 elementSize, ref Color
         /// <param name="swizzle">Swizzle mode indicating the swizzle use when sampling the texture in the shader</param>
         /// <param name="snapImage">Indicate if the image needs to be snapped or not</param>
         public void DrawImage(Texture texture, ref Matrix worldMatrix, ref RectangleF sourceRectangle, ref Vector3 elementSize, ref Vector4 borderSize, 
-            ref Color color, int depthBias, ImageOrientation imageOrientation = ImageOrientation.AsIs, SwizzleMode swizzle = SwizzleMode.None, bool snapImage = false)
+            ref Color4 color, int depthBias, ImageOrientation imageOrientation = ImageOrientation.AsIs, SwizzleMode swizzle = SwizzleMode.None, bool snapImage = false)
         {
             if (texture == null) throw new ArgumentNullException(nameof(texture));
 
             // Skip items with null size
-            if (elementSize.Length() < MathUtil.ZeroTolerance)
+            if (elementSize.LengthSquared() < MathUtil.ZeroTolerance)
                 return;
 
             // Calculate the information needed to draw.
@@ -345,7 +350,6 @@ public void DrawImage(Texture texture, ref Matrix worldMatrix, ref RectangleF so
                 },
                 DepthBias = depthBias,
                 ColorScale = color,
-                ColorAdd = new Color(0, 0, 0, 0),
                 Swizzle = swizzle,
                 SnapImage = snapImage,
                 Primitive = borderSize == Vector4.Zero ? PrimitiveType.Rectangle : PrimitiveType.BorderRectangle,
@@ -411,7 +415,6 @@ internal void DrawCharacter(Texture texture, ref Matrix worldViewProjectionMatri
                 },
                 DepthBias = depthBias,
                 ColorScale = color,
-                ColorAdd = new Color(0, 0, 0, 0),
                 Swizzle = swizzle,
                 Primitive = PrimitiveType.Rectangle,
                 VertexShift = Vector4.Zero,
@@ -433,7 +436,7 @@ internal void DrawString(SpriteFont font, string text, ref SpriteFont.InternalUI
             var proxy = new SpriteFont.StringProxy(text);
 
             // shift the string position so that it is written from the left/top corner of the element
-            var leftTopCornerOffset = drawCommand.TextBoxSize / 2;
+            var leftTopCornerOffset = drawCommand.TextBoxSize / 2f;
             var worldMatrix = drawCommand.Matrix;
             worldMatrix.M41 -= worldMatrix.M11 * leftTopCornerOffset.X + worldMatrix.M21 * leftTopCornerOffset.Y;
             worldMatrix.M42 -= worldMatrix.M12 * leftTopCornerOffset.X + worldMatrix.M22 * leftTopCornerOffset.Y;
@@ -442,20 +445,9 @@ internal void DrawString(SpriteFont font, string text, ref SpriteFont.InternalUI
             // transform the world matrix into the world view project matrix
             Matrix.MultiplyTo(ref worldMatrix, ref viewProjectionMatrix, out drawCommand.Matrix);
 
-            // do not snap static fonts when real/virtual resolution does not match.
-            if (font.FontType == SpriteFontType.SDF)
-            {
-                drawCommand.SnapText = false;
-                float scaling = drawCommand.RequestedFontSize / font.Size;
-                drawCommand.RealVirtualResolutionRatio = 1 / new Vector2(scaling, scaling);
-            }
-            else if ((font.FontType == SpriteFontType.Static)) 
-            {
-                if ((drawCommand.RealVirtualResolutionRatio.X != 1 || drawCommand.RealVirtualResolutionRatio.Y != 1))
-                    drawCommand.SnapText = false;   // we don't want snapping of the resolution of the screen does not match virtual resolution. (character alignment problems)
-
-                drawCommand.RealVirtualResolutionRatio = Vector2.One; // ensure that static font are not scaled internally
-            }
+            drawCommand.SnapText = false;
+            float scaling = drawCommand.RequestedFontSize / font.Size;
+            drawCommand.RealVirtualResolutionRatio = 1 / new Vector2(scaling, scaling);
 
             // snap draw start position to prevent characters to be drawn in between two pixels
             if (drawCommand.SnapText)
@@ -499,7 +491,7 @@ protected override unsafe void UpdateBufferValuesFromElementInfo(ref ElementInfo
 
                 // the index buffer
                 var index = (short*)indexPtr;
-                var indices = PrimiteTypeToIndices[(int)drawInfo->Primitive];
+                var indices = PrimitiveTypeToIndices[(int)drawInfo->Primitive];
                 for (var i = 0; i < indices.Length; ++i)
                     index[i] = (short)(indices[i] + vertexOffset);
             }
@@ -508,7 +500,11 @@ protected override unsafe void UpdateBufferValuesFromElementInfo(ref ElementInfo
         private static unsafe void CalculateCubeVertices(UIImageDrawInfo* drawInfo, VertexPositionColorTextureSwizzle* vertex)
         {
             var currentPosition = drawInfo->LeftTopCornerWorld;
-            
+
+            // convert colors here instead of in the loop
+            Color4 colorScale = drawInfo->ColorScale;
+            float depthShift = drawInfo->DepthBias * DepthBiasShiftOneUnit;
+
             // set the two first line of vertices
             for (var l = 0; l < 2; ++l)
             {
@@ -516,8 +512,7 @@ private static unsafe void CalculateCubeVertices(UIImageDrawInfo* drawInfo, Vert
                 {
                     for (var c = 0; c < 2; c++)
                     {
-                        vertex->ColorScale = drawInfo->ColorScale;
-                        vertex->ColorAdd = drawInfo->ColorAdd;
+                        vertex->ColorScale = colorScale;
 
                         vertex->Swizzle = (int)drawInfo->Swizzle;
                         vertex->TextureCoordinate.X = 0; // cubes are used only for color
@@ -525,7 +520,7 @@ private static unsafe void CalculateCubeVertices(UIImageDrawInfo* drawInfo, Vert
 
                         vertex->Position.X = currentPosition.X;
                         vertex->Position.Y = currentPosition.Y;
-                        vertex->Position.Z = currentPosition.Z - currentPosition.W * drawInfo->DepthBias * DepthBiasShiftOneUnit;
+                        vertex->Position.Z = currentPosition.Z - currentPosition.W * depthShift;
                         vertex->Position.W = currentPosition.W;
 
                         vertex++;
@@ -571,11 +566,17 @@ private unsafe void CalculateBorderRectangleVertices(UIImageDrawInfo* drawInfo,
             Vector4.Multiply(ref drawInfo->UnitYWorld, drawInfo->VertexShift.W, out shiftVectorY[2]);
             shiftVectorY[3] = drawInfo->UnitYWorld;
 
+            // convert colors here instead of in the loop
+            Color4 colorScale = drawInfo->ColorScale;
+            float depthShift = drawInfo->DepthBias * DepthBiasShiftOneUnit;
+
             for (var r = 0; r < 4; r++)
             {
                 Vector4 currentRowPosition;
                 Vector4.Add(ref drawInfo->LeftTopCornerWorld, ref shiftVectorY[r], out currentRowPosition);
 
+                float uvYr = uvY[r]; // grab it out here
+
                 for (var c = 0; c < 4; c++)
                 {
                     Vector4 currentPosition;
@@ -583,14 +584,13 @@ private unsafe void CalculateBorderRectangleVertices(UIImageDrawInfo* drawInfo,
 
                     vertex->Position.X = currentPosition.X;
                     vertex->Position.Y = currentPosition.Y;
-                    vertex->Position.Z = currentPosition.Z - currentPosition.W * drawInfo->DepthBias * DepthBiasShiftOneUnit;
+                    vertex->Position.Z = currentPosition.Z - currentPosition.W * depthShift;
                     vertex->Position.W = currentPosition.W;
 
-                    vertex->ColorScale = drawInfo->ColorScale;
-                    vertex->ColorAdd = drawInfo->ColorAdd;
+                    vertex->ColorScale = colorScale;
 
-                    vertex->TextureCoordinate.X = uvX[c];
-                    vertex->TextureCoordinate.Y = uvY[r];
+                    vertex->TextureCoordinate.X = c == 0 ? uvX.X : uvX.Y;
+                    vertex->TextureCoordinate.Y = uvYr;
 
                     vertex->Swizzle = (int)drawInfo->Swizzle;
 
@@ -618,41 +618,65 @@ private unsafe void CalculateRectangleVertices(UIImageDrawInfo* drawInfo, Vertex
                 currentPosition.Y *= currentPosition.W;
             }
 
-            var textureCoordX = new Vector2(drawInfo->Source.Left, drawInfo->Source.Right);
-            var textureCoordY = new Vector2(drawInfo->Source.Top, drawInfo->Source.Bottom);
+            float tcx0 = drawInfo->Source.Left;
+            float tcx1 = drawInfo->Source.Right;
+            float tcy0 = drawInfo->Source.Top;
+            float tcy1 = drawInfo->Source.Bottom;
+
+            // convert colors here instead of in the loop
+            Color4 colorScale = drawInfo->ColorScale;
+            float depthShift = drawInfo->DepthBias * DepthBiasShiftOneUnit;
 
             // set the two first line of vertices
             for (var r = 0; r < 2; r++)
             {
-                for (var c = 0; c < 2; c++)
+                // unroll this loop
+                // c = 0
+                vertex->ColorScale = colorScale;
+                vertex->Swizzle = (int)drawInfo->Swizzle;
+                vertex->TextureCoordinate.X = tcx0;
+                vertex->TextureCoordinate.Y = r == 0 ? tcy0 : tcy1;
+
+                vertex->Position.X = currentPosition.X;
+                vertex->Position.Y = currentPosition.Y;
+                vertex->Position.Z = currentPosition.Z - currentPosition.W * depthShift;
+                vertex->Position.W = currentPosition.W;
+
+                if (drawInfo->SnapImage)
                 {
-                    vertex->ColorScale = drawInfo->ColorScale;
-                    vertex->ColorAdd = drawInfo->ColorAdd;
-                    vertex->Swizzle = (int)drawInfo->Swizzle;
-                    vertex->TextureCoordinate.X = textureCoordX[c];
-                    vertex->TextureCoordinate.Y = textureCoordY[r];
+                    var backBufferHalfWidth = GraphicsContext.CommandList.RenderTarget.ViewWidth / 2;
+                    var backBufferHalfHeight = GraphicsContext.CommandList.RenderTarget.ViewHeight / 2;
+                    vertex->Position.X = (float)(Math.Round(vertex->Position.X * backBufferHalfWidth) / backBufferHalfWidth);
+                    vertex->Position.Y = (float)(Math.Round(vertex->Position.Y * backBufferHalfHeight) / backBufferHalfHeight);
+                }
 
-                    vertex->Position.X = currentPosition.X;
-                    vertex->Position.Y = currentPosition.Y;
-                    vertex->Position.Z = currentPosition.Z - currentPosition.W * drawInfo->DepthBias * DepthBiasShiftOneUnit;
-                    vertex->Position.W = currentPosition.W;
+                vertex++;
 
-                    if (drawInfo->SnapImage)
-                    {
-                        var backBufferHalfWidth = GraphicsContext.CommandList.RenderTarget.ViewWidth / 2;
-                        var backBufferHalfHeight = GraphicsContext.CommandList.RenderTarget.ViewHeight / 2;
-                        vertex->Position.X = (float)(Math.Round(vertex->Position.X * backBufferHalfWidth) / backBufferHalfWidth);
-                        vertex->Position.Y = (float)(Math.Round(vertex->Position.Y * backBufferHalfHeight) / backBufferHalfHeight);
-                    }
+                Vector4.Add(ref currentPosition, ref drawInfo->UnitXWorld, out currentPosition);
 
-                    vertex++;
+                // c = 1
+                vertex->ColorScale = colorScale;
+                vertex->Swizzle = (int)drawInfo->Swizzle;
+                vertex->TextureCoordinate.X = tcx1;
+                vertex->TextureCoordinate.Y = r == 0 ? tcy0 : tcy1;
 
-                    if (c == 0)
-                        Vector4.Add(ref currentPosition, ref drawInfo->UnitXWorld, out currentPosition);
-                    else
-                        Vector4.Subtract(ref currentPosition, ref drawInfo->UnitXWorld, out currentPosition);
+                vertex->Position.X = currentPosition.X;
+                vertex->Position.Y = currentPosition.Y;
+                vertex->Position.Z = currentPosition.Z - currentPosition.W * depthShift;
+                vertex->Position.W = currentPosition.W;
+
+                if (drawInfo->SnapImage)
+                {
+                    var backBufferHalfWidth = GraphicsContext.CommandList.RenderTarget.ViewWidth / 2;
+                    var backBufferHalfHeight = GraphicsContext.CommandList.RenderTarget.ViewHeight / 2;
+                    vertex->Position.X = (float)(Math.Round(vertex->Position.X * backBufferHalfWidth) / backBufferHalfWidth);
+                    vertex->Position.Y = (float)(Math.Round(vertex->Position.Y * backBufferHalfHeight) / backBufferHalfHeight);
                 }
 
+                vertex++;
+
+                Vector4.Subtract(ref currentPosition, ref drawInfo->UnitXWorld, out currentPosition);
+
                 Vector4.Add(ref currentPosition, ref drawInfo->UnitYWorld, out currentPosition);
             }
         }
@@ -693,8 +717,7 @@ public struct UIImageDrawInfo
             public RectangleF Source;
             public Vector4 BorderSize;
             public Vector4 VertexShift;
-            public Color ColorScale;
-            public Color ColorAdd;
+            public Color4 ColorScale;
             public int DepthBias;
             public SwizzleMode Swizzle;
             public bool SnapImage;
diff --git a/sources/engine/Xenko.Graphics/VertexDeclaration.cs b/sources/engine/Xenko.Graphics/VertexDeclaration.cs
index 39c513357d..0d9b9be534 100644
--- a/sources/engine/Xenko.Graphics/VertexDeclaration.cs
+++ b/sources/engine/Xenko.Graphics/VertexDeclaration.cs
@@ -41,7 +41,7 @@ public VertexDeclaration(params VertexElement[] elements)
         /// <param name="instanceCount">The instance count.</param>
         /// <param name="vertexStride">The vertex stride.</param>
         /// <exception cref="System.ArgumentNullException">elements</exception>
-        public VertexDeclaration(VertexElement[] elements, int instanceCount = 0, int vertexStride = 0) 
+        public VertexDeclaration(VertexElement[] elements, int instanceCount, int vertexStride) 
         {
             if (elements == null) throw new ArgumentNullException("elements");
 
diff --git a/sources/engine/Xenko.Graphics/VertexElement.cs b/sources/engine/Xenko.Graphics/VertexElement.cs
index 382bc8041c..3051610d47 100644
--- a/sources/engine/Xenko.Graphics/VertexElement.cs
+++ b/sources/engine/Xenko.Graphics/VertexElement.cs
@@ -507,7 +507,7 @@ private static PixelFormat ConvertTypeToFormat(Type typeT)
                 return PixelFormat.R16G16B16A16_Float;
             if (typeof(Half2) == typeT)
                 return PixelFormat.R16G16_Float;
-            if (typeof(Half) == typeT)
+            if (typeof(Xenko.Core.Mathematics.Half) == typeT)
                 return PixelFormat.R16_Float;
 
             if (typeof(Int4) == typeT)
diff --git a/sources/engine/Xenko.Graphics/VertexHelper.cs b/sources/engine/Xenko.Graphics/VertexHelper.cs
index 7a0815e33e..6f5923e4ca 100644
--- a/sources/engine/Xenko.Graphics/VertexHelper.cs
+++ b/sources/engine/Xenko.Graphics/VertexHelper.cs
@@ -121,7 +121,7 @@ public static unsafe VertexTransformResult GenerateMultiTextureCoordinates(Verte
             if (vertexBufferData == IntPtr.Zero) throw new ArgumentNullException("vertexBufferData");
             if (vertexCount <= 0) throw new ArgumentOutOfRangeException("vertexCount", "vertexCount must be > 0");
             if (vertexStride < 0) throw new ArgumentOutOfRangeException("vertexStride", "vertexStride must be >= 0");
-            if (maxTexcoord < 0) throw new ArgumentOutOfRangeException("maxTexcoord", "maxTexcoord must be > 0");
+            if (maxTexcoord < 0) throw new ArgumentOutOfRangeException("maxTexcoord", "maxTexcoord must be >= 0");
 
             // Get the stride from the vertex declaration if necessary
             if (vertexStride == 0)
@@ -147,11 +147,11 @@ public static unsafe VertexTransformResult GenerateMultiTextureCoordinates(Verte
             {
                 var vertexElement = VertexElement.TextureCoordinate(i, DefaultUVFormat);
                 var semantic = vertexElement.SemanticAsText;
-                if (offsetMapping.ContainsKey(semantic))
+                if (offsetMapping.TryGetValue(semantic, out int offset))
                 {
                     if (vertexUVOffset < 0)
                     {
-                        vertexUVOffset = offsetMapping[semantic];
+                        vertexUVOffset = offset;
                     }
                 }
                 else
diff --git a/sources/engine/Xenko.Graphics/VertexPositionColorTexture.cs b/sources/engine/Xenko.Graphics/VertexPositionColorTexture.cs
index 76705de12c..11c268501e 100644
--- a/sources/engine/Xenko.Graphics/VertexPositionColorTexture.cs
+++ b/sources/engine/Xenko.Graphics/VertexPositionColorTexture.cs
@@ -18,7 +18,7 @@ public struct VertexPositionColorTexture : IEquatable<VertexPositionColorTexture
         /// <param name="position">The position of this vertex.</param>
         /// <param name="color">The color of this vertex.</param>
         /// <param name="textureCoordinate">UV texture coordinates.</param>
-        public VertexPositionColorTexture(Vector3 position, Color color, Vector2 textureCoordinate)
+        public VertexPositionColorTexture(Vector3 position, Color4 color, Vector2 textureCoordinate)
             : this()
         {
             Position = position;
@@ -34,7 +34,7 @@ public VertexPositionColorTexture(Vector3 position, Color color, Vector2 texture
         /// <summary>
         /// The vertex color.
         /// </summary>
-        public Color Color;
+        public Color4 Color;
 
         /// <summary>
         /// UV texture coordinates.
@@ -44,14 +44,14 @@ public VertexPositionColorTexture(Vector3 position, Color color, Vector2 texture
         /// <summary>
         /// Defines structure byte size.
         /// </summary>
-        public static readonly int Size = 24;
+        public static readonly int Size = 36;
 
         /// <summary>
         /// The vertex layout of this struct.
         /// </summary>
         public static readonly VertexDeclaration Layout = new VertexDeclaration(
             VertexElement.Position<Vector3>(),
-            VertexElement.Color<Color>(),
+            VertexElement.Color<Color4>(),
             VertexElement.TextureCoordinate<Vector2>());
 
         public bool Equals(VertexPositionColorTexture other)
diff --git a/sources/engine/Xenko.Graphics/VertexPositionColorTextureSwizzle.cs b/sources/engine/Xenko.Graphics/VertexPositionColorTextureSwizzle.cs
index 5d096a167a..7e9b98075b 100644
--- a/sources/engine/Xenko.Graphics/VertexPositionColorTextureSwizzle.cs
+++ b/sources/engine/Xenko.Graphics/VertexPositionColorTextureSwizzle.cs
@@ -20,7 +20,7 @@ public struct VertexPositionColorTextureSwizzle : IEquatable<VertexPositionColor
         /// <param name="color">The color of this vertex.</param>
         /// <param name="textureCoordinate">UV texture coordinates.</param>
         /// <param name="swizzle">The swizzle mode</param>
-        public VertexPositionColorTextureSwizzle(Vector4 position, Color color, Color colorAdd, Vector2 textureCoordinate, SwizzleMode swizzle)
+        public VertexPositionColorTextureSwizzle(Vector4 position, Color4 color, Color4 colorAdd, Vector2 textureCoordinate, SwizzleMode swizzle)
             : this()
         {
             Position = position;
diff --git a/sources/engine/Xenko.Graphics/VertexPositionNormalColor.cs b/sources/engine/Xenko.Graphics/VertexPositionNormalColor.cs
index 05788aa591..ec1c7e9c8f 100644
--- a/sources/engine/Xenko.Graphics/VertexPositionNormalColor.cs
+++ b/sources/engine/Xenko.Graphics/VertexPositionNormalColor.cs
@@ -20,7 +20,7 @@ public struct VertexPositionNormalColor : IEquatable<VertexPositionNormalColor>,
         /// <param name="position">The position of this vertex.</param>
         /// <param name="normal">The vertex normal.</param>
         /// <param name="color">the color</param>
-        public VertexPositionNormalColor(Vector3 position, Vector3 normal, Color color)
+        public VertexPositionNormalColor(Vector3 position, Vector3 normal, Color4 color)
             : this()
         {
             Position = position;
@@ -41,12 +41,12 @@ public VertexPositionNormalColor(Vector3 position, Vector3 normal, Color color)
         /// <summary>
         /// The color.
         /// </summary>
-        public Color Color;
+        public Color4 Color;
 
         /// <summary>
         /// Defines structure byte size.
         /// </summary>
-        public static readonly int Size = 28;
+        public static readonly int Size = 40;
 
         /// <summary>
         /// The vertex layout of this structure.
@@ -54,7 +54,7 @@ public VertexPositionNormalColor(Vector3 position, Vector3 normal, Color color)
         public static readonly VertexDeclaration Layout = new VertexDeclaration(
             VertexElement.Position<Vector3>(),
             VertexElement.Normal<Vector3>(),
-            VertexElement.Color<Color>());
+            VertexElement.Color<Color4>());
 
         public bool Equals(VertexPositionNormalColor other)
         {
diff --git a/sources/engine/Xenko.Graphics/VertexPositionNormalTextureTangent.cs b/sources/engine/Xenko.Graphics/VertexPositionNormalTextureTangent.cs
new file mode 100644
index 0000000000..8a1dda0ffe
--- /dev/null
+++ b/sources/engine/Xenko.Graphics/VertexPositionNormalTextureTangent.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Copyright (c) 2010-2013 SharpDX - Alexandre Mutel
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+using System;
+using System.Runtime.InteropServices;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Graphics
+{
+    /// <summary>
+    /// Describes a custom vertex format structure that contains position, normal and texture information.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    public struct VertexPositionNormalTextureTangent : IEquatable<VertexPositionNormalTextureTangent>, IVertex
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VertexPositionNormalTexture"/> struct.
+        /// </summary>
+        /// <param name="position">The position of this vertex.</param>
+        /// <param name="normal">The vertex normal.</param>
+        /// <param name="textureCoordinate">UV texture coordinates.</param>
+        public VertexPositionNormalTextureTangent(Vector3 position, Vector3 normal, Vector2 textureCoordinate) : this()
+        {
+            Position = position;
+            Normal = normal;
+            TextureCoordinate = textureCoordinate;
+        }
+
+        /// <summary>
+        /// XYZ position.
+        /// </summary>
+        public Vector3 Position;
+
+        /// <summary>
+        /// The vertex normal.
+        /// </summary>
+        public Vector3 Normal;
+
+        /// <summary>
+        /// UV texture coordinates.
+        /// </summary>
+        public Vector2 TextureCoordinate;
+
+        /// <summary>
+        /// Tangent
+        /// </summary>
+        public Vector4 Tangent;
+
+        /// <summary>
+        /// Defines structure byte size.
+        /// </summary>
+        public static readonly int Size = 32;
+
+        /// <summary>
+        /// The vertex layout of this struct.
+        /// </summary>
+        public static readonly VertexDeclaration Layout = new VertexDeclaration(
+            VertexElement.Position<Vector3>(),
+            VertexElement.Normal<Vector3>(),
+            VertexElement.TextureCoordinate<Vector2>(),
+            VertexElement.Tangent<Vector4>());
+
+        public bool Equals(VertexPositionNormalTextureTangent other)
+        {
+            return Position.Equals(other.Position) && Normal.Equals(other.Normal) && TextureCoordinate.Equals(other.TextureCoordinate) && Tangent.Equals(other.Tangent);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            return obj is VertexPositionNormalTextureTangent && Equals((VertexPositionNormalTextureTangent)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = Position.GetHashCode();
+                hashCode = (hashCode * 397) ^ Normal.GetHashCode();
+                hashCode = (hashCode * 397) ^ TextureCoordinate.GetHashCode();
+                hashCode = (hashCode * 397) ^ Tangent.GetHashCode();
+                return hashCode;
+            }
+        }
+
+        public VertexDeclaration GetLayout()
+        {
+            return Layout;
+        }
+
+        public void FlipWinding()
+        {
+            TextureCoordinate.X = (1.0f - TextureCoordinate.X);
+        }
+
+        public static bool operator ==(VertexPositionNormalTextureTangent left, VertexPositionNormalTextureTangent right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(VertexPositionNormalTextureTangent left, VertexPositionNormalTextureTangent right)
+        {
+            return !left.Equals(right);
+        }
+
+        public override string ToString()
+        {
+            return string.Format("Position: {0}, Normal: {1}, Texcoord: {2}, Tangent {3}", Position, Normal, TextureCoordinate, Tangent);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Graphics/Vulkan/Buffer.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/Buffer.Vulkan.cs
index 9c40049cf2..200d64fffd 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/Buffer.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/Buffer.Vulkan.cs
@@ -3,17 +3,21 @@
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
 using System.Collections.Generic;
-
-using SharpVulkan;
+using Xenko.Core.Threading;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Core;
+using System.Runtime.ExceptionServices;
+using Xenko.Core.Serialization.Contents;
 
 namespace Xenko.Graphics
 {
     public partial class Buffer
     {
-        internal SharpVulkan.Buffer NativeBuffer;
-        internal BufferView NativeBufferView;
-        internal AccessFlags NativeAccessMask;
+        internal static object BufferLocker = new object();
+        internal VkBuffer NativeBuffer;
+        internal VkBufferView NativeBufferView;
+        internal VkAccessFlags NativeAccessMask;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="Buffer" /> class.
@@ -36,30 +40,65 @@ protected Buffer InitializeFromImpl(BufferDescription description, BufferFlags v
                 GraphicsDevice.RegisterBufferMemoryUsage(SizeInBytes);
             }
 
+            Ready = true;
+
             return this;
         }
 
+        public unsafe void DestroyNow()
+        {
+            GraphicsDevice.RegisterBufferMemoryUsage(-SizeInBytes);
+
+            if (NativeBufferView != VkBufferView.Null)
+            {
+                vkDestroyBufferView(GraphicsDevice.NativeDevice, NativeBufferView, null);
+                NativeBufferView = VkBufferView.Null;
+            }
+
+            if (NativeBuffer != VkBuffer.Null)
+            {
+                vkDestroyBuffer(GraphicsDevice.NativeDevice, NativeBuffer, null);            
+                NativeBuffer = VkBuffer.Null;
+            }
+
+            if (NativeMemory != VkDeviceMemory.Null)
+            {
+                if (NativeMemoryOffset.HasValue)
+                    VulkanMemoryPool.Free(this, NativeMemoryOffset.Value);
+                else
+                    vkFreeMemory(GraphicsDevice.NativeDevice, NativeMemory, null);
+                NativeMemory = VkDeviceMemory.Null;
+            }
+
+            base.OnDestroyed();
+        }
+
         /// <inheritdoc/>
         protected internal override void OnDestroyed()
         {
+            Ready = false;
+
             GraphicsDevice.RegisterBufferMemoryUsage(-SizeInBytes);
 
-            if (NativeBufferView != BufferView.Null)
+            if (NativeBufferView != VkBufferView.Null)
             {
                 GraphicsDevice.Collect(NativeBufferView);
-                NativeBufferView = BufferView.Null;
+                NativeBufferView = VkBufferView.Null;
             }
 
-            if (NativeBuffer != SharpVulkan.Buffer.Null)
+            if (NativeBuffer != VkBuffer.Null)
             {
                 GraphicsDevice.Collect(NativeBuffer);
-                NativeBuffer = SharpVulkan.Buffer.Null;
+                NativeBuffer = VkBuffer.Null;
             }
 
-            if (NativeMemory != DeviceMemory.Null)
+            if (NativeMemory != VkDeviceMemory.Null)
             {
-                GraphicsDevice.Collect(NativeMemory);
-                NativeMemory = DeviceMemory.Null;
+                if (NativeMemoryOffset.HasValue)
+                    VulkanMemoryPool.Free(this, NativeMemoryOffset.Value);
+                else
+                    GraphicsDevice.Collect(NativeMemory);
+                NativeMemory = VkDeviceMemory.Null;
             }
 
             base.OnDestroyed();
@@ -86,161 +125,186 @@ protected internal override bool OnRecreate()
         /// <param name="dataPointer"></param>
         public unsafe void Recreate(IntPtr dataPointer)
         {
-            var createInfo = new BufferCreateInfo
+            // capture vertex information for possible later easy batching or physics mesh generation
+            if (dataPointer != IntPtr.Zero &&
+                (ViewFlags == BufferFlags.VertexBuffer && (ContentManager._captureThisModel || CaptureAllModelBuffers || bufferDescription.SizeInBytes <= CaptureVertexBuffersOfSize) ||
+                 ViewFlags == BufferFlags.IndexBuffer && (ContentManager._captureThisModel || CaptureAllModelBuffers || bufferDescription.SizeInBytes <= CaptureIndexBuffersOfSize)))
             {
-                StructureType = StructureType.BufferCreateInfo,
-                Size = (ulong)bufferDescription.SizeInBytes,
-                Flags = BufferCreateFlags.None,
-            };
+                VertIndexData = new byte[Description.SizeInBytes];
+                fixed (byte* vid = &VertIndexData[0])
+                {
+                    Utilities.CopyMemory((IntPtr)vid, dataPointer, VertIndexData.Length);
+                }
+            } else VertIndexData = null;
 
-            createInfo.Usage |= BufferUsageFlags.TransferSource;
+            var createInfo = new VkBufferCreateInfo
+            {
+                sType = VkStructureType.BufferCreateInfo,
+                size = (ulong)bufferDescription.SizeInBytes,
+                flags = VkBufferCreateFlags.None,
+            };
 
-            // We always fill using transfer
-            //if (bufferDescription.Usage != GraphicsResourceUsage.Immutable)
-                createInfo.Usage |= BufferUsageFlags.TransferDestination;
+            createInfo.usage |= VkBufferUsageFlags.TransferSrc;
+            createInfo.usage |= VkBufferUsageFlags.TransferDst;
 
             if (Usage == GraphicsResourceUsage.Staging)
             {
-                NativeAccessMask = AccessFlags.HostRead | AccessFlags.HostWrite;
-                NativePipelineStageMask |= PipelineStageFlags.Host;
+                NativeAccessMask = VkAccessFlags.HostRead | VkAccessFlags.HostWrite;
+                NativePipelineStageMask |= VkPipelineStageFlags.Host;
             }
             else
             {
                 if ((ViewFlags & BufferFlags.VertexBuffer) != 0)
                 {
-                    createInfo.Usage |= BufferUsageFlags.VertexBuffer;
-                    NativeAccessMask |= AccessFlags.VertexAttributeRead;
-                    NativePipelineStageMask |= PipelineStageFlags.VertexInput;
+                    createInfo.usage |= VkBufferUsageFlags.VertexBuffer;
+                    NativeAccessMask |= VkAccessFlags.VertexAttributeRead;
+                    NativePipelineStageMask |= VkPipelineStageFlags.VertexInput;
                 }
 
                 if ((ViewFlags & BufferFlags.IndexBuffer) != 0)
                 {
-                    createInfo.Usage |= BufferUsageFlags.IndexBuffer;
-                    NativeAccessMask |= AccessFlags.IndexRead;
-                    NativePipelineStageMask |= PipelineStageFlags.VertexInput;
+                    createInfo.usage |= VkBufferUsageFlags.IndexBuffer;
+                    NativeAccessMask |= VkAccessFlags.IndexRead;
+                    NativePipelineStageMask |= VkPipelineStageFlags.VertexInput;
                 }
 
                 if ((ViewFlags & BufferFlags.ConstantBuffer) != 0)
                 {
-                    createInfo.Usage |= BufferUsageFlags.UniformBuffer;
-                    NativeAccessMask |= AccessFlags.UniformRead;
-                    NativePipelineStageMask |= PipelineStageFlags.VertexShader | PipelineStageFlags.FragmentShader;
+                    createInfo.usage |= VkBufferUsageFlags.UniformBuffer;
+                    NativeAccessMask |= VkAccessFlags.UniformRead;
+                    NativePipelineStageMask |= VkPipelineStageFlags.VertexShader | VkPipelineStageFlags.FragmentShader;
                 }
 
                 if ((ViewFlags & BufferFlags.ShaderResource) != 0)
                 {
-                    createInfo.Usage |= BufferUsageFlags.UniformTexelBuffer;
-                    NativeAccessMask |= AccessFlags.ShaderRead;
-                    NativePipelineStageMask |= PipelineStageFlags.VertexShader | PipelineStageFlags.FragmentShader;
+                    createInfo.usage |= VkBufferUsageFlags.UniformTexelBuffer;
+                    NativeAccessMask |= VkAccessFlags.ShaderRead;
+                    NativePipelineStageMask |= VkPipelineStageFlags.VertexShader | VkPipelineStageFlags.FragmentShader;
 
                     if ((ViewFlags & BufferFlags.UnorderedAccess) != 0)
                     {
-                        createInfo.Usage |= BufferUsageFlags.StorageTexelBuffer;
-                        NativeAccessMask |= AccessFlags.ShaderWrite;
+                        createInfo.usage |= VkBufferUsageFlags.StorageTexelBuffer;
+                        NativeAccessMask |= VkAccessFlags.ShaderWrite;
                     }
                 }
             }
 
             // Create buffer
-            NativeBuffer = GraphicsDevice.NativeDevice.CreateBuffer(ref createInfo);
+            vkCreateBuffer(GraphicsDevice.NativeDevice, &createInfo, null, out NativeBuffer);
 
             // Allocate memory
-            var memoryProperties = MemoryPropertyFlags.DeviceLocal;
+            var memoryProperties = VkMemoryPropertyFlags.DeviceLocal;
             if (bufferDescription.Usage == GraphicsResourceUsage.Staging || Usage == GraphicsResourceUsage.Dynamic)
             { 
-                memoryProperties = MemoryPropertyFlags.HostVisible | MemoryPropertyFlags.HostCoherent;
+                memoryProperties = VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent;
             }
 
-            MemoryRequirements memoryRequirements;
-            GraphicsDevice.NativeDevice.GetBufferMemoryRequirements(NativeBuffer, out memoryRequirements);
+            vkGetBufferMemoryRequirements(GraphicsDevice.NativeDevice, NativeBuffer, out var memoryRequirements);
 
-            AllocateMemory(memoryProperties, memoryRequirements);
-
-            if (NativeMemory != DeviceMemory.Null)
+            if (bufferDescription.Usage == GraphicsResourceUsage.Staging || Usage == GraphicsResourceUsage.Dynamic)
             {
-                GraphicsDevice.NativeDevice.BindBufferMemory(NativeBuffer, NativeMemory, 0);
+                AllocateMemory(memoryProperties, memoryRequirements); // special case that doesn't use a pool
+                NativeMemoryOffset = null;
             }
-
-            if (SizeInBytes > 0)
+            else if (VulkanMemoryPool.TryAllocateMemoryForBuffer(createInfo.size, GraphicsDevice.NativeDevice, GraphicsDevice.NativePhysicalDevice, ref memoryRequirements, ref memoryProperties, out var memOffset, out var devmem))
             {
-                // Begin copy command buffer
-                var commandBufferAllocateInfo = new CommandBufferAllocateInfo
-                {
-                    StructureType = StructureType.CommandBufferAllocateInfo,
-                    CommandPool = GraphicsDevice.NativeCopyCommandPool,
-                    CommandBufferCount = 1,
-                    Level = CommandBufferLevel.Primary
-                };
-                CommandBuffer commandBuffer;
-
-                lock (GraphicsDevice.QueueLock)
-                {
-                    GraphicsDevice.NativeDevice.AllocateCommandBuffers(ref commandBufferAllocateInfo, &commandBuffer);
-                }
+                NativeMemory = devmem;
+                NativeMemoryOffset = memOffset;
+            }
+            else
+            {
+                AllocateMemory(memoryProperties, memoryRequirements); // last resort, allocate its own VkDeviceMemory
+                NativeMemoryOffset = null;
+            }
 
-                var beginInfo = new CommandBufferBeginInfo { StructureType = StructureType.CommandBufferBeginInfo, Flags = CommandBufferUsageFlags.OneTimeSubmit };
-                commandBuffer.Begin(ref beginInfo);
+            if (NativeMemory != VkDeviceMemory.Null)
+            {
+                vkBindBufferMemory(GraphicsDevice.NativeDevice, NativeBuffer, NativeMemory, NativeMemoryOffset ?? 0);
 
-                // Copy to upload buffer
-                if (dataPointer != IntPtr.Zero)
+                if (SizeInBytes > 0)
                 {
-                    if (Usage == GraphicsResourceUsage.Dynamic)
+                    // Begin copy command buffer
+                    var commandBufferAllocateInfo = new VkCommandBufferAllocateInfo
                     {
-                        var uploadMemory = GraphicsDevice.NativeDevice.MapMemory(NativeMemory, 0, (ulong)SizeInBytes, MemoryMapFlags.None);
-                        Utilities.CopyMemory(uploadMemory, dataPointer, SizeInBytes);
-                        GraphicsDevice.NativeDevice.UnmapMemory(NativeMemory);
-                    }
-                    else
+                        sType = VkStructureType.CommandBufferAllocateInfo,
+                        commandPool = GraphicsDevice.NativeCopyCommandPool,
+                        commandBufferCount = 1,
+                        level = VkCommandBufferLevel.Primary
+                    };
+                    VkCommandBuffer commandBuffer;
+
+                    // stuff we can prepare before the lock
+                    var fenceCreateInfo = new VkFenceCreateInfo { sType = VkStructureType.FenceCreateInfo };
+                    vkCreateFence(GraphicsDevice.NativeDevice, &fenceCreateInfo, null, out var fence);
+
+                    var bufferMemoryBarrier = new VkBufferMemoryBarrier(NativeBuffer, VkAccessFlags.TransferWrite, NativeAccessMask);
+
+                    var submitInfo = new VkSubmitInfo
                     {
-                        var sizeInBytes = bufferDescription.SizeInBytes;
-                        SharpVulkan.Buffer uploadResource;
-                        int uploadOffset;
-                        var uploadMemory = GraphicsDevice.AllocateUploadBuffer(sizeInBytes, out uploadResource, out uploadOffset);
+                        sType = VkStructureType.SubmitInfo,
+                        commandBufferCount = 1,
+                        pCommandBuffers = &commandBuffer,
+                    };
 
-                        Utilities.CopyMemory(uploadMemory, dataPointer, sizeInBytes);
+                    var beginInfo = new VkCommandBufferBeginInfo { sType = VkStructureType.CommandBufferBeginInfo, flags = VkCommandBufferUsageFlags.OneTimeSubmit };
 
-                        // Barrier
-                        var memoryBarrier = new BufferMemoryBarrier(uploadResource, AccessFlags.HostWrite, AccessFlags.TransferRead, (ulong)uploadOffset, (ulong)sizeInBytes);
-                        commandBuffer.PipelineBarrier(PipelineStageFlags.Host, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, 1, &memoryBarrier, 0, null);
+                    lock (BufferLocker)
+                    {
+                        vkAllocateCommandBuffers(GraphicsDevice.NativeDevice, &commandBufferAllocateInfo, &commandBuffer);
 
-                        // Copy
-                        var bufferCopy = new BufferCopy
+                        vkBeginCommandBuffer(commandBuffer, &beginInfo);
+
+                        // Copy to upload buffer
+                        if (dataPointer != IntPtr.Zero)
                         {
-                            SourceOffset = (uint)uploadOffset,
-                            DestinationOffset = 0,
-                            Size = (uint)sizeInBytes
-                        };
-                        commandBuffer.CopyBuffer(uploadResource, NativeBuffer, 1, &bufferCopy);
-                    }
-                }
-                else
-                {
-                    commandBuffer.FillBuffer(NativeBuffer, 0, (uint)bufferDescription.SizeInBytes, 0);
-                }
+                            if (Usage == GraphicsResourceUsage.Dynamic)
+                            {
+                                void* uploadMemory;
+                                vkMapMemory(GraphicsDevice.NativeDevice, NativeMemory, 0, (ulong)SizeInBytes, VkMemoryMapFlags.None, &uploadMemory);
+                                Utilities.CopyMemory((IntPtr)uploadMemory, dataPointer, SizeInBytes);
+                                GraphicsDevice.DelayedUnmaps.Enqueue(NativeMemory);
+                            }
+                            else
+                            {
+                                var sizeInBytes = bufferDescription.SizeInBytes;
+                                var uploadMemory = GraphicsDevice.AllocateUploadBuffer(sizeInBytes, out var uploadBuffer, out int uploadOffset);
+                                Utilities.CopyMemory(uploadMemory, dataPointer, sizeInBytes);
+
+                                // Barrier
+                                var memoryBarrier = new VkBufferMemoryBarrier(uploadBuffer, VkAccessFlags.HostWrite, VkAccessFlags.TransferRead, (ulong)uploadOffset, (ulong)sizeInBytes);
+                                vkCmdPipelineBarrier(commandBuffer, VkPipelineStageFlags.Host, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 1, &memoryBarrier, 0, null);
+
+                                // Copy
+                                var bufferCopy = new VkBufferCopy
+                                {
+                                    srcOffset = (uint)uploadOffset,
+                                    dstOffset = 0,
+                                    size = (uint)sizeInBytes
+                                };
+
+                                vkCmdCopyBuffer(commandBuffer, uploadBuffer, NativeBuffer, 1, &bufferCopy);
+                            }
+                        }
+                        else
+                        {
+                            vkCmdFillBuffer(commandBuffer, NativeBuffer, 0, (uint)bufferDescription.SizeInBytes, 0);
+                        }
 
-                // Barrier
-                var bufferMemoryBarrier = new BufferMemoryBarrier(NativeBuffer, AccessFlags.TransferWrite, NativeAccessMask);
-                commandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, PipelineStageFlags.AllCommands, DependencyFlags.None, 0, null, 1, &bufferMemoryBarrier, 0, null);
+                        // Barrier
+                        vkCmdPipelineBarrier(commandBuffer, VkPipelineStageFlags.Transfer, VkPipelineStageFlags.AllCommands, VkDependencyFlags.None, 0, null, 1, &bufferMemoryBarrier, 0, null);
 
-                // Close and submit
-                commandBuffer.End();
+                        // Close and submit
+                        vkEndCommandBuffer(commandBuffer);
+                        vkQueueSubmit(GraphicsDevice.NativeCommandQueue, 1, &submitInfo, fence);
+                        vkWaitForFences(GraphicsDevice.NativeDevice, 1, &fence, 1, ulong.MaxValue);
 
-                var submitInfo = new SubmitInfo
-                {
-                    StructureType = StructureType.SubmitInfo,
-                    CommandBufferCount = 1,
-                    CommandBuffers = new IntPtr(&commandBuffer),
-                };
+                        vkFreeCommandBuffers(GraphicsDevice.NativeDevice, GraphicsDevice.NativeCopyCommandPool, 1, &commandBuffer);
+                    }
 
-                lock (GraphicsDevice.QueueLock)
-                {
-                    GraphicsDevice.NativeCommandQueue.Submit(1, &submitInfo, Fence.Null);
-                    GraphicsDevice.NativeCommandQueue.WaitIdle();
-                    //commandBuffer.Reset(CommandBufferResetFlags.None);
-                    GraphicsDevice.NativeDevice.FreeCommandBuffers(GraphicsDevice.NativeCopyCommandPool, 1, &commandBuffer);
-                }
+                    vkDestroyFence(GraphicsDevice.NativeDevice, fence, null);
 
-                InitializeViews();
+                    InitializeViews();
+                }
             }
         }
 
@@ -262,18 +326,19 @@ private void InitializeViews()
             }
         }
 
-        internal unsafe BufferView GetShaderResourceView(PixelFormat viewFormat)
+        internal unsafe VkBufferView GetShaderResourceView(PixelFormat viewFormat)
         {
-            var createInfo = new BufferViewCreateInfo
+            var createInfo = new VkBufferViewCreateInfo
             {
-                StructureType = StructureType.BufferViewCreateInfo,
-                Buffer = NativeBuffer,
-                Format = viewFormat == PixelFormat.None ? Format.Undefined : VulkanConvertExtensions.ConvertPixelFormat(viewFormat),
-                Range = (ulong)SizeInBytes, // this.ElementCount
-                //View = (Description.BufferFlags & BufferFlags.RawBuffer) != 0 ? BufferViewType.Raw : BufferViewType.Formatted
+                sType = VkStructureType.BufferViewCreateInfo,
+                buffer = NativeBuffer,
+                format = viewFormat == PixelFormat.None ? VkFormat.Undefined : VulkanConvertExtensions.ConvertPixelFormat(viewFormat),
+                range = (ulong)SizeInBytes, // this.ElementCount
+                //view = (Description.BufferFlags & BufferFlags.RawBuffer) != 0 ? VkBufferViewType.Raw : VkBufferViewType.Formatted,
             };
 
-            return GraphicsDevice.NativeDevice.CreateBufferView(ref createInfo);
+            vkCreateBufferView(GraphicsDevice.NativeDevice, &createInfo, null, out var bufferView);
+            return bufferView;
         }
 
         private void InitCountAndViewFormat(out int count, ref PixelFormat viewFormat)
diff --git a/sources/engine/Xenko.Graphics/Vulkan/ColorHelper.cs b/sources/engine/Xenko.Graphics/Vulkan/ColorHelper.cs
deleted file mode 100644
index db61b0dcdf..0000000000
--- a/sources/engine/Xenko.Graphics/Vulkan/ColorHelper.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_VULKAN
-// Copyright (c) 2010-2011 SharpDX - Alexandre Mutel
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-using SharpVulkan;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.Graphics
-{
-    internal class ColorHelper
-    {
-        public static RawColor4 Convert(Color4 color)
-        {
-            var temp = new RawColor4();
-            unsafe
-            {
-                *((Color4*)&temp) = color;
-            }
-            return temp;
-        }
-
-        public static Color4 Convert(RawColor4 color)
-        {
-            var temp = new Color4();
-            unsafe
-            {
-                *((RawColor4*)&temp) = color;
-            }
-            return temp;
-        }
-    }
-}
-
- 
-#endif 
diff --git a/sources/engine/Xenko.Graphics/Vulkan/CommandList.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/CommandList.Vulkan.cs
index 9ecb2a18ca..3b5a4eb796 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/CommandList.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/CommandList.Vulkan.cs
@@ -1,11 +1,20 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+// set this define if we want to debug Vulkan. Requires Framework v4.8 runtime for some weird reason (might be a Vortice.Vulkan version thing)
+//#define VULKAN_DEBUG
+
+// use checkpoints to debut vulkan
+//#define VULKAN_CHECKPOINT_DEBUG
+
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Core;
+using Xenko.Core.Threading;
 using Xenko.Core.Collections;
 using Xenko.Core.Mathematics;
 
@@ -15,18 +24,18 @@ public partial class CommandList
     {
         internal CommandBufferPool CommandBufferPool;
 
-        private RenderPass activeRenderPass;
-        private RenderPass previousRenderPass;
+        private VkRenderPass activeRenderPass;
+        private VkRenderPass previousRenderPass;
         private PipelineState activePipeline;
 
-        private readonly Dictionary<FramebufferKey, Framebuffer> framebuffers = new Dictionary<FramebufferKey, Framebuffer>();
-        private readonly ImageView[] framebufferAttachments = new ImageView[9];
+        private readonly Dictionary<FramebufferKey, VkFramebuffer> framebuffers = new Dictionary<FramebufferKey, VkFramebuffer>();
+        private readonly VkImageView[] framebufferAttachments = new VkImageView[9];
         private int framebufferAttachmentCount;
         private bool framebufferDirty = true;
-        private Framebuffer activeFramebuffer;
+        private VkFramebuffer activeFramebuffer;
 
-        private SharpVulkan.DescriptorPool descriptorPool;
-        private SharpVulkan.DescriptorSet descriptorSet;
+        private VkDescriptorPool descriptorPool;
+        private VkDescriptorSet descriptorSet;
         private uint[] allocatedTypeCounts;
         private uint allocatedSetCount;
 
@@ -44,7 +53,7 @@ private CommandList(GraphicsDevice device) : base(device)
             Recreate();
         }
 
-        private void Recreate()
+        protected void Recreate()
         {
             CommandBufferPool = new CommandBufferPool(GraphicsDevice);
 
@@ -55,7 +64,7 @@ private void Recreate()
             Reset();
         }
 
-        public void Reset()
+        public unsafe void Reset()
         {
             if (currentCommandList.Builder != null)
                 return;
@@ -71,12 +80,16 @@ public void Reset()
             currentCommandList.DescriptorPools = GraphicsDevice.DescriptorPoolLists.Acquire();
             currentCommandList.StagingResources = GraphicsDevice.StagingResourceLists.Acquire();
 
-            var beginInfo = new CommandBufferBeginInfo
+            var beginInfo = new VkCommandBufferBeginInfo
             {
-                StructureType = StructureType.CommandBufferBeginInfo,
-                Flags = CommandBufferUsageFlags.OneTimeSubmit,
+                sType = VkStructureType.CommandBufferBeginInfo,
+                flags = VkCommandBufferUsageFlags.OneTimeSubmit,
             };
-            currentCommandList.NativeCommandBuffer.Begin(ref beginInfo);
+            vkBeginCommandBuffer(currentCommandList.NativeCommandBuffer, &beginInfo);
+
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("BeginCommandBuffer", currentCommandList.NativeCommandBuffer);
+#endif
 
             activeStencilReference = null;
         }
@@ -90,8 +103,11 @@ public CompiledCommandList Close()
             // End active render pass
             CleanupRenderPass();
 
-            // Close
-            currentCommandList.NativeCommandBuffer.End();
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("CloseCommandBuffer", currentCommandList.NativeCommandBuffer);
+#endif
+
+            vkEndCommandBuffer(currentCommandList.NativeCommandBuffer);
 
             // Staging resources not updated anymore
             foreach (var stagingResource in currentCommandList.StagingResources)
@@ -111,7 +127,9 @@ public CompiledCommandList Close()
         /// </summary>
         public void Flush()
         {
-            GraphicsDevice.ExecuteCommandList(Close());
+            CompiledCommandList ccl;
+            ccl = Close();
+            GraphicsDevice.ExecuteCommandList(ccl);
         }
 
         private unsafe void FlushInternal(bool wait)
@@ -123,14 +141,20 @@ private unsafe void FlushInternal(bool wait)
 
             Reset();
 
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("FlushSetStencil", currentCommandList.NativeCommandBuffer);
+#endif
             // Restore states
-            currentCommandList.NativeCommandBuffer.SetStencilReference(StencilFaceFlags.FrontAndBack, activeStencilReference ?? 0);
+            vkCmdSetStencilReference(currentCommandList.NativeCommandBuffer, VkStencilFaceFlags.FrontAndBack, activeStencilReference ?? 0);
 
             if (activePipeline != null)
             {
-                currentCommandList.NativeCommandBuffer.BindPipeline(PipelineBindPoint.Graphics, activePipeline.NativePipeline);
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("activePipeline != null binding Flush", currentCommandList.NativeCommandBuffer);
+#endif
+                vkCmdBindPipeline(currentCommandList.NativeCommandBuffer, VkPipelineBindPoint.Graphics, activePipeline.NativePipeline);
                 var descriptorSetCopy = descriptorSet;
-                currentCommandList.NativeCommandBuffer.BindDescriptorSets(PipelineBindPoint.Graphics, activePipeline.NativeLayout, 0, 1, &descriptorSetCopy, 0, null);
+                vkCmdBindDescriptorSets(currentCommandList.NativeCommandBuffer, VkPipelineBindPoint.Graphics, activePipeline.NativeLayout, 0, 1, &descriptorSetCopy, 0, null);
             }
             SetRenderTargetsImpl(depthStencilBuffer, renderTargetCount, renderTargets);
         }
@@ -195,11 +219,14 @@ private unsafe void SetViewportImpl()
             if (!viewportDirty && !scissorsDirty)
                 return;
 
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("SetViewportImpl", currentCommandList.NativeCommandBuffer);
+#endif
             //// TODO D3D12 Hardcoded for one viewport
             var viewportCopy = Viewport;
             if (viewportDirty)
             {
-                currentCommandList.NativeCommandBuffer.SetViewport(0, 1, (SharpVulkan.Viewport*)&viewportCopy);
+                vkCmdSetViewport(currentCommandList.NativeCommandBuffer, 0, 1, (Vortice.Mathematics.Viewport*)&viewportCopy);
                 viewportDirty = false;
             }
 
@@ -209,16 +236,16 @@ private unsafe void SetViewportImpl()
                 {
                     // Use manual scissor
                     var scissor = scissors[0];
-                    var nativeScissor = new Rect2D(scissor.Left, scissor.Top, (uint)scissor.Width, (uint)scissor.Height);
-                    currentCommandList.NativeCommandBuffer.SetScissor(0, 1, &nativeScissor);
+                    var nativeScissor = new Vortice.Vulkan.VkRect2D(scissor.Left, scissor.Top, scissor.Width, scissor.Height);
+                    vkCmdSetScissor(currentCommandList.NativeCommandBuffer, 0, 1, &nativeScissor);
                 }
             }
             else
             {
                 // Use viewport
                 // Always update, because either scissor or viewport was dirty and we use viewport size
-                var scissor = new Rect2D((int)viewportCopy.X, (int)viewportCopy.Y, (uint)viewportCopy.Width, (uint)viewportCopy.Height);
-                currentCommandList.NativeCommandBuffer.SetScissor(0, 1, &scissor);
+                var scissor = new Vortice.Vulkan.VkRect2D((int)viewportCopy.X, (int)viewportCopy.Y, (int)viewportCopy.Width, (int)viewportCopy.Height);
+                vkCmdSetScissor(currentCommandList.NativeCommandBuffer, 0, 1, &scissor);
             }
 
             scissorsDirty = false;
@@ -239,10 +266,14 @@ private unsafe void PrepareDraw()
         {
             SetViewportImpl();
 
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("PrepareDraw", currentCommandList.NativeCommandBuffer);
+#endif
+
             if (!activeStencilReference.HasValue)
             {
                 activeStencilReference = 0;
-                currentCommandList.NativeCommandBuffer.SetStencilReference(StencilFaceFlags.FrontAndBack, 0);
+                vkCmdSetStencilReference(currentCommandList.NativeCommandBuffer, VkStencilFaceFlags.FrontAndBack, 0);
             }
 
             // Lazily set the render pass and frame buffer
@@ -275,40 +306,20 @@ private unsafe void PrepareDraw()
 
             // Allocate descriptor set
             var nativeDescriptorSetLayout = activePipeline.NativeDescriptorSetLayout;
-            var allocateInfo = new DescriptorSetAllocateInfo
+            var allocateInfo = new VkDescriptorSetAllocateInfo
             {
-                StructureType = StructureType.DescriptorSetAllocateInfo,
-                DescriptorPool = descriptorPool,
-                DescriptorSetCount = 1,
-                SetLayouts = new IntPtr(&nativeDescriptorSetLayout)
+                sType = VkStructureType.DescriptorSetAllocateInfo,
+                descriptorPool = descriptorPool,
+                descriptorSetCount = 1,
+                pSetLayouts = &nativeDescriptorSetLayout,
             };
 
-            SharpVulkan.DescriptorSet localDescriptorSet;
-            GraphicsDevice.NativeDevice.AllocateDescriptorSets(ref allocateInfo, &localDescriptorSet);
+            VkDescriptorSet localDescriptorSet;
+            vkAllocateDescriptorSets(GraphicsDevice.NativeDevice, &allocateInfo, &localDescriptorSet);
             this.descriptorSet = localDescriptorSet;
 
-#if !XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES
-            copies.Clear(true);
-
-            foreach (var mapping in activePipeline.DescriptorBindingMapping)
-            {
-                copies.Add(new CopyDescriptorSet
-                {
-                    StructureType = StructureType.CopyDescriptorSet,
-                    SourceSet = boundDescriptorSets[mapping.SourceSet],
-                    SourceBinding = (uint)mapping.SourceBinding,
-                    SourceArrayElement = 0,
-                    DestinationSet = localDescriptorSet,
-                    DestinationBinding = (uint)mapping.DestinationBinding,
-                    DestinationArrayElement = 0,
-                    DescriptorCount = 1
-                });
-            }
-
-            GraphicsDevice.NativeDevice.UpdateDescriptorSets(0, null, (uint)copies.Count, copies.Count > 0 ? (CopyDescriptorSet*)Interop.Fixed(copies.Items) : null);
-#else
             var bindingCount = activePipeline.DescriptorBindingMapping.Count;
-            var writes = stackalloc WriteDescriptorSet[bindingCount];
+            var writes = stackalloc VkWriteDescriptorSet[bindingCount];
             var descriptorDatas = stackalloc DescriptorData[bindingCount];
 
             for (int index = 0; index < bindingCount; index++)
@@ -320,40 +331,40 @@ private unsafe void PrepareDraw()
                 var write = writes + index;
                 var descriptorData = descriptorDatas + index;
 
-                *write = new WriteDescriptorSet
+                *write = new VkWriteDescriptorSet
                 {
-                    StructureType = StructureType.WriteDescriptorSet,
-                    DescriptorType = mapping.DescriptorType,
-                    DestinationSet = localDescriptorSet,
-                    DestinationBinding = (uint)mapping.DestinationBinding,
-                    DestinationArrayElement = 0,
-                    DescriptorCount = 1,
+                    sType = VkStructureType.WriteDescriptorSet,
+                    descriptorType = mapping.DescriptorType,
+                    dstSet = localDescriptorSet,
+                    dstBinding = (uint)mapping.DestinationBinding,
+                    dstArrayElement = 0,
+                    descriptorCount = 1,
                 };
 
                 switch (mapping.DescriptorType)
                 {
-                    case DescriptorType.SampledImage:
+                    case VkDescriptorType.SampledImage:
                         var texture = heapObject.Value as Texture;
-                        descriptorData->ImageInfo = new DescriptorImageInfo { ImageView = texture?.NativeImageView ?? ImageView.Null, ImageLayout = ImageLayout.ShaderReadOnlyOptimal };
-                        write->ImageInfo = new IntPtr(descriptorData);
+                        descriptorData->ImageInfo = new VkDescriptorImageInfo { imageView = texture?.NativeImageView ?? GraphicsDevice.EmptyTexture.NativeImageView, imageLayout = VkImageLayout.ShaderReadOnlyOptimal };
+                        write->pImageInfo = &descriptorData->ImageInfo;
                         break;
 
-                    case DescriptorType.Sampler:
+                    case VkDescriptorType.Sampler:
                         var samplerState = heapObject.Value as SamplerState;
-                        descriptorData->ImageInfo = new DescriptorImageInfo { Sampler = samplerState?.NativeSampler ?? GraphicsDevice.SamplerStates.LinearWrap.NativeSampler };
-                        write->ImageInfo = new IntPtr(descriptorData);
+                        descriptorData->ImageInfo = new VkDescriptorImageInfo { sampler = samplerState?.NativeSampler ?? GraphicsDevice.SamplerStates.LinearClamp.NativeSampler };
+                        write->pImageInfo = &descriptorData->ImageInfo;
                         break;
 
-                    case DescriptorType.UniformBuffer:
+                    case VkDescriptorType.UniformBuffer:
                         var buffer = heapObject.Value as Buffer;
-                        descriptorData->BufferInfo = new DescriptorBufferInfo { Buffer = buffer?.NativeBuffer ?? SharpVulkan.Buffer.Null, Offset = (ulong)heapObject.Offset, Range = (ulong)heapObject.Size };
-                        write->BufferInfo = new IntPtr(descriptorData);
+                        descriptorData->BufferInfo = new VkDescriptorBufferInfo { buffer = buffer?.NativeBuffer ?? VkBuffer.Null, offset = (ulong)heapObject.Offset, range = (ulong)heapObject.Size };
+                        write->pBufferInfo = &descriptorData->BufferInfo;
                         break;
 
-                    case DescriptorType.UniformTexelBuffer:
+                    case VkDescriptorType.UniformTexelBuffer:
                         buffer = heapObject.Value as Buffer;
                         descriptorData->BufferView = buffer?.NativeBufferView ?? GraphicsDevice.EmptyTexelBuffer.NativeBufferView;
-                        write->TexelBufferView = new IntPtr(descriptorData);
+                        write->pTexelBufferView = &descriptorData->BufferView;
                         break;
 
                     default:
@@ -361,19 +372,28 @@ private unsafe void PrepareDraw()
                 }
             }
 
-            GraphicsDevice.NativeDevice.UpdateDescriptorSets((uint)bindingCount, writes, 0, null);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("PrepareDrawBindDescriptor", currentCommandList.NativeCommandBuffer);
 #endif
-            currentCommandList.NativeCommandBuffer.BindDescriptorSets(PipelineBindPoint.Graphics, activePipeline.NativeLayout, 0, 1, &localDescriptorSet, 0, null);
+
+            // POSSIBLE "device lost" is due to the following, I did have a report of a "VULKAN_DEVICE_LOST" with the line above
+            // however that was before the bufferpool fixes, so unsure this is still a thing
+            vkUpdateDescriptorSets(GraphicsDevice.NativeDevice, (uint)bindingCount, writes, 0, null);
+            vkCmdBindDescriptorSets(currentCommandList.NativeCommandBuffer, VkPipelineBindPoint.Graphics, activePipeline.NativeLayout, 0, 1, &localDescriptorSet, 0, null);
         }
 
-        private readonly FastList<CopyDescriptorSet> copies = new FastList<CopyDescriptorSet>();
+        private readonly FastList<VkCopyDescriptorSet> copies = new FastList<VkCopyDescriptorSet>();
 
         public void SetStencilReference(int stencilReference)
         {
             if (activeStencilReference != stencilReference)
             {
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("SetStencilReference", currentCommandList.NativeCommandBuffer);
+#endif
+
                 activeStencilReference = (uint)stencilReference;
-                currentCommandList.NativeCommandBuffer.SetStencilReference(StencilFaceFlags.FrontAndBack, activeStencilReference.Value);
+                vkCmdSetStencilReference(currentCommandList.NativeCommandBuffer, VkStencilFaceFlags.FrontAndBack, activeStencilReference.Value);
             }
         }
 
@@ -387,7 +407,19 @@ public void SetPipelineState(PipelineState pipelineState)
 
             activePipeline = pipelineState;
 
-            currentCommandList.NativeCommandBuffer.BindPipeline(PipelineBindPoint.Graphics, pipelineState.NativePipeline);
+            if (pipelineState.CurrentState() != PipelineState.PIPELINE_STATE.ERROR)
+            {
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("SetPipelineStateBind", currentCommandList.NativeCommandBuffer);
+#endif
+                vkCmdBindPipeline(currentCommandList.NativeCommandBuffer, VkPipelineBindPoint.Graphics, pipelineState.NativePipeline);
+            } 
+            else
+            {
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("SetPipelineStateBindFAILERROR", currentCommandList.NativeCommandBuffer);
+#endif
+            }
         }
 
         public unsafe void SetVertexBuffer(int index, Buffer buffer, int offset, int stride)
@@ -401,12 +433,19 @@ public unsafe void SetVertexBuffer(int index, Buffer buffer, int offset, int str
             var bufferCopy = buffer.NativeBuffer;
             var offsetCopy = (ulong)offset;
 
-            currentCommandList.NativeCommandBuffer.BindVertexBuffers((uint)index, 1, &bufferCopy, &offsetCopy);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("SetVertexBuffer", currentCommandList.NativeCommandBuffer);
+#endif
+
+            vkCmdBindVertexBuffers(currentCommandList.NativeCommandBuffer, (uint)index, 1, &bufferCopy, &offsetCopy);
         }
 
         public void SetIndexBuffer(Buffer buffer, int offset, bool is32bits)
         {
-            currentCommandList.NativeCommandBuffer.BindIndexBuffer(buffer.NativeBuffer, (ulong)offset, is32bits ? IndexType.UInt32 : IndexType.UInt16);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("SetIndexBuffer", currentCommandList.NativeCommandBuffer);
+#endif
+            vkCmdBindIndexBuffer(currentCommandList.NativeCommandBuffer, buffer.NativeBuffer, (ulong)offset, is32bits ? VkIndexType.Uint32 : VkIndexType.Uint16);
         }
 
         public unsafe void ResourceBarrierTransition(GraphicsResource resource, GraphicsResourceState newState)
@@ -418,7 +457,7 @@ public unsafe void ResourceBarrierTransition(GraphicsResource resource, Graphics
                     texture = texture.ParentTexture;
 
                 // TODO VULKAN: Check for change
-
+                
                 var oldLayout = texture.NativeLayout;
                 var oldAccessMask = texture.NativeAccessMask;
 
@@ -427,48 +466,51 @@ public unsafe void ResourceBarrierTransition(GraphicsResource resource, Graphics
                 switch (newState)
                 {
                     case GraphicsResourceState.RenderTarget:
-                        texture.NativeLayout = ImageLayout.ColorAttachmentOptimal;
-                        texture.NativeAccessMask = AccessFlags.ColorAttachmentWrite;
-                        texture.NativePipelineStageMask = PipelineStageFlags.ColorAttachmentOutput;
+                        texture.NativeLayout = VkImageLayout.ColorAttachmentOptimal;
+                        texture.NativeAccessMask = VkAccessFlags.ColorAttachmentWrite;
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.ColorAttachmentOutput;
                         break;
                     case GraphicsResourceState.Present:
-                        texture.NativeLayout = ImageLayout.PresentSource;
-                        texture.NativeAccessMask = AccessFlags.MemoryRead;
-                        texture.NativePipelineStageMask = PipelineStageFlags.BottomOfPipe;
+                        texture.NativeLayout = VkImageLayout.PresentSrcKHR;
+                        texture.NativeAccessMask = VkAccessFlags.MemoryRead;
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.BottomOfPipe;
                         break;
                     case GraphicsResourceState.DepthWrite:
-                        texture.NativeLayout = ImageLayout.DepthStencilAttachmentOptimal;
-                        texture.NativeAccessMask = AccessFlags.DepthStencilAttachmentWrite;
-                        texture.NativePipelineStageMask = PipelineStageFlags.ColorAttachmentOutput | PipelineStageFlags.EarlyFragmentTests | PipelineStageFlags.LateFragmentTests;
+                        texture.NativeLayout = VkImageLayout.DepthStencilAttachmentOptimal;
+                        texture.NativeAccessMask = VkAccessFlags.DepthStencilAttachmentWrite;
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.ColorAttachmentOutput | VkPipelineStageFlags.EarlyFragmentTests | VkPipelineStageFlags.LateFragmentTests;
                         break;
                     case GraphicsResourceState.PixelShaderResource:
-                        texture.NativeLayout = ImageLayout.ShaderReadOnlyOptimal;
-                        texture.NativeAccessMask = AccessFlags.ShaderRead;
-                        texture.NativePipelineStageMask = PipelineStageFlags.FragmentShader;
+                        texture.NativeLayout = VkImageLayout.ShaderReadOnlyOptimal;
+                        texture.NativeAccessMask = VkAccessFlags.ShaderRead;
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.FragmentShader;
                         break;
                     case GraphicsResourceState.GenericRead:
-                        texture.NativeLayout = ImageLayout.General;
-                        texture.NativeAccessMask = AccessFlags.ShaderRead | AccessFlags.TransferRead | AccessFlags.IndirectCommandRead | AccessFlags.ColorAttachmentRead | AccessFlags.DepthStencilAttachmentRead | AccessFlags.InputAttachmentRead | AccessFlags.VertexAttributeRead | AccessFlags.IndexRead | AccessFlags.UniformRead;
-                        texture.NativePipelineStageMask = PipelineStageFlags.AllCommands;
+                        texture.NativeLayout = VkImageLayout.General;
+                        texture.NativeAccessMask = VkAccessFlags.ShaderRead | VkAccessFlags.TransferRead | VkAccessFlags.IndirectCommandRead | VkAccessFlags.ColorAttachmentRead | VkAccessFlags.DepthStencilAttachmentRead | VkAccessFlags.InputAttachmentRead | VkAccessFlags.VertexAttributeRead | VkAccessFlags.IndexRead | VkAccessFlags.UniformRead;
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.AllCommands;
                         break;
                     default:
-                        texture.NativeLayout = ImageLayout.General;
-                        texture.NativeAccessMask = (AccessFlags)0x1FFFF; // TODO VULKAN: Don't hard-code this
-                        texture.NativePipelineStageMask = PipelineStageFlags.AllCommands;
+                        texture.NativeLayout = VkImageLayout.General;
+                        texture.NativeAccessMask = (VkAccessFlags)0x1FFFF; // TODO VULKAN: Don't hard-code this
+                        texture.NativePipelineStageMask = VkPipelineStageFlags.AllCommands;
                         break;
                 }
 
                 if (oldLayout == texture.NativeLayout && oldAccessMask == texture.NativeAccessMask)
                     return;
 
-                if (oldLayout == ImageLayout.Undefined || oldLayout == ImageLayout.PresentSource)
-                    sourceStages = PipelineStageFlags.TopOfPipe;
+                if (oldLayout == VkImageLayout.Undefined || oldLayout == VkImageLayout.PresentSrcKHR)
+                    sourceStages = VkPipelineStageFlags.TopOfPipe;
 
                 // End render pass, so barrier effects all commands in the buffer
                 CleanupRenderPass();
 
-                var memoryBarrier = new ImageMemoryBarrier(texture.NativeImage, oldLayout, texture.NativeLayout, oldAccessMask, texture.NativeAccessMask, new ImageSubresourceRange(texture.NativeImageAspect));
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(sourceStages, texture.NativePipelineStageMask, DependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("CmdPipelineBarrierTransition", currentCommandList.NativeCommandBuffer);
+#endif
+                var memoryBarrier = new VkImageMemoryBarrier(texture.NativeImage, new VkImageSubresourceRange(texture.NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue), oldAccessMask, texture.NativeAccessMask, oldLayout, texture.NativeLayout);
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, sourceStages, texture.NativePipelineStageMask, VkDependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
             }
             else
             {
@@ -476,25 +518,14 @@ public unsafe void ResourceBarrierTransition(GraphicsResource resource, Graphics
             }
         }
 
-#if !XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES
-        private readonly FastList<SharpVulkan.DescriptorSet> boundDescriptorSets = new FastList<SharpVulkan.DescriptorSet>();
-#else
         private readonly FastList<DescriptorSet> boundDescriptorSets = new FastList<DescriptorSet>();
-#endif
 
-        public void SetDescriptorSets(int index, DescriptorSet[] descriptorSets)
+        public void SetDescriptorSets(DescriptorSet[] descriptorSets)
         {
-            if (index != 0)
-                throw new NotImplementedException();
-
             boundDescriptorSets.Clear(true);
             for (int i = 0; i < descriptorSets.Length; i++)
             {
-#if !XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES
-                boundDescriptorSets.Add(descriptorSets[i].NativeDescriptorSet);
-#else
                 boundDescriptorSets.Add(descriptorSets[i]);
-#endif
             }
         }
 
@@ -519,9 +550,15 @@ public void Dispatch(Buffer indirectBuffer, int offsetInBytes)
         /// <param name="startVertexLocation">Index of the first vertex, which is usually an offset in a vertex buffer; it could also be used as the first vertex id generated for a shader parameter marked with the <strong>SV_TargetId</strong> system-value semantic.</param>
         public void Draw(int vertexCount, int startVertexLocation = 0)
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return;
+
             PrepareDraw();
 
-            currentCommandList.NativeCommandBuffer.Draw((uint)vertexCount, 1, (uint)startVertexLocation, 0);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("Draw VC" + vertexCount.ToString(), currentCommandList.NativeCommandBuffer);
+#endif
+            vkCmdDraw(currentCommandList.NativeCommandBuffer, (uint)vertexCount, 1, (uint)startVertexLocation, 0);
 
             GraphicsDevice.FrameTriangleCount += (uint)vertexCount;
             GraphicsDevice.FrameDrawCalls++;
@@ -532,6 +569,9 @@ public void Draw(int vertexCount, int startVertexLocation = 0)
         /// </summary>
         public void DrawAuto()
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return;
+
             PrepareDraw();
 
             throw new NotImplementedException();
@@ -548,9 +588,12 @@ public void DrawAuto()
         /// <param name="baseVertexLocation">A value added to each index before reading a vertex from the vertex buffer.</param>
         public void DrawIndexed(int indexCount, int startIndexLocation = 0, int baseVertexLocation = 0)
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return;
+
             PrepareDraw();
 
-            currentCommandList.NativeCommandBuffer.DrawIndexed((uint)indexCount, 1, (uint)startIndexLocation, baseVertexLocation, 0);
+            vkCmdDrawIndexed(currentCommandList.NativeCommandBuffer, (uint)indexCount, 1, (uint)startIndexLocation, baseVertexLocation, 0);
 
             GraphicsDevice.FrameDrawCalls++;
             GraphicsDevice.FrameTriangleCount += (uint)indexCount;
@@ -566,9 +609,12 @@ public void DrawIndexed(int indexCount, int startIndexLocation = 0, int baseVert
         /// <param name="startInstanceLocation">A value added to each index before reading per-instance data from a vertex buffer.</param>
         public void DrawIndexedInstanced(int indexCountPerInstance, int instanceCount, int startIndexLocation = 0, int baseVertexLocation = 0, int startInstanceLocation = 0)
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return;
+
             PrepareDraw();
 
-            currentCommandList.NativeCommandBuffer.DrawIndexed((uint)indexCountPerInstance, (uint)instanceCount, (uint)startIndexLocation, baseVertexLocation, (uint)startInstanceLocation);
+            vkCmdDrawIndexed(currentCommandList.NativeCommandBuffer, (uint)indexCountPerInstance, (uint)instanceCount, (uint)startIndexLocation, baseVertexLocation, (uint)startInstanceLocation);
             //NativeCommandList.DrawIndexedInstanced(indexCountPerInstance, instanceCount, startIndexLocation, baseVertexLocation, startInstanceLocation);
 
             GraphicsDevice.FrameDrawCalls++;
@@ -582,6 +628,9 @@ public void DrawIndexedInstanced(int indexCountPerInstance, int instanceCount, i
         /// <param name="alignedByteOffsetForArgs">Offset in <em>pBufferForArgs</em> to the start of the GPU generated primitives.</param>
         public void DrawIndexedInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs = 0)
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return;
+
             if (argumentsBuffer == null) throw new ArgumentNullException("argumentsBuffer");
 
             PrepareDraw();
@@ -602,9 +651,12 @@ public void DrawIndexedInstanced(Buffer argumentsBuffer, int alignedByteOffsetFo
         /// <param name="startInstanceLocation">A value added to each index before reading per-instance data from a vertex buffer.</param>
         public void DrawInstanced(int vertexCountPerInstance, int instanceCount, int startVertexLocation = 0, int startInstanceLocation = 0)
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return;
+
             PrepareDraw();
 
-            currentCommandList.NativeCommandBuffer.Draw((uint)vertexCountPerInstance, (uint)instanceCount, (uint)startVertexLocation, (uint)startVertexLocation);
+            vkCmdDraw(currentCommandList.NativeCommandBuffer, (uint)vertexCountPerInstance, (uint)instanceCount, (uint)startVertexLocation, (uint)startVertexLocation);
             //NativeCommandList.DrawInstanced(vertexCountPerInstance, instanceCount, startVertexLocation, startInstanceLocation);
 
             GraphicsDevice.FrameDrawCalls++;
@@ -618,6 +670,9 @@ public void DrawInstanced(int vertexCountPerInstance, int instanceCount, int sta
         /// <param name="alignedByteOffsetForArgs">Offset in <em>pBufferForArgs</em> to the start of the GPU generated primitives.</param>
         public void DrawInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs = 0)
         {
+            // skip if this pipeline had an error
+            if (activePipeline.CurrentState() != PipelineState.PIPELINE_STATE.READY) return
+;
             if (argumentsBuffer == null) throw new ArgumentNullException("argumentsBuffer");
 
             PrepareDraw();
@@ -635,21 +690,24 @@ public void DrawInstanced(Buffer argumentsBuffer, int alignedByteOffsetForArgs =
         /// <param name="name">The name.</param>
         public unsafe void BeginProfile(Color4 profileColor, string name)
         {
+#if VULKAN_DEBUG && DEBUG
             if (GraphicsDevice.IsProfilingSupported)
             {
                 var bytes = System.Text.Encoding.ASCII.GetBytes(name);
 
                 fixed (byte* bytesPointer = &bytes[0])
                 {
-                    var debugMarkerInfo = new DebugMarkerMarkerInfo
+                    var profileColorCopy = profileColor;
+                    var debugMarkerInfo = new VkDebugMarkerMarkerInfoEXT
                     {
-                        StructureType = StructureType.DebugMarkerMarkerInfo,
-                        MarkerName = new IntPtr(bytesPointer),
-                        Color = *(DebugMarkerMarkerInfo.ColorArray*)&profileColor
+                        sType = VkStructureType.DebugMarkerMarkerInfoEXT,
+                        pMarkerName = bytesPointer,
                     };
+                    *(Color4*)&debugMarkerInfo.color = profileColor;
                     GraphicsAdapterFactory.GetInstance(GraphicsDevice.IsDebugMode).BeginDebugMarker(currentCommandList.NativeCommandBuffer, &debugMarkerInfo);
                 }
             }
+#endif
         }
 
         /// <summary>
@@ -657,10 +715,12 @@ public unsafe void BeginProfile(Color4 profileColor, string name)
         /// </summary>
         public void EndProfile()
         {
+#if VULKAN_DEBUG && DEBUG
             if (GraphicsDevice.IsProfilingSupported)
             {
                 GraphicsAdapterFactory.GetInstance(GraphicsDevice.IsDebugMode).EndDebugMarker(currentCommandList.NativeCommandBuffer);
             }
+#endif
         }
         /// <summary>
         /// Submit a timestamp query.
@@ -669,12 +729,18 @@ public void EndProfile()
         /// <param name="query">The timestamp query.</param>
         public void WriteTimestamp(QueryPool queryPool, int index)
         {
-            currentCommandList.NativeCommandBuffer.WriteTimestamp(PipelineStageFlags.AllCommands, queryPool.NativeQueryPool, (uint)index);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("Timestamp?", currentCommandList.NativeCommandBuffer);
+#endif
+            vkCmdWriteTimestamp(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.AllCommands, queryPool.NativeQueryPool, (uint)index);
         }
 
         public void ResetQueryPool(QueryPool queryPool)
         {
-            currentCommandList.NativeCommandBuffer.ResetQueryPool(queryPool.NativeQueryPool, 0, (uint)queryPool.QueryCount);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("Reset QueryPool", currentCommandList.NativeCommandBuffer);
+#endif
+            vkCmdResetQueryPool(currentCommandList.NativeCommandBuffer, queryPool.NativeQueryPool, 0, (uint)queryPool.QueryCount);
         }
 
         /// <summary>
@@ -690,23 +756,28 @@ public unsafe void Clear(Texture depthStencilBuffer, DepthStencilClearOptions op
             // Barriers need to be global to command buffer
             CleanupRenderPass();
 
-            var clearRange = new ImageSubresourceRange(ImageAspectFlags.None, (uint)depthStencilBuffer.ArraySlice, (uint)depthStencilBuffer.ArraySize, (uint)depthStencilBuffer.MipLevel, (uint)depthStencilBuffer.MipLevels);
+            var clearRange = new VkImageSubresourceRange(VkImageAspectFlags.None, (uint)depthStencilBuffer.MipLevel, (uint)depthStencilBuffer.MipLevels, (uint)depthStencilBuffer.ArraySlice, (uint)depthStencilBuffer.ArraySize);
             var barrierRange = clearRange;
-            barrierRange.AspectMask = depthStencilBuffer.NativeImageAspect;
+            barrierRange.aspectMask = depthStencilBuffer.NativeImageAspect;
 
             if ((options & DepthStencilClearOptions.DepthBuffer) != 0)
-                clearRange.AspectMask |= ImageAspectFlags.Depth & depthStencilBuffer.NativeImageAspect;
+                clearRange.aspectMask |= VkImageAspectFlags.Depth & depthStencilBuffer.NativeImageAspect;
 
             if ((options & DepthStencilClearOptions.Stencil) != 0)
-                clearRange.AspectMask |= ImageAspectFlags.Stencil & depthStencilBuffer.NativeImageAspect;
+                clearRange.aspectMask |= VkImageAspectFlags.Stencil & depthStencilBuffer.NativeImageAspect;
 
-            var memoryBarrier = new ImageMemoryBarrier(depthStencilBuffer.NativeImage, depthStencilBuffer.NativeLayout, ImageLayout.TransferDestinationOptimal, depthStencilBuffer.NativeAccessMask, AccessFlags.TransferWrite, barrierRange);
-            currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.TopOfPipe, PipelineStageFlags.TopOfPipe, DependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("ClearTexture: " + depthStencilBuffer.ToString(), currentCommandList.NativeCommandBuffer);
+#endif
 
-            currentCommandList.NativeCommandBuffer.ClearDepthStencilImage(depthStencilBuffer.NativeImage, ImageLayout.TransferDestinationOptimal, new ClearDepthStencilValue(depth, stencil), 1, &clearRange);
+            var memoryBarrier = new VkImageMemoryBarrier(depthStencilBuffer.NativeImage, barrierRange, depthStencilBuffer.NativeAccessMask, VkAccessFlags.TransferWrite, depthStencilBuffer.NativeLayout, VkImageLayout.TransferDstOptimal);
+            vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, depthStencilBuffer.NativePipelineStageMask, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
 
-            memoryBarrier = new ImageMemoryBarrier(depthStencilBuffer.NativeImage, ImageLayout.TransferDestinationOptimal, depthStencilBuffer.NativeLayout, AccessFlags.TransferWrite, depthStencilBuffer.NativeAccessMask, barrierRange);
-            currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.TopOfPipe, PipelineStageFlags.TopOfPipe, DependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
+            var clearValue = new VkClearDepthStencilValue(depth, stencil);
+            vkCmdClearDepthStencilImage(currentCommandList.NativeCommandBuffer, depthStencilBuffer.NativeImage, VkImageLayout.TransferDstOptimal, &clearValue, 1, &clearRange);
+
+            memoryBarrier = new VkImageMemoryBarrier(depthStencilBuffer.NativeImage, barrierRange, VkAccessFlags.TransferWrite, depthStencilBuffer.NativeAccessMask, VkImageLayout.TransferDstOptimal, depthStencilBuffer.NativeLayout);
+            vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, depthStencilBuffer.NativePipelineStageMask, VkDependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
 
             depthStencilBuffer.IsInitialized = true;
         }
@@ -723,15 +794,19 @@ public unsafe void Clear(Texture renderTarget, Color4 color)
             // Barriers need to be global to command buffer
             CleanupRenderPass();
 
-            var clearRange = new ImageSubresourceRange(ImageAspectFlags.Color, (uint)renderTarget.ArraySlice, (uint)renderTarget.ArraySize, (uint)renderTarget.MipLevel, (uint)renderTarget.MipLevels);
+            var clearRange = new VkImageSubresourceRange(VkImageAspectFlags.Color, (uint)renderTarget.MipLevel, (uint)renderTarget.MipLevels, (uint)renderTarget.ArraySlice, (uint)renderTarget.ArraySize);
+
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("ClearRenderTargetTexture: " + renderTarget.ToString(), currentCommandList.NativeCommandBuffer);
+#endif
 
-            var memoryBarrier = new ImageMemoryBarrier(renderTarget.NativeImage, renderTarget.NativeLayout, ImageLayout.TransferDestinationOptimal, renderTarget.NativeAccessMask, AccessFlags.TransferWrite, clearRange);
-            currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.TopOfPipe, PipelineStageFlags.TopOfPipe, DependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
+            var memoryBarrier = new VkImageMemoryBarrier(renderTarget.NativeImage, clearRange, renderTarget.NativeAccessMask, VkAccessFlags.TransferWrite, renderTarget.NativeLayout, VkImageLayout.TransferDstOptimal);
+            vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, renderTarget.NativePipelineStageMask, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
 
-            currentCommandList.NativeCommandBuffer.ClearColorImage(renderTarget.NativeImage, ImageLayout.TransferDestinationOptimal, ColorHelper.Convert(color), 1, &clearRange);
+            vkCmdClearColorImage(currentCommandList.NativeCommandBuffer, renderTarget.NativeImage, VkImageLayout.TransferDstOptimal, (VkClearColorValue*)&color, 1, &clearRange);
 
-            memoryBarrier = new ImageMemoryBarrier(renderTarget.NativeImage, ImageLayout.TransferDestinationOptimal, renderTarget.NativeLayout, AccessFlags.TransferWrite, renderTarget.NativeAccessMask, clearRange);
-            currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.TopOfPipe, PipelineStageFlags.TopOfPipe, DependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
+            memoryBarrier = new VkImageMemoryBarrier(renderTarget.NativeImage, clearRange, VkAccessFlags.TransferWrite, renderTarget.NativeAccessMask, VkImageLayout.TransferDstOptimal, renderTarget.NativeLayout);
+            vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, renderTarget.NativePipelineStageMask, VkDependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
 
             renderTarget.IsInitialized = true;
         }
@@ -819,8 +894,8 @@ public unsafe void Copy(GraphicsResource source, GraphicsResource destination)
             {
                 CleanupRenderPass();
 
-                var imageBarriers = stackalloc ImageMemoryBarrier[2];
-                var bufferBarriers = stackalloc BufferMemoryBarrier[2];
+                var imageBarriers = stackalloc VkImageMemoryBarrier[2];
+                var bufferBarriers = stackalloc VkBufferMemoryBarrier[2];
 
                 var sourceParent = sourceTexture.ParentTexture ?? sourceTexture;
                 var destinationParent = destinationTexture.ParentTexture ?? destinationTexture;
@@ -831,74 +906,90 @@ public unsafe void Copy(GraphicsResource source, GraphicsResource destination)
                 // Initial barriers
                 if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount++] = new BufferMemoryBarrier(sourceParent.NativeBuffer, sourceTexture.NativeAccessMask, AccessFlags.TransferRead);
+                    bufferBarriers[bufferBarrierCount++] = new VkBufferMemoryBarrier(sourceParent.NativeBuffer, sourceTexture.NativeAccessMask, VkAccessFlags.TransferRead);
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount++] = new ImageMemoryBarrier(sourceParent.NativeImage, sourceTexture.NativeLayout, ImageLayout.TransferSourceOptimal, sourceTexture.NativeAccessMask, AccessFlags.TransferRead, new ImageSubresourceRange(sourceParent.NativeImageAspect));
+                    imageBarriers[imageBarrierCount++] = new VkImageMemoryBarrier(sourceParent.NativeImage, new VkImageSubresourceRange(sourceParent.NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue), sourceTexture.NativeAccessMask, VkAccessFlags.TransferRead, sourceTexture.NativeLayout, VkImageLayout.TransferSrcOptimal);
                 }
 
                 if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount++] = new BufferMemoryBarrier(destinationParent.NativeBuffer, destinationTexture.NativeAccessMask, AccessFlags.TransferWrite);
+                    bufferBarriers[bufferBarrierCount++] = new VkBufferMemoryBarrier(destinationParent.NativeBuffer, destinationTexture.NativeAccessMask, VkAccessFlags.TransferWrite);
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount++] = new ImageMemoryBarrier(destinationParent.NativeImage, destinationTexture.NativeLayout, ImageLayout.TransferDestinationOptimal, destinationTexture.NativeAccessMask, AccessFlags.TransferWrite, new ImageSubresourceRange(destinationParent.NativeImageAspect));
+                    imageBarriers[imageBarrierCount++] = new VkImageMemoryBarrier(destinationParent.NativeImage, new VkImageSubresourceRange(destinationParent.NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue), destinationTexture.NativeAccessMask, VkAccessFlags.TransferWrite, destinationTexture.NativeLayout, VkImageLayout.TransferDstOptimal);
                 }
 
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(sourceTexture.NativePipelineStageMask, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("CopyPipelineBarrier", currentCommandList.NativeCommandBuffer);
+#endif
+
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, sourceTexture.NativePipelineStageMask | destinationParent.NativePipelineStageMask, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
 
                 // Copy
                 if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
                 {
                     if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                     {
-                        var copy = new BufferCopy
+#if VULKAN_CHECKPOINT_DEBUG
+                        GraphicsDevice.RecordInfo("CmdCopyBuffer", currentCommandList.NativeCommandBuffer);
+#endif
+                        var copy = new VkBufferCopy
                         {
-                            SourceOffset = 0,
-                            DestinationOffset = 0,
-                            Size = (uint)(sourceParent.ViewWidth * sourceParent.ViewHeight * sourceParent.ViewDepth * sourceParent.ViewFormat.SizeInBytes())
+                            srcOffset = 0,
+                            dstOffset = 0,
+                            size = (uint)(sourceParent.ViewWidth * sourceParent.ViewHeight * sourceParent.ViewDepth * sourceParent.ViewFormat.SizeInBytes())
                         };
-                        currentCommandList.NativeCommandBuffer.CopyBuffer(sourceParent.NativeBuffer, destinationParent.NativeBuffer, 1, &copy);
+                        vkCmdCopyBuffer(currentCommandList.NativeCommandBuffer, sourceParent.NativeBuffer, destinationParent.NativeBuffer, 1, &copy);
                     }
                     else
                     {
-                        var copy = new BufferImageCopy
+#if VULKAN_CHECKPOINT_DEBUG
+                        GraphicsDevice.RecordInfo("CmdCopyImageToBuffer", currentCommandList.NativeCommandBuffer);
+#endif
+                        var copy = new VkBufferImageCopy
                         {
-                            ImageSubresource = new ImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize, (uint)sourceTexture.MipLevel),
-                            ImageExtent = new Extent3D((uint)destinationTexture.Width, (uint)destinationTexture.Height, (uint)destinationTexture.Depth)
+                            imageSubresource = new VkImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.MipLevel, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize),
+                            imageExtent = new Vortice.Vulkan.VkExtent3D(destinationTexture.Width, destinationTexture.Height, destinationTexture.Depth)
                         };
-                        currentCommandList.NativeCommandBuffer.CopyImageToBuffer(sourceParent.NativeImage, ImageLayout.TransferSourceOptimal, destinationParent.NativeBuffer, 1, &copy);
+                        vkCmdCopyImageToBuffer(currentCommandList.NativeCommandBuffer, sourceParent.NativeImage, VkImageLayout.TransferSrcOptimal, destinationParent.NativeBuffer, 1, &copy);
                     }
 
-                    // Fence for host access
+                    // VkFence for host access
                     destinationParent.StagingFenceValue = null;
                     destinationParent.StagingBuilder = this;
                     currentCommandList.StagingResources.Add(destinationParent);
                 }
                 else
                 {
-                    var destinationSubresource = new ImageSubresourceLayers(destinationParent.NativeImageAspect, (uint)destinationTexture.ArraySlice, (uint)destinationTexture.ArraySize, (uint)destinationTexture.MipLevel);
+                    var destinationSubresource = new VkImageSubresourceLayers(destinationParent.NativeImageAspect, (uint)destinationTexture.MipLevel, (uint)destinationTexture.ArraySlice, (uint)destinationTexture.ArraySize);
 
                     if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                     {
-                        var copy = new BufferImageCopy
+#if VULKAN_CHECKPOINT_DEBUG
+                        GraphicsDevice.RecordInfo("CmdCopyBufferToImage", currentCommandList.NativeCommandBuffer);
+#endif
+                        var copy = new VkBufferImageCopy
                         {
-                            ImageSubresource = destinationSubresource,
-                            ImageExtent = new Extent3D((uint)destinationTexture.Width, (uint)destinationTexture.Height, (uint)destinationTexture.Depth)
+                            imageSubresource = destinationSubresource,
+                            imageExtent = new Vortice.Vulkan.VkExtent3D(destinationTexture.Width, destinationTexture.Height, destinationTexture.Depth)
                         };
-                        currentCommandList.NativeCommandBuffer.CopyBufferToImage(sourceParent.NativeBuffer, destinationParent.NativeImage, ImageLayout.TransferDestinationOptimal, 1, &copy);
+                        vkCmdCopyBufferToImage(currentCommandList.NativeCommandBuffer, sourceParent.NativeBuffer, destinationParent.NativeImage, VkImageLayout.TransferDstOptimal, 1, &copy);
                     }
                     else
                     {
-                        var copy = new ImageCopy
+#if VULKAN_CHECKPOINT_DEBUG
+                        GraphicsDevice.RecordInfo("CmdCopyImage", currentCommandList.NativeCommandBuffer);
+#endif
+                        var copy = new VkImageCopy
                         {
-                            SourceSubresource = new ImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize, (uint)sourceTexture.MipLevel),
-                            DestinationSubresource = destinationSubresource,
-                            Extent = new Extent3D((uint)sourceTexture.ViewWidth, (uint)sourceTexture.ViewHeight, (uint)sourceTexture.ViewDepth),
+                            srcSubresource = new VkImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.MipLevel, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize),
+                            dstSubresource = destinationSubresource,
+                            extent = new Vortice.Vulkan.VkExtent3D(sourceTexture.ViewWidth, sourceTexture.ViewHeight, sourceTexture.ViewDepth),
                         };
-                        currentCommandList.NativeCommandBuffer.CopyImage(sourceParent.NativeImage, ImageLayout.TransferSourceOptimal, destinationParent.NativeImage, ImageLayout.TransferDestinationOptimal, 1, &copy);
+                        vkCmdCopyImage(currentCommandList.NativeCommandBuffer, sourceParent.NativeImage, VkImageLayout.TransferSrcOptimal, destinationParent.NativeImage, VkImageLayout.TransferDstOptimal, 1, &copy);
                     }
                 }
 
@@ -908,35 +999,38 @@ public unsafe void Copy(GraphicsResource source, GraphicsResource destination)
                 // Final barriers
                 if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount].SourceAccessMask = AccessFlags.TransferRead;
-                    bufferBarriers[bufferBarrierCount].DestinationAccessMask = sourceParent.NativeAccessMask;
+                    bufferBarriers[bufferBarrierCount].srcAccessMask = VkAccessFlags.TransferRead;
+                    bufferBarriers[bufferBarrierCount].dstAccessMask = sourceParent.NativeAccessMask;
                     bufferBarrierCount++;
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount].OldLayout = ImageLayout.TransferSourceOptimal;
-                    imageBarriers[imageBarrierCount].NewLayout = sourceParent.NativeLayout;
-                    imageBarriers[imageBarrierCount].SourceAccessMask = AccessFlags.TransferRead;
-                    imageBarriers[imageBarrierCount].DestinationAccessMask = sourceParent.NativeAccessMask;
+                    imageBarriers[imageBarrierCount].oldLayout = VkImageLayout.TransferSrcOptimal;
+                    imageBarriers[imageBarrierCount].newLayout = sourceParent.NativeLayout;
+                    imageBarriers[imageBarrierCount].srcAccessMask = VkAccessFlags.TransferRead;
+                    imageBarriers[imageBarrierCount].dstAccessMask = sourceParent.NativeAccessMask;
                     imageBarrierCount++;
                 }
 
                 if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount].SourceAccessMask = AccessFlags.TransferWrite;
-                    bufferBarriers[bufferBarrierCount].DestinationAccessMask = destinationParent.NativeAccessMask;
+                    bufferBarriers[bufferBarrierCount].srcAccessMask = VkAccessFlags.TransferWrite;
+                    bufferBarriers[bufferBarrierCount].dstAccessMask = destinationParent.NativeAccessMask;
                     bufferBarrierCount++;
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount].OldLayout = ImageLayout.TransferDestinationOptimal;
-                    imageBarriers[imageBarrierCount].NewLayout = destinationParent.NativeLayout;
-                    imageBarriers[imageBarrierCount].SourceAccessMask = AccessFlags.TransferWrite;
-                    imageBarriers[imageBarrierCount].DestinationAccessMask = destinationParent.NativeAccessMask;
+                    imageBarriers[imageBarrierCount].oldLayout = VkImageLayout.TransferDstOptimal;
+                    imageBarriers[imageBarrierCount].newLayout = destinationParent.NativeLayout;
+                    imageBarriers[imageBarrierCount].srcAccessMask = VkAccessFlags.TransferWrite;
+                    imageBarriers[imageBarrierCount].dstAccessMask = destinationParent.NativeAccessMask;
                     imageBarrierCount++;
                 }
 
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, sourceTexture.NativePipelineStageMask, DependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("CopyCmdPipelineBarrier2", currentCommandList.NativeCommandBuffer);
+#endif
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, sourceTexture.NativePipelineStageMask | destinationParent.NativePipelineStageMask, VkDependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
             }
             else
             {
@@ -945,22 +1039,25 @@ public unsafe void Copy(GraphicsResource source, GraphicsResource destination)
 
                 if (sourceBuffer != null && destinationBuffer != null)
                 {
-                    var bufferBarriers = stackalloc BufferMemoryBarrier[2];
-                    bufferBarriers[0] = new BufferMemoryBarrier(sourceBuffer.NativeBuffer, sourceBuffer.NativeAccessMask, AccessFlags.TransferRead);
-                    bufferBarriers[1] = new BufferMemoryBarrier(destinationBuffer.NativeBuffer, destinationBuffer.NativeAccessMask, AccessFlags.TransferWrite);
-                    currentCommandList.NativeCommandBuffer.PipelineBarrier(sourceBuffer.NativePipelineStageMask, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, 2, bufferBarriers, 0, null);
+                    var bufferBarriers = stackalloc VkBufferMemoryBarrier[2];
+                    bufferBarriers[0] = new VkBufferMemoryBarrier(sourceBuffer.NativeBuffer, sourceBuffer.NativeAccessMask, VkAccessFlags.TransferRead);
+                    bufferBarriers[1] = new VkBufferMemoryBarrier(destinationBuffer.NativeBuffer, destinationBuffer.NativeAccessMask, VkAccessFlags.TransferWrite);
+                    vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, sourceBuffer.NativePipelineStageMask, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 2, bufferBarriers, 0, null);
 
-                    var copy = new BufferCopy
+#if VULKAN_CHECKPOINT_DEBUG
+                    GraphicsDevice.RecordInfo("CopyCopyBuffer2", currentCommandList.NativeCommandBuffer);
+#endif
+                    var copy = new VkBufferCopy
                     {
-                        SourceOffset = 0,
-                        DestinationOffset = 0,
-                        Size = (uint)sourceBuffer.SizeInBytes
+                        srcOffset = 0,
+                        dstOffset = 0,
+                        size = (uint)sourceBuffer.SizeInBytes
                     };
-                    currentCommandList.NativeCommandBuffer.CopyBuffer(sourceBuffer.NativeBuffer, destinationBuffer.NativeBuffer, 1, &copy);
+                    vkCmdCopyBuffer(currentCommandList.NativeCommandBuffer, sourceBuffer.NativeBuffer, destinationBuffer.NativeBuffer, 1, &copy);
 
-                    bufferBarriers[0] = new BufferMemoryBarrier(sourceBuffer.NativeBuffer, AccessFlags.TransferRead, sourceBuffer.NativeAccessMask);
-                    bufferBarriers[1] = new BufferMemoryBarrier(destinationBuffer.NativeBuffer, AccessFlags.TransferWrite, destinationBuffer.NativeAccessMask);
-                    currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, sourceBuffer.NativePipelineStageMask, DependencyFlags.None, 0, null, 2, bufferBarriers, 0, null);
+                    bufferBarriers[0] = new VkBufferMemoryBarrier(sourceBuffer.NativeBuffer, VkAccessFlags.TransferRead, sourceBuffer.NativeAccessMask);
+                    bufferBarriers[1] = new VkBufferMemoryBarrier(destinationBuffer.NativeBuffer, VkAccessFlags.TransferWrite, destinationBuffer.NativeAccessMask);
+                    vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, sourceBuffer.NativePipelineStageMask, VkDependencyFlags.None, 0, null, 2, bufferBarriers, 0, null);
                 }
                 else
                 {
@@ -987,8 +1084,8 @@ public unsafe void CopyRegion(GraphicsResource source, int sourceSubresource, Re
 
                 var region = sourecRegion ?? new ResourceRegion(0, 0, 0, sourceTexture.Width, sourceTexture.Height, sourceTexture.Depth);
 
-                var imageBarriers = stackalloc ImageMemoryBarrier[2];
-                var bufferBarriers = stackalloc BufferMemoryBarrier[2];
+                var imageBarriers = stackalloc VkImageMemoryBarrier[2];
+                var bufferBarriers = stackalloc VkBufferMemoryBarrier[2];
 
                 var sourceParent = sourceTexture.ParentTexture ?? sourceTexture;
                 var destinationParent = destinationTexture.ParentTexture ?? destinationTexture;
@@ -999,23 +1096,23 @@ public unsafe void CopyRegion(GraphicsResource source, int sourceSubresource, Re
                 // Initial barriers
                 if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount++] = new BufferMemoryBarrier(sourceParent.NativeBuffer, sourceParent.NativeAccessMask, AccessFlags.TransferRead);
+                    bufferBarriers[bufferBarrierCount++] = new VkBufferMemoryBarrier(sourceParent.NativeBuffer, sourceParent.NativeAccessMask, VkAccessFlags.TransferRead);
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount++] = new ImageMemoryBarrier(sourceParent.NativeImage, sourceParent.NativeLayout, ImageLayout.TransferSourceOptimal, sourceParent.NativeAccessMask, AccessFlags.TransferRead, new ImageSubresourceRange(sourceParent.NativeImageAspect));
+                    imageBarriers[imageBarrierCount++] = new VkImageMemoryBarrier(sourceParent.NativeImage, new VkImageSubresourceRange(sourceParent.NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue), sourceParent.NativeAccessMask, VkAccessFlags.TransferRead, sourceParent.NativeLayout, VkImageLayout.TransferSrcOptimal);
                 }
 
                 if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount++] = new BufferMemoryBarrier(destinationParent.NativeBuffer, destinationParent.NativeAccessMask, AccessFlags.TransferWrite);
+                    bufferBarriers[bufferBarrierCount++] = new VkBufferMemoryBarrier(destinationParent.NativeBuffer, destinationParent.NativeAccessMask, VkAccessFlags.TransferWrite);
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount++] = new ImageMemoryBarrier(destinationParent.NativeImage, destinationParent.NativeLayout, ImageLayout.TransferDestinationOptimal, destinationParent.NativeAccessMask, AccessFlags.TransferWrite, new ImageSubresourceRange(destinationParent.NativeImageAspect));
+                    imageBarriers[imageBarrierCount++] = new VkImageMemoryBarrier(destinationParent.NativeImage, new VkImageSubresourceRange(destinationParent.NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue), destinationParent.NativeAccessMask, VkAccessFlags.TransferWrite, destinationParent.NativeLayout, VkImageLayout.TransferDstOptimal);
                 }
 
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(sourceTexture.NativePipelineStageMask, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, sourceTexture.NativePipelineStageMask | destinationParent.NativePipelineStageMask, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
 
                 // Copy
                 if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
@@ -1023,56 +1120,62 @@ public unsafe void CopyRegion(GraphicsResource source, int sourceSubresource, Re
                     throw new NotImplementedException();
                     //if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                     //{
-                    //    var copy = new BufferCopy
+                    //    var copy = new VkBufferCopy
                     //    {
                     //        SourceOffset = 0,
                     //        DestinationOffset = 0,
                     //        Size = (uint)(sourceParent.ViewWidth * sourceParent.ViewHeight * sourceParent.ViewDepth * sourceParent.ViewFormat.SizeInBytes())
                     //    };
-                    //    currentCommandList.NativeCommandBuffer.CopyBuffer(sourceParent.NativeBuffer, destinationParent.NativeBuffer, 1, &copy);
+                    //    vkCmdCopyBuffer(currentCommandList.NativeCommandBuffer, sourceParent.NativeBuffer, destinationParent.NativeBuffer, 1, &copy);
                     //}
                     //else
                     //{
-                    //    var copy = new BufferImageCopy
+                    //    var copy = new VkBufferImageCopy
                     //    {
-                    //        ImageSubresource = new ImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize, (uint)sourceTexture.MipLevel),
-                    //        ImageExtent = new Extent3D((uint)destinationTexture.Width, (uint)destinationTexture.Height, (uint)destinationTexture.Depth)
+                    //        ImageSubresource = new VkImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize, (uint)sourceTexture.MipLevel),
+                    //        ImageExtent = new Vortice.Mathematics.Size3((uint)destinationTexture.Width, (uint)destinationTexture.Height, (uint)destinationTexture.Depth)
                     //    };
-                    //    currentCommandList.NativeCommandBuffer.CopyImageToBuffer(sourceParent.NativeImage, ImageLayout.TransferSourceOptimal, destinationParent.NativeBuffer, 1, &copy);
+                    //    vkCmdCopyImageToBuffer(currentCommandList.NativeCommandBuffer, sourceParent.NativeImage, VkImageLayout.TransferSrcOptimal, destinationParent.NativeBuffer, 1, &copy);
                     //}
 
-                    //// Fence for host access
+                    //// VkFence for host access
                     //destinationParent.StagingFenceValue = null;
                     //destinationParent.StagingBuilder = this;
                     //currentCommandList.StagingResources.Add(destinationParent);
                 }
                 else
                 {
-                    var destinationSubresource = new ImageSubresourceLayers(destinationParent.NativeImageAspect, (uint)destinationTexture.ArraySlice, (uint)destinationTexture.ArraySize, (uint)destinationTexture.MipLevel);
+                    var destinationSubresource = new VkImageSubresourceLayers(destinationParent.NativeImageAspect, (uint)destinationTexture.MipLevel, (uint)destinationTexture.ArraySlice, (uint)destinationTexture.ArraySize);
 
                     if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                     {
-                        var copy = new BufferImageCopy
+#if VULKAN_CHECKPOINT_DEBUG
+                        GraphicsDevice.RecordInfo("CopyBufferToImageRegion", currentCommandList.NativeCommandBuffer);
+#endif
+                        var copy = new VkBufferImageCopy
                         {
-                            ImageSubresource = destinationSubresource,
-                            BufferOffset = (ulong)sourceTexture.ComputeBufferOffset(sourceSubresource, 0),
-                            BufferImageHeight = (uint)sourceTexture.Height,
-                            BufferRowLength = (uint)sourceTexture.Width,
-                            ImageOffset = new Offset3D(dstX, dstY, dstZ),
-                            ImageExtent = new Extent3D((uint)(region.Right - region.Left), (uint)(region.Bottom - region.Top), (uint)(region.Back - region.Front))
+                            imageSubresource = destinationSubresource,
+                            bufferOffset = (ulong)sourceTexture.ComputeBufferOffset(sourceSubresource, 0),
+                            bufferImageHeight = (uint)sourceTexture.Height,
+                            bufferRowLength = (uint)sourceTexture.Width,
+                            imageOffset = new Vortice.Vulkan.VkOffset3D(dstX, dstY, dstZ),
+                            imageExtent = new Vortice.Vulkan.VkExtent3D(region.Right - region.Left, region.Bottom - region.Top, region.Back - region.Front),
                         };
-                        currentCommandList.NativeCommandBuffer.CopyBufferToImage(sourceParent.NativeBuffer, destinationParent.NativeImage, ImageLayout.TransferDestinationOptimal, 1, &copy);
+                        vkCmdCopyBufferToImage(currentCommandList.NativeCommandBuffer, sourceParent.NativeBuffer, destinationParent.NativeImage, VkImageLayout.TransferDstOptimal, 1, &copy);
                     }
                     else
                     {
-                        throw new NotImplementedException();
-                        //var copy = new ImageCopy
-                        //{
-                        //    SourceSubresource = new ImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize, (uint)sourceTexture.MipLevel),
-                        //    DestinationSubresource = destinationSubresource,
-                        //    Extent = new Extent3D((uint)sourceTexture.ViewWidth, (uint)sourceTexture.ViewHeight, (uint)sourceTexture.ViewDepth),
-                        //};
-                        //currentCommandList.NativeCommandBuffer.CopyImage(sourceParent.NativeImage, ImageLayout.TransferSourceOptimal, destinationParent.NativeImage, ImageLayout.TransferDestinationOptimal, 1, &copy);
+#if VULKAN_CHECKPOINT_DEBUG
+                        GraphicsDevice.RecordInfo("CopyImageRegion", currentCommandList.NativeCommandBuffer);
+#endif
+                        var copy = new VkImageCopy
+                        {
+                            srcSubresource = new VkImageSubresourceLayers(sourceParent.NativeImageAspect, (uint)sourceTexture.MipLevel, (uint)sourceTexture.ArraySlice, (uint)sourceTexture.ArraySize),
+                            dstSubresource = destinationSubresource,
+                            dstOffset = new Vortice.Vulkan.VkOffset3D(dstX, dstY, dstZ),
+                            extent = new Vortice.Vulkan.VkExtent3D((region.Right - region.Left), (region.Bottom - region.Top), (region.Back - region.Front)),
+                        };
+                        vkCmdCopyImage(currentCommandList.NativeCommandBuffer, sourceParent.NativeImage, VkImageLayout.TransferSrcOptimal, destinationParent.NativeImage, VkImageLayout.TransferDstOptimal, 1, &copy);
                     }
                 }
 
@@ -1082,35 +1185,35 @@ public unsafe void CopyRegion(GraphicsResource source, int sourceSubresource, Re
                 // Final barriers
                 if (sourceTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount].SourceAccessMask = AccessFlags.TransferRead;
-                    bufferBarriers[bufferBarrierCount].DestinationAccessMask = sourceParent.NativeAccessMask;
+                    bufferBarriers[bufferBarrierCount].srcAccessMask = VkAccessFlags.TransferRead;
+                    bufferBarriers[bufferBarrierCount].dstAccessMask = sourceParent.NativeAccessMask;
                     bufferBarrierCount++;
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount].OldLayout = ImageLayout.TransferSourceOptimal;
-                    imageBarriers[imageBarrierCount].NewLayout = sourceParent.NativeLayout;
-                    imageBarriers[imageBarrierCount].SourceAccessMask = AccessFlags.TransferRead;
-                    imageBarriers[imageBarrierCount].DestinationAccessMask = sourceParent.NativeAccessMask;
+                    imageBarriers[imageBarrierCount].oldLayout = VkImageLayout.TransferSrcOptimal;
+                    imageBarriers[imageBarrierCount].newLayout = sourceParent.NativeLayout;
+                    imageBarriers[imageBarrierCount].srcAccessMask = VkAccessFlags.TransferRead;
+                    imageBarriers[imageBarrierCount].dstAccessMask = sourceParent.NativeAccessMask;
                     imageBarrierCount++;
                 }
 
                 if (destinationTexture.Usage == GraphicsResourceUsage.Staging)
                 {
-                    bufferBarriers[bufferBarrierCount].SourceAccessMask = AccessFlags.TransferWrite;
-                    bufferBarriers[bufferBarrierCount].DestinationAccessMask = destinationParent.NativeAccessMask;
+                    bufferBarriers[bufferBarrierCount].srcAccessMask = VkAccessFlags.TransferWrite;
+                    bufferBarriers[bufferBarrierCount].dstAccessMask = destinationParent.NativeAccessMask;
                     bufferBarrierCount++;
                 }
                 else
                 {
-                    imageBarriers[imageBarrierCount].OldLayout = ImageLayout.TransferDestinationOptimal;
-                    imageBarriers[imageBarrierCount].NewLayout = destinationParent.NativeLayout;
-                    imageBarriers[imageBarrierCount].SourceAccessMask = AccessFlags.TransferWrite;
-                    imageBarriers[imageBarrierCount].DestinationAccessMask = destinationParent.NativeAccessMask;
+                    imageBarriers[imageBarrierCount].oldLayout = VkImageLayout.TransferDstOptimal;
+                    imageBarriers[imageBarrierCount].newLayout = destinationParent.NativeLayout;
+                    imageBarriers[imageBarrierCount].srcAccessMask = VkAccessFlags.TransferWrite;
+                    imageBarriers[imageBarrierCount].dstAccessMask = destinationParent.NativeAccessMask;
                     imageBarrierCount++;
                 }
 
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, sourceTexture.NativePipelineStageMask, DependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, sourceTexture.NativePipelineStageMask | destinationParent.NativePipelineStageMask, VkDependencyFlags.None, 0, null, bufferBarrierCount, bufferBarriers, imageBarrierCount, imageBarriers);
             }
             else
             {
@@ -1168,62 +1271,69 @@ internal unsafe void UpdateSubresource(GraphicsResource resource, int subResourc
             // Buffer-to-image copies need to be aligned to the pixel size and 4 (always a power of 2)
             var alignmentMask = (blockSize < 4 ? 4 : blockSize) - 1;
 
-            SharpVulkan.Buffer uploadResource;
+            VkBuffer uploadResource;
             int uploadOffset;
             var uploadMemory = GraphicsDevice.AllocateUploadBuffer(lengthInBytes + alignmentMask, out uploadResource, out uploadOffset);
             var alignment = ((uploadOffset + alignmentMask) & ~alignmentMask) - uploadOffset;
 
             Utilities.CopyMemory(uploadMemory + alignment, databox.DataPointer, lengthInBytes);
 
-            var uploadBufferMemoryBarrier = new BufferMemoryBarrier(uploadResource, AccessFlags.HostWrite, AccessFlags.TransferRead, (ulong)(uploadOffset + alignment), (ulong)lengthInBytes);
+            var uploadBufferMemoryBarrier = new VkBufferMemoryBarrier(uploadResource, VkAccessFlags.HostWrite, VkAccessFlags.TransferRead, (ulong)(uploadOffset + alignment), (ulong)lengthInBytes);
 
             if (texture != null)
             {
                 var mipSlice = subResourceIndex % texture.MipLevels;
                 var arraySlice = subResourceIndex / texture.MipLevels;
-                var subresourceRange = new ImageSubresourceRange(ImageAspectFlags.Color, (uint)arraySlice, 1, (uint)mipSlice, 1);
+                var subresourceRange = new VkImageSubresourceRange(VkImageAspectFlags.Color, (uint)mipSlice, 1, (uint)arraySlice, 1);
+
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("UpdateSubresource", currentCommandList.NativeCommandBuffer);
+#endif
 
-                var memoryBarrier = new ImageMemoryBarrier(texture.NativeImage, texture.NativeLayout, ImageLayout.TransferDestinationOptimal, texture.NativeAccessMask, AccessFlags.TransferWrite, subresourceRange);
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(texture.NativePipelineStageMask, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, 1, &uploadBufferMemoryBarrier, 1, &memoryBarrier);
+                var memoryBarrier = new VkImageMemoryBarrier(texture.NativeImage, subresourceRange, texture.NativeAccessMask, VkAccessFlags.TransferWrite, texture.NativeLayout, VkImageLayout.TransferDstOptimal);
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, texture.NativePipelineStageMask | VkPipelineStageFlags.Host, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 1, &uploadBufferMemoryBarrier, 1, &memoryBarrier);
 
                 // TODO VULKAN: Handle depth-stencil (NOTE: only supported on graphics queue)
                 // TODO VULKAN: Handle non-packed pitches
-                var bufferCopy = new BufferImageCopy
+                var bufferCopy = new VkBufferImageCopy
                 {
-                    BufferOffset = (ulong)(uploadOffset + alignment),
-                    ImageSubresource = new ImageSubresourceLayers { AspectMask = ImageAspectFlags.Color, BaseArrayLayer = (uint)arraySlice, LayerCount = 1, MipLevel = (uint)mipSlice },
-                    BufferRowLength = 0, //(uint)databox.RowPitch / ...,
-                    BufferImageHeight = 0, //(uint)databox.SlicePitch / ...,
-                    ImageOffset = new Offset3D(region.Left, region.Top, region.Front),
-                    ImageExtent = new Extent3D((uint)(region.Right - region.Left), (uint)(region.Bottom - region.Top), (uint)(region.Back - region.Front))
+                    bufferOffset = (ulong)(uploadOffset + alignment),
+                    imageSubresource = new VkImageSubresourceLayers { aspectMask = VkImageAspectFlags.Color, baseArrayLayer = (uint)arraySlice, layerCount = 1, mipLevel = (uint)mipSlice },
+                    bufferRowLength = 0, //(uint)databox.RowPitch / ...,
+                    bufferImageHeight = 0, //(uint)databox.SlicePitch / ...,
+                    imageOffset = new Vortice.Vulkan.VkOffset3D(region.Left, region.Top, region.Front),
+                    imageExtent = new Vortice.Vulkan.VkExtent3D(region.Right - region.Left, region.Bottom - region.Top, region.Back - region.Front),
                 };
-                currentCommandList.NativeCommandBuffer.CopyBufferToImage(uploadResource, texture.NativeImage, ImageLayout.TransferDestinationOptimal, 1, &bufferCopy);
+                vkCmdCopyBufferToImage(currentCommandList.NativeCommandBuffer, uploadResource, texture.NativeImage, VkImageLayout.TransferDstOptimal, 1, &bufferCopy);
 
-                memoryBarrier = new ImageMemoryBarrier(texture.NativeImage, ImageLayout.TransferDestinationOptimal, texture.NativeLayout, AccessFlags.TransferWrite, texture.NativeAccessMask, subresourceRange);
-                currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, texture.NativePipelineStageMask, DependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
+                memoryBarrier = new VkImageMemoryBarrier(texture.NativeImage, subresourceRange, VkAccessFlags.TransferWrite, texture.NativeAccessMask, VkImageLayout.TransferDstOptimal, texture.NativeLayout);
+                vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, texture.NativePipelineStageMask, VkDependencyFlags.None, 0, null, 0, null, 1, &memoryBarrier);
             }
             else
             {
                 var buffer = resource as Buffer;
                 if (buffer != null)
                 {
-                    var memoryBarriers = stackalloc BufferMemoryBarrier[2];
+                    var memoryBarriers = stackalloc VkBufferMemoryBarrier[2];
 
-                    var bufferCopy = new BufferCopy
+                    var bufferCopy = new VkBufferCopy
                     {
-                        SourceOffset = (ulong)(uploadOffset + alignment),
-                        DestinationOffset = (ulong)region.Left,
-                        Size = (ulong)lengthInBytes,
+                        srcOffset = (ulong)(uploadOffset + alignment),
+                        dstOffset = (ulong)region.Left,
+                        size = (ulong)lengthInBytes,
                     };
 
+#if VULKAN_CHECKPOINT_DEBUG
+                    GraphicsDevice.RecordInfo("UpdateSubresource2", currentCommandList.NativeCommandBuffer);
+#endif
                     memoryBarriers[0] = uploadBufferMemoryBarrier;
-                    memoryBarriers[1] = new BufferMemoryBarrier(buffer.NativeBuffer, buffer.NativeAccessMask, AccessFlags.TransferWrite, bufferCopy.DestinationOffset, bufferCopy.Size);
-                    currentCommandList.NativeCommandBuffer.PipelineBarrier(buffer.NativePipelineStageMask, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, 2, memoryBarriers, 0, null);
+                    memoryBarriers[1] = new VkBufferMemoryBarrier(buffer.NativeBuffer, buffer.NativeAccessMask, VkAccessFlags.TransferWrite, bufferCopy.dstOffset, bufferCopy.size);
+                    vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, buffer.NativePipelineStageMask | VkPipelineStageFlags.Host, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 2, memoryBarriers, 0, null);
 
-                    currentCommandList.NativeCommandBuffer.CopyBuffer(uploadResource, buffer.NativeBuffer, 1, &bufferCopy);
+                    vkCmdCopyBuffer(currentCommandList.NativeCommandBuffer, uploadResource, buffer.NativeBuffer, 1, &bufferCopy);
 
-                    var memoryBarrier = new BufferMemoryBarrier(buffer.NativeBuffer, AccessFlags.TransferWrite, buffer.NativeAccessMask, bufferCopy.DestinationOffset, bufferCopy.Size);
-                    currentCommandList.NativeCommandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, buffer.NativePipelineStageMask, DependencyFlags.None, 0, null, 1, &memoryBarrier, 0, null);
+                    var memoryBarrier = new VkBufferMemoryBarrier(buffer.NativeBuffer, VkAccessFlags.TransferWrite, buffer.NativeAccessMask, bufferCopy.dstOffset, bufferCopy.size);
+                    vkCmdPipelineBarrier(currentCommandList.NativeCommandBuffer, VkPipelineStageFlags.Transfer, buffer.NativePipelineStageMask, VkDependencyFlags.None, 0, null, 1, &memoryBarrier, 0, null);
                 }
                 else
                 {
@@ -1244,7 +1354,7 @@ internal unsafe void UpdateSubresource(GraphicsResource resource, int subResourc
         /// <param name="offsetInBytes">The offset information in bytes.</param>
         /// <param name="lengthInBytes">The length information in bytes.</param>
         /// <returns>Pointer to the sub resource to map.</returns>
-        public MappedResource MapSubresource(GraphicsResource resource, int subResourceIndex, MapMode mapMode, bool doNotWait = false, int offsetInBytes = 0, int lengthInBytes = 0)
+        public unsafe MappedResource MapSubresource(GraphicsResource resource, int subResourceIndex, MapMode mapMode, bool doNotWait = false, int offsetInBytes = 0, int lengthInBytes = 0)
         {
             if (resource == null) throw new ArgumentNullException("resource");
 
@@ -1270,18 +1380,18 @@ public MappedResource MapSubresource(GraphicsResource resource, int subResourceI
                 }
             }
 
-            if (mapMode == MapMode.Read || mapMode == MapMode.ReadWrite || mapMode == MapMode.Write)
+            if (mapMode == MapMode.WriteDiscard)
+            {
+                // this mode isn't supported, so fallback to just Write
+                mapMode = MapMode.Write;
+            }
+            else if (mapMode == MapMode.Read || mapMode == MapMode.ReadWrite || mapMode == MapMode.Write)
             {
                 // Is non-staging ever possible for Read/Write?
                 if (usage != GraphicsResourceUsage.Staging)
                     throw new InvalidOperationException();
             }
 
-            if (mapMode == MapMode.WriteDiscard)
-            {
-                throw new InvalidOperationException("Can't use WriteDiscard on Graphics API that doesn't support renaming");
-            }
-
             if (mapMode != MapMode.WriteNoOverwrite && mapMode != MapMode.Write)
             {
                 // Need to wait?
@@ -1316,14 +1426,19 @@ public MappedResource MapSubresource(GraphicsResource resource, int subResourceI
                 }
             }
 
-            var mappedMemory = GraphicsDevice.NativeDevice.MapMemory(resource.NativeMemory, (ulong)offsetInBytes, (ulong)lengthInBytes, MemoryMapFlags.None);
-            return new MappedResource(resource, subResourceIndex, new DataBox(mappedMemory, rowPitch, 0), offsetInBytes, lengthInBytes);
+#if VULKAN_CHECKPOINT_DEBUG
+            GraphicsDevice.RecordInfo("vkMapMemoryMapSubresource", currentCommandList.NativeCommandBuffer);
+#endif
+
+            void* mappedMemory;
+            vkMapMemory(GraphicsDevice.NativeDevice, resource.NativeMemory, (ulong)offsetInBytes, (ulong)lengthInBytes, VkMemoryMapFlags.None, &mappedMemory);
+            GraphicsDevice.DelayedUnmaps.Enqueue(resource.NativeMemory);
+            return new MappedResource(resource, subResourceIndex, new DataBox((IntPtr)mappedMemory, rowPitch, 0), offsetInBytes, lengthInBytes);
         }
 
         // TODO GRAPHICS REFACTOR what should we do with this?
         public void UnmapSubresource(MappedResource unmapped)
         {
-            GraphicsDevice.NativeDevice.UnmapMemory(unmapped.Resource.NativeMemory);
         }
 
         /// <inheritdoc/>
@@ -1336,15 +1451,16 @@ protected internal override bool OnRecreate()
         /// <inheritdoc/>
         protected internal override void OnDestroyed()
         {
-            GraphicsDevice.NativeDevice.WaitIdle();
+            vkDeviceWaitIdle(GraphicsDevice.NativeDevice);
 
-            if (descriptorPool != SharpVulkan.DescriptorPool.Null)
+            if (descriptorPool != VkDescriptorPool.Null)
             {
                 GraphicsDevice.DescriptorPools.RecycleObject(GraphicsDevice.NextFenceValue - 1, descriptorPool);
-                descriptorPool = SharpVulkan.DescriptorPool.Null;
+                descriptorPool = VkDescriptorPool.Null;
             }
 
-            CommandBufferPool.Dispose();
+            if (activePipeline != null) activePipeline.OnDestroyed();
+            activePipeline = null;
 
             base.OnDestroyed();
         }
@@ -1356,41 +1472,43 @@ private unsafe void EnsureRenderPass()
 
             var pipelineRenderPass = activePipeline.NativeRenderPass;
 
-            // Reuse the Framebuffer if the RenderPass didn't change
+            // Reuse the Framebuffer if the VkRenderPass didn't change
             if (previousRenderPass != pipelineRenderPass)
                 framebufferDirty = true;
 
-            // Nothing to do. RenderPass and Framebuffer are still valid
+            // Nothing to do. VkRenderPass and Framebuffer are still valid
             if (!framebufferDirty && activeRenderPass == pipelineRenderPass)
                 return;
 
             // End old render pass
             CleanupRenderPass();
 
-            if (pipelineRenderPass != RenderPass.Null)
+            if (pipelineRenderPass != VkRenderPass.Null)
             {
                 var renderTarget = RenderTargetCount > 0 ? renderTargets[0] : depthStencilBuffer;
 
+                if (renderTarget == null) return;
+
                 if (framebufferDirty)
                 {
                     // Create new frame buffer
-                    fixed (ImageView* attachmentsPointer = &framebufferAttachments[0])
+                    fixed (VkImageView* attachmentsPointer = &framebufferAttachments[0])
                     {
                         var framebufferKey = new FramebufferKey(pipelineRenderPass, framebufferAttachmentCount, attachmentsPointer);
 
                         if (!framebuffers.TryGetValue(framebufferKey, out activeFramebuffer))
                         {
-                            var framebufferCreateInfo = new FramebufferCreateInfo
+                            var framebufferCreateInfo = new VkFramebufferCreateInfo
                             {
-                                StructureType = StructureType.FramebufferCreateInfo,
-                                RenderPass = pipelineRenderPass,
-                                AttachmentCount = (uint)framebufferAttachmentCount,
-                                Attachments = new IntPtr(attachmentsPointer),
-                                Width = (uint)renderTarget.ViewWidth,
-                                Height = (uint)renderTarget.ViewHeight,
-                                Layers = 1, // TODO VULKAN: Use correct view depth/array size
+                                sType = VkStructureType.FramebufferCreateInfo,
+                                renderPass = pipelineRenderPass,
+                                attachmentCount = (uint)framebufferAttachmentCount,
+                                pAttachments = attachmentsPointer,
+                                width = (uint)renderTarget.ViewWidth,
+                                height = (uint)renderTarget.ViewHeight,
+                                layers = 1, // TODO VULKAN: Use correct view depth/array size
                             };
-                            activeFramebuffer = GraphicsDevice.NativeDevice.CreateFramebuffer(ref framebufferCreateInfo);
+                            vkCreateFramebuffer(GraphicsDevice.NativeDevice, &framebufferCreateInfo, null, out activeFramebuffer);
                             GraphicsDevice.Collect(activeFramebuffer);
                             framebuffers.Add(framebufferKey, activeFramebuffer);
                         }
@@ -1413,15 +1531,18 @@ private unsafe void EnsureRenderPass()
                     Clear(depthStencilBuffer, DepthStencilClearOptions.DepthBuffer | DepthStencilClearOptions.Stencil);
                 }
 
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("StartingNewRenderPass", currentCommandList.NativeCommandBuffer);
+#endif
                 // Start new render pass
-                var renderPassBegin = new RenderPassBeginInfo
+                var renderPassBegin = new VkRenderPassBeginInfo
                 {
-                    StructureType = StructureType.RenderPassBeginInfo,
-                    RenderPass = pipelineRenderPass,
-                    Framebuffer = activeFramebuffer,
-                    RenderArea = new Rect2D(0, 0, (uint)renderTarget.ViewWidth, (uint)renderTarget.ViewHeight)
+                    sType = VkStructureType.RenderPassBeginInfo,
+                    renderPass = pipelineRenderPass,
+                    framebuffer = activeFramebuffer,
+                    renderArea = new Vortice.Vulkan.VkRect2D(0, 0, renderTarget.ViewWidth, renderTarget.ViewHeight),
                 };
-                currentCommandList.NativeCommandBuffer.BeginRenderPass(ref renderPassBegin, SubpassContents.Inline);
+                vkCmdBeginRenderPass(currentCommandList.NativeCommandBuffer, &renderPassBegin, VkSubpassContents.Inline);
 
                 previousRenderPass = activeRenderPass = pipelineRenderPass;
             }
@@ -1429,29 +1550,32 @@ private unsafe void EnsureRenderPass()
 
         private unsafe void CleanupRenderPass()
         {
-            if (activeRenderPass != RenderPass.Null)
+            if (activeRenderPass != VkRenderPass.Null)
             {
-                currentCommandList.NativeCommandBuffer.EndRenderPass();
-                activeRenderPass = RenderPass.Null;
+#if VULKAN_CHECKPOINT_DEBUG
+                GraphicsDevice.RecordInfo("EndingCommandBufferRenderPass", currentCommandList.NativeCommandBuffer);
+#endif
+                vkCmdEndRenderPass(currentCommandList.NativeCommandBuffer);
+                activeRenderPass = VkRenderPass.Null;
             }
         }
 
         private struct FramebufferKey : IEquatable<FramebufferKey>
         {
-            private RenderPass renderPass;
+            private VkRenderPass renderPass;
             private int attachmentCount;
-            private ImageView attachment0;
-            private ImageView attachment1;
-            private ImageView attachment2;
-            private ImageView attachment3;
-            private ImageView attachment4;
-            private ImageView attachment5;
-            private ImageView attachment6;
-            private ImageView attachment7;
-            private ImageView attachment8;
-            private ImageView attachment9;
-
-            public unsafe FramebufferKey(RenderPass renderPass, int attachmentCount, ImageView* attachments)
+            private VkImageView attachment0;
+            private VkImageView attachment1;
+            private VkImageView attachment2;
+            private VkImageView attachment3;
+            private VkImageView attachment4;
+            private VkImageView attachment5;
+            private VkImageView attachment6;
+            private VkImageView attachment7;
+            private VkImageView attachment8;
+            private VkImageView attachment9;
+
+            public unsafe FramebufferKey(VkRenderPass renderPass, int attachmentCount, VkImageView* attachments)
             {
                 this.renderPass = renderPass;
                 this.attachmentCount = attachmentCount;
@@ -1472,7 +1596,7 @@ public override unsafe int GetHashCode()
             {
                 var hashcode = renderPass.GetHashCode();
 
-                fixed (ImageView* attachmentsPointer = &attachment0)
+                fixed (VkImageView* attachmentsPointer = &attachment0)
                 {
                     for (int i = 0; i < attachmentCount; i++)
                     {
@@ -1488,7 +1612,7 @@ public unsafe bool Equals(FramebufferKey other)
                 if (other.renderPass != this.renderPass || attachmentCount != other.attachmentCount)
                     return false;
 
-                fixed (ImageView* attachmentsPointer = &attachment0)
+                fixed (VkImageView* attachmentsPointer = &attachment0)
                 {
                     var otherAttachmentsPointer = &other.attachment0;
 
@@ -1507,13 +1631,13 @@ public unsafe bool Equals(FramebufferKey other)
         private struct DescriptorData
         {
             [FieldOffset(0)]
-            public DescriptorBufferInfo BufferInfo;
+            public VkDescriptorBufferInfo BufferInfo;
 
             [FieldOffset(0)]
-            public DescriptorImageInfo ImageInfo;
+            public VkDescriptorImageInfo ImageInfo;
 
             [FieldOffset(0)]
-            public BufferView BufferView;
+            public VkBufferView BufferView;
         }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/CompiledCommandList.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/CompiledCommandList.Vulkan.cs
index 5bbae0cf64..092ee9c360 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/CompiledCommandList.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/CompiledCommandList.Vulkan.cs
@@ -2,15 +2,16 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System.Collections.Generic;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
     public partial struct CompiledCommandList
     {
         internal CommandList Builder;
-        internal CommandBuffer NativeCommandBuffer;
-        internal List<SharpVulkan.DescriptorPool> DescriptorPools;
+        internal VkCommandBuffer NativeCommandBuffer;
+        internal List<VkDescriptorPool> DescriptorPools;
         internal List<Texture> StagingResources;
     }
 }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/DescriptorPool.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/DescriptorPool.Vulkan.cs
index 31229d8ac4..f355f47a19 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/DescriptorPool.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/DescriptorPool.Vulkan.cs
@@ -2,7 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN && !XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES
 using System;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
@@ -11,12 +12,12 @@ public partial class DescriptorPool
         private uint[] allocatedTypeCounts;
         private uint allocatedSetCount;
 
-        internal SharpVulkan.DescriptorPool NativeDescriptorPool;
+        internal VkDescriptorPool NativeDescriptorPool;
 
         public void Reset()
         {
-            GraphicsDevice.descriptorPools.RecycleObject(GraphicsDevice.NextFenceValue, NativeDescriptorPool);
-            NativeDescriptorPool = GraphicsDevice.descriptorPools.GetObject();
+            GraphicsDevice.DescriptorPools.RecycleObject(GraphicsDevice.NextFenceValue, NativeDescriptorPool);
+            NativeDescriptorPool = GraphicsDevice.DescriptorPools.GetObject();
 
             allocatedSetCount = 0;
             for (int i = 0; i < DescriptorSetLayout.DescriptorTypeCount; i++)
@@ -30,7 +31,7 @@ private DescriptorPool(GraphicsDevice graphicsDevice, DescriptorTypeCount[] coun
             Recreate();
         }
 
-        internal unsafe SharpVulkan.DescriptorSet AllocateDescriptorSet(DescriptorSetLayout descriptorSetLayout)
+        internal unsafe VkDescriptorSet AllocateDescriptorSet(DescriptorSetLayout descriptorSetLayout)
         {
             // Keep track of descriptor pool usage
             bool isPoolExhausted = ++allocatedSetCount > GraphicsDevice.MaxDescriptorSetCount;
@@ -46,27 +47,27 @@ internal unsafe SharpVulkan.DescriptorSet AllocateDescriptorSet(DescriptorSetLay
 
             if (isPoolExhausted)
             {
-                return SharpVulkan.DescriptorSet.Null;
+                return VkDescriptorSet.Null;
             }
 
             // Allocate new descriptor set
             var nativeLayoutCopy = descriptorSetLayout.NativeLayout;
             var allocateInfo = new DescriptorSetAllocateInfo
             {
-                StructureType = StructureType.DescriptorSetAllocateInfo,
+                sType = VkStructureType.DescriptorSetAllocateInfo,
                 DescriptorPool = NativeDescriptorPool,
                 DescriptorSetCount = 1,
                 SetLayouts = new IntPtr(&nativeLayoutCopy)
             };
 
-            SharpVulkan.DescriptorSet descriptorSet;
+            VkDescriptorSet descriptorSet;
             GraphicsDevice.NativeDevice.AllocateDescriptorSets(ref allocateInfo, &descriptorSet);
             return descriptorSet;
         }
 
         private void Recreate()
         {
-            NativeDescriptorPool = GraphicsDevice.descriptorPools.GetObject();
+            NativeDescriptorPool = GraphicsDevice.DescriptorPools.GetObject();
             
             allocatedTypeCounts = new uint[DescriptorSetLayout.DescriptorTypeCount];
             allocatedSetCount = 0;
@@ -82,7 +83,7 @@ protected internal override bool OnRecreate()
         /// <inheritdoc/>
         protected internal override void OnDestroyed()
         {
-            GraphicsDevice.descriptorPools.RecycleObject(GraphicsDevice.NextFenceValue, NativeDescriptorPool);
+            GraphicsDevice.DescriptorPools.RecycleObject(GraphicsDevice.NextFenceValue, NativeDescriptorPool);
 
             base.OnDestroyed();
         }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/DescriptorSet.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/DescriptorSet.Vulkan.cs
index 306764879c..c87673ce4e 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/DescriptorSet.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/DescriptorSet.Vulkan.cs
@@ -3,17 +3,18 @@
 #if XENKO_GRAPHICS_API_VULKAN && !XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES
 using System;
 using System.Collections.Generic;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Shaders;
 
 namespace Xenko.Graphics
 {
     public partial struct DescriptorSet
     {
-        internal readonly SharpVulkan.DescriptorSet NativeDescriptorSet;
+        internal readonly VkDescriptorSet NativeDescriptorSet;
         internal readonly GraphicsDevice GraphicsDevice;
         
-        public bool IsValid => NativeDescriptorSet != SharpVulkan.DescriptorSet.Null;
+        public bool IsValid => NativeDescriptorSet != VkDescriptorSet.Null;
 
         private DescriptorSet(GraphicsDevice graphicsDevice, DescriptorPool pool, DescriptorSetLayout desc)
         {
@@ -52,7 +53,7 @@ public unsafe void SetShaderResourceView(int slot, GraphicsResource shaderResour
         {
             var write = new WriteDescriptorSet
             {
-                StructureType = StructureType.WriteDescriptorSet,
+                sType = VkStructureType.WriteDescriptorSet,
                 DescriptorCount = 1,
                 DestinationSet = NativeDescriptorSet,
                 DestinationBinding = (uint)slot,
@@ -62,9 +63,9 @@ public unsafe void SetShaderResourceView(int slot, GraphicsResource shaderResour
             var texture = shaderResourceView as Texture;
             if (texture != null)
             {
-                var imageInfo = new DescriptorImageInfo { ImageView = texture.NativeImageView, ImageLayout = ImageLayout.ShaderReadOnlyOptimal };
+                var imageInfo = new DescriptorImageInfo { VkImageView = texture.NativeImageView, ImageLayout = VkImageLayout.ShaderReadOnlyOptimal };
 
-                write.DescriptorType = DescriptorType.SampledImage;
+                write.VkDescriptorType = VkDescriptorType.SampledImage;
                 write.ImageInfo = new IntPtr(&imageInfo);
 
                 GraphicsDevice.NativeDevice.UpdateDescriptorSets(1, &write, 0, null);
@@ -76,7 +77,7 @@ public unsafe void SetShaderResourceView(int slot, GraphicsResource shaderResour
                 {
                     var bufferViewCopy = buffer.NativeBufferView;
 
-                    write.DescriptorType = DescriptorType.UniformTexelBuffer;
+                    write.VkDescriptorType = VkDescriptorType.UniformTexelBuffer;
                     write.TexelBufferView = new IntPtr(&bufferViewCopy);
 
                     GraphicsDevice.NativeDevice.UpdateDescriptorSets(1, &write, 0, null);
@@ -99,12 +100,12 @@ public unsafe void SetSamplerState(int slot, SamplerState samplerState)
 
             var write = new WriteDescriptorSet
             {
-                StructureType = StructureType.WriteDescriptorSet,
+                sType = VkStructureType.WriteDescriptorSet,
                 DescriptorCount = 1,
                 DestinationSet = NativeDescriptorSet,
                 DestinationBinding = (uint)slot,
                 DestinationArrayElement = 0,
-                DescriptorType = DescriptorType.Sampler,
+                VkDescriptorType = VkDescriptorType.Sampler,
                 ImageInfo = new IntPtr(&imageInfo),
             };
 
@@ -124,12 +125,12 @@ public unsafe void SetConstantBuffer(int slot, Buffer buffer, int offset, int si
 
             var write = new WriteDescriptorSet
             {
-                StructureType = StructureType.WriteDescriptorSet,
+                sType = VkStructureType.WriteDescriptorSet,
                 DescriptorCount = 1,
                 DestinationSet = NativeDescriptorSet,
                 DestinationBinding = (uint)slot,
                 DestinationArrayElement = 0,
-                DescriptorType = DescriptorType.UniformBuffer,
+                VkDescriptorType = VkDescriptorType.UniformBuffer,
                 BufferInfo = new IntPtr(&bufferInfo)
             };
             
diff --git a/sources/engine/Xenko.Graphics/Vulkan/DescriptorSetLayout.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/DescriptorSetLayout.Vulkan.cs
index a28952c07b..8f2049899c 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/DescriptorSetLayout.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/DescriptorSetLayout.Vulkan.cs
@@ -7,7 +7,8 @@
 using Xenko.Core.Collections;
 using Xenko.Shaders;
 #if XENKO_GRAPHICS_API_VULKAN
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
@@ -18,7 +19,7 @@ public partial class DescriptorSetLayout
 #if !XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES
         internal readonly DescriptorSetLayoutBuilder Builder;
 
-        internal SharpVulkan.DescriptorSetLayout NativeLayout;
+        internal VkDescriptorSetLayout NativeLayout;
 
         internal uint[] TypeCounts;
 
@@ -44,22 +45,22 @@ protected internal override bool OnRecreate()
         protected internal override unsafe void OnDestroyed()
         {
             GraphicsDevice.NativeDevice.DestroyDescriptorSetLayout(NativeLayout);
-            NativeLayout = SharpVulkan.DescriptorSetLayout.Null;
+            NativeLayout = VkDescriptorSetLayout.Null;
 
             base.OnDestroyed();
         }
 #endif
 
-        internal static unsafe SharpVulkan.DescriptorSetLayout CreateNativeDescriptorSetLayout(GraphicsDevice device, IList<DescriptorSetLayoutBuilder.Entry> entries, out uint[] typeCounts)
+        internal static unsafe VkDescriptorSetLayout CreateNativeDescriptorSetLayout(GraphicsDevice device, IList<DescriptorSetLayoutBuilder.Entry> entries, out uint[] typeCounts)
         {
-            var bindings = new DescriptorSetLayoutBinding[entries.Count];
-            var immutableSamplers = new Sampler[entries.Count];
+            var bindings = new VkDescriptorSetLayoutBinding[entries.Count];
+            var immutableSamplers = new VkSampler[entries.Count];
 
             int usedBindingCount = 0;
 
             typeCounts = new uint[DescriptorTypeCount];
 
-            fixed (Sampler* immutableSamplersPointer = &immutableSamplers[0])
+            fixed (VkSampler* immutableSamplersPointer = &immutableSamplers[0])
             {
                 for (int i = 0; i < entries.Count; i++)
                 {
@@ -69,12 +70,12 @@ internal static unsafe SharpVulkan.DescriptorSetLayout CreateNativeDescriptorSet
                     if (entry.ArraySize == 0)
                         continue;
 
-                    bindings[usedBindingCount] = new DescriptorSetLayoutBinding
+                    bindings[usedBindingCount] = new VkDescriptorSetLayoutBinding
                     {
-                        DescriptorType = VulkanConvertExtensions.ConvertDescriptorType(entry.Class, entry.Type),
-                        StageFlags = ShaderStageFlags.All, // TODO VULKAN: Filter?
-                        Binding = (uint)i,
-                        DescriptorCount = (uint)entry.ArraySize
+                        descriptorType = VulkanConvertExtensions.ConvertDescriptorType(entry.Class, entry.Type),
+                        stageFlags = VkShaderStageFlags.All, // TODO VULKAN: Filter?
+                        binding = (uint)i,
+                        descriptorCount = (uint)entry.ArraySize
                     };
 
                     if (entry.ImmutableSampler != null)
@@ -85,24 +86,25 @@ internal static unsafe SharpVulkan.DescriptorSetLayout CreateNativeDescriptorSet
                             throw new NotImplementedException();
                         }
 
-                        // Remember this, so we can choose the right DescriptorType in DescriptorSet.SetShaderResourceView
+                        // Remember this, so we can choose the right VkDescriptorType in DescriptorSet.SetShaderResourceView
                         immutableSamplers[i] = entry.ImmutableSampler.NativeSampler;
-                        //bindings[i].DescriptorType = DescriptorType.CombinedImageSampler;
-                        bindings[usedBindingCount].ImmutableSamplers = new IntPtr(immutableSamplersPointer + i);
+                        //bindings[i].VkDescriptorType = VkDescriptorType.CombinedImageSampler;
+                        bindings[usedBindingCount].pImmutableSamplers = immutableSamplersPointer + i;
                     }
 
-                    typeCounts[(int)bindings[usedBindingCount].DescriptorType] += bindings[usedBindingCount].DescriptorCount;
+                    typeCounts[(int)bindings[usedBindingCount].descriptorType] += bindings[usedBindingCount].descriptorCount;
 
                     usedBindingCount++;
                 }
 
-                var createInfo = new DescriptorSetLayoutCreateInfo
+                var createInfo = new VkDescriptorSetLayoutCreateInfo
                 {
-                    StructureType = StructureType.DescriptorSetLayoutCreateInfo,
-                    BindingCount = (uint)usedBindingCount,
-                    Bindings = usedBindingCount > 0 ? new IntPtr(Interop.Fixed(bindings)) : IntPtr.Zero
+                    sType = VkStructureType.DescriptorSetLayoutCreateInfo,
+                    bindingCount = (uint)usedBindingCount,
+                    pBindings = usedBindingCount > 0 ? (VkDescriptorSetLayoutBinding*)Core.Interop.Fixed(bindings) : null,
                 };
-                return device.NativeDevice.CreateDescriptorSetLayout(ref createInfo);
+                vkCreateDescriptorSetLayout(device.NativeDevice, &createInfo, null, out var descriptorSetLayout);
+                return descriptorSetLayout;
             }
         }
     }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/DisplayMode.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/DisplayMode.Vulkan.cs
index 5fd94a3567..36e7f6c209 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/DisplayMode.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/DisplayMode.Vulkan.cs
@@ -2,7 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapter.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapter.Vulkan.cs
index bc9f4ea689..67ab42a0cf 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapter.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapter.Vulkan.cs
@@ -6,7 +6,8 @@
 using System.Resources;
 using System.Runtime.InteropServices;
 using System.Text;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Core;
 
 using ComponentBase = Xenko.Core.ComponentBase;
@@ -22,23 +23,23 @@ namespace Xenko.Graphics
     /// <unmanaged-short>IDXGIAdapter1</unmanaged-short>	
     public partial class GraphicsAdapter
     {
-        private PhysicalDevice defaultPhysicalDevice;
-        private PhysicalDevice debugPhysicalDevice;
+        private VkPhysicalDevice defaultPhysicalDevice;
+        private VkPhysicalDevice debugPhysicalDevice;
 
         private readonly int adapterOrdinal;
-        private readonly PhysicalDeviceProperties properties;
+        private readonly VkPhysicalDeviceProperties properties;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="GraphicsAdapter" /> class.
         /// </summary>
         /// <param name="physicalDevice">The default factory.</param>
         /// <param name="adapterOrdinal">The adapter ordinal.</param>
-        internal GraphicsAdapter(PhysicalDevice defaultPhysicalDevice, int adapterOrdinal)
+        internal GraphicsAdapter(VkPhysicalDevice defaultPhysicalDevice, int adapterOrdinal)
         {
             this.adapterOrdinal = adapterOrdinal;
             this.defaultPhysicalDevice = defaultPhysicalDevice;
 
-            defaultPhysicalDevice.GetProperties(out properties);
+            vkGetPhysicalDeviceProperties(defaultPhysicalDevice, out properties);
 
             // TODO VULKAN
             //var displayProperties = physicalDevice.DisplayProperties;
@@ -58,7 +59,7 @@ public unsafe string Description
             {
                 // TODO VULKAN api
                 var propertiesCopy = properties;
-                return Marshal.PtrToStringAnsi(new IntPtr(&propertiesCopy.DeviceName));
+                return Marshal.PtrToStringAnsi((IntPtr)propertiesCopy.deviceName);
             }
         }
 
@@ -72,7 +73,7 @@ public int VendorId
         {
             get
             {
-                return (int)properties.VendorId;
+                return (int)properties.vendorID;
             }
         }
 
@@ -87,13 +88,13 @@ public bool IsDefaultAdapter
             }
         }
 
-        internal PhysicalDevice GetPhysicalDevice(bool enableValidation)
+        internal VkPhysicalDevice GetPhysicalDevice(bool enableValidation)
         {
             if (enableValidation)
             {
-                if (debugPhysicalDevice == PhysicalDevice.Null)
+                if (debugPhysicalDevice == VkPhysicalDevice.Null)
                 {
-                    debugPhysicalDevice = GraphicsAdapterFactory.GetInstance(true).NativeInstance.PhysicalDevices[adapterOrdinal];
+                    debugPhysicalDevice = vkEnumeratePhysicalDevices(GraphicsAdapterFactory.GetInstance(true).NativeInstance).ToArray()[adapterOrdinal];
                 }
 
                 return debugPhysicalDevice;
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapterFactory.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapterFactory.Vulkan.cs
index 9d68fffcd3..42bbd1cfbc 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapterFactory.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsAdapterFactory.Vulkan.cs
@@ -1,29 +1,49 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+// set this define if we want to debug Vulkan. Requires Framework v4.8 runtime for some weird reason (might be a Vortice.Vulkan version thing)
+//#define VULKAN_DEBUG
+
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Core;
 
+#if VULKAN_DEBUG && DEBUG
+using System.Collections.Concurrent;
+#endif
+
 namespace Xenko.Graphics
 {
     public static partial class GraphicsAdapterFactory
     {
         private static GraphicsAdapterFactoryInstance defaultInstance;
+
+#if VULKAN_DEBUG && DEBUG
         private static GraphicsAdapterFactoryInstance debugInstance;
+#endif
 
         /// <summary>
         /// Initializes all adapters with the specified factory.
         /// </summary>
-        internal static void InitializeInternal()
+        internal static void InitializeInternal(bool debug)
         {
+            var result = vkInitialize();
+            result.CheckResult();
+
+#if VULKAN_DEBUG && DEBUG
+            if (!RuntimeInformation.FrameworkDescription.Contains("amework")) 
+                throw new Exception("Engine is running Vulkan in DEBUG and VULKAN_DEBUG with .NET Core. Debug output reports don't work. Try running with .NET Framework v4.8 or RELEASE.");    
+#endif
+
             // Create the default instance to enumerate physical devices
-            defaultInstance = new GraphicsAdapterFactoryInstance(false);
-            var nativePhysicalDevices = defaultInstance.NativeInstance.PhysicalDevices;
+            defaultInstance = new GraphicsAdapterFactoryInstance(debug);
+            var nativePhysicalDevices = vkEnumeratePhysicalDevices(defaultInstance.NativeInstance);
 
             var adapterList = new List<GraphicsAdapter>();
             for (int i = 0; i < nativePhysicalDevices.Length; i++)
@@ -47,11 +67,13 @@ private static void Cleanup()
                 defaultInstance = null;
             }
 
+#if VULKAN_DEBUG && DEBUG
             if (debugInstance != null)
             {
                 debugInstance.Dispose();
                 debugInstance = null;
             }
+#endif
         }
 
         /// <summary>
@@ -63,6 +85,7 @@ internal static GraphicsAdapterFactoryInstance GetInstance(bool enableValidation
             {
                 Initialize();
 
+#if VULKAN_DEBUG && DEBUG
                 if (enableValidation)
                 {
                     return debugInstance ?? (debugInstance = new GraphicsAdapterFactoryInstance(true));
@@ -71,58 +94,51 @@ internal static GraphicsAdapterFactoryInstance GetInstance(bool enableValidation
                 {
                     return defaultInstance;
                 }
+#else
+                return defaultInstance;
+#endif
             }
         }
     }
 
     internal class GraphicsAdapterFactoryInstance : IDisposable
     {
-        private DebugReportCallback debugReportCallback;
+#if VULKAN_DEBUG && DEBUG
+        private VkDebugReportCallbackEXT debugReportCallback;
         private DebugReportCallbackDelegate debugReport;
-
-        internal Instance NativeInstance;
-        internal bool HasXlibSurfaceSupport;
-
         internal BeginDebugMarkerDelegate BeginDebugMarker;
         internal EndDebugMarkerDelegate EndDebugMarker;
+#endif
+
+        internal VkInstance NativeInstance;
 
         public unsafe GraphicsAdapterFactoryInstance(bool enableValidation)
         {
-            var applicationInfo = new ApplicationInfo
+            var applicationInfo = new VkApplicationInfo
             {
-                StructureType = StructureType.ApplicationInfo,
-                ApiVersion = new SharpVulkan.Version(1, 0, 0),
-                EngineName = Marshal.StringToHGlobalAnsi("Xenko"),
-                //EngineVersion = new SharpVulkan.Version()
+                sType = VkStructureType.ApplicationInfo,
+                apiVersion = new VkVersion(1, 0, 0),
+                pEngineName = (byte*)Marshal.StringToHGlobalAnsi("Focus"),
             };
 
-            var desiredLayerNames = new[]
-            {
-                    //"VK_LAYER_LUNARG_standard_validation",
-                    "VK_LAYER_GOOGLE_threading",
-                    "VK_LAYER_LUNARG_parameter_validation",
-                    "VK_LAYER_LUNARG_device_limits",
-                    "VK_LAYER_LUNARG_object_tracker",
-                    "VK_LAYER_LUNARG_image",
-                    "VK_LAYER_LUNARG_core_validation",
-                    "VK_LAYER_LUNARG_swapchain",
-                    "VK_LAYER_GOOGLE_unique_objects",
-                    //"VK_LAYER_LUNARG_api_dump",
-                    //"VK_LAYER_LUNARG_vktrace"
-                };
-
             IntPtr[] enabledLayerNames = new IntPtr[0];
 
+#if VULKAN_DEBUG && DEBUG
             if (enableValidation)
             {
-                var layers = Vulkan.InstanceLayerProperties;
+                var desiredLayerNames = new[]
+                {
+                    "VK_LAYER_KHRONOS_validation",
+                };
+
+                var layers = vkEnumerateInstanceLayerProperties();
                 var availableLayerNames = new HashSet<string>();
 
                 for (int index = 0; index < layers.Length; index++)
                 {
                     var properties = layers[index];
-                    var namePointer = new IntPtr(Interop.Fixed(ref properties.LayerName));
-                    var name = Marshal.PtrToStringAnsi(namePointer);
+                    var namePointer = properties.layerName;
+                    var name = Marshal.PtrToStringAnsi((IntPtr)namePointer);
 
                     availableLayerNames.Add(name);
                 }
@@ -131,97 +147,101 @@ public unsafe GraphicsAdapterFactoryInstance(bool enableValidation)
                     .Where(x => availableLayerNames.Contains(x))
                     .Select(Marshal.StringToHGlobalAnsi).ToArray();
             }
+#endif
 
-            var extensionProperties = Vulkan.GetInstanceExtensionProperties();
+            var extensionProperties = vkEnumerateInstanceExtensionProperties();
             var availableExtensionNames = new List<string>();
             var desiredExtensionNames = new List<string>();
 
             for (int index = 0; index < extensionProperties.Length; index++)
             {
-                var namePointer = new IntPtr(Interop.Fixed(ref extensionProperties[index].ExtensionName));
-                var name = Marshal.PtrToStringAnsi(namePointer);
+                var extensionProperty = extensionProperties[index];
+                var name = Marshal.PtrToStringAnsi((IntPtr)extensionProperty.extensionName);
                 availableExtensionNames.Add(name);
             }
 
+            desiredExtensionNames.Add("VK_KHR_get_physical_device_properties2");
+            desiredExtensionNames.Add("VK_KHR_external_semaphore_capabilities");
+            desiredExtensionNames.Add("VK_KHR_external_semaphore");
             desiredExtensionNames.Add("VK_KHR_surface");
-            if (!availableExtensionNames.Contains("VK_KHR_surface"))
-                throw new InvalidOperationException("Required extension VK_KHR_surface is not available");
-
-#if XENKO_PLATFORM_WINDOWS_DESKTOP
-            desiredExtensionNames.Add("VK_KHR_win32_surface");
-            if (!availableExtensionNames.Contains("VK_KHR_win32_surface"))
-                throw new InvalidOperationException("Required extension VK_KHR_win32_surface is not available");
-#elif XENKO_PLATFORM_ANDROID
-                desiredExtensionNames.Add("VK_KHR_android_surface");
-                if (!availableExtensionNames.Contains("VK_KHR_android_surface"))
-                    throw new InvalidOperationException("Required extension VK_KHR_android_surface is not available");
-#elif XENKO_PLATFORM_LINUX
-                if (availableExtensionNames.Contains("VK_KHR_xlib_surface"))
-                {
-                    desiredExtensionNames.Add("VK_KHR_xlib_surface");
-                    HasXlibSurfaceSupport = true;
-                }
-                else if (availableExtensionNames.Contains("VK_KHR_xcb_surface"))
-                {
-                    desiredExtensionNames.Add("VK_KHR_xcb_surface");
-                }
-                else
-                {
-                    throw new InvalidOperationException("None of the supported surface extensions VK_KHR_xcb_surface or VK_KHR_xlib_surface is available");
-                }
-#endif
+            desiredExtensionNames.Add("VK_KHR_win32_surface"); // windows
+            desiredExtensionNames.Add("VK_KHR_image_format_list"); // openxr
+            desiredExtensionNames.Add("VK_KHR_android_surface"); // android
+            desiredExtensionNames.Add("VK_KHR_xlib_surface"); // linux
+            desiredExtensionNames.Add("VK_KHR_xcb_surface"); // linux
+            desiredExtensionNames.Add("VK_MVK_macos_surface"); // macos
+            desiredExtensionNames.Add("VK_EXT_metal_surface"); // macos
+            desiredExtensionNames.Add("VK_MVK_moltenvk"); // macos
+            desiredExtensionNames.Add("VK_NV_external_memory_capabilities"); // NVIDIA needs this one for OpenVR
+            desiredExtensionNames.Add("VK_KHR_external_memory_capabilities"); // this one might be used in the future for OpenVR
+
+#if VULKAN_DEBUG && DEBUG
             bool enableDebugReport = enableValidation && availableExtensionNames.Contains("VK_EXT_debug_report");
             if (enableDebugReport)
                 desiredExtensionNames.Add("VK_EXT_debug_report");
+#endif
 
-            var enabledExtensionNames = desiredExtensionNames.Select(Marshal.StringToHGlobalAnsi).ToArray();
+            // take out any extensions not supported
+            for (int i=0; i<desiredExtensionNames.Count; i++)
+            {
+                if (availableExtensionNames.Contains(desiredExtensionNames[i]) == false)
+                {
+                    desiredExtensionNames.RemoveAt(i);
+                    i--;
+                }
+            }
 
-            var createDebugReportCallbackName = Marshal.StringToHGlobalAnsi("vkCreateDebugReportCallbackEXT");
+            var enabledExtensionNames = desiredExtensionNames.Select(Marshal.StringToHGlobalAnsi).ToArray();
 
             try
             {
                 fixed (void* enabledExtensionNamesPointer = &enabledExtensionNames[0])
                 {
-                    var instanceCreateInfo = new InstanceCreateInfo
+                    var instanceCreateInfo = new VkInstanceCreateInfo
                     {
-                        StructureType = StructureType.InstanceCreateInfo,
-                        ApplicationInfo = new IntPtr(&applicationInfo),
-                        EnabledLayerCount = enabledLayerNames != null ? (uint)enabledLayerNames.Length : 0,
-                        EnabledLayerNames = enabledLayerNames?.Length > 0 ? new IntPtr(Interop.Fixed(enabledLayerNames)) : IntPtr.Zero,
-                        EnabledExtensionCount = (uint)enabledExtensionNames.Length,
-                        EnabledExtensionNames = new IntPtr(enabledExtensionNamesPointer)
+                        sType = VkStructureType.InstanceCreateInfo,
+                        pApplicationInfo = &applicationInfo,
+                        enabledLayerCount = enabledLayerNames != null ? (uint)enabledLayerNames.Length : 0,
+                        ppEnabledLayerNames = enabledLayerNames?.Length > 0 ? (byte**)Core.Interop.Fixed(enabledLayerNames) : null,
+                        enabledExtensionCount = (uint)enabledExtensionNames.Length,
+                        ppEnabledExtensionNames = (byte**)enabledExtensionNamesPointer,
                     };
 
-                    NativeInstance = Vulkan.CreateInstance(ref instanceCreateInfo);
+                    vkCreateInstance(&instanceCreateInfo, null, out NativeInstance);
+                    vkLoadInstance(NativeInstance);
                 }
 
+#if VULKAN_DEBUG && DEBUG
                 if (enableDebugReport)
                 {
-                    var createDebugReportCallback = (CreateDebugReportCallbackDelegate)Marshal.GetDelegateForFunctionPointer(NativeInstance.GetProcAddress((byte*)createDebugReportCallbackName), typeof(CreateDebugReportCallbackDelegate));
+                    var createDebugReportCallbackName = Marshal.StringToHGlobalAnsi("vkCreateDebugReportCallbackEXT");
+                    var createDebugReportCallback = (CreateDebugReportCallbackDelegate)Marshal.GetDelegateForFunctionPointer(vkGetInstanceProcAddr(NativeInstance, (byte*)createDebugReportCallbackName), typeof(CreateDebugReportCallbackDelegate));
 
                     debugReport = DebugReport;
-                    var createInfo = new DebugReportCallbackCreateInfo
+                    var createInfo = new VkDebugReportCallbackCreateInfoEXT
                     {
-                        StructureType = StructureType.DebugReportCallbackCreateInfo,
-                        Flags = (uint)(DebugReportFlags.Error | DebugReportFlags.Warning /* | DebugReportFlags.PerformanceWarning | DebugReportFlags.Information | DebugReportFlags.Debug*/),
-                        Callback = Marshal.GetFunctionPointerForDelegate(debugReport)
+                        sType = VkStructureType.DebugReportCallbackCreateInfoEXT,
+                        flags = VkDebugReportFlagsEXT.Error | VkDebugReportFlagsEXT.Warning /* | VkDebugReportFlagsEXT.PerformanceWarningEXT | VkDebugReportFlagsEXT.InformationEXT | VkDebugReportFlagsEXT.DebugEXT*/,
+                        pfnCallback = Marshal.GetFunctionPointerForDelegate(debugReport)
                     };
                     createDebugReportCallback(NativeInstance, ref createInfo, null, out debugReportCallback);
+                    Marshal.FreeHGlobal(createDebugReportCallbackName);
                 }
 
                 if (availableExtensionNames.Contains("VK_EXT_debug_marker"))
                 {
                     var beginDebugMarkerName = System.Text.Encoding.ASCII.GetBytes("vkCmdDebugMarkerBeginEXT");
 
-                    var ptr = NativeInstance.GetProcAddress((byte*)Interop.Fixed(beginDebugMarkerName));
+                    var ptr = vkGetInstanceProcAddr(NativeInstance, (byte*)Core.Interop.Fixed(beginDebugMarkerName));
                     if (ptr != IntPtr.Zero)
                         BeginDebugMarker = (BeginDebugMarkerDelegate)Marshal.GetDelegateForFunctionPointer(ptr, typeof(BeginDebugMarkerDelegate));
 
                     var endDebugMarkerName = System.Text.Encoding.ASCII.GetBytes("vkCmdDebugMarkerEndEXT");
-                    ptr = NativeInstance.GetProcAddress((byte*)Interop.Fixed(endDebugMarkerName));
+                    ptr = vkGetInstanceProcAddr(NativeInstance, (byte*)Core.Interop.Fixed(endDebugMarkerName));
                     if (ptr != IntPtr.Zero)
                         EndDebugMarker = (EndDebugMarkerDelegate)Marshal.GetDelegateForFunctionPointer(ptr, typeof(EndDebugMarkerDelegate));
                 }
+#endif
             }
             finally
             {
@@ -235,38 +255,77 @@ public unsafe GraphicsAdapterFactoryInstance(bool enableValidation)
                     Marshal.FreeHGlobal(enabledLayerName);
                 }
 
-                Marshal.FreeHGlobal(applicationInfo.EngineName);
-                Marshal.FreeHGlobal(createDebugReportCallbackName);
+                Marshal.FreeHGlobal((IntPtr)applicationInfo.pEngineName);
             }
         }
 
-        private static RawBool DebugReport(DebugReportFlags flags, DebugReportObjectType objectType, ulong @object, PointerSize location, int messageCode, string layerPrefix, string message, IntPtr userData)
+#if VULKAN_DEBUG && DEBUG
+
+        private static ConcurrentDictionary<string, bool> ErrorsAlready = new ConcurrentDictionary<string, bool>();
+
+        private static bool DebugReport(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, ulong @object, nuint location, int messageCode, string layerPrefix, string message, IntPtr userData)
         {
-            Debug.WriteLine($"{flags}: {message} ([{messageCode}] {layerPrefix})");
-            return true;
+            string debugMessage = $"{flags}, {@object}, {location}: {message} ([{messageCode}] {layerPrefix})";
+            switch (GraphicsAdapterFactory.adapterFlags)
+            {
+                default:
+                    Debug.WriteLine(debugMessage);
+                    return false;
+                case DeviceCreationFlags.DebugAndBreak:
+                    Debug.WriteLine(debugMessage);
+                    Debugger.Break();
+                    return false;
+                case DeviceCreationFlags.DebugAndBreakUnique:
+                    int start = message.IndexOf("[ ");
+                    int end = message.IndexOf(" ]");
+                    string key = message.Substring(start, end - start);
+                    if (ErrorsAlready.TryGetValue(key, out _) == false)
+                    {
+                        ErrorsAlready[key] = true;
+                        Debug.WriteLine(debugMessage);
+                        Debugger.Break();
+                    }
+                    return false;
+                case DeviceCreationFlags.DebugAndLogUnique:
+                    start = message.IndexOf("[ ");
+                    end = message.IndexOf(" ]");
+                    key = message.Substring(start, end - start);
+                    if (ErrorsAlready.TryGetValue(key, out _) == false)
+                    {
+                        ErrorsAlready[key] = true;
+                        debugMessage += "\n\nStack Trace: " + (new StackTrace()).ToString();
+                        ErrorFileLogger.WriteLogToFile(debugMessage);
+                    }
+                    return false;
+            }
         }
+#endif
 
         public unsafe void Dispose()
         {
-            if (debugReportCallback != DebugReportCallback.Null)
+#if VULKAN_DEBUG && DEBUG
+            if (debugReportCallback != VkDebugReportCallbackEXT.Null)
             {
-                NativeInstance.DestroyDebugReportCallback(debugReportCallback);
+                vkDestroyDebugReportCallbackEXT(NativeInstance, debugReportCallback, null);
             }
+#endif
 
-            NativeInstance.Destroy();
+            vkDestroyInstance(NativeInstance, null);
         }
 
+#if VULKAN_DEBUG && DEBUG
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        internal unsafe delegate void BeginDebugMarkerDelegate(CommandBuffer commandBuffer, DebugMarkerMarkerInfo* markerInfo);
+        internal unsafe delegate void BeginDebugMarkerDelegate(VkCommandBuffer commandBuffer, VkDebugMarkerMarkerInfoEXT* markerInfo);
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        internal delegate void EndDebugMarkerDelegate(CommandBuffer commandBuffer);
+        internal delegate void EndDebugMarkerDelegate(VkCommandBuffer commandBuffer);
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall, CharSet = CharSet.Ansi)]
-        private delegate RawBool DebugReportCallbackDelegate(DebugReportFlags flags, DebugReportObjectType objectType, ulong @object, PointerSize location, int messageCode, string layerPrefix, string message, IntPtr userData);
+        private delegate bool DebugReportCallbackDelegate(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType, ulong @object, nuint location, int messageCode, string layerPrefix, string message, IntPtr userData);
 
         [UnmanagedFunctionPointer(CallingConvention.StdCall)]
-        private unsafe delegate Result CreateDebugReportCallbackDelegate(Instance instance, ref DebugReportCallbackCreateInfo createInfo, AllocationCallbacks* allocator, out DebugReportCallback callback);
+        private unsafe delegate VkResult CreateDebugReportCallbackDelegate(VkInstance instance, ref VkDebugReportCallbackCreateInfoEXT createInfo, VkAllocationCallbacks* allocator, out VkDebugReportCallbackEXT callback);
+#endif
     }
 }
 #endif 
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsDevice.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsDevice.Vulkan.cs
index d1b499fe00..cf3be60ba3 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsDevice.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsDevice.Vulkan.cs
@@ -6,11 +6,12 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
+using System.Collections.Concurrent;
 
 using Xenko.Core;
 using Xenko.Core.Threading;
-using Semaphore = SharpVulkan.Semaphore;
 
 namespace Xenko.Graphics
 {
@@ -18,32 +19,36 @@ public partial class GraphicsDevice
     {
         internal int ConstantBufferDataPlacementAlignment;
 
-        internal readonly ConcurrentPool<List<SharpVulkan.DescriptorPool>> DescriptorPoolLists = new ConcurrentPool<List<SharpVulkan.DescriptorPool>>(() => new List<SharpVulkan.DescriptorPool>());
+        internal readonly ConcurrentPool<List<VkDescriptorPool>> DescriptorPoolLists = new ConcurrentPool<List<VkDescriptorPool>>(() => new List<VkDescriptorPool>());
         internal readonly ConcurrentPool<List<Texture>> StagingResourceLists = new ConcurrentPool<List<Texture>>(() => new List<Texture>());
 
+        internal static HashSet<VkDeviceMemory> SkipUnmap = new HashSet<VkDeviceMemory>();
+        internal static ConcurrentQueue<VkDeviceMemory> DelayedUnmaps = new ConcurrentQueue<VkDeviceMemory>();
+
         private const GraphicsPlatform GraphicPlatform = GraphicsPlatform.Vulkan;
         internal GraphicsProfile RequestedProfile;
 
         private bool simulateReset = false;
         private string rendererName;
 
-        private Device nativeDevice;
-        internal Queue NativeCommandQueue;
-        internal object QueueLock = new object();
+        private VkDevice nativeDevice;
+        internal VkQueue NativeCommandQueue;
+        internal ReaderWriterLockSlim QueueLock = new ReaderWriterLockSlim();
+        internal ReaderWriterLockSlim FenceLock = new ReaderWriterLockSlim();
 
-        internal CommandPool NativeCopyCommandPool;
-        internal CommandBuffer NativeCopyCommandBuffer;
+        internal VkCommandPool NativeCopyCommandPool;
+        internal VkCommandBuffer NativeCopyCommandBuffer;
         private NativeResourceCollector nativeResourceCollector;
         private GraphicsResourceLinkCollector graphicsResourceLinkCollector;
 
-        private SharpVulkan.Buffer nativeUploadBuffer;
-        private DeviceMemory nativeUploadBufferMemory;
+        private VkBuffer nativeUploadBuffer;
+        private VkDeviceMemory nativeUploadBufferMemory;
         private IntPtr nativeUploadBufferStart;
         private int nativeUploadBufferSize;
         private int nativeUploadBufferOffset;
 
-        private Queue<KeyValuePair<long, Fence>> nativeFences = new Queue<KeyValuePair<long, Fence>>();
-        private long lastCompletedFence;
+        private List<KeyValuePair<long, VkFence>> nativeFences = new List<KeyValuePair<long, VkFence>>();
+        internal long lastCompletedFence;
         internal long NextFenceValue = 1;
 
         internal HeapPool DescriptorPools;
@@ -64,20 +69,31 @@ public partial class GraphicsDevice
         };
 
         internal Buffer EmptyTexelBuffer;
+        internal Texture EmptyTexture;
 
-        internal PhysicalDevice NativePhysicalDevice => Adapter.GetPhysicalDevice(IsDebugMode);
+        public VkPhysicalDevice NativePhysicalDevice => Adapter.GetPhysicalDevice(IsDebugMode);
+        public VkInstance NativeInstance => GraphicsAdapterFactory.GetInstance(IsDebugMode).NativeInstance;
 
-        internal Instance NativeInstance => GraphicsAdapterFactory.GetInstance(IsDebugMode).NativeInstance;
+        public static volatile int CollectedInfoIndex;
+        public static string[] CollectedInfo = new string[2048];
+
+        public static unsafe void RecordInfo(string info, VkCommandBuffer buffer)
+        {
+            if (buffer == VkCommandBuffer.Null) return; // no buffer
+            int useindex = (Interlocked.Increment(ref CollectedInfoIndex) - 1) % CollectedInfo.Length;
+            CollectedInfo[useindex] = info;
+            vkCmdSetCheckpointNV(buffer, (void*)useindex);
+        }
 
         internal struct BufferInfo
         {
             public long FenceValue;
 
-            public SharpVulkan.Buffer Buffer;
+            public VkBuffer Buffer;
 
-            public DeviceMemory Memory;
+            public VkDeviceMemory Memory;
 
-            public BufferInfo(long fenceValue, SharpVulkan.Buffer buffer, DeviceMemory memory)
+            public BufferInfo(long fenceValue, VkBuffer buffer, VkDeviceMemory memory)
             {
                 FenceValue = fenceValue;
                 Buffer = buffer;
@@ -104,37 +120,6 @@ public GraphicsDeviceStatus GraphicsDeviceStatus
                     return GraphicsDeviceStatus.Reset;
                 }
 
-                //var result = NativeDevice.DeviceRemovedReason;
-                //if (result == SharpDX.DXGI.ResultCode.DeviceRemoved)
-                //{
-                //    return GraphicsDeviceStatus.Removed;
-                //}
-
-                //if (result == SharpDX.DXGI.ResultCode.DeviceReset)
-                //{
-                //    return GraphicsDeviceStatus.Reset;
-                //}
-
-                //if (result == SharpDX.DXGI.ResultCode.DeviceHung)
-                //{
-                //    return GraphicsDeviceStatus.Hung;
-                //}
-
-                //if (result == SharpDX.DXGI.ResultCode.DriverInternalError)
-                //{
-                //    return GraphicsDeviceStatus.InternalError;
-                //}
-
-                //if (result == SharpDX.DXGI.ResultCode.InvalidCall)
-                //{
-                //    return GraphicsDeviceStatus.InvalidCall;
-                //}
-
-                //if (result.Code < 0)
-                //{
-                //    return GraphicsDeviceStatus.Reset;
-                //}
-
                 return GraphicsDeviceStatus.Normal;
             }
         }
@@ -143,7 +128,7 @@ public GraphicsDeviceStatus GraphicsDeviceStatus
         ///     Gets the native device.
         /// </summary>
         /// <value>The native device.</value>
-        internal Device NativeDevice
+        internal VkDevice NativeDevice
         {
             get { return nativeDevice; }
         }
@@ -170,6 +155,16 @@ public void EnableProfile(bool enabledFlag)
         /// </summary>
         public void End()
         {
+            CleanupFences();
+            
+            while(DelayedUnmaps.TryDequeue(out var mem)) {
+                if (SkipUnmap.Contains(mem) == false) {
+                    vkUnmapMemory(NativeDevice, mem);
+                    SkipUnmap.Add(mem);
+                }
+            }
+
+            SkipUnmap.Clear();
         }
 
         /// <summary>
@@ -194,12 +189,16 @@ public unsafe void ExecuteCommandLists(int count, CompiledCommandList[] commandL
             var fenceValue = NextFenceValue++;
 
             // Create a fence
-            var fenceCreateInfo = new FenceCreateInfo { StructureType = StructureType.FenceCreateInfo };
-            var fence = nativeDevice.CreateFence(ref fenceCreateInfo);
-            nativeFences.Enqueue(new KeyValuePair<long, Fence>(fenceValue, fence));
+            var fenceCreateInfo = new VkFenceCreateInfo { sType = VkStructureType.FenceCreateInfo };
+            vkCreateFence(nativeDevice, &fenceCreateInfo, null, out var fence);
+
+            using (FenceLock.WriteLock())
+            {
+                nativeFences.Add(new KeyValuePair<long, VkFence>(fenceValue, fence));
+            }
 
             // Collect resources
-            var commandBuffers = stackalloc CommandBuffer[count];
+            var commandBuffers = stackalloc VkCommandBuffer[count];
             for (int i = 0; i < count; i++)
             {
                 commandBuffers[i] = commandLists[i].NativeCommandBuffer;
@@ -207,22 +206,24 @@ public unsafe void ExecuteCommandLists(int count, CompiledCommandList[] commandL
             }
 
             // Submit commands
-            var pipelineStageFlags = PipelineStageFlags.BottomOfPipe;
-            var presentSemaphoreCopy = presentSemaphore;
-            var submitInfo = new SubmitInfo
-            {
-                StructureType = StructureType.SubmitInfo,
-                CommandBufferCount = (uint)count,
-                CommandBuffers = new IntPtr(commandBuffers),
-                WaitSemaphoreCount = presentSemaphore != Semaphore.Null ? 1U : 0U,
-                WaitSemaphores = new IntPtr(&presentSemaphoreCopy),
-                WaitDstStageMask = new IntPtr(&pipelineStageFlags),
+            var pipelineStageFlags = VkPipelineStageFlags.BottomOfPipe;
+            var submitInfo = new VkSubmitInfo
+            {
+                sType = VkStructureType.SubmitInfo,
+                commandBufferCount = (uint)count,
+                pCommandBuffers = commandBuffers,
+                waitSemaphoreCount = 0U,
+                pWaitSemaphores = null,
+                pWaitDstStageMask = &pipelineStageFlags,
             };
-            NativeCommandQueue.Submit(1, &submitInfo, fence);
 
-            presentSemaphore = Semaphore.Null;
-            nativeResourceCollector.Release();
-            graphicsResourceLinkCollector.Release();
+            using (QueueLock.ReadLock())
+            {
+                vkQueueSubmit(NativeCommandQueue, 1, &submitInfo, fence);
+            }
+
+            nativeResourceCollector.FastRelease();
+            graphicsResourceLinkCollector.FastRelease();
         }
 
         private void InitializePostFeatures()
@@ -247,7 +248,7 @@ public void SimulateReset()
         /// <param name="windowHandle">The window handle.</param>
         private unsafe void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles, DeviceCreationFlags deviceCreationFlags, object windowHandle)
         {
-            if (nativeDevice != Device.Null)
+            if (nativeDevice != VkDevice.Null)
             {
                 // Destroy previous device
                 ReleaseDevice();
@@ -255,14 +256,13 @@ private unsafe void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles,
 
             rendererName = Adapter.Description;
 
-            PhysicalDeviceProperties physicalDeviceProperties;
-            NativePhysicalDevice.GetProperties(out physicalDeviceProperties);
-            ConstantBufferDataPlacementAlignment = (int)physicalDeviceProperties.Limits.MinUniformBufferOffsetAlignment;
-            TimestampFrequency = (long)(1.0e9 / physicalDeviceProperties.Limits.TimestampPeriod); // Resolution in nanoseconds
+            vkGetPhysicalDeviceProperties(NativePhysicalDevice, out var physicalDeviceProperties);
+            ConstantBufferDataPlacementAlignment = (int)physicalDeviceProperties.limits.minUniformBufferOffsetAlignment;
+            TimestampFrequency = (long)(1.0e9 / physicalDeviceProperties.limits.timestampPeriod); // Resolution in nanoseconds
 
             RequestedProfile = graphicsProfiles.Last();
 
-            var queueProperties = NativePhysicalDevice.QueueFamilyProperties;
+            var queueProperties = vkGetPhysicalDeviceQueueFamilyProperties(NativePhysicalDevice);
             //IsProfilingSupported = queueProperties[0].TimestampValidBits > 0;
 
             // Command lists are thread-safe and execute deferred
@@ -270,36 +270,49 @@ private unsafe void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles,
 
             // TODO VULKAN
             // Create Vulkan device based on profile
-            uint queuePriorities = 0;
-            var queueCreateInfo = new DeviceQueueCreateInfo
+            float queuePriorities = 0;
+            var queueCreateInfo = new VkDeviceQueueCreateInfo
             {
-                StructureType = StructureType.DeviceQueueCreateInfo,
-                QueueFamilyIndex = 0,
-                QueueCount = 1,
-                QueuePriorities = new IntPtr(&queuePriorities)
+                sType = VkStructureType.DeviceQueueCreateInfo,
+                queueFamilyIndex = 0,
+                queueCount = 1,
+                pQueuePriorities = &queuePriorities,
             };
 
-            var enabledFeature = new PhysicalDeviceFeatures
+            vkGetPhysicalDeviceFeatures(NativePhysicalDevice, out VkPhysicalDeviceFeatures features);
+
+            var enabledFeature = new VkPhysicalDeviceFeatures
             {
-                FillModeNonSolid = true,
-                ShaderClipDistance = true,
-                ShaderCullDistance = true,
-                SamplerAnisotropy = true,
-                DepthClamp = true,
+                fillModeNonSolid = features.fillModeNonSolid,
+                shaderClipDistance = features.shaderClipDistance,
+                shaderCullDistance = features.shaderCullDistance,
+                samplerAnisotropy = features.samplerAnisotropy,
+                depthClamp = features.depthClamp,
             };
 
-            var extensionProperties = NativePhysicalDevice.GetDeviceExtensionProperties();
+            var extensionProperties = vkEnumerateDeviceExtensionProperties(NativePhysicalDevice, null);
             var availableExtensionNames = new List<string>();
             var desiredExtensionNames = new List<string>();
 
             for (int index = 0; index < extensionProperties.Length; index++)
             {
-                var namePointer = new IntPtr(Interop.Fixed(ref extensionProperties[index].ExtensionName));
-                var name = Marshal.PtrToStringAnsi(namePointer);
-                availableExtensionNames.Add(name);
+                fixed (VkExtensionProperties* extensionPropertiesPtr = extensionProperties)
+                {
+                    var namePointer = new IntPtr(extensionPropertiesPtr[index].extensionName);
+                    var name = Marshal.PtrToStringAnsi(namePointer);
+                    availableExtensionNames.Add(name);
+                }
             }
 
             desiredExtensionNames.Add("VK_KHR_swapchain");
+            desiredExtensionNames.Add("VK_KHR_external_memory");
+            desiredExtensionNames.Add("VK_KHR_external_semaphore");
+            desiredExtensionNames.Add("VK_KHR_dedicated_allocation");
+            desiredExtensionNames.Add("VK_KHR_get_memory_requirements2");
+            desiredExtensionNames.Add("VK_KHR_external_memory_win32");
+            desiredExtensionNames.Add("VK_KHR_win32_keyed_mutex");
+            desiredExtensionNames.Add("VK_NV_device_diagnostic_checkpoints");
+
             if (!availableExtensionNames.Contains("VK_KHR_swapchain"))
                 throw new InvalidOperationException();
 
@@ -309,21 +322,31 @@ private unsafe void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles,
                 IsProfilingSupported = true;
             }
 
+            // take out any extensions not supported
+            for (int i=0; i<desiredExtensionNames.Count; i++)
+            {
+                if (availableExtensionNames.Contains(desiredExtensionNames[i]) == false)
+                {
+                    desiredExtensionNames.RemoveAt(i);
+                    i--;
+                }
+            }
+
             var enabledExtensionNames = desiredExtensionNames.Select(Marshal.StringToHGlobalAnsi).ToArray();
 
             try
             {
-                var deviceCreateInfo = new DeviceCreateInfo
+                var deviceCreateInfo = new VkDeviceCreateInfo
                 {
-                    StructureType = StructureType.DeviceCreateInfo,
-                    QueueCreateInfoCount = 1,
-                    QueueCreateInfos = new IntPtr(&queueCreateInfo),
-                    EnabledExtensionCount = (uint)enabledExtensionNames.Length,
-                    EnabledExtensionNames = enabledExtensionNames.Length > 0 ? new IntPtr(Interop.Fixed(enabledExtensionNames)) : IntPtr.Zero,
-                    EnabledFeatures = new IntPtr(&enabledFeature)
+                    sType = VkStructureType.DeviceCreateInfo,
+                    queueCreateInfoCount = 1,
+                    pQueueCreateInfos = &queueCreateInfo,
+                    enabledExtensionCount = (uint)enabledExtensionNames.Length,
+                    ppEnabledExtensionNames = enabledExtensionNames.Length > 0 ? (byte**)Core.Interop.Fixed(enabledExtensionNames) : null,
+                    pEnabledFeatures = &enabledFeature,
                 };
 
-                nativeDevice = NativePhysicalDevice.CreateDevice(ref deviceCreateInfo);
+                vkCreateDevice(NativePhysicalDevice, &deviceCreateInfo, null, out nativeDevice);
             }
             finally
             {
@@ -333,26 +356,26 @@ private unsafe void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles,
                 }
             }
 
-            NativeCommandQueue = nativeDevice.GetQueue(0, 0);
+            vkGetDeviceQueue(nativeDevice, 0, 0, out NativeCommandQueue);
 
             //// Prepare copy command list (start it closed, so that every new use start with a Reset)
-            var commandPoolCreateInfo = new CommandPoolCreateInfo
+            var commandPoolCreateInfo = new VkCommandPoolCreateInfo
             {
-                StructureType = StructureType.CommandPoolCreateInfo,
-                QueueFamilyIndex = 0, //device.NativeCommandQueue.FamilyIndex
-                Flags = CommandPoolCreateFlags.ResetCommandBuffer
+                sType = VkStructureType.CommandPoolCreateInfo,
+                queueFamilyIndex = 0, //device.NativeCommandQueue.FamilyIndex
+                flags = VkCommandPoolCreateFlags.ResetCommandBuffer
             };
-            NativeCopyCommandPool = NativeDevice.CreateCommandPool(ref commandPoolCreateInfo);
+            vkCreateCommandPool(NativeDevice, &commandPoolCreateInfo, null, out NativeCopyCommandPool);
 
-            var commandBufferAllocationInfo = new CommandBufferAllocateInfo
+            var commandBufferAllocationInfo = new VkCommandBufferAllocateInfo
             {
-                StructureType = StructureType.CommandBufferAllocateInfo,
-                Level = CommandBufferLevel.Primary,
-                CommandPool = NativeCopyCommandPool,
-                CommandBufferCount = 1
+                sType = VkStructureType.CommandBufferAllocateInfo,
+                level = VkCommandBufferLevel.Primary,
+                commandPool = NativeCopyCommandPool,
+                commandBufferCount = 1
             };
-            CommandBuffer nativeCommandBuffer;
-            NativeDevice.AllocateCommandBuffers(ref commandBufferAllocationInfo, &nativeCommandBuffer);
+            VkCommandBuffer nativeCommandBuffer;
+            vkAllocateCommandBuffers(NativeDevice, &commandBufferAllocationInfo, &nativeCommandBuffer);
             NativeCopyCommandBuffer = nativeCommandBuffer;
 
             DescriptorPools = new HeapPool(this);
@@ -361,80 +384,79 @@ private unsafe void InitializePlatformDevice(GraphicsProfile[] graphicsProfiles,
             graphicsResourceLinkCollector = new GraphicsResourceLinkCollector(this);
 
             EmptyTexelBuffer = Buffer.Typed.New(this, 1, PixelFormat.R32G32B32A32_Float);
-        }
-        internal unsafe IntPtr AllocateUploadBuffer(int size, out SharpVulkan.Buffer resource, out int offset)
-        {
-            // TODO D3D12 thread safety, should we simply use locks?
-            if (nativeUploadBuffer == SharpVulkan.Buffer.Null || nativeUploadBufferOffset + size > nativeUploadBufferSize)
+            EmptyTexture = Texture.New2D(this, 1, 1, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.ShaderResource);
+
+            // prepare upload buffer now
+            // Allocate buffer that will be recycled
+            nativeUploadBufferSize = Buffer.UploadBufferSizeInMB * 1024 * 1024;
+
+            var bufferCreateInfo = new VkBufferCreateInfo
             {
-                if (nativeUploadBuffer != SharpVulkan.Buffer.Null)
-                {
-                    NativeDevice.UnmapMemory(nativeUploadBufferMemory);
-                    Collect(nativeUploadBuffer);
-                    Collect(nativeUploadBufferMemory);
-                }
+                sType = VkStructureType.BufferCreateInfo,
+                size = (ulong)nativeUploadBufferSize,
+                flags = VkBufferCreateFlags.None,
+                usage = VkBufferUsageFlags.TransferSrc,
+            };
+            vkCreateBuffer(NativeDevice, &bufferCreateInfo, null, out nativeUploadBuffer);
+            AllocateMemory(VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent);
 
-                // Allocate new buffer
-                // TODO D3D12 recycle old ones (using fences to know when GPU is done with them)
-                // TODO D3D12 ResourceStates.CopySource not working?
-                nativeUploadBufferSize = Math.Max(4 * 1024 * 1024, size);
+            fixed (IntPtr* nativeUploadBufferStartPtr = &nativeUploadBufferStart)
+                vkMapMemory(NativeDevice, nativeUploadBufferMemory, 0, (ulong)nativeUploadBufferSize, VkMemoryMapFlags.None, (void**)nativeUploadBufferStartPtr);
 
-                var bufferCreateInfo = new BufferCreateInfo
-                {
-                    StructureType = StructureType.BufferCreateInfo,
-                    Size = (ulong)nativeUploadBufferSize,
-                    Flags = BufferCreateFlags.None,
-                    Usage = BufferUsageFlags.TransferSource,
-                };
-                nativeUploadBuffer = NativeDevice.CreateBuffer(ref bufferCreateInfo);
-                AllocateMemory(MemoryPropertyFlags.HostVisible | MemoryPropertyFlags.HostCoherent);
+            nativeUploadBufferOffset = 0;
+        }
 
-                nativeUploadBufferStart = NativeDevice.MapMemory(nativeUploadBufferMemory, 0, (ulong)nativeUploadBufferSize, MemoryMapFlags.None);
-                nativeUploadBufferOffset = 0;
-            }
+        internal object uploadBufferLocker = new object();
+        internal unsafe IntPtr AllocateUploadBuffer(int size, out VkBuffer resource, out int offset)
+        {
+            resource = nativeUploadBuffer;
 
             // Bump allocate
-            resource = nativeUploadBuffer;
-            offset = nativeUploadBufferOffset;
-            nativeUploadBufferOffset += size;
+            lock (uploadBufferLocker)
+            {
+                if (nativeUploadBufferOffset + size > nativeUploadBufferSize)
+                    nativeUploadBufferOffset = 0; // start from the beginning of the buffer
+
+                offset = nativeUploadBufferOffset;
+                nativeUploadBufferOffset += size;
+            }
+
             return nativeUploadBufferStart + offset;
         }
 
-        protected unsafe void AllocateMemory(MemoryPropertyFlags memoryProperties)
+        protected unsafe void AllocateMemory(VkMemoryPropertyFlags memoryProperties)
         {
-            MemoryRequirements memoryRequirements;
-            NativeDevice.GetBufferMemoryRequirements(nativeUploadBuffer, out memoryRequirements);
+            vkGetBufferMemoryRequirements(nativeDevice, nativeUploadBuffer, out var memoryRequirements);
 
-            if (memoryRequirements.Size == 0)
+            if (memoryRequirements.size == 0)
                 return;
 
-            var allocateInfo = new MemoryAllocateInfo
+            var allocateInfo = new VkMemoryAllocateInfo
             {
-                StructureType = StructureType.MemoryAllocateInfo,
-                AllocationSize = memoryRequirements.Size,
+                sType = VkStructureType.MemoryAllocateInfo,
+                allocationSize = memoryRequirements.size,
             };
 
-            PhysicalDeviceMemoryProperties physicalDeviceMemoryProperties;
-            NativePhysicalDevice.GetMemoryProperties(out physicalDeviceMemoryProperties);
-            var typeBits = memoryRequirements.MemoryTypeBits;
-            for (uint i = 0; i < physicalDeviceMemoryProperties.MemoryTypeCount; i++)
+            vkGetPhysicalDeviceMemoryProperties(NativePhysicalDevice, out var physicalDeviceMemoryProperties);
+            var typeBits = memoryRequirements.memoryTypeBits;
+            for (uint i = 0; i < physicalDeviceMemoryProperties.memoryTypeCount; i++)
             {
                 if ((typeBits & 1) == 1)
                 {
                     // Type is available, does it match user properties?
-                    var memoryType = *((MemoryType*)&physicalDeviceMemoryProperties.MemoryTypes + i);
-                    if ((memoryType.PropertyFlags & memoryProperties) == memoryProperties)
+                    var memoryType = *(&physicalDeviceMemoryProperties.memoryTypes_0 + i);
+                    if ((memoryType.propertyFlags & memoryProperties) == memoryProperties)
                     {
-                        allocateInfo.MemoryTypeIndex = i;
+                        allocateInfo.memoryTypeIndex = i;
                         break;
                     }
                 }
                 typeBits >>= 1;
             }
 
-            nativeUploadBufferMemory = NativeDevice.AllocateMemory(ref allocateInfo);
+            vkAllocateMemory(NativeDevice, &allocateInfo, null, out nativeUploadBufferMemory);
 
-            NativeDevice.BindBufferMemory(nativeUploadBuffer, nativeUploadBufferMemory, 0);
+            vkBindBufferMemory(NativeDevice, nativeUploadBuffer, nativeUploadBufferMemory, 0);
         }
 
         private void AdjustDefaultPipelineStateDescription(ref PipelineStateDescription pipelineStateDescription)
@@ -451,29 +473,32 @@ private unsafe void ReleaseDevice()
             EmptyTexelBuffer.Dispose();
             EmptyTexelBuffer = null;
 
+            EmptyTexture.Dispose();
+            EmptyTexture = null;
+
             // Wait for all queues to be idle
-            nativeDevice.WaitIdle();
+            vkDeviceWaitIdle(nativeDevice);
 
             // Destroy all remaining fences
             GetCompletedValue();
 
             // Mark upload buffer for destruction
-            if (nativeUploadBuffer != SharpVulkan.Buffer.Null)
+            if (nativeUploadBuffer != VkBuffer.Null)
             {
-                NativeDevice.UnmapMemory(nativeUploadBufferMemory);
+                vkUnmapMemory(NativeDevice, nativeUploadBufferMemory);
                 nativeResourceCollector.Add(lastCompletedFence, nativeUploadBuffer);
                 nativeResourceCollector.Add(lastCompletedFence, nativeUploadBufferMemory);
 
-                nativeUploadBuffer = SharpVulkan.Buffer.Null;
-                nativeUploadBufferMemory = DeviceMemory.Null;
+                nativeUploadBuffer = VkBuffer.Null;
+                nativeUploadBufferMemory = VkDeviceMemory.Null;
             }
 
             // Release fenced resources
             nativeResourceCollector.Dispose();
             DescriptorPools.Dispose();
 
-            nativeDevice.DestroyCommandPool(NativeCopyCommandPool);
-            nativeDevice.Destroy();
+            vkDestroyCommandPool(nativeDevice, NativeCopyCommandPool, null);
+            vkDestroyDevice(nativeDevice, null);
         }
 
         internal void OnDestroyed()
@@ -482,44 +507,41 @@ internal void OnDestroyed()
 
         internal unsafe long ExecuteCommandListInternal(CompiledCommandList commandList)
         {
-            //if (nativeUploadBuffer != SharpVulkan.Buffer.Null)
-            //{
-            //    NativeDevice.UnmapMemory(nativeUploadBufferMemory);
-            //    TemporaryResources.Enqueue(new BufferInfo(NextFenceValue, nativeUploadBuffer, nativeUploadBufferMemory));
-
-            //    nativeUploadBuffer = SharpVulkan.Buffer.Null;
-            //    nativeUploadBufferMemory = DeviceMemory.Null;
-            //}
-
             var fenceValue = NextFenceValue++;
 
             // Create new fence
-            var fenceCreateInfo = new FenceCreateInfo { StructureType = StructureType.FenceCreateInfo };
-            var fence = nativeDevice.CreateFence(ref fenceCreateInfo);
-            nativeFences.Enqueue(new KeyValuePair<long, Fence>(fenceValue, fence));
+            var fenceCreateInfo = new VkFenceCreateInfo { sType = VkStructureType.FenceCreateInfo };
+            vkCreateFence(nativeDevice, &fenceCreateInfo, null, out var fence);
+
+            using (FenceLock.WriteLock())
+            {
+                nativeFences.Add(new KeyValuePair<long, VkFence>(fenceValue, fence));
+            }
 
             // Collect resources
             RecycleCommandListResources(commandList, fenceValue);
 
             // Submit commands
             var nativeCommandBufferCopy = commandList.NativeCommandBuffer;
-            var pipelineStageFlags = PipelineStageFlags.BottomOfPipe;
+            var pipelineStageFlags = VkPipelineStageFlags.BottomOfPipe;
 
-            var presentSemaphoreCopy = presentSemaphore;
-            var submitInfo = new SubmitInfo
+            var submitInfo = new VkSubmitInfo
             {
-                StructureType = StructureType.SubmitInfo,
-                CommandBufferCount = 1,
-                CommandBuffers = new IntPtr(&nativeCommandBufferCopy),
-                WaitSemaphoreCount = presentSemaphore != Semaphore.Null ? 1U : 0U,
-                WaitSemaphores = new IntPtr(&presentSemaphoreCopy),
-                WaitDstStageMask = new IntPtr(&pipelineStageFlags),
+                sType = VkStructureType.SubmitInfo,
+                commandBufferCount = 1,
+                pCommandBuffers = &nativeCommandBufferCopy,
+                waitSemaphoreCount = 0U,
+                pWaitSemaphores = null,
+                pWaitDstStageMask = &pipelineStageFlags,
             };
-            NativeCommandQueue.Submit(1, &submitInfo, fence);
 
-            presentSemaphore = Semaphore.Null;
-            nativeResourceCollector.Release();
-            graphicsResourceLinkCollector.Release();
+            using (QueueLock.ReadLock())
+            {
+                vkQueueSubmit(NativeCommandQueue, 1, &submitInfo, fence);
+            }
+
+            nativeResourceCollector.FastRelease();
+            graphicsResourceLinkCollector.FastRelease();
 
             return fenceValue;
         }
@@ -557,29 +579,68 @@ internal bool IsFenceCompleteInternal(long fenceValue)
             return fenceValue <= lastCompletedFence;
         }
 
-        private SpinLock spinLock = new SpinLock();
+        internal Queue<VkFence> fencesToDestroy = new Queue<VkFence>();
+        internal unsafe void CleanupFences()
+        {
+            using (FenceLock.WriteLock())
+            {
+                for (int i=0; i<nativeFences.Count; i++)
+                {
+                    if (nativeFences[i].Key <= lastCompletedFence)
+                    {
+                        fencesToDestroy.Enqueue(nativeFences[i].Value);
+                        nativeFences.RemoveAt(i);
+                        i--;
+                    }
+                }
+            }
+
+            while (fencesToDestroy.Count > 0)
+                vkDestroyFence(NativeDevice, fencesToDestroy.Dequeue(), null);
+        }
 
         internal unsafe long GetCompletedValue()
         {
-            bool lockTaken = false;
-            try
+            using (FenceLock.ReadLock())
             {
-                spinLock.Enter(ref lockTaken);
-
-                while (nativeFences.Count > 0 && NativeDevice.GetFenceStatus(nativeFences.Peek().Value) == Result.Success)
+                for (int i=0; i<nativeFences.Count; i++)
                 {
-                    var fence = nativeFences.Dequeue();
-                    NativeDevice.DestroyFence(fence.Value);
-                    lastCompletedFence = Math.Max(lastCompletedFence, fence.Key);
+                    if (nativeFences[i].Key <= lastCompletedFence)
+                        continue;
+
+                    var gfs = Xenko.Graphics.SDL.Window._GenerateVulkanDeviceLostCrash ? VkResult.ErrorDeviceLost : vkGetFenceStatus(NativeDevice, nativeFences[i].Value);
+                    switch (gfs)
+                    {
+                        default:
+                            return lastCompletedFence;
+                        case VkResult.ErrorDeviceLost:
+                            // god fucking dammit
+                            Xenko.Graphics.SDL.Window.GenerateGenericInfo("Vulkan device lost! Trying to gather more info...", "Device Lost");
+                            uint datalen = 0;
+                            vkGetQueueCheckpointDataNV(NativeCommandQueue, &datalen, (VkCheckpointDataNV*)0);
+                            VkCheckpointDataNV[] data = new VkCheckpointDataNV[datalen];
+                            for (int j = 0; j < data.Length; j++) data[j].sType = VkStructureType.CheckpointDataNV;
+                            fixed (VkCheckpointDataNV* ptr = data)
+                            {
+                                vkGetQueueCheckpointDataNV(NativeCommandQueue, &datalen, ptr);
+                            }
+                            string log = "";
+                            foreach(VkCheckpointDataNV cp in data)
+                            {
+                                int index = (int)cp.pCheckpointMarker;
+                                log += index.ToString() + ": " + CollectedInfo[index] + " Stage: " + cp.stage.ToString() + "\n";
+                            }
+                            Xenko.Graphics.SDL.Window.GenerateGenericInfo(log, "Device Lost Log");
+                            throw new Exception("Vulkan device lost while checking GetCompletedValue()! Log:\n" + log);
+                        case VkResult.Success:
+                            if (nativeFences[i].Key > lastCompletedFence)
+                                lastCompletedFence = nativeFences[i].Key;
+                            break;
+                    }                    
                 }
 
                 return lastCompletedFence;
             }
-            finally
-            {
-                if (lockTaken)
-                    spinLock.Exit(false);
-            }
         }
 
         internal unsafe void WaitForFenceInternal(long fenceValue)
@@ -587,29 +648,22 @@ internal unsafe void WaitForFenceInternal(long fenceValue)
             if (IsFenceCompleteInternal(fenceValue))
                 return;
 
-            // TODO D3D12 in case of concurrency, this lock could end up blocking too long a second thread with lower fenceValue then first one
-            lock (nativeFences)
+            using (FenceLock.ReadLock())
             {
-                while (nativeFences.Count > 0 && nativeFences.Peek().Key <= fenceValue)
+                for (int i=0; i<nativeFences.Count; i++)
                 {
-                    var fence = nativeFences.Dequeue();
-                    var fenceCopy = fence.Value;
+                    if (nativeFences[i].Key <= fenceValue)
+                    {
+                        var fenceCopy = nativeFences[i].Value;
 
-                    NativeDevice.WaitForFences(1, &fenceCopy, true, ulong.MaxValue);
-                    NativeDevice.DestroyFence(fence.Value);
-                    lastCompletedFence = fenceValue;
-                }
-            }
-        }
+                        vkWaitForFences(NativeDevice, 1, &fenceCopy, 1, ulong.MaxValue);
 
-        private Semaphore presentSemaphore;
+                        if (fenceValue > lastCompletedFence)
+                            lastCompletedFence = fenceValue;
+                    }
+                }
 
-        public unsafe Semaphore GetNextPresentSemaphore()
-        {
-            var createInfo = new SemaphoreCreateInfo { StructureType = StructureType.SemaphoreCreateInfo };
-            presentSemaphore = NativeDevice.CreateSemaphore(ref createInfo);
-            Collect(presentSemaphore);
-            return presentSemaphore;
+            }
         }
 
         internal void Collect(NativeResource nativeResource)
@@ -647,42 +701,84 @@ internal void TagResource(GraphicsResourceLink resourceLink)
         }
     }
 
-    internal abstract class ResourcePool<T> : ComponentBase
+   internal abstract class ResourcePool<T> : ComponentBase
     {
+        private const int CHECK_COMPLETED_INTERVAL = 12;
+
         protected readonly GraphicsDevice GraphicsDevice;
+        private static int checkCompleted;
+        private SpinLock spinLock = new SpinLock();
         private readonly Queue<KeyValuePair<long, T>> liveObjects = new Queue<KeyValuePair<long, T>>();
 
         protected ResourcePool(GraphicsDevice graphicsDevice)
         {
             GraphicsDevice = graphicsDevice;
+            checkCompleted = 0;
         }
 
         public T GetObject()
         {
-            lock (liveObjects)
+            KeyValuePair<long, T>? firstAllocator = null;
+
+            if (Interlocked.Increment(ref checkCompleted) == CHECK_COMPLETED_INTERVAL)
+            {
+                // this check is slow, so only do it occassionally
+                // this may cause more objects to get created, but that is fine
+                // more things will come safely off the queue when this updates
+                GraphicsDevice.GetCompletedValue();
+
+                // only start counting for another one when we were done with the above
+                checkCompleted = 0;
+            }
+
+            bool lockTaken = false;
+            try
             {
-                // Check if first allocator is ready for reuse
+                spinLock.Enter(ref lockTaken);
+
                 if (liveObjects.Count > 0)
                 {
-                    var firstAllocator = liveObjects.Peek();
-                    if (firstAllocator.Key <= GraphicsDevice.GetCompletedValue())
+                    firstAllocator = liveObjects.Peek();
+
+                    if (firstAllocator.Value.Key < GraphicsDevice.lastCompletedFence)
                     {
                         liveObjects.Dequeue();
-                        ResetObject(firstAllocator.Value);
-                        return firstAllocator.Value;
+                    }
+                    else
+                    {
+                        firstAllocator = null;
                     }
                 }
+            }
+            finally
+            {
+                if (lockTaken)
+                    spinLock.Exit(true);
+            }
 
-                return CreateObject();
+            if (firstAllocator.HasValue)
+            {
+                ResetObject(firstAllocator.Value.Value);
+                return firstAllocator.Value.Value;
             }
+
+            return CreateObject();
         }
 
         public void RecycleObject(long fenceValue, T obj)
         {
-            lock (liveObjects)
+            bool lockTaken = false;
+            try
             {
+                spinLock.Enter(ref lockTaken);
+
                 liveObjects.Enqueue(new KeyValuePair<long, T>(fenceValue, obj));
             }
+            finally
+            {
+                if (lockTaken)
+                    spinLock.Exit(true);
+            }
         }
 
         protected abstract T CreateObject();
@@ -693,160 +789,191 @@ protected virtual void DestroyObject(T obj)
         {
         }
 
-        protected override void Destroy()
-        {
-            lock (liveObjects)
-            { 
-                foreach (var item in liveObjects)
+        public void ResetAll() {
+            while (true)
+            {
+                KeyValuePair<long, T>? toremove = null;
+
+                bool lockTaken = false;
+                try
+                {
+                    spinLock.Enter(ref lockTaken);
+
+                    if (liveObjects.Count == 0) return;
+
+                    toremove = liveObjects.Dequeue();
+                }
+                finally
                 {
-                    DestroyObject(item.Value);
+                    if (lockTaken)
+                        spinLock.Exit(true);
                 }
+
+                DestroyObject(toremove.Value.Value);
             }
+        }
 
+        protected override void Destroy()
+        {
+            ResetAll();
             base.Destroy();
         }
     }
 
-    internal class CommandBufferPool : ResourcePool<CommandBuffer>
+    internal class CommandBufferPool : ResourcePool<VkCommandBuffer>
     {
-        private readonly CommandPool commandPool;
+        private readonly VkCommandPool commandPool;
 
         public unsafe CommandBufferPool(GraphicsDevice graphicsDevice) : base(graphicsDevice)
         {
-            var commandPoolCreateInfo = new CommandPoolCreateInfo
+            var commandPoolCreateInfo = new VkCommandPoolCreateInfo
             {
-                StructureType = StructureType.CommandPoolCreateInfo,
-                QueueFamilyIndex = 0, //device.NativeCommandQueue.FamilyIndex
-                Flags = CommandPoolCreateFlags.ResetCommandBuffer
+                sType = VkStructureType.CommandPoolCreateInfo,
+                queueFamilyIndex = 0, //device.NativeCommandQueue.FamilyIndex
+                flags = VkCommandPoolCreateFlags.ResetCommandBuffer
             };
 
-            commandPool = graphicsDevice.NativeDevice.CreateCommandPool(ref commandPoolCreateInfo);
+            vkCreateCommandPool(graphicsDevice.NativeDevice, &commandPoolCreateInfo, null, out commandPool);
         }
 
-        protected override unsafe CommandBuffer CreateObject()
+        protected override unsafe VkCommandBuffer CreateObject()
         {
             // No allocator ready to be used, let's create a new one
-            var commandBufferAllocationInfo = new CommandBufferAllocateInfo
+            var commandBufferAllocationInfo = new VkCommandBufferAllocateInfo
             {
-                StructureType = StructureType.CommandBufferAllocateInfo,
-                Level = CommandBufferLevel.Primary,
-                CommandPool = commandPool,
-                CommandBufferCount = 1,
+                sType = VkStructureType.CommandBufferAllocateInfo,
+                level = VkCommandBufferLevel.Primary,
+                commandPool = commandPool,
+                commandBufferCount = 1,
             };
 
-            CommandBuffer commandBuffer;
-            GraphicsDevice.NativeDevice.AllocateCommandBuffers(ref commandBufferAllocationInfo, &commandBuffer);
+            VkCommandBuffer commandBuffer;
+            vkAllocateCommandBuffers(GraphicsDevice.NativeDevice, &commandBufferAllocationInfo, &commandBuffer);
             return commandBuffer;
         }
 
-        protected override void ResetObject(CommandBuffer obj)
+        protected override void ResetObject(VkCommandBuffer obj)
         {
-            obj.Reset(CommandBufferResetFlags.None);
+            vkResetCommandBuffer(obj, VkCommandBufferResetFlags.None);
         }
 
         protected override unsafe void Destroy()
         {
             base.Destroy();
 
-            GraphicsDevice.NativeDevice.DestroyCommandPool(commandPool);
+            vkDestroyCommandPool(GraphicsDevice.NativeDevice, commandPool, null);
         }
     }
 
-    internal class HeapPool : ResourcePool<SharpVulkan.DescriptorPool>
+    internal class HeapPool : ResourcePool<VkDescriptorPool>
     {
         public HeapPool(GraphicsDevice graphicsDevice) : base(graphicsDevice)
         {
         }
 
-        protected override unsafe SharpVulkan.DescriptorPool CreateObject()
+        protected override unsafe VkDescriptorPool CreateObject()
         {
             // No allocator ready to be used, let's create a new one
             var poolSizes = GraphicsDevice.MaxDescriptorTypeCounts
-                .Select((count, index) => new DescriptorPoolSize { Type = (DescriptorType)index, DescriptorCount = count })
-                .Where(size => size.DescriptorCount > 0)
+                .Select((count, index) => new VkDescriptorPoolSize { type = (VkDescriptorType)index, descriptorCount = count })
+                .Where(size => size.descriptorCount > 0)
                 .ToArray();
 
-            var descriptorPoolCreateInfo = new DescriptorPoolCreateInfo
+            var descriptorPoolCreateInfo = new VkDescriptorPoolCreateInfo
             {
-                StructureType = StructureType.DescriptorPoolCreateInfo,
-                PoolSizeCount = (uint)poolSizes.Length,
-                PoolSizes = new IntPtr(Interop.Fixed(poolSizes)),
-                MaxSets = GraphicsDevice.MaxDescriptorSetCount,
+                sType = VkStructureType.DescriptorPoolCreateInfo,
+                poolSizeCount = (uint)poolSizes.Length,
+                pPoolSizes = (VkDescriptorPoolSize*)Core.Interop.Fixed(poolSizes),
+                maxSets = GraphicsDevice.MaxDescriptorSetCount,
             };
-            return GraphicsDevice.NativeDevice.CreateDescriptorPool(ref descriptorPoolCreateInfo);
+            vkCreateDescriptorPool(GraphicsDevice.NativeDevice, &descriptorPoolCreateInfo, null, out var descriptorPool);
+            return descriptorPool;
         }
 
-        protected override void ResetObject(SharpVulkan.DescriptorPool obj)
+        protected override void ResetObject(VkDescriptorPool obj)
         {
-            GraphicsDevice.NativeDevice.ResetDescriptorPool(obj, DescriptorPoolResetFlags.None);
+            vkResetDescriptorPool(GraphicsDevice.NativeDevice, obj, VkDescriptorPoolResetFlags.None);
         }
 
-        protected override unsafe void DestroyObject(SharpVulkan.DescriptorPool obj)
+        protected override unsafe void DestroyObject(VkDescriptorPool obj)
         {
-            GraphicsDevice.NativeDevice.DestroyDescriptorPool(obj);
+            vkDestroyDescriptorPool(GraphicsDevice.NativeDevice, obj, null);
         }
     }
 
-    internal struct NativeResource
+    internal struct NativeResource : IEquatable<NativeResource>
     {
-        public DebugReportObjectType type;
+        public VkDebugReportObjectTypeEXT type;
 
         public ulong handle;
 
-        public NativeResource(DebugReportObjectType type, ulong handle)
+        public bool Equals(NativeResource other) {
+            return handle == other.handle;
+        }
+
+        public override bool Equals(object other) {
+            if (other == null || other is NativeResource == false) return false;
+            return Equals((NativeResource)other);
+        }
+
+        public override int GetHashCode() {
+            return handle.GetHashCode();
+        }
+
+        public NativeResource(VkDebugReportObjectTypeEXT type, ulong handle)
         {
             this.type = type;
             this.handle = handle;
         }
 
-        public static unsafe implicit operator NativeResource(SharpVulkan.Buffer handle)
+        public static unsafe implicit operator NativeResource(VkBuffer handle)
         {
-            return new NativeResource(DebugReportObjectType.Buffer, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.Buffer, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(BufferView handle)
+        public static unsafe implicit operator NativeResource(VkBufferView handle)
         {
-            return new NativeResource(DebugReportObjectType.BufferView, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.BufferView, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(SharpVulkan.Image handle)
+        public static unsafe implicit operator NativeResource(VkImage handle)
         {
-            return new NativeResource(DebugReportObjectType.Image, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.Image, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(ImageView handle)
+        public static unsafe implicit operator NativeResource(VkImageView handle)
         {
-            return new NativeResource(DebugReportObjectType.ImageView, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.ImageView, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(DeviceMemory handle)
+        public static unsafe implicit operator NativeResource(VkDeviceMemory handle)
         {
-            return new NativeResource(DebugReportObjectType.DeviceMemory, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.DeviceMemory, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(Sampler handle)
+        public static unsafe implicit operator NativeResource(VkSampler handle)
         {
-            return new NativeResource(DebugReportObjectType.Sampler, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.Sampler, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(Framebuffer handle)
+        public static unsafe implicit operator NativeResource(VkFramebuffer handle)
         {
-            return new NativeResource(DebugReportObjectType.Framebuffer, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.Framebuffer, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(Semaphore handle)
+        public static unsafe implicit operator NativeResource(VkSemaphore handle)
         {
-            return new NativeResource(DebugReportObjectType.Semaphore, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.Semaphore, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(Fence handle)
+        public static unsafe implicit operator NativeResource(VkFence handle)
         {
-            return new NativeResource(DebugReportObjectType.Fence, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.Fence, *(ulong*)&handle);
         }
 
-        public static unsafe implicit operator NativeResource(SharpVulkan.QueryPool handle)
+        public static unsafe implicit operator NativeResource(VkQueryPool handle)
         {
-            return new NativeResource(DebugReportObjectType.QueryPool, *(ulong*)&handle);
+            return new NativeResource(VkDebugReportObjectTypeEXT.QueryPool, *(ulong*)&handle);
         }
 
         public unsafe void Destroy(GraphicsDevice device)
@@ -855,35 +982,35 @@ public unsafe void Destroy(GraphicsDevice device)
 
             switch (type)
             {
-                case DebugReportObjectType.Buffer:
-                    device.NativeDevice.DestroyBuffer(*(SharpVulkan.Buffer*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.Buffer:
+                    vkDestroyBuffer(device.NativeDevice, *(VkBuffer*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.BufferView:
-                    device.NativeDevice.DestroyBufferView(*(BufferView*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.BufferView:
+                    vkDestroyBufferView(device.NativeDevice, *(VkBufferView*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.Image:
-                    device.NativeDevice.DestroyImage(*(SharpVulkan.Image*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.Image:
+                    vkDestroyImage(device.NativeDevice, *(VkImage*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.ImageView:
-                    device.NativeDevice.DestroyImageView(*(ImageView*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.ImageView:
+                    vkDestroyImageView(device.NativeDevice, *(VkImageView*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.DeviceMemory:
-                    device.NativeDevice.FreeMemory(*(DeviceMemory*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.DeviceMemory:
+                    vkFreeMemory(device.NativeDevice, *(VkDeviceMemory*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.Sampler:
-                    device.NativeDevice.DestroySampler(*(Sampler*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.Sampler:
+                    vkDestroySampler(device.NativeDevice, *(VkSampler*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.Framebuffer:
-                    device.NativeDevice.DestroyFramebuffer(*(Framebuffer*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.Framebuffer:
+                    vkDestroyFramebuffer(device.NativeDevice, *(VkFramebuffer*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.Semaphore:
-                    device.NativeDevice.DestroySemaphore(*(Semaphore*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.Semaphore:
+                    vkDestroySemaphore(device.NativeDevice, *(VkSemaphore*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.Fence:
-                    device.NativeDevice.DestroyFence(*(Fence*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.Fence:
+                    vkDestroyFence(device.NativeDevice, *(VkFence*)&handleCopy, null);
                     break;
-                case DebugReportObjectType.QueryPool:
-                    device.NativeDevice.DestroyQueryPool(*(SharpVulkan.QueryPool*)&handleCopy);
+                case VkDebugReportObjectTypeEXT.QueryPool:
+                    vkDestroyQueryPool(device.NativeDevice, *(VkQueryPool*)&handleCopy, null);
                     break;
             }
         }
@@ -916,7 +1043,7 @@ protected override void ReleaseObject(NativeResource item)
     internal abstract class TemporaryResourceCollector<T> : IDisposable
     {
         protected readonly GraphicsDevice GraphicsDevice;
-        private readonly Queue<KeyValuePair<long, T>> items = new Queue<KeyValuePair<long, T>>();
+        private readonly ConcurrentDictionary<T, long> items = new ConcurrentDictionary<T, long>();
 
         protected TemporaryResourceCollector(GraphicsDevice graphicsDevice)
         {
@@ -925,19 +1052,18 @@ protected TemporaryResourceCollector(GraphicsDevice graphicsDevice)
 
         public void Add(long fenceValue, T item)
         {
-            lock (items)
-            {
-                items.Enqueue(new KeyValuePair<long, T>(fenceValue, item));
-            }
+            items[item] = fenceValue;
         }
 
-        public void Release()
+        // only releases things that are easy to determine
+        public void FastRelease()
         {
-            lock (items)
+            foreach (var pair in items)
             {
-                while (items.Count > 0 && GraphicsDevice.IsFenceCompleteInternal(items.Peek().Key))
+                if (pair.Value <= GraphicsDevice.lastCompletedFence) 
                 {
-                    ReleaseObject(items.Dequeue().Value);
+                    ReleaseObject(pair.Key);
+                    items.TryRemove(pair.Key, out _);
                 }
             }
         }
@@ -946,10 +1072,10 @@ public void Release()
 
         public void Dispose()
         {
-            while (items.Count > 0)
-            {
-                ReleaseObject(items.Dequeue().Value);
+            foreach (T tr in items.Keys) {
+                ReleaseObject(tr);
             }
+            items.Clear();
         }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsDeviceFeatures.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsDeviceFeatures.Vulkan.cs
index dc88029574..fcf92f6b6b 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsDeviceFeatures.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsDeviceFeatures.Vulkan.cs
@@ -3,7 +3,8 @@
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
 using System.Collections.Generic;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsOutput.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsOutput.Vulkan.cs
index 5d75929c79..3be71ee362 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsOutput.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsOutput.Vulkan.cs
@@ -3,7 +3,8 @@
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
 using System.Collections.Generic;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 using Xenko.Core;
 using Xenko.Core.Mathematics;
@@ -19,7 +20,7 @@ namespace Xenko.Graphics
     /// <unmanaged-short>IDXGIOutput</unmanaged-short>	
     public partial class GraphicsOutput
     {
-        private readonly DisplayProperties displayProperties;
+        private readonly VkDisplayPropertiesKHR displayProperties;
         private readonly int outputIndex;
 
         /// <summary>
@@ -29,14 +30,14 @@ public partial class GraphicsOutput
         /// <param name="outputIndex">Index of the output.</param>
         /// <exception cref="System.ArgumentNullException">output</exception>
         /// <exception cref="ArgumentOutOfRangeException">output</exception>
-        internal GraphicsOutput(GraphicsAdapter adapter, DisplayProperties displayProperties, int outputIndex)
+        internal GraphicsOutput(GraphicsAdapter adapter, VkDisplayPropertiesKHR displayProperties, int outputIndex)
         {
             if (adapter == null) throw new ArgumentNullException("adapter");
 
             this.outputIndex = outputIndex;
             this.displayProperties = displayProperties;
 
-            desktopBounds = new Rectangle(0, 0, (int)displayProperties.PhysicalResolution.Width, (int)displayProperties.PhysicalResolution.Height);
+            desktopBounds = new Rectangle(0, 0, (int)displayProperties.physicalResolution.width, (int)displayProperties.physicalResolution.height);
         }
 
         /// <summary>
@@ -51,39 +52,6 @@ public DisplayMode FindClosestMatchingDisplayMode(GraphicsProfile[] targetProfil
         {
             if (targetProfiles == null) throw new ArgumentNullException("targetProfiles");
 
-            // TODO VULKAN
-
-            //ModeDescription closestDescription;
-            //SharpDX.Direct3D12.Device deviceTemp = null;
-            //for (int i = 0; i < targetProfiles.Length; i++)
-            //{
-            //    // Create Device D3D12 with feature Level based on profile
-            //    try
-            //    {
-            //        deviceTemp = new SharpDX.Direct3D12.Device(Adapter.NativeAdapter, (FeatureLevel)targetProfiles[i]);
-            //        break;
-            //    }
-            //    catch (Exception)
-            //    {
-            //    }
-            //}
-
-            //if (deviceTemp == null)
-            //    throw new InvalidOperationException("Could not create D3D12 graphics device");
-
-            //var description = new SharpDX.DXGI.ModeDescription()
-            //{
-            //    Width = mode.Width,
-            //    Height = mode.Height,
-            //    RefreshRate = mode.RefreshRate.ToSharpDX(),
-            //    Format = (SharpDX.DXGI.Format)mode.Format,
-            //    Scaling = DisplayModeScaling.Unspecified,
-            //    ScanlineOrdering = DisplayModeScanlineOrder.Unspecified
-            //};
-            //using (var device = deviceTemp)
-            //    output.GetClosestMatchingMode(device, description, out closestDescription);
-
-            //return DisplayMode.FromDescription(closestDescription);
             return mode;
         }
 
@@ -95,18 +63,6 @@ public DisplayMode FindClosestMatchingDisplayMode(GraphicsProfile[] targetProfil
         /// <unmanaged-short>HMONITOR Monitor</unmanaged-short>	
         public IntPtr MonitorHandle { get { return IntPtr.Zero; } }
 
-        /// <summary>
-        /// Gets the native output.
-        /// </summary>
-        /// <value>The native output.</value>
-        //internal Output NativeOutput
-        //{
-        //    get
-        //    {
-        //        return output;
-        //    }
-        //}
-
         /// <summary>
         /// Enumerates all available display modes for this output and stores them in <see cref="SupportedDisplayModes"/>.
         /// </summary>
@@ -115,50 +71,6 @@ private void InitializeSupportedDisplayModes()
             var modesAvailable = new List<DisplayMode>();
             var modesMap = new Dictionary<string, DisplayMode>();
 
-//#if DIRECTX11_1
-//            var output1 = output.QueryInterface<Output1>();
-//#endif
-
-//            try
-//            {
-//                const DisplayModeEnumerationFlags displayModeEnumerationFlags = DisplayModeEnumerationFlags.Interlaced | DisplayModeEnumerationFlags.Scaling;
-
-//                foreach (var format in Enum.GetValues(typeof(SharpDX.DXGI.Format)))
-//                {
-//                    var dxgiFormat = (Format)format;
-//#if DIRECTX11_1
-//                    var modes = output1.GetDisplayModeList1(dxgiFormat, displayModeEnumerationFlags);
-//#else
-//                    var modes = output.GetDisplayModeList(dxgiFormat, displayModeEnumerationFlags);
-//#endif
-
-//                    foreach (var mode in modes)
-//                    {
-//                        if (mode.Scaling == DisplayModeScaling.Unspecified)
-//                        {
-//                            var key = format + ";" + mode.Width + ";" + mode.Height + ";" + mode.RefreshRate.Numerator + ";" + mode.RefreshRate.Denominator;
-
-//                            DisplayMode oldMode;
-//                            if (!modesMap.TryGetValue(key, out oldMode))
-//                            {
-//                                var displayMode = DisplayMode.FromDescription(mode);
-
-//                                modesMap.Add(key, displayMode);
-//                                modesAvailable.Add(displayMode);
-//                            }
-//                        }
-//                    }
-//                }
-//            }
-//            catch (SharpDX.SharpDXException dxgiException)
-//            {
-//                if (dxgiException.ResultCode != ResultCode.NotCurrentlyAvailable)
-//                    throw;
-//            }
-
-#if DIRECTX11_1
-            output1.Dispose();
-#endif
             supportedDisplayModes = modesAvailable.ToArray();
         }
 
@@ -169,8 +81,6 @@ private void InitializeSupportedDisplayModes()
         /// if it is not found - it checks for <see cref="Format.B8G8R8A8_UNorm"/>.</remarks>
         private void InitializeCurrentDisplayMode()
         {
-            //currentDisplayMode = TryFindMatchingDisplayMode(Format.R8G8B8A8_UNorm)
-            //                     ?? TryFindMatchingDisplayMode(Format.B8G8R8A8_UNorm);
         }
 
         /// <summary>
@@ -179,24 +89,8 @@ private void InitializeCurrentDisplayMode()
         /// </summary>
         /// <param name="format">The format to match with.</param>
         /// <returns>A matched <see cref="DisplayMode"/> or null if nothing is found.</returns>
-        private DisplayMode TryFindMatchingDisplayMode(Format format)
+        private DisplayMode TryFindMatchingDisplayMode(VkFormat format)
         {
-            //var desktopBounds = outputDescription.DesktopBounds;
-
-            //foreach (var supportedDisplayMode in SupportedDisplayModes)
-            //{
-            //    var width = desktopBounds.Right - desktopBounds.Left;
-            //    var height = desktopBounds.Bottom - desktopBounds.Top;
-
-            //    if (supportedDisplayMode.Width == width
-            //        && supportedDisplayMode.Height == height
-            //        && (Format)supportedDisplayMode.Format == format)
-            //    {
-            //        // Stupid DXGI, there is no way to get the DXGI.Format, nor the refresh rate.
-            //        return new DisplayMode((PixelFormat)format, width, height, supportedDisplayMode.RefreshRate);
-            //    }
-            //}
-
             return null;
         }
     }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsProfileHelper.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsProfileHelper.cs
index 35eef1bc27..245f7c32a1 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsProfileHelper.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsProfileHelper.cs
@@ -1,7 +1,8 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsResource.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsResource.Vulkan.cs
index e981712ffc..7bbcbd5cf5 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsResource.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsResource.Vulkan.cs
@@ -2,7 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
@@ -11,10 +12,11 @@ namespace Xenko.Graphics
     /// </summary>
     public abstract partial class GraphicsResource
     {
-        internal DeviceMemory NativeMemory;
+        internal ulong? NativeMemoryOffset; // used if this is a pooled buffer
+        internal VkDeviceMemory NativeMemory;
         internal long? StagingFenceValue;
         internal CommandList StagingBuilder;
-        internal PipelineStageFlags NativePipelineStageMask;
+        internal VkPipelineStageFlags NativePipelineStageMask;
 
         protected bool IsDebugMode
         {
@@ -27,60 +29,57 @@ protected bool IsDebugMode
         protected override unsafe void OnNameChanged()
         {
             base.OnNameChanged();
-            //if (GraphicsDevice != null && GraphicsDevice.IsProfilingSupported)
-            //{
-            //    if (string.IsNullOrEmpty(Name))
-            //        return;
-
-            //    var bytes = System.Text.Encoding.ASCII.GetBytes(Name);
-
-            //    fixed (byte* bytesPointer = &bytes[0])
-            //    {
-            //        var nameInfo = new DebugMarkerObjectNameInfo
-            //        {
-            //            StructureType = StructureType.DebugMarkerObjectNameInfo,
-            //            Object = ,
-            //            ObjectName = new IntPtr(bytesPointer),
-            //            ObjectType = 
-            //        };
-            //        GraphicsDevice.NativeDevice.DebugMarkerSetObjectName(ref nameInfo);
-            //    }
-            //}
         }
+        
+        internal static VkPhysicalDeviceMemoryProperties physicalDeviceMemoryProperties;
+        internal static bool gotProps = false;
 
-        protected unsafe void AllocateMemory(MemoryPropertyFlags memoryProperties, MemoryRequirements memoryRequirements)
+        protected unsafe void AllocateMemory(VkMemoryPropertyFlags memoryProperties, VkMemoryRequirements memoryRequirements)
         {
-            if (NativeMemory != DeviceMemory.Null)
+            if (NativeMemory != VkDeviceMemory.Null)
                 return;
 
-            if (memoryRequirements.Size == 0)
+            if (memoryRequirements.size == 0)
                 return;
 
-            var allocateInfo = new MemoryAllocateInfo
+            var allocateInfo = new VkMemoryAllocateInfo
             {
-                StructureType = StructureType.MemoryAllocateInfo,
-                AllocationSize = memoryRequirements.Size,
+                sType = VkStructureType.MemoryAllocateInfo,
+                allocationSize = memoryRequirements.size,
             };
 
-            PhysicalDeviceMemoryProperties physicalDeviceMemoryProperties;
-            GraphicsDevice.NativePhysicalDevice.GetMemoryProperties(out physicalDeviceMemoryProperties);
-            var typeBits = memoryRequirements.MemoryTypeBits;
-            for (uint i = 0; i < physicalDeviceMemoryProperties.MemoryTypeCount; i++)
+            VkPhysicalDeviceMemoryProperties localProps;
+            if (!gotProps) 
+            {
+                gotProps = true;
+                vkGetPhysicalDeviceMemoryProperties(GraphicsDevice.NativePhysicalDevice, out physicalDeviceMemoryProperties);
+            }
+            localProps = physicalDeviceMemoryProperties;
+
+            var typeBits = memoryRequirements.memoryTypeBits;
+            for (uint i = 0; i < localProps.memoryTypeCount; i++)
             {
                 if ((typeBits & 1) == 1)
                 {
                     // Type is available, does it match user properties?
-                    var memoryType = *((MemoryType*)&physicalDeviceMemoryProperties.MemoryTypes + i);
-                    if ((memoryType.PropertyFlags & memoryProperties) == memoryProperties)
+                    var memoryType = *(&localProps.memoryTypes_0 + i);
+                    if ((memoryType.propertyFlags & memoryProperties) == memoryProperties)
                     {
-                        allocateInfo.MemoryTypeIndex = i;
+                        allocateInfo.memoryTypeIndex = i;
                         break;
                     }
                 }
                 typeBits >>= 1;
             }
 
-            NativeMemory = GraphicsDevice.NativeDevice.AllocateMemory(ref allocateInfo);
+            var result = vkAllocateMemory(GraphicsDevice.NativeDevice, &allocateInfo, null, out NativeMemory);
+
+            if (result != VkResult.Success)
+            {
+                string err = "Couldn't allocate memory: " + result + ", NativeMemory: " + NativeMemory + ", type: " + allocateInfo.memoryTypeIndex + ", size: " + memoryRequirements.size;
+                Xenko.Core.ErrorFileLogger.WriteLogToFile(err);
+                throw new Exception(err);
+            }
         }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/GraphicsResourceBase.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/GraphicsResourceBase.Vulkan.cs
index b7df48897b..14d5480e4f 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/GraphicsResourceBase.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/GraphicsResourceBase.Vulkan.cs
@@ -4,7 +4,8 @@
 using System;
 using System.Diagnostics;
 
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
diff --git a/sources/engine/Xenko.Graphics/Vulkan/MappedResource.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/MappedResource.Vulkan.cs
deleted file mode 100644
index 737f659fa2..0000000000
--- a/sources/engine/Xenko.Graphics/Vulkan/MappedResource.Vulkan.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_VULKAN
-namespace Xenko.Graphics
-{
-    public partial struct MappedResource
-    {
-        internal SharpVulkan.Buffer UploadResource;
-        internal int UploadOffset;
-    }
-}
-#endif
diff --git a/sources/engine/Xenko.Graphics/Vulkan/PipelineState.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/PipelineState.Vulkan.cs
index 6cee330752..f1210cb33d 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/PipelineState.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/PipelineState.Vulkan.cs
@@ -4,325 +4,158 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
+using System.Runtime.ExceptionServices;
+using System.Security;
 using Xenko.Core;
+using Xenko.Core.Threading;
 using Xenko.Core.Collections;
 using Xenko.Core.Serialization;
 using Xenko.Shaders;
+using System.Threading;
 using Encoding = System.Text.Encoding;
 
 namespace Xenko.Graphics
 {
     public partial class PipelineState
     {
-        internal SharpVulkan.DescriptorSetLayout NativeDescriptorSetLayout;
+        internal VkDescriptorSetLayout NativeDescriptorSetLayout;
         internal uint[] DescriptorTypeCounts;
         internal DescriptorSetLayout DescriptorSetLayout;
 
-        internal PipelineLayout NativeLayout;
-        internal Pipeline NativePipeline;
-        internal RenderPass NativeRenderPass;
+        internal bool errorDuringCreate;
+        internal VkPipelineLayout NativeLayout;
+        internal VkPipeline NativePipeline = VkPipeline.Null;
+        internal VkRenderPass NativeRenderPass;
         internal int[] ResourceGroupMapping;
         internal int ResourceGroupCount;
         internal PipelineStateDescription Description;
 
+        // GLSL converter always outputs entry point main()
+        private static readonly byte[] defaultEntryPoint = Encoding.UTF8.GetBytes("main\0");
+
         // State exposed by the CommandList
-        private static readonly DynamicState[] dynamicStates =
+        private static readonly VkDynamicState[] dynamicStates =
         {
-            DynamicState.Viewport,
-            DynamicState.Scissor,
-            DynamicState.BlendConstants,
-            DynamicState.StencilReference,
+            VkDynamicState.Viewport,
+            VkDynamicState.Scissor,
+            VkDynamicState.BlendConstants,
+            VkDynamicState.StencilReference,
         };
 
-        internal PipelineState(GraphicsDevice graphicsDevice, PipelineStateDescription pipelineStateDescription) : base(graphicsDevice)
+        public PIPELINE_STATE CurrentState() {
+            if (errorDuringCreate) return PIPELINE_STATE.ERROR;
+            return NativePipeline != VkPipeline.Null ? PIPELINE_STATE.READY : PIPELINE_STATE.LOADING;
+        }
+
+        internal PipelineState(GraphicsDevice graphicsDevice) : base(graphicsDevice) {
+            // just return a memory address to Prepare later
+        }
+
+        internal void Prepare(PipelineStateDescription pipelineStateDescription)
         {
-            Description = pipelineStateDescription.Clone();
+
+            Description = pipelineStateDescription;
             Recreate();
         }
 
+        //[HandleProcessCorruptedStateExceptionsAttribute, SecurityCriticalAttribute]
         private unsafe void Recreate()
         {
+            errorDuringCreate = false;
+
             if (Description.RootSignature == null)
                 return;
 
-            CreateRenderPass(Description);
-
-            CreatePipelineLayout(Description);
+            VkPipelineShaderStageCreateInfo[] stages;
 
-            // Create shader stages
-            Dictionary<int, string> inputAttributeNames;
-            var stages = CreateShaderStages(Description, out inputAttributeNames);
-
-            var inputAttributes = new VertexInputAttributeDescription[Description.InputElements.Length];
-            int inputAttributeCount = 0;
-            var inputBindings = new VertexInputBindingDescription[inputAttributes.Length];
-            int inputBindingCount = 0;
-
-            for (int inputElementIndex = 0; inputElementIndex < inputAttributes.Length; inputElementIndex++)
-            {
-                var inputElement = Description.InputElements[inputElementIndex];
-                var slotIndex = inputElement.InputSlot;
-
-                if (inputElement.InstanceDataStepRate > 1)
-                {
-                    throw new NotImplementedException();
-                }
-
-                Format format;
-                int size;
-                bool isCompressed;
-                VulkanConvertExtensions.ConvertPixelFormat(inputElement.Format, out format, out size, out isCompressed);
-
-                var location = inputAttributeNames.FirstOrDefault(x => x.Value == inputElement.SemanticName && inputElement.SemanticIndex == 0 || x.Value == inputElement.SemanticName + inputElement.SemanticIndex);
-                if (location.Value != null)
-                {
-                    inputAttributes[inputAttributeCount++] = new VertexInputAttributeDescription
-                    {
-                        Format = format,
-                        Offset = (uint)inputElement.AlignedByteOffset,
-                        Binding = (uint)inputElement.InputSlot,
-                        Location = (uint)location.Key
-                    };
-                }
-
-                inputBindings[slotIndex].Binding = (uint)slotIndex;
-                inputBindings[slotIndex].InputRate = inputElement.InputSlotClass == InputClassification.Vertex ? VertexInputRate.Vertex : VertexInputRate.Instance;
-
-                // TODO VULKAN: This is currently an argument to Draw() overloads.
-                if (inputBindings[slotIndex].Stride < inputElement.AlignedByteOffset + size)
-                    inputBindings[slotIndex].Stride = (uint)(inputElement.AlignedByteOffset + size);
-
-                if (inputElement.InputSlot >= inputBindingCount)
-                    inputBindingCount = inputElement.InputSlot + 1;
-            }
-
-            var inputAssemblyState = new PipelineInputAssemblyStateCreateInfo
-            {
-                StructureType = StructureType.PipelineInputAssemblyStateCreateInfo,
-                Topology = VulkanConvertExtensions.ConvertPrimitiveType(Description.PrimitiveType),
-                PrimitiveRestartEnable = true,
-            };
-
-            // TODO VULKAN: Tessellation and multisampling
-            var multisampleState = new PipelineMultisampleStateCreateInfo
-            {
-                StructureType = StructureType.PipelineMultisampleStateCreateInfo,
-                RasterizationSamples = SampleCountFlags.Sample1
-            };
-
-            var tessellationState = new PipelineTessellationStateCreateInfo();
-
-            var rasterizationState = CreateRasterizationState(Description.RasterizerState);
-
-            var depthStencilState = CreateDepthStencilState(Description);
-
-            var description = Description.BlendState;
+            // create render pass
+            bool hasDepthStencilAttachment = Description.Output.DepthStencilFormat != PixelFormat.None;
 
             var renderTargetCount = Description.Output.RenderTargetCount;
-            var colorBlendAttachments = new PipelineColorBlendAttachmentState[renderTargetCount];
-
-            var renderTargetBlendState = &description.RenderTarget0;
-            for (int i = 0; i < renderTargetCount; i++)
-            {
-                colorBlendAttachments[i] = new PipelineColorBlendAttachmentState
-                {
-                    BlendEnable = renderTargetBlendState->BlendEnable,
-                    AlphaBlendOperation = VulkanConvertExtensions.ConvertBlendFunction(renderTargetBlendState->AlphaBlendFunction),
-                    ColorBlendOperation = VulkanConvertExtensions.ConvertBlendFunction(renderTargetBlendState->ColorBlendFunction),
-                    DestinationAlphaBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->AlphaDestinationBlend),
-                    DestinationColorBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->ColorDestinationBlend),
-                    SourceAlphaBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->AlphaSourceBlend),
-                    SourceColorBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->ColorSourceBlend),
-                    ColorWriteMask = VulkanConvertExtensions.ConvertColorWriteChannels(renderTargetBlendState->ColorWriteChannels),
-                };
-
-                if (description.IndependentBlendEnable)
-                    renderTargetBlendState++;
-            }
-
-            var viewportState = new PipelineViewportStateCreateInfo
-            {
-                StructureType = StructureType.PipelineViewportStateCreateInfo,
-                ScissorCount = 1,
-                ViewportCount = 1,
-            };
-
-            fixed (DynamicState* dynamicStatesPointer = &dynamicStates[0])
-            {
-                var vertexInputState = new PipelineVertexInputStateCreateInfo
-                {
-                    StructureType = StructureType.PipelineVertexInputStateCreateInfo,
-                    VertexAttributeDescriptionCount = (uint)inputAttributeCount,
-                    VertexAttributeDescriptions = inputAttributes.Length > 0 ? new IntPtr(Interop.Fixed(inputAttributes)) : IntPtr.Zero,
-                    VertexBindingDescriptionCount = (uint)inputBindingCount,
-                    VertexBindingDescriptions = inputBindings.Length > 0 ? new IntPtr(Interop.Fixed(inputBindings)) : IntPtr.Zero,
-                };
-
-                var colorBlendState = new PipelineColorBlendStateCreateInfo
-                {
-                    StructureType = StructureType.PipelineColorBlendStateCreateInfo,
-                    AttachmentCount = (uint)renderTargetCount,
-                    Attachments = colorBlendAttachments.Length > 0 ? new IntPtr(Interop.Fixed(colorBlendAttachments)) : IntPtr.Zero,
-                };
-
-                var dynamicState = new PipelineDynamicStateCreateInfo
-                {
-                    StructureType = StructureType.PipelineDynamicStateCreateInfo,
-                    DynamicStateCount = (uint)dynamicStates.Length,
-                    DynamicStates = new IntPtr(dynamicStatesPointer)
-                };
-
-                var createInfo = new GraphicsPipelineCreateInfo
-                {
-                    StructureType = StructureType.GraphicsPipelineCreateInfo,
-                    Layout = NativeLayout,
-                    StageCount = (uint)stages.Length,
-                    Stages = stages.Length > 0 ? new IntPtr(Interop.Fixed(stages)) : IntPtr.Zero,
-                    //TessellationState = new IntPtr(&tessellationState),
-                    VertexInputState = new IntPtr(&vertexInputState),
-                    InputAssemblyState = new IntPtr(&inputAssemblyState),
-                    RasterizationState = new IntPtr(&rasterizationState),
-                    MultisampleState = new IntPtr(&multisampleState),
-                    DepthStencilState = new IntPtr(&depthStencilState),
-                    ColorBlendState = new IntPtr(&colorBlendState),
-                    DynamicState = new IntPtr(&dynamicState),
-                    ViewportState = new IntPtr(&viewportState),
-                    RenderPass = NativeRenderPass,
-                    Subpass = 0,
-                };
-                NativePipeline = GraphicsDevice.NativeDevice.CreateGraphicsPipelines(PipelineCache.Null, 1, &createInfo);
-            }
-
-            // Cleanup shader modules
-            foreach (var stage in stages)
-            {
-                GraphicsDevice.NativeDevice.DestroyShaderModule(stage.Module);
-            }
-        }
-
-        /// <inheritdoc/>
-        protected internal override bool OnRecreate()
-        {
-            Recreate();
-            return true;
-        }
-
-        private unsafe void CreateRenderPass(PipelineStateDescription pipelineStateDescription)
-        {
-            bool hasDepthStencilAttachment = pipelineStateDescription.Output.DepthStencilFormat != PixelFormat.None;
-
-            var renderTargetCount = pipelineStateDescription.Output.RenderTargetCount;
 
             var attachmentCount = renderTargetCount;
             if (hasDepthStencilAttachment)
                 attachmentCount++;
 
-            var attachments = new AttachmentDescription[attachmentCount];
-            var colorAttachmentReferences = new AttachmentReference[renderTargetCount];
+            var attachments = new VkAttachmentDescription[attachmentCount];
+            var colorAttachmentReferences = new VkAttachmentReference[renderTargetCount];
 
-            fixed (PixelFormat* renderTargetFormat = &pipelineStateDescription.Output.RenderTargetFormat0)
-            fixed (BlendStateRenderTargetDescription* blendDescription = &pipelineStateDescription.BlendState.RenderTarget0)
+            fixed (PixelFormat* renderTargetFormat = &Description.Output.RenderTargetFormat0)
+            fixed (BlendStateRenderTargetDescription* blendDescription = &Description.BlendState.RenderTarget0)
             {
                 for (int i = 0; i < renderTargetCount; i++)
                 {
-                    var currentBlendDesc = pipelineStateDescription.BlendState.IndependentBlendEnable ? (blendDescription + i) : blendDescription;
+                    var currentBlendDesc = Description.BlendState.IndependentBlendEnable ? (blendDescription + i) : blendDescription;
 
-                    attachments[i] = new AttachmentDescription
+                    attachments[i] = new VkAttachmentDescription
                     {
-                        Format = VulkanConvertExtensions.ConvertPixelFormat(*(renderTargetFormat + i)),
-                        Samples = SampleCountFlags.Sample1,
-                        LoadOperation = currentBlendDesc->BlendEnable ? AttachmentLoadOperation.Load : AttachmentLoadOperation.DontCare, // TODO VULKAN: Only if any destination blend?
-                        StoreOperation = AttachmentStoreOperation.Store,
-                        StencilLoadOperation = AttachmentLoadOperation.DontCare,
-                        StencilStoreOperation = AttachmentStoreOperation.DontCare,
-                        InitialLayout = ImageLayout.ColorAttachmentOptimal,
-                        FinalLayout = ImageLayout.ColorAttachmentOptimal,
+                        format = VulkanConvertExtensions.ConvertPixelFormat(*(renderTargetFormat + i)),
+                        samples = VkSampleCountFlags.Count1,
+                        loadOp = currentBlendDesc->BlendEnable ? VkAttachmentLoadOp.Load : VkAttachmentLoadOp.DontCare, // TODO VULKAN: Only if any destination blend?
+                        storeOp = VkAttachmentStoreOp.Store,
+                        stencilLoadOp = VkAttachmentLoadOp.DontCare,
+                        stencilStoreOp = VkAttachmentStoreOp.DontCare,
+                        initialLayout = VkImageLayout.ColorAttachmentOptimal,
+                        finalLayout = VkImageLayout.ColorAttachmentOptimal,
                     };
 
-                    colorAttachmentReferences[i] = new AttachmentReference
+                    colorAttachmentReferences[i] = new VkAttachmentReference
                     {
-                        Attachment = (uint)i,
-                        Layout = ImageLayout.ColorAttachmentOptimal,
+                        attachment = (uint)i,
+                        layout = VkImageLayout.ColorAttachmentOptimal,
                     };
                 }
             }
 
             if (hasDepthStencilAttachment)
             {
-                attachments[attachmentCount - 1] = new AttachmentDescription
+                attachments[attachmentCount - 1] = new VkAttachmentDescription
                 {
-                    Format = Texture.GetFallbackDepthStencilFormat(GraphicsDevice, VulkanConvertExtensions.ConvertPixelFormat(pipelineStateDescription.Output.DepthStencilFormat)),
-                    Samples = SampleCountFlags.Sample1,
-                    LoadOperation = AttachmentLoadOperation.Load, // TODO VULKAN: Only if depth read enabled?
-                    StoreOperation = AttachmentStoreOperation.Store, // TODO VULKAN: Only if depth write enabled?
-                    StencilLoadOperation = AttachmentLoadOperation.DontCare, // TODO VULKAN: Handle stencil
-                    StencilStoreOperation = AttachmentStoreOperation.DontCare,
-                    InitialLayout = ImageLayout.DepthStencilAttachmentOptimal,
-                    FinalLayout = ImageLayout.DepthStencilAttachmentOptimal,
+                    format = Texture.GetFallbackDepthStencilFormat(GraphicsDevice, VulkanConvertExtensions.ConvertPixelFormat(Description.Output.DepthStencilFormat)),
+                    samples = VkSampleCountFlags.Count1,
+                    loadOp = VkAttachmentLoadOp.Load, // TODO VULKAN: Only if depth read enabled?
+                    storeOp = VkAttachmentStoreOp.Store, // TODO VULKAN: Only if depth write enabled?
+                    stencilLoadOp = VkAttachmentLoadOp.DontCare, // TODO VULKAN: Handle stencil
+                    stencilStoreOp = VkAttachmentStoreOp.DontCare,
+                    initialLayout = VkImageLayout.DepthStencilAttachmentOptimal,
+                    finalLayout = VkImageLayout.DepthStencilAttachmentOptimal,
                 };
             }
 
-            var depthAttachmentReference = new AttachmentReference
+            var depthAttachmentReference = new VkAttachmentReference
             {
-                Attachment = (uint)attachments.Length - 1,
-                Layout = ImageLayout.DepthStencilAttachmentOptimal,
+                attachment = (uint)attachments.Length - 1,
+                layout = VkImageLayout.DepthStencilAttachmentOptimal,
             };
 
-            var subpass = new SubpassDescription
+            var subpass = new VkSubpassDescription
             {
-                PipelineBindPoint = PipelineBindPoint.Graphics,
-                ColorAttachmentCount = (uint)renderTargetCount,
-                ColorAttachments = colorAttachmentReferences.Length > 0 ? new IntPtr(Interop.Fixed(colorAttachmentReferences)) : IntPtr.Zero,
-                DepthStencilAttachment = hasDepthStencilAttachment ? new IntPtr(&depthAttachmentReference) : IntPtr.Zero,
+                pipelineBindPoint = VkPipelineBindPoint.Graphics,
+                colorAttachmentCount = (uint)renderTargetCount,
+                pColorAttachments = colorAttachmentReferences.Length > 0 ? (VkAttachmentReference*)Core.Interop.Fixed(colorAttachmentReferences) : null,
+                pDepthStencilAttachment = hasDepthStencilAttachment ? &depthAttachmentReference : null,
             };
 
-            var renderPassCreateInfo = new RenderPassCreateInfo
+            var renderPassCreateInfo = new VkRenderPassCreateInfo
             {
-                StructureType = StructureType.RenderPassCreateInfo,
-                AttachmentCount = (uint)attachmentCount,
-                Attachments = attachments.Length > 0 ? new IntPtr(Interop.Fixed(attachments)) : IntPtr.Zero,
-                SubpassCount = 1,
-                Subpasses = new IntPtr(&subpass)
+                sType = VkStructureType.RenderPassCreateInfo,
+                attachmentCount = (uint)attachmentCount,
+                pAttachments = attachments.Length > 0 ? (VkAttachmentDescription*)Core.Interop.Fixed(attachments) : null,
+                subpassCount = 1,
+                pSubpasses = &subpass,
             };
-            NativeRenderPass = GraphicsDevice.NativeDevice.CreateRenderPass(ref renderPassCreateInfo);
-        }
-
-        /// <inheritdoc/>
-        protected internal override unsafe void OnDestroyed()
-        {
-            if (NativePipeline != Pipeline.Null)
-            {
-                GraphicsDevice.NativeDevice.DestroyRenderPass(NativeRenderPass);
-                GraphicsDevice.NativeDevice.DestroyPipeline(NativePipeline);
-                GraphicsDevice.NativeDevice.DestroyPipelineLayout(NativeLayout);
-
-                GraphicsDevice.NativeDevice.DestroyDescriptorSetLayout(NativeDescriptorSetLayout);
-            }
-
-            base.OnDestroyed();
-        }
-
-        internal struct DescriptorSetInfo
-        {
-            public int SourceSet;
-            public int SourceBinding;
-            public int DestinationBinding;
-            public DescriptorType DescriptorType;
-        }
-
-        internal List<DescriptorSetInfo> DescriptorBindingMapping;
 
-        private unsafe void CreatePipelineLayout(PipelineStateDescription pipelineStateDescription)
-        {
+            // create pipeline layout
             // Remap descriptor set indices to those in the shader. This ordering generated by the ShaderCompiler
-            var resourceGroups = pipelineStateDescription.EffectBytecode.Reflection.ResourceBindings.Select(x => x.ResourceGroup ?? "Globals").Distinct().ToList();
+            var resourceGroups = Description.EffectBytecode.Reflection.ResourceBindings.Select(x => x.ResourceGroup ?? "Globals").Distinct().ToList();
             ResourceGroupCount = resourceGroups.Count;
 
-            var layouts = pipelineStateDescription.RootSignature.EffectDescriptorSetReflection.Layouts;
+            var layouts = Description.RootSignature.EffectDescriptorSetReflection.Layouts;
             
             // Get binding indices used by the shader
-            var destinationBindings = pipelineStateDescription.EffectBytecode.Stages
+            var destinationBindings = Description.EffectBytecode.Stages
                 .SelectMany(x => BinarySerialization.Read<ShaderInputBytecode>(x.Data).ResourceBindings)
                 .GroupBy(x => x.Key, x => x.Value)
                 .ToDictionary(x => x.Key, x => x.First());
@@ -334,7 +167,7 @@ private unsafe void CreatePipelineLayout(PipelineStateDescription pipelineStateD
 
             for (int i = 0; i < resourceGroups.Count; i++)
             {
-                var resourceGroupName = resourceGroups[i] == "Globals" ? pipelineStateDescription.RootSignature.EffectDescriptorSetReflection.DefaultSetSlot : resourceGroups[i];
+                var resourceGroupName = resourceGroups[i] == "Globals" ? Description.RootSignature.EffectDescriptorSetReflection.DefaultSetSlot : resourceGroups[i];
                 var layoutIndex = resourceGroups[i] == null ? 0 : layouts.FindIndex(x => x.Name == resourceGroupName);
 
                 // Check if the resource group is used by the shader
@@ -383,107 +216,286 @@ private unsafe void CreatePipelineLayout(PipelineStateDescription pipelineStateD
 
             // Create pipeline layout
             var nativeDescriptorSetLayout = NativeDescriptorSetLayout;
-            var pipelineLayoutCreateInfo = new PipelineLayoutCreateInfo
+            var pipelineLayoutCreateInfo = new VkPipelineLayoutCreateInfo
             {
-                StructureType = StructureType.PipelineLayoutCreateInfo,
-                SetLayoutCount = 1,
-                SetLayouts = new IntPtr(&nativeDescriptorSetLayout)
+                sType = VkStructureType.PipelineLayoutCreateInfo,
+                setLayoutCount = 1,
+                pSetLayouts = &nativeDescriptorSetLayout,
             };
-            NativeLayout = GraphicsDevice.NativeDevice.CreatePipelineLayout(ref pipelineLayoutCreateInfo);
-        }
 
-        private unsafe PipelineShaderStageCreateInfo[] CreateShaderStages(PipelineStateDescription pipelineStateDescription, out Dictionary<int, string> inputAttributeNames)
-        {
-            var stages = pipelineStateDescription.EffectBytecode.Stages;
-            var nativeStages = new PipelineShaderStageCreateInfo[stages.Length];
+            // Create shader stages
+            Dictionary<int, string> inputAttributeNames;
 
-            inputAttributeNames = null;
+            // Note: important to pin this so that stages[x].Name is valid during this whole function
+            void* defaultEntryPointData = Core.Interop.Fixed(defaultEntryPoint);
+            stages = CreateShaderStages(Description, out inputAttributeNames);
 
-            // GLSL converter always outputs entry point main()
-            var entryPoint = Encoding.UTF8.GetBytes("main\0");
+            var inputAttributes = new VkVertexInputAttributeDescription[Description.InputElements.Length];
+            int inputAttributeCount = 0;
+            var inputBindings = new VkVertexInputBindingDescription[inputAttributes.Length];
+            int inputBindingCount = 0;
 
-            for (int i = 0; i < stages.Length; i++)
+            for (int inputElementIndex = 0; inputElementIndex < inputAttributes.Length; inputElementIndex++)
             {
-                var shaderBytecode = BinarySerialization.Read<ShaderInputBytecode>(stages[i].Data);
-                if (stages[i].Stage == ShaderStage.Vertex)
-                    inputAttributeNames = shaderBytecode.InputAttributeNames;
+                var inputElement = Description.InputElements[inputElementIndex];
+                var slotIndex = inputElement.InputSlot;
 
-                fixed (byte* entryPointPointer = &entryPoint[0])
-                fixed (byte* codePointer = &shaderBytecode.Data[0])
+                if (inputElement.InstanceDataStepRate > 1)
                 {
-                    // Create shader module
-                    var moduleCreateInfo = new ShaderModuleCreateInfo
-                    {
-                        StructureType = StructureType.ShaderModuleCreateInfo,
-                        Code = new IntPtr(codePointer),
-                        CodeSize = shaderBytecode.Data.Length
-                    };
+                    throw new NotImplementedException();
+                }
 
-                    // Create stage
-                    nativeStages[i] = new PipelineShaderStageCreateInfo
+                VkFormat format;
+                int size;
+                bool isCompressed;
+                VulkanConvertExtensions.ConvertPixelFormat(inputElement.Format, out format, out size, out isCompressed);
+
+                var location = inputAttributeNames.FirstOrDefault(x => x.Value == inputElement.SemanticName && inputElement.SemanticIndex == 0 || x.Value == inputElement.SemanticName + inputElement.SemanticIndex);
+                if (location.Value != null)
+                {
+                    inputAttributes[inputAttributeCount++] = new VkVertexInputAttributeDescription
                     {
-                        StructureType = StructureType.PipelineShaderStageCreateInfo,
-                        Stage = VulkanConvertExtensions.Convert(stages[i].Stage),
-                        Name = new IntPtr(entryPointPointer),
-                        Module = GraphicsDevice.NativeDevice.CreateShaderModule(ref moduleCreateInfo)
+                        format = format,
+                        offset = (uint)inputElement.AlignedByteOffset,
+                        binding = (uint)inputElement.InputSlot,
+                        location = (uint)location.Key
                     };
                 }
+
+                inputBindings[slotIndex].binding = (uint)slotIndex;
+                inputBindings[slotIndex].inputRate = inputElement.InputSlotClass == InputClassification.Vertex ? VkVertexInputRate.Vertex : VkVertexInputRate.Instance;
+
+                // TODO VULKAN: This is currently an argument to Draw() overloads.
+                if (inputBindings[slotIndex].stride < inputElement.AlignedByteOffset + size)
+                    inputBindings[slotIndex].stride = (uint)(inputElement.AlignedByteOffset + size);
+
+                if (inputElement.InputSlot >= inputBindingCount)
+                    inputBindingCount = inputElement.InputSlot + 1;
+            }
+
+            var inputAssemblyState = new VkPipelineInputAssemblyStateCreateInfo
+            {
+                sType = VkStructureType.PipelineInputAssemblyStateCreateInfo,
+                topology = VulkanConvertExtensions.ConvertPrimitiveType(Description.PrimitiveType),
+                primitiveRestartEnable = VulkanConvertExtensions.ConvertPrimitiveRestart(Description.PrimitiveType) ? (uint)1 : (uint)0,
             };
 
-            return nativeStages;
+            // TODO VULKAN: Tessellation and multisampling
+            var multisampleState = new VkPipelineMultisampleStateCreateInfo
+            {
+                sType = VkStructureType.PipelineMultisampleStateCreateInfo,
+                rasterizationSamples = VkSampleCountFlags.Count1,
+            };
+
+            var rasterizationState = new VkPipelineRasterizationStateCreateInfo
+            {
+                sType = VkStructureType.PipelineRasterizationStateCreateInfo,
+                cullMode = VulkanConvertExtensions.ConvertCullMode(Description.RasterizerState.CullMode),
+                frontFace = Description.RasterizerState.FrontFaceCounterClockwise ? VkFrontFace.CounterClockwise : VkFrontFace.Clockwise,
+                polygonMode = VulkanConvertExtensions.ConvertFillMode(Description.RasterizerState.FillMode),
+                depthBiasEnable = 1, // TODO VULKAN
+                depthBiasConstantFactor = Description.RasterizerState.DepthBias,
+                depthBiasSlopeFactor = Description.RasterizerState.SlopeScaleDepthBias,
+                depthBiasClamp = Description.RasterizerState.DepthBiasClamp,
+                lineWidth = 1.0f,
+                depthClampEnable = Description.RasterizerState.DepthClipEnable ? (uint)0 : (uint)1,
+                rasterizerDiscardEnable = 0,
+            };
+
+            var depthStencilState = new VkPipelineDepthStencilStateCreateInfo
+            {
+                sType = VkStructureType.PipelineDepthStencilStateCreateInfo,
+                depthTestEnable = Description.DepthStencilState.DepthBufferEnable ? (uint)1 : (uint)0,
+                stencilTestEnable = Description.DepthStencilState.StencilEnable ? (uint)1 : (uint)0,
+                depthWriteEnable = Description.DepthStencilState.DepthBufferWriteEnable ? (uint)1 : (uint)0,
+
+                minDepthBounds = 0.0f,
+                maxDepthBounds = 1.0f,
+                depthCompareOp = VulkanConvertExtensions.ConvertComparisonFunction(Description.DepthStencilState.DepthBufferFunction),
+                front =
+                {
+                    compareOp = VulkanConvertExtensions.ConvertComparisonFunction(Description.DepthStencilState.FrontFace.StencilFunction),
+                    depthFailOp = VulkanConvertExtensions.ConvertStencilOperation(Description.DepthStencilState.FrontFace.StencilDepthBufferFail),
+                    failOp = VulkanConvertExtensions.ConvertStencilOperation(Description.DepthStencilState.FrontFace.StencilFail),
+                    passOp = VulkanConvertExtensions.ConvertStencilOperation(Description.DepthStencilState.FrontFace.StencilPass),
+                    compareMask = Description.DepthStencilState.StencilMask,
+                    writeMask = Description.DepthStencilState.StencilWriteMask
+                },
+                back =
+                {
+                    compareOp = VulkanConvertExtensions.ConvertComparisonFunction(Description.DepthStencilState.BackFace.StencilFunction),
+                    depthFailOp = VulkanConvertExtensions.ConvertStencilOperation(Description.DepthStencilState.BackFace.StencilDepthBufferFail),
+                    failOp = VulkanConvertExtensions.ConvertStencilOperation(Description.DepthStencilState.BackFace.StencilFail),
+                    passOp = VulkanConvertExtensions.ConvertStencilOperation(Description.DepthStencilState.BackFace.StencilPass),
+                    compareMask = Description.DepthStencilState.StencilMask,
+                    writeMask = Description.DepthStencilState.StencilWriteMask
+                }
+            };
+
+            var description = Description.BlendState;
+
+            var colorBlendAttachments = new VkPipelineColorBlendAttachmentState[renderTargetCount];
+
+            var renderTargetBlendState = &description.RenderTarget0;
+            for (int i = 0; i < renderTargetCount; i++)
+            {
+                colorBlendAttachments[i] = new VkPipelineColorBlendAttachmentState
+                {
+                    blendEnable = renderTargetBlendState->BlendEnable ? (uint)1 : (uint)0,
+                    alphaBlendOp = VulkanConvertExtensions.ConvertBlendFunction(renderTargetBlendState->AlphaBlendFunction),
+                    colorBlendOp = VulkanConvertExtensions.ConvertBlendFunction(renderTargetBlendState->ColorBlendFunction),
+                    dstAlphaBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->AlphaDestinationBlend),
+                    dstColorBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->ColorDestinationBlend),
+                    srcAlphaBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->AlphaSourceBlend),
+                    srcColorBlendFactor = VulkanConvertExtensions.ConvertBlend(renderTargetBlendState->ColorSourceBlend),
+                    colorWriteMask = VulkanConvertExtensions.ConvertColorWriteChannels(renderTargetBlendState->ColorWriteChannels),
+                };
+
+                if (description.IndependentBlendEnable)
+                    renderTargetBlendState++;
+            }
+
+            var viewportState = new VkPipelineViewportStateCreateInfo
+            {
+                sType = VkStructureType.PipelineViewportStateCreateInfo,
+                scissorCount = 1,
+                viewportCount = 1,
+            };
+
+            fixed (void* dynamicStatesPointer = dynamicStates.Length == 0 ? null : dynamicStates,
+                         inputAttributesPointer = inputAttributes.Length == 0 ? null : inputAttributes,
+                         inputBindingsPointer = inputBindings.Length == 0 ? null : inputBindings,
+                         colorBlendAttachmentsPointer = colorBlendAttachments.Length == 0 ? null : colorBlendAttachments,
+                         stagesPointer = stages.Length == 0 ? null : stages)
+            {
+                var vertexInputState = new VkPipelineVertexInputStateCreateInfo
+                {
+                    sType = VkStructureType.PipelineVertexInputStateCreateInfo,
+                    vertexAttributeDescriptionCount = (uint)inputAttributeCount,
+                    pVertexAttributeDescriptions = (Vortice.Vulkan.VkVertexInputAttributeDescription*)inputAttributesPointer,
+                    vertexBindingDescriptionCount = (uint)inputBindingCount,
+                    pVertexBindingDescriptions = (Vortice.Vulkan.VkVertexInputBindingDescription*)inputBindingsPointer,
+                };
+
+                var colorBlendState = new VkPipelineColorBlendStateCreateInfo
+                {
+                    sType = VkStructureType.PipelineColorBlendStateCreateInfo,
+                    attachmentCount = (uint)renderTargetCount,
+                    pAttachments = (Vortice.Vulkan.VkPipelineColorBlendAttachmentState*)colorBlendAttachmentsPointer,
+                };
+
+                var dynamicState = new VkPipelineDynamicStateCreateInfo
+                {
+                    sType = VkStructureType.PipelineDynamicStateCreateInfo,
+                    dynamicStateCount = (uint)dynamicStates.Length,
+                    pDynamicStates = (Vortice.Vulkan.VkDynamicState*)dynamicStatesPointer,
+                };
+                
+                var createInfo = new VkGraphicsPipelineCreateInfo
+                {
+                    sType = VkStructureType.GraphicsPipelineCreateInfo,
+                    layout = NativeLayout,
+                    stageCount = (uint)stages.Length,
+                    pVertexInputState = &vertexInputState,
+                    pInputAssemblyState = &inputAssemblyState,
+                    pRasterizationState = &rasterizationState,
+                    pMultisampleState = &multisampleState,
+                    pDepthStencilState = &depthStencilState,
+                    pColorBlendState = &colorBlendState,
+                    pDynamicState = &dynamicState,
+                    pStages = (Vortice.Vulkan.VkPipelineShaderStageCreateInfo*)stagesPointer,
+                    pViewportState = &viewportState,
+                    renderPass = NativeRenderPass,
+                    subpass = 0,
+                };
+
+                using (GraphicsDevice.QueueLock.ReadLock())
+                {
+                    vkCreateRenderPass(GraphicsDevice.NativeDevice, &renderPassCreateInfo, null, out NativeRenderPass);
+                    vkCreatePipelineLayout(GraphicsDevice.NativeDevice, &pipelineLayoutCreateInfo, null, out NativeLayout);
+
+                    createInfo.layout = NativeLayout;
+                    createInfo.renderPass = NativeRenderPass;
+
+                    try {
+                        fixed (VkPipeline* nativePipelinePtr = &NativePipeline)
+                            vkCreateGraphicsPipelines(GraphicsDevice.NativeDevice, VkPipelineCache.Null, 1, &createInfo, null, nativePipelinePtr);
+                    } catch (Exception e) {
+                        errorDuringCreate = true;
+                        NativePipeline = VkPipeline.Null;
+                    }
+                }
+            }
+
+            // Cleanup shader modules
+            for (int i=0; i<stages.Length; i++)
+            {
+                vkDestroyShaderModule(GraphicsDevice.NativeDevice, stages[i].module, null);
+            }
         }
 
-        private PipelineRasterizationStateCreateInfo CreateRasterizationState(RasterizerStateDescription description)
+        /// <inheritdoc/>
+        protected internal override bool OnRecreate()
+        {
+            Recreate();
+
+            return true;
+        }
+
+        /// <inheritdoc/>
+        protected internal override unsafe void OnDestroyed()
         {
-            return new PipelineRasterizationStateCreateInfo
+            if (NativePipeline != VkPipeline.Null)
             {
-                StructureType = StructureType.PipelineRasterizationStateCreateInfo,
-                CullMode = VulkanConvertExtensions.ConvertCullMode(description.CullMode),
-                FrontFace = description.FrontFaceCounterClockwise ? FrontFace.CounterClockwise : FrontFace.Clockwise,
-                PolygonMode = VulkanConvertExtensions.ConvertFillMode(description.FillMode),
-                DepthBiasEnable = true, // TODO VULKAN
-                DepthBiasConstantFactor = description.DepthBias,
-                DepthBiasSlopeFactor = description.SlopeScaleDepthBias,
-                DepthBiasClamp = description.DepthBiasClamp,
-                LineWidth = 1.0f,
-                DepthClampEnable = !description.DepthClipEnable,
-                RasterizerDiscardEnable = false,
-            };
+                vkDestroyRenderPass(GraphicsDevice.NativeDevice, NativeRenderPass, null);
+                vkDestroyPipeline(GraphicsDevice.NativeDevice, NativePipeline, null);
+                vkDestroyPipelineLayout(GraphicsDevice.NativeDevice, NativeLayout, null);
+
+                vkDestroyDescriptorSetLayout(GraphicsDevice.NativeDevice, NativeDescriptorSetLayout, null);
+
+                NativePipeline = VkPipeline.Null;
+            }
+
+            base.OnDestroyed();
         }
 
-        private PipelineDepthStencilStateCreateInfo CreateDepthStencilState(PipelineStateDescription pipelineStateDescription)
+        internal struct DescriptorSetInfo
+        {
+            public int SourceSet;
+            public int SourceBinding;
+            public int DestinationBinding;
+            public VkDescriptorType DescriptorType;
+        }
+
+        internal List<DescriptorSetInfo> DescriptorBindingMapping;
+
+        private unsafe VkPipelineShaderStageCreateInfo[] CreateShaderStages(PipelineStateDescription pipelineStateDescription, out Dictionary<int, string> inputAttributeNames)
         {
-            var description = pipelineStateDescription.DepthStencilState;
+            var stages = pipelineStateDescription.EffectBytecode.Stages;
+            var nativeStages = new VkPipelineShaderStageCreateInfo[stages.Length];
+
+            inputAttributeNames = null;
 
-            return new PipelineDepthStencilStateCreateInfo
+            for (int i = 0; i < stages.Length; i++)
             {
-                StructureType = StructureType.PipelineDepthStencilStateCreateInfo,
-                DepthTestEnable = description.DepthBufferEnable,
-                StencilTestEnable = description.StencilEnable,
-                DepthWriteEnable = description.DepthBufferWriteEnable,
-
-                MinDepthBounds = 0.0f,
-                MaxDepthBounds = 1.0f,
-                DepthCompareOperation = VulkanConvertExtensions.ConvertComparisonFunction(description.DepthBufferFunction),
-                Front = new StencilOperationState
-                {
-                    CompareOperation = VulkanConvertExtensions.ConvertComparisonFunction(description.FrontFace.StencilFunction),
-                    DepthFailOperation = VulkanConvertExtensions.ConvertStencilOperation(description.FrontFace.StencilDepthBufferFail),
-                    FailOperation = VulkanConvertExtensions.ConvertStencilOperation(description.FrontFace.StencilFail),
-                    PassOperation = VulkanConvertExtensions.ConvertStencilOperation(description.FrontFace.StencilPass),
-                    CompareMask = description.StencilMask,
-                    WriteMask = description.StencilWriteMask
-                },
-                Back = new StencilOperationState
+                var shaderBytecode = BinarySerialization.Read<ShaderInputBytecode>(stages[i].Data);
+                if (stages[i].Stage == ShaderStage.Vertex)
+                    inputAttributeNames = shaderBytecode.InputAttributeNames;
+
+                fixed (byte* entryPointPointer = &defaultEntryPoint[0])
                 {
-                    CompareOperation = VulkanConvertExtensions.ConvertComparisonFunction(description.BackFace.StencilFunction),
-                    DepthFailOperation = VulkanConvertExtensions.ConvertStencilOperation(description.BackFace.StencilDepthBufferFail),
-                    FailOperation = VulkanConvertExtensions.ConvertStencilOperation(description.BackFace.StencilFail),
-                    PassOperation = VulkanConvertExtensions.ConvertStencilOperation(description.BackFace.StencilPass),
-                    CompareMask = description.StencilMask,
-                    WriteMask = description.StencilWriteMask
+                    // Create stage
+                    nativeStages[i] = new VkPipelineShaderStageCreateInfo
+                    {
+                        sType = VkStructureType.PipelineShaderStageCreateInfo,
+                        stage = VulkanConvertExtensions.Convert(stages[i].Stage),
+                        pName = entryPointPointer,
+                    };
+                    vkCreateShaderModule(GraphicsDevice.NativeDevice, shaderBytecode.Data, null, out nativeStages[i].module);
                 }
             };
+
+            return nativeStages;
         }
     }
 }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/QueryPool.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/QueryPool.Vulkan.cs
index c691dcd056..29c4409fcb 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/QueryPool.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/QueryPool.Vulkan.cs
@@ -2,23 +2,24 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 namespace Xenko.Graphics
 {
     public partial class QueryPool
     {
-        internal SharpVulkan.QueryPool NativeQueryPool;
+        internal VkQueryPool NativeQueryPool;
 
         public unsafe bool TryGetData(long[] dataArray)
         {
             fixed (long* dataPointer = &dataArray[0])
             {
                 // Read back all results
-                var result = GraphicsDevice.NativeDevice.GetQueryPoolResults(NativeQueryPool, 0, (uint)QueryCount, QueryCount * 8, new IntPtr(dataPointer), 8, QueryResultFlags.Is64Bits);
+                var result = vkGetQueryPoolResults(GraphicsDevice.NativeDevice, NativeQueryPool, 0, (uint)QueryCount, (uint)QueryCount * 8, dataPointer, 8, VkQueryResultFlags._64);
 
                 // Some queries are not ready yet
-                if (result == Result.NotReady)
+                if (result == VkResult.NotReady)
                     return false;
             }
 
@@ -27,30 +28,30 @@ public unsafe bool TryGetData(long[] dataArray)
 
         private unsafe void Recreate()
         {
-            var createInfo = new QueryPoolCreateInfo
+            var createInfo = new VkQueryPoolCreateInfo
             {
-                StructureType = StructureType.QueryPoolCreateInfo,
-                QueryCount = (uint)QueryCount,
+                sType = VkStructureType.QueryPoolCreateInfo,
+                queryCount = (uint)QueryCount,
             };
 
             switch (QueryType)
             {
                 case QueryType.Timestamp:
-                    createInfo.QueryType = SharpVulkan.QueryType.Timestamp;
+                    createInfo.queryType = VkQueryType.Timestamp;
                     break;
 
                 default:
                     throw new NotImplementedException();
             }
 
-            NativeQueryPool = GraphicsDevice.NativeDevice.CreateQueryPool(ref createInfo);
+            vkCreateQueryPool(GraphicsDevice.NativeDevice, &createInfo, null, out NativeQueryPool);
         }
 
         /// <inheritdoc/>
         protected internal override void OnDestroyed()
         {
             GraphicsDevice.Collect(NativeQueryPool);
-            NativeQueryPool = SharpVulkan.QueryPool.Null;
+            NativeQueryPool = VkQueryPool.Null;
 
             base.OnDestroyed();
         }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/SamplerState.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/SamplerState.Vulkan.cs
index 2aab465838..189773c203 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/SamplerState.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/SamplerState.Vulkan.cs
@@ -2,7 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 
 using Xenko.Core.Mathematics;
 
@@ -13,7 +14,7 @@ namespace Xenko.Graphics
     /// </summary>
     public partial class SamplerState
     {
-        internal Sampler NativeSampler;
+        internal VkSampler NativeSampler;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SamplerState"/> class.
@@ -40,57 +41,70 @@ protected internal override bool OnRecreate()
         protected internal override void OnDestroyed()
         {
             GraphicsDevice.Collect(NativeSampler);
-            NativeSampler = Sampler.Null;
+            NativeSampler = VkSampler.Null;
 
             base.OnDestroyed();
         }
 
         private unsafe void CreateNativeSampler()
         {
-            var createInfo = new SamplerCreateInfo
+            var createInfo = new VkSamplerCreateInfo
             {
-                StructureType = StructureType.SamplerCreateInfo,
-                AddressModeU = ConvertAddressMode(Description.AddressU),
-                AddressModeV = ConvertAddressMode(Description.AddressV),
-                AddressModeW = ConvertAddressMode(Description.AddressW),
-                MipLodBias = Description.MipMapLevelOfDetailBias,
-                MaxAnisotropy = Description.MaxAnisotropy,
-                CompareOperation = VulkanConvertExtensions.ConvertComparisonFunction(Description.CompareFunction),
-                MinLod = Description.MinMipLevel,
-                MaxLod = Description.MaxMipLevel,
-                BorderColor = BorderColor.FloatOpaqueBlack // TODO VULKAN: How to handle BorderColor
+                sType = VkStructureType.SamplerCreateInfo,
+                addressModeU = ConvertAddressMode(Description.AddressU),
+                addressModeV = ConvertAddressMode(Description.AddressV),
+                addressModeW = ConvertAddressMode(Description.AddressW),
+                mipLodBias = Description.MipMapLevelOfDetailBias,
+                maxAnisotropy = Description.MaxAnisotropy,
+                compareOp = VulkanConvertExtensions.ConvertComparisonFunction(Description.CompareFunction),
+                minLod = Description.MinMipLevel,
+                maxLod = Description.MaxMipLevel,
             };
 
-            ConvertMinFilter(Description.Filter, out createInfo.MinFilter, out createInfo.MagFilter, out createInfo.MipmapMode, out createInfo.CompareEnable, out createInfo.AnisotropyEnable);
+            if (Description.AddressU == TextureAddressMode.Border ||
+                Description.AddressV == TextureAddressMode.Border ||
+                Description.AddressW == TextureAddressMode.Border)
+            {
+                if (Description.BorderColor == Color4.White)
+                    createInfo.borderColor = VkBorderColor.FloatOpaqueWhite;
+                else if (Description.BorderColor == Color4.Black)
+                    createInfo.borderColor = VkBorderColor.FloatOpaqueBlack;
+                else if (Description.BorderColor == Color.Transparent)
+                    createInfo.borderColor = VkBorderColor.FloatTransparentBlack;
+                else
+                    throw new NotImplementedException("Vulkan: only simple BorderColor are supported");
+            }
+
+            ConvertMinFilter(Description.Filter, out createInfo.minFilter, out createInfo.magFilter, out createInfo.mipmapMode, out createInfo.compareEnable, out createInfo.anisotropyEnable);
 
-            NativeSampler = GraphicsDevice.NativeDevice.CreateSampler(ref createInfo);
+            vkCreateSampler(GraphicsDevice.NativeDevice, &createInfo, null, out NativeSampler);
         }
 
-        private static SamplerAddressMode ConvertAddressMode(TextureAddressMode addressMode)
+        private static VkSamplerAddressMode ConvertAddressMode(TextureAddressMode addressMode)
         {
             switch (addressMode)
             {
                 case TextureAddressMode.Wrap:
-                    return SamplerAddressMode.Repeat;
+                    return VkSamplerAddressMode.Repeat;
                 case TextureAddressMode.Border:
-                    return SamplerAddressMode.ClampToBorder;
+                    return VkSamplerAddressMode.ClampToBorder;
                 case TextureAddressMode.Clamp:
-                    return SamplerAddressMode.ClampToEdge;
+                    return VkSamplerAddressMode.ClampToEdge;
                 case TextureAddressMode.Mirror:
-                    return SamplerAddressMode.MirroredRepeat;
+                    return VkSamplerAddressMode.MirroredRepeat;
                 case TextureAddressMode.MirrorOnce:
-                    return SamplerAddressMode.MirrorClampToEdge;
+                    return VkSamplerAddressMode.MirrorClampToEdge;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        private void ConvertMinFilter(TextureFilter filter, out Filter minFilter, out Filter magFilter, out SamplerMipmapMode mipmapMode, out RawBool enableComparison, out RawBool enableAnisotropy)
+        private void ConvertMinFilter(TextureFilter filter, out VkFilter minFilter, out VkFilter magFilter, out VkSamplerMipmapMode mipmapMode, out uint enableComparison, out uint enableAnisotropy)
         {
-            minFilter = magFilter = Filter.Nearest;
-            mipmapMode = SamplerMipmapMode.Nearest;
-            enableComparison = false;
-            enableAnisotropy = false;
+            minFilter = magFilter = VkFilter.Nearest;
+            mipmapMode = VkSamplerMipmapMode.Nearest;
+            enableComparison = 0;
+            enableAnisotropy = 0;
 
             switch (filter)
             {
@@ -98,85 +112,85 @@ private void ConvertMinFilter(TextureFilter filter, out Filter minFilter, out Fi
                 case TextureFilter.Point:
                     break;
                 case TextureFilter.MinLinearMagMipPoint:
-                    minFilter = Filter.Linear;
+                    minFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.MinPointMagLinearMipPoint:
-                    magFilter = Filter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.MinMagLinearMipPoint:
-                    minFilter = Filter.Linear;
-                    magFilter = Filter.Linear;
+                    minFilter = VkFilter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
 
                 // Mip linear
                 case TextureFilter.MinMagPointMipLinear:
-                    mipmapMode = SamplerMipmapMode.Linear;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
                     break;
                 case TextureFilter.MinLinearMagPointMipLinear:
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    minFilter = Filter.Linear;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    minFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.MinPointMagMipLinear:
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    magFilter = Filter.Linear;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.Linear:
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    minFilter = Filter.Linear;
-                    magFilter = Filter.Linear;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    minFilter = VkFilter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.Anisotropic:
-                    enableAnisotropy = true;
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    minFilter = Filter.Linear;
-                    magFilter = Filter.Linear;
+                    enableAnisotropy = 1;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    minFilter = VkFilter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
 
                 // Comparison mip point
                 case TextureFilter.ComparisonPoint:
-                    enableComparison = true;
+                    enableComparison = 1;
                     break;
                 case TextureFilter.ComparisonMinLinearMagMipPoint:
-                    enableComparison = true;
-                    minFilter = Filter.Linear;
+                    enableComparison = 1;
+                    minFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.ComparisonMinPointMagLinearMipPoint:
-                    enableComparison = true;
-                    magFilter = Filter.Linear;
+                    enableComparison = 1;
+                    magFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.ComparisonMinMagLinearMipPoint:
-                    enableComparison = true;
-                    minFilter = Filter.Linear;
-                    magFilter = Filter.Linear;
+                    enableComparison = 1;
+                    minFilter = VkFilter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
 
                 // Comparison mip linear
                 case TextureFilter.ComparisonMinMagPointMipLinear:
-                    enableComparison = true;
-                    mipmapMode = SamplerMipmapMode.Linear;
+                    enableComparison = 1;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
                     break;
                 case TextureFilter.ComparisonMinLinearMagPointMipLinear:
-                    enableComparison = true;
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    minFilter = Filter.Linear;
+                    enableComparison = 1;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    minFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.ComparisonMinPointMagMipLinear:
-                    enableComparison = true;
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    magFilter = Filter.Linear;
+                    enableComparison = 1;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.ComparisonLinear:
-                    enableComparison = true;
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    minFilter = Filter.Linear;
-                    magFilter = Filter.Linear;
+                    enableComparison = 1;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    minFilter = VkFilter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
                 case TextureFilter.ComparisonAnisotropic:
-                    enableComparison = true;
-                    enableAnisotropy = true;
-                    mipmapMode = SamplerMipmapMode.Linear;
-                    minFilter = Filter.Linear;
-                    magFilter = Filter.Linear;
+                    enableComparison = 1;
+                    enableAnisotropy = 1;
+                    mipmapMode = VkSamplerMipmapMode.Linear;
+                    minFilter = VkFilter.Linear;
+                    magFilter = VkFilter.Linear;
                     break;
 
                 default:
diff --git a/sources/engine/Xenko.Graphics/Vulkan/SwapChainGraphicsPresenter.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/SwapChainGraphicsPresenter.Vulkan.cs
index f26e706065..be75982b21 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/SwapChainGraphicsPresenter.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/SwapChainGraphicsPresenter.Vulkan.cs
@@ -2,12 +2,17 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
+using System.Threading;
 using System.Runtime.InteropServices;
-using SharpVulkan;
-using ImageLayout = SharpVulkan.ImageLayout;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
+using Xenko.Core;
+using Xenko.Core.Threading;
+using System.Runtime.ExceptionServices;
 
 namespace Xenko.Graphics
 {
@@ -16,17 +21,18 @@ namespace Xenko.Graphics
     /// </summary>
     public class SwapChainGraphicsPresenter : GraphicsPresenter
     {
-        private Swapchain swapChain;
-        private Surface surface;
+        private VkSwapchainKHR swapChain = VkSwapchainKHR.Null;
+        private VkSurfaceKHR surface;
 
         private Texture backbuffer;
         private SwapChainImageInfo[] swapchainImages;
         private uint currentBufferIndex;
+        private VkFence presentFence;
 
         private struct SwapChainImageInfo
         {
-            public SharpVulkan.Image NativeImage;
-            public ImageView NativeColorAttachmentView;
+            public VkImage NativeImage;
+            public VkImageView NativeColorAttachmentView;
         }
 
         public SwapChainGraphicsPresenter(GraphicsDevice device, PresentationParameters presentationParameters)
@@ -58,112 +64,46 @@ public override object NativePresenter
             }
         }
 
-        public override bool IsFullScreen
-        {
-            get
-            {
-                //return swapChain.IsFullScreen;
-                return false;
-            }
-
-            set
-            {
-//#if !XENKO_PLATFORM_UWP
-//                if (swapChain == null)
-//                    return;
-
-//                var outputIndex = Description.PreferredFullScreenOutputIndex;
-
-//                // no outputs connected to the current graphics adapter
-//                var output = GraphicsDevice.Adapter != null && outputIndex < GraphicsDevice.Adapter.Outputs.Length ? GraphicsDevice.Adapter.Outputs[outputIndex] : null;
-
-//                Output currentOutput = null;
-
-//                try
-//                {
-//                    RawBool isCurrentlyFullscreen;
-//                    swapChain.GetFullscreenState(out isCurrentlyFullscreen, out currentOutput);
-
-//                    // check if the current fullscreen monitor is the same as new one
-//                    if (isCurrentlyFullscreen == value && output != null && currentOutput != null && currentOutput.NativePointer == output.NativeOutput.NativePointer)
-//                        return;
-//                }
-//                finally
-//                {
-//                    if (currentOutput != null)
-//                        currentOutput.Dispose();
-//                }
-
-//                bool switchToFullScreen = value;
-//                // If going to fullscreen mode: call 1) SwapChain.ResizeTarget 2) SwapChain.IsFullScreen
-//                var description = new ModeDescription(backBuffer.ViewWidth, backBuffer.ViewHeight, Description.RefreshRate.ToSharpDX(), (SharpDX.DXGI.Format)Description.BackBufferFormat);
-//                if (switchToFullScreen)
-//                {
-//                    // Force render target destruction
-//                    // TODO: We should track all user created render targets that points to back buffer as well (or deny their creation?)
-//                    backBuffer.OnDestroyed();
-
-//                    OnDestroyed();
-
-//                    Description.IsFullScreen = true;
-
-//                    OnRecreated();
-
-//                    // Recreate render target
-//                    backBuffer.OnRecreate();
-//                }
-//                else
-//                {
-//                    Description.IsFullScreen = false;
-//                    swapChain.IsFullScreen = false;
-
-//                    // call 1) SwapChain.IsFullScreen 2) SwapChain.Resize
-//                    Resize(backBuffer.ViewWidth, backBuffer.ViewHeight, backBuffer.ViewFormat);
-//                }
-
-//                // If going to window mode: 
-//                if (!switchToFullScreen)
-//                {
-//                    // call 1) SwapChain.IsFullScreen 2) SwapChain.Resize
-//                    description.RefreshRate = new SharpDX.DXGI.Rational(0, 0);
-//                    swapChain.ResizeTarget(ref description);
-//                }
-//#endif
-            }
-        }
-
+        public override bool InternalFullscreen { get; set; }
 
+        [HandleProcessCorruptedStateExceptionsAttribute]
         public override unsafe void Present()
         {
-            try
-            {
-                var swapChainCopy = swapChain;
-                var currentBufferIndexCopy = currentBufferIndex;
-                var presentInfo = new PresentInfo
-                {
-                    StructureType = StructureType.PresentInfo,
-                    SwapchainCount = 1,
-                    Swapchains = new IntPtr(&swapChainCopy),
-                    ImageIndices = new IntPtr(&currentBufferIndexCopy),
-                };
-
-                // Present
-                GraphicsDevice.NativeCommandQueue.Present(ref presentInfo);
+            // remember which frame we need to present (for presenting thread)
+            VkSwapchainKHR swapChainCopy = swapChain;
+            uint currentBufferIndexCopy = currentBufferIndex;
+            VkPresentInfoKHR presentInfo = new VkPresentInfoKHR {
+                sType = VkStructureType.PresentInfoKHR,
+                swapchainCount = 1,
+                pSwapchains = &swapChainCopy,
+                pImageIndices = &currentBufferIndexCopy,
+            };
 
-                // Get next image
-                currentBufferIndex = GraphicsDevice.NativeDevice.AcquireNextImage(swapChain, ulong.MaxValue, GraphicsDevice.GetNextPresentSemaphore(), Fence.Null);
+            VkResult result = VkResult.Success;
 
-                // Flip render targets
-                backbuffer.SetNativeHandles(swapchainImages[currentBufferIndex].NativeImage, swapchainImages[currentBufferIndex].NativeColorAttachmentView);
+            try {
+                result = vkAcquireNextImageKHR(GraphicsDevice.NativeDevice, swapChain, (ulong)0, VkSemaphore.Null, VkFence.Null, out currentBufferIndex);
+                vkQueuePresentKHR(GraphicsDevice.NativeCommandQueue, &presentInfo);
+            } catch (AccessViolationException ave) {
+                Xenko.Graphics.SDL.Window.GeneratePresentError();                
             }
-            catch (SharpVulkanException e) when (e.Result == Result.ErrorOutOfDate)
+
+            if ((int)result < 0)
+                Xenko.Graphics.SDL.Window.GenerateSwapchainError("vkAcquireNextImageKHR result: " + (int)result);
+
+            // did we get another image?
+            while ((int)result > 0)
             {
-                // TODO VULKAN 
+                result = vkAcquireNextImageKHR(GraphicsDevice.NativeDevice, swapChain, (ulong)0, VkSemaphore.Null, VkFence.Null, out currentBufferIndex);
+                Thread.Sleep(1);
             }
+
+            // Flip render targets
+            backbuffer.SetNativeHandles(swapchainImages[currentBufferIndex].NativeImage, swapchainImages[currentBufferIndex].NativeColorAttachmentView);
         }
 
         public override void BeginDraw(CommandList commandList)
-        {
+        {   
             // Backbuffer needs to be cleared
             backbuffer.IsInitialized = false;
         }
@@ -182,8 +122,8 @@ protected internal override unsafe void OnDestroyed()
         {
             DestroySwapchain();
 
-            GraphicsDevice.NativeInstance.DestroySurface(surface);
-            surface = Surface.Null;
+            vkDestroySurfaceKHR(GraphicsDevice.NativeInstance, surface, null);
+            surface = VkSurfaceKHR.Null;
 
             base.OnDestroyed();
         }
@@ -191,65 +131,57 @@ protected internal override unsafe void OnDestroyed()
         /// <inheritdoc/>
         public override void OnRecreated()
         {
-            // TODO VULKAN: Violent driver crashes when recreating device and swapchain
-            throw new NotImplementedException();
-
             base.OnRecreated();
 
-            // Recreate swap chain
-            CreateSwapChain();
+            // not supported
         }
 
-        protected override void ResizeBackBuffer(int width, int height, PixelFormat format)
+        protected unsafe override void ResizeBackBuffer(int width, int height, PixelFormat format)
         {
-            CreateSwapChain();
+            // not supported
         }
 
         protected override void ResizeDepthStencilBuffer(int width, int height, PixelFormat format)
         {
-            var newTextureDescription = DepthStencilBuffer.Description;
-            newTextureDescription.Width = width;
-            newTextureDescription.Height = height;
-
-            // Manually update the texture
-            DepthStencilBuffer.OnDestroyed();
-
-            // Put it in our back buffer texture
-            DepthStencilBuffer.InitializeFrom(newTextureDescription);
+            // not supported
         }
 
-
         private unsafe void DestroySwapchain()
         {
-            if (swapChain == Swapchain.Null)
+            if (swapChain == VkSwapchainKHR.Null)
                 return;
-
-            GraphicsDevice.NativeDevice.WaitIdle();
+    
+            vkQueueWaitIdle(GraphicsDevice.NativeCommandQueue);
 
             backbuffer.OnDestroyed();
 
             foreach (var swapchainImage in swapchainImages)
             {
-                GraphicsDevice.NativeDevice.DestroyImageView(swapchainImage.NativeColorAttachmentView);
+                vkDestroyImageView(GraphicsDevice.NativeDevice, swapchainImage.NativeColorAttachmentView, null);
             }
             swapchainImages = null;
 
-            GraphicsDevice.NativeDevice.DestroySwapchain(swapChain);
-            swapChain = Swapchain.Null;
+            vkDestroySwapchainKHR(GraphicsDevice.NativeDevice, swapChain, null);
+            swapChain = VkSwapchainKHR.Null;
         }
 
         private unsafe void CreateSwapChain()
         {
+            // we are destroying the swap chain now, because it causes lots of other things to be reset too (like all commandbufferpools)
+            // normally we pass the old swapchain to the create new swapchain Vulkan call... but I haven't figured out a stable way of
+            // preserving the old swap chain to be passed during the new swapchain creation, and then destroying just the old swapchain parts.
+            // might have to reset the command buffers and pipeline stuff after swapchain handoff... for another day e.g. TODO
+            DestroySwapchain();
+
             var formats = new[] { PixelFormat.B8G8R8A8_UNorm_SRgb, PixelFormat.R8G8B8A8_UNorm_SRgb, PixelFormat.B8G8R8A8_UNorm, PixelFormat.R8G8B8A8_UNorm };
 
             foreach (var format in formats)
             {
                 var nativeFromat = VulkanConvertExtensions.ConvertPixelFormat(format);
 
-                FormatProperties formatProperties;
-                GraphicsDevice.NativePhysicalDevice.GetFormatProperties(nativeFromat, out formatProperties);
+                vkGetPhysicalDeviceFormatProperties(GraphicsDevice.NativePhysicalDevice, nativeFromat, out var formatProperties);
 
-                if ((formatProperties.OptimalTilingFeatures & FormatFeatureFlags.ColorAttachment) != 0)
+                if ((formatProperties.optimalTilingFeatures & VkFormatFeatureFlags.ColorAttachment) != 0)
                 {
                     Description.BackBufferFormat = format;
                     break;
@@ -258,87 +190,88 @@ private unsafe void CreateSwapChain()
 
             // Queue
             // TODO VULKAN: Queue family is needed when creating the Device, so here we can just do a sanity check?
-            var queueNodeIndex = GraphicsDevice.NativePhysicalDevice.QueueFamilyProperties.
-                Where((properties, index) => (properties.QueueFlags & QueueFlags.Graphics) != 0 && GraphicsDevice.NativePhysicalDevice.GetSurfaceSupport((uint)index, surface)).
+            var queueNodeIndex = vkGetPhysicalDeviceQueueFamilyProperties(GraphicsDevice.NativePhysicalDevice).ToArray().
+                Where((properties, index) => (properties.queueFlags & VkQueueFlags.Graphics) != 0 && vkGetPhysicalDeviceSurfaceSupportKHR(GraphicsDevice.NativePhysicalDevice, (uint)index, surface, out var supported) == VkResult.Success && supported == 1).
                 Select((properties, index) => index).First();
 
             // Surface format
             var backBufferFormat = VulkanConvertExtensions.ConvertPixelFormat(Description.BackBufferFormat);
 
-            var surfaceFormats = GraphicsDevice.NativePhysicalDevice.GetSurfaceFormats(surface);
-            if ((surfaceFormats.Length != 1 || surfaceFormats[0].Format != Format.Undefined) &&
-                !surfaceFormats.Any(x => x.Format == backBufferFormat))
+            var surfaceFormats = vkGetPhysicalDeviceSurfaceFormatsKHR(GraphicsDevice.NativePhysicalDevice, surface).ToArray();
+            if ((surfaceFormats.Length != 1 || surfaceFormats[0].format != VkFormat.Undefined) &&
+                !surfaceFormats.Any(x => x.format == backBufferFormat))
             {
-                backBufferFormat = surfaceFormats[0].Format;
+                backBufferFormat = surfaceFormats[0].format;
             }
 
             // Create swapchain
-            SurfaceCapabilities surfaceCapabilities;
-            GraphicsDevice.NativePhysicalDevice.GetSurfaceCapabilities(surface, out surfaceCapabilities);
+            vkGetPhysicalDeviceSurfaceCapabilitiesKHR(GraphicsDevice.NativePhysicalDevice, surface, out var surfaceCapabilities);
 
             // Buffer count
-            uint desiredImageCount = Math.Max(surfaceCapabilities.MinImageCount, 2);
-            if (surfaceCapabilities.MaxImageCount > 0 && desiredImageCount > surfaceCapabilities.MaxImageCount)
+            uint desiredImageCount = Math.Max(surfaceCapabilities.minImageCount, 6);
+            if (surfaceCapabilities.maxImageCount > 0 && desiredImageCount > surfaceCapabilities.maxImageCount)
             {
-                desiredImageCount = surfaceCapabilities.MaxImageCount;
+                desiredImageCount = surfaceCapabilities.maxImageCount;
             }
 
             // Transform
-            SurfaceTransformFlags preTransform;
-            if ((surfaceCapabilities.SupportedTransforms & SurfaceTransformFlags.Identity) != 0)
+            VkSurfaceTransformFlagsKHR preTransform;
+            if ((surfaceCapabilities.supportedTransforms & VkSurfaceTransformFlagsKHR.Identity) != 0)
             {
-                preTransform = SurfaceTransformFlags.Identity;
+                preTransform = VkSurfaceTransformFlagsKHR.Identity;
             }
             else
             {
-                preTransform = surfaceCapabilities.CurrentTransform;
+                preTransform = surfaceCapabilities.currentTransform;
             }
 
             // Find present mode
-            var presentModes = GraphicsDevice.NativePhysicalDevice.GetSurfacePresentModes(surface);
-            var swapChainPresentMode = PresentMode.Fifo; // Always supported
-            foreach (var presentMode in presentModes)
-            {
-                // TODO VULKAN: Handle PresentInterval.Two
-                if (Description.PresentationInterval == PresentInterval.Immediate)
+            var swapChainPresentMode = VkPresentModeKHR.Fifo; // Always supported, but slow
+            if (Description.PresentationInterval == PresentInterval.Immediate) {
+                var presentModes = vkGetPhysicalDeviceSurfacePresentModesKHR(GraphicsDevice.NativePhysicalDevice, surface);
+                foreach (var pm in presentModes)
                 {
-                    // Prefer mailbox to immediate
-                    if (presentMode == PresentMode.Immediate)
-                    {
-                        swapChainPresentMode = PresentMode.Immediate;
-                    }
-                    else if (presentMode == PresentMode.Mailbox)
+                    if (pm == VkPresentModeKHR.Mailbox)
                     {
-                        swapChainPresentMode = PresentMode.Mailbox;
+                        swapChainPresentMode = VkPresentModeKHR.Mailbox;
                         break;
                     }
                 }
             }
 
             // Create swapchain
-            var swapchainCreateInfo = new SwapchainCreateInfo
+            var swapchainCreateInfo = new VkSwapchainCreateInfoKHR
             {
-                StructureType = StructureType.SwapchainCreateInfo,
-                Surface = surface,
-                ImageArrayLayers = 1,
-                ImageSharingMode = SharingMode.Exclusive,
-                ImageExtent = new Extent2D((uint)Description.BackBufferWidth, (uint)Description.BackBufferHeight),
-                ImageFormat = backBufferFormat,
-                ImageColorSpace = Description.ColorSpace == ColorSpace.Gamma ? SharpVulkan.ColorSpace.SRgbNonlinear : 0,
-                ImageUsage = ImageUsageFlags.ColorAttachment | ImageUsageFlags.TransferDestination | (surfaceCapabilities.SupportedUsageFlags & ImageUsageFlags.TransferSource), // TODO VULKAN: Use off-screen buffer to emulate
-                PresentMode = swapChainPresentMode,
-                CompositeAlpha = CompositeAlphaFlags.Opaque,
-                MinImageCount = desiredImageCount,
-                PreTransform = preTransform,
-                OldSwapchain = swapChain,
-                Clipped = true
+                sType = VkStructureType.SwapchainCreateInfoKHR,
+                surface = surface,
+                imageArrayLayers = 1,
+                imageSharingMode = VkSharingMode.Exclusive,
+                imageExtent = new Vortice.Vulkan.VkExtent2D(Description.BackBufferWidth, Description.BackBufferHeight),
+                imageFormat = backBufferFormat,
+                imageColorSpace = Description.ColorSpace == ColorSpace.Gamma ? VkColorSpaceKHR.SrgbNonLinear : 0,
+                imageUsage = VkImageUsageFlags.ColorAttachment | VkImageUsageFlags.TransferDst | (surfaceCapabilities.supportedUsageFlags & VkImageUsageFlags.TransferSrc), // TODO VULKAN: Use off-screen buffer to emulate
+                presentMode = swapChainPresentMode,
+                compositeAlpha = VkCompositeAlphaFlagsKHR.Opaque,
+                minImageCount = desiredImageCount,
+                preTransform = preTransform,
+                oldSwapchain = swapChain,
+                clipped = 1
             };
-            var newSwapChain = GraphicsDevice.NativeDevice.CreateSwapchain(ref swapchainCreateInfo);
 
-            DestroySwapchain();
+            vkCreateSwapchainKHR(GraphicsDevice.NativeDevice, &swapchainCreateInfo, null, out swapChain);
 
-            swapChain = newSwapChain;
             CreateBackBuffers();
+
+            // resize/create stencil buffers
+            var newTextureDescription = DepthStencilBuffer.Description;
+            newTextureDescription.Width = Description.BackBufferWidth;
+            newTextureDescription.Height = Description.BackBufferHeight;
+
+            // Manually update the texture
+            DepthStencilBuffer.OnDestroyed();
+
+            // Put it in our back buffer texture
+            DepthStencilBuffer.InitializeFrom(newTextureDescription);
         }
 
         private unsafe void CreateSurface()
@@ -351,8 +284,11 @@ private unsafe void CreateSurface()
             // Create surface
 #if XENKO_UI_SDL
             var control = Description.DeviceWindowHandle.NativeWindow as SDL.Window;
-            SDL2.SDL.SDL_Vulkan_CreateSurface(control.SdlHandle, GraphicsDevice.NativeInstance.NativeHandle, out IntPtr surfacePtr);
-            surface = new Surface(surfacePtr);
+
+            if (SDL2.SDL.SDL_Vulkan_CreateSurface(control.SdlHandle, GraphicsDevice.NativeInstance.Handle, out ulong surfacePtr) == SDL2.SDL.SDL_bool.SDL_FALSE)
+                Xenko.Graphics.SDL.Window.GenerateCreationError();
+
+            surface = new VkSurfaceKHR(surfacePtr);
 #elif XENKO_PLATFORM_WINDOWS
             var controlHandle = Description.DeviceWindowHandle.Handle;
             if (controlHandle == IntPtr.Zero)
@@ -360,11 +296,11 @@ private unsafe void CreateSurface()
                 throw new NotSupportedException($"Form of type [{Description.DeviceWindowHandle.GetType().Name}] is not supported. Only System.Windows.Control are supported");
             }
 
-            var surfaceCreateInfo = new Win32SurfaceCreateInfo
+            var surfaceCreateInfo = new VkWin32SurfaceCreateInfoKHR
             {
-                StructureType = StructureType.Win32SurfaceCreateInfo,
-                InstanceHandle = Process.GetCurrentProcess().Handle,
-                WindowHandle = controlHandle,
+                sType = VkStructureType.Win32SurfaceCreateInfoKHR,
+                instanceHandle = Process.GetCurrentProcess().Handle,
+                windowHandle = controlHandle,
             };
             surface = GraphicsDevice.NativeInstance.CreateWin32Surface(surfaceCreateInfo);
 #elif XENKO_PLATFORM_ANDROID
@@ -378,6 +314,8 @@ private unsafe void CreateSurface()
 
         private unsafe void CreateBackBuffers()
         {
+            backbuffer.OnDestroyed();
+
             // Create the texture object
             var backBufferDescription = new TextureDescription
             {
@@ -394,62 +332,61 @@ private unsafe void CreateBackBuffers()
             };
             backbuffer.InitializeWithoutResources(backBufferDescription);
 
-            var createInfo = new ImageViewCreateInfo
+            var createInfo = new VkImageViewCreateInfo
             {
-                StructureType = StructureType.ImageViewCreateInfo,
-                SubresourceRange = new ImageSubresourceRange(ImageAspectFlags.Color, 0, 1, 0, 1),
-                Format = backbuffer.NativeFormat,
-                ViewType = ImageViewType.Image2D,
+                sType = VkStructureType.ImageViewCreateInfo,
+                subresourceRange = new VkImageSubresourceRange(VkImageAspectFlags.Color, 0, 1, 0, 1),
+                format = backbuffer.NativeFormat,
+                viewType = VkImageViewType.Image2D,
             };
 
             // We initialize swapchain images to PresentSource, since we swap them out while in this layout.
-            backbuffer.NativeAccessMask = AccessFlags.MemoryRead;
-            backbuffer.NativeLayout = ImageLayout.PresentSource;
+            backbuffer.NativeAccessMask = VkAccessFlags.MemoryRead;
+            backbuffer.NativeLayout = VkImageLayout.PresentSrcKHR;
 
-            var imageMemoryBarrier = new ImageMemoryBarrier
+            var imageMemoryBarrier = new VkImageMemoryBarrier
             {
-                StructureType = StructureType.ImageMemoryBarrier,
-                SubresourceRange = new ImageSubresourceRange(ImageAspectFlags.Color, 0, 1, 0, 1),
-                OldLayout = ImageLayout.Undefined,
-                NewLayout = ImageLayout.PresentSource,
-                SourceAccessMask = AccessFlags.None,
-                DestinationAccessMask = AccessFlags.MemoryRead
+                sType = VkStructureType.ImageMemoryBarrier,
+                subresourceRange = new VkImageSubresourceRange(VkImageAspectFlags.Color, 0, 1, 0, 1),
+                oldLayout = VkImageLayout.Undefined,
+                newLayout = VkImageLayout.PresentSrcKHR,
+                srcAccessMask = VkAccessFlags.None,
+                dstAccessMask = VkAccessFlags.MemoryRead
             };
 
             var commandBuffer = GraphicsDevice.NativeCopyCommandBuffer;
-            var beginInfo = new CommandBufferBeginInfo { StructureType = StructureType.CommandBufferBeginInfo };
-            commandBuffer.Begin(ref beginInfo);
+            var beginInfo = new VkCommandBufferBeginInfo { sType = VkStructureType.CommandBufferBeginInfo };
+            vkBeginCommandBuffer(commandBuffer, &beginInfo);
 
-            var buffers = GraphicsDevice.NativeDevice.GetSwapchainImages(swapChain);
+            var buffers = vkGetSwapchainImagesKHR(GraphicsDevice.NativeDevice, swapChain);
             swapchainImages = new SwapChainImageInfo[buffers.Length];
 
             for (int i = 0; i < buffers.Length; i++)
             {
                 // Create image views
-                swapchainImages[i].NativeImage = createInfo.Image = buffers[i];
-                swapchainImages[i].NativeColorAttachmentView = GraphicsDevice.NativeDevice.CreateImageView(ref createInfo);
+                swapchainImages[i].NativeImage = createInfo.image = buffers[i];
+                vkCreateImageView(GraphicsDevice.NativeDevice, &createInfo, null, out swapchainImages[i].NativeColorAttachmentView);
 
                 // Transition to default layout
-                imageMemoryBarrier.Image = buffers[i];
-                commandBuffer.PipelineBarrier(PipelineStageFlags.AllCommands, PipelineStageFlags.AllCommands, DependencyFlags.None, 0, null, 0, null, 1, &imageMemoryBarrier);
+                imageMemoryBarrier.image = buffers[i];
+                vkCmdPipelineBarrier(commandBuffer, VkPipelineStageFlags.AllCommands, VkPipelineStageFlags.AllCommands, VkDependencyFlags.None, 0, null, 0, null, 1, &imageMemoryBarrier);
             }
 
             // Close and submit
-            commandBuffer.End();
+            vkEndCommandBuffer(commandBuffer);
 
-            var submitInfo = new SubmitInfo
+            var submitInfo = new VkSubmitInfo
             {
-                StructureType = StructureType.SubmitInfo,
-                CommandBufferCount = 1,
-                CommandBuffers = new IntPtr(&commandBuffer),
+                sType = VkStructureType.SubmitInfo,
+                commandBufferCount = 1,
+                pCommandBuffers = &commandBuffer,
             };
-            GraphicsDevice.NativeCommandQueue.Submit(1, &submitInfo, Fence.Null);
-            GraphicsDevice.NativeCommandQueue.WaitIdle();
-            commandBuffer.Reset(CommandBufferResetFlags.None);
+            vkQueueSubmit(GraphicsDevice.NativeCommandQueue, 1, &submitInfo, VkFence.Null);
+            vkQueueWaitIdle(GraphicsDevice.NativeCommandQueue);
+            vkResetCommandBuffer(commandBuffer, VkCommandBufferResetFlags.None);
+
+            vkAcquireNextImageKHR(GraphicsDevice.NativeDevice, swapChain, ulong.MaxValue, VkSemaphore.Null, VkFence.Null, out currentBufferIndex);
 
-            // Get next image
-            currentBufferIndex = GraphicsDevice.NativeDevice.AcquireNextImage(swapChain, ulong.MaxValue, GraphicsDevice.GetNextPresentSemaphore(), Fence.Null);
-            
             // Apply the first swap chain image to the texture
             backbuffer.SetNativeHandles(swapchainImages[currentBufferIndex].NativeImage, swapchainImages[currentBufferIndex].NativeColorAttachmentView);
         }
diff --git a/sources/engine/Xenko.Graphics/Vulkan/Texture.Vulkan.cs b/sources/engine/Xenko.Graphics/Vulkan/Texture.Vulkan.cs
index bb0b1fa9b9..a5780651b8 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/Texture.Vulkan.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/Texture.Vulkan.cs
@@ -2,9 +2,12 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
+using System.Threading;
 using System.Linq;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Core;
+using Xenko.Core.Threading;
 using Xenko.Core.Mathematics;
 
 namespace Xenko.Graphics
@@ -16,21 +19,21 @@ public partial class Texture
         internal const int TextureSubresourceAlignment = 4;
         internal const int TextureRowPitchAlignment = 1;
 
-        internal SharpVulkan.Image NativeImage;
-        internal SharpVulkan.Buffer NativeBuffer;
-        internal ImageView NativeColorAttachmentView;
-        internal ImageView NativeDepthStencilView;
-        internal ImageView NativeImageView;
+        internal VkImage NativeImage;
+        internal VkBuffer NativeBuffer;
+        internal VkImageView NativeColorAttachmentView;
+        internal VkImageView NativeDepthStencilView;
+        internal VkImageView NativeImageView;
 
         private bool isNotOwningResources;
         internal bool IsInitialized;
 
-        internal Format NativeFormat;
+        internal VkFormat NativeFormat;
         internal bool HasStencil;
 
-        internal ImageLayout NativeLayout;
-        internal AccessFlags NativeAccessMask;
-        internal ImageAspectFlags NativeImageAspect;
+        internal VkImageLayout NativeLayout;
+        internal VkAccessFlags NativeAccessMask;
+        internal VkImageAspectFlags NativeImageAspect;
 
         public void Recreate(DataBox[] dataBoxes = null)
         {
@@ -57,17 +60,15 @@ internal void SwapInternal(Texture other)
             Utilities.Swap(ref NativeLayout, ref other.NativeLayout);
             Utilities.Swap(ref NativeAccessMask, ref other.NativeAccessMask);
             Utilities.Swap(ref NativeImageAspect, ref other.NativeImageAspect);
-            //
             Utilities.Swap(ref NativeMemory, ref other.NativeMemory);
             Utilities.Swap(ref StagingFenceValue, ref other.StagingFenceValue);
             Utilities.Swap(ref StagingBuilder, ref other.StagingBuilder);
             Utilities.Swap(ref NativePipelineStageMask, ref other.NativePipelineStageMask);
         }
 
-        internal Texture InitializeFromPersistent(TextureDescription description, SharpVulkan.Image nativeImage)
+        internal Texture InitializeFromPersistent(TextureDescription description, VkImage nativeImage)
         {
             NativeImage = nativeImage;
-
             return InitializeFrom(description);
         }
 
@@ -77,7 +78,19 @@ internal Texture InitializeWithoutResources(TextureDescription description)
             return InitializeFrom(description);
         }
 
-        internal void SetNativeHandles(SharpVulkan.Image image, ImageView attachmentView)
+        public void SetFullHandles(VkImage image, VkImageView attachmentView, 
+                                   VkImageLayout layout, VkAccessFlags accessMask,
+                                   VkFormat nativeFormat, VkImageAspectFlags aspect)
+        {
+            NativeImage = image;
+            NativeColorAttachmentView = attachmentView;
+            NativeLayout = layout;
+            NativeAccessMask = accessMask;
+            NativeFormat = nativeFormat;
+            NativeImageAspect = aspect;
+        }
+
+        public void SetNativeHandles(VkImage image, VkImageView attachmentView)
         {
             NativeImage = image;
             NativeColorAttachmentView = attachmentView;
@@ -88,9 +101,9 @@ private void InitializeFromImpl(DataBox[] dataBoxes = null)
             NativeFormat = VulkanConvertExtensions.ConvertPixelFormat(ViewFormat);
             HasStencil = IsStencilFormat(ViewFormat);
             
-            NativeImageAspect = IsDepthStencil ? ImageAspectFlags.Depth : ImageAspectFlags.Color;
+            NativeImageAspect = IsDepthStencil ? VkImageAspectFlags.Depth : VkImageAspectFlags.Color;
             if (HasStencil)
-                NativeImageAspect |= ImageAspectFlags.Stencil;
+                NativeImageAspect |= VkImageAspectFlags.Stencil;
 
             // For depth-stencil formats, automatically fall back to a supported one
             if (IsDepthStencil && HasStencil)
@@ -100,15 +113,15 @@ private void InitializeFromImpl(DataBox[] dataBoxes = null)
 
             if (Usage == GraphicsResourceUsage.Staging)
             {
-                if (NativeImage != SharpVulkan.Image.Null)
+                if (NativeImage != VkImage.Null)
                     throw new InvalidOperationException();
 
                 if (isNotOwningResources)
                     throw new InvalidOperationException();
 
-                NativeAccessMask = AccessFlags.HostRead | AccessFlags.HostWrite;
+                NativeAccessMask = VkAccessFlags.HostRead | VkAccessFlags.HostWrite;
 
-                NativePipelineStageMask = PipelineStageFlags.Host;
+                NativePipelineStageMask = VkPipelineStageFlags.Host;
 
                 if (ParentTexture != null)
                 {
@@ -126,32 +139,32 @@ private void InitializeFromImpl(DataBox[] dataBoxes = null)
             }
             else
             {
-                if (NativeImage != SharpVulkan.Image.Null)
+                if (NativeImage != VkImage.Null)
                     throw new InvalidOperationException();
 
                 NativeLayout =
-                    IsRenderTarget ? ImageLayout.ColorAttachmentOptimal :
-                    IsDepthStencil ? ImageLayout.DepthStencilAttachmentOptimal :
-                    IsShaderResource ? ImageLayout.ShaderReadOnlyOptimal :
-                    ImageLayout.General;
+                    IsRenderTarget ? VkImageLayout.ColorAttachmentOptimal :
+                    IsDepthStencil ? VkImageLayout.DepthStencilAttachmentOptimal :
+                    IsShaderResource ? VkImageLayout.ShaderReadOnlyOptimal :
+                    VkImageLayout.TransferDstOptimal;
 
-                if (NativeLayout == ImageLayout.TransferDestinationOptimal)
-                    NativeAccessMask = AccessFlags.TransferRead;
+                if (NativeLayout == VkImageLayout.TransferDstOptimal)
+                    NativeAccessMask = VkAccessFlags.TransferRead;
 
-                if (NativeLayout == ImageLayout.ColorAttachmentOptimal)
-                    NativeAccessMask = AccessFlags.ColorAttachmentWrite;
+                if (NativeLayout == VkImageLayout.ColorAttachmentOptimal)
+                    NativeAccessMask = VkAccessFlags.ColorAttachmentWrite;
 
-                if (NativeLayout == ImageLayout.DepthStencilAttachmentOptimal)
-                    NativeAccessMask = AccessFlags.DepthStencilAttachmentWrite;
+                if (NativeLayout == VkImageLayout.DepthStencilAttachmentOptimal)
+                    NativeAccessMask = VkAccessFlags.DepthStencilAttachmentWrite;
 
-                if (NativeLayout == ImageLayout.ShaderReadOnlyOptimal)
-                    NativeAccessMask = AccessFlags.ShaderRead | AccessFlags.InputAttachmentRead;
+                if (NativeLayout == VkImageLayout.ShaderReadOnlyOptimal)
+                    NativeAccessMask = VkAccessFlags.ShaderRead | VkAccessFlags.InputAttachmentRead;
 
                 NativePipelineStageMask =
-                    IsRenderTarget ? PipelineStageFlags.ColorAttachmentOutput :
-                    IsDepthStencil ? PipelineStageFlags.ColorAttachmentOutput | PipelineStageFlags.EarlyFragmentTests | PipelineStageFlags.LateFragmentTests :
-                    IsShaderResource ? PipelineStageFlags.VertexInput | PipelineStageFlags.FragmentShader :
-                    PipelineStageFlags.None;
+                    IsRenderTarget ? VkPipelineStageFlags.ColorAttachmentOutput :
+                    IsDepthStencil ? VkPipelineStageFlags.ColorAttachmentOutput | VkPipelineStageFlags.EarlyFragmentTests | VkPipelineStageFlags.LateFragmentTests :
+                    IsShaderResource ? VkPipelineStageFlags.VertexInput | VkPipelineStageFlags.FragmentShader :
+                    VkPipelineStageFlags.None;
 
                 if (ParentTexture != null)
                 {
@@ -171,126 +184,136 @@ private void InitializeFromImpl(DataBox[] dataBoxes = null)
 
                 if (!isNotOwningResources)
                 {
-                    NativeImageView = GetImageView(ViewType, ArraySlice, MipLevel);
                     NativeColorAttachmentView = GetColorAttachmentView(ViewType, ArraySlice, MipLevel);
                     NativeDepthStencilView = GetDepthStencilView();
+                    NativeImageView = GetImageView(ViewType, ArraySlice, MipLevel);
                 }
             }
         }
 
         private unsafe void CreateBuffer()
         {
-            var createInfo = new BufferCreateInfo
+            var createInfo = new VkBufferCreateInfo
             {
-                StructureType = StructureType.BufferCreateInfo,
-                Flags = BufferCreateFlags.None
+                sType = VkStructureType.BufferCreateInfo,
+                flags = VkBufferCreateFlags.None
             };
 
             for (int i = 0; i < MipLevels; i++)
             { 
                 var mipmap = GetMipMapDescription(i);
-                createInfo.Size += (uint)(mipmap.DepthStride * mipmap.Depth * ArraySize);
+                createInfo.size += (uint)(mipmap.DepthStride * mipmap.Depth * ArraySize);
             }
 
-            createInfo.Usage = BufferUsageFlags.TransferSource | BufferUsageFlags.TransferDestination;
+            createInfo.usage = VkBufferUsageFlags.TransferSrc | VkBufferUsageFlags.TransferDst;
 
             // Create buffer
-            NativeBuffer = GraphicsDevice.NativeDevice.CreateBuffer(ref createInfo);
+            vkCreateBuffer(GraphicsDevice.NativeDevice, &createInfo, null, out NativeBuffer);
 
             // Allocate and bind memory
-            MemoryRequirements memoryRequirements;
-            GraphicsDevice.NativeDevice.GetBufferMemoryRequirements(NativeBuffer, out memoryRequirements);
+            vkGetBufferMemoryRequirements(GraphicsDevice.NativeDevice, NativeBuffer, out var memoryRequirements);
 
-            AllocateMemory(MemoryPropertyFlags.HostVisible | MemoryPropertyFlags.HostCoherent, memoryRequirements);
+            AllocateMemory(VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent, memoryRequirements);
 
-            if (NativeMemory != DeviceMemory.Null)
+            if (NativeMemory != VkDeviceMemory.Null)
             {
-                GraphicsDevice.NativeDevice.BindBufferMemory(NativeBuffer, NativeMemory, 0);
+                vkBindBufferMemory(GraphicsDevice.NativeDevice, NativeBuffer, NativeMemory, 0);
+                SharedHandle = new IntPtr((long)NativeMemory.Handle);
             }
         }
 
         private unsafe void CreateImage()
         {
             // Create a new image
-            var createInfo = new ImageCreateInfo
+            var createInfo = new VkImageCreateInfo
             {
-                StructureType = StructureType.ImageCreateInfo,
-                ArrayLayers = (uint)ArraySize,
-                Extent = new Extent3D((uint)Width, (uint)Height, (uint)Depth),
-                MipLevels = (uint)MipLevels,
-                Samples = SampleCountFlags.Sample1,
-                Format = NativeFormat,
-                Flags = ImageCreateFlags.None,
-                Tiling = ImageTiling.Optimal,
-                InitialLayout = ImageLayout.Undefined
+                sType = VkStructureType.ImageCreateInfo,
+                arrayLayers = (uint)ArraySize,
+                extent = new Vortice.Vulkan.VkExtent3D(Width, Height, Depth),
+                mipLevels = (uint)MipLevels,
+                samples = VkSampleCountFlags.Count1,
+                format = NativeFormat,
+                flags = VkImageCreateFlags.None,
+                tiling = VkImageTiling.Optimal,
+                initialLayout = VkImageLayout.Undefined
             };
 
             switch (Dimension)
             {
                 case TextureDimension.Texture1D:
-                    createInfo.ImageType = ImageType.Image1D;
+                    createInfo.imageType = VkImageType.Image1D;
                     break;
                 case TextureDimension.Texture2D:
-                    createInfo.ImageType = ImageType.Image2D;
+                    createInfo.imageType = VkImageType.Image2D;
                     break;
                 case TextureDimension.Texture3D:
-                    createInfo.ImageType = ImageType.Image3D;
+                    createInfo.imageType = VkImageType.Image3D;
                     break;
                 case TextureDimension.TextureCube:
-                    createInfo.ImageType = ImageType.Image2D;
-                    createInfo.Flags |= ImageCreateFlags.CubeCompatible;
+                    createInfo.imageType = VkImageType.Image2D;
+                    createInfo.flags |= VkImageCreateFlags.CubeCompatible;
                     break;
             }
 
-            // TODO VULKAN: Can we restrict more based on GraphicsResourceUsage? 
-            createInfo.Usage |= ImageUsageFlags.TransferSource | ImageUsageFlags.TransferDestination;
+            createInfo.usage |= VkImageUsageFlags.TransferSrc | VkImageUsageFlags.TransferDst;
 
             if (IsRenderTarget)
-                createInfo.Usage |= ImageUsageFlags.ColorAttachment;
+                createInfo.usage |= VkImageUsageFlags.ColorAttachment;
 
             if (IsDepthStencil)
-                createInfo.Usage |= ImageUsageFlags.DepthStencilAttachment;
+                createInfo.usage |= VkImageUsageFlags.DepthStencilAttachment;
 
             if (IsShaderResource)
-                createInfo.Usage |= ImageUsageFlags.Sampled; // TODO VULKAN: Input attachments
+                createInfo.usage |= VkImageUsageFlags.Sampled;
 
-            var memoryProperties = MemoryPropertyFlags.DeviceLocal;
+            if (IsUnorderedAccess)
+                createInfo.usage |= VkImageUsageFlags.Storage;
+
+            var memoryProperties = VkMemoryPropertyFlags.DeviceLocal;
 
             // Create native image
-            // TODO: Multisampling, flags, usage, etc.
-            NativeImage = GraphicsDevice.NativeDevice.CreateImage(ref createInfo);
+            vkCreateImage(GraphicsDevice.NativeDevice, &createInfo, null, out NativeImage);
 
             // Allocate and bind memory
-            MemoryRequirements memoryRequirements;
-            GraphicsDevice.NativeDevice.GetImageMemoryRequirements(NativeImage, out memoryRequirements);
+            vkGetImageMemoryRequirements(GraphicsDevice.NativeDevice, NativeImage, out var memoryRequirements);
 
             AllocateMemory(memoryProperties, memoryRequirements);
 
-            if (NativeMemory != DeviceMemory.Null)
+            if (NativeMemory != VkDeviceMemory.Null)
             {
-                GraphicsDevice.NativeDevice.BindImageMemory(NativeImage, NativeMemory, 0);
+                vkBindImageMemory(GraphicsDevice.NativeDevice, NativeImage, NativeMemory, 0);
+                SharedHandle = new IntPtr((long)NativeMemory.Handle);
             }
         }
 
         private unsafe void InitializeImage(DataBox[] dataBoxes)
         {
             // Begin copy command buffer
-            var commandBufferAllocateInfo = new CommandBufferAllocateInfo
+            var commandBufferAllocateInfo = new VkCommandBufferAllocateInfo
             {
-                StructureType = StructureType.CommandBufferAllocateInfo,
-                CommandPool = GraphicsDevice.NativeCopyCommandPool,
-                CommandBufferCount = 1,
-                Level = CommandBufferLevel.Primary
+                sType = VkStructureType.CommandBufferAllocateInfo,
+                commandPool = GraphicsDevice.NativeCopyCommandPool,
+                commandBufferCount = 1,
+                level = VkCommandBufferLevel.Primary
             };
-            CommandBuffer commandBuffer;
+            VkCommandBuffer commandBuffer;
 
-            lock (GraphicsDevice.QueueLock)
+            // do some setup outside of the lock
+            var beginInfo = new VkCommandBufferBeginInfo { sType = VkStructureType.CommandBufferBeginInfo, flags = VkCommandBufferUsageFlags.OneTimeSubmit };
+            var fenceCreateInfo = new VkFenceCreateInfo { sType = VkStructureType.FenceCreateInfo };
+            vkCreateFence(GraphicsDevice.NativeDevice, &fenceCreateInfo, null, out var fence);
+            var submitInfo = new VkSubmitInfo
             {
-                GraphicsDevice.NativeDevice.AllocateCommandBuffers(ref commandBufferAllocateInfo, &commandBuffer);
+                sType = VkStructureType.SubmitInfo,
+                commandBufferCount = 1,
+            };     
+
+            using (GraphicsDevice.QueueLock.ReadLock())
+            {
+                vkAllocateCommandBuffers(GraphicsDevice.NativeDevice, &commandBufferAllocateInfo, &commandBuffer);
             }
 
-            var beginInfo = new CommandBufferBeginInfo { StructureType = StructureType.CommandBufferBeginInfo, Flags = CommandBufferUsageFlags.OneTimeSubmit };
-            commandBuffer.Begin(ref beginInfo);
+            vkBeginCommandBuffer(commandBuffer, &beginInfo);
 
             if (dataBoxes != null && dataBoxes.Length > 0)
             {
@@ -304,19 +327,17 @@ private unsafe void InitializeImage(DataBox[] dataBoxes)
                     totalSize += dataBoxes[i].SlicePitch;
                 }
 
-                SharpVulkan.Buffer uploadResource;
-                int uploadOffset;
-                var uploadMemory = GraphicsDevice.AllocateUploadBuffer(totalSize, out uploadResource, out uploadOffset);
+                var uploadMemory = GraphicsDevice.AllocateUploadBuffer(totalSize, out var upBuf, out int uploadOffset);
 
                 // Upload buffer barrier
-                var bufferMemoryBarrier = new BufferMemoryBarrier(uploadResource, AccessFlags.HostWrite, AccessFlags.TransferRead, (ulong)uploadOffset, (ulong)totalSize);
+                var bufferMemoryBarrier = new VkBufferMemoryBarrier(upBuf, VkAccessFlags.HostWrite, VkAccessFlags.TransferRead, (ulong)uploadOffset, (ulong)totalSize);
 
                 // Image barrier
-                var initialBarrier = new ImageMemoryBarrier(NativeImage, ImageLayout.Undefined, ImageLayout.TransferDestinationOptimal, AccessFlags.None, AccessFlags.TransferWrite, new ImageSubresourceRange(NativeImageAspect));
-                commandBuffer.PipelineBarrier(PipelineStageFlags.TopOfPipe, PipelineStageFlags.Transfer, DependencyFlags.None, 0, null, 1, &bufferMemoryBarrier, 1, &initialBarrier);
+                var initialBarrier = new VkImageMemoryBarrier(NativeImage, new VkImageSubresourceRange(NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue), VkAccessFlags.None, VkAccessFlags.TransferWrite, VkImageLayout.Undefined, VkImageLayout.TransferDstOptimal);
+                vkCmdPipelineBarrier(commandBuffer, VkPipelineStageFlags.Host, VkPipelineStageFlags.Transfer, VkDependencyFlags.None, 0, null, 1, &bufferMemoryBarrier, 1, &initialBarrier);
 
                 // Copy data boxes to upload buffer
-                var copies = new BufferImageCopy[dataBoxes.Length];
+                var copies = new VkBufferImageCopy[dataBoxes.Length];
                 for (int i = 0; i < copies.Length; i++)
                 {
                     var slicePitch = dataBoxes[i].SlicePitch;
@@ -332,14 +353,14 @@ private unsafe void InitializeImage(DataBox[] dataBoxes)
                     Utilities.CopyMemory(uploadMemory, dataBoxes[i].DataPointer, slicePitch);
 
                     // TODO VULKAN: Check if pitches are valid
-                    copies[i] = new BufferImageCopy
+                    copies[i] = new VkBufferImageCopy
                     {
-                        BufferOffset = (ulong)uploadOffset,
-                        ImageSubresource = new ImageSubresourceLayers(ImageAspectFlags.Color, (uint)arraySlice, 1, (uint)mipSlice),
-                        BufferRowLength = 0, //(uint)(dataBoxes[i].RowPitch / pixelSize),
-                        BufferImageHeight = 0, //(uint)(dataBoxes[i].SlicePitch / dataBoxes[i].RowPitch),
-                        ImageOffset = new Offset3D(0, 0, 0),
-                        ImageExtent = new Extent3D((uint)mipMapDescription.Width, (uint)mipMapDescription.Height, (uint)mipMapDescription.Depth)
+                        bufferOffset = (ulong)uploadOffset,
+                        imageSubresource = new VkImageSubresourceLayers(VkImageAspectFlags.Color, (uint)mipSlice, (uint)arraySlice, 1),
+                        bufferRowLength = 0, //(uint)(dataBoxes[i].RowPitch / pixelSize),
+                        bufferImageHeight = 0, //(uint)(dataBoxes[i].SlicePitch / dataBoxes[i].RowPitch),
+                        imageOffset = new Vortice.Vulkan.VkOffset3D(0, 0, 0),
+                        imageExtent = new Vortice.Vulkan.VkExtent3D(mipMapDescription.Width, mipMapDescription.Height, mipMapDescription.Depth)
                     };
 
                     uploadMemory += slicePitch;
@@ -347,36 +368,36 @@ private unsafe void InitializeImage(DataBox[] dataBoxes)
                 }
 
                 // Copy from upload buffer to image
-                fixed (BufferImageCopy* copiesPointer = &copies[0])
+                using (GraphicsDevice.QueueLock.ReadLock())
                 {
-                    commandBuffer.CopyBufferToImage(uploadResource, NativeImage, ImageLayout.TransferDestinationOptimal, (uint)copies.Length, copiesPointer);
+                    fixed (VkBufferImageCopy* copiesPointer = copies)
+                    {
+                        vkCmdCopyBufferToImage(commandBuffer, upBuf, NativeImage, VkImageLayout.TransferDstOptimal, (uint)copies.Length, copiesPointer);
+                    }
                 }
 
                 IsInitialized = true;
             }
 
             // Transition to default layout
-            var imageMemoryBarrier = new ImageMemoryBarrier(NativeImage,
-                dataBoxes == null || dataBoxes.Length == 0 ? ImageLayout.Undefined : ImageLayout.TransferDestinationOptimal, NativeLayout,
-                dataBoxes == null || dataBoxes.Length == 0 ? AccessFlags.None : AccessFlags.TransferWrite, NativeAccessMask, new ImageSubresourceRange(NativeImageAspect));
-            commandBuffer.PipelineBarrier(PipelineStageFlags.Transfer, PipelineStageFlags.AllCommands, DependencyFlags.None, 0, null, 0, null, 1, &imageMemoryBarrier);
+            var imageMemoryBarrier = new VkImageMemoryBarrier(NativeImage,
+                new VkImageSubresourceRange(NativeImageAspect, 0, uint.MaxValue, 0, uint.MaxValue),
+                dataBoxes == null || dataBoxes.Length == 0 ? VkAccessFlags.None : VkAccessFlags.TransferWrite, NativeAccessMask,
+                dataBoxes == null || dataBoxes.Length == 0 ? VkImageLayout.Undefined : VkImageLayout.TransferDstOptimal, NativeLayout);
 
-            // Close and submit
-            commandBuffer.End();
+            submitInfo.pCommandBuffers = &commandBuffer;
+            vkCmdPipelineBarrier(commandBuffer, VkPipelineStageFlags.Transfer, VkPipelineStageFlags.AllCommands, VkDependencyFlags.None, 0, null, 0, null, 1, &imageMemoryBarrier);
+            vkEndCommandBuffer(commandBuffer);
 
-            var submitInfo = new SubmitInfo
-            {
-                StructureType = StructureType.SubmitInfo,
-                CommandBufferCount = 1,
-                CommandBuffers = new IntPtr(&commandBuffer),
-            };
-
-            lock (GraphicsDevice.QueueLock)
+            // Close and submit
+            using (GraphicsDevice.QueueLock.WriteLock())
             {
-                GraphicsDevice.NativeCommandQueue.Submit(1, &submitInfo, Fence.Null);
-                GraphicsDevice.NativeCommandQueue.WaitIdle();
-                GraphicsDevice.NativeDevice.FreeCommandBuffers(GraphicsDevice.NativeCopyCommandPool, 1, &commandBuffer);
+                vkQueueSubmit(GraphicsDevice.NativeCommandQueue, 1, &submitInfo, fence);
             }
+
+            vkWaitForFences(GraphicsDevice.NativeDevice, 1, &fence, 1, ulong.MaxValue);
+            vkFreeCommandBuffers(GraphicsDevice.NativeDevice, GraphicsDevice.NativeCopyCommandPool, 1, &commandBuffer);
+            vkDestroyFence(GraphicsDevice.NativeDevice, fence, null);
         }
 
         /// <inheritdoc/>
@@ -384,46 +405,47 @@ protected internal override void OnDestroyed()
         {
             if (ParentTexture != null || isNotOwningResources)
             {
-                NativeImage = SharpVulkan.Image.Null;
-                NativeMemory = DeviceMemory.Null;
+                NativeImage = VkImage.Null;
+                NativeMemory = VkDeviceMemory.Null;
             }
 
             if (!isNotOwningResources)
             {
-                if (NativeMemory != DeviceMemory.Null)
+                if (NativeMemory != VkDeviceMemory.Null)
                 {
                     GraphicsDevice.Collect(NativeMemory);
-                    NativeMemory = DeviceMemory.Null;
+                    NativeMemory = VkDeviceMemory.Null;
+                    SharedHandle = IntPtr.Zero;
                 }
 
-                if (NativeImage != SharpVulkan.Image.Null)
+                if (NativeImage != VkImage.Null)
                 {
                     GraphicsDevice.Collect(NativeImage);
-                    NativeImage = SharpVulkan.Image.Null;
+                    NativeImage = VkImage.Null;
                 }
 
-                if (NativeBuffer != SharpVulkan.Buffer.Null)
+                if (NativeBuffer != VkBuffer.Null)
                 {
                     GraphicsDevice.Collect(NativeBuffer);
-                    NativeBuffer = SharpVulkan.Buffer.Null;
+                    NativeBuffer = VkBuffer.Null;
                 }
 
-                if (NativeImageView != ImageView.Null)
+                if (NativeImageView != VkImageView.Null)
                 {
                     GraphicsDevice.Collect(NativeImageView);
-                    NativeImageView = ImageView.Null;
+                    NativeImageView = VkImageView.Null;
                 }
 
-                if (NativeColorAttachmentView != ImageView.Null)
+                if (NativeColorAttachmentView != VkImageView.Null)
                 {
                     GraphicsDevice.Collect(NativeColorAttachmentView);
-                    NativeColorAttachmentView = ImageView.Null;
+                    NativeColorAttachmentView = VkImageView.Null;
                 }
 
-                if (NativeDepthStencilView != ImageView.Null)
+                if (NativeDepthStencilView != VkImageView.Null)
                 {
                     GraphicsDevice.Collect(NativeDepthStencilView);
-                    NativeDepthStencilView = ImageView.Null;
+                    NativeDepthStencilView = VkImageView.Null;
                 }
             }
 
@@ -450,10 +472,10 @@ private void OnRecreateImpl()
             InitializeFromImpl();
         }
 
-        private unsafe ImageView GetImageView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
+        private unsafe VkImageView GetImageView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
         {
             if (!IsShaderResource)
-                return ImageView.Null;
+                return VkImageView.Null;
 
             if (viewType == ViewType.MipBand)
                 throw new NotSupportedException("ViewSlice.MipBand is not supported for render targets");
@@ -464,13 +486,13 @@ private unsafe ImageView GetImageView(ViewType viewType, int arrayOrDepthSlice,
 
             var layerCount = Dimension == TextureDimension.Texture3D ? 1 : arrayOrDepthCount;
 
-            var createInfo = new ImageViewCreateInfo
+            var createInfo = new VkImageViewCreateInfo
             {
-                StructureType = StructureType.ImageViewCreateInfo,
-                Format = NativeFormat, //VulkanConvertExtensions.ConvertPixelFormat(ViewFormat),
-                Image = NativeImage,
-                Components = ComponentMapping.Identity,
-                SubresourceRange = new ImageSubresourceRange(IsDepthStencil ? ImageAspectFlags.Depth : ImageAspectFlags.Color, (uint)arrayOrDepthSlice, (uint)layerCount, (uint)mipIndex, (uint)mipCount) // TODO VULKAN: Select between depth and stencil?
+                sType = VkStructureType.ImageViewCreateInfo,
+                format = NativeFormat, //VulkanConvertExtensions.ConvertPixelFormat(ViewFormat),
+                image = NativeImage,
+                components = VkComponentMapping.Identity,
+                subresourceRange = new VkImageSubresourceRange(IsDepthStencil ? VkImageAspectFlags.Depth : VkImageAspectFlags.Color, (uint)mipIndex, (uint)mipCount, (uint)arrayOrDepthSlice, (uint)layerCount) // TODO VULKAN: Select between depth and stencil?
             };
 
             if (IsMultisample)
@@ -487,15 +509,15 @@ private unsafe ImageView GetImageView(ViewType viewType, int arrayOrDepthSlice,
                 switch (Dimension)
                 {
                     case TextureDimension.Texture1D:
-                        createInfo.ViewType = ImageViewType.Image1DArray;
+                        createInfo.viewType = VkImageViewType.Image1DArray;
                         break;
                     case TextureDimension.Texture2D:
-                        createInfo.ViewType = ImageViewType.Image2DArray;
+                        createInfo.viewType = VkImageViewType.Image2DArray;
                         break;
                     case TextureDimension.TextureCube:
                         if (ArraySize % 6 != 0) throw new NotSupportedException("Texture cubes require an ArraySize which is a multiple of 6");
 
-                        createInfo.ViewType = ArraySize > 6 ? ImageViewType.ImageCubeArray : ImageViewType.ImageCube;
+                        createInfo.viewType = ArraySize > 6 ? VkImageViewType.ImageCubeArray : VkImageViewType.ImageCube;
                         break;
                 }
             }
@@ -510,24 +532,25 @@ private unsafe ImageView GetImageView(ViewType viewType, int arrayOrDepthSlice,
                 switch (Dimension)
                 {
                     case TextureDimension.Texture1D:
-                        createInfo.ViewType = ImageViewType.Image1D;
+                        createInfo.viewType = VkImageViewType.Image1D;
                         break;
                     case TextureDimension.Texture2D:
-                        createInfo.ViewType = ImageViewType.Image2D;
+                        createInfo.viewType = VkImageViewType.Image2D;
                         break;
                     case TextureDimension.Texture3D:
-                        createInfo.ViewType = ImageViewType.Image3D;
+                        createInfo.viewType = VkImageViewType.Image3D;
                         break;
                 }
             }
 
-            return GraphicsDevice.NativeDevice.CreateImageView(ref createInfo);
+            vkCreateImageView(GraphicsDevice.NativeDevice, &createInfo, null, out var imageView);
+            return imageView;
         }
 
-        private unsafe ImageView GetColorAttachmentView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
+        private unsafe VkImageView GetColorAttachmentView(ViewType viewType, int arrayOrDepthSlice, int mipIndex)
         {
             if (!IsRenderTarget)
-                return ImageView.Null;
+                return VkImageView.Null;
 
             if (viewType == ViewType.MipBand)
                 throw new NotSupportedException("ViewSlice.MipBand is not supported for render targets");
@@ -536,14 +559,14 @@ private unsafe ImageView GetColorAttachmentView(ViewType viewType, int arrayOrDe
             int mipCount;
             GetViewSliceBounds(viewType, ref arrayOrDepthSlice, ref mipIndex, out arrayOrDepthCount, out mipCount);
 
-            var createInfo = new ImageViewCreateInfo
+            var createInfo = new VkImageViewCreateInfo
             {
-                StructureType = StructureType.ImageViewCreateInfo,
-                ViewType = ImageViewType.Image2D,
-                Format = NativeFormat, // VulkanConvertExtensions.ConvertPixelFormat(ViewFormat),
-                Image = NativeImage,
-                Components = ComponentMapping.Identity,
-                SubresourceRange = new ImageSubresourceRange(ImageAspectFlags.Color, (uint)arrayOrDepthSlice, 1, (uint)mipIndex, (uint)mipCount)
+                sType = VkStructureType.ImageViewCreateInfo,
+                viewType = VkImageViewType.Image2D,
+                format = NativeFormat, // VulkanConvertExtensions.ConvertPixelFormat(ViewFormat),
+                image = NativeImage,
+                components = VkComponentMapping.Identity,
+                subresourceRange = new VkImageSubresourceRange(VkImageAspectFlags.Color, (uint)mipIndex, (uint)mipCount, (uint)arrayOrDepthSlice, 1)
             };
 
             if (IsMultisample)
@@ -566,27 +589,28 @@ private unsafe ImageView GetColorAttachmentView(ViewType viewType, int arrayOrDe
                     throw new NotSupportedException("TextureCube dimension is expecting an arraysize > 1");
             }
 
-            return GraphicsDevice.NativeDevice.CreateImageView(ref createInfo);
+            vkCreateImageView(GraphicsDevice.NativeDevice, &createInfo, null, out var imageView);
+            return imageView;
         }
 
-        private unsafe ImageView GetDepthStencilView()
+        private unsafe VkImageView GetDepthStencilView()
         {
             if (!IsDepthStencil)
-                return ImageView.Null;
+                return VkImageView.Null;
 
             // Check that the format is supported
             //if (ComputeShaderResourceFormatFromDepthFormat(ViewFormat) == PixelFormat.None)
             //    throw new NotSupportedException("Depth stencil format [{0}] not supported".ToFormat(ViewFormat));
 
             // Create a Depth stencil view on this texture2D
-            var createInfo = new ImageViewCreateInfo
+            var createInfo = new VkImageViewCreateInfo
             {
-                StructureType = StructureType.ImageViewCreateInfo,
-                ViewType = ImageViewType.Image2D,
-                Format = NativeFormat, //VulkanConvertExtensions.ConvertPixelFormat(ViewFormat),
-                Image = NativeImage,
-                Components = ComponentMapping.Identity,
-                SubresourceRange = new ImageSubresourceRange(NativeImageAspect, 0, 1, 0, 1)
+                sType = VkStructureType.ImageViewCreateInfo,
+                viewType = VkImageViewType.Image2D,
+                format = NativeFormat, //VulkanConvertExtensions.ConvertPixelFormat(ViewFormat),
+                image = NativeImage,
+                components = VkComponentMapping.Identity,
+                subresourceRange = new VkImageSubresourceRange(NativeImageAspect, 0, 1, 0, 1)
             };
 
             //if (IsDepthStencilReadOnly)
@@ -600,7 +624,8 @@ private unsafe ImageView GetDepthStencilView()
             //        createInfo.Flags |= (int)AttachmentViewCreateFlags.AttachmentViewCreateReadOnlyStencilBit;
             //}
 
-            return GraphicsDevice.NativeDevice.CreateImageView(ref createInfo);
+            vkCreateImageView(GraphicsDevice.NativeDevice, &createInfo, null, out var imageView);
+            return imageView;
         }
 
         private bool IsFlipped()
@@ -669,18 +694,17 @@ private static int CalculateMipCount(int width, int height, int minimumSizeLastM
             return Math.Min(CalculateMipCountFromSize(width, minimumSizeLastMip), CalculateMipCountFromSize(height, minimumSizeLastMip));
         }
 
-        internal static Format GetFallbackDepthStencilFormat(GraphicsDevice device, Format format)
+        internal static VkFormat GetFallbackDepthStencilFormat(GraphicsDevice device, VkFormat format)
         {
-            if (format == SharpVulkan.Format.D16UNormS8UInt || format == SharpVulkan.Format.D24UNormS8UInt || format == SharpVulkan.Format.D32SFloatS8UInt)
+            if (format == VkFormat.D16UNormS8UInt || format == VkFormat.D24UNormS8UInt || format == VkFormat.D32SFloatS8UInt)
             {
-                var fallbackFormats = new[] { format, SharpVulkan.Format.D32SFloatS8UInt, SharpVulkan.Format.D24UNormS8UInt, SharpVulkan.Format.D16UNormS8UInt };
+                var fallbackFormats = new[] { format, VkFormat.D32SFloatS8UInt, VkFormat.D24UNormS8UInt, VkFormat.D16UNormS8UInt };
 
                 foreach (var fallbackFormat in fallbackFormats)
                 {
-                    FormatProperties formatProperties;
-                    device.NativePhysicalDevice.GetFormatProperties(fallbackFormat, out formatProperties);
+                    vkGetPhysicalDeviceFormatProperties(device.NativePhysicalDevice, fallbackFormat, out var formatProperties);
 
-                    if ((formatProperties.OptimalTilingFeatures & FormatFeatureFlags.DepthStencilAttachment) != 0)
+                    if ((formatProperties.optimalTilingFeatures & VkFormatFeatureFlags.DepthStencilAttachment) != 0)
                     {
                         format = fallbackFormat;
                         break;
diff --git a/sources/engine/Xenko.Graphics/Vulkan/VulkanConvertExtensions.cs b/sources/engine/Xenko.Graphics/Vulkan/VulkanConvertExtensions.cs
index 95b448f63e..b8078617a1 100644
--- a/sources/engine/Xenko.Graphics/Vulkan/VulkanConvertExtensions.cs
+++ b/sources/engine/Xenko.Graphics/Vulkan/VulkanConvertExtensions.cs
@@ -2,215 +2,228 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 #if XENKO_GRAPHICS_API_VULKAN
 using System;
-using SharpVulkan;
+using Vortice.Vulkan;
+using static Vortice.Vulkan.Vulkan;
 using Xenko.Shaders;
 
 namespace Xenko.Graphics
 {
     internal static class VulkanConvertExtensions
     {
-        public static PolygonMode ConvertFillMode(FillMode fillMode)
+        public static VkPolygonMode ConvertFillMode(FillMode fillMode)
         {
             // NOTE: Vulkan's PolygonMode.Point is not exposed
 
             switch (fillMode)
             {
                 case FillMode.Solid:
-                    return PolygonMode.Fill;
+                    return VkPolygonMode.Fill;
                 case FillMode.Wireframe:
-                    return PolygonMode.Line;
+                    return VkPolygonMode.Line;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(fillMode));
             }
         }
 
-        public static CullModeFlags ConvertCullMode(CullMode cullMode)
+        public static VkCullModeFlags ConvertCullMode(CullMode cullMode)
         {
-            // NOTE: Vulkan's CullModeFlags.FrontAndBack is not exposed
+            // NOTE: Vulkan's VkCullModeFlags.FrontAndBack is not exposed
 
             switch (cullMode)
             {
                 case CullMode.Back:
-                    return CullModeFlags.Back;
+                    return VkCullModeFlags.Back;
                 case CullMode.Front:
-                    return CullModeFlags.Front;
+                    return VkCullModeFlags.Front;
                 case CullMode.None:
-                    return CullModeFlags.None;
+                    return VkCullModeFlags.None;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(cullMode));
             }
         }
 
-        public static PrimitiveTopology ConvertPrimitiveType(PrimitiveType primitiveType)
+        public static VkPrimitiveTopology ConvertPrimitiveType(PrimitiveType primitiveType)
         {
             switch (primitiveType)
             {
                 case PrimitiveType.PointList:
-                    return PrimitiveTopology.PointList;
+                    return VkPrimitiveTopology.PointList;
                 case PrimitiveType.LineList:
-                    return PrimitiveTopology.LineList;
+                    return VkPrimitiveTopology.LineList;
                 case PrimitiveType.LineStrip:
-                    return PrimitiveTopology.LineStrip;
+                    return VkPrimitiveTopology.LineStrip;
                 case PrimitiveType.TriangleList:
-                    return PrimitiveTopology.TriangleList;
+                    return VkPrimitiveTopology.TriangleList;
                 case PrimitiveType.TriangleStrip:
-                    return PrimitiveTopology.TriangleStrip;
+                    return VkPrimitiveTopology.TriangleStrip;
                 case PrimitiveType.LineListWithAdjacency:
-                    return PrimitiveTopology.LineListWithAdjacency;
+                    return VkPrimitiveTopology.LineListWithAdjacency;
                 case PrimitiveType.LineStripWithAdjacency:
-                    return PrimitiveTopology.LineStripWithAdjacency;
+                    return VkPrimitiveTopology.LineStripWithAdjacency;
                 case PrimitiveType.TriangleListWithAdjacency:
-                    return PrimitiveTopology.TriangleListWithAdjacency;
+                    return VkPrimitiveTopology.TriangleListWithAdjacency;
                 case PrimitiveType.TriangleStripWithAdjacency:
-                    return PrimitiveTopology.TriangleStripWithAdjacency;
+                    return VkPrimitiveTopology.TriangleStripWithAdjacency;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(primitiveType));
             }
         }
 
-        public static ShaderStageFlags Convert(ShaderStage stage)
+        public static bool ConvertPrimitiveRestart(PrimitiveType primitiveType)
+        {
+            switch (primitiveType)
+            {
+                case PrimitiveType.PointList:
+                case PrimitiveType.LineList:
+                case PrimitiveType.TriangleList:
+                case PrimitiveType.LineListWithAdjacency:
+                case PrimitiveType.TriangleListWithAdjacency:
+                case PrimitiveType.PatchList:
+                    return false;
+                default:
+                    return true;
+            }
+        }
+
+        public static VkShaderStageFlags Convert(ShaderStage stage)
         {
             switch (stage)
             {
                 case ShaderStage.Vertex:
-                    return ShaderStageFlags.Vertex;
+                    return VkShaderStageFlags.Vertex;
                 case ShaderStage.Hull:
-                    return ShaderStageFlags.TessellationControl;
+                    return VkShaderStageFlags.TessellationControl;
                 case ShaderStage.Domain:
-                    return ShaderStageFlags.TessellationEvaluation;
+                    return VkShaderStageFlags.TessellationEvaluation;
                 case ShaderStage.Geometry:
-                    return ShaderStageFlags.Geometry;
+                    return VkShaderStageFlags.Geometry;
                 case ShaderStage.Pixel:
-                    return ShaderStageFlags.Fragment;
+                    return VkShaderStageFlags.Fragment;
                 case ShaderStage.Compute:
-                    return ShaderStageFlags.Compute;
+                    return VkShaderStageFlags.Compute;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        public static CompareOperation ConvertComparisonFunction(CompareFunction comparison)
+        public static VkCompareOp ConvertComparisonFunction(CompareFunction comparison)
         {
             switch (comparison)
             {
                 case CompareFunction.Always:
-                    return CompareOperation.Always;
+                    return VkCompareOp.Always;
                 case CompareFunction.Never:
-                    return CompareOperation.Never;
+                    return VkCompareOp.Never;
                 case CompareFunction.Equal:
-                    return CompareOperation.Equal;
+                    return VkCompareOp.Equal;
                 case CompareFunction.Greater:
-                    return CompareOperation.Greater;
+                    return VkCompareOp.Greater;
                 case CompareFunction.GreaterEqual:
-                    return CompareOperation.GreaterOrEqual;
+                    return VkCompareOp.GreaterOrEqual;
                 case CompareFunction.Less:
-                    return CompareOperation.Less;
+                    return VkCompareOp.Less;
                 case CompareFunction.LessEqual:
-                    return CompareOperation.LessOrEqual;
+                    return VkCompareOp.LessOrEqual;
                 case CompareFunction.NotEqual:
-                    return CompareOperation.NotEqual;
+                    return VkCompareOp.NotEqual;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        public static SharpVulkan.StencilOperation ConvertStencilOperation(StencilOperation operation)
+        public static VkStencilOp ConvertStencilOperation(StencilOperation operation)
         {
             switch (operation)
             {
                 case StencilOperation.Decrement:
-                    return SharpVulkan.StencilOperation.DecrementAndWrap;
+                    return VkStencilOp.DecrementAndWrap;
                 case StencilOperation.DecrementSaturation:
-                    return SharpVulkan.StencilOperation.DecrementAndClamp;
+                    return VkStencilOp.DecrementAndClamp;
                 case StencilOperation.Increment:
-                    return SharpVulkan.StencilOperation.IncrementAndWrap;
+                    return VkStencilOp.IncrementAndWrap;
                 case StencilOperation.IncrementSaturation:
-                    return SharpVulkan.StencilOperation.IncrementAndClamp;
+                    return VkStencilOp.IncrementAndClamp;
                 case StencilOperation.Invert:
-                    return SharpVulkan.StencilOperation.Invert;
+                    return VkStencilOp.Invert;
                 case StencilOperation.Keep:
-                    return SharpVulkan.StencilOperation.Keep;
+                    return VkStencilOp.Keep;
                 case StencilOperation.Replace:
-                    return SharpVulkan.StencilOperation.Replace;
+                    return VkStencilOp.Replace;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        public static BlendOperation ConvertBlendFunction(BlendFunction blendFunction)
+        public static VkBlendOp ConvertBlendFunction(BlendFunction blendFunction)
         {
             // TODO: Binary compatible
             switch (blendFunction)
             {
                 case BlendFunction.Add:
-                    return BlendOperation.Add;
+                    return VkBlendOp.Add;
                 case BlendFunction.Subtract:
-                    return BlendOperation.Subtract;
+                    return VkBlendOp.Subtract;
                 case BlendFunction.ReverseSubtract:
-                    return BlendOperation.ReverseSubtract;
+                    return VkBlendOp.ReverseSubtract;
                 case BlendFunction.Max:
-                    return BlendOperation.Max;
+                    return VkBlendOp.Max;
                 case BlendFunction.Min:
-                    return BlendOperation.Min;
+                    return VkBlendOp.Min;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        public static BlendFactor ConvertBlend(Blend blend)
+        public static VkBlendFactor ConvertBlend(Blend blend)
         {
             switch (blend)
             {
                 case Blend.BlendFactor:
-                    return BlendFactor.ConstantColor;
+                    return VkBlendFactor.ConstantColor;
                 case Blend.DestinationAlpha:
-                    return BlendFactor.DestinationAlpha;
+                    return VkBlendFactor.DstAlpha;
                 case Blend.DestinationColor:
-                    return BlendFactor.DestinationColor;
+                    return VkBlendFactor.DstColor;
                 case Blend.InverseBlendFactor:
-                    return BlendFactor.OneMinusConstantColor;
+                    return VkBlendFactor.OneMinusConstantColor;
                 case Blend.InverseDestinationAlpha:
-                    return BlendFactor.OneMinusDestinationAlpha;
+                    return VkBlendFactor.OneMinusDstAlpha;
                 case Blend.InverseDestinationColor:
-                    return BlendFactor.OneMinusDestinationColor;
+                    return VkBlendFactor.OneMinusDstColor;
                 case Blend.InverseSecondarySourceAlpha:
-                    return BlendFactor.OneMinusSource1Alpha;
+                    return VkBlendFactor.OneMinusSrc1Alpha;
                 case Blend.InverseSecondarySourceColor:
-                    return BlendFactor.OneMinusSource1Color;
+                    return VkBlendFactor.OneMinusSrc1Color;
                 case Blend.InverseSourceAlpha:
-                    return BlendFactor.OneMinusSourceAlpha;
+                    return VkBlendFactor.OneMinusSrcAlpha;
                 case Blend.InverseSourceColor:
-                    return BlendFactor.OneMinusSourceColor;
+                    return VkBlendFactor.OneMinusSrcColor;
                 case Blend.One:
-                    return BlendFactor.One;
+                    return VkBlendFactor.One;
                 case Blend.SecondarySourceAlpha:
-                    return BlendFactor.Source1Alpha;
+                    return VkBlendFactor.Src1Alpha;
                 case Blend.SecondarySourceColor:
-                    return BlendFactor.Source1Color;
+                    return VkBlendFactor.Src1Color;
                 case Blend.SourceAlpha:
-                    return BlendFactor.SourceAlpha;
+                    return VkBlendFactor.SrcAlpha;
                 case Blend.SourceAlphaSaturate:
-                    return BlendFactor.SourceAlphaSaturate;
+                    return VkBlendFactor.SrcAlphaSaturate;
                 case Blend.SourceColor:
-                    return BlendFactor.SourceColor;
+                    return VkBlendFactor.SrcColor;
                 case Blend.Zero:
-                    return BlendFactor.Zero;
+                    return VkBlendFactor.Zero;
                 default:
                     throw new ArgumentOutOfRangeException();
             }
         }
 
-        public static Format ConvertPixelFormat(PixelFormat inputFormat)
+        public static VkFormat ConvertPixelFormat(PixelFormat inputFormat)
         {
-            Format format;
-            int pixelSize;
-            bool compressed;
-
-            ConvertPixelFormat(inputFormat, out format, out pixelSize, out compressed);
+            ConvertPixelFormat(inputFormat, out var format, out _, out _);
             return format;
         }
 
-        public static void ConvertPixelFormat(PixelFormat inputFormat, out Format format, out int pixelSize, out bool compressed)
+        public static void ConvertPixelFormat(PixelFormat inputFormat, out VkFormat format, out int pixelSize, out bool compressed)
         {
             compressed = false;
 
@@ -218,288 +231,295 @@ public static void ConvertPixelFormat(PixelFormat inputFormat, out Format format
             switch (inputFormat)
             {
                 //case PixelFormat.A8_UNorm:
-                //    format = Format.;
+                //    format = VkFormat.;
                 //    pixelSize = 1;
                 //    break;
                 case PixelFormat.R8_UNorm:
-                    format = Format.R8UNorm;
+                    format = VkFormat.R8UNorm;
                     pixelSize = 1;
                     break;
                 case PixelFormat.R8_SNorm:
-                    format = Format.R8SNorm;
+                    format = VkFormat.R8SNorm;
                     pixelSize = 1;
                     break;
                 case PixelFormat.R8_UInt:
-                    format = Format.R8UInt;
+                    format = VkFormat.R8UInt;
                     pixelSize = 1;
                     break;
                 case PixelFormat.R8_SInt:
-                    format = Format.R8SInt;
+                    format = VkFormat.R8SInt;
                     pixelSize = 1;
                     break;
-
+                case PixelFormat.R10G10B10A2_UNorm:
+                    format = VkFormat.A2R10G10B10UNormPack32;
+                    pixelSize = 4;
+                    break;
                 case PixelFormat.R8G8B8A8_UNorm:
-                    format = Format.R8G8B8A8UNorm;
+                    format = VkFormat.R8G8B8A8UNorm;
+                    pixelSize = 4;
+                    break;
+                case PixelFormat.R11G11B10_Float:
+                    format = VkFormat.B10G11R11UFloatPack32;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R8G8B8A8_UInt:
-                    format = Format.R8G8B8A8UInt;
+                    format = VkFormat.R8G8B8A8UInt;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R8G8B8A8_SInt:
-                    format = Format.R8G8B8A8SInt;
+                    format = VkFormat.R8G8B8A8SInt;
                     pixelSize = 4;
                     break;
                 case PixelFormat.B8G8R8A8_UNorm:
-                    format = Format.B8G8R8A8UNorm;
+                    format = VkFormat.B8G8R8A8UNorm;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R8G8B8A8_UNorm_SRgb:
-                    format = Format.R8G8B8A8SRgb;
+                    format = VkFormat.R8G8B8A8SRgb;
                     pixelSize = 4;
                     break;
                 case PixelFormat.B8G8R8A8_UNorm_SRgb:
-                    format = Format.B8G8R8A8SRgb;
+                    format = VkFormat.B8G8R8A8SRgb;
                     pixelSize = 4;
                     break;
 
                 case PixelFormat.R16_Float:
-                    format = Format.R16SFloat;
+                    format = VkFormat.R16SFloat;
                     pixelSize = 2;
                     break;
                 case PixelFormat.R16_UNorm:
-                    format = Format.R16UNorm;
+                    format = VkFormat.R16UNorm;
                     pixelSize = 2;
                     break;
                 case PixelFormat.R16_UInt:
-                    format = Format.R16UInt;
+                    format = VkFormat.R16UInt;
                     pixelSize = 2;
                     break;
                 case PixelFormat.R16_SInt:
-                    format = Format.R16SInt;
+                    format = VkFormat.R16SInt;
                     pixelSize = 2;
                     break;
 
                 case PixelFormat.R16G16_Float:
-                    format = Format.R16G16SFloat;
+                    format = VkFormat.R16G16SFloat;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R16G16_SNorm:
-                    format = Format.R16G16SNorm;
+                    format = VkFormat.R16G16SNorm;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R16G16_UNorm:
-                    format = Format.R16G16UNorm;
+                    format = VkFormat.R16G16UNorm;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R16G16_SInt:
-                    format = Format.R16G16SNorm;
+                    format = VkFormat.R16G16SNorm;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R16G16_UInt:
-                    format = Format.R16G16UNorm;
+                    format = VkFormat.R16G16UNorm;
                     pixelSize = 4;
                     break;
 
                 case PixelFormat.R16G16B16A16_Float:
-                    format = Format.R16G16B16A16SFloat;
+                    format = VkFormat.R16G16B16A16SFloat;
                     pixelSize = 8;
                     break;
                 case PixelFormat.R16G16B16A16_UNorm:
-                    format = Format.R16G16B16A16UNorm;
+                    format = VkFormat.R16G16B16A16UNorm;
                     pixelSize = 8;
                     break;
                 case PixelFormat.R16G16B16A16_SNorm:
-                    format = Format.R16G16B16A16SNorm;
+                    format = VkFormat.R16G16B16A16SNorm;
                     pixelSize = 8;
                     break;
                 case PixelFormat.R16G16B16A16_UInt:
-                    format = Format.R16G16B16A16UInt;
+                    format = VkFormat.R16G16B16A16UInt;
                     pixelSize = 8;
                     break;
                 case PixelFormat.R16G16B16A16_SInt:
-                    format = Format.R16G16B16A16SInt;
+                    format = VkFormat.R16G16B16A16SInt;
                     pixelSize = 8;
                     break;
 
                 case PixelFormat.R32_UInt:
-                    format = Format.R32UInt;
+                    format = VkFormat.R32UInt;
                     pixelSize = 4;
                     break;
                 case PixelFormat.R32_Float:
-                    format = Format.R32SFloat;
+                    format = VkFormat.R32SFloat;
                     pixelSize = 4;
                     break;
 
                 case PixelFormat.R32G32_Float:
-                    format = Format.R32G32SFloat;
+                    format = VkFormat.R32G32SFloat;
                     pixelSize = 8;
                     break;
                 case PixelFormat.R32G32_UInt:
-                    format = Format.R32G32UInt;
+                    format = VkFormat.R32G32UInt;
                     pixelSize = 8;
                     break;
                 case PixelFormat.R32G32_SInt:
-                    format = Format.R32G32SInt;
+                    format = VkFormat.R32G32SInt;
                     pixelSize = 8;
                     break;
 
                 case PixelFormat.R32G32B32_Float:
-                    format = Format.R32G32B32SFloat;
+                    format = VkFormat.R32G32B32SFloat;
                     pixelSize = 12;
                     break;
                 case PixelFormat.R32G32B32_SInt:
-                    format = Format.R32G32B32SInt;
+                    format = VkFormat.R32G32B32SInt;
                     pixelSize = 12;
                     break;
                 case PixelFormat.R32G32B32_UInt:
-                    format = Format.R32G32B32UInt;
+                    format = VkFormat.R32G32B32UInt;
                     pixelSize = 12;
                     break;
 
                 case PixelFormat.R32G32B32A32_Float:
-                    format = Format.R32G32B32A32SFloat;
+                    format = VkFormat.R32G32B32A32SFloat;
                     pixelSize = 16;
                     break;
                 case PixelFormat.R32G32B32A32_SInt:
-                    format = Format.R32G32B32A32SInt;
+                    format = VkFormat.R32G32B32A32SInt;
                     pixelSize = 16;
                     break;
                 case PixelFormat.R32G32B32A32_UInt:
-                    format = Format.R32G32B32A32UInt;
+                    format = VkFormat.R32G32B32A32UInt;
                     pixelSize = 16;
                     break;
 
                 case PixelFormat.D16_UNorm:
-                    format = Format.D16UNorm;
+                    format = VkFormat.D16UNorm;
                     pixelSize = 2;
                     break;
                 case PixelFormat.D24_UNorm_S8_UInt:
-                    format = Format.D24UNormS8UInt;
+                    format = VkFormat.D24UNormS8UInt;
                     pixelSize = 4;
                     break;
                 // TODO: Temporary depth format (need to decide relation between RenderTarget1D and Texture)
                 case PixelFormat.D32_Float:
-                    format = Format.D32SFloat;
+                    format = VkFormat.D32SFloat;
                     pixelSize = 4;
                     break;
 
                 case PixelFormat.ETC1:
                 case PixelFormat.ETC2_RGB: // ETC1 upper compatible
-                    format = Format.Etc2R8G8B8UNormBlock;
+                    format = VkFormat.ETC2R8G8B8UNormBlock;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.ETC2_RGB_SRgb:
-                    format = Format.Etc2R8G8B8SRgbBlock;
+                    format = VkFormat.ETC2R8G8B8SRgbBlock;
                     compressed = true;
                     pixelSize = 1;
                     break;
                 case PixelFormat.ETC2_RGB_A1:
-                    format = Format.Etc2R8G8B8A1UNormBlock;
+                    format = VkFormat.ETC2R8G8B8A1UNormBlock;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.ETC2_RGBA: // ETC2 + EAC
-                    format = Format.Etc2R8G8B8A8UNormBlock;
+                    format = VkFormat.ETC2R8G8B8A8UNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.ETC2_RGBA_SRgb: // ETC2 + EAC
-                    format = Format.Etc2R8G8B8A8SRgbBlock;
+                    format = VkFormat.ETC2R8G8B8A8SRgbBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.EAC_R11_Unsigned:
-                    format = Format.EacR11UNormBlock;
+                    format = VkFormat.EACR11UNormBlock;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.EAC_R11_Signed:
-                    format = Format.EacR11SNormBlock;
+                    format = VkFormat.EACR11SNormBlock;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.EAC_RG11_Unsigned:
-                    format = Format.EacR11G11UNormBlock;
+                    format = VkFormat.EACR11G11UNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.EAC_RG11_Signed:
-                    format = Format.EacR11G11SNormBlock;
+                    format = VkFormat.EACR11G11SNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
 
                 case PixelFormat.BC1_UNorm:
-                    format = Format.Bc1RgbaUNormBlock;
-                    //format = Format.RAD_TEXTURE_FORMAT_DXT1_RGBA;
+                    format = VkFormat.BC1RGBAUNormBlock;
+                    //format = VkFormat.RAD_TEXTURE_FORMAT_DXT1_RGBA;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.BC1_UNorm_SRgb:
-                    format = Format.Bc1RgbaSRgbBlock;
-                    //format = Format.RAD_TEXTURE_FORMAT_DXT1_RGBA_SRgb;
+                    format = VkFormat.BC1RGBASRgbBlock;
+                    //format = VkFormat.RAD_TEXTURE_FORMAT_DXT1_RGBA_SRgb;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.BC2_UNorm:
-                    format = Format.Bc2UNormBlock;
+                    format = VkFormat.BC2UNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC2_UNorm_SRgb:
-                    format = Format.Bc2SRgbBlock;
+                    format = VkFormat.BC2SRgbBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC3_UNorm:
-                    format = Format.Bc3UNormBlock;
+                    format = VkFormat.BC3UNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC3_UNorm_SRgb:
-                    format = Format.Bc3SRgbBlock;
+                    format = VkFormat.BC3SRgbBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC4_SNorm:
-                    format = Format.Bc4SNormBlock;
+                    format = VkFormat.BC4SNormBlock;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.BC4_UNorm:
-                    format = Format.Bc4UNormBlock;
+                    format = VkFormat.BC4UNormBlock;
                     compressed = true;
                     pixelSize = 1; // 4bpp
                     break;
                 case PixelFormat.BC5_SNorm:
-                    format = Format.Bc5SNormBlock;
+                    format = VkFormat.BC5SNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC5_UNorm:
-                    format = Format.Bc5UNormBlock;
+                    format = VkFormat.BC5UNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC6H_Sf16:
-                    format = Format.Bc6HSFloatBlock;
+                    format = VkFormat.BC6HSFloatBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC6H_Uf16:
-                    format = Format.Bc6HUFloatBlock;
+                    format = VkFormat.BC6HUFloatBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC7_UNorm:
-                    format = Format.Bc7UNormBlock;
+                    format = VkFormat.BC7UNormBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
                 case PixelFormat.BC7_UNorm_SRgb:
-                    format = Format.Bc7SRgbBlock;
+                    format = VkFormat.BC7SRgbBlock;
                     compressed = true;
                     pixelSize = 2; // 8bpp
                     break;
@@ -508,19 +528,19 @@ public static void ConvertPixelFormat(PixelFormat inputFormat, out Format format
             }
         }
 
-        public static unsafe ColorComponentFlags ConvertColorWriteChannels(ColorWriteChannels colorWriteChannels)
+        public static unsafe VkColorComponentFlags ConvertColorWriteChannels(ColorWriteChannels colorWriteChannels)
         {
-            return *(ColorComponentFlags*)&colorWriteChannels;
+            return *(VkColorComponentFlags*)&colorWriteChannels;
         }
 
-        public static DescriptorType ConvertDescriptorType(EffectParameterClass @class, EffectParameterType type)
+        public static VkDescriptorType ConvertDescriptorType(EffectParameterClass @class, EffectParameterType type)
         {
             switch (@class)
             {
                 case EffectParameterClass.ConstantBuffer:
-                    return DescriptorType.UniformBuffer;
+                    return VkDescriptorType.UniformBuffer;
                 case EffectParameterClass.Sampler:
-                    return DescriptorType.Sampler;
+                    return VkDescriptorType.Sampler;
                 case EffectParameterClass.ShaderResourceView:
                     switch (type)
                     {
@@ -532,105 +552,122 @@ public static DescriptorType ConvertDescriptorType(EffectParameterClass @class,
                         case EffectParameterType.Texture1DArray:
                         case EffectParameterType.Texture2DArray:
                         case EffectParameterType.TextureCubeArray:
-                            return DescriptorType.SampledImage;
+                            return VkDescriptorType.SampledImage;
 
                         case EffectParameterType.Buffer:
-                            return DescriptorType.UniformTexelBuffer;
+                            return VkDescriptorType.UniformTexelBuffer;
 
                         default:
                             throw new NotImplementedException();
                     }
                 case EffectParameterClass.UnorderedAccessView:
-                    return DescriptorType.StorageBuffer;
+                    switch (type)
+                    {
+                        case EffectParameterType.Texture:
+                        case EffectParameterType.Texture1D:
+                        case EffectParameterType.Texture2D:
+                        case EffectParameterType.Texture3D:
+                        case EffectParameterType.TextureCube:
+                        case EffectParameterType.Texture1DArray:
+                        case EffectParameterType.Texture2DArray:
+                        case EffectParameterType.TextureCubeArray:
+                            return VkDescriptorType.StorageImage;
+
+                        case EffectParameterType.Buffer:
+                            return VkDescriptorType.StorageBuffer;
+
+                        default:
+                            throw new NotImplementedException();
+                    }
                 default:
                     throw new NotImplementedException();
             }
         }
 
-        public static int BlockSizeInBytes(this Format format)
+        public static int BlockSizeInBytes(this VkFormat format)
         {
             switch (format)
             {
-                case Format.Bc1RgbUNormBlock:
-                case Format.Bc1RgbSRgbBlock:
-                case Format.Bc1RgbaUNormBlock:
-                case Format.Bc1RgbaSRgbBlock:
+                case VkFormat.BC1RGBUNormBlock:
+                case VkFormat.BC1RGBSRgbBlock:
+                case VkFormat.BC1RGBAUNormBlock:
+                case VkFormat.BC1RGBASRgbBlock:
                     return 8;
 
-                case Format.Bc2UNormBlock:
-                case Format.Bc2SRgbBlock:
-                case Format.Bc3UNormBlock:
-                case Format.Bc3SRgbBlock:
+                case VkFormat.BC2UNormBlock:
+                case VkFormat.BC2SRgbBlock:
+                case VkFormat.BC3UNormBlock:
+                case VkFormat.BC3SRgbBlock:
                     return 16;
 
-                case Format.Bc4UNormBlock:
-                case Format.Bc4SNormBlock:
+                case VkFormat.BC4UNormBlock:
+                case VkFormat.BC4SNormBlock:
                     return 8;
 
-                case Format.Bc5UNormBlock:
-                case Format.Bc5SNormBlock:
-                case Format.Bc6HUFloatBlock:
-                case Format.Bc6HSFloatBlock:
-                case Format.Bc7UNormBlock:
-                case Format.Bc7SRgbBlock:
+                case VkFormat.BC5UNormBlock:
+                case VkFormat.BC5SNormBlock:
+                case VkFormat.BC6HUFloatBlock:
+                case VkFormat.BC6HSFloatBlock:
+                case VkFormat.BC7UNormBlock:
+                case VkFormat.BC7SRgbBlock:
                     return 16;
 
-                case Format.Etc2R8G8B8UNormBlock:
-                case Format.Etc2R8G8B8SRgbBlock:
-                case Format.Etc2R8G8B8A1UNormBlock:
-                case Format.Etc2R8G8B8A1SRgbBlock:
+                case VkFormat.ETC2R8G8B8UNormBlock:
+                case VkFormat.ETC2R8G8B8SRgbBlock:
+                case VkFormat.ETC2R8G8B8A1UNormBlock:
+                case VkFormat.ETC2R8G8B8A1SRgbBlock:
                     return 8;
 
-                case Format.Etc2R8G8B8A8UNormBlock:
-                case Format.Etc2R8G8B8A8SRgbBlock:
+                case VkFormat.ETC2R8G8B8A8UNormBlock:
+                case VkFormat.ETC2R8G8B8A8SRgbBlock:
                     return 16;
 
-                case Format.EacR11UNormBlock:
-                case Format.EacR11SNormBlock:
+                case VkFormat.EACR11UNormBlock:
+                case VkFormat.EACR11SNormBlock:
                     return 8;
 
-                case Format.EacR11G11UNormBlock:
-                case Format.EacR11G11SNormBlock:
+                case VkFormat.EACR11G11UNormBlock:
+                case VkFormat.EACR11G11SNormBlock:
                     return 16;
 
-                case Format.Astc4X4UNormBlock:
-                case Format.Astc4X4SRgbBlock:
-                case Format.Astc5X4UNormBlock:
-                case Format.Astc5X4SRgbBlock:
-                case Format.Astc5X5UNormBlock:
-                case Format.Astc5X5SRgbBlock:
-                case Format.Astc6X5UNormBlock:
-                case Format.Astc6X5SRgbBlock:
-                case Format.Astc6X6UNormBlock:
-                case Format.Astc6X6SRgbBlock:
-                case Format.Astc8X5UNormBlock:
-                case Format.Astc8X5SRgbBlock:
-                case Format.Astc8X6UNormBlock:
-                case Format.Astc8X6SRgbBlock:
-                case Format.Astc8X8UNormBlock:
-                case Format.Astc8X8SRgbBlock:
-                case Format.Astc10X5UNormBlock:
-                case Format.Astc10X5SRgbBlock:
-                case Format.Astc10X6UNormBlock:
-                case Format.Astc10X6SRgbBlock:
-                case Format.Astc10X8UNormBlock:
-                case Format.Astc10X8SRgbBlock:
-                case Format.Astc10X10UNormBlock:
-                case Format.Astc10X10SRgbBlock:
-                case Format.Astc12X10UNormBlock:
-                case Format.Astc12X10SRgbBlock:
-                case Format.Astc12X12UNormBlock:
-                case Format.Astc12X12SRgbBlock:
+                case VkFormat.ASTC4x4UNormBlock:
+                case VkFormat.ASTC4x4SRgbBlock:
+                case VkFormat.ASTC5x4UNormBlock:
+                case VkFormat.ASTC5x4SRgbBlock:
+                case VkFormat.ASTC5x5UNormBlock:
+                case VkFormat.ASTC5x5SRgbBlock:
+                case VkFormat.ASTC6x5UNormBlock:
+                case VkFormat.ASTC6x5SRgbBlock:
+                case VkFormat.ASTC6x6UNormBlock:
+                case VkFormat.ASTC6x6SRgbBlock:
+                case VkFormat.ASTC8x5UNormBlock:
+                case VkFormat.ASTC8x5SRgbBlock:
+                case VkFormat.ASTC8x6UNormBlock:
+                case VkFormat.ASTC8x6SRgbBlock:
+                case VkFormat.ASTC8x8UNormBlock:
+                case VkFormat.ASTC8x8SRgbBlock:
+                case VkFormat.ASTC10x5UNormBlock:
+                case VkFormat.ASTC10x5SRgbBlock:
+                case VkFormat.ASTC10x6UNormBlock:
+                case VkFormat.ASTC10x6SRgbBlock:
+                case VkFormat.ASTC10x8UNormBlock:
+                case VkFormat.ASTC10x8SRgbBlock:
+                case VkFormat.ASTC10x10UNormBlock:
+                case VkFormat.ASTC10x10SRgbBlock:
+                case VkFormat.ASTC12x10UNormBlock:
+                case VkFormat.ASTC12x10SRgbBlock:
+                case VkFormat.ASTC12x12UNormBlock:
+                case VkFormat.ASTC12x12SRgbBlock:
                     return 16;
 
-                //case Format.Pvrtc12BppUNormBlock:
-                //case Format.Pvrtc14BppUNormBlock:
-                //case Format.Pvrtc22BppUNormBlock:
-                //case Format.Pvrtc24BppUNormBlock:
-                //case Format.Pvrtc12BppSRgbBlock:
-                //case Format.Pvrtc14BppSRgbBlock:
-                //case Format.Pvrtc22BppSRgbBlock:
-                //case Format.Pvrtc24BppSRgbBlock:
+                //case VkFormat.Pvrtc12BppUNormBlock:
+                //case VkFormat.Pvrtc14BppUNormBlock:
+                //case VkFormat.Pvrtc22BppUNormBlock:
+                //case VkFormat.Pvrtc24BppUNormBlock:
+                //case VkFormat.Pvrtc12BppSRgbBlock:
+                //case VkFormat.Pvrtc14BppSRgbBlock:
+                //case VkFormat.Pvrtc22BppSRgbBlock:
+                //case VkFormat.Pvrtc24BppSRgbBlock:
                 //    return 8;
 
                 default:
diff --git a/sources/engine/Xenko.Graphics/Vulkan/VulkanMemoryPool.cs b/sources/engine/Xenko.Graphics/Vulkan/VulkanMemoryPool.cs
new file mode 100644
index 0000000000..45c9af8754
--- /dev/null
+++ b/sources/engine/Xenko.Graphics/Vulkan/VulkanMemoryPool.cs
@@ -0,0 +1,120 @@
+#if XENKO_GRAPHICS_API_VULKAN
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using Vortice.Vulkan;
+
+namespace Xenko.Graphics
+{
+    public class VulkanMemoryPool
+    {
+        internal static VkDeviceMemory BigMemoryPool = VkDeviceMemory.Null, SmallMemoryPool = VkDeviceMemory.Null;
+        internal static ConcurrentQueue<ulong> FreeBig = new ConcurrentQueue<ulong>(), FreeSmall = new ConcurrentQueue<ulong>();
+
+        internal static unsafe void AllocatePool(out VkDeviceMemory NativeMemory, ref VkDevice device, ref VkPhysicalDevice pDevice, ref VkMemoryPropertyFlags memoryProperties, ref VkMemoryRequirements memoryRequirements, ulong size)
+        {
+            var allocateInfo = new VkMemoryAllocateInfo
+            {
+                sType = VkStructureType.MemoryAllocateInfo,
+                allocationSize = size,
+            };
+
+            Vortice.Vulkan.Vulkan.vkGetPhysicalDeviceMemoryProperties(pDevice, out var physicalDeviceMemoryProperties);
+
+            var typeBits = memoryRequirements.memoryTypeBits;
+            for (uint i = 0; i < physicalDeviceMemoryProperties.memoryTypeCount; i++)
+            {
+                if ((typeBits & 1) == 1)
+                {
+                    // Type is available, does it match user properties?
+                    var memoryType = *(&physicalDeviceMemoryProperties.memoryTypes_0 + i);
+                    if ((memoryType.propertyFlags & memoryProperties) == memoryProperties)
+                    {
+                        allocateInfo.memoryTypeIndex = i;
+                        break;
+                    }
+                }
+                typeBits >>= 1;
+            }
+
+            NativeMemory = new VkDeviceMemory();
+
+            Vortice.Vulkan.Vulkan.vkAllocateMemory(device, &allocateInfo, null, out NativeMemory);
+        }
+
+        public static bool Free(Buffer buf, ulong offset)
+        {
+            if ((ulong)buf.SizeInBytes >= Buffer.SmallPooledBufferSize)
+            {
+                if (BigMemoryPool != VkDeviceMemory.Null)
+                {
+                    FreeBig.Enqueue(offset);
+                    Buffer.CurrentFreeBigPool = FreeBig.Count;
+                    return true;
+                }
+            }
+            else if (SmallMemoryPool != VkDeviceMemory.Null)
+            {
+                FreeSmall.Enqueue(offset);
+                Buffer.CurrentFreeSmallPool = FreeSmall.Count;
+                return true;
+            }
+            
+            return false;
+        }
+
+        public static bool TryAllocateMemoryForBuffer(ulong size, VkDevice device, VkPhysicalDevice pDevice, ref VkMemoryRequirements memoryRequirements, ref VkMemoryPropertyFlags memoryProperties, out ulong offset, out VkDeviceMemory mem)
+        {
+            if (size > Buffer.LargestBufferSize) Buffer.LargestBufferSize = size;
+
+            if (size >= Buffer.LargePooledBufferSize)
+            {
+                offset = 0;
+                mem = VkDeviceMemory.Null;
+                Buffer.PoolMissesDueToSize++;
+                return false;
+            }
+            else if (size >= Buffer.SmallPooledBufferSize) 
+            {
+                if (BigMemoryPool == VkDeviceMemory.Null)
+                {
+                    AllocatePool(out BigMemoryPool, ref device, ref pDevice, ref memoryProperties, ref memoryRequirements, Buffer.LargePooledBufferCount * Buffer.LargePooledBufferSize);
+                    for (ulong i = 0; i < Buffer.LargePooledBufferCount; i++)
+                        FreeBig.Enqueue(i * Buffer.LargePooledBufferSize);
+                }
+
+                if (FreeBig.TryDequeue(out offset))
+                {
+                    Buffer.CurrentFreeBigPool = FreeBig.Count;
+                    mem = BigMemoryPool;
+                    return true;
+                }
+            }
+            else
+            {
+                if (SmallMemoryPool == VkDeviceMemory.Null)
+                {
+                    AllocatePool(out SmallMemoryPool, ref device, ref pDevice, ref memoryProperties, ref memoryRequirements, Buffer.SmallPooledBufferCount * Buffer.SmallPooledBufferSize);
+                    for (ulong i = 0; i < Buffer.SmallPooledBufferCount; i++)
+                        FreeSmall.Enqueue(i * Buffer.SmallPooledBufferSize);
+                }
+
+                if (FreeSmall.TryDequeue(out offset))
+                {
+                    Buffer.CurrentFreeSmallPool = FreeSmall.Count;
+                    mem = SmallMemoryPool;
+                    return true;
+                }
+            }
+
+            offset = 0;
+            mem = VkDeviceMemory.Null;
+            Buffer.PoolMissesDueToExaustion++;
+            return false;
+        }
+    }
+}
+
+#endif
diff --git a/sources/engine/Xenko.Graphics/Xenko.Graphics.csproj b/sources/engine/Xenko.Graphics/Xenko.Graphics.csproj
index 5291e49086..f1a6d8faca 100644
--- a/sources/engine/Xenko.Graphics/Xenko.Graphics.csproj
+++ b/sources/engine/Xenko.Graphics/Xenko.Graphics.csproj
@@ -1,11 +1,10 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -14,6 +13,7 @@
     <XenkoProjectPlatformDependentWindows>true</XenkoProjectPlatformDependentWindows>
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoPackAssets>true</XenkoPackAssets>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <DefineConstants>$(DefineConstants);XENKO_GRAPHICS_NO_DESCRIPTOR_COPIES</DefineConstants>
   </PropertyGroup>
   <Choose>
@@ -21,28 +21,6 @@
     </When>
   </Choose>
   <Import Condition="$(XenkoUI.Contains('SDL'))" Project="..\..\targets\SDL.targets" />
-  <Choose>
-    <When Condition=" '$(XenkoGraphicsApi)' == 'Vulkan' ">
-      <Choose>
-        <When Condition=" '$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'macOS' ">
-          <ItemGroup>
-            <Reference Include="SharpVulkan">
-              <SpecificVersion>False</SpecificVersion>
-              <HintPath>$(XenkoDependenciesDir)\SharpVulkan\$(XenkoPlatform)\SharpVulkan.dll</HintPath>
-            </Reference>
-          </ItemGroup>
-        </When>
-        <Otherwise>
-          <ItemGroup>
-            <Reference Include="SharpVulkan">
-              <SpecificVersion>False</SpecificVersion>
-              <HintPath>$(XenkoDependenciesDir)\SharpVulkan\Other\SharpVulkan.dll</HintPath>
-            </Reference>
-          </ItemGroup>
-        </Otherwise>
-      </Choose>
-    </When>
-  </Choose>
   <Choose>
     <When Condition="$(XenkoUI.Contains('SDL'))">
       <ItemGroup>
@@ -68,144 +46,38 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </XenkoNativeLib>
   </ItemGroup>
-  <ItemGroup Condition=" '$(XenkoPlatform)' == 'iOS' Or '$(XenkoPlatform)' == 'Linux'">
+  <ItemGroup Condition="'$(XenkoPlatform)' == 'Linux'">
     <Reference Include="SharpFont">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(XenkoDependenciesDir)SharpFont\$(XenkoPlatform)\SharpFont.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition="'$(XenkoPlatform)' != 'iOS' And '$(XenkoPlatform)' != 'Linux'">
+  <ItemGroup Condition="'$(XenkoPlatform)' != 'Linux'">
     <Reference Include="SharpFont">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(XenkoDependenciesDir)SharpFont\Portable\SharpFont.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <!-- Files for Direct3D  -->
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Update="Shaders\ColorUtility.cs">
-      <DependentUpon>ColorUtility.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\SignedDistanceFieldFontShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SignedDistanceFieldFontShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\SignedDistanceFieldFont.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SignedDistanceFieldFont.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\SpriteAlphaCutoff.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpriteAlphaCutoff.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\SpriteEffectExtTexture.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpriteEffectExtTexture.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\SpriteEffectExtTextureRegular.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpriteEffectExtTextureRegular.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\SpriteSignedDistanceFieldFontShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpriteSignedDistanceFieldFontShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\SpriteSuperSampler.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpriteSuperSampler.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\UIEffect.cs">
-      <DependentUpon>UIEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\SpriteBatch.cs">
-      <DependentUpon>SpriteBatch.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\ShaderBaseStream.cs">
-      <DependentUpon>ShaderBaseStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="FrameworkResources.Designer.cs">
-      <DependentUpon>FrameworkResources.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\SpriteBase.cs">
-      <DependentUpon>SpriteBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\SpriteBatchShader.cs">
-      <DependentUpon>SpriteBatchShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\ShaderBase.cs">
-      <DependentUpon>ShaderBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\SpriteEffect.cs">
-      <DependentUpon>SpriteEffect.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\Texturing.cs">
-      <DependentUpon>Texturing.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Shaders\UIEffectShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>UIEffectShader.xksl</DependentUpon>
-    </Compile>
   </ItemGroup>
-  <!-- Files for Null device -->
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Native\Xenko.Native.csproj" />
     <ProjectReference Include="..\Xenko.Shaders\Xenko.Shaders.csproj" />
     <ProjectReference Include="..\Xenko\Xenko.csproj" />
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.1.1" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
-    <PackageReference Include="SharpDX.Direct3D12" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
-    <PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
-    <PackageReference Include="Xenko.OpenTK" Version="1.0.2" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'Linux' Or '$(XenkoPlatform)' == 'iOS' Or '$(XenkoPlatform)' == 'Android'" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="Vortice.Mathematics" Version="1.4.26" />
+    <PackageReference Include="Vortice.Vulkan" Version="1.2.170.2" />
   </ItemGroup>
   <ItemGroup>
-    <WCFMetadata Include="Service References\" />
+    <Compile Update="Shaders\ShaderBaseStream.xksl.cs">
+      <DesignTime>True</DesignTime>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="FrameworkResources.resx">
@@ -214,83 +86,14 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
-    <None Include="Shaders.Bytecodes\CompileShaders.cmd" />
-    <None Include="Shaders.Bytecodes\Graphics.xkpkg" />
-    <None Include="Shaders.Bytecodes\Shaders.xkeffectlog" />
-    <None Include="Shaders\SignedDistanceFieldFontShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SignedDistanceFieldFontShader.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SignedDistanceFieldFont.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SignedDistanceFieldFont.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteAlphaCutoff.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteAlphaCutoff.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteEffectExtTexture.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteEffectExtTexture.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteEffectExtTextureRegular.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteEffectExtTextureRegular.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteSignedDistanceFieldFontShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteSignedDistanceFieldFontShader.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteSuperSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteSuperSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\UIEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>UIEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteBatch.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteBatch.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ShaderBaseStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShaderBaseStream.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ColorUtility.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorUtility.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteBase.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteBatchShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteBatchShader.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ShaderBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShaderBase.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\SpriteEffect.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpriteEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\Texturing.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Texturing.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\UIEffectShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>UIEffectShader.cs</LastGenOutput>
+    <None Update="Shaders\ShaderBaseStream.xksl">
+      <LastGenOutput>ShaderBaseStream.xksl.cs</LastGenOutput>
     </None>
   </ItemGroup>
   <Import Project="..\Xenko.Shared\Refactor\Xenko.Refactor.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
@@ -298,7 +101,6 @@
   <Target Name="IncludeExtraAssemblies">
     <ItemGroup>
       <BuildOutputInPackage Include="$(OutputPath)SharpFont.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)SharpVulkan.dll" Condition=" '$(XenkoGraphicsApi)' == 'Vulkan' " />
       <BuildOutputInPackage Include="$(OutputPath)SDL2-CS.dll" Condition="$(XenkoUI.Contains('SDL'))" />
     </ItemGroup>
   </Target>
diff --git a/sources/engine/Xenko.Input.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Input.Tests/Properties/AndroidManifest.xml
index ffe35aa224..325cb1bebc 100644
--- a/sources/engine/Xenko.Input.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Input.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Input.Tests" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
   <application android:icon="@drawable/icon" android:label="Xenko Input" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>  
   <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Input.Tests/TestInput.cs b/sources/engine/Xenko.Input.Tests/TestInput.cs
index 60a78d68fe..1cde8ba61e 100644
--- a/sources/engine/Xenko.Input.Tests/TestInput.cs
+++ b/sources/engine/Xenko.Input.Tests/TestInput.cs
@@ -14,7 +14,7 @@ public TestInput()
         {
             EnableSimulatedInputSource();
         }
-        
+
         /// <summary>
         /// Checks keyboard press/release
         /// </summary>
@@ -25,7 +25,7 @@ void TestPressRelease()
 
             keyboard.SimulateDown(Keys.A);
             Input.Update(DrawTime);
-            
+
             // Test press
             Assert.Equal(1, events.Count);
             Assert.True(events[0] is KeyEvent);
@@ -72,7 +72,7 @@ void TestRepeat()
             Input.Update(DrawTime);
             keyboard.SimulateDown(Keys.A);
             Input.Update(DrawTime);
-            
+
             // Test press with release
             Assert.Equal(1, events.Count);
             Assert.True(events[0] is KeyEvent);
@@ -114,7 +114,7 @@ void TestMouse()
             mouse.SetPosition(targetPosition = new Vector2(0.6f, 0.5f));
             mouse.SimulateMouseDown(MouseButton.Left);
             Input.Update(DrawTime);
-            
+
             // Check for pointer events (2, 1 move, 1 down)
             Assert.Equal(2, Input.PointerEvents.Count);
             Assert.Equal(PointerEventType.Moved, Input.PointerEvents[0].EventType);
@@ -132,7 +132,7 @@ void TestMouse()
             Assert.Equal(1, mouse.PressedPointers.Count);
             Assert.Equal(0, mouse.ReleasedPointers.Count);
             Assert.Equal(1, mouse.DownPointers.Count);
-            
+
             // Check delta
             Assert.Equal(new Vector2(0.1f, 0.0f), Input.PointerEvents[0].DeltaPosition);
             Assert.Equal(new Vector2(0.0f, 0.0f), Input.PointerEvents[1].DeltaPosition);
@@ -175,7 +175,7 @@ void TestSingleFrameStates()
             Assert.True(Input.IsKeyPressed(Keys.Space));
             Assert.True(Input.IsKeyReleased(Keys.Space));
             Assert.False(Input.IsKeyDown(Keys.Space));
-            
+
             var mouse = MouseSimulated;
 
             mouse.SimulateMouseDown(MouseButton.Extended2);
@@ -185,7 +185,7 @@ void TestSingleFrameStates()
             Assert.True(Input.IsMouseButtonPressed(MouseButton.Extended2));
             Assert.True(Input.IsMouseButtonReleased(MouseButton.Extended2));
             Assert.False(Input.IsMouseButtonDown(MouseButton.Extended2));
-            
+
             mouse.SimulateMouseDown(MouseButton.Left);
             mouse.SimulateMouseUp(MouseButton.Left);
             mouse.SimulateMouseDown(MouseButton.Left);
@@ -198,7 +198,7 @@ void TestSingleFrameStates()
             mouse.SimulateMouseUp(MouseButton.Left);
             Input.Update(DrawTime);
         }
-        
+
         /// <summary>
         /// Checks adding/removal of keyboard and mouse
         /// </summary>
@@ -261,7 +261,7 @@ void TestLockedMousePosition()
             var mouse = MouseSimulated;
             mouse.LockPosition(true);
             Input.Update(DrawTime);
-            
+
             Assert.Equal(new Vector2(0.5f), mouse.Position);
             Input.Update(DrawTime);
 
@@ -276,7 +276,7 @@ void TestLockedMousePosition()
             Assert.Equal(new Vector2(0.5f, 0.5f), mouse.Position);
 
             mouse.UnlockPosition();
-            
+
             // Validate mouse delta with unlocked position
             mouse.SetPosition(new Vector2(0.6f, 0.5f));
             Input.Update(DrawTime);
@@ -292,9 +292,9 @@ void TestGamePad()
             Assert.Equal(0, InputSourceSimulated.GamePads.Count);
             Assert.False(Input.HasGamePad);
             Assert.Null(Input.DefaultGamePad);
-            
+
             var gamePad0 = InputSourceSimulated.AddGamePad();
-            
+
             Assert.Equal(1, Input.GamePadCount);
             Assert.True(Input.HasGamePad);
             Assert.NotNull(Input.DefaultGamePad);
@@ -334,13 +334,35 @@ void TestGamePad()
             Assert.False(gamePad0.IsButtonPressed(GamePadButton.A));
             Assert.True(gamePad0.IsButtonReleased(GamePadButton.A));
             Assert.False(gamePad0.IsButtonDown(GamePadButton.A));
-            
+
             InputSourceSimulated.RemoveGamePad(gamePad0);
             InputSourceSimulated.RemoveGamePad(gamePad1);
 
             Assert.Equal(0, Input.GamePadCount);
         }
 
+        /// <summary>
+        /// Checks whether VirtualButton.Find works for Keyboard, Mouse and GamePad.
+        /// </summary>
+        void TestVirtualButtonFind()
+        {
+            // Test Keyboard Keys
+            Assert.Equal(VirtualButton.Keyboard.A, VirtualButton.Find("Keyboard.a"));
+            Assert.Equal(VirtualButton.Keyboard.Z, VirtualButton.Find("Keyboard.z"));
+            Assert.Equal(VirtualButton.Keyboard.LeftCtrl, VirtualButton.Find("Keyboard.leftctrl"));
+            Assert.Equal(VirtualButton.Keyboard.LeftShift, VirtualButton.Find("Keyboard.leftshift"));
+
+            // Test Mouse Buttons
+            Assert.Equal(VirtualButton.Mouse.Left, VirtualButton.Find("Mouse.Left"));
+            Assert.Equal(VirtualButton.Mouse.PositionX, VirtualButton.Find("Mouse.PositionX"));
+            Assert.Equal(VirtualButton.Mouse.DeltaY, VirtualButton.Find("Mouse.DeltaY"));
+
+            // Test GamePad Buttons
+            Assert.Equal(VirtualButton.GamePad.LeftThumbAxisX, VirtualButton.Find("GamePad.LeftThumbAxisX"));
+            Assert.Equal(VirtualButton.GamePad.RightThumb, VirtualButton.Find("GamePad.RightThumb"));
+            Assert.Equal(VirtualButton.GamePad.A, VirtualButton.Find("GamePad.A"));
+        }
+
         protected override void RegisterTests()
         {
             base.RegisterTests();
@@ -352,6 +374,7 @@ protected override void RegisterTests()
             FrameGameSystem.Update(TestLockedMousePosition);
             FrameGameSystem.Update(TestSingleFrameStates);
             FrameGameSystem.Update(TestGamePad);
+            FrameGameSystem.Update(TestVirtualButtonFind);
         }
 
         [Fact]
diff --git a/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Android.csproj b/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Android.csproj
index 750a9885a9..9f9d9d20b9 100644
--- a/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Android.csproj
+++ b/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Android.csproj
@@ -24,7 +24,6 @@
     <MandroidI18n />
     <JavaMaximumHeapSize />
     <JavaOptions />
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <XenkoPlatform>Android</XenkoPlatform>
     <XenkoBuildProfile>Android</XenkoBuildProfile>
diff --git a/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Windows.csproj b/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Windows.csproj
index 609692f827..d0f3bd1f4f 100644
--- a/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Input.Tests</RootNamespace>
@@ -60,6 +60,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.iOS.csproj b/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.iOS.csproj
index 49c9d60e7c..ca6952ed3d 100644
--- a/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.iOS.csproj
+++ b/sources/engine/Xenko.Input.Tests/Xenko.Input.Tests.iOS.csproj
@@ -23,7 +23,6 @@
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
   </PropertyGroup>
   <PropertyGroup>
     <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Input.Tests.xkpkg</XenkoCurrentPackagePath>
diff --git a/sources/engine/Xenko.Input/GameControllerDeviceBase.cs b/sources/engine/Xenko.Input/GameControllerDeviceBase.cs
index ff293bbffa..0f730d51aa 100644
--- a/sources/engine/Xenko.Input/GameControllerDeviceBase.cs
+++ b/sources/engine/Xenko.Input/GameControllerDeviceBase.cs
@@ -40,9 +40,9 @@ protected GameControllerDeviceBase()
         public abstract IReadOnlyList<GameControllerAxisInfo> AxisInfos { get; }
         public abstract IReadOnlyList<GameControllerDirectionInfo> DirectionInfos { get; }
 
-        public IReadOnlySet<int> PressedButtons { get; }
-        public IReadOnlySet<int> ReleasedButtons { get; }
-        public IReadOnlySet<int> DownButtons { get; }
+        public Core.Collections.IReadOnlySet<int> PressedButtons { get; }
+        public Core.Collections.IReadOnlySet<int> ReleasedButtons { get; }
+        public Core.Collections.IReadOnlySet<int> DownButtons { get; }
 
         /// <summary>
         /// Creates the correct amount of states based on the amount of object infos that are set
diff --git a/sources/engine/Xenko.Input/GamePadDeviceBase.cs b/sources/engine/Xenko.Input/GamePadDeviceBase.cs
index 14eebd4b8f..317f6acb85 100644
--- a/sources/engine/Xenko.Input/GamePadDeviceBase.cs
+++ b/sources/engine/Xenko.Input/GamePadDeviceBase.cs
@@ -32,9 +32,9 @@ public int Index
             }
         }
 
-        public IReadOnlySet<GamePadButton> PressedButtons { get; }
-        public IReadOnlySet<GamePadButton> ReleasedButtons { get; }
-        public IReadOnlySet<GamePadButton> DownButtons { get; }
+        public Core.Collections.IReadOnlySet<GamePadButton> PressedButtons { get; }
+        public Core.Collections.IReadOnlySet<GamePadButton> ReleasedButtons { get; }
+        public Core.Collections.IReadOnlySet<GamePadButton> DownButtons { get; }
 
         public abstract IInputSource Source { get; }
 
diff --git a/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayoutGenericSDL.cs b/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayoutGenericSDL.cs
new file mode 100644
index 0000000000..fbd21e4a78
--- /dev/null
+++ b/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayoutGenericSDL.cs
@@ -0,0 +1,153 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+
+namespace Xenko.Input
+{
+    /// <summary>
+    /// Partial support of Game Controller DB for SDL in 2.0.9 format.
+    /// DPad remapping is ignored, partial axis (+aN, -aN) are ignored.
+    /// List of devices and mappings: https://github.com/gabomdq/SDL_GameControllerDB
+    /// </summary>
+    public class GamePadLayoutGenericSDL : GamePadLayout
+    {
+        public string DisplayName { get; }
+
+        public Guid ProductId { get; set; }
+
+        public GamePadLayoutGenericSDL(Guid productId, string displayName, Dictionary<string, string> properties)
+        {
+            ProductId = productId;
+            DisplayName = displayName;
+            foreach (var pair in properties)
+            {
+                var key = pair.Key;
+                var value = pair.Value;
+
+                var gamePadInputType = GetGamePadInputType(key);
+                var deviceInputType = GetDeviceInputType(value);
+
+                if (gamePadInputType == InputType.Button && deviceInputType == InputType.Button)
+                {
+                    AddButtonToButton(GetIndex(value), GetGamePadButton(key));
+                }
+                else if (gamePadInputType == InputType.Button && deviceInputType == InputType.Axis)
+                {
+                    AddAxisToButton(GetIndex(value), GetGamePadButton(key));
+                }
+                else if (gamePadInputType == InputType.Axis && deviceInputType == InputType.Axis)
+                {
+                    AddAxisToAxis(GetIndex(value), GetGamePadAxis(key), GetInverted(key, value), GetRemap(key));
+                }
+                else if (gamePadInputType == InputType.Axis && deviceInputType == InputType.Button)
+                {
+                    AddButtonToAxis(GetIndex(value), GetGamePadAxis(key), GetInverted(key, value));
+                }
+            }
+        }
+
+        public override bool MatchDevice(IInputSource source, IGameControllerDevice device)
+        {
+            return CompareProductId(device.ProductId, ProductId);
+        }
+
+        private static int GetIndex(string input)
+        {
+            int result = 0;
+            foreach (char c in input)
+            {
+                if (char.IsDigit(c))
+                {
+                    result *= 10;
+                    result += c - '0';
+                }
+            }
+
+            return result;
+        }
+
+        private static bool GetInverted(string key, string value)
+        {
+            // invert the Y axis input (SDL uses up left, we use up right?)
+            var byAxis = key == "lefty" || key == "righty";
+            return value.EndsWith("~") ? !byAxis : byAxis; // trailing ~ means invert axis
+        }
+
+        private static bool GetRemap(string input)
+        {
+            // Clamp trigger axis to (0, 1) instead of (-1, 1)
+            return input == "lefttrigger" || input == "righttrigger";
+        }
+
+        private static GamePadButton GetGamePadButton(string input)
+        {
+            switch (input)
+            {
+                case "a": return GamePadButton.A;
+                case "b": return GamePadButton.B;
+                case "x": return GamePadButton.X;
+                case "y": return GamePadButton.Y;
+                case "back": return GamePadButton.Back;
+                case "start": return GamePadButton.Start;
+                case "leftstick": return GamePadButton.LeftThumb;
+                case "rightstick": return GamePadButton.RightThumb;
+                case "leftshoulder": return GamePadButton.LeftShoulder;
+                case "rightshoulder": return GamePadButton.RightShoulder;
+                default: throw new InvalidOperationException("Unsupported button value (likely a bug).");
+            }
+        }
+
+        private static GamePadAxis GetGamePadAxis(string input)
+        {
+            switch (input)
+            {
+                case "leftx": return GamePadAxis.LeftThumbX;
+                case "lefty": return GamePadAxis.LeftThumbY;
+                case "rightx": return GamePadAxis.RightThumbX;
+                case "righty": return GamePadAxis.RightThumbY;
+                case "lefttrigger": return GamePadAxis.LeftTrigger;
+                case "righttrigger": return GamePadAxis.RightTrigger;
+                default: throw new InvalidOperationException("Unsupported axis value (likely a bug).");
+            }
+        }
+
+        private static InputType GetGamePadInputType(string input)
+        {
+            switch (input)
+            {
+                case "a":
+                case "b":
+                case "x":
+                case "y":
+                case "back":
+                case "start":
+                case "leftstick":
+                case "rightstick":
+                case "leftshoulder":
+                case "rightshoulder":
+                    return InputType.Button;
+                case "leftx":
+                case "lefty":
+                case "rightx":
+                case "righty":
+                case "lefttrigger":
+                case "righttrigger":
+                    return InputType.Axis;
+                default: return InputType.None;
+                // ignoring platform and dup,ddown,dleft,dright
+            }
+        }
+
+        private static InputType GetDeviceInputType(string input)
+        {
+            if (input[0] == 'b') return InputType.Button;
+            if (input[0] == 'a') return InputType.Axis;
+            // We ignore half axis here (-a0/+a0) and dpad (h0.1/h0.2/h0.4/h0.8)
+            return InputType.None;
+        }
+
+        private enum InputType { None, Button, Axis }
+    }
+}
diff --git a/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayouts.cs b/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayouts.cs
index 0bd5068bf7..76848ee1ec 100644
--- a/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayouts.cs
+++ b/sources/engine/Xenko.Input/GamePadLayouts/GamePadLayouts.cs
@@ -1,7 +1,12 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using Xenko.Core;
 
 namespace Xenko.Input
 {
@@ -19,6 +24,8 @@ static GamePadLayouts()
 
             // Support for DualShock4 controllers
             AddLayout(new GamePadLayoutDS4());
+
+            LoadGenericSDLLayouts();
         }
 
         /// <summary>
@@ -36,6 +43,85 @@ public static void AddLayout(GamePadLayout layout)
             }
         }
 
+        private static void LoadGenericSDLLayouts()
+        {
+            const string filename = "gamecontrollerdb.txt";
+
+            string[] contents = null;
+            foreach (var searchpath in new[]
+            {
+                Path.GetDirectoryName(typeof(GamePadLayoutGenericSDL).Assembly.Location),
+                Path.GetDirectoryName(Process.GetCurrentProcess().MainModule.FileName),
+                Environment.CurrentDirectory,
+            })
+            {
+                var filePath = Path.Combine(searchpath ?? string.Empty, filename);
+                if (File.Exists(filePath))
+                {
+                    contents = File.ReadAllLines(filePath);
+                    break;
+                }
+            }
+
+            if (contents == null)
+                return; // file was not found
+
+            foreach (var line in contents)
+            {
+                if (line.StartsWith("#") || string.IsNullOrWhiteSpace(line))
+                    continue;
+
+                var chunks = line.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
+
+                if (chunks.Length < 3 || !TryParseSDLGuid(chunks[0], out Guid id))
+                    continue; // invalid format
+
+                var name = chunks[1];
+                var properties = new Dictionary<string, string>(chunks.Length - 2);
+
+                for (int i = 2; i < chunks.Length; i++)
+                {
+                    var indexOfSeparator = chunks[i].IndexOf(':');
+                    var key = chunks[i].Substring(0, indexOfSeparator);
+                    var value = chunks[i].Substring(indexOfSeparator + 1);
+                    properties.Add(key, value);
+                }
+
+                if (properties.TryGetValue("platform", out string controllerPlatform) && CompatibleWithCurrentPlatform(controllerPlatform))
+                    AddLayout(new GamePadLayoutGenericSDL(id, name, properties));
+            }
+        }
+
+        private static bool TryParseSDLGuid(string input, out Guid guid)
+        {
+            guid = default;
+
+            if (input.Length != 32)
+                return false;
+
+            // The guid is in big endian hex format - which aligns with the Guid constructor from bytes
+            Span<byte> bytes = stackalloc byte[16];
+            for (int i = 0; i < 32; i += 2)
+            {
+                if (!byte.TryParse(input.AsSpan(i, 2).ToString(), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out var b))
+                    return false;
+                bytes[i / 2] = b;
+            }
+
+            guid = new Guid(bytes.ToArray());
+            return true;
+        }
+
+        private static bool CompatibleWithCurrentPlatform(string controllerPlatform)
+        {
+            return
+                (controllerPlatform == "Windows" && (Platform.Type == PlatformType.Windows || Platform.Type == PlatformType.UWP)) ||
+                (controllerPlatform == "Mac OS X" && Platform.Type == PlatformType.macOS) ||
+                (controllerPlatform == "Linux" && Platform.Type == PlatformType.Linux) ||
+                (controllerPlatform == "Android" && Platform.Type == PlatformType.Android) ||
+                (controllerPlatform == "iOS" && Platform.Type == PlatformType.iOS);
+        }
+
         /// <summary>
         /// Finds a layout matching the given gamepad
         /// </summary>
@@ -55,4 +141,4 @@ public static GamePadLayout FindLayout(IInputSource source, IGameControllerDevic
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Input/IGameControllerDevice.cs b/sources/engine/Xenko.Input/IGameControllerDevice.cs
index 6a9d7e9f75..6e0795d16b 100644
--- a/sources/engine/Xenko.Input/IGameControllerDevice.cs
+++ b/sources/engine/Xenko.Input/IGameControllerDevice.cs
@@ -35,17 +35,17 @@ public interface IGameControllerDevice : IInputDevice
         /// <summary>
         /// The buttons that have been pressed since the last frame
         /// </summary>
-        IReadOnlySet<int> PressedButtons { get; }
+        Core.Collections.IReadOnlySet<int> PressedButtons { get; }
 
         /// <summary>
         /// The buttons that have been released since the last frame
         /// </summary>
-        IReadOnlySet<int> ReleasedButtons { get; }
+        Core.Collections.IReadOnlySet<int> ReleasedButtons { get; }
 
         /// <summary>
         /// The buttons that are down
         /// </summary>
-        IReadOnlySet<int> DownButtons { get; }
+        Core.Collections.IReadOnlySet<int> DownButtons { get; }
         
         /// <summary>
         /// Retrieves the state of a single axis
diff --git a/sources/engine/Xenko.Input/IGamePadDevice.cs b/sources/engine/Xenko.Input/IGamePadDevice.cs
index 1e02d8be77..b058280382 100644
--- a/sources/engine/Xenko.Input/IGamePadDevice.cs
+++ b/sources/engine/Xenko.Input/IGamePadDevice.cs
@@ -37,17 +37,17 @@ public interface IGamePadDevice : IInputDevice
         /// <summary>
         /// The gamepad buttons that have been pressed since the last frame
         /// </summary>
-        IReadOnlySet<GamePadButton> PressedButtons { get; }
+        Core.Collections.IReadOnlySet<GamePadButton> PressedButtons { get; }
 
         /// <summary>
         /// The gamepad buttons that have been released since the last frame
         /// </summary>
-        IReadOnlySet<GamePadButton> ReleasedButtons { get; }
+        Core.Collections.IReadOnlySet<GamePadButton> ReleasedButtons { get; }
 
         /// <summary>
         /// The gamepad buttons that are down
         /// </summary>
-        IReadOnlySet<GamePadButton> DownButtons { get; }
+        Core.Collections.IReadOnlySet<GamePadButton> DownButtons { get; }
 
         /// <summary>
         /// Raised if the index assigned to this gamepad changed
diff --git a/sources/engine/Xenko.Input/IKeyboardDevice.cs b/sources/engine/Xenko.Input/IKeyboardDevice.cs
index 6e0b667b51..c7f1e0804d 100644
--- a/sources/engine/Xenko.Input/IKeyboardDevice.cs
+++ b/sources/engine/Xenko.Input/IKeyboardDevice.cs
@@ -14,16 +14,16 @@ public interface IKeyboardDevice : IInputDevice
         /// <summary>
         /// The keys that have been pressed since the last frame
         /// </summary>
-        IReadOnlySet<Keys> PressedKeys { get; }
+        Core.Collections.IReadOnlySet<Keys> PressedKeys { get; }
 
         /// <summary>
         /// The keys that have been released since the last frame
         /// </summary>
-        IReadOnlySet<Keys> ReleasedKeys { get; }
+        Core.Collections.IReadOnlySet<Keys> ReleasedKeys { get; }
 
         /// <summary>
         /// List of keys that are currently down on this keyboard
         /// </summary>
-        IReadOnlySet<Keys> DownKeys { get; }
+        Core.Collections.IReadOnlySet<Keys> DownKeys { get; }
     }
 }
\ No newline at end of file
diff --git a/sources/engine/Xenko.Input/IMouseDevice.cs b/sources/engine/Xenko.Input/IMouseDevice.cs
index d373ca3a66..acc316aed2 100644
--- a/sources/engine/Xenko.Input/IMouseDevice.cs
+++ b/sources/engine/Xenko.Input/IMouseDevice.cs
@@ -24,17 +24,17 @@ public interface IMouseDevice : IPointerDevice
         /// <summary>
         /// The mouse buttons that have been pressed since the last frame
         /// </summary>
-        IReadOnlySet<MouseButton> PressedButtons { get; }
+        Core.Collections.IReadOnlySet<MouseButton> PressedButtons { get; }
 
         /// <summary>
         /// The mouse buttons that have been released since the last frame
         /// </summary>
-        IReadOnlySet<MouseButton> ReleasedButtons { get; }
+        Core.Collections.IReadOnlySet<MouseButton> ReleasedButtons { get; }
 
         /// <summary>
         /// The mouse buttons that are down
         /// </summary>
-        IReadOnlySet<MouseButton> DownButtons { get; }
+        Core.Collections.IReadOnlySet<MouseButton> DownButtons { get; }
         
         /// <summary>
         /// Gets or sets if the mouse is locked to the screen
@@ -50,7 +50,7 @@ public interface IMouseDevice : IPointerDevice
         /// <summary>
         /// Unlocks the mouse position if it was locked
         /// </summary>
-        void UnlockPosition();
+        void UnlockPosition(bool restoreVisibility = true);
 
         /// <summary>
         /// Attempts to set the pointer position, this only makes sense for mouse pointers
@@ -58,4 +58,4 @@ public interface IMouseDevice : IPointerDevice
         /// <param name="normalizedPosition"></param>
         void SetPosition(Vector2 normalizedPosition);
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Input/IPointerDevice.cs b/sources/engine/Xenko.Input/IPointerDevice.cs
index 3303d87cac..dbf0ee20f5 100644
--- a/sources/engine/Xenko.Input/IPointerDevice.cs
+++ b/sources/engine/Xenko.Input/IPointerDevice.cs
@@ -26,17 +26,17 @@ public interface IPointerDevice : IInputDevice
         /// <summary>
         /// The index of the pointers that have been pressed since the last frame
         /// </summary>
-        IReadOnlySet<PointerPoint> PressedPointers { get; }
+        Core.Collections.IReadOnlySet<PointerPoint> PressedPointers { get; }
 
         /// <summary>
         /// The index of the pointers that have been released since the last frame
         /// </summary>
-        IReadOnlySet<PointerPoint> ReleasedPointers { get; }
+        Core.Collections.IReadOnlySet<PointerPoint> ReleasedPointers { get; }
 
         /// <summary>
         /// The index of the pointers that are down
         /// </summary>
-        IReadOnlySet<PointerPoint> DownPointers { get; }
+        Core.Collections.IReadOnlySet<PointerPoint> DownPointers { get; }
 
         /// <summary>
         /// Raised when the surface size of this pointer changed
diff --git a/sources/engine/Xenko.Input/InputManager.State.cs b/sources/engine/Xenko.Input/InputManager.State.cs
index e57dbe06ac..73f6dc27d2 100644
--- a/sources/engine/Xenko.Input/InputManager.State.cs
+++ b/sources/engine/Xenko.Input/InputManager.State.cs
@@ -106,7 +106,7 @@ public bool HasDownKeys
         /// <summary>
         /// The keys that have been pressed since the last frame
         /// </summary>
-        public IReadOnlySet<Keys> PressedKeys
+        public Core.Collections.IReadOnlySet<Keys> PressedKeys
         {
             get
             {
@@ -118,7 +118,7 @@ public IReadOnlySet<Keys> PressedKeys
         /// <summary>
         /// The keys that have been released since the last frame
         /// </summary>
-        public IReadOnlySet<Keys> ReleasedKeys
+        public Core.Collections.IReadOnlySet<Keys> ReleasedKeys
         {
             get
             {
@@ -130,7 +130,7 @@ public IReadOnlySet<Keys> ReleasedKeys
         /// <summary>
         /// The keys that are down
         /// </summary>
-        public IReadOnlySet<Keys> DownKeys
+        public Core.Collections.IReadOnlySet<Keys> DownKeys
         {
             get
             {
@@ -142,7 +142,7 @@ public IReadOnlySet<Keys> DownKeys
         /// <summary>
         /// The mouse buttons that have been pressed since the last frame
         /// </summary>
-        public IReadOnlySet<MouseButton> PressedButtons
+        public Core.Collections.IReadOnlySet<MouseButton> PressedButtons
         {
             get
             {
@@ -154,7 +154,7 @@ public IReadOnlySet<MouseButton> PressedButtons
         /// <summary>
         /// The mouse buttons that have been released since the last frame
         /// </summary>
-        public IReadOnlySet<MouseButton> ReleasedButtons
+        public Core.Collections.IReadOnlySet<MouseButton> ReleasedButtons
         {
             get
             {
@@ -166,7 +166,7 @@ public IReadOnlySet<MouseButton> ReleasedButtons
         /// <summary>
         /// The mouse buttons that are down
         /// </summary>
-        public IReadOnlySet<MouseButton> DownButtons
+        public Core.Collections.IReadOnlySet<MouseButton> DownButtons
         {
             get
             {
diff --git a/sources/engine/Xenko.Input/InputManager.cs b/sources/engine/Xenko.Input/InputManager.cs
index a7c367844a..32c25f8474 100644
--- a/sources/engine/Xenko.Input/InputManager.cs
+++ b/sources/engine/Xenko.Input/InputManager.cs
@@ -28,6 +28,7 @@ public partial class InputManager : GameSystemBase
         public static float GameControllerAxisDeadZone = 0.05f;
         
         internal static Logger Logger = GlobalLogger.GetLogger("Input");
+        internal static InputManager instance;
 
         private readonly List<IInputDevice> devices = new List<IInputDevice>();
 
@@ -293,6 +294,8 @@ public static Vector2 TransformPosition(Size2F fromSize, RectangleF destinationR
 
         public override void Initialize()
         {
+            instance = this;
+
             base.Initialize();
 
             Game.Activated += OnApplicationResumed;
@@ -341,14 +344,14 @@ public void LockMousePosition(bool forceCenter = false)
         }
 
         /// <summary>
-        /// Unlock the mouse's position previously locked by calling <see cref="LockMousePosition"/> and restore the mouse visibility.
+        /// Unlock the mouse's position previously locked by calling <see cref="LockMousePosition"/>. By default restores mouse visibility.
         /// </summary>
         /// <remarks>This function has no effects on devices that does not have mouse</remarks>
-        public void UnlockMousePosition()
+        public void UnlockMousePosition(bool restoreVisibility = true)
         {
             if (HasMouse)
             {
-                Mouse.UnlockPosition();
+                Mouse.UnlockPosition(restoreVisibility);
             }
         }
 
@@ -924,7 +927,7 @@ private void UpdateVirtualButtonValues()
                     {
                         foreach (var name in config.BindingNames)
                         {
-                            mapNameToValue[name] = config.GetValue(this, name);
+                            mapNameToValue[name] = config.GetValue(name);
                         }
                     }
                 }
diff --git a/sources/engine/Xenko.Input/KeyEvent.cs b/sources/engine/Xenko.Input/KeyEvent.cs
index 6709f8c5d0..3fb76ac54d 100644
--- a/sources/engine/Xenko.Input/KeyEvent.cs
+++ b/sources/engine/Xenko.Input/KeyEvent.cs
@@ -8,6 +8,11 @@ namespace Xenko.Input
     /// </summary>
     public class KeyEvent : ButtonEvent
     {
+        /// <summary>
+        /// Should we filter out keyboard repeating? Defaults to true. Currently implemented for SDL input only
+        /// </summary>
+        public static bool DisableRepeats = true;
+
         /// <summary>
         /// The key that is being pressed or released.
         /// </summary>
diff --git a/sources/engine/Xenko.Input/KeyboardDeviceBase.cs b/sources/engine/Xenko.Input/KeyboardDeviceBase.cs
index 67c148a23b..8cb05c20b7 100644
--- a/sources/engine/Xenko.Input/KeyboardDeviceBase.cs
+++ b/sources/engine/Xenko.Input/KeyboardDeviceBase.cs
@@ -27,9 +27,9 @@ protected KeyboardDeviceBase()
             DownKeys = new ReadOnlySet<Keys>(downKeys);
         }
 
-        public IReadOnlySet<Keys> PressedKeys { get; }
-        public IReadOnlySet<Keys> ReleasedKeys { get; }
-        public IReadOnlySet<Keys> DownKeys { get; }
+        public Core.Collections.IReadOnlySet<Keys> PressedKeys { get; }
+        public Core.Collections.IReadOnlySet<Keys> ReleasedKeys { get; }
+        public Core.Collections.IReadOnlySet<Keys> DownKeys { get; }
 
         public abstract string Name { get; }
 
diff --git a/sources/engine/Xenko.Input/Keys.cs b/sources/engine/Xenko.Input/Keys.cs
index e950d292a3..5b95f086d5 100644
--- a/sources/engine/Xenko.Input/Keys.cs
+++ b/sources/engine/Xenko.Input/Keys.cs
@@ -1,8 +1,154 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
-namespace Xenko.Input
-{
+using System.Collections.Generic;
+
+namespace Xenko.Input {
+
+    public class CharConverter {
+
+        private static Dictionary<Keys, char> keyToChar = new Dictionary<Keys, char>() {
+            {Keys.Tilde        , '`'},
+            {Keys.D1              , '1'},
+            {Keys.D2              , '2'},
+            {Keys.D3              , '3'},
+            {Keys.D4              , '4'},
+            {Keys.D5              , '5'},
+            {Keys.D6              , '6'},
+            {Keys.D7              , '7'},
+            {Keys.D8              , '8'},
+            {Keys.D9              , '9'},
+            {Keys.D0              , '0'},
+            {Keys.NumPad1         , '1'},
+            {Keys.NumPad2         , '2'},
+            {Keys.NumPad3         , '3'},
+            {Keys.NumPad4         , '4'},
+            {Keys.NumPad5         , '5'},
+            {Keys.NumPad6         , '6'},
+            {Keys.NumPad7         , '7'},
+            {Keys.NumPad8         , '8'},
+            {Keys.NumPad9         , '9'},
+            {Keys.NumPad0         , '0'},
+            {Keys.Divide          , '/'},
+            {Keys.Multiply        , '*'},
+            {Keys.Subtract        , '-'},
+            {Keys.Add             , '+'},
+            {Keys.A               , 'a'},
+            {Keys.B               , 'b'},
+            {Keys.C               , 'c'},
+            {Keys.D               , 'd'},
+            {Keys.E               , 'e'},
+            {Keys.F               , 'f'},
+            {Keys.G               , 'g'},
+            {Keys.H               , 'h'},
+            {Keys.I               , 'i'},
+            {Keys.J               , 'j'},
+            {Keys.K               , 'k'},
+            {Keys.L               , 'l'},
+            {Keys.M               , 'm'},
+            {Keys.N               , 'n'},
+            {Keys.O               , 'o'},
+            {Keys.P               , 'p'},
+            {Keys.Q               , 'q'},
+            {Keys.R               , 'r'},
+            {Keys.S               , 's'},
+            {Keys.T               , 't'},
+            {Keys.U               , 'u'},
+            {Keys.V               , 'v'},
+            {Keys.W               , 'w'},
+            {Keys.X               , 'x'},
+            {Keys.Y               , 'y'},
+            {Keys.Z               , 'z'},
+            {Keys.Tab             , '\t'},
+            {Keys.Minus        , '-'},
+            {Keys.Equals         , '='},
+            {Keys.Plus        , '+' },
+            {Keys.OpenBrackets , '['},
+            {Keys.CloseBrackets, ']'},
+            {Keys.Pipe         , '\\'},
+            {Keys.Backslash    , '\\' },
+            {Keys.Semicolon    , ';'},
+            {Keys.Quotes       , '\''},
+            {Keys.Comma        , ','},
+            {Keys.Period       , '.'},
+            {Keys.Question     , '/'},
+            {Keys.ForwardSlash , '/'},
+            {Keys.Space           , ' '},
+            {Keys.Decimal         , '.'},
+            {Keys.Return          , '\n'},
+            {Keys.Colon           , ';' },
+            {Keys.Back            , '\b'}
+        };
+
+        private static Dictionary<Keys, char> keyToCharShift = new Dictionary<Keys, char>() {
+            {Keys.Tilde        , '~'},
+            {Keys.D1              , '!'},
+            {Keys.D2              , '@'},
+            {Keys.D3              , '#'},
+            {Keys.D4              , '$'},
+            {Keys.D5              , '%'},
+            {Keys.D6              , '^'},
+            {Keys.D7              , '&'},
+            {Keys.D8              , '*'},
+            {Keys.D9              , '('},
+            {Keys.D0              , ')'},
+            {Keys.Divide          , '/'},
+            {Keys.Multiply        , '*'},
+            {Keys.Subtract        , '-'},
+            {Keys.Add             , '+'},
+            {Keys.A               , 'A'},
+            {Keys.B               , 'B'},
+            {Keys.C               , 'C'},
+            {Keys.D               , 'D'},
+            {Keys.E               , 'E'},
+            {Keys.F               , 'F'},
+            {Keys.G               , 'G'},
+            {Keys.H               , 'H'},
+            {Keys.I               , 'I'},
+            {Keys.J               , 'J'},
+            {Keys.K               , 'K'},
+            {Keys.L               , 'L'},
+            {Keys.M               , 'M'},
+            {Keys.N               , 'N'},
+            {Keys.O               , 'O'},
+            {Keys.P               , 'P'},
+            {Keys.Q               , 'Q'},
+            {Keys.R               , 'R'},
+            {Keys.S               , 'S'},
+            {Keys.T               , 'T'},
+            {Keys.U               , 'U'},
+            {Keys.V               , 'V'},
+            {Keys.W               , 'W'},
+            {Keys.X               , 'X'},
+            {Keys.Y               , 'Y'},
+            {Keys.Z               , 'Z'},
+            {Keys.Minus        , '_'},
+            {Keys.Plus         , '+'},
+            {Keys.Equals         , '+'},
+            {Keys.OpenBrackets , '{'},
+            {Keys.CloseBrackets, '}'},
+            {Keys.Pipe         , '|'},
+            {Keys.Backslash    , '|' },
+            {Keys.Semicolon    , ':'},
+            {Keys.Quotes       , '\"'},
+            {Keys.Comma        , '<'},
+            {Keys.Period       , '>'},
+            {Keys.Question     , '?'},
+            {Keys.ForwardSlash , '?' },
+            {Keys.Colon        , ':' },
+            {Keys.Space           , ' '},
+            {Keys.Return          , '\n'},
+            {Keys.Back            , '\b'}
+        };
+
+        public static char Get(Keys key, bool shift = false) {
+            if (!shift) {
+                if (keyToChar.TryGetValue(key, out char val)) return val;
+            } else if (keyToCharShift.TryGetValue(key, out char val)) return val;
+            return '\0';
+        }
+    }
+
     /// <summary>
     /// Enumeration for keys.
     /// </summary>
@@ -743,110 +889,70 @@ public enum Keys
         /// </summary>
         LaunchApplication2 = 139,
 
-        /// <summary>
-        /// The 'oem1' key.
-        /// </summary>
-        Oem1 = 140,
-
         /// <summary>
         /// The 'oemsemicolon' key.
         /// </summary>
-        OemSemicolon = 140,
+        Semicolon = 140,
 
         /// <summary>
         /// The 'oemplus' key.
         /// </summary>
-        OemPlus = 141,
+        Plus = 141,
 
         /// <summary>
         /// The 'oemcomma' key.
         /// </summary>
-        OemComma = 142,
+        Comma = 142,
 
         /// <summary>
         /// The 'oemminus' key.
         /// </summary>
-        OemMinus = 143,
+        Minus = 143,
 
         /// <summary>
         /// The 'oemperiod' key.
         /// </summary>
-        OemPeriod = 144,
-
-        /// <summary>
-        /// The 'oem2' key.
-        /// </summary>
-        Oem2 = 145,
+        Period = 144,
 
         /// <summary>
         /// The 'oemquestion' key.
         /// </summary>
-        OemQuestion = 145,
-
-        /// <summary>
-        /// The 'oem3' key.
-        /// </summary>
-        Oem3 = 146,
+        Question = 145,
 
         /// <summary>
         /// The 'oemtilde' key.
         /// </summary>
-        OemTilde = 146,
-
-        /// <summary>
-        /// The 'oem4' key.
-        /// </summary>
-        Oem4 = 149,
+        Tilde = 146,
 
         /// <summary>
         /// The 'oemopenbrackets' key.
         /// </summary>
-        OemOpenBrackets = 149,
-
-        /// <summary>
-        /// The 'oem5' key.
-        /// </summary>
-        Oem5 = 150,
+        OpenBrackets = 149,
 
         /// <summary>
         /// The 'oempipe' key.
         /// </summary>
-        OemPipe = 150,
-
-        /// <summary>
-        /// The 'oem6' key.
-        /// </summary>
-        Oem6 = 151,
+        Pipe = 150,
 
         /// <summary>
         /// The 'oemclosebrackets' key.
         /// </summary>
-        OemCloseBrackets = 151,
-
-        /// <summary>
-        /// The 'oem7' key.
-        /// </summary>
-        Oem7 = 152,
+        CloseBrackets = 151,
 
         /// <summary>
         /// The 'oemquotes' key.
         /// </summary>
-        OemQuotes = 152,
+        Quotes = 152,
 
         /// <summary>
         /// The 'oem8' key.
         /// </summary>
         Oem8 = 153,
 
-        /// <summary>
-        /// The 'oem102' key.
-        /// </summary>
-        Oem102 = 154,
-
         /// <summary>
         /// The 'oembackslash' key.
         /// </summary>
-        OemBackslash = 154,
+        Backslash = 154,
 
         /// <summary>
         /// The 'attn' key.
@@ -902,5 +1008,30 @@ public enum Keys
         /// The 'numpad decimal' key.
         /// </summary>
         NumPadDecimal = 181,
+
+        /// <summary>
+        /// The 'equals' key
+        /// </summary>
+        Equals = 182,
+
+        /// <summary>
+        /// The ':' key
+        /// </summary>
+        Colon = 183,
+
+        /// <summary>
+        /// The '/' key
+        /// </summary>
+        ForwardSlash = 184,
+
+        /// <summary>
+        /// The ' key
+        /// </summary>
+        SingleQuote = 185,
+
+        /// <summary>
+        /// The ` key
+        /// </summary>
+        BackQuote = 186
     }
 }
\ No newline at end of file
diff --git a/sources/engine/Xenko.Input/MouseDeviceBase.cs b/sources/engine/Xenko.Input/MouseDeviceBase.cs
index fdadbbf803..f0afbab3ed 100644
--- a/sources/engine/Xenko.Input/MouseDeviceBase.cs
+++ b/sources/engine/Xenko.Input/MouseDeviceBase.cs
@@ -21,9 +21,9 @@ protected MouseDeviceBase()
 
         public abstract bool IsPositionLocked { get; }
 
-        public IReadOnlySet<MouseButton> PressedButtons => MouseState.PressedButtons;
-        public IReadOnlySet<MouseButton> ReleasedButtons => MouseState.ReleasedButtons;
-        public IReadOnlySet<MouseButton> DownButtons => MouseState.DownButtons;
+        public Core.Collections.IReadOnlySet<MouseButton> PressedButtons => MouseState.PressedButtons;
+        public Core.Collections.IReadOnlySet<MouseButton> ReleasedButtons => MouseState.ReleasedButtons;
+        public Core.Collections.IReadOnlySet<MouseButton> DownButtons => MouseState.DownButtons;
 
         public Vector2 Position => MouseState.Position;
         public Vector2 Delta => MouseState.Delta;
@@ -38,6 +38,6 @@ public override void Update(List<InputEvent> inputEvents)
         
         public abstract void LockPosition(bool forceCenter = false);
         
-        public abstract void UnlockPosition();
+        public abstract void UnlockPosition(bool restoreVisibility = true);
     }
 }
diff --git a/sources/engine/Xenko.Input/MouseDeviceState.cs b/sources/engine/Xenko.Input/MouseDeviceState.cs
index 2c2eb684c5..7022943acd 100644
--- a/sources/engine/Xenko.Input/MouseDeviceState.cs
+++ b/sources/engine/Xenko.Input/MouseDeviceState.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
@@ -34,9 +34,9 @@ public MouseDeviceState(PointerDeviceState pointerState, IMouseDevice mouseDevic
             ReleasedButtons = new ReadOnlySet<MouseButton>(releasedButtons);
         }
 
-        public IReadOnlySet<MouseButton> PressedButtons { get; }
-        public IReadOnlySet<MouseButton> ReleasedButtons { get; }
-        public IReadOnlySet<MouseButton> DownButtons { get; }
+        public Core.Collections.IReadOnlySet<MouseButton> PressedButtons { get; }
+        public Core.Collections.IReadOnlySet<MouseButton> ReleasedButtons { get; }
+        public Core.Collections.IReadOnlySet<MouseButton> DownButtons { get; }
         
         public Vector2 Position { get; set; }
         public Vector2 Delta { get; set; }
@@ -117,9 +117,7 @@ public void HandleButtonDown(MouseButton button)
             buttonEvent.IsDown = true;
             Events.Add(buttonEvent);
 
-            // Simulate tap on primary mouse button
-            if (button == MouseButton.Left)
-                HandlePointerDown();
+            HandlePointerDown((int)button);
         }
 
         public void HandleButtonUp(MouseButton button)
@@ -135,9 +133,7 @@ public void HandleButtonUp(MouseButton button)
             buttonEvent.IsDown = false;
             Events.Add(buttonEvent);
 
-            // Simulate tap on primary mouse button
-            if (button == MouseButton.Left)
-                HandlePointerUp();
+            HandlePointerUp((int)button);
         }
 
         public void HandleMouseWheel(float wheelDelta)
@@ -150,17 +146,17 @@ public void HandleMouseWheel(float wheelDelta)
         /// <summary>
         /// Handles a single pointer down
         /// </summary>
-        public void HandlePointerDown()
+        public void HandlePointerDown(int buttonId)
         {
-            PointerState.PointerInputEvents.Add(new PointerDeviceState.InputEvent { Type = PointerEventType.Pressed, Position = Position, Id = 0 });
+            PointerState.PointerInputEvents.Add(new PointerDeviceState.InputEvent { Type = PointerEventType.Pressed, Position = Position, Id = buttonId });
         }
 
         /// <summary>
         /// Handles a single pointer up
         /// </summary>
-        public void HandlePointerUp()
+        public void HandlePointerUp(int buttonId)
         {
-            PointerState.PointerInputEvents.Add(new PointerDeviceState.InputEvent { Type = PointerEventType.Released, Position = Position, Id = 0 });
+            PointerState.PointerInputEvents.Add(new PointerDeviceState.InputEvent { Type = PointerEventType.Released, Position = Position, Id = buttonId });
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Input/PointerDeviceBase.cs b/sources/engine/Xenko.Input/PointerDeviceBase.cs
index 74cce2da2a..7ed8dc743b 100644
--- a/sources/engine/Xenko.Input/PointerDeviceBase.cs
+++ b/sources/engine/Xenko.Input/PointerDeviceBase.cs
@@ -22,9 +22,9 @@ protected PointerDeviceBase()
 
         public Vector2 SurfaceSize => PointerState.SurfaceSize;
         public float SurfaceAspectRatio => PointerState.SurfaceAspectRatio;
-        public IReadOnlySet<PointerPoint> PressedPointers => PointerState.PressedPointers;
-        public IReadOnlySet<PointerPoint> ReleasedPointers => PointerState.ReleasedPointers;
-        public IReadOnlySet<PointerPoint> DownPointers => PointerState.DownPointers;
+        public Core.Collections.IReadOnlySet<PointerPoint> PressedPointers => PointerState.PressedPointers;
+        public Core.Collections.IReadOnlySet<PointerPoint> ReleasedPointers => PointerState.ReleasedPointers;
+        public Core.Collections.IReadOnlySet<PointerPoint> DownPointers => PointerState.DownPointers;
         public event EventHandler<SurfaceSizeChangedEventArgs> SurfaceSizeChanged;
 
         public int Priority { get; set; }
diff --git a/sources/engine/Xenko.Input/PointerDeviceState.cs b/sources/engine/Xenko.Input/PointerDeviceState.cs
index a2546d5561..d7c7b63dce 100644
--- a/sources/engine/Xenko.Input/PointerDeviceState.cs
+++ b/sources/engine/Xenko.Input/PointerDeviceState.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
@@ -15,7 +15,7 @@ namespace Xenko.Input
     public class PointerDeviceState
     {
         public readonly List<InputEvent> PointerInputEvents = new List<InputEvent>();
-        public readonly List<PointerData> PointerDatas = new List<PointerData>();
+        public readonly PointerData pointerData = new PointerData();
 
         private readonly HashSet<PointerPoint> pressedPointers = new HashSet<PointerPoint>();
         private readonly HashSet<PointerPoint> releasedPointers = new HashSet<PointerPoint>();
@@ -37,9 +37,9 @@ public PointerDeviceState(IPointerDevice pointerDevice)
         public Vector2 InverseSurfaceSize => invSurfaceSize;
         public float SurfaceAspectRatio => aspectRatio;
 
-        public IReadOnlySet<PointerPoint> PressedPointers { get; }
-        public IReadOnlySet<PointerPoint> ReleasedPointers { get; }
-        public IReadOnlySet<PointerPoint> DownPointers { get; }
+        public Core.Collections.IReadOnlySet<PointerPoint> PressedPointers { get; }
+        public Core.Collections.IReadOnlySet<PointerPoint> ReleasedPointers { get; }
+        public Core.Collections.IReadOnlySet<PointerPoint> DownPointers { get; }
 
         public IPointerDevice SourceDevice;
 
@@ -90,55 +90,39 @@ public PointerEvent ProcessPointerEvent(InputEvent evt)
         /// <param name="evt"></param>
         public void UpdatePointerState(PointerEvent evt, bool updateDelta = true)
         {
-            var data = GetPointerData(evt.PointerId);
-
             if (updateDelta)
             {
                 // Update delta based on change in position
-                evt.DeltaPosition = data.Delta = evt.Position - data.Position;
+                evt.DeltaPosition = pointerData.Delta = evt.Position - pointerData.Position;
             }
             else
             {
-                data.Delta = evt.DeltaPosition;
+                pointerData.Delta = evt.DeltaPosition;
             }
 
             // Update position
-            data.Position = evt.Position;
+            pointerData.Position = evt.Position;
 
             if (evt.EventType == PointerEventType.Pressed)
             {
                 // Start pressed events with time 0
-                data.Clock.Restart();
-                data.IsDown = true;
-                pressedPointers.Add(data);
-                downPointers.Add(data);
+                pointerData.Clock.Restart();
+                pointerData.IsDown = true;
+                pressedPointers.Add(pointerData);
+                downPointers.Add(pointerData);
             }
             else if (evt.EventType == PointerEventType.Released || evt.EventType == PointerEventType.Canceled)
             {
-                releasedPointers.Add(data);
-                downPointers.Remove(data);
-                data.IsDown = false;
+                releasedPointers.Add(pointerData);
+                downPointers.Remove(pointerData);
+                pointerData.IsDown = false;
             }
 
-            evt.IsDown = data.IsDown;
-            evt.DeltaTime = data.Clock.Elapsed;
+            evt.IsDown = pointerData.IsDown;
+            evt.DeltaTime = pointerData.Clock.Elapsed;
 
             // Reset pointer clock
-            data.Clock.Restart();
-        }
-
-        /// <summary>
-        /// Retrueves a pointer data structure unqiue to the given pointer ID
-        /// </summary>
-        /// <param name="pointerId"></param>
-        /// <returns></returns>
-        public PointerData GetPointerData(int pointerId)
-        {
-            while (PointerDatas.Count <= pointerId)
-            {
-                PointerDatas.Add(new PointerData { Pointer = SourceDevice });
-            }
-            return PointerDatas[pointerId];
+            pointerData.Clock.Restart();
         }
 
         /// <summary>
@@ -147,11 +131,7 @@ public PointerData GetPointerData(int pointerId)
         private void Reset()
         {
             // Reset delta for all pointers before processing newly received events
-            foreach (var pointerData in PointerDatas)
-            {
-                pointerData.Delta = Vector2.Zero;
-            }
-
+            pointerData.Delta = Vector2.Zero;
             pressedPointers.Clear();
             releasedPointers.Clear();
         }
diff --git a/sources/engine/Xenko.Input/SDL/InputSourceSDL.cs b/sources/engine/Xenko.Input/SDL/InputSourceSDL.cs
index a44344f5fb..ead7596a3b 100644
--- a/sources/engine/Xenko.Input/SDL/InputSourceSDL.cs
+++ b/sources/engine/Xenko.Input/SDL/InputSourceSDL.cs
@@ -11,7 +11,7 @@
 namespace Xenko.Input
 {
     /// <summary>
-    /// Provides support for mouse/keyboard/gamepads using SDL
+    /// Provides support for mouse/touch/keyboard/gamepads using SDL
     /// </summary>
     internal class InputSourceSDL : InputSourceBase
     {
@@ -21,6 +21,7 @@ internal class InputSourceSDL : InputSourceBase
         private Window uiControl;
         private MouseSDL mouse;
         private KeyboardSDL keyboard;
+        private PointerSDL pointer; // Touch
         private InputManager inputManager;
 
         public override void Initialize(InputManager inputManager)
@@ -33,9 +34,11 @@ public override void Initialize(InputManager inputManager)
 
             mouse = new MouseSDL(this, inputManager.Game, uiControl);
             keyboard = new KeyboardSDL(this, uiControl);
+            pointer = new PointerSDL(this, uiControl);
 
             RegisterDevice(mouse);
             RegisterDevice(keyboard);
+            RegisterDevice(pointer);
 
             // Scan for gamepads
             Scan();
@@ -65,14 +68,20 @@ public override void Dispose()
 
         public override void Update()
         {
-            // Notify event listeners of device removals
-            foreach (var deviceIdToRemove in devicesToRemove)
+            if (devicesToRemove.Count > 0)
             {
-                var gameController = Devices[deviceIdToRemove];
-                (gameController as IDisposable)?.Dispose();
-                UnregisterDevice(gameController);
+                // Notify event listeners of device removals
+                foreach (var deviceIdToRemove in devicesToRemove)
+                {
+                    var gameController = Devices[deviceIdToRemove];
+                    (gameController as IDisposable)?.Dispose();
+                    UnregisterDevice(gameController);
+                }
+                devicesToRemove.Clear();
             }
-            devicesToRemove.Clear();
+
+            // do we need to make sure relative mode is set correctly?
+            mouse.SyncRelativeMode();
         }
 
         public override void Scan()
@@ -144,4 +153,4 @@ private int GetJoystickInstanceId(int deviceIndex)
     }
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/sources/engine/Xenko.Input/SDL/KeyboardSDL.cs b/sources/engine/Xenko.Input/SDL/KeyboardSDL.cs
index f32b525e9b..79d63e98f7 100644
--- a/sources/engine/Xenko.Input/SDL/KeyboardSDL.cs
+++ b/sources/engine/Xenko.Input/SDL/KeyboardSDL.cs
@@ -57,9 +57,11 @@ public void DisableTextInput()
 
         private void OnKeyEvent(SDL.SDL_KeyboardEvent e)
         {
+            // wait, do we want to filter repeating keys?
+            if (e.repeat > 0 && KeyEvent.DisableRepeats) return;
             // Try to map to a xenko key
-            Keys key;
-            if (SDLKeys.MapKeys.TryGetValue(e.keysym.sym, out key) && key != Keys.None)
+            Keys key = ConvertSDLKey(e.keysym.sym);
+            if (key != Keys.None)
             {
                 if (e.type == SDL.SDL_EventType.SDL_KEYDOWN)
                     HandleKeyDown(key);
@@ -104,211 +106,321 @@ private unsafe string SDLBufferToString(byte* text, int size = 32)
         }
 
         /// <summary>
-        /// Mapping between <see cref="SDL.SDL_Keycode"/> and <see cref="Xenko.Input.Keys"/> needed for
-        /// translating SDL key events into Xenko ones.
+        /// Converts an SDL key to a Xenko key
         /// </summary>
-        private static class SDLKeys
-        {
-            /// <summary>
-            /// Map between SDL keys and Xenko keys.
-            /// </summary>
-            internal static readonly Dictionary<SDL.SDL_Keycode, Keys> MapKeys = NewMapKeys();
-
-            /// <summary>
-            /// Create a mapping between <see cref="SDL.SDL_Keycode"/> and <see cref="Xenko.Input.Keys"/>
-            /// </summary>
-            /// <remarks>Not all <see cref="Xenko.Input.Keys"/> have a corresponding SDL entries. For the moment they are commented out in the code below.</remarks>
-            /// <returns>A new map.</returns>
-            private static Dictionary<SDL.SDL_Keycode, Keys> NewMapKeys()
-            {
-                var map = new Dictionary<SDL.SDL_Keycode, Keys>(200);
-                map[SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.None;
-                map[SDL.SDL_Keycode.SDLK_CANCEL] = Keys.Cancel;
-                map[SDL.SDL_Keycode.SDLK_BACKSPACE] = Keys.Back;
-                map[SDL.SDL_Keycode.SDLK_TAB] = Keys.Tab;
-                map[SDL.SDL_Keycode.SDLK_KP_TAB] = Keys.Tab;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.LineFeed;
-                map[SDL.SDL_Keycode.SDLK_CLEAR] = Keys.Clear;
-                map[SDL.SDL_Keycode.SDLK_CLEARAGAIN] = Keys.Clear;
-                map[SDL.SDL_Keycode.SDLK_KP_CLEAR] = Keys.Clear;
-                map[SDL.SDL_Keycode.SDLK_KP_CLEARENTRY] = Keys.Clear;
-                map[SDL.SDL_Keycode.SDLK_KP_ENTER] = Keys.Enter;
-                map[SDL.SDL_Keycode.SDLK_RETURN] = Keys.Return;
-                map[SDL.SDL_Keycode.SDLK_RETURN2] = Keys.Return;
-                map[SDL.SDL_Keycode.SDLK_PAUSE] = Keys.Pause;
-                map[SDL.SDL_Keycode.SDLK_CAPSLOCK] = Keys.Capital;
-                //            map [SDL.SDL_Keycode.SDLK_CAPSLOCK] = Keys.CapsLock;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.HangulMode;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.KanaMode;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.JunjaMode;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.FinalMode;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.HanjaMode;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.KanjiMode;
-                map[SDL.SDL_Keycode.SDLK_ESCAPE] = Keys.Escape;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.ImeConvert;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.ImeNonConvert;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.ImeAccept;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.ImeModeChange;
-                map[SDL.SDL_Keycode.SDLK_SPACE] = Keys.Space;
-                map[SDL.SDL_Keycode.SDLK_KP_SPACE] = Keys.Space;
-                map[SDL.SDL_Keycode.SDLK_PAGEUP] = Keys.PageUp;
-                map[SDL.SDL_Keycode.SDLK_PRIOR] = Keys.Prior;
-                //            map [SDL.SDL_Keycode.SDLK_PAGEDOWN] = Keys.Next); // Next is the same as PageDo;
-                map[SDL.SDL_Keycode.SDLK_PAGEDOWN] = Keys.PageDown;
-                map[SDL.SDL_Keycode.SDLK_END] = Keys.End;
-                map[SDL.SDL_Keycode.SDLK_HOME] = Keys.Home;
-                map[SDL.SDL_Keycode.SDLK_AC_HOME] = Keys.Home;
-                map[SDL.SDL_Keycode.SDLK_LEFT] = Keys.Left;
-                map[SDL.SDL_Keycode.SDLK_UP] = Keys.Up;
-                map[SDL.SDL_Keycode.SDLK_RIGHT] = Keys.Right;
-                map[SDL.SDL_Keycode.SDLK_DOWN] = Keys.Down;
-                map[SDL.SDL_Keycode.SDLK_SELECT] = Keys.Select;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Print;
-                map[SDL.SDL_Keycode.SDLK_EXECUTE] = Keys.Execute;
-                map[SDL.SDL_Keycode.SDLK_PRINTSCREEN] = Keys.PrintScreen;
-                //            map [SDL.SDL_Keycode.SDLK_PRINTSCREEN] = Keys.Snapshot); // Snapshot is the same as PageDo;
-                map[SDL.SDL_Keycode.SDLK_INSERT] = Keys.Insert;
-                map[SDL.SDL_Keycode.SDLK_DELETE] = Keys.Delete;
-                map[SDL.SDL_Keycode.SDLK_HELP] = Keys.Help;
-                map[SDL.SDL_Keycode.SDLK_1] = Keys.D0;
-                map[SDL.SDL_Keycode.SDLK_2] = Keys.D2;
-                map[SDL.SDL_Keycode.SDLK_3] = Keys.D3;
-                map[SDL.SDL_Keycode.SDLK_4] = Keys.D4;
-                map[SDL.SDL_Keycode.SDLK_5] = Keys.D5;
-                map[SDL.SDL_Keycode.SDLK_6] = Keys.D6;
-                map[SDL.SDL_Keycode.SDLK_7] = Keys.D7;
-                map[SDL.SDL_Keycode.SDLK_8] = Keys.D8;
-                map[SDL.SDL_Keycode.SDLK_9] = Keys.D9;
-                map[SDL.SDL_Keycode.SDLK_a] = Keys.A;
-                map[SDL.SDL_Keycode.SDLK_b] = Keys.B;
-                map[SDL.SDL_Keycode.SDLK_c] = Keys.C;
-                map[SDL.SDL_Keycode.SDLK_d] = Keys.D;
-                map[SDL.SDL_Keycode.SDLK_e] = Keys.E;
-                map[SDL.SDL_Keycode.SDLK_f] = Keys.F;
-                map[SDL.SDL_Keycode.SDLK_g] = Keys.G;
-                map[SDL.SDL_Keycode.SDLK_h] = Keys.H;
-                map[SDL.SDL_Keycode.SDLK_i] = Keys.I;
-                map[SDL.SDL_Keycode.SDLK_j] = Keys.J;
-                map[SDL.SDL_Keycode.SDLK_k] = Keys.K;
-                map[SDL.SDL_Keycode.SDLK_l] = Keys.L;
-                map[SDL.SDL_Keycode.SDLK_m] = Keys.M;
-                map[SDL.SDL_Keycode.SDLK_n] = Keys.N;
-                map[SDL.SDL_Keycode.SDLK_o] = Keys.O;
-                map[SDL.SDL_Keycode.SDLK_p] = Keys.P;
-                map[SDL.SDL_Keycode.SDLK_q] = Keys.Q;
-                map[SDL.SDL_Keycode.SDLK_r] = Keys.R;
-                map[SDL.SDL_Keycode.SDLK_s] = Keys.S;
-                map[SDL.SDL_Keycode.SDLK_t] = Keys.T;
-                map[SDL.SDL_Keycode.SDLK_u] = Keys.U;
-                map[SDL.SDL_Keycode.SDLK_v] = Keys.V;
-                map[SDL.SDL_Keycode.SDLK_w] = Keys.W;
-                map[SDL.SDL_Keycode.SDLK_x] = Keys.X;
-                map[SDL.SDL_Keycode.SDLK_y] = Keys.Y;
-                map[SDL.SDL_Keycode.SDLK_z] = Keys.Z;
-                map[SDL.SDL_Keycode.SDLK_LGUI] = Keys.LeftWin;
-                map[SDL.SDL_Keycode.SDLK_RGUI] = Keys.RightWin;
-                map[SDL.SDL_Keycode.SDLK_APPLICATION] = Keys.Apps; // TODO: Verify value
-                map[SDL.SDL_Keycode.SDLK_SLEEP] = Keys.Sleep;
-                map[SDL.SDL_Keycode.SDLK_KP_0] = Keys.NumPad0;
-                map[SDL.SDL_Keycode.SDLK_KP_1] = Keys.NumPad1;
-                map[SDL.SDL_Keycode.SDLK_KP_2] = Keys.NumPad2;
-                map[SDL.SDL_Keycode.SDLK_KP_3] = Keys.NumPad3;
-                map[SDL.SDL_Keycode.SDLK_KP_4] = Keys.NumPad4;
-                map[SDL.SDL_Keycode.SDLK_KP_5] = Keys.NumPad5;
-                map[SDL.SDL_Keycode.SDLK_KP_6] = Keys.NumPad6;
-                map[SDL.SDL_Keycode.SDLK_KP_7] = Keys.NumPad7;
-                map[SDL.SDL_Keycode.SDLK_KP_8] = Keys.NumPad8;
-                map[SDL.SDL_Keycode.SDLK_KP_9] = Keys.NumPad9;
-                map[SDL.SDL_Keycode.SDLK_KP_MULTIPLY] = Keys.Multiply;
-                map[SDL.SDL_Keycode.SDLK_PLUS] = Keys.Add;
-                map[SDL.SDL_Keycode.SDLK_KP_PLUS] = Keys.Add;
-                map[SDL.SDL_Keycode.SDLK_SEPARATOR] = Keys.Separator;
-                map[SDL.SDL_Keycode.SDLK_MINUS] = Keys.Subtract;
-                map[SDL.SDL_Keycode.SDLK_KP_MINUS] = Keys.Subtract;
-                map[SDL.SDL_Keycode.SDLK_DECIMALSEPARATOR] = Keys.Decimal;
-                map[SDL.SDL_Keycode.SDLK_KP_DECIMAL] = Keys.Decimal;
-                map[SDL.SDL_Keycode.SDLK_KP_DIVIDE] = Keys.Divide;
-                map[SDL.SDL_Keycode.SDLK_F1] = Keys.F1;
-                map[SDL.SDL_Keycode.SDLK_F2] = Keys.F2;
-                map[SDL.SDL_Keycode.SDLK_F3] = Keys.F3;
-                map[SDL.SDL_Keycode.SDLK_F4] = Keys.F4;
-                map[SDL.SDL_Keycode.SDLK_F5] = Keys.F5;
-                map[SDL.SDL_Keycode.SDLK_F6] = Keys.F6;
-                map[SDL.SDL_Keycode.SDLK_F7] = Keys.F7;
-                map[SDL.SDL_Keycode.SDLK_F8] = Keys.F8;
-                map[SDL.SDL_Keycode.SDLK_F9] = Keys.F9;
-                map[SDL.SDL_Keycode.SDLK_F10] = Keys.F10;
-                map[SDL.SDL_Keycode.SDLK_F11] = Keys.F11;
-                map[SDL.SDL_Keycode.SDLK_F12] = Keys.F12;
-                map[SDL.SDL_Keycode.SDLK_F13] = Keys.F13;
-                map[SDL.SDL_Keycode.SDLK_F14] = Keys.F14;
-                map[SDL.SDL_Keycode.SDLK_F15] = Keys.F15;
-                map[SDL.SDL_Keycode.SDLK_F16] = Keys.F16;
-                map[SDL.SDL_Keycode.SDLK_F17] = Keys.F17;
-                map[SDL.SDL_Keycode.SDLK_F18] = Keys.F18;
-                map[SDL.SDL_Keycode.SDLK_F19] = Keys.F19;
-                map[SDL.SDL_Keycode.SDLK_F20] = Keys.F20;
-                map[SDL.SDL_Keycode.SDLK_F21] = Keys.F21;
-                map[SDL.SDL_Keycode.SDLK_F22] = Keys.F22;
-                map[SDL.SDL_Keycode.SDLK_F23] = Keys.F23;
-                map[SDL.SDL_Keycode.SDLK_F24] = Keys.F24;
-                map[SDL.SDL_Keycode.SDLK_NUMLOCKCLEAR] = Keys.NumLock;
-                map[SDL.SDL_Keycode.SDLK_SCROLLLOCK] = Keys.Scroll;
-                map[SDL.SDL_Keycode.SDLK_LSHIFT] = Keys.LeftShift;
-                map[SDL.SDL_Keycode.SDLK_RSHIFT] = Keys.RightShift;
-                map[SDL.SDL_Keycode.SDLK_LCTRL] = Keys.LeftCtrl;
-                map[SDL.SDL_Keycode.SDLK_RCTRL] = Keys.RightCtrl;
-                map[SDL.SDL_Keycode.SDLK_LALT] = Keys.LeftAlt;
-                map[SDL.SDL_Keycode.SDLK_RALT] = Keys.RightAlt;
-                map[SDL.SDL_Keycode.SDLK_AC_BACK] = Keys.BrowserBack;
-                map[SDL.SDL_Keycode.SDLK_AC_FORWARD] = Keys.BrowserForward;
-                map[SDL.SDL_Keycode.SDLK_AC_REFRESH] = Keys.BrowserRefresh;
-                map[SDL.SDL_Keycode.SDLK_AC_STOP] = Keys.BrowserStop;
-                map[SDL.SDL_Keycode.SDLK_AC_SEARCH] = Keys.BrowserSearch;
-                map[SDL.SDL_Keycode.SDLK_AC_BOOKMARKS] = Keys.BrowserFavorites;
-                map[SDL.SDL_Keycode.SDLK_AC_HOME] = Keys.BrowserHome;
-                map[SDL.SDL_Keycode.SDLK_AUDIOMUTE] = Keys.VolumeMute;
-                map[SDL.SDL_Keycode.SDLK_VOLUMEDOWN] = Keys.VolumeDown;
-                map[SDL.SDL_Keycode.SDLK_VOLUMEUP] = Keys.VolumeUp;
-                map[SDL.SDL_Keycode.SDLK_AUDIONEXT] = Keys.MediaNextTrack;
-                map[SDL.SDL_Keycode.SDLK_AUDIOPREV] = Keys.MediaPreviousTrack;
-                map[SDL.SDL_Keycode.SDLK_AUDIOSTOP] = Keys.MediaStop;
-                map[SDL.SDL_Keycode.SDLK_AUDIOPLAY] = Keys.MediaPlayPause;
-                map[SDL.SDL_Keycode.SDLK_MAIL] = Keys.LaunchMail;
-                map[SDL.SDL_Keycode.SDLK_MEDIASELECT] = Keys.SelectMedia;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.LaunchApplication1;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.LaunchApplication2;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem1;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemSemicolon;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemPlus;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemComma;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemMinus;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemPeriod;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem2;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemQuestion;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem3;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemTilde;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem4;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemOpenBrackets;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem5;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemPipe;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem6;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemCloseBrackets;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem7;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemQuotes;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem8;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Oem102;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemBackslash;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Attn;
-                map[SDL.SDL_Keycode.SDLK_CRSEL] = Keys.CrSel;
-                map[SDL.SDL_Keycode.SDLK_EXSEL] = Keys.ExSel;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.EraseEof;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Play;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Zoom;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.NoName;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.Pa1;
-                //            map [SDL.SDL_Keycode.SDLK_UNKNOWN] = Keys.OemClear;
-                return map;
+        private static Keys ConvertSDLKey(SDL.SDL_Keycode k) {
+            switch (k) {
+                default:
+                case SDL.SDL_Keycode.SDLK_UNKNOWN:
+                    return Keys.None;
+                case SDL.SDL_Keycode.SDLK_BACKQUOTE:
+                    return Keys.BackQuote;
+                case SDL.SDL_Keycode.SDLK_QUOTE:
+                    return Keys.SingleQuote;
+                case SDL.SDL_Keycode.SDLK_QUOTEDBL:
+                    return Keys.Quotes;
+                case SDL.SDL_Keycode.SDLK_LEFTBRACKET:
+                    return Keys.OpenBrackets;
+                case SDL.SDL_Keycode.SDLK_RIGHTBRACKET:
+                    return Keys.CloseBrackets;
+                case SDL.SDL_Keycode.SDLK_KP_PERIOD:
+                    return Keys.Period;
+                case SDL.SDL_Keycode.SDLK_PERIOD:
+                    return Keys.Period;
+                case SDL.SDL_Keycode.SDLK_SLASH:
+                    return Keys.ForwardSlash;
+                case SDL.SDL_Keycode.SDLK_BACKSLASH:
+                    return Keys.Backslash;
+                case SDL.SDL_Keycode.SDLK_EQUALS:
+                    return Keys.Equals;
+                case SDL.SDL_Keycode.SDLK_SEMICOLON:
+                    return Keys.Semicolon;
+                case SDL.SDL_Keycode.SDLK_COMMA:
+                    return Keys.Comma;
+                case SDL.SDL_Keycode.SDLK_KP_COMMA:
+                    return Keys.Comma;
+                case SDL.SDL_Keycode.SDLK_KP_EQUALS:
+                    return Keys.Equals;
+                case SDL.SDL_Keycode.SDLK_CANCEL:
+                    return Keys.Cancel;
+                case SDL.SDL_Keycode.SDLK_BACKSPACE:
+                    return Keys.Back;
+                case SDL.SDL_Keycode.SDLK_TAB:
+                    return Keys.Tab;
+                case SDL.SDL_Keycode.SDLK_KP_TAB:
+                    return Keys.Tab;
+                case SDL.SDL_Keycode.SDLK_CLEAR:
+                    return Keys.Clear;
+                case SDL.SDL_Keycode.SDLK_CLEARAGAIN:
+                    return Keys.Clear;
+                case SDL.SDL_Keycode.SDLK_KP_CLEAR:
+                    return Keys.Clear;
+                case SDL.SDL_Keycode.SDLK_KP_CLEARENTRY:
+                    return Keys.Clear;
+                case SDL.SDL_Keycode.SDLK_KP_ENTER:
+                    return Keys.Enter;
+                case SDL.SDL_Keycode.SDLK_RETURN:
+                    return Keys.Return;
+                case SDL.SDL_Keycode.SDLK_RETURN2:
+                    return Keys.Return;
+                case SDL.SDL_Keycode.SDLK_PAUSE:
+                    return Keys.Pause;
+                case SDL.SDL_Keycode.SDLK_CAPSLOCK:
+                    return Keys.Capital;
+                case SDL.SDL_Keycode.SDLK_ESCAPE:
+                    return Keys.Escape;
+                case SDL.SDL_Keycode.SDLK_SPACE:
+                    return Keys.Space;
+                case SDL.SDL_Keycode.SDLK_KP_SPACE:
+                    return Keys.Space;
+                case SDL.SDL_Keycode.SDLK_PAGEUP:
+                    return Keys.PageUp;
+                case SDL.SDL_Keycode.SDLK_PRIOR:
+                    return Keys.Prior;
+                case SDL.SDL_Keycode.SDLK_PAGEDOWN:
+                    return Keys.PageDown;
+                case SDL.SDL_Keycode.SDLK_END:
+                    return Keys.End;
+                case SDL.SDL_Keycode.SDLK_HOME:
+                    return Keys.Home;
+                case SDL.SDL_Keycode.SDLK_AC_HOME:
+                    return Keys.Home;
+                case SDL.SDL_Keycode.SDLK_LEFT:
+                    return Keys.Left;
+                case SDL.SDL_Keycode.SDLK_UP:
+                    return Keys.Up;
+                case SDL.SDL_Keycode.SDLK_RIGHT:
+                    return Keys.Right;
+                case SDL.SDL_Keycode.SDLK_DOWN:
+                    return Keys.Down;
+                case SDL.SDL_Keycode.SDLK_SELECT:
+                    return Keys.Select;
+                case SDL.SDL_Keycode.SDLK_EXECUTE:
+                    return Keys.Execute;
+                case SDL.SDL_Keycode.SDLK_PRINTSCREEN:
+                    return Keys.PrintScreen;
+                case SDL.SDL_Keycode.SDLK_INSERT:
+                    return Keys.Insert;
+                case SDL.SDL_Keycode.SDLK_DELETE:
+                    return Keys.Delete;
+                case SDL.SDL_Keycode.SDLK_HELP:
+                    return Keys.Help;
+                case SDL.SDL_Keycode.SDLK_0:
+                    return Keys.D0;
+                case SDL.SDL_Keycode.SDLK_1:
+                    return Keys.D1;
+                case SDL.SDL_Keycode.SDLK_2:
+                    return Keys.D2;
+                case SDL.SDL_Keycode.SDLK_3:
+                    return Keys.D3;
+                case SDL.SDL_Keycode.SDLK_4:
+                    return Keys.D4;
+                case SDL.SDL_Keycode.SDLK_5:
+                    return Keys.D5;
+                case SDL.SDL_Keycode.SDLK_6:
+                    return Keys.D6;
+                case SDL.SDL_Keycode.SDLK_7:
+                    return Keys.D7;
+                case SDL.SDL_Keycode.SDLK_8:
+                    return Keys.D8;
+                case SDL.SDL_Keycode.SDLK_9:
+                    return Keys.D9;
+                case SDL.SDL_Keycode.SDLK_a:
+                    return Keys.A;
+                case SDL.SDL_Keycode.SDLK_b:
+                    return Keys.B;
+                case SDL.SDL_Keycode.SDLK_c:
+                    return Keys.C;
+                case SDL.SDL_Keycode.SDLK_d:
+                    return Keys.D;
+                case SDL.SDL_Keycode.SDLK_e:
+                    return Keys.E;
+                case SDL.SDL_Keycode.SDLK_f:
+                    return Keys.F;
+                case SDL.SDL_Keycode.SDLK_g:
+                    return Keys.G;
+                case SDL.SDL_Keycode.SDLK_h:
+                    return Keys.H;
+                case SDL.SDL_Keycode.SDLK_i:
+                    return Keys.I;
+                case SDL.SDL_Keycode.SDLK_j:
+                    return Keys.J;
+                case SDL.SDL_Keycode.SDLK_k:
+                    return Keys.K;
+                case SDL.SDL_Keycode.SDLK_l:
+                    return Keys.L;
+                case SDL.SDL_Keycode.SDLK_m:
+                    return Keys.M;
+                case SDL.SDL_Keycode.SDLK_n:
+                    return Keys.N;
+                case SDL.SDL_Keycode.SDLK_o:
+                    return Keys.O;
+                case SDL.SDL_Keycode.SDLK_p:
+                    return Keys.P;
+                case SDL.SDL_Keycode.SDLK_q:
+                    return Keys.Q;
+                case SDL.SDL_Keycode.SDLK_r:
+                    return Keys.R;
+                case SDL.SDL_Keycode.SDLK_s:
+                    return Keys.S;
+                case SDL.SDL_Keycode.SDLK_t:
+                    return Keys.T;
+                case SDL.SDL_Keycode.SDLK_u:
+                    return Keys.U;
+                case SDL.SDL_Keycode.SDLK_v:
+                    return Keys.V;
+                case SDL.SDL_Keycode.SDLK_w:
+                    return Keys.W;
+                case SDL.SDL_Keycode.SDLK_x:
+                    return Keys.X;
+                case SDL.SDL_Keycode.SDLK_y:
+                    return Keys.Y;
+                case SDL.SDL_Keycode.SDLK_z:
+                    return Keys.Z;
+                case SDL.SDL_Keycode.SDLK_LGUI:
+                    return Keys.LeftWin;
+                case SDL.SDL_Keycode.SDLK_RGUI:
+                    return Keys.RightWin;
+                case SDL.SDL_Keycode.SDLK_APPLICATION:
+                    return Keys.Apps;
+                case SDL.SDL_Keycode.SDLK_SLEEP:
+                    return Keys.Sleep;
+                case SDL.SDL_Keycode.SDLK_KP_0:
+                    return Keys.NumPad0;
+                case SDL.SDL_Keycode.SDLK_KP_1:
+                    return Keys.NumPad1;
+                case SDL.SDL_Keycode.SDLK_KP_2:
+                    return Keys.NumPad2;
+                case SDL.SDL_Keycode.SDLK_KP_3:
+                    return Keys.NumPad3;
+                case SDL.SDL_Keycode.SDLK_KP_4:
+                    return Keys.NumPad4;
+                case SDL.SDL_Keycode.SDLK_KP_5:
+                    return Keys.NumPad5;
+                case SDL.SDL_Keycode.SDLK_KP_6:
+                    return Keys.NumPad6;
+                case SDL.SDL_Keycode.SDLK_KP_7:
+                    return Keys.NumPad7;
+                case SDL.SDL_Keycode.SDLK_KP_8:
+                    return Keys.NumPad8;
+                case SDL.SDL_Keycode.SDLK_KP_9:
+                    return Keys.NumPad9;
+                case SDL.SDL_Keycode.SDLK_KP_MULTIPLY:
+                    return Keys.Multiply;
+                case SDL.SDL_Keycode.SDLK_PLUS:
+                    return Keys.Equals;
+                case SDL.SDL_Keycode.SDLK_KP_PLUS:
+                    return Keys.Add;
+                case SDL.SDL_Keycode.SDLK_SEPARATOR:
+                    return Keys.Separator;
+                case SDL.SDL_Keycode.SDLK_MINUS:
+                    return Keys.Minus;
+                case SDL.SDL_Keycode.SDLK_KP_MINUS:
+                    return Keys.Subtract;
+                case SDL.SDL_Keycode.SDLK_DECIMALSEPARATOR:
+                    return Keys.Decimal;
+                case SDL.SDL_Keycode.SDLK_KP_DECIMAL:
+                    return Keys.Decimal;
+                case SDL.SDL_Keycode.SDLK_KP_DIVIDE:
+                    return Keys.Divide;
+                case SDL.SDL_Keycode.SDLK_F1:
+                    return Keys.F1;
+                case SDL.SDL_Keycode.SDLK_F2:
+                    return Keys.F2;
+                case SDL.SDL_Keycode.SDLK_F3:
+                    return Keys.F3;
+                case SDL.SDL_Keycode.SDLK_F4:
+                    return Keys.F4;
+                case SDL.SDL_Keycode.SDLK_F5:
+                    return Keys.F5;
+                case SDL.SDL_Keycode.SDLK_F6:
+                    return Keys.F6;
+                case SDL.SDL_Keycode.SDLK_F7:
+                    return Keys.F7;
+                case SDL.SDL_Keycode.SDLK_F8:
+                    return Keys.F8;
+                case SDL.SDL_Keycode.SDLK_F9:
+                    return Keys.F9;
+                case SDL.SDL_Keycode.SDLK_F10:
+                    return Keys.F10;
+                case SDL.SDL_Keycode.SDLK_F11:
+                    return Keys.F11;
+                case SDL.SDL_Keycode.SDLK_F12:
+                    return Keys.F12;
+                case SDL.SDL_Keycode.SDLK_F13:
+                    return Keys.F13;
+                case SDL.SDL_Keycode.SDLK_F14:
+                    return Keys.F14;
+                case SDL.SDL_Keycode.SDLK_F15:
+                    return Keys.F15;
+                case SDL.SDL_Keycode.SDLK_F16:
+                    return Keys.F16;
+                case SDL.SDL_Keycode.SDLK_F17:
+                    return Keys.F17;
+                case SDL.SDL_Keycode.SDLK_F18:
+                    return Keys.F18;
+                case SDL.SDL_Keycode.SDLK_F19:
+                    return Keys.F19;
+                case SDL.SDL_Keycode.SDLK_F20:
+                    return Keys.F20;
+                case SDL.SDL_Keycode.SDLK_F21:
+                    return Keys.F21;
+                case SDL.SDL_Keycode.SDLK_F22:
+                    return Keys.F22;
+                case SDL.SDL_Keycode.SDLK_F23:
+                    return Keys.F23;
+                case SDL.SDL_Keycode.SDLK_F24:
+                    return Keys.F24;
+                case SDL.SDL_Keycode.SDLK_NUMLOCKCLEAR:
+                    return Keys.NumLock;
+                case SDL.SDL_Keycode.SDLK_SCROLLLOCK:
+                    return Keys.Scroll;
+                case SDL.SDL_Keycode.SDLK_LSHIFT:
+                    return Keys.LeftShift;
+                case SDL.SDL_Keycode.SDLK_RSHIFT:
+                    return Keys.RightShift;
+                case SDL.SDL_Keycode.SDLK_LCTRL:
+                    return Keys.LeftCtrl;
+                case SDL.SDL_Keycode.SDLK_RCTRL:
+                    return Keys.RightCtrl;
+                case SDL.SDL_Keycode.SDLK_LALT:
+                    return Keys.LeftAlt;
+                case SDL.SDL_Keycode.SDLK_RALT:
+                    return Keys.RightAlt;
+                case SDL.SDL_Keycode.SDLK_AC_BACK:
+                    return Keys.BrowserBack;
+                case SDL.SDL_Keycode.SDLK_AC_FORWARD:
+                    return Keys.BrowserForward;
+                case SDL.SDL_Keycode.SDLK_AC_REFRESH:
+                    return Keys.BrowserRefresh;
+                case SDL.SDL_Keycode.SDLK_AC_STOP:
+                    return Keys.BrowserStop;
+                case SDL.SDL_Keycode.SDLK_AC_SEARCH:
+                    return Keys.BrowserSearch;
+                case SDL.SDL_Keycode.SDLK_AC_BOOKMARKS:
+                    return Keys.BrowserFavorites;
+                case SDL.SDL_Keycode.SDLK_AUDIOMUTE:
+                    return Keys.VolumeMute;
+                case SDL.SDL_Keycode.SDLK_VOLUMEDOWN:
+                    return Keys.VolumeDown;
+                case SDL.SDL_Keycode.SDLK_VOLUMEUP:
+                    return Keys.VolumeUp;
+                case SDL.SDL_Keycode.SDLK_AUDIONEXT:
+                    return Keys.MediaNextTrack;
+                case SDL.SDL_Keycode.SDLK_AUDIOPREV:
+                    return Keys.MediaPreviousTrack;
+                case SDL.SDL_Keycode.SDLK_AUDIOSTOP:
+                    return Keys.MediaStop;
+                case SDL.SDL_Keycode.SDLK_AUDIOPLAY:
+                    return Keys.MediaPlayPause;
+                case SDL.SDL_Keycode.SDLK_MAIL:
+                    return Keys.LaunchMail;
+                case SDL.SDL_Keycode.SDLK_MEDIASELECT:
+                    return Keys.SelectMedia;
+                case SDL.SDL_Keycode.SDLK_CRSEL:
+                    return Keys.CrSel;
+                case SDL.SDL_Keycode.SDLK_EXSEL:
+                    return Keys.ExSel;
             }
         }
     }
diff --git a/sources/engine/Xenko.Input/SDL/MouseSDL.cs b/sources/engine/Xenko.Input/SDL/MouseSDL.cs
index 759832351f..5d41e27beb 100644
--- a/sources/engine/Xenko.Input/SDL/MouseSDL.cs
+++ b/sources/engine/Xenko.Input/SDL/MouseSDL.cs
@@ -16,7 +16,6 @@ internal class MouseSDL : MouseDeviceBase, IDisposable
         private readonly Window uiControl;
 
         private bool isMousePositionLocked;
-        private bool wasMouseVisibleBeforeCapture;
         private Point relativeCapturedPosition;
 
         public MouseSDL(InputSourceSDL source, GameBase game, Window uiControl)
@@ -54,14 +53,11 @@ public override void LockPosition(bool forceCenter = false)
         {
             if (!IsPositionLocked)
             {
-                wasMouseVisibleBeforeCapture = game.IsMouseVisible;
                 game.IsMouseVisible = false;
 
                 if (forceCenter)
                 {
-                    // Take the center of the client area as the captured position and move the cursor to that position
                     relativeCapturedPosition = new Point(uiControl.ClientSize.Width / 2, uiControl.ClientSize.Height / 2);
-                    uiControl.RelativeCursorPosition = relativeCapturedPosition;
                 }
                 else
                 {
@@ -69,16 +65,33 @@ public override void LockPosition(bool forceCenter = false)
                 }
 
                 isMousePositionLocked = true;
+                needsRelativeSync = true;
             }
         }
 
-        public override void UnlockPosition()
+        /// <summary>
+        /// Setting relative mode for SDL is NOT thread safe (like during events), this makes sure it happens on the main thread ONLY
+        /// </summary>
+        internal bool needsRelativeSync;
+
+        internal void SyncRelativeMode()
+        {
+            if (needsRelativeSync)
+            {
+                needsRelativeSync = false;
+                uiControl.SetRelativeMouseMode(isMousePositionLocked);
+            }
+        }
+
+        public override void UnlockPosition(bool restoreVisibility = true)
         {
             if (IsPositionLocked)
             {
                 isMousePositionLocked = false;
+                needsRelativeSync = true;
+                if (restoreVisibility) game.IsMouseVisible = true;
+                uiControl.RelativeCursorPosition = relativeCapturedPosition;
                 relativeCapturedPosition = Point.Zero;
-                game.IsMouseVisible = wasMouseVisibleBeforeCapture;
             }
         }
 
@@ -117,11 +130,7 @@ private void OnMouseMoveEvent(SDL.SDL_MouseMotionEvent e)
         {
             if (IsPositionLocked)
             {
-                MouseState.HandleMouseDelta(new Vector2(e.x - relativeCapturedPosition.X, e.y - relativeCapturedPosition.Y));
-
-                // Restore position to prevent mouse from going out of the window where we would not get
-                // mouse move event.
-                uiControl.RelativeCursorPosition = relativeCapturedPosition;
+                MouseState.HandleMouseDelta(new Vector2(e.xrel, e.yrel));
             }
             else
             {
diff --git a/sources/engine/Xenko.Input/SDL/PointerSDL.cs b/sources/engine/Xenko.Input/SDL/PointerSDL.cs
new file mode 100644
index 0000000000..32ae30e5ac
--- /dev/null
+++ b/sources/engine/Xenko.Input/SDL/PointerSDL.cs
@@ -0,0 +1,115 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+#if XENKO_UI_SDL
+using System;
+using System.Collections.Generic;
+using SDL2;
+using Xenko.Core.Extensions;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Graphics.SDL;
+
+namespace Xenko.Input
+{
+    /// <summary>
+    /// Class handling finger touch inputs using the SDL backend
+    /// </summary>
+    internal class PointerSDL : PointerDeviceBase, IDisposable
+    {
+        private readonly Window uiControl;
+        private readonly Dictionary<long, int> touchFingerIndexMap = new Dictionary<long, int>();
+        private int touchCounter;
+
+        public PointerSDL(InputSourceSDL source, Window uiControl)
+        {
+            Source = source;
+            this.uiControl = uiControl;
+
+            // Disable Touch-Mouse synthesis
+            SDL.SDL_SetHint(SDL.SDL_HINT_TOUCH_MOUSE_EVENTS, "false");
+
+            uiControl.FingerMoveActions += OnFingerMoveEvent;
+            uiControl.FingerPressActions += OnFingerPressEvent;
+            uiControl.FingerReleaseActions += OnFingerReleaseEvent;
+
+            uiControl.ResizeEndActions += OnSizeChanged;
+            OnSizeChanged(new SDL.SDL_WindowEvent());
+        }
+
+        public override string Name => "SDL Pointer";
+
+        public override Guid Id => new Guid("f64482a9-dac9-4806-959f-eea7cbb4c609");
+
+        public override IInputSource Source { get; }
+
+        public void Dispose()
+        {
+            uiControl.FingerMoveActions -= OnFingerMoveEvent;
+            uiControl.FingerPressActions -= OnFingerPressEvent;
+            uiControl.FingerReleaseActions -= OnFingerReleaseEvent;
+
+            uiControl.ResizeEndActions -= OnSizeChanged;
+        }
+
+        private void OnSizeChanged(SDL.SDL_WindowEvent eventArgs)
+        {
+            SetSurfaceSize(new Vector2(uiControl.ClientSize.Width, uiControl.ClientSize.Height));
+        }
+
+        // TODO Code from PointeriOS with slight modifications, consider creating and referencing a utility class
+        private int GetFingerId(long touchId, PointerEventType type)
+        {
+            // Assign finger index (starting at 0) to touch ID
+            int touchFingerIndex = 0;
+            if (type == PointerEventType.Pressed)
+            {
+                touchFingerIndex = touchCounter++;
+                touchFingerIndexMap.Add(touchId, touchFingerIndex);
+            }
+            else
+            {
+                touchFingerIndex = touchFingerIndexMap[touchId];
+            }
+
+            // Remove index
+            if (type == PointerEventType.Released)
+            {
+                touchFingerIndexMap.Remove(touchId);
+                touchCounter = 0; // Reset touch counter
+
+                // Recalculate next finger index
+                if (touchFingerIndexMap.Count > 0)
+                {
+                    touchFingerIndexMap.ForEach(pair => touchCounter = Math.Max(touchCounter, pair.Value));
+                    touchCounter++; // next
+                }
+            }
+
+            return touchFingerIndex;
+        }
+
+        private void HandleFingerEvent(SDL.SDL_TouchFingerEvent e, PointerEventType type)
+        {
+            var newPosition = new Vector2(e.x, e.y);
+            var id = GetFingerId(e.fingerId, type);
+            PointerState.PointerInputEvents.Add(new PointerDeviceState.InputEvent { Type = type, Position = newPosition, Id = id });
+        }
+
+        private void OnFingerMoveEvent(SDL.SDL_TouchFingerEvent e)
+        {
+            HandleFingerEvent(e, PointerEventType.Moved);
+        }
+
+        private void OnFingerPressEvent(SDL.SDL_TouchFingerEvent e)
+        {
+            HandleFingerEvent(e, PointerEventType.Pressed);
+        }
+
+        private void OnFingerReleaseEvent(SDL.SDL_TouchFingerEvent e)
+        {
+            HandleFingerEvent(e, PointerEventType.Released);
+        }
+    }
+}
+#endif
diff --git a/sources/engine/Xenko.Input/Simulated/InputSourceSimulated.cs b/sources/engine/Xenko.Input/Simulated/InputSourceSimulated.cs
index 86c094c24f..aafb839370 100644
--- a/sources/engine/Xenko.Input/Simulated/InputSourceSimulated.cs
+++ b/sources/engine/Xenko.Input/Simulated/InputSourceSimulated.cs
@@ -15,11 +15,13 @@ public class InputSourceSimulated : InputSourceBase
         private List<GamePadSimulated> gamePads = new List<GamePadSimulated>();
         private List<MouseSimulated> mice = new List<MouseSimulated>();
         private List<KeyboardSimulated> keyboards = new List<KeyboardSimulated>();
-        
+        private List<PointerSimulated> pointers = new List<PointerSimulated>();
+
         public IReadOnlyList<KeyboardSimulated> Keyboards => keyboards;
         public IReadOnlyList<MouseSimulated> Mice => mice;
         public IReadOnlyList<GamePadSimulated> GamePads => gamePads;
-        
+        public IReadOnlyList<PointerSimulated> Pointers => pointers;
+
         public override void Initialize(InputManager inputManager)
         {
         }
@@ -30,6 +32,7 @@ public override void Dispose()
             keyboards.Clear();
             mice.Clear();
             gamePads.Clear();
+            pointers.Clear();
         }
 
         public GamePadSimulated AddGamePad()
@@ -101,10 +104,27 @@ public void RemoveAllKeyboards()
             keyboards.Clear();
         }
 
-        private enum DeviceEventType
+        public PointerSimulated AddPointer()
+        {
+            var pointer = new PointerSimulated(this);
+            pointers.Add(pointer);
+            RegisterDevice(pointer);
+            return pointer;
+        }
+
+        public void RemovePointer(PointerSimulated pointer)
+        {
+            if (!pointers.Contains(pointer))
+                throw new InvalidOperationException("Simulated PointerDevice does not exist");
+            UnregisterDevice(pointer);
+            pointers.Remove(pointer);
+        }
+
+        public void RemoveAllPointers()
         {
-            Add,
-            Remove,
+            foreach (var pointer in pointers)
+                UnregisterDevice(pointer);
+            pointers.Clear();
         }
     }
 }
diff --git a/sources/engine/Xenko.Input/Simulated/MouseSimulated.cs b/sources/engine/Xenko.Input/Simulated/MouseSimulated.cs
index 2dcd56c62e..d85cae4dfd 100644
--- a/sources/engine/Xenko.Input/Simulated/MouseSimulated.cs
+++ b/sources/engine/Xenko.Input/Simulated/MouseSimulated.cs
@@ -37,7 +37,7 @@ public override void Update(List<InputEvent> inputEvents)
             if (positionLocked)
             {
                 MouseState.Position = capturedPosition;
-                PointerState.GetPointerData(0).Position = capturedPosition;
+                PointerState.pointerData.Position = capturedPosition;
             }
         }
 
@@ -79,9 +79,9 @@ public override void LockPosition(bool forceCenter = false)
             capturedPosition = forceCenter ? new Vector2(0.5f) : Position;
         }
 
-        public override void UnlockPosition()
+        public override void UnlockPosition(bool restoreVisible = true)
         {
             positionLocked = false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Input/Simulated/PointerSimulated.cs b/sources/engine/Xenko.Input/Simulated/PointerSimulated.cs
new file mode 100644
index 0000000000..81c2377fa0
--- /dev/null
+++ b/sources/engine/Xenko.Input/Simulated/PointerSimulated.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Input
+{
+    /// <summary>
+    /// Simulation of PointerEvents
+    /// </summary>
+    public class PointerSimulated : PointerDeviceBase
+    {
+        public PointerSimulated(InputSourceSimulated source)
+        {
+            Priority = -1000;
+            SetSurfaceSize(Vector2.One);
+            Source = source;
+        }
+
+        public override string Name => "Simulated Pointer";
+
+        public override Guid Id => new Guid("8D527970-EB53-4392-AFBB-CB08CFF95143");
+
+        public override IInputSource Source { get; }
+
+        public new PointerDeviceState PointerState => base.PointerState;
+
+        public override void Update(List<InputEvent> inputEvents)
+        {
+            base.Update(inputEvents);
+        }
+
+        public void SimulatePointer(PointerEventType pointerEventType, Vector2 position, int id = 0)
+        {
+            PointerState.PointerInputEvents.Add(new PointerDeviceState.InputEvent { Id = id, Position = position, Type = pointerEventType });
+        }
+
+        //shortcuts for convenience
+        public void MovePointer(Vector2 position, int id = 0)
+        {
+            SimulatePointer(PointerEventType.Moved, position, id);
+        }
+
+        public void PressPointer(Vector2 position, int id = 0)
+        {
+            SimulatePointer(PointerEventType.Pressed, position, id);
+        }
+
+        public void ReleasePointer(Vector2 position, int id = 0)
+        {
+            SimulatePointer(PointerEventType.Released, position, id);
+        }
+
+        public void CancelPointer(Vector2 position, int id = 0)
+        {
+            SimulatePointer(PointerEventType.Canceled, position, id);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Input/VirtualButton/IVirtualButton.cs b/sources/engine/Xenko.Input/VirtualButton/IVirtualButton.cs
index 5b9b213ee9..7fe514a4be 100644
--- a/sources/engine/Xenko.Input/VirtualButton/IVirtualButton.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/IVirtualButton.cs
@@ -12,27 +12,27 @@ public interface IVirtualButton
         /// </summary>
         /// <param name="manager">The manager.</param>
         /// <returns>System.Single.</returns>
-        float GetValue(InputManager manager);
+        float GetValue();
 
         /// <summary>
         /// Indicate if the button is currently down
         /// </summary>
         /// <param name="manager">The input manager</param>
         /// <returns></returns>
-        bool IsDown(InputManager manager);
+        bool IsDown();
 
         /// <summary>
         /// Indicate if the button has been pressed since the last frame
         /// </summary>
         /// <param name="manager">The input manager</param>
         /// <returns></returns>
-        bool IsPressed(InputManager manager);
+        bool IsPressed();
 
         /// <summary>
         /// Indicate if the button has been released since the last frame
         /// </summary>
         /// <param name="manager">The input manager</param>
         /// <returns></returns>
-        bool IsReleased(InputManager manager);
+        bool IsReleased();
     }
 }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.GamePad.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.GamePad.cs
index 8d33f75306..3d8fe2adef 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.GamePad.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.GamePad.cs
@@ -48,122 +48,122 @@ public GamePad OfGamePad(int index)
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.PadUp"/>.
             /// </summary>
-            public static readonly GamePad PadUp = new GamePad("PadUp", 0);
+            public static readonly VirtualButton PadUp = new GamePad("PadUp", 0);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.PadDown"/>.
             /// </summary>
-            public static readonly GamePad PadDown = new GamePad("PadDown", 1);
+            public static readonly VirtualButton PadDown = new GamePad("PadDown", 1);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.PadLeft"/>.
             /// </summary>
-            public static readonly GamePad PadLeft = new GamePad("PadLeft", 2);
+            public static readonly VirtualButton PadLeft = new GamePad("PadLeft", 2);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.PadRight"/>.
             /// </summary>
-            public static readonly GamePad PadRight = new GamePad("PadRight", 3);
+            public static readonly VirtualButton PadRight = new GamePad("PadRight", 3);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.Start"/>.
             /// </summary>
-            public static readonly GamePad Start = new GamePad("Start", 4);
+            public static readonly VirtualButton Start = new GamePad("Start", 4);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.Back"/>.
             /// </summary>
-            public static readonly GamePad Back = new GamePad("Back", 5);
+            public static readonly VirtualButton Back = new GamePad("Back", 5);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.LeftThumb"/>.
             /// </summary>
-            public static readonly GamePad LeftThumb = new GamePad("LeftThumb", 6);
+            public static readonly VirtualButton LeftThumb = new GamePad("LeftThumb", 6);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.RightThumb"/>.
             /// </summary>
-            public static readonly GamePad RightThumb = new GamePad("RightThumb", 7);
+            public static readonly VirtualButton RightThumb = new GamePad("RightThumb", 7);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.LeftShoulder"/>.
             /// </summary>
-            public static readonly GamePad LeftShoulder = new GamePad("LeftShoulder", 8);
+            public static readonly VirtualButton LeftShoulder = new GamePad("LeftShoulder", 8);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.RightShoulder"/>.
             /// </summary>
-            public static readonly GamePad RightShoulder = new GamePad("RightShoulder", 9);
+            public static readonly VirtualButton RightShoulder = new GamePad("RightShoulder", 9);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.A"/>.
             /// </summary>
-            public static readonly GamePad A = new GamePad("A", 12);
+            public static readonly VirtualButton A = new GamePad("A", 12);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.B"/>.
             /// </summary>
-            public static readonly GamePad B = new GamePad("B", 13);
+            public static readonly VirtualButton B = new GamePad("B", 13);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.X"/>.
             /// </summary>
-            public static readonly GamePad X = new GamePad("X", 14);
+            public static readonly VirtualButton X = new GamePad("X", 14);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadButton.Y"/>.
             /// </summary>
-            public static readonly GamePad Y = new GamePad("Y", 15);
+            public static readonly VirtualButton Y = new GamePad("Y", 15);
 
             /// <summary>
             /// Equivalent to the X Axis of <see cref="GamePadState.LeftThumb"/>.
             /// </summary>
-            public static readonly GamePad LeftThumbAxisX = new GamePad("LeftThumbAxisX", 16, true);
+            public static readonly VirtualButton LeftThumbAxisX = new GamePad("LeftThumbAxisX", 16, true);
 
             /// <summary>
             /// Equivalent to the Y Axis of <see cref="GamePadState.LeftThumb"/>.
             /// </summary>
-            public static readonly GamePad LeftThumbAxisY = new GamePad("LeftThumbAxisY", 17, true);
+            public static readonly VirtualButton LeftThumbAxisY = new GamePad("LeftThumbAxisY", 17, true);
 
             /// <summary>
             /// Equivalent to the X Axis of <see cref="GamePadState.RightThumb"/>.
             /// </summary>
-            public static readonly GamePad RightThumbAxisX = new GamePad("RightThumbAxisX", 18, true);
+            public static readonly VirtualButton RightThumbAxisX = new GamePad("RightThumbAxisX", 18, true);
 
             /// <summary>
             /// Equivalent to the Y Axis of <see cref="GamePadState.RightThumb"/>.
             /// </summary>
-            public static readonly GamePad RightThumbAxisY = new GamePad("RightThumbAxisY", 19, true);
+            public static readonly VirtualButton RightThumbAxisY = new GamePad("RightThumbAxisY", 19, true);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadState.LeftTrigger"/>.
             /// </summary>
-            public static readonly GamePad LeftTrigger = new GamePad("LeftTrigger", 20);
+            public static readonly VirtualButton LeftTrigger = new GamePad("LeftTrigger", 20);
 
             /// <summary>
             /// Equivalent to <see cref="GamePadState.RightTrigger"/>.
             /// </summary>
-            public static readonly GamePad RightTrigger = new GamePad("RightTrigger", 21);
+            public static readonly VirtualButton RightTrigger = new GamePad("RightTrigger", 21);
 
             protected override string BuildButtonName()
             {
                 return PadIndex < 0 ? base.BuildButtonName() : Type.ToString() + PadIndex + "." + ShortName;
             }
 
-            private IGamePadDevice GetGamePad(InputManager manager)
+            private IGamePadDevice GetGamePad()
             {
-                return PadIndex >= 0 ? manager.GetGamePadByIndex(PadIndex) : manager.DefaultGamePad;
+                return PadIndex >= 0 ? InputManager.instance.GetGamePadByIndex(PadIndex) : InputManager.instance.DefaultGamePad;
             }
 
-            public override float GetValue(InputManager manager)
+            public override float GetValue()
             {
-                var gamePad = GetGamePad(manager);
+                var gamePad = GetGamePad();
                 if (gamePad == null)
                     return 0.0f;
 
                 if (Index <= 15)
                 {
-                    if (IsDown(manager))
+                    if (IsDown())
                         return 1.0f;
                 }
                 else
@@ -189,9 +189,9 @@ public override float GetValue(InputManager manager)
                 return 0.0f;
             }
 
-            public override bool IsDown(InputManager manager)
+            public override bool IsDown()
             {
-                var gamePad = GetGamePad(manager);
+                var gamePad = GetGamePad();
                 if (gamePad == null)
                     return false;
                 
@@ -211,9 +211,9 @@ public override bool IsDown(InputManager manager)
                 return false;
             }
 
-            public override bool IsPressed(InputManager manager)
+            public override bool IsPressed()
             {
-                var gamePad = GetGamePad(manager);
+                var gamePad = GetGamePad();
                 if (gamePad == null)
                     return false;
                 
@@ -223,9 +223,9 @@ public override bool IsPressed(InputManager manager)
                 return gamePad.IsButtonPressed((GamePadButton)(1 << Index));
             }
 
-            public override bool IsReleased(InputManager manager)
+            public override bool IsReleased()
             {
-                var gamePad = GetGamePad(manager);
+                var gamePad = GetGamePad();
                 if (gamePad == null)
                     return false;
 
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Keyboard.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Keyboard.cs
index 549aafe56f..f63a241090 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Keyboard.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Keyboard.cs
@@ -747,110 +747,65 @@ public class Keyboard : VirtualButton
             /// </summary>
             public static readonly VirtualButton LaunchApplication2 = new Keyboard("launchapplication2", (int)Keys.LaunchApplication2);
 
-            /// <summary>
-            /// The 'oem1' key.
-            /// </summary>
-            public static readonly VirtualButton Oem1 = new Keyboard("oem1", (int)Keys.Oem1);
-
             /// <summary>
             /// The 'oemsemicolon' key.
             /// </summary>
-            public static readonly VirtualButton OemSemicolon = new Keyboard("oemsemicolon", (int)Keys.OemSemicolon);
+            public static readonly VirtualButton Semicolon = new Keyboard("semicolon", (int)Keys.Semicolon);
 
             /// <summary>
             /// The 'oemplus' key.
             /// </summary>
-            public static readonly VirtualButton OemPlus = new Keyboard("oemplus", (int)Keys.OemPlus);
+            public static readonly VirtualButton Plus = new Keyboard("plus", (int)Keys.Plus);
 
             /// <summary>
             /// The 'oemcomma' key.
             /// </summary>
-            public static readonly VirtualButton OemComma = new Keyboard("oemcomma", (int)Keys.OemComma);
+            public static readonly VirtualButton Comma = new Keyboard("comma", (int)Keys.Comma);
 
             /// <summary>
             /// The 'oemminus' key.
             /// </summary>
-            public static readonly VirtualButton OemMinus = new Keyboard("oemminus", (int)Keys.OemMinus);
+            public static readonly VirtualButton Minus = new Keyboard("minus", (int)Keys.Minus);
 
             /// <summary>
             /// The 'oemperiod' key.
             /// </summary>
-            public static readonly VirtualButton OemPeriod = new Keyboard("oemperiod", (int)Keys.OemPeriod);
-
-            /// <summary>
-            /// The 'oem2' key.
-            /// </summary>
-            public static readonly VirtualButton Oem2 = new Keyboard("oem2", (int)Keys.Oem2);
+            public static readonly VirtualButton Period = new Keyboard("period", (int)Keys.Period);
 
             /// <summary>
             /// The 'oemquestion' key.
             /// </summary>
-            public static readonly VirtualButton OemQuestion = new Keyboard("oemquestion", (int)Keys.OemQuestion);
-
-            /// <summary>
-            /// The 'oem3' key.
-            /// </summary>
-            public static readonly VirtualButton Oem3 = new Keyboard("oem3", (int)Keys.Oem3);
+            public static readonly VirtualButton Question = new Keyboard("question", (int)Keys.Question);
 
             /// <summary>
             /// The 'oemtilde' key.
             /// </summary>
-            public static readonly VirtualButton OemTilde = new Keyboard("oemtilde", (int)Keys.OemTilde);
-
-            /// <summary>
-            /// The 'oem4' key.
-            /// </summary>
-            public static readonly VirtualButton Oem4 = new Keyboard("oem4", (int)Keys.Oem4);
+            public static readonly VirtualButton Tilde = new Keyboard("tilde", (int)Keys.Tilde);
 
             /// <summary>
             /// The 'oemopenbrackets' key.
             /// </summary>
-            public static readonly VirtualButton OemOpenBrackets = new Keyboard("oemopenbrackets", (int)Keys.OemOpenBrackets);
-
-            /// <summary>
-            /// The 'oem5' key.
-            /// </summary>
-            public static readonly VirtualButton Oem5 = new Keyboard("oem5", (int)Keys.Oem5);
+            public static readonly VirtualButton OpenBrackets = new Keyboard("openbrackets", (int)Keys.OpenBrackets);
 
             /// <summary>
             /// The 'oempipe' key.
             /// </summary>
-            public static readonly VirtualButton OemPipe = new Keyboard("oempipe", (int)Keys.OemPipe);
-
-            /// <summary>
-            /// The 'oem6' key.
-            /// </summary>
-            public static readonly VirtualButton Oem6 = new Keyboard("oem6", (int)Keys.Oem6);
+            public static readonly VirtualButton Pipe = new Keyboard("pipe", (int)Keys.Pipe);
 
             /// <summary>
             /// The 'oemclosebrackets' key.
             /// </summary>
-            public static readonly VirtualButton OemCloseBrackets = new Keyboard("oemclosebrackets", (int)Keys.OemCloseBrackets);
-
-            /// <summary>
-            /// The 'oem7' key.
-            /// </summary>
-            public static readonly VirtualButton Oem7 = new Keyboard("oem7", (int)Keys.Oem7);
+            public static readonly VirtualButton CloseBrackets = new Keyboard("closebrackets", (int)Keys.CloseBrackets);
 
             /// <summary>
             /// The 'oemquotes' key.
             /// </summary>
-            public static readonly VirtualButton OemQuotes = new Keyboard("oemquotes", (int)Keys.OemQuotes);
-
-            /// <summary>
-            /// The 'oem8' key.
-            /// </summary>
-            public static readonly VirtualButton Oem8 = new Keyboard("oem8", (int)Keys.Oem8);
-
-            /// <summary>
-            /// The 'oem102' key.
-            /// </summary>
-            public static readonly VirtualButton Oem102 = new Keyboard("oem102", (int)Keys.Oem102);
+            public static readonly VirtualButton Quotes = new Keyboard("quotes", (int)Keys.Quotes);
 
             /// <summary>
             /// The 'oembackslash' key.
             /// </summary>
-            public static readonly VirtualButton OemBackslash = new Keyboard("oembackslash", (int)Keys.OemBackslash);
+            public static readonly VirtualButton Backslash = new Keyboard("backslash", (int)Keys.Backslash);
 
             /// <summary>
             /// The 'attn' key.
@@ -902,24 +857,24 @@ protected Keyboard(string name, int id, bool isPositiveAndNegative = false)
             {
             }
 
-            public override float GetValue(InputManager manager)
+            public override float GetValue()
             {
-                return IsDown(manager) ? 1.0f : 0.0f;
+                return IsDown() ? 1.0f : 0.0f;
             }
 
-            public override bool IsDown(InputManager manager)
+            public override bool IsDown()
             {
-                return manager.IsKeyDown((Keys)Index);
+                return InputManager.instance.IsKeyDown((Keys)Index);
             }
 
-            public override bool IsPressed(InputManager manager)
+            public override bool IsPressed()
             {
-                return manager.IsKeyPressed((Keys)Index);
+                return InputManager.instance.IsKeyPressed((Keys)Index);
             }
 
-            public override bool IsReleased(InputManager manager)
+            public override bool IsReleased()
             {
-                return manager.IsKeyReleased((Keys)Index);
+                return InputManager.instance.IsKeyReleased((Keys)Index);
             }
         }
     }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Mouse.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Mouse.cs
index f49616a85c..b03d19acad 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Mouse.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Mouse.cs
@@ -20,53 +20,53 @@ protected Mouse(string name, int id, bool isPositiveAndNegative)
             /// <summary>
             /// Equivalent to <see cref="MouseButton.Left"/>.
             /// </summary>
-            public static readonly Mouse Left = new Mouse("Left", 0, false);
+            public static readonly VirtualButton Left = new Mouse("Left", 0, false);
 
             /// <summary>
             /// Equivalent to <see cref="MouseButton.Middle"/>.
             /// </summary>
-            public static readonly Mouse Middle = new Mouse("Middle", 1, false);
+            public static readonly VirtualButton Middle = new Mouse("Middle", 1, false);
 
             /// <summary>
             /// Equivalent to <see cref="MouseButton.Right"/>.
             /// </summary>
-            public static readonly Mouse Right = new Mouse("Right", 2, false);
+            public static readonly VirtualButton Right = new Mouse("Right", 2, false);
 
             /// <summary>
             /// Equivalent to <see cref="MouseButton.Extended1"/>.
             /// </summary>
-            public static readonly Mouse Extended1 = new Mouse("Extended1", 3, false);
+            public static readonly VirtualButton Extended1 = new Mouse("Extended1", 3, false);
 
             /// <summary>
             /// Equivalent to <see cref="MouseButton.Extended2"/>.
             /// </summary>
-            public static readonly Mouse Extended2 = new Mouse("Extended2", 4, false);
+            public static readonly VirtualButton Extended2 = new Mouse("Extended2", 4, false);
 
             /// <summary>
             /// Equivalent to X Axis of <see cref="InputManager.MousePosition"/>.
             /// </summary>
-            public static readonly Mouse PositionX = new Mouse("PositionX", 5, true);
+            public static readonly VirtualButton PositionX = new Mouse("PositionX", 5, true);
 
             /// <summary>
             /// Equivalent to Y Axis of <see cref="InputManager.MousePosition"/>.
             /// </summary>
-            public static readonly Mouse PositionY = new Mouse("PositionY", 6, true);
+            public static readonly VirtualButton PositionY = new Mouse("PositionY", 6, true);
 
             /// <summary>
             /// Equivalent to X Axis delta of <see cref="InputManager.MousePosition"/>.
             /// </summary>
-            public static readonly Mouse DeltaX = new Mouse("DeltaX", 7, true);
+            public static readonly VirtualButton DeltaX = new Mouse("DeltaX", 7, true);
 
             /// <summary>
             /// Equivalent to Y Axis delta of <see cref="InputManager.MousePosition"/>.
             /// </summary>
-            public static readonly Mouse DeltaY = new Mouse("DeltaY", 8, true);
+            public static readonly VirtualButton DeltaY = new Mouse("DeltaY", 8, true);
 
-            public override float GetValue(InputManager manager)
+            public override float GetValue()
             {
                 if (Index < 5)
                 {
-                    if (IsDown(manager))
+                    if (IsDown())
                         return 1.0f;
                 }
                 else
@@ -74,32 +74,32 @@ public override float GetValue(InputManager manager)
                     switch (Index)
                     {
                         case 5:
-                            return manager.MousePosition.X;
+                            return InputManager.instance.MousePosition.X;
                         case 6:
-                            return manager.MousePosition.Y;
+                            return InputManager.instance.MousePosition.Y;
                         case 7:
-                            return manager.MouseDelta.X;
+                            return InputManager.instance.MouseDelta.X;
                         case 8:
-                            return manager.MouseDelta.Y;
+                            return InputManager.instance.MouseDelta.Y;
                     }
                 }
 
                 return 0.0f;
             }
 
-            public override bool IsDown(InputManager manager)
+            public override bool IsDown()
             {
-                return Index < 5 ? manager.IsMouseButtonDown((MouseButton)Index) : false;
+                return Index < 5 ? InputManager.instance.IsMouseButtonDown((MouseButton)Index) : false;
             }
 
-            public override bool IsPressed(InputManager manager)
+            public override bool IsPressed()
             {
-                return Index < 5 ? manager.IsMouseButtonPressed((MouseButton)Index) : false;
+                return Index < 5 ? InputManager.instance.IsMouseButtonPressed((MouseButton)Index) : false;
             }
 
-            public override bool IsReleased(InputManager manager)
+            public override bool IsReleased()
             {
-                return Index < 5 ? manager.IsMouseButtonReleased((MouseButton)Index) : false;
+                return Index < 5 ? InputManager.instance.IsMouseButtonReleased((MouseButton)Index) : false;
             }
         }
     }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Pointer.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Pointer.cs
index cb10c335ac..d9af8c61fa 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Pointer.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.Pointer.cs
@@ -49,71 +49,71 @@ public Pointer WithId(int pointerId)
             /// <summary>
             /// The current state of pointers.
             /// </summary>
-            public static readonly Pointer State = new Pointer("State", 0, false);
+            public static readonly VirtualButton State = new Pointer("State", 0, false);
 
             /// <summary>
             /// The X component of the Pointer <see cref="PointerPoint.Position"/>.
             /// </summary>
-            public static readonly Pointer PositionX = new Pointer("PositionX", 1, true);
+            public static readonly VirtualButton PositionX = new Pointer("PositionX", 1, true);
 
             /// <summary>
             /// The Y component of the Pointer <see cref="PointerPoint.Position"/>.
             /// </summary>
-            public static readonly Pointer PositionY = new Pointer("PositionY", 2, true);
+            public static readonly VirtualButton PositionY = new Pointer("PositionY", 2, true);
 
             /// <summary>
             /// The X component of the Pointer <see cref="PointerPoint.Delta"/>.
             /// </summary>
-            public static readonly Pointer DeltaX = new Pointer("DeltaX", 3, true);
+            public static readonly VirtualButton DeltaX = new Pointer("DeltaX", 3, true);
 
             /// <summary>
             /// The Y component of the Pointer <see cref="PointerPoint.Delta"/>.
             /// </summary>
-            public static readonly Pointer DeltaY = new Pointer("DeltaY", 4, true);
+            public static readonly VirtualButton DeltaY = new Pointer("DeltaY", 4, true);
 
             protected override string BuildButtonName()
             {
                 return PointerId < 0 ? base.BuildButtonName() : Type.ToString() + PointerId + "." + ShortName;
             }
 
-            public override float GetValue(InputManager manager)
+            public override float GetValue()
             {
                 int index = (Id & TypeIdMask);
                 switch (index)
                 {
                     case 0:
-                        return IsDown(manager) ? 1f : 0f;
+                        return IsDown() ? 1f : 0f;
                     case 1:
-                        return FromFirstMatchingEvent(manager, GetPositionX);
+                        return FromFirstMatchingEvent(GetPositionX);
                     case 2:
-                        return FromFirstMatchingEvent(manager, GetPositionY);
+                        return FromFirstMatchingEvent(GetPositionY);
                     case 3:
-                        return FromFirstMatchingEvent(manager, GetDeltaX);
+                        return FromFirstMatchingEvent(GetDeltaX);
                     case 4:
-                        return FromFirstMatchingEvent(manager, GetDeltaY);
+                        return FromFirstMatchingEvent(GetDeltaY);
                 }
 
                 return 0.0f;
             }
 
-            public override bool IsDown(InputManager manager)
+            public override bool IsDown()
             {
-                return Index == 0 ? AnyPointerInState(manager, GetDownPointers) : false;
+                return Index == 0 ? AnyPointerInState(GetDownPointers) : false;
             }
 
-            public override bool IsPressed(InputManager manager)
+            public override bool IsPressed()
             {
-                return Index == 0 ? AnyPointerInState(manager, GetPressedPointers) : false;
+                return Index == 0 ? AnyPointerInState(GetPressedPointers) : false;
             }
 
-            public override bool IsReleased(InputManager manager)
+            public override bool IsReleased()
             {
-                return Index == 0 ? AnyPointerInState(manager, GetReleasedPointers) : false;
+                return Index == 0 ? AnyPointerInState(GetReleasedPointers) : false;
             }
 
-            private float FromFirstMatchingEvent(InputManager manager, Func<PointerEvent, float> valueGetter)
+            private float FromFirstMatchingEvent(Func<PointerEvent, float> valueGetter)
             {
-                foreach (var pointerEvent in manager.PointerEvents)
+                foreach (var pointerEvent in InputManager.instance.PointerEvents)
                 {
                     if (PointerId < 0 || pointerEvent.PointerId == PointerId)
                         return valueGetter(pointerEvent);
@@ -121,9 +121,9 @@ private float FromFirstMatchingEvent(InputManager manager, Func<PointerEvent, fl
                 return 0f;
             }
 
-            private bool AnyPointerInState(InputManager manager, Func<IPointerDevice, IReadOnlySet<PointerPoint>> stateGetter)
+            private bool AnyPointerInState(Func<IPointerDevice, Core.Collections.IReadOnlySet<PointerPoint>> stateGetter)
             {
-                foreach (var pointerDevice in manager.Pointers)
+                foreach (var pointerDevice in InputManager.instance.Pointers)
                 {
                     foreach (var pointerPoint in stateGetter(pointerDevice))
                     {
@@ -134,17 +134,17 @@ private bool AnyPointerInState(InputManager manager, Func<IPointerDevice, IReadO
                 return false;
             }
 
-            private IReadOnlySet<PointerPoint> GetDownPointers(IPointerDevice device)
+            private Core.Collections.IReadOnlySet<PointerPoint> GetDownPointers(IPointerDevice device)
             {
                 return device.DownPointers;
             }
 
-            private IReadOnlySet<PointerPoint> GetPressedPointers(IPointerDevice device)
+            private Core.Collections.IReadOnlySet<PointerPoint> GetPressedPointers(IPointerDevice device)
             {
                 return device.DownPointers;
             }
 
-            private IReadOnlySet<PointerPoint> GetReleasedPointers(IPointerDevice device)
+            private Core.Collections.IReadOnlySet<PointerPoint> GetReleasedPointers(IPointerDevice device)
             {
                 return device.DownPointers;
             }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.cs
index 1f1be4350c..90288b3fb2 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButton.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButton.cs
@@ -132,11 +132,26 @@ public static VirtualButton Find(int id)
             return virtualButton;
         }
 
-        public abstract float GetValue(InputManager manager);
+        /// <summary>
+        /// Scans all registered virtual buttons for one pressed this frame. Can be useful to grab an input option from a user during runtime
+        /// </summary>
+        /// <param name="manager">Your game's InputManager</param>
+        /// <returns>A pressed VirtualButton, null if nothing was pressed</returns>
+        public static VirtualButton GetAnyPressed()
+        {
+            foreach (VirtualButton vb in Registered)
+            {
+                if (vb == Pointer.State) continue; // skip you, which is always apparently down
+                if (vb.IsPressed()) return vb;
+            }
+            return null;
+        }
 
-        public abstract bool IsDown(InputManager manager);
-        public abstract bool IsPressed(InputManager manager);
-        public abstract bool IsReleased(InputManager manager);
+        public abstract float GetValue();
+
+        public abstract bool IsDown();
+        public abstract bool IsPressed();
+        public abstract bool IsReleased();
 
         protected virtual string BuildButtonName()
         {
@@ -151,11 +166,26 @@ private static void EnsureInitialize()
                 {
                     RegisterFromType(typeof(Keyboard));
                     RegisterFromType(typeof(GamePad));
+                    RegisterFromType(typeof(Mouse));
+                    RegisterFromType(typeof(Pointer));
                     registeredReadOnly = registered;
                 }
             }
         }
 
+        /// <summary>
+        /// Add another set of virtual buttons. Useful for say, VR buttons via VRDeviceSystem.
+        /// </summary>
+        /// <param name="VirtualButtonType"></param>
+        public static void RegisterExternalVirtualButtonType(Type VirtualButtonType)
+        {
+            lock (mapIp)
+            {
+                RegisterFromType(VirtualButtonType);
+                registeredReadOnly = registered;
+            }
+        }
+
         internal static float ClampValue(float value)
         {
             return MathUtil.Clamp(value, -1.0f, 1.0f);
@@ -165,7 +195,7 @@ private static void RegisterFromType(Type type)
         {
             foreach (var fieldInfo in type.GetTypeInfo().DeclaredFields)
             {
-                if (fieldInfo.IsStatic && fieldInfo.FieldType == typeof(VirtualButton))
+                if (fieldInfo.IsStatic && typeof(VirtualButton).IsAssignableFrom(fieldInfo.FieldType))
                 {
                     Register((VirtualButton)fieldInfo.GetValue(null));
                 }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonBinding.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonBinding.cs
index dbefc97c5c..188bbb2792 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonBinding.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonBinding.cs
@@ -41,9 +41,9 @@ public VirtualButtonBinding(object name, IVirtualButton button = null)
         /// Gets the value for a particular binding.
         /// </summary>
         /// <returns>Value of the binding</returns>
-        public virtual float GetValue(InputManager manager)
+        public virtual float GetValue()
         {
-            return Button != null ? Button.GetValue(manager) : 0.0f;
+            return Button != null ? Button.GetValue() : 0.0f;
         }
 
         public override string ToString()
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfig.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfig.cs
index 845190288d..36ea053fa6 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfig.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfig.cs
@@ -35,7 +35,7 @@ public IEnumerable<object> BindingNames
             }
         }
 
-        public virtual float GetValue(InputManager inputManager, object name)
+        public virtual float GetValue(object name)
         {
             float value = 0.0f;
             List<VirtualButtonBinding> bindingsPerName;
@@ -43,7 +43,7 @@ public virtual float GetValue(InputManager inputManager, object name)
             {
                 foreach (var virtualButtonBinding in bindingsPerName)
                 {
-                    float newValue = virtualButtonBinding.GetValue(inputManager);
+                    float newValue = virtualButtonBinding.GetValue();
                     if (Math.Abs(newValue) > Math.Abs(value))
                     {
                         value = newValue;
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfigSet.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfigSet.cs
index 770fa6116c..86057e7b6b 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfigSet.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonConfigSet.cs
@@ -20,7 +20,7 @@ public VirtualButtonConfigSet()
         {
         }
 
-        public virtual float GetValue(InputManager inputManager, int configIndex, object name)
+        public virtual float GetValue(int configIndex, object name)
         {
             if (configIndex < 0 || configIndex >= Count)
             {
@@ -28,7 +28,7 @@ public virtual float GetValue(InputManager inputManager, int configIndex, object
             }
 
             var config = this[configIndex];
-            return config != null ? config.GetValue(inputManager, name) : 0.0f;
+            return config != null ? config.GetValue(name) : 0.0f;
         }
     }
 }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonGroup.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonGroup.cs
index c67fa028f9..415dfcf74f 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonGroup.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonGroup.cs
@@ -60,12 +60,12 @@ protected override void SetItem(int index, IVirtualButton item)
             return combination;
         }
 
-        public virtual float GetValue(InputManager manager)
+        public virtual float GetValue()
         {
             float value = 0.0f;
             foreach (var virtualButton in Items)
             {
-                float newValue = virtualButton != null ? virtualButton.GetValue(manager) : 0.0f;
+                float newValue = virtualButton != null ? virtualButton.GetValue() : 0.0f;
 
                 // In case of a || (disjunction) set, we return the latest non-zero value.
                 if (IsDisjunction)
@@ -104,41 +104,41 @@ public override string ToString()
             return text.ToString();
         }
 
-        public bool IsDown(InputManager manager)
+        public bool IsDown()
         {
-            return CheckAnyOrAll(manager, IsDown);
+            return CheckAnyOrAll(IsDown);
         }
 
-        public bool IsPressed(InputManager manager)
+        public bool IsPressed()
         {
-            return CheckAnyOrAll(manager, IsPressed);
+            return CheckAnyOrAll(IsPressed);
         }
 
-        public bool IsReleased(InputManager manager)
+        public bool IsReleased()
         {
-            return CheckAnyOrAll(manager, IsReleased);
+            return CheckAnyOrAll(IsReleased);
         }
 
-        private bool IsDown(IVirtualButton button, InputManager manager)
+        private bool IsDown(IVirtualButton button)
         {
-            return button.IsDown(manager);
+            return button.IsDown();
         }
 
-        private bool IsReleased(IVirtualButton button, InputManager manager)
+        private bool IsReleased(IVirtualButton button)
         {
-            return button.IsReleased(manager);
+            return button.IsReleased();
         }
 
-        private bool IsPressed(IVirtualButton button, InputManager manager)
+        private bool IsPressed(IVirtualButton button)
         {
-            return button.IsPressed(manager);
+            return button.IsPressed();
         }
 
-        private bool CheckAnyOrAll(InputManager manager, Func<IVirtualButton, InputManager, bool> check)
+        private bool CheckAnyOrAll(Func<IVirtualButton, bool> check)
         {
             foreach (var virtualButton in Items)
             {
-                var isDown = check(virtualButton, manager);
+                var isDown = check(virtualButton);
 
                 if (IsDisjunction && isDown)
                     return true;
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonTwoWay.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonTwoWay.cs
index cf7328c2e2..32241882bc 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonTwoWay.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonTwoWay.cs
@@ -43,24 +43,24 @@ public VirtualButtonTwoWay(IVirtualButton negativeButton, IVirtualButton positiv
         /// <value>The positive button.</value>
         public IVirtualButton PositiveButton { get; set; }
 
-        public virtual float GetValue(InputManager manager)
+        public virtual float GetValue()
         {
-            float negativeValue = ((NegativeButton != null) ? NegativeButton.GetValue(manager) : 0.0f);
-            float positiveValue = (PositiveButton != null) ? PositiveButton.GetValue(manager) : 0.0f;
+            float negativeValue = ((NegativeButton != null) ? NegativeButton.GetValue() : 0.0f);
+            float positiveValue = (PositiveButton != null) ? PositiveButton.GetValue() : 0.0f;
             return positiveValue - negativeValue;
         }
 
-        public bool IsDown(InputManager manager)
+        public bool IsDown()
         {
             return false;
         }
 
-        public bool IsPressed(InputManager manager)
+        public bool IsPressed()
         {
             return false;
         }
 
-        public bool IsReleased(InputManager manager)
+        public bool IsReleased()
         {
             return false;
         }
diff --git a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonType.cs b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonType.cs
index 478eb7489f..bdecb28814 100644
--- a/sources/engine/Xenko.Input/VirtualButton/VirtualButtonType.cs
+++ b/sources/engine/Xenko.Input/VirtualButton/VirtualButtonType.cs
@@ -26,5 +26,10 @@ public enum VirtualButtonType
         /// A gamepad virtual button.
         /// </summary>
         GamePad = 4 << 28,
+
+        /// <summary>
+        /// Virtual Reality input button.
+        /// </summary>
+        VR = 5 << 28
     }
 }
diff --git a/sources/engine/Xenko.Input/Windows/GameControllerDirectInput.cs b/sources/engine/Xenko.Input/Windows/GameControllerDirectInput.cs
index ed26ea919b..41b9f8dedf 100644
--- a/sources/engine/Xenko.Input/Windows/GameControllerDirectInput.cs
+++ b/sources/engine/Xenko.Input/Windows/GameControllerDirectInput.cs
@@ -37,6 +37,7 @@ public GameControllerDirectInput(InputSourceWindowsDirectInput source, DirectInp
             Id = instance.InstanceGuid;
             ProductId = instance.ProductGuid;
             joystick = new DirectInputJoystick(directInput, instance.InstanceGuid);
+            joystick.SetCooperativeLevel(IntPtr.Zero, CooperativeLevel.NonExclusive | CooperativeLevel.Foreground);
             var objects = joystick.GetObjects();
 
             int sliderCount = 0;
@@ -146,18 +147,27 @@ public override void Update(List<InputEvent> inputEvents)
                 joystick.Acquire();
                 joystick.Poll();
                 joystick.GetCurrentState(ref state);
-
-                for (int i = 0; i < buttonInfos.Count; i++)
+                
+                // Some device might report (perhaps erroneously) more than 128 buttons, which DirectInputState doesn't support  
+                // Should be investigated with such a device at hand for proper testing
+                var buttonCount = buttonInfos.Count < state.Buttons.Length ? buttonInfos.Count : state.Buttons.Length;
+                for (int i = 0; i < buttonCount; i++)
                 {
                     HandleButton(i, state.Buttons[i]);
                 }
 
                 for (int i = 0; i < axisInfos.Count; i++)
                 {
-                    HandleAxis(i, ClampDeadZone(state.Axes[axisInfos[i].Offset] * 2.0f - 1.0f, InputManager.GameControllerAxisDeadZone));
+                    int axisMemIndex = axisInfos[i].Offset;
+                    // See previous comment
+                    if(axisMemIndex >= state.Axes.Length)
+                        continue;
+                    HandleAxis(i, ClampDeadZone(state.Axes[axisMemIndex] * 2.0f - 1.0f, InputManager.GameControllerAxisDeadZone));
                 }
-
-                for (int i = 0; i < directionInfos.Count; i++)
+                
+                // See previous comment
+                var dirCount = state.PovControllers.Length < directionInfos.Count ? state.PovControllers.Length : directionInfos.Count;
+                for (int i = 0; i < dirCount; i++)
                 {
                     int povController = state.PovControllers[i];
                     HandleDirection(i, povController >= 0 ? Direction.FromTicks(povController, 36000) : Direction.None);
diff --git a/sources/engine/Xenko.Input/Windows/InputSourceWinforms.cs b/sources/engine/Xenko.Input/Windows/InputSourceWinforms.cs
index d94eedb9b8..71e4d959e2 100644
--- a/sources/engine/Xenko.Input/Windows/InputSourceWinforms.cs
+++ b/sources/engine/Xenko.Input/Windows/InputSourceWinforms.cs
@@ -183,7 +183,7 @@ private static WinFormsKeys GetCorrectExtendedKey(WinFormsKeys virtualKey, long
             {
                 // We need to check the scan code to check which SHIFT key it is.
                 var scanCode = (lParam & 0x00FF0000) >> 16;
-                return (scanCode != 36) ? WinFormsKeys.LShiftKey : WinFormsKeys.RShiftKey;
+                return (scanCode != 0x36) ? WinFormsKeys.LShiftKey : WinFormsKeys.RShiftKey;
             }
 
             if (virtualKey == WinFormsKeys.Menu)
diff --git a/sources/engine/Xenko.Input/Windows/MouseWinforms.cs b/sources/engine/Xenko.Input/Windows/MouseWinforms.cs
index 6bdada45a0..2b0c71b42d 100644
--- a/sources/engine/Xenko.Input/Windows/MouseWinforms.cs
+++ b/sources/engine/Xenko.Input/Windows/MouseWinforms.cs
@@ -88,7 +88,7 @@ public override void LockPosition(bool forceCenter = false)
             }
         }
 
-        public override void UnlockPosition()
+        public override void UnlockPosition(bool restoreVisible = true)
         {
             if (isPositionLocked)
             {
@@ -123,6 +123,11 @@ private void OnMouseMove(object sender, MouseEventArgs e)
         private void OnSizeChanged(object sender, EventArgs eventArgs)
         {
             SetSurfaceSize(new Vector2(uiControl.ClientSize.Width, uiControl.ClientSize.Height));
+            if (isPositionLocked) {
+                // update center of screen for locking cursor
+                capturedPosition = uiControl.PointToScreen(new Point(uiControl.ClientSize.Width / 2, uiControl.ClientSize.Height / 2));
+                Cursor.Position = capturedPosition;
+            }
         }
 
         private void OnMouseWheelEvent(object sender, MouseEventArgs mouseEventArgs)
diff --git a/sources/engine/Xenko.Input/Windows/WinKeys.cs b/sources/engine/Xenko.Input/Windows/WinKeys.cs
index 5ba7d8622c..c6163312f4 100644
--- a/sources/engine/Xenko.Input/Windows/WinKeys.cs
+++ b/sources/engine/Xenko.Input/Windows/WinKeys.cs
@@ -184,27 +184,27 @@ private static Dictionary<WinFormsKeys, Keys> NewMapKeys()
             map[WinFormsKeys.SelectMedia] = Keys.SelectMedia;
             map[WinFormsKeys.LaunchApplication1] = Keys.LaunchApplication1;
             map[WinFormsKeys.LaunchApplication2] = Keys.LaunchApplication2;
-            map[WinFormsKeys.Oem1] = Keys.Oem1;
-            map[WinFormsKeys.OemSemicolon] = Keys.OemSemicolon;
-            map[WinFormsKeys.Oemplus] = Keys.OemPlus;
-            map[WinFormsKeys.Oemcomma] = Keys.OemComma;
-            map[WinFormsKeys.OemMinus] = Keys.OemMinus;
-            map[WinFormsKeys.OemPeriod] = Keys.OemPeriod;
-            map[WinFormsKeys.Oem2] = Keys.Oem2;
-            map[WinFormsKeys.OemQuestion] = Keys.OemQuestion;
-            map[WinFormsKeys.Oem3] = Keys.Oem3;
-            map[WinFormsKeys.Oemtilde] = Keys.OemTilde;
-            map[WinFormsKeys.Oem4] = Keys.Oem4;
-            map[WinFormsKeys.OemOpenBrackets] = Keys.OemOpenBrackets;
-            map[WinFormsKeys.Oem5] = Keys.Oem5;
-            map[WinFormsKeys.OemPipe] = Keys.OemPipe;
-            map[WinFormsKeys.Oem6] = Keys.Oem6;
-            map[WinFormsKeys.OemCloseBrackets] = Keys.OemCloseBrackets;
-            map[WinFormsKeys.Oem7] = Keys.Oem7;
-            map[WinFormsKeys.OemQuotes] = Keys.OemQuotes;
-            map[WinFormsKeys.Oem8] = Keys.Oem8;
-            map[WinFormsKeys.Oem102] = Keys.Oem102;
-            map[WinFormsKeys.OemBackslash] = Keys.OemBackslash;
+            //map[WinFormsKeys.Oem1] = Keys.Oem1;
+            map[WinFormsKeys.OemSemicolon] = Keys.Semicolon;
+            map[WinFormsKeys.Oemplus] = Keys.Plus;
+            map[WinFormsKeys.Oemcomma] = Keys.Comma;
+            map[WinFormsKeys.OemMinus] = Keys.Minus;
+            map[WinFormsKeys.OemPeriod] = Keys.Period;
+            //map[WinFormsKeys.Oem2] = Keys.Oem2;
+            map[WinFormsKeys.OemQuestion] = Keys.Question;
+            //map[WinFormsKeys.Oem3] = Keys.Oem3;
+            map[WinFormsKeys.Oemtilde] = Keys.Tilde;
+            //map[WinFormsKeys.Oem4] = Keys.Oem4;
+            map[WinFormsKeys.OemOpenBrackets] = Keys.OpenBrackets;
+            //map[WinFormsKeys.Oem5] = Keys.Oem5;
+            map[WinFormsKeys.OemPipe] = Keys.Pipe;
+            //map[WinFormsKeys.Oem6] = Keys.Oem6;
+            map[WinFormsKeys.OemCloseBrackets] = Keys.CloseBrackets;
+            //map[WinFormsKeys.Oem7] = Keys.Oem7;
+            map[WinFormsKeys.OemQuotes] = Keys.Quotes;
+            //map[WinFormsKeys.Oem8] = Keys.Oem8;
+            //map[WinFormsKeys.Oem102] = Keys.Oem102;
+            map[WinFormsKeys.OemBackslash] = Keys.Backslash;
             map[WinFormsKeys.Attn] = Keys.Attn;
             map[WinFormsKeys.Crsel] = Keys.CrSel;
             map[WinFormsKeys.Exsel] = Keys.ExSel;
diff --git a/sources/engine/Xenko.Input/Xenko.Input.csproj b/sources/engine/Xenko.Input/Xenko.Input.csproj
index 2f6e5a975a..be2f51cbd0 100644
--- a/sources/engine/Xenko.Input/Xenko.Input.csproj
+++ b/sources/engine/Xenko.Input/Xenko.Input.csproj
@@ -1,23 +1,19 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeWindowsDotNet>true</XenkoRuntimeWindowsDotNet>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoProjectPlatformDependentWindows>true</XenkoProjectPlatformDependentWindows>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <Import Condition="$(XenkoUI.Contains('SDL'))" Project="..\..\targets\SDL.targets" />
   <Choose>
     <When Condition="$(XenkoUI.Contains('WINFORMS')) OR $(XenkoUI.Contains('WPF'))">
@@ -31,13 +27,23 @@
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <XenkoNativeLib Include="..\..\..\deps\SDL2\gamecontrollerdb.txt">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </XenkoNativeLib>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Games\Xenko.Games.csproj" />
-    <PackageReference Include="SharpDX.RawInput" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' And $(TargetFramework.StartsWith('net4'))" />
-    <PackageReference Include="SharpDX.DirectInput" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
-    <PackageReference Include="SharpDX.XInput" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="SharpDX.RawInput" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' And $(TargetFramework.StartsWith('net4'))" />
+    <PackageReference Include="SharpDX.DirectInput" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="SharpDX.XInput" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Native/NativeInvoke.cs b/sources/engine/Xenko.Native/NativeInvoke.cs
index 1e81f9b572..75ba9b5c73 100644
--- a/sources/engine/Xenko.Native/NativeInvoke.cs
+++ b/sources/engine/Xenko.Native/NativeInvoke.cs
@@ -47,7 +47,7 @@ internal class Module
         [ModuleInitializer]
         public static void Initialize()
         {
-            Core.Native.NativeInvoke.Setup();
+
         }
     }
 }
diff --git a/sources/engine/Xenko.Native/Xenko.Native.csproj b/sources/engine/Xenko.Native/Xenko.Native.csproj
index f25e1eb1e5..566aa83a0a 100644
--- a/sources/engine/Xenko.Native/Xenko.Native.csproj
+++ b/sources/engine/Xenko.Native/Xenko.Native.csproj
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoNativeOutputName>libxenko</XenkoNativeOutputName>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -36,5 +35,5 @@
     <None Include="Lightprobes\predicates.c" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Navigation.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Navigation.Tests/Properties/AndroidManifest.xml
index 7f1b44370b..0949bb6e90 100644
--- a/sources/engine/Xenko.Navigation.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Navigation.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Navigation.Tests" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
   <application android:icon="@drawable/icon" android:label="Xenko.Navigation.Tests" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
   <uses-feature android:glEsVersion="0x00020000" android:required="true" />
   <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
diff --git a/sources/engine/Xenko.Navigation.Tests/Xenko.Navigation.Tests.Windows.csproj b/sources/engine/Xenko.Navigation.Tests/Xenko.Navigation.Tests.Windows.csproj
index 9b5cadda22..0930ba45ca 100644
--- a/sources/engine/Xenko.Navigation.Tests/Xenko.Navigation.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Navigation.Tests/Xenko.Navigation.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Navigation.Tests</RootNamespace>
@@ -40,6 +40,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Navigation/NavigationMeshBuildUtils.cs b/sources/engine/Xenko.Navigation/NavigationMeshBuildUtils.cs
index 7539416871..b0f4847703 100644
--- a/sources/engine/Xenko.Navigation/NavigationMeshBuildUtils.cs
+++ b/sources/engine/Xenko.Navigation/NavigationMeshBuildUtils.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Xenko.Core.Mathematics;
+using Xenko.Engine;
 using Xenko.Physics;
 
 namespace Xenko.Navigation
@@ -163,5 +164,48 @@ public static int HashEntityCollider(StaticColliderComponent collider, Collision
             }
             return hash;
         }
+
+        /// <summary>
+        /// Checks if a static collider has latest collider shape
+        /// </summary>
+        /// <param name="collider">The collider to check</param>
+        /// <returns><c>true</c> if the collider has latest collider shape, <c>false</c> otherwise</returns>
+        public static bool HasLatestColliderShape(StaticColliderComponent collider)
+        {
+            if (collider.ColliderShape == null)
+            {
+                return false;
+            }
+            else
+            {
+                if (collider.ColliderShapes.Count == 1)
+                {
+                    if (!collider.ColliderShapes[0].Match(collider.ColliderShape.Description))
+                    {
+                        return false;
+                    }
+                }
+                else
+                {
+                    var compound = collider.ColliderShape as CompoundColliderShape;
+                    if ((compound != null) && (compound.Count == collider.ColliderShapes.Count))
+                    {
+                        for (int i = 0; i < compound.Count; ++i)
+                        {
+                            if (!collider.ColliderShapes[i].Match(compound[i].Description))
+                            {
+                                return false;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
     }
 }
diff --git a/sources/engine/Xenko.Navigation/NavigationMeshBuilder.cs b/sources/engine/Xenko.Navigation/NavigationMeshBuilder.cs
index b2e22d9839..b3168e90d7 100644
--- a/sources/engine/Xenko.Navigation/NavigationMeshBuilder.cs
+++ b/sources/engine/Xenko.Navigation/NavigationMeshBuilder.cs
@@ -438,7 +438,8 @@ private void BuildInput(StaticColliderData[] collidersLocal, CollisionFilterGrou
                 colliderData.Previous = null;
                 if (lastCache?.Objects.TryGetValue(colliderData.Component.Id, out colliderData.Previous) ?? false)
                 {
-                    if (colliderData.Previous.ParameterHash == colliderData.ParameterHash)
+                    if ((!colliderData.Component.AlwaysUpdateNaviMeshCache) &&
+                        (colliderData.Previous.ParameterHash == colliderData.ParameterHash))
                     {
                         // In this case, we don't need to recalculate the geometry for this shape, since it wasn't changed
                         // here we take the triangle mesh from the previous build as the current
@@ -466,7 +467,10 @@ private void BuildInput(StaticColliderData[] collidersLocal, CollisionFilterGrou
                 }
 
                 // Make sure shape is up to date
-                colliderData.Component.ComposeShape();
+                if (!NavigationMeshBuildUtils.HasLatestColliderShape(colliderData.Component))
+                {
+                    colliderData.Component.ComposeShape();
+                }
 
                 // Interate through all the colliders shapes while queueing all shapes in compound shapes to process those as well
                 Queue<ColliderShape> shapesToProcess = new Queue<ColliderShape>();
@@ -544,7 +548,7 @@ private void BuildInput(StaticColliderData[] collidersLocal, CollisionFilterGrou
 
                             // Convert hull indices to int
                             int[] indices = new int[hull.Indices.Count];
-                            if (hull.Indices.Count % 3 != 0) throw new InvalidOperationException("Physics hull does not consist of triangles");
+                            if (hull.Indices.Count % 3 != 0) throw new InvalidOperationException($"{shapeType} does not consist of triangles");
                             for (int i = 0; i < hull.Indices.Count; i += 3)
                             {
                                 indices[i] = (int)hull.Indices[i];
@@ -554,6 +558,67 @@ private void BuildInput(StaticColliderData[] collidersLocal, CollisionFilterGrou
 
                             entityNavigationMeshInputBuilder.AppendArrays(hull.Points.ToArray(), indices, transform);
                         }
+                        else if (shapeType == typeof(StaticMeshColliderShape))
+                        {
+                            var mesh = (StaticMeshColliderShape)shape;
+                            Matrix transform = mesh.PositiveCenterMatrix * entityWorldMatrix;
+
+                            // Convert hull indices to int
+                            int[] indices = new int[mesh.Indices.Count];
+                            if (mesh.Indices.Count % 3 != 0) throw new InvalidOperationException($"{shapeType} does not consist of triangles");
+                            for (int i = 0; i < mesh.Indices.Count; i += 3)
+                            {
+                                indices[i] = (int)mesh.Indices[i];
+                                indices[i + 2] = (int)mesh.Indices[i + 1]; // NOTE: Reversed winding to create left handed input
+                                indices[i + 1] = (int)mesh.Indices[i + 2];
+                            }
+
+                            entityNavigationMeshInputBuilder.AppendArrays(mesh.Vertices.ToArray(), indices, transform);
+                        }
+                        else if (shapeType == typeof(HeightfieldColliderShape))
+                        {
+                            var heightfield = (HeightfieldColliderShape)shape;
+
+                            var halfRange = (heightfield.MaxHeight - heightfield.MinHeight) * 0.5f;
+                            var offset = -(heightfield.MinHeight + halfRange);
+                            Matrix transform = Matrix.Translation(new Vector3(0, offset, 0)) * heightfield.PositiveCenterMatrix * entityWorldMatrix;
+
+                            var width = heightfield.HeightStickWidth - 1;
+                            var length = heightfield.HeightStickLength - 1;
+                            var mesh = GeometricPrimitive.Plane.New(width, length, width, length, normalDirection: NormalDirection.UpY, toLeftHanded: true);
+
+                            var arrayLength = heightfield.HeightStickWidth * heightfield.HeightStickLength;
+
+                            using (heightfield.LockToReadHeights())
+                            {
+                                switch (heightfield.HeightType)
+                                {
+                                    case HeightfieldTypes.Short:
+                                        if (heightfield.ShortArray == null) continue;
+                                        for (int i = 0; i < arrayLength; ++i)
+                                        {
+                                            mesh.Vertices[i].Position.Y = heightfield.ShortArray[i] * heightfield.HeightScale;
+                                        }
+                                        break;
+                                    case HeightfieldTypes.Byte:
+                                        if (heightfield.ByteArray == null) continue;
+                                        for (int i = 0; i < arrayLength; ++i)
+                                        {
+                                            mesh.Vertices[i].Position.Y = heightfield.ByteArray[i] * heightfield.HeightScale;
+                                        }
+                                        break;
+                                    case HeightfieldTypes.Float:
+                                        if (heightfield.FloatArray == null) continue;
+                                        for (int i = 0; i < arrayLength; ++i)
+                                        {
+                                            mesh.Vertices[i].Position.Y = heightfield.FloatArray[i];
+                                        }
+                                        break;
+                                }
+                            }
+
+                            entityNavigationMeshInputBuilder.AppendMeshData(mesh, transform);
+                        }
                         else if (shapeType == typeof(CompoundColliderShape))
                         {
                             // Unroll compound collider shapes
diff --git a/sources/engine/Xenko.Navigation/Processors/BoundingBoxProcessor.cs b/sources/engine/Xenko.Navigation/Processors/BoundingBoxProcessor.cs
index f22b72d0ab..a0013df442 100644
--- a/sources/engine/Xenko.Navigation/Processors/BoundingBoxProcessor.cs
+++ b/sources/engine/Xenko.Navigation/Processors/BoundingBoxProcessor.cs
@@ -11,7 +11,7 @@ namespace Xenko.Navigation.Processors
 {
     internal class BoundingBoxProcessor : EntityProcessor<NavigationBoundingBoxComponent>
     {
-        public ICollection<NavigationBoundingBoxComponent> BoundingBoxes => ComponentDatas.Keys;
+        public ICollection<NavigationBoundingBoxComponent> BoundingBoxes => ComponentDataKeys;
 
         protected override void OnSystemAdd()
         {
diff --git a/sources/engine/Xenko.Navigation/Processors/NavigationProcessor.cs b/sources/engine/Xenko.Navigation/Processors/NavigationProcessor.cs
index da5ddb021a..0989e0df11 100644
--- a/sources/engine/Xenko.Navigation/Processors/NavigationProcessor.cs
+++ b/sources/engine/Xenko.Navigation/Processors/NavigationProcessor.cs
@@ -27,9 +27,9 @@ public class NavigationProcessor : EntityProcessor<NavigationComponent, Navigati
         public override void Update(GameTime time)
         {
             // Update scene offsets for navigation components
-            foreach (var p in ComponentDatas)
+            for (int i=0; i<ComponentDataValues.Count; i++)
             {
-                UpdateSceneOffset(p.Value);
+                UpdateSceneOffset(ComponentDataValues[i]);
             }
         }
 
@@ -48,7 +48,7 @@ protected override void OnSystemRemove()
         {
             if (gameSystemCollection != null)
             {
-                gameSystemCollection.CollectionChanged += GameSystemsOnCollectionChanged;
+                gameSystemCollection.CollectionChanged -= GameSystemsOnCollectionChanged;
             }
 
             if (dynamicNavigationMeshSystem != null)
@@ -142,7 +142,7 @@ private void DynamicNavigationMeshSystemOnNavigationMeshUpdatedUpdated(object se
 
             // Update loaded navigation meshes for components that are useing it,
             //  in case a group was added
-            var componentsToUpdate = ComponentDatas.Values.Where(x => x.Component.NavigationMesh == null).ToArray();
+            var componentsToUpdate = ComponentDataValues.Where(x => x.Component.NavigationMesh == null).ToArray();
             foreach (var component in componentsToUpdate)
             {
                 UpdateNavigationMesh(component);
@@ -151,8 +151,10 @@ private void DynamicNavigationMeshSystemOnNavigationMeshUpdatedUpdated(object se
 
         private void ComponentOnNavigationMeshChanged(object sender, EventArgs eventArgs)
         {
-            var data = ComponentDatas[(NavigationComponent)sender];
-            UpdateNavigationMesh(data);
+            if (KeyIndex.TryGetValue((NavigationComponent)sender, out int index))
+            {
+                UpdateNavigationMesh(ComponentDataValues[index]);
+            }
         }
 
         private void UpdateNavigationMesh(AssociatedData data)
diff --git a/sources/engine/Xenko.Navigation/Processors/StaticColliderProcessor.cs b/sources/engine/Xenko.Navigation/Processors/StaticColliderProcessor.cs
index 2d83a37347..487325a1ea 100644
--- a/sources/engine/Xenko.Navigation/Processors/StaticColliderProcessor.cs
+++ b/sources/engine/Xenko.Navigation/Processors/StaticColliderProcessor.cs
@@ -16,7 +16,7 @@ internal class StaticColliderProcessor : EntityProcessor<StaticColliderComponent
         /// <inheritdoc />
         protected override StaticColliderData GenerateComponentData(Entity entity, StaticColliderComponent component)
         {
-            return new StaticColliderData { Component = component };
+            return new StaticColliderData { Component = component, };
         }
 
         /// <inheritdoc />
diff --git a/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj b/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj
index f871ff1796..edf0b0bb40 100644
--- a/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj
+++ b/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj
@@ -1,19 +1,18 @@
-<Project>
-
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoNativeOutputName>libxenkonavigation</XenkoNativeOutputName>
   </PropertyGroup>
 
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>--serialization</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
 
@@ -44,6 +43,8 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Particles.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Particles.Tests/Properties/AndroidManifest.xml
index 13392f76f3..63ee40b893 100644
--- a/sources/engine/Xenko.Particles.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Particles.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Particles.Tests" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
 	<application android:icon="@drawable/icon" android:label="Xenko Particles" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Android.csproj b/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Android.csproj
index c016bcb4ea..2ee022c5fe 100644
--- a/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Android.csproj
+++ b/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Android.csproj
@@ -24,7 +24,6 @@
     <MandroidI18n />
     <JavaMaximumHeapSize />
     <JavaOptions />
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
     <XenkoPlatform>Android</XenkoPlatform>
     <XenkoBuildProfile>Android</XenkoBuildProfile>
diff --git a/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Windows.csproj b/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Windows.csproj
index 0345b934e4..39da1e141a 100644
--- a/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Particles.Tests</RootNamespace>
@@ -77,6 +77,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.iOS.csproj b/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.iOS.csproj
index 26c563c86b..d408dd8890 100644
--- a/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.iOS.csproj
+++ b/sources/engine/Xenko.Particles.Tests/Xenko.Particles.Tests.iOS.csproj
@@ -23,7 +23,6 @@
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
   </PropertyGroup>
   <PropertyGroup>
     <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Particles.Tests.xkpkg</XenkoCurrentPackagePath>
diff --git a/sources/engine/Xenko.Particles/BoundingShapes/BoundingBoxStatic.cs b/sources/engine/Xenko.Particles/BoundingShapes/BoundingBoxStatic.cs
index e2be61ec6b..b7a313fd1d 100644
--- a/sources/engine/Xenko.Particles/BoundingShapes/BoundingBoxStatic.cs
+++ b/sources/engine/Xenko.Particles/BoundingShapes/BoundingBoxStatic.cs
@@ -29,14 +29,14 @@ public class BoundingBoxStatic : BoundingShape
         /// </userdoc>
         [DataMember(40)]
         [Display("Upper corner")]
-        public Vector3 Maximum { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 Maximum { get; set; } = Vector3.One;
 
         [DataMemberIgnore]
         private BoundingBox cachedBox;
 
         private static void AddCornerToAabb(Vector3 corner, Quaternion rotation, ref Vector3 min, ref Vector3 max)
         {
-            rotation.Rotate(ref corner);
+            rotation.RotateVector(ref corner);
             min.X = (corner.X < min.X) ? corner.X : min.X;
             min.Y = (corner.Y < min.Y) ? corner.Y : min.Y;
             min.Z = (corner.Z < min.Z) ? corner.Z : min.Z;
diff --git a/sources/engine/Xenko.Particles/BoundingShapes/BoundingShape.cs b/sources/engine/Xenko.Particles/BoundingShapes/BoundingShape.cs
index 9eff01e348..ae843b8f19 100644
--- a/sources/engine/Xenko.Particles/BoundingShapes/BoundingShape.cs
+++ b/sources/engine/Xenko.Particles/BoundingShapes/BoundingShape.cs
@@ -30,8 +30,8 @@ public abstract class BoundingShape
         public virtual bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out Vector3 translation, out Quaternion rotation, out Vector3 scale)
         {
             debugDrawShape = DebugDrawShape.None;
-            scale = new Vector3(1, 1, 1);
-            translation = new Vector3(0, 0, 0);
+            scale = Vector3.One;
+            translation = Vector3.Zero;
             rotation = Quaternion.Identity;
             return false;
         }
diff --git a/sources/engine/Xenko.Particles/BoundingShapes/BoundingSphereStatic.cs b/sources/engine/Xenko.Particles/BoundingShapes/BoundingSphereStatic.cs
index 5f4e4dc398..34fcbc36ea 100644
--- a/sources/engine/Xenko.Particles/BoundingShapes/BoundingSphereStatic.cs
+++ b/sources/engine/Xenko.Particles/BoundingShapes/BoundingSphereStatic.cs
@@ -43,7 +43,7 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
 
             debugDrawShape = DebugDrawShape.Cube;
             scale = new Vector3(Radius, Radius, Radius);
-            translation = new Vector3(0, 0, 0);
+            translation = Vector3.Zero;
             rotation = Quaternion.Identity;
             return true;
         }
diff --git a/sources/engine/Xenko.Particles/Components/ParticleSystemSimulationProcessor.cs b/sources/engine/Xenko.Particles/Components/ParticleSystemSimulationProcessor.cs
index fc6c43c853..becf838f9c 100644
--- a/sources/engine/Xenko.Particles/Components/ParticleSystemSimulationProcessor.cs
+++ b/sources/engine/Xenko.Particles/Components/ParticleSystemSimulationProcessor.cs
@@ -94,19 +94,21 @@ private void UpdateParticleSystem(ParticleSystemComponentState state, float delt
         /// <inheritdoc />
         public override void Draw(RenderContext context)
         {
-            float deltaTime = (float) context.Time.Elapsed.TotalSeconds;
+            float deltaTime = (float) context.Time.WarpElapsed.TotalSeconds;
 
             ParticleSystems.Clear();
-            foreach (var particleSystemStateKeyPair in ComponentDatas)
+            for (int i=0; i<ComponentDataValues.Count; i++)
             {
-                if (particleSystemStateKeyPair.Value.ParticleSystemComponent.Enabled)
+                var pairValue = ComponentDataValues[i];
+
+                if (pairValue.ParticleSystemComponent.Enabled)
                 {
                     // Exposed variables
 
-                    if (!particleSystemStateKeyPair.Value.ParticleSystemComponent.ParticleSystem.Enabled)
+                    if (!pairValue.ParticleSystemComponent.ParticleSystem.Enabled)
                         continue;
 
-                    ParticleSystems.Add(particleSystemStateKeyPair.Value);
+                    ParticleSystems.Add(pairValue);
                 }
             }
 
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialDefaultFields.cs b/sources/engine/Xenko.Particles/Initializers/InitialDefaultFields.cs
index bf1d029697..16e8c2e28f 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialDefaultFields.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialDefaultFields.cs
@@ -44,7 +44,7 @@ public unsafe void Initialize(ParticlePool pool, int startIdx, int endIdx, int m
             var dirField = pool.GetField(ParticleFields.Direction);
             if (dirField.IsValid())
             {
-                var zeroDirection = new Vector3(0, 0, 0);
+                var zeroDirection = Vector3.Zero;
                 for (var i = startIdx; i != endIdx;)
                 {
                     var particle = pool.FromIndex(i);
@@ -81,7 +81,7 @@ public unsafe void Initialize(ParticlePool pool, int startIdx, int endIdx, int m
             var velField = pool.GetField(ParticleFields.Velocity);
             if (velField.IsValid())
             {
-                var zeroVelocity = new Vector3(0, 0, 0);
+                var zeroVelocity = Vector3.Zero;
                 for (var i = startIdx; i != endIdx;)
                 {
                     var particle = pool.FromIndex(i);
@@ -133,7 +133,7 @@ public unsafe void Initialize(ParticlePool pool, int startIdx, int endIdx, int m
         }
 
         [DataMemberIgnore]
-        public Vector3 WorldPosition { get; private set; } = new Vector3(0, 0, 0);
+        public Vector3 WorldPosition { get; private set; } = Vector3.Zero;
         [DataMemberIgnore]
         public Quaternion WorldRotation { get; private set; } = Quaternion.Identity;
         [DataMemberIgnore]
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialDirectionSeed.cs b/sources/engine/Xenko.Particles/Initializers/InitialDirectionSeed.cs
index 7fa5fb8549..5d1203cb19 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialDirectionSeed.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialDirectionSeed.cs
@@ -40,10 +40,10 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref leftCorner);
-                WorldRotation.Rotate(ref xAxis);
-                WorldRotation.Rotate(ref yAxis);
-                WorldRotation.Rotate(ref zAxis);
+                WorldRotation.RotateVector(ref leftCorner);
+                WorldRotation.RotateVector(ref xAxis);
+                WorldRotation.RotateVector(ref yAxis);
+                WorldRotation.RotateVector(ref zAxis);
             }
 
             var i = startIdx;
@@ -91,7 +91,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
         /// </userdoc>
         [DataMember(40)]
         [Display("Direction max")]
-        public Vector3 DirectionMax { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 DirectionMax { get; set; } = Vector3.One;
 
         /// <summary>
         /// Should this Particle Module's bounds be displayed as a debug draw
@@ -116,7 +116,7 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
             translation = (DirectionMax + DirectionMin) * 0.5f * WorldScale;
 
             scale *= WorldScale;
-            rotation.Rotate(ref translation);
+            rotation.RotateVector(ref translation);
             translation += WorldPosition;
 
             return true;
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialPositionArc.cs b/sources/engine/Xenko.Particles/Initializers/InitialPositionArc.cs
index 828f78b10b..dede6fd91e 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialPositionArc.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialPositionArc.cs
@@ -123,7 +123,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
             var arcOffset = new Vector3(0, ArcHeight, 0);
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref arcOffset);
+                WorldRotation.RotateVector(ref arcOffset);
             }
 
             var leftCorner = PositionMin * WorldScale;
@@ -133,10 +133,10 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref leftCorner);
-                WorldRotation.Rotate(ref xAxis);
-                WorldRotation.Rotate(ref yAxis);
-                WorldRotation.Rotate(ref zAxis);
+                WorldRotation.RotateVector(ref leftCorner);
+                WorldRotation.RotateVector(ref xAxis);
+                WorldRotation.RotateVector(ref yAxis);
+                WorldRotation.RotateVector(ref zAxis);
             }
 
             var targetCornerAdd = Target?.WorldMatrix.TranslationVector - WorldPosition ?? FallbackTarget;
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialPositionParent.cs b/sources/engine/Xenko.Particles/Initializers/InitialPositionParent.cs
index 6d3822320a..6a11bcdd16 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialPositionParent.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialPositionParent.cs
@@ -56,7 +56,7 @@ public InitialPositionParent()
         /// </userdoc>
         [DataMember(40)]
         [Display("Position max")]
-        public Vector3 PositionMax { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 PositionMax { get; set; } = Vector3.One;
 
 
         /// <inheritdoc />
@@ -89,10 +89,10 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref leftCorner);
-                WorldRotation.Rotate(ref xAxis);
-                WorldRotation.Rotate(ref yAxis);
-                WorldRotation.Rotate(ref zAxis);
+                WorldRotation.RotateVector(ref leftCorner);
+                WorldRotation.RotateVector(ref xAxis);
+                WorldRotation.RotateVector(ref yAxis);
+                WorldRotation.RotateVector(ref zAxis);
             }
 
             // Already inheriting from parent
@@ -106,7 +106,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
             // Interpolation - if parent particle has OldPosition field
             var stepF = 0f;
             var stepTotal = 0f;
-            var positionDistance = new Vector3(0, 0, 0);
+            var positionDistance = Vector3.Zero;
 
             var i = startIdx;
             while (i != endIdx)
@@ -122,7 +122,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
                 if (parentParticlesCount > 0)
                 {
-                    var parentParticlePosition = new Vector3(0, 0, 0);
+                    var parentParticlePosition = Vector3.Zero;
 
                     // Spawn is fixed - parent particles have spawned a very specific number of children each
                     if (spawnControlField.IsValid())
@@ -172,7 +172,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
                     // Convert from Local -> World space if needed
                     if (Parent.SimulationSpace == EmitterSimulationSpace.Local)
                     {
-                        WorldRotation.Rotate(ref parentParticlePosition);
+                        WorldRotation.RotateVector(ref parentParticlePosition);
                         parentParticlePosition *= WorldScale.X;
                         parentParticlePosition += WorldPosition;
                     }
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialPositionSeed.cs b/sources/engine/Xenko.Particles/Initializers/InitialPositionSeed.cs
index beecea238f..50d36fbcaa 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialPositionSeed.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialPositionSeed.cs
@@ -52,10 +52,10 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref leftCorner);
-                WorldRotation.Rotate(ref xAxis);
-                WorldRotation.Rotate(ref yAxis);
-                WorldRotation.Rotate(ref zAxis);
+                WorldRotation.RotateVector(ref leftCorner);
+                WorldRotation.RotateVector(ref xAxis);
+                WorldRotation.RotateVector(ref yAxis);
+                WorldRotation.RotateVector(ref zAxis);
             }
 
             leftCorner += WorldPosition;
@@ -66,7 +66,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
             {
                 // Interpolate positions between the old and the new one
 
-                var positionDistance = (hasBegun) ? oldPosition - WorldPosition : new Vector3(0, 0, 0);
+                var positionDistance = (hasBegun) ? oldPosition - WorldPosition : Vector3.Zero;
                 oldPosition = WorldPosition;
                 hasBegun = true;
 
@@ -152,7 +152,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
         /// </userdoc>
         [DataMember(40)]
         [Display("Position max")]
-        public Vector3 PositionMax { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 PositionMax { get; set; } = Vector3.One;
 
         /// <summary>
         /// If set to <c>true</c> it will interpolate the particles between the old and the new position, rather than using only the new one
@@ -188,7 +188,7 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
             translation = (PositionMax + PositionMin) * 0.5f * WorldScale;
 
             scale *= WorldScale;
-            rotation.Rotate(ref translation);
+            rotation.RotateVector(ref translation);
             translation += WorldPosition;
 
             return true;
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialVelocityParent.cs b/sources/engine/Xenko.Particles/Initializers/InitialVelocityParent.cs
index 9276e2ac69..5275a26af4 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialVelocityParent.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialVelocityParent.cs
@@ -66,7 +66,7 @@ public InitialVelocityParent()
         /// </userdoc>
         [DataMember(40)]
         [Display("Velocity max")]
-        public Vector3 VelocityMax { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 VelocityMax { get; set; } = Vector3.One;
 
 
         /// <inheritdoc />
@@ -96,10 +96,10 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref leftCorner);
-                WorldRotation.Rotate(ref xAxis);
-                WorldRotation.Rotate(ref yAxis);
-                WorldRotation.Rotate(ref zAxis);
+                WorldRotation.RotateVector(ref leftCorner);
+                WorldRotation.RotateVector(ref xAxis);
+                WorldRotation.RotateVector(ref yAxis);
+                WorldRotation.RotateVector(ref zAxis);
             }
 
             var sequentialParentIndex = 0;
@@ -120,7 +120,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
                 if (parentParticlesCount > 0)
                 {
-                    var parentParticleVelocity = new Vector3(0, 0, 0);
+                    var parentParticleVelocity = Vector3.Zero;
 
                     // Spawn is fixed - parent particles have spawned a very specific number of children each
                     if (spawnControlField.IsValid())
@@ -159,7 +159,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
                     // Convert from Local -> World space if needed
                     if (Parent.SimulationSpace == EmitterSimulationSpace.Local)
                     {
-                        WorldRotation.Rotate(ref parentParticleVelocity);
+                        WorldRotation.RotateVector(ref parentParticleVelocity);
                         parentParticleVelocity *= WorldScale.X;
                     }
 
diff --git a/sources/engine/Xenko.Particles/Initializers/InitialVelocitySeed.cs b/sources/engine/Xenko.Particles/Initializers/InitialVelocitySeed.cs
index 779b7bae8f..88141ed0ae 100644
--- a/sources/engine/Xenko.Particles/Initializers/InitialVelocitySeed.cs
+++ b/sources/engine/Xenko.Particles/Initializers/InitialVelocitySeed.cs
@@ -40,10 +40,10 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
 
             if (!WorldRotation.IsIdentity)
             {
-                WorldRotation.Rotate(ref leftCorner);
-                WorldRotation.Rotate(ref xAxis);
-                WorldRotation.Rotate(ref yAxis);
-                WorldRotation.Rotate(ref zAxis);
+                WorldRotation.RotateVector(ref leftCorner);
+                WorldRotation.RotateVector(ref xAxis);
+                WorldRotation.RotateVector(ref yAxis);
+                WorldRotation.RotateVector(ref zAxis);
             }
 
             var i = startIdx;
@@ -91,7 +91,7 @@ public unsafe override void Initialize(ParticlePool pool, int startIdx, int endI
         /// </userdoc>
         [DataMember(40)]
         [Display("Velocity max")]
-        public Vector3 VelocityMax { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 VelocityMax { get; set; } = Vector3.One;
 
         /// <summary>
         /// Should this Particle Module's bounds be displayed as a debug draw
@@ -116,7 +116,7 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
             translation = (VelocityMax + VelocityMin) * 0.5f * WorldScale;
 
             scale *= WorldScale;
-            rotation.Rotate(ref translation);
+            rotation.RotateVector(ref translation);
             translation += WorldPosition;
 
             return true;
diff --git a/sources/engine/Xenko.Particles/Materials/ParticleMaterialSimple.cs b/sources/engine/Xenko.Particles/Materials/ParticleMaterialSimple.cs
index 74412aec32..fcb97c5e28 100644
--- a/sources/engine/Xenko.Particles/Materials/ParticleMaterialSimple.cs
+++ b/sources/engine/Xenko.Particles/Materials/ParticleMaterialSimple.cs
@@ -10,6 +10,7 @@
 using Xenko.Particles.Sorters;
 using Xenko.Particles.VertexLayouts;
 using Xenko.Rendering;
+using Xenko.Rendering.Sprites;
 
 namespace Xenko.Particles.Materials
 {
@@ -26,29 +27,6 @@ public enum ParticleMaterialCulling : byte
     [DataContract("ParticleMaterialSimple")]
     public abstract class ParticleMaterialSimple : ParticleMaterial
     {
-        /// <summary>
-        /// Shows if the particles should be rendered as alhpa-blended, additive or something in-between (lerp between the two methods)
-        /// </summary>
-        /// <userdoc>
-        /// Defines if the particles should be rendered as alpha-blended (0), additive (1) or something in-between (any value between 0 and 1)
-        /// </userdoc>
-        [DataMember(20)]
-        [DataMemberRange(0, 1, 0.01, 0.1, 3)]
-        [Display("Alpha-Add")]
-        [DefaultValue(0)]
-        public float AlphaAdditive { get; set; }
-
-        /// <summary>
-        /// Adjusts the depth of the particle in regard to opaque objects
-        /// </summary>
-        /// <userdoc>
-        /// Adjusts the depth of the particle in regard to opaque objects
-        /// </userdoc>
-        [DataMember(30)]
-        [Display("Z Offset")]
-        [DefaultValue(0)]
-        public float ZOffset { get; set; } = 0f;
-
         /// <summary>
         /// If positive, soft particle edges will be calculated with maximum distance of the value set.
         /// </summary>
@@ -71,6 +49,18 @@ public abstract class ParticleMaterialSimple : ParticleMaterial
         [DefaultValue(ParticleMaterialCulling.CullNone)]
         public ParticleMaterialCulling FaceCulling { get; set; }
 
+        [DataMember(50)]
+        [DefaultValue(RenderSprite.SpriteDepthMode.ReadOnly)]
+        public RenderSprite.SpriteDepthMode DepthMode { get; set; } = RenderSprite.SpriteDepthMode.ReadOnly;
+
+        [DataMember(60)]
+        [DefaultValue(SpriteBlend.AlphaBlend)]
+        public SpriteBlend BlendMode { get; set; } = SpriteBlend.AlphaBlend;
+
+        [DataMember(70)]
+        [DefaultValue(0f)]
+        public float AlphaCutoff { get; set; } = 0f;
+
         /// <summary>
         /// Indicates if this material requires a color field in the vertex stream
         /// </summary>
@@ -108,10 +98,7 @@ public override void Setup(RenderContext context)
                 return;
             particleMaterialSimpleHasChanged = false;
 
-            // This is correct. We invert the value here to reduce calculations on the shader side later
-            Parameters.Set(ParticleBaseKeys.AlphaAdditive, 1f - AlphaAdditive);
-
-            Parameters.Set(ParticleBaseKeys.ZOffset, ZOffset);
+            Parameters.Set(ParticleBaseKeys.AlphaCutoff, AlphaCutoff);
 
             // This is correct. We invert the value here to reduce calculations on the shader side later
             Parameters.Set(ParticleBaseKeys.SoftEdgeInverseDistance, (SoftEdgeDistance > 0) ? (1f / SoftEdgeDistance) : 0f);
@@ -132,9 +119,44 @@ public override void SetupPipeline(RenderContext renderContext, PipelineStateDes
             else if (FaceCulling == ParticleMaterialCulling.CullBack) pipelineState.RasterizerState = RasterizerStates.CullBack;
             else if (FaceCulling == ParticleMaterialCulling.CullFront) pipelineState.RasterizerState = RasterizerStates.CullFront;
 
-            pipelineState.BlendState = BlendStates.AlphaBlend;
+            switch (BlendMode)
+            {
+                default:
+                case SpriteBlend.Auto:
+                case SpriteBlend.AlphaBlend:
+                    pipelineState.BlendState = BlendStates.AlphaBlend;
+                    break;
+                case SpriteBlend.AdditiveBlend:
+                    pipelineState.BlendState = BlendStates.Additive;
+                    break;
+                case SpriteBlend.NoColor:
+                    pipelineState.BlendState = BlendStates.ColorDisabled;
+                    break;
+                case SpriteBlend.None:
+                    pipelineState.BlendState = BlendStates.Opaque;
+                    break;
+            }
 
-            pipelineState.DepthStencilState = DepthStencilStates.DepthRead;
+            switch (DepthMode)
+            {
+                case Xenko.Rendering.Sprites.RenderSprite.SpriteDepthMode.Ignore:
+                    pipelineState.DepthStencilState.DepthBufferEnable = false;
+                    pipelineState.DepthStencilState.DepthBufferWriteEnable = false;
+                    break;
+                default:
+                    pipelineState.DepthStencilState.DepthBufferEnable = true;
+                    pipelineState.DepthStencilState.DepthBufferWriteEnable = false;
+                    break;
+                case Xenko.Rendering.Sprites.RenderSprite.SpriteDepthMode.ReadWrite:
+                    pipelineState.DepthStencilState.DepthBufferEnable = true;
+                    pipelineState.DepthStencilState.DepthBufferWriteEnable = true;
+                    break;
+                case RenderSprite.SpriteDepthMode.WriteOnly:
+                    pipelineState.DepthStencilState.DepthBufferFunction = CompareFunction.Always;
+                    pipelineState.DepthStencilState.DepthBufferEnable = true;
+                    pipelineState.DepthStencilState.DepthBufferWriteEnable = true;
+                    break;
+            }
         }
 
         /// <inheritdoc />
diff --git a/sources/engine/Xenko.Particles/Materials/UVBuilderFlipbook.cs b/sources/engine/Xenko.Particles/Materials/UVBuilderFlipbook.cs
index 83f1e494d9..50483a0959 100644
--- a/sources/engine/Xenko.Particles/Materials/UVBuilderFlipbook.cs
+++ b/sources/engine/Xenko.Particles/Materials/UVBuilderFlipbook.cs
@@ -98,12 +98,20 @@ public uint AnimationSpeed
             set { animationSpeedOverLife = value; }
         }
 
+        /// <summary>
+        /// Have this flipbook start on a shuffled frame?
+        /// </summary>
+        [DataMember(360)]
+        [Display("Shuffle Start Frame")]
+        public bool ShuffleStartFrame { get; set; } = false;
+
         /// <inheritdoc />
         public override unsafe void BuildUVCoordinates(ref ParticleBufferState bufferState, ref ParticleList sorter, AttributeDescription texCoordsDescription)
         {
             var lifeField = sorter.GetField(ParticleFields.RemainingLife);
+            var randomSeed = sorter.GetField(ParticleFields.RandomSeed);
 
-            if (!lifeField.IsValid())
+            if (!lifeField.IsValid() || !randomSeed.IsValid() && ShuffleStartFrame)
                 return;
 
             var texAttribute = bufferState.GetAccessor(texCoordsDescription);
@@ -118,12 +126,15 @@ public override unsafe void BuildUVCoordinates(ref ParticleBufferState bufferSta
                 return;
             }
 
-
             foreach (var particle in sorter)
             {
                 var normalizedTimeline = 1f - *(float*)(particle[lifeField]);
+                uint spriteId;
 
-                var spriteId = startingFrame + (int)(normalizedTimeline*animationSpeedOverLife);
+                if (ShuffleStartFrame)
+                    spriteId = ((*(RandomSeed*)(particle[randomSeed])).seed % (xDivisions * yDivisions)) + (uint)(normalizedTimeline * animationSpeedOverLife);
+                else
+                    spriteId = startingFrame + (uint)(normalizedTimeline*animationSpeedOverLife);
 
                 Vector4 uvTransform = new Vector4((spriteId%xDivisions)*xStep, (spriteId/xDivisions)*yStep, xStep, yStep);
 
diff --git a/sources/engine/Xenko.Particles/ParticleEmitter.cs b/sources/engine/Xenko.Particles/ParticleEmitter.cs
index 84b4b86127..56c9144789 100644
--- a/sources/engine/Xenko.Particles/ParticleEmitter.cs
+++ b/sources/engine/Xenko.Particles/ParticleEmitter.cs
@@ -110,7 +110,7 @@ public class ParticleEmitter : IDisposable
         /// Particles will live for a number of seconds between these two values
         /// </summary>
         [DataMemberIgnore]
-        private Vector2 particleLifetime = new Vector2(1, 1);
+        private Vector2 particleLifetime = Vector2.One;
 
         /// <summary>
         /// If positive, forces particles to stay one frame more when they are about ot expire
@@ -659,7 +659,7 @@ private void UpdateLocations(ParticleSystem parentSystem)
             }
             else
             {
-                var posIdentity = new Vector3(0, 0, 0);
+                var posIdentity = Vector3.Zero;
                 var rotIdentity = Quaternion.Identity;
 
                 // Update sub-systems
@@ -719,12 +719,10 @@ private unsafe void MoveAndDeleteParticles(float dt)
             {
                 var lifeField = pool.GetField(ParticleFields.RemainingLife);
                 var randField = pool.GetField(ParticleFields.RandomSeed);
-                var lifeStep = particleLifetime.Y - particleLifetime.X;
 
-                var particleEnumerator = pool.GetEnumerator();
-                while (particleEnumerator.MoveNext())
+                for (int i = 0; i < pool.NextFreeIndex; i++)
                 {
-                    var particle = particleEnumerator.Current;
+                    var particle = pool.FromIndex(i);
 
                     var randSeed = *(RandomSeed*)(particle[randField]);
                     var life = (float*)particle[lifeField];
@@ -732,11 +730,12 @@ private unsafe void MoveAndDeleteParticles(float dt)
                     if (*life > 1)
                         *life = 1;
 
-                    var startingLife = particleLifetime.X + lifeStep * randSeed.GetFloat(0);
+                    var startingLife = pool.SpecificLives[i];
 
                     if (*life <= MathUtil.ZeroTolerance)
                     {
-                        particleEnumerator.RemoveCurrent(ref particle);
+                        pool.RemoveAt(i);
+                        i--;
                     }
                     else
                     if ((*life -= (dt / startingLife)) <= MathUtil.ZeroTolerance)
@@ -747,7 +746,8 @@ private unsafe void MoveAndDeleteParticles(float dt)
                         }
                         else
                         {
-                            particleEnumerator.RemoveCurrent(ref particle);
+                            pool.RemoveAt(i);
+                            i--;
                         }
                     }
                 }
@@ -760,8 +760,10 @@ private unsafe void MoveAndDeleteParticles(float dt)
                 var posField = pool.GetField(ParticleFields.Position);
                 var oldField = pool.GetField(ParticleFields.OldPosition);
 
-                foreach (var particle in pool)
+                for (int i=0; i<pool.NextFreeIndex; i++)
                 {
+                    Particle particle = pool.FromIndex(i);
+
                     (*((Vector3*)particle[oldField])) = (*((Vector3*)particle[posField]));
                 }
             }
@@ -772,8 +774,10 @@ private unsafe void MoveAndDeleteParticles(float dt)
                 var posField = pool.GetField(ParticleFields.Position);
                 var velField = pool.GetField(ParticleFields.Velocity);
 
-                foreach (var particle in pool)
+                for (int i = 0; i < pool.NextFreeIndex; i++)
                 {
+                    Particle particle = pool.FromIndex(i);
+
                     var pos = ((Vector3*)particle[posField]);
                     var vel = ((Vector3*)particle[velField]);
 
@@ -808,6 +812,78 @@ private void ApplyParticlePostUpdaters(float dt)
             }
         }
 
+        private struct SpecificParticle
+        {
+            public Vector3 _position;
+            public Color4 _color;
+            public Vector3 _velocity;
+            public Quaternion _rotation;
+            public float _lifetime, _size, _angle;
+            public uint _seed;
+        }
+
+        private List<SpecificParticle> SpawnIndividuals = new List<SpecificParticle>();
+
+        /// <summary>
+        /// Emit a single particle with specific parameters. Values provided as arguments here will be replaced by initializers,
+        /// so only set what isn't being initialized by the particle system. Returns false if the particle system doesn't have capacity
+        /// </summary>
+        public bool EmitSpecificParticle(Vector3 pos, Color4? color = null, Quaternion? rotation3D = null, float? size = null,
+                                         float life = 1f, Vector3? velocity = null, uint? seed = null, bool prioritize = false, float? angle = null)
+        {
+            // first sanity check
+            if (pool.AvailableParticles <= 0) return false;
+
+            // do we have room if we are not prioritizing?
+            bool noneAvailable = SpawnIndividuals.Count >= pool.AvailableParticles;
+            if (noneAvailable && !prioritize) return false;
+
+            // make sure pool has the fields needed
+            if (color.HasValue)
+            {
+                pool.AddField(ParticleFields.Color);
+                if (pool.SpecificColors == null ||
+                    pool.SpecificColors.Length < pool.ParticleCapacity)
+                    pool.SpecificColors = new Color4[pool.ParticleCapacity];
+            }
+            if (angle.HasValue) pool.AddField(ParticleFields.Rotation);
+            if (rotation3D.HasValue) pool.AddField(ParticleFields.Quaternion);
+            if (size.HasValue)
+            {
+                pool.AddField(ParticleFields.Size);
+                if (pool.SpecificSizes == null ||
+                    pool.SpecificSizes.Length < pool.ParticleCapacity)
+                    pool.SpecificSizes = new float[pool.ParticleCapacity];
+            }
+            if (velocity.HasValue) pool.AddField(ParticleFields.Velocity);
+
+            // make the specific particle
+            SpecificParticle sp = new SpecificParticle()
+            {
+                _position = pos,
+                _color = color ?? Color4.White,
+                _angle = angle ?? 0f,
+                _rotation = rotation3D ?? Quaternion.Identity,
+                _size = size ?? 1f,
+                _velocity = velocity ?? Vector3.Zero,
+                _lifetime = life,
+                _seed = seed ?? (uint)System.Environment.TickCount
+            };
+
+            if (noneAvailable)
+            {
+                // need to find one to replace (with positive seed)
+                int pseed = (int)sp._seed;
+                pseed = pseed >= 0 ? pseed : -pseed;
+                SpawnIndividuals[pseed % SpawnIndividuals.Count] = sp;
+            }
+            else
+                // just add it to the list
+                SpawnIndividuals.Add(sp);
+
+            return true;
+        }
+
         /// <summary>
         /// Spawns new particles and in general should be one of the last methods to call from the <see cref="Update"/> method
         /// </summary>
@@ -827,6 +903,10 @@ private unsafe void SpawnNewParticles(float dt)
                 return;
             }
 
+            // handle spawning specific ones first
+            int specificParticles = SpawnIndividuals.Count;
+            particlesToSpawn += specificParticles;
+
             // Sometimes particles will be spawned when there is no available space
             // In such occasions we have to buffer them and spawn them when space becomes available
             particlesToSpawn = Math.Min(pool.AvailableParticles, particlesToSpawn);
@@ -842,15 +922,74 @@ private unsafe void SpawnNewParticles(float dt)
 
             var startIndex = pool.NextFreeIndex % capacity;
 
+            // if we have specific particles to make, make them first
+            // apply all of the specific parameters to these particles
+            if (specificParticles > 0)
+            {
+                var posField = pool.GetField(ParticleFields.Position);
+                var oldposField = pool.GetField(ParticleFields.OldPosition);
+                var rotField = pool.GetField(ParticleFields.Quaternion);
+                var velField = pool.GetField(ParticleFields.Velocity);
+                var clrField = pool.GetField(ParticleFields.Color);
+                var dirField = pool.GetField(ParticleFields.Direction);
+                var angField = pool.GetField(ParticleFields.Rotation);
+                var sizeField = pool.GetField(ParticleFields.Size);
+
+                for (int i = 0; i < specificParticles && particlesToSpawn > 0; i++)
+                {
+                    SpecificParticle sp = SpawnIndividuals[i];
+                    int particleIndex = pool.AddParticleIndex();
+                    Particle particle = pool.FromIndex(particleIndex);
+
+                    if (dirField.IsValid()) *((Vector3*)particle[dirField]) = Vector3.Zero;
+                    if (posField.IsValid()) *((Vector3*)particle[posField]) = sp._position;
+                    if (oldposField.IsValid()) *((Vector3*)particle[oldposField]) = sp._position;
+                    if (rotField.IsValid()) *((Quaternion*)particle[rotField]) = sp._rotation;
+                    if (velField.IsValid()) *((Vector3*)particle[velField]) = sp._velocity;
+                    if (clrField.IsValid()) *((Color4*)particle[clrField]) = sp._color;
+                    if (sizeField.IsValid()) *((float*)particle[sizeField]) = sp._size;
+                    if (angField.IsValid()) *((float*)particle[angField]) = sp._angle;
+
+                    if (pool.SpecificColors != null) pool.SpecificColors[particleIndex] = sp._color;
+                    if (pool.SpecificSizes != null) pool.SpecificSizes[particleIndex] = sp._size;
+
+                    *((RandomSeed*)particle[randField]) = new RandomSeed(sp._seed);
+                    *((float*)particle[lifeField]) = 1f;
+
+                    pool.SpecificLives[particleIndex] = sp._lifetime;
+
+                    for (int j = 0; j < ParticleFields.ChildrenFlags.Length; j++)
+                    {
+                        var flagField = pool.GetField(ParticleFields.ChildrenFlags[j]);
+                        if (flagField.IsValid())
+                        {
+                            (*((uint*)particle[flagField])) = 0;
+                        }
+
+                    }
+
+                    particlesToSpawn--;
+                }
+
+                SpawnIndividuals.Clear();
+            }
+
             for (var i = 0; i < particlesToSpawn; i++)
             {
-                var particle = pool.AddParticle();
+                int index = pool.AddParticleIndex();
+                var particle = pool.FromIndex(index);
 
                 var randSeed = RandomSeedGenerator.GetNextSeed();
 
+                // precalculate the life of this particle
+                pool.SpecificLives[index] = particleLifetime.X + randSeed.GetFloat(0) * (particleLifetime.Y - particleLifetime.X);
+
+                // if some are specific sizes, just use these at the default 100% size
+                if (pool.SpecificSizes != null) pool.SpecificSizes[index] = 1f;
+
                 *((RandomSeed*)particle[randField]) = randSeed;
 
-                *((float*)particle[lifeField]) = 1; // Start at 100% normalized lifetime                
+                *((float*)particle[lifeField]) = 1f; // Start at 100% normalized lifetime                
             }
 
             var endIndex = pool.NextFreeIndex % capacity;
@@ -865,7 +1004,7 @@ private unsafe void SpawnNewParticles(float dt)
 
             particlesToSpawn = 0;
 
-            initialDefaultFields.Initialize(pool, startIndex, endIndex, capacity);
+            initialDefaultFields.Initialize(pool, Math.Min(capacity - 1, startIndex + specificParticles), endIndex, capacity);
 
             foreach (var initializer in Initializers)
             {
@@ -979,13 +1118,13 @@ public void BuildVertexBuffer(IntPtr sharedBufferPtr, ref Matrix invViewMatrix,
             {
                 var inverseRotation = drawTransform.WorldRotation;
                 inverseRotation.W *= -1;
-                inverseRotation.Rotate(ref depthVector);
+                inverseRotation.RotateVector(ref depthVector);
             }
             var sortedList = ParticleSorter.GetSortedList(depthVector);
 
             // If the particles are in world space they don't need to be fixed as their coordinates are already in world space
             // If the particles are in local space they need to be drawn in world space using the emitter's current location matrix
-            var posIdentity = new Vector3(0, 0, 0);
+            var posIdentity = Vector3.Zero;
             var rotIdentity = Quaternion.Identity;
             var scaleIdentity = 1f;
             if (simulationSpace == EmitterSimulationSpace.Local)
@@ -1047,7 +1186,7 @@ private void SimulationSpaceChanged()
                         position = position + negativeTranslation;
                         position = position * negativeScale;
 
-                        negativeRotation.Rotate(ref position);
+                        negativeRotation.RotateVector(ref position);
 
                         particle.Set(posField, position);
                     }
@@ -1064,7 +1203,7 @@ private void SimulationSpaceChanged()
                         position = position + negativeTranslation;
                         position = position * negativeScale;
 
-                        negativeRotation.Rotate(ref position);
+                        negativeRotation.RotateVector(ref position);
 
                         particle.Set(posField, position);
                     }
@@ -1080,7 +1219,7 @@ private void SimulationSpaceChanged()
 
                         velocity = velocity * negativeScale;
 
-                        negativeRotation.Rotate(ref velocity);
+                        negativeRotation.RotateVector(ref velocity);
 
                         particle.Set(velField, velocity);
                     }
@@ -1115,7 +1254,7 @@ private void SimulationSpaceChanged()
                     {
                         var position = particle.Get(posField);
 
-                        drawTransform.WorldRotation.Rotate( ref position );
+                        drawTransform.WorldRotation.RotateVector( ref position );
 
                         position = position * drawTransform.WorldScale.X + drawTransform.WorldPosition;
 
@@ -1131,7 +1270,7 @@ private void SimulationSpaceChanged()
                     {
                         var position = particle.Get(posField);
 
-                        drawTransform.WorldRotation.Rotate(ref position);
+                        drawTransform.WorldRotation.RotateVector(ref position);
 
                         position = position * drawTransform.WorldScale.X + drawTransform.WorldPosition;
 
@@ -1147,7 +1286,7 @@ private void SimulationSpaceChanged()
                     {
                         var velocity = particle.Get(velField);
 
-                        drawTransform.WorldRotation.Rotate(ref velocity);
+                        drawTransform.WorldRotation.RotateVector(ref velocity);
 
                         velocity = velocity * drawTransform.WorldScale.X;
 
diff --git a/sources/engine/Xenko.Particles/ParticleFields.cs b/sources/engine/Xenko.Particles/ParticleFields.cs
index 8ce1ad5d28..896de73779 100644
--- a/sources/engine/Xenko.Particles/ParticleFields.cs
+++ b/sources/engine/Xenko.Particles/ParticleFields.cs
@@ -13,17 +13,17 @@ public static class ParticleFields
         /// <summary>
         /// Particle position in 3D space
         /// </summary>
-        public static readonly ParticleFieldDescription<Vector3> Position       = new ParticleFieldDescription<Vector3>("Position", new Vector3(0, 0, 0));
+        public static readonly ParticleFieldDescription<Vector3> Position       = new ParticleFieldDescription<Vector3>("Position", Vector3.Zero);
 
         /// <summary>
         /// Particle position from the last frame in 3D space, updated every frame if the particle has a Position field
         /// </summary>
-        public static readonly ParticleFieldDescription<Vector3> OldPosition    = new ParticleFieldDescription<Vector3>("OldPosition", new Vector3(0, 0, 0));
+        public static readonly ParticleFieldDescription<Vector3> OldPosition    = new ParticleFieldDescription<Vector3>("OldPosition", Vector3.Zero);
 
         /// <summary>
         /// Particle direction, or offset, in 3D space, calculated from the particle's position
         /// </summary>
-        public static readonly ParticleFieldDescription<Vector3> Direction      = new ParticleFieldDescription<Vector3>("Direction", new Vector3(0, 0, 0));
+        public static readonly ParticleFieldDescription<Vector3> Direction      = new ParticleFieldDescription<Vector3>("Direction", Vector3.Zero);
 
         /// <summary>
         /// Quaternion rotation, for particles which have rotation in 3D
@@ -41,7 +41,7 @@ public static class ParticleFields
         /// <summary>
         /// Particle velocity in 3D space
         /// </summary>
-        public static readonly ParticleFieldDescription<Vector3> Velocity       = new ParticleFieldDescription<Vector3>("Velocity", new Vector3(0, 0, 0));
+        public static readonly ParticleFieldDescription<Vector3> Velocity       = new ParticleFieldDescription<Vector3>("Velocity", Vector3.Zero);
         public static readonly ParticleFieldDescription<Vector3> Speed          = Velocity;
 
         /// <summary>
diff --git a/sources/engine/Xenko.Particles/ParticleModule.cs b/sources/engine/Xenko.Particles/ParticleModule.cs
index 85d8fa8b4c..92e5f10233 100644
--- a/sources/engine/Xenko.Particles/ParticleModule.cs
+++ b/sources/engine/Xenko.Particles/ParticleModule.cs
@@ -79,8 +79,8 @@ public virtual void ResetSimulation() { }
         public virtual bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out Vector3 translation, out Quaternion rotation, out Vector3 scale)
         {
             debugDrawShape = DebugDrawShape.None;
-            scale = new Vector3(1, 1, 1);
-            translation = new Vector3(0, 0, 0);
+            scale = Vector3.One;
+            translation = Vector3.Zero;
             rotation = Quaternion.Identity;
             return false;
         }
diff --git a/sources/engine/Xenko.Particles/ParticlePool.cs b/sources/engine/Xenko.Particles/ParticlePool.cs
index a3120fd401..f29aac79e1 100644
--- a/sources/engine/Xenko.Particles/ParticlePool.cs
+++ b/sources/engine/Xenko.Particles/ParticlePool.cs
@@ -7,6 +7,7 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using Xenko.Core;
+using Xenko.Core.Mathematics;
 
 namespace Xenko.Particles
 {
@@ -52,7 +53,13 @@ public enum ListPolicy
 
         private readonly List<ParticleFieldDescription> fieldDescriptions = new List<ParticleFieldDescription>(DefaultMaxFielsPerPool);
 
-
+        /// <summary>
+        /// Specific values are primarily for specifically emitted particles, used to keep track of original
+        /// states that might be adjusted by updaters
+        /// </summary>
+        public float[] SpecificLives;
+        public Color4[] SpecificColors;
+        public float[] SpecificSizes;
 
         /// <summary>
         /// <see cref="ParticlePool"/> constructor
@@ -160,6 +167,8 @@ private void ReallocatePool(int newSize, int newCapacity, CopyParticlePoolDelega
 
             var newMemoryBlockSize = newCapacity * newSize;
 
+            SpecificLives = new float[newCapacity];
+
             if (newMemoryBlockSize > 0)
                 newParticleData = Utilities.AllocateMemory(newMemoryBlockSize);
 
@@ -239,6 +248,11 @@ private void CopyParticleData(int dst, int src)
             var dstParticle = FromIndex(dst);
             var srcParticle = FromIndex(src);
 
+            if (SpecificColors != null) SpecificColors[dst] = SpecificColors[src];
+            if (SpecificSizes != null) SpecificSizes[dst] = SpecificSizes[src];
+
+            SpecificLives[dst] = SpecificLives[src];
+
 #if PARTICLES_SOA
             foreach (var field in fields.Values)
             {
@@ -287,6 +301,30 @@ public Particle AddParticle()
             return FromIndex(nextFreeIndex++);
         }
 
+        public int AddParticleIndex()
+        {
+            if (nextFreeIndex != ParticleCapacity)
+            {
+                nextFreeIndex++;
+                return nextFreeIndex - 1;
+            }
+
+            if (listPolicy != ListPolicy.Ring || ParticleCapacity == 0)
+                return -1;
+
+            nextFreeIndex = 1;
+            return 0;
+        }
+
+        public void RemoveAt(int index)
+        {
+            if (index < nextFreeIndex - 1)
+            {
+                CopyParticleData(index, nextFreeIndex - 1);
+            }
+            --nextFreeIndex;
+        }
+
         /// <summary>
         /// Removes the current particle
         /// </summary>
diff --git a/sources/engine/Xenko.Particles/ParticleSystem.cs b/sources/engine/Xenko.Particles/ParticleSystem.cs
index f46250f7c6..df9e162dcb 100644
--- a/sources/engine/Xenko.Particles/ParticleSystem.cs
+++ b/sources/engine/Xenko.Particles/ParticleSystem.cs
@@ -46,7 +46,7 @@ private bool ToWorldSpace(ref Vector3 translation, ref Quaternion rotation, ref
 
             rotation *= Rotation;
 
-            Rotation.Rotate(ref translation);
+            Rotation.RotateVector(ref translation);
             translation *= UniformScale;
             translation += Translation;
 
@@ -173,7 +173,7 @@ public ParticleSystem()
         /// Translation of the ParticleSystem. Usually inherited directly from the ParticleSystemComponent or can be directly set.
         /// </userdoc>
         [DataMemberIgnore]
-        public Vector3 Translation = new Vector3(0, 0, 0);
+        public Vector3 Translation = Vector3.Zero;
 
         /// <summary>
         /// Rotation of the ParticleSystem, expressed as a quaternion rotation. Usually inherited directly from the ParticleSystemComponent or can be directly set.
diff --git a/sources/engine/Xenko.Particles/ParticleSystemSettings.cs b/sources/engine/Xenko.Particles/ParticleSystemSettings.cs
index 204b108db4..e92137908f 100644
--- a/sources/engine/Xenko.Particles/ParticleSystemSettings.cs
+++ b/sources/engine/Xenko.Particles/ParticleSystemSettings.cs
@@ -22,7 +22,5 @@ public class ParticleSystemSettings
         [DataMemberRange(0, 5, 0.01, 1, 3)]
         [DefaultValue(0f)]
         public float WarmupTime { get; set; } = 0f;
-
-
     }
 }
diff --git a/sources/engine/Xenko.Particles/ParticleTransform.cs b/sources/engine/Xenko.Particles/ParticleTransform.cs
index 759c9bd741..a1bdbed705 100644
--- a/sources/engine/Xenko.Particles/ParticleTransform.cs
+++ b/sources/engine/Xenko.Particles/ParticleTransform.cs
@@ -16,7 +16,7 @@ public class ParticleTransform
 
         [DataMember(1)]
         [Display("Position offset")]
-        public Vector3 Position { get; set; } = new Vector3(0, 0, 0);
+        public Vector3 Position { get; set; } = Vector3.Zero;
 
         [DataMember(2)]
         [Display("Rotation inheritance")]
@@ -32,7 +32,7 @@ public class ParticleTransform
 
         [DataMember(5)]
         [Display("Scale offset")]
-        public Vector3 Scale { get; set; } = new Vector3(1, 1, 1);
+        public Vector3 Scale { get; set; } = Vector3.One;
 
         [DataMember(6)]
         [Display("Uniform Scale")]
@@ -52,13 +52,13 @@ public class ParticleTransform
         public bool DisplayParticleScaleUniform = false;
 
         [DataMemberIgnore]
-        public Vector3 WorldPosition { get; private set; } = new Vector3(0, 0, 0);
+        public Vector3 WorldPosition { get; private set; } = Vector3.Zero;
 
         [DataMemberIgnore]
         public Quaternion WorldRotation { get; private set; } = Quaternion.Identity;
 
         [DataMemberIgnore]
-        public Vector3 WorldScale { get; private set; } = new Vector3(1, 1, 1);
+        public Vector3 WorldScale { get; private set; } = Vector3.One;
 
 
         public void SetParentTransform(ParticleTransform parentTransform)
@@ -74,7 +74,7 @@ public void SetParentTransform(ParticleTransform parentTransform)
 
             if (notNull && InheritRotation)
             {
-                parentTransform.WorldRotation.Rotate(ref offsetTranslation);
+                parentTransform.WorldRotation.RotateVector(ref offsetTranslation);
             }
 
             WorldPosition = (notNull && InheritPosition) ? parentTransform.WorldPosition + offsetTranslation : offsetTranslation;
diff --git a/sources/engine/Xenko.Particles/Rendering/ParticleEmitterRenderFeature.cs b/sources/engine/Xenko.Particles/Rendering/ParticleEmitterRenderFeature.cs
index 475909cfb0..14e647bcb2 100644
--- a/sources/engine/Xenko.Particles/Rendering/ParticleEmitterRenderFeature.cs
+++ b/sources/engine/Xenko.Particles/Rendering/ParticleEmitterRenderFeature.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using Xenko.Core.Mathematics;
 using Xenko.Core.Threading;
+using Xenko.Engine;
 using Xenko.Graphics;
 using Xenko.Particles.Materials;
 using Xenko.Rendering;
@@ -114,9 +115,11 @@ public override void PrepareEffectPermutationsImpl(RenderDrawContext context)
                 material.Key.Setup(context.RenderContext);
             }
 
-            foreach (var renderObject in RenderObjects)
+            for (int k=0; k<RenderObjects.Count; k++)
             {
+                var renderObject = RenderObjects[k];
                 var staticObjectNode = renderObject.StaticObjectNode;
+
                 var renderParticleEmitter = (RenderParticleEmitter)renderObject;
 
                 var material = renderParticleEmitter.ParticleEmitter.Material;
@@ -213,7 +216,7 @@ public override unsafe void Prepare(RenderDrawContext context)
                 var renderParticleEmitter = (RenderParticleEmitter)renderNode.RenderObject;
 
                 // Ignore fallback effects
-                if (renderNode.RenderEffect.State != RenderEffectState.Normal)
+                if (renderNode.RenderEffect?.State != RenderEffectState.Normal)
                     continue;
 
                 // Collect materials and create associated MaterialInfo (includes reflection) first time
@@ -347,7 +350,7 @@ public override unsafe void Draw(RenderDrawContext context, RenderView renderVie
 
                 // Get effect
                 var renderEffect = GetRenderNode(renderNodeReference).RenderEffect;
-                if (renderEffect.Effect == null)
+                if (renderEffect?.Effect == null || renderEffect.PipelineState.CurrentState() != PipelineState.PIPELINE_STATE.READY)
                     continue;
 
                 // Get the extra node data
@@ -369,7 +372,7 @@ public override unsafe void Draw(RenderDrawContext context, RenderView renderVie
                 }
 
                 commandList.SetPipelineState(renderEffect.PipelineState);
-                commandList.SetDescriptorSets(0, descriptorSetsLocal);
+                commandList.SetDescriptorSets(descriptorSetsLocal);
 
                 // Bind the buffers and draw
                 commandList.SetVertexBuffer(0, nodeData.VertexBuffer, nodeData.VertexBufferOffset, nodeData.VertexBufferStride);
diff --git a/sources/engine/Xenko.Particles/Rendering/ParticleSystemRenderProcessor.cs b/sources/engine/Xenko.Particles/Rendering/ParticleSystemRenderProcessor.cs
index d3e629d8d6..cec8594431 100644
--- a/sources/engine/Xenko.Particles/Rendering/ParticleSystemRenderProcessor.cs
+++ b/sources/engine/Xenko.Particles/Rendering/ParticleSystemRenderProcessor.cs
@@ -84,10 +84,10 @@ private void CheckEmitters(RenderParticleSystem renderParticleSystem)
 
         public override void Draw(RenderContext context)
         {
-            foreach (var componentData in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var particleSystemComponent = componentData.Key;
-                var renderSystem = componentData.Value;
+                var particleSystemComponent = ComponentDataKeys[i];
+                var renderSystem = ComponentDataValues[i];
 
                 CheckEmitters(renderSystem);
 
diff --git a/sources/engine/Xenko.Particles/Shaders/ComputeColorWhite.cs b/sources/engine/Xenko.Particles/Shaders/ComputeColorWhite.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ComputeColorWhite.cs
rename to sources/engine/Xenko.Particles/Shaders/ComputeColorWhite.xksl.cs
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl b/sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl
index 250979e3ea..7d49f6c0bf 100644
--- a/sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl
+++ b/sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl
@@ -26,7 +26,7 @@ shader ParticleBase : DepthBase, ShaderBase, Texturing, ParticleUtilities
     // -------------------------------------
     // conditional streams - may or may not be present depending on existing particle fields
     // -------------------------------------
-    //stage stream float4 Color : COLOR;
+    stage stream float4 Color : COLOR;
     nointerpolation stage stream float Lifetime : BATCH_LIFETIME;
     nointerpolation stage stream float RandomSeed : BATCH_RANDOMSEED; // Ideally should be uint. Note! The xksl doesn't support nointerpolation, so cast the float as int before using it
 
@@ -34,14 +34,11 @@ shader ParticleBase : DepthBase, ShaderBase, Texturing, ParticleUtilities
     {
         stage float4 ColorScale;
 
-        // When the value is 0 there is no occlusion (100% emissive), when it is 1 there is 100% occlusion (still limited by alpha)
-        stage float AlphaAdditive;
-
-        // Z offset is how much the depth should be adjusted when rendering
-        stage float ZOffset;
-
         // 0 if disabled, equal to 1/Distance otherwise
         stage float SoftEdgeInverseDistance;
+
+        // alpha cutoff
+        stage float AlphaCutoff;
     }
             
     // -------------------------------------
@@ -66,7 +63,6 @@ shader ParticleBase : DepthBase, ShaderBase, Texturing, ParticleUtilities
 
         // Z Offset
         viewPos.w = 1;
-        viewPos.z += ZOffset;
 
         streams.ZDepth = viewPos.z;
 
@@ -82,7 +78,16 @@ shader ParticleBase : DepthBase, ShaderBase, Texturing, ParticleUtilities
     // Override Pixel shader main method from the ShaderBase shader
     stage override void PSMain()
     {
+        // properly deal with total alpha shading
         float4 colorTarget = Shading();
+        float additional_alpha = streams.Color.a * ColorScale.a;
+        colorTarget.a *= additional_alpha;
+        
+        // clip now if we are too transparent
+        clip(colorTarget.a - AlphaCutoff);
+
+        // apply all alpha to rgb channels
+        colorTarget.rgb *= streams.Color.rgb * ColorScale.rgb * additional_alpha;
 
         if (UsesSoftEdge > 0)
         {
@@ -114,19 +119,12 @@ shader ParticleBase : DepthBase, ShaderBase, Texturing, ParticleUtilities
             var softEdge = smoothstep(0, 1, depthDistance * SoftEdgeInverseDistance); 
             colorTarget.rgba *= softEdge;
         }
-        else
-        {
-            // Do nothing. The depth testing is enabled
-        }
-
-        colorTarget.a *= AlphaAdditive;
 
         streams.ColorTarget = colorTarget;
     }
     
     stage float4 Shading()
     {
-        return ColorScale;
+        return float(1, 1, 1, 1);
     }
-
 };
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleBase.cs b/sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl.cs
similarity index 75%
rename from sources/engine/Xenko.Particles/Shaders/ParticleBase.cs
rename to sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl.cs
index 75f0fdf644..4791b125fd 100644
--- a/sources/engine/Xenko.Particles/Shaders/ParticleBase.cs
+++ b/sources/engine/Xenko.Particles/Shaders/ParticleBase.xksl.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Do not edit this file yourself!
 //
 // This code was generated by Xenko Shader Mixin Code Generator.
@@ -19,8 +19,7 @@ namespace Xenko.Rendering
     public static partial class ParticleBaseKeys
     {
         public static readonly ValueParameterKey<Vector4> ColorScale = ParameterKeys.NewValue<Vector4>();
-        public static readonly ValueParameterKey<float> AlphaAdditive = ParameterKeys.NewValue<float>();
-        public static readonly ValueParameterKey<float> ZOffset = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<float> AlphaCutoff = ParameterKeys.NewValue<float>();
         public static readonly ValueParameterKey<float> SoftEdgeInverseDistance = ParameterKeys.NewValue<float>();
     }
 }
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleBaseEffect.cs b/sources/engine/Xenko.Particles/Shaders/ParticleBaseEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ParticleBaseEffect.cs
rename to sources/engine/Xenko.Particles/Shaders/ParticleBaseEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleColor.xksl b/sources/engine/Xenko.Particles/Shaders/ParticleColor.xksl
deleted file mode 100644
index 8a50e25790..0000000000
--- a/sources/engine/Xenko.Particles/Shaders/ParticleColor.xksl
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Xenko.Rendering
-{        
-    // This is a sample shader for plugging into the Shader input for ComputeColor computations
-    shader ParticleColor : ComputeColor
-    {
-        override float4 Compute()
-        {
-            return float4(1, 1, 1, 1);
-        }
-    };
-}
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleColorStream.xksl b/sources/engine/Xenko.Particles/Shaders/ParticleColorStream.xksl
deleted file mode 100644
index b161a13a16..0000000000
--- a/sources/engine/Xenko.Particles/Shaders/ParticleColorStream.xksl
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Xenko.Rendering
-{        
-    // This is a sample shader for plugging into the Shader input for ComputeColor computations
-    shader ParticleColorStream : ParticleColor
-    {
-        // -------------------------------------
-        // uniforms
-        // -------------------------------------        
-        stage stream float4 Color : COLOR;
-
-        override float4 Compute()
-        {
-            return streams.Color;
-        }
-    };
-}
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.xksl b/sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.xksl
index 57a6e774d4..657cff5937 100644
--- a/sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.xksl
+++ b/sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.xksl
@@ -14,12 +14,7 @@ shader ParticleComputeColorShader : ParticleBase
     // Shading of the sprite
     stage override float4 Shading()
     {
-        // -----------------------------------------------
-        // Base particle color
-        // -----------------------------------------------        
-        float4 finalColor = base.Shading() * baseColor.Compute();
-
-        return finalColor;
+        return baseColor.Compute();
     }
 };
 
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleColor.cs b/sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ParticleColor.cs
rename to sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.xksl.cs
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleEffect.cs b/sources/engine/Xenko.Particles/Shaders/ParticleEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ParticleEffect.cs
rename to sources/engine/Xenko.Particles/Shaders/ParticleEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleUtilities.cs b/sources/engine/Xenko.Particles/Shaders/ParticleUtilities.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ParticleUtilities.cs
rename to sources/engine/Xenko.Particles/Shaders/ParticleUtilities.xksl.cs
diff --git a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderBillboard.cs b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderBillboard.cs
index 0df66f4721..3f8fd061ab 100644
--- a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderBillboard.cs
+++ b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderBillboard.cs
@@ -58,7 +58,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
             // Check if the draw space is identity - in this case we don't need to transform the position, scale and rotation vectors
             var trsIdentity = (spaceScale == 1f);
-            trsIdentity = trsIdentity && (spaceTranslation.Equals(new Vector3(0, 0, 0)));
+            trsIdentity = trsIdentity && (spaceTranslation.Equals(Vector3.Zero));
             trsIdentity = trsIdentity && (spaceRotation.Equals(Quaternion.Identity));
 
 
@@ -75,13 +75,13 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
                 if (!trsIdentity)
                 {
-                    spaceRotation.Rotate(ref centralPos);
+                    spaceRotation.RotateVector(ref centralPos);
                     centralPos = centralPos * spaceScale + spaceTranslation;
                     particleSize *= spaceScale;
                 }
 
                 // Use half size to make a Size = 1 result in a Billboard of 1m x 1m
-                var unitX = invViewX * (particleSize * 0.5f); 
+                var unitX = invViewX * (particleSize * 0.5f);
                 var unitY = invViewY * (particleSize * 0.5f);
 
                 // Particle rotation. Positive value means clockwise rotation.
@@ -98,7 +98,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
 
                 var particlePos = centralPos - unitX + unitY;
-                var uvCoord = new Vector2(0, 0);
+                var uvCoord = Vector2.Zero;
                 // 0f 0f
                 bufferState.SetAttribute(posAttribute, (IntPtr) (&particlePos));
                 bufferState.SetAttribute(texAttribute, (IntPtr) (&uvCoord));
diff --git a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderHexagon.cs b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderHexagon.cs
index c484fa87ca..4172d5f545 100644
--- a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderHexagon.cs
+++ b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderHexagon.cs
@@ -57,7 +57,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
             // Check if the draw space is identity - in this case we don't need to transform the position, scale and rotation vectors
             var trsIdentity = (spaceScale == 1f);
-            trsIdentity = trsIdentity && (spaceTranslation.Equals(new Vector3(0, 0, 0)));
+            trsIdentity = trsIdentity && (spaceTranslation.Equals(Vector3.Zero));
             trsIdentity = trsIdentity && (spaceRotation.Equals(Quaternion.Identity));
 
 
@@ -74,7 +74,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
                 if (!trsIdentity)
                 {
-                    spaceRotation.Rotate(ref centralPos);
+                    spaceRotation.RotateVector(ref centralPos);
                     centralPos = centralPos * spaceScale + spaceTranslation;
                     particleSize *= spaceScale;
                 }
diff --git a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderOrientedQuad.cs b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderOrientedQuad.cs
index 8029237451..5568a179ed 100644
--- a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderOrientedQuad.cs
+++ b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderOrientedQuad.cs
@@ -56,7 +56,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
             // Check if the draw space is identity - in this case we don't need to transform the position, scale and rotation vectors
             var trsIdentity = (spaceScale == 1f);
-            trsIdentity = trsIdentity && (spaceTranslation.Equals(new Vector3(0, 0, 0)));
+            trsIdentity = trsIdentity && (spaceTranslation.Equals(Vector3.Zero));
             trsIdentity = trsIdentity && (spaceRotation.Equals(Quaternion.Identity));
 
 
@@ -80,10 +80,10 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
                 if (!trsIdentity)
                 {
-                    spaceRotation.Rotate(ref centralPos);
+                    spaceRotation.RotateVector(ref centralPos);
                     centralPos = centralPos * spaceScale + spaceTranslation;
 
-                    spaceRotation.Rotate(ref centralOffset);
+                    spaceRotation.RotateVector(ref centralOffset);
                     centralOffset = centralOffset * spaceScale;
 
                     particleSize *= spaceScale;
@@ -124,7 +124,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
                 }
 
                 var particlePos = centralPos - unitX + unitY;
-                var uvCoord = new Vector2(0, 0);
+                var uvCoord = Vector2.Zero;
                 // 0f 0f
                 bufferState.SetAttribute(posAttribute, (IntPtr)(&particlePos));
                 bufferState.SetAttribute(texAttribute, (IntPtr)(&uvCoord));
diff --git a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderQuad.cs b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderQuad.cs
index 570c196c1e..18a680790e 100644
--- a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderQuad.cs
+++ b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderQuad.cs
@@ -57,7 +57,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
             // Check if the draw space is identity - in this case we don't need to transform the position, scale and rotation vectors
             var trsIdentity = (spaceScale == 1f);
-            trsIdentity = trsIdentity && (spaceTranslation.Equals(new Vector3(0, 0, 0)));
+            trsIdentity = trsIdentity && (spaceTranslation.Equals(Vector3.Zero));
             trsIdentity = trsIdentity && (spaceRotation.Equals(Quaternion.Identity));
 
 
@@ -78,19 +78,19 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
                 if (hasRotation)
                 {
                     var particleRotation = GetParticleRotation(particle, rotField, lifeField);
-                    particleRotation.Rotate(ref unitX);
-                    particleRotation.Rotate(ref unitY);
+                    particleRotation.RotateVector(ref unitX);
+                    particleRotation.RotateVector(ref unitY);
                 }
 
                 // The TRS matrix is not an identity, so we need to transform the quad
                 if (!trsIdentity)
                 {
-                    spaceRotation.Rotate(ref centralPos);
+                    spaceRotation.RotateVector(ref centralPos);
                     centralPos = centralPos * spaceScale + spaceTranslation;
                     particleSize *= spaceScale;
 
-                    spaceRotation.Rotate(ref unitX);
-                    spaceRotation.Rotate(ref unitY);
+                    spaceRotation.RotateVector(ref unitX);
+                    spaceRotation.RotateVector(ref unitY);
                 }
 
                 // Use half size to make a Size = 1 result in a Billboard of 1m x 1m
@@ -98,7 +98,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
                 unitY *= (particleSize * 0.5f);
 
                 var particlePos = centralPos - unitX + unitY;
-                var uvCoord = new Vector2(0, 0);
+                var uvCoord = Vector2.Zero;
                 // 0f 0f
                 bufferState.SetAttribute(posAttribute, (IntPtr)(&particlePos));
                 bufferState.SetAttribute(texAttribute, (IntPtr)(&uvCoord));
diff --git a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderRibbon.cs b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderRibbon.cs
index 2816d77cea..572417ed41 100644
--- a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderRibbon.cs
+++ b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderRibbon.cs
@@ -121,7 +121,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
             // Check if the draw space is identity - in this case we don't need to transform the position, scale and rotation vectors
             // ReSharper disable once CompareOfFloatsByEqualityOperator
             var trsIdentity = (spaceScale == 1f);
-            trsIdentity = trsIdentity && (spaceTranslation.Equals(new Vector3(0, 0, 0)));
+            trsIdentity = trsIdentity && (spaceTranslation.Equals(Vector3.Zero));
             trsIdentity = trsIdentity && (spaceRotation.Equals(Quaternion.Identity));
 
             var ribbonizer = new Ribbonizer(this, currentTotalParticles, currentQuadsPerParticle);
@@ -152,7 +152,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
                 if (!trsIdentity)
                 {
-                    spaceRotation.Rotate(ref centralPos);
+                    spaceRotation.RotateVector(ref centralPos);
                     centralPos = centralPos * spaceScale + spaceTranslation;
                     particleSize *= spaceScale;
                 }
@@ -261,7 +261,7 @@ private static Vector3 GetWidthVector(float particleSize, ref Vector3 invViewZ,
                 var unitX = axis0 + axis1;
                 unitX -= Vector3.Dot(invViewZ, unitX) * invViewZ;
                 var rotationQuaternion = Quaternion.RotationAxis(invViewZ, -MathUtil.PiOverTwo);
-                rotationQuaternion.Rotate(ref unitX);
+                rotationQuaternion.RotateVector(ref unitX);
                 unitX.Normalize();
 
                 return unitX * (particleSize * 0.5f);
@@ -383,8 +383,8 @@ public unsafe void Ribbonize(ref ParticleBufferState bufferState, Vector3 invVie
                     // Optional - connect first particle to the origin/emitter
 
                     // Draw a dummy quad for the first particle
-                    var particlePos = new Vector3(0, 0, 0);
-                    var uvCoord = new Vector2(0, 0);
+                    var particlePos = Vector3.Zero;
+                    var uvCoord = Vector2.Zero;
 
                     for (var particleIdx = 0; particleIdx < lastParticle; particleIdx++)
                     {
@@ -474,7 +474,7 @@ public unsafe void Ribbonize(ref ParticleBufferState bufferState, Vector3 invVie
                     // Particle rotation - intentionally IGNORED for ribbon
 
                     var particlePos = oldPoint - oldUnitX;
-                    var uvCoord = new Vector2(0, 0);
+                    var uvCoord = Vector2.Zero;
                     var rotatedCoord = uvCoord;
 
 
diff --git a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderTrail.cs b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderTrail.cs
index 648c3e1d1c..fd49e32a15 100644
--- a/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderTrail.cs
+++ b/sources/engine/Xenko.Particles/ShapeBuilders/ShapeBuilderTrail.cs
@@ -129,7 +129,7 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
             // Check if the draw space is identity - in this case we don't need to transform the position, scale and rotation vectors
             var trsIdentity = (spaceScale == 1f);
-            trsIdentity = trsIdentity && (spaceTranslation.Equals(new Vector3(0, 0, 0)));
+            trsIdentity = trsIdentity && (spaceTranslation.Equals(Vector3.Zero));
             trsIdentity = trsIdentity && (spaceRotation.Equals(Quaternion.Identity));
 
             var ribbonizer = new Ribbonizer(this, currentTotalParticles, currentQuadsPerParticle);
@@ -162,11 +162,11 @@ public override unsafe int BuildVertexBuffer(ref ParticleBufferState bufferState
 
                 if (!trsIdentity)
                 {
-                    spaceRotation.Rotate(ref centralPos);
+                    spaceRotation.RotateVector(ref centralPos);
                     centralPos = centralPos * spaceScale + spaceTranslation;
 
                     // Direction
-                    spaceRotation.Rotate(ref particleDirection);
+                    spaceRotation.RotateVector(ref particleDirection);
                     particleDirection *= spaceScale;
                 }
 
@@ -374,8 +374,8 @@ public unsafe void Ribbonize(ref ParticleBufferState bufferState, int quadsPerPa
                     // Optional - connect first particle to the origin/emitter
 
                     // Draw a dummy quad for the first particle
-                    var particlePos = new Vector3(0, 0, 0);
-                    var uvCoord = new Vector2(0, 0);
+                    var particlePos = Vector3.Zero;
+                    var uvCoord = Vector2.Zero;
 
                     for (var particleIdx = 0; particleIdx < lastParticle; particleIdx++)
                     {
@@ -426,7 +426,7 @@ public unsafe void Ribbonize(ref ParticleBufferState bufferState, int quadsPerPa
                     // Particle rotation - intentionally IGNORED for ribbon
 
                     var particlePos = (EdgePolicy == EdgePolicy.Center) ? oldPoint - oldUnitX : oldPoint;
-                    var uvCoord = new Vector2(0, 0);
+                    var uvCoord = Vector2.Zero;
                     var rotatedCoord = uvCoord;
 
 
diff --git a/sources/engine/Xenko.Particles/Sorters/ArrayPool.cs b/sources/engine/Xenko.Particles/Sorters/ArrayPool.cs
index e9961bab4e..599682089a 100644
--- a/sources/engine/Xenko.Particles/Sorters/ArrayPool.cs
+++ b/sources/engine/Xenko.Particles/Sorters/ArrayPool.cs
@@ -2,9 +2,6 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Xenko.Particles.Sorters
 {
@@ -12,7 +9,7 @@ public class ArrayPool<T> where T : struct
     {
         private readonly Dictionary<int, Stack<T[]>> _pool = new Dictionary<int, Stack<T[]>>();
 
-        public readonly T[] Empty = new T[0];
+        public static readonly T[] Empty = Array.Empty<T>();
 
         public virtual void Clear()
         {
diff --git a/sources/engine/Xenko.Particles/Spawners/ParticleSpawner.cs b/sources/engine/Xenko.Particles/Spawners/ParticleSpawner.cs
index a414172bdd..43b5210be6 100644
--- a/sources/engine/Xenko.Particles/Spawners/ParticleSpawner.cs
+++ b/sources/engine/Xenko.Particles/Spawners/ParticleSpawner.cs
@@ -82,10 +82,10 @@ public abstract class ParticleSpawner
         private uint randomOffset = 0;
 
         [DataMemberIgnore]
-        private Vector2 delay = new Vector2(0, 0);
+        private Vector2 delay = Vector2.Zero;
 
         [DataMemberIgnore]
-        private Vector2 duration = new Vector2(1, 1);
+        private Vector2 duration = Vector2.One;
 
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="ParticleSpawner"/> is enabled.
diff --git a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cube.cs b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cube.cs
index 2e6c92064b..a742e08290 100644
--- a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cube.cs
+++ b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cube.cs
@@ -14,7 +14,7 @@ public class Cube : FieldShape
     {
         public override DebugDrawShape GetDebugDrawShape(out Vector3 pos, out Quaternion rot, out Vector3 scl)
         {
-            pos = new Vector3(0, 0, 0);
+            pos = Vector3.Zero;
             rot = Quaternion.Identity;
             scl = new Vector3(halfSideX * 2, halfSideY * 2, halfSideZ * 2);
             return DebugDrawShape.Cube;
@@ -92,7 +92,7 @@ public override void PreUpdateField(Vector3 position, Quaternion rotation, Vecto
             inverseRotation = new Quaternion(-rotation.X, -rotation.Y, -rotation.Z, rotation.W);
 
             mainAxis = new Vector3(0, 1, 0);
-            rotation.Rotate(ref mainAxis);
+            rotation.RotateVector(ref mainAxis);
         }
 
         public override float GetDistanceToCenter(
@@ -111,7 +111,7 @@ public override float GetDistanceToCenter(
 
             particlePosition -= fieldPosition;
             var inverseRotation = new Quaternion(-fieldRotation.X, -fieldRotation.Y, -fieldRotation.Z, fieldRotation.W);
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
             particlePosition /= fieldSize;
 
             // Start of code for Cube
@@ -125,7 +125,7 @@ public override float GetDistanceToCenter(
         public override bool IsPointInside(Vector3 particlePosition, out Vector3 surfacePoint, out Vector3 surfaceNormal)
         {
             particlePosition -= fieldPosition;
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
 //            particlePosition /= fieldSize;
 
             var halfSize = fieldSize;
@@ -178,10 +178,10 @@ public override bool IsPointInside(Vector3 particlePosition, out Vector3 surface
             }
 
             // Fix the surface point and normal to world space
-            fieldRotation.Rotate(ref surfaceNormal);
+            fieldRotation.RotateVector(ref surfaceNormal);
             surfaceNormal.Normalize();
 
-            fieldRotation.Rotate(ref surfacePoint);
+            fieldRotation.RotateVector(ref surfacePoint);
 //            surfacePoint *= fieldSize;
             surfacePoint += fieldPosition;
 
diff --git a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cylinder.cs b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cylinder.cs
index 7a60c70687..cc834e58fd 100644
--- a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cylinder.cs
+++ b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Cylinder.cs
@@ -13,7 +13,7 @@ public class Cylinder : FieldShape
     {
         public override DebugDrawShape GetDebugDrawShape(out Vector3 pos, out Quaternion rot, out Vector3 scl)
         {
-            pos = new Vector3(0, 0, 0);
+            pos = Vector3.Zero;
             rot = Quaternion.Identity;
             scl = new Vector3(radius * 2, halfHeight * 2, radius * 2);
             return DebugDrawShape.Cylinder;
@@ -74,7 +74,7 @@ public override void PreUpdateField(Vector3 position, Quaternion rotation, Vecto
             inverseRotation = new Quaternion(-rotation.X, -rotation.Y, -rotation.Z, rotation.W);
 
             mainAxis = new Vector3(0, 1, 0);
-            rotation.Rotate(ref mainAxis);
+            rotation.RotateVector(ref mainAxis);
         }
 
 
@@ -94,7 +94,7 @@ public override float GetDistanceToCenter(
             aroundAxis = Vector3.Cross(alongAxis, awayAxis);
 
             particlePosition -= fieldPosition;
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
             particlePosition /= fieldSize;
 
             // Start of code for Cylinder
@@ -115,7 +115,7 @@ public override float GetDistanceToCenter(
         public override bool IsPointInside(Vector3 particlePosition, out Vector3 surfacePoint, out Vector3 surfaceNormal)
         {
             particlePosition -= fieldPosition;
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
 //            particlePosition /= fieldSize;
 
             var maxDist = (float)Math.Sqrt(particlePosition.X * particlePosition.X + particlePosition.Z * particlePosition.Z);
@@ -177,10 +177,10 @@ public override bool IsPointInside(Vector3 particlePosition, out Vector3 surface
 
             // Fix the surface point and normal to world space
             surfaceNormal /= fieldSize;
-            fieldRotation.Rotate(ref surfaceNormal);
+            fieldRotation.RotateVector(ref surfaceNormal);
             surfaceNormal.Normalize();
    
-            fieldRotation.Rotate(ref surfacePoint);
+            fieldRotation.RotateVector(ref surfacePoint);
 //            surfacePoint *= fieldSize;
             surfacePoint += fieldPosition;
 
diff --git a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Sphere.cs b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Sphere.cs
index d07c16b4da..e283d4168f 100644
--- a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Sphere.cs
+++ b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Sphere.cs
@@ -13,7 +13,7 @@ public class Sphere : FieldShape
     {
         public override DebugDrawShape GetDebugDrawShape(out Vector3 pos, out Quaternion rot, out Vector3 scl)
         {
-            pos = new Vector3(0, 0, 0);
+            pos = Vector3.Zero;
             rot = Quaternion.Identity;
             scl = new Vector3(radius * 2, radius * 2, radius * 2);
             return DebugDrawShape.Sphere;
@@ -58,7 +58,7 @@ public override void PreUpdateField(Vector3 position, Quaternion rotation, Vecto
             inverseRotation = new Quaternion(-rotation.X, -rotation.Y, -rotation.Z, rotation.W);
 
             mainAxis = new Vector3(0, 1, 0);
-            rotation.Rotate(ref mainAxis);
+            rotation.RotateVector(ref mainAxis);
         }
 
         public override float GetDistanceToCenter(
@@ -76,7 +76,7 @@ public override float GetDistanceToCenter(
             aroundAxis = Vector3.Cross(alongAxis, awayAxis);
 
             particlePosition -= fieldPosition;
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
             particlePosition /= fieldSize;
 
             // Start of code for Sphere
@@ -89,7 +89,7 @@ public override float GetDistanceToCenter(
         public override bool IsPointInside(Vector3 particlePosition, out Vector3 surfacePoint, out Vector3 surfaceNormal)
         {
             particlePosition -= fieldPosition;
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
             particlePosition /= fieldSize;
 
             var maxDist = particlePosition.Length() / radius;
@@ -104,11 +104,11 @@ public override bool IsPointInside(Vector3 particlePosition, out Vector3 surface
 
             surfacePoint = surfaceNormal;
             surfacePoint *= fieldSize;
-            fieldRotation.Rotate(ref surfacePoint);
+            fieldRotation.RotateVector(ref surfacePoint);
             surfacePoint += fieldPosition;
 
             surfaceNormal /= fieldSize;
-            fieldRotation.Rotate(ref surfaceNormal);
+            fieldRotation.RotateVector(ref surfaceNormal);
             surfaceNormal.Normalize();
 
             return (maxDist <= 1);
diff --git a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Torus.cs b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Torus.cs
index e008f3e082..c813eeb85d 100644
--- a/sources/engine/Xenko.Particles/Updaters/FieldShapes/Torus.cs
+++ b/sources/engine/Xenko.Particles/Updaters/FieldShapes/Torus.cs
@@ -13,7 +13,7 @@ public class Torus : FieldShape
     {
         public override DebugDrawShape GetDebugDrawShape(out Vector3 pos, out Quaternion rot, out Vector3 scl)
         {
-            pos = new Vector3(0, 0, 0);
+            pos = Vector3.Zero;
             rot = Quaternion.Identity;
             scl = new Vector3(2 * BigRadius, 2 * BigRadius, 2 * BigRadius); // The default torus for drawing has a small radius of 0.5f
             return DebugDrawShape.Torus;
@@ -77,7 +77,7 @@ public override float GetDistanceToCenter(
             alongAxis = new Vector3(0, 1, 0);
 
             particlePosition -= fieldPosition;            
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
             particlePosition /= fieldSize;
 
             // Start by positioning hte particle on the torus' plane
@@ -89,14 +89,14 @@ public override float GetDistanceToCenter(
 
             // Fix the field's axis back to world space
             var forceAxis = Vector3.Cross(alongAxis, projectedPosition);
-            fieldRotation.Rotate(ref forceAxis);
+            fieldRotation.RotateVector(ref forceAxis);
             forceAxis.Normalize();
             alongAxis = forceAxis;
 
             projectedPosition = (distanceFromOrigin > 0) ? (projectedPosition/(float)distanceFromOrigin) : projectedPosition;
             projectedPosition -= particlePosition;
             projectedPosition *= fieldSize;
-            fieldRotation.Rotate(ref projectedPosition);
+            fieldRotation.RotateVector(ref projectedPosition);
             awayAxis = -projectedPosition;
             awayAxis.Normalize();
 
@@ -108,7 +108,7 @@ public override float GetDistanceToCenter(
         public override bool IsPointInside(Vector3 particlePosition, out Vector3 surfacePoint, out Vector3 surfaceNormal)
         {
             particlePosition -= fieldPosition;
-            inverseRotation.Rotate(ref particlePosition);
+            inverseRotation.RotateVector(ref particlePosition);
             particlePosition /= fieldSize;
 
             var projectedPosition = new Vector3(particlePosition.X, 0, particlePosition.Z);
@@ -129,11 +129,11 @@ public override bool IsPointInside(Vector3 particlePosition, out Vector3 surface
 
             // Fix the surface point and normal to world space
             surfaceNormal /= fieldSize;
-            fieldRotation.Rotate(ref surfaceNormal);
+            fieldRotation.RotateVector(ref surfaceNormal);
             surfaceNormal.Normalize();
 
             surfacePoint *= fieldSize;
-            fieldRotation.Rotate(ref surfacePoint);
+            fieldRotation.RotateVector(ref surfacePoint);
             surfacePoint += fieldPosition;
 
             return isInside;
diff --git a/sources/engine/Xenko.Particles/Updaters/UpdaterCollider.cs b/sources/engine/Xenko.Particles/Updaters/UpdaterCollider.cs
index 0d8aee7808..3203680f3a 100644
--- a/sources/engine/Xenko.Particles/Updaters/UpdaterCollider.cs
+++ b/sources/engine/Xenko.Particles/Updaters/UpdaterCollider.cs
@@ -108,7 +108,7 @@ public override unsafe void Update(float dt, ParticlePool pool)
 
             foreach (var particle in pool)
             {
-                var surfacePoint = new Vector3(0, 0, 0);
+                var surfacePoint = Vector3.Zero;
                 var surfaceNormal = new Vector3(0, 1, 0);
 
                 var particlePos = (*((Vector3*)particle[posField]));
@@ -139,7 +139,7 @@ public override unsafe void Update(float dt, ParticlePool pool)
                     var verticalIncidentVelocity = verIncidentCoef * surfaceNormal;
                     var horizontalIncidentVelocity = particleVel - verticalIncidentVelocity;
 
-                    particleVel = horizontalIncidentVelocity * (1 - Friction) + 
+                    particleVel = horizontalIncidentVelocity * (1 - Friction) +
                         verticalIncidentVelocity * ((verIncidentCoef > 0) ? Restitution : -Restitution);
 
                     (*((Vector3*)particle[velField])) = particleVel;
@@ -177,8 +177,8 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
                 return base.TryGetDebugDrawShape(out debugDrawShape, out translation, out rotation, out scale);
 
             rotation = Quaternion.Identity;
-            scale = new Vector3(1, 1, 1);
-            translation = new Vector3(0, 0, 0);
+            scale = Vector3.One;
+            translation = Vector3.Zero;
 
             debugDrawShape = FieldShape?.GetDebugDrawShape(out translation, out rotation, out scale) ?? DebugDrawShape.None;
 
@@ -187,7 +187,7 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
             scale *= WorldScale;
 
             translation *= WorldScale;
-            rotation.Rotate(ref translation);
+            rotation.RotateVector(ref translation);
             translation += WorldPosition;
 
             return true;
diff --git a/sources/engine/Xenko.Particles/Updaters/UpdaterColorOverTime.cs b/sources/engine/Xenko.Particles/Updaters/UpdaterColorOverTime.cs
index f0cd08c845..541d85fccf 100644
--- a/sources/engine/Xenko.Particles/Updaters/UpdaterColorOverTime.cs
+++ b/sources/engine/Xenko.Particles/Updaters/UpdaterColorOverTime.cs
@@ -95,12 +95,24 @@ private unsafe void UpdateSingleSampler(ParticlePool pool)
             var colorField = pool.GetField(ParticleFields.Color);
             var lifeField  = pool.GetField(ParticleFields.Life);
 
-            foreach (var particle in pool)
+            int count = pool.NextFreeIndex;
+            for(int i = 0; i < count; i++)
             {
+                Particle particle = pool.FromIndex(i);
+
                 var life = 1f - (*((float*)particle[lifeField]));   // The Life field contains remaining life, so for sampling we take (1 - life)
 
                 var color = SamplerMain.Evaluate(life);
 
+                // preserve any colors?
+                if (pool.SpecificColors != null)
+                {
+                    if (color.A < 0f) color.A = pool.SpecificColors[i].A;
+                    if (color.R < 0f) color.R = pool.SpecificColors[i].R;
+                    if (color.G < 0f) color.G = pool.SpecificColors[i].G;
+                    if (color.B < 0f) color.B = pool.SpecificColors[i].B;
+                }
+
                 // Premultiply alpha
                 color.R *= color.A;
                 color.G *= color.A;
@@ -120,8 +132,11 @@ private unsafe void UpdateDoubleSampler(ParticlePool pool)
             var lifeField  = pool.GetField(ParticleFields.Life);
             var randField  = pool.GetField(ParticleFields.RandomSeed);
 
-            foreach (var particle in pool)
+            int count = pool.NextFreeIndex;
+            for (int i = 0; i < count; i++)
             {
+                Particle particle = pool.FromIndex(i);
+
                 var life = 1f - (*((float*)particle[lifeField]));   // The Life field contains remaining life, so for sampling we take (1 - life)
 
                 var randSeed = particle.Get(randField);
@@ -131,6 +146,15 @@ private unsafe void UpdateDoubleSampler(ParticlePool pool)
                 var colorMax = SamplerOptional.Evaluate(life);                
                 var color    =  Color4.Lerp(colorMin, colorMax, lerp);
 
+                // preserve any colors?
+                if (pool.SpecificColors != null)
+                {
+                    if (color.A < 0f) color.A = pool.SpecificColors[i].A;
+                    if (color.R < 0f) color.R = pool.SpecificColors[i].R;
+                    if (color.G < 0f) color.G = pool.SpecificColors[i].G;
+                    if (color.B < 0f) color.B = pool.SpecificColors[i].B;
+                }
+
                 // Premultiply alpha
                 color.R *= color.A;
                 color.G *= color.A;
diff --git a/sources/engine/Xenko.Particles/Updaters/UpdaterForceField.cs b/sources/engine/Xenko.Particles/Updaters/UpdaterForceField.cs
index 1e4592a78e..302457d755 100644
--- a/sources/engine/Xenko.Particles/Updaters/UpdaterForceField.cs
+++ b/sources/engine/Xenko.Particles/Updaters/UpdaterForceField.cs
@@ -108,7 +108,7 @@ public UpdaterForceField()
         /// </userdoc>
         [DataMember(100)]
         [Display("Fixed force")]
-        public Vector3 ForceFixed { get; set; } = new Vector3(0, 0, 0);
+        public Vector3 ForceFixed { get; set; } = Vector3.Zero;
 
         /// <inheritdoc />
         public override unsafe void Update(float dt, ParticlePool pool)
@@ -186,8 +186,8 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
                 return base.TryGetDebugDrawShape(out debugDrawShape, out translation, out rotation, out scale);
 
             rotation = Quaternion.Identity;
-            scale = new Vector3(1, 1, 1);
-            translation = new Vector3(0, 0, 0);
+            scale = Vector3.One;
+            translation = Vector3.Zero;
 
             debugDrawShape = FieldShape?.GetDebugDrawShape(out translation, out rotation, out scale) ?? DebugDrawShape.None;
 
@@ -196,7 +196,7 @@ public override bool TryGetDebugDrawShape(out DebugDrawShape debugDrawShape, out
             scale *= WorldScale;
 
             translation *= WorldScale;
-            rotation.Rotate(ref translation);
+            rotation.RotateVector(ref translation);
             translation += WorldPosition;
 
             return true;
diff --git a/sources/engine/Xenko.Particles/Updaters/UpdaterSizeOverTime.cs b/sources/engine/Xenko.Particles/Updaters/UpdaterSizeOverTime.cs
index 6d5533276f..7064519bbc 100644
--- a/sources/engine/Xenko.Particles/Updaters/UpdaterSizeOverTime.cs
+++ b/sources/engine/Xenko.Particles/Updaters/UpdaterSizeOverTime.cs
@@ -96,11 +96,21 @@ private unsafe void UpdateSingleSampler(ParticlePool pool)
             var sizeField = pool.GetField(ParticleFields.Size);
             var lifeField = pool.GetField(ParticleFields.Life);
 
-            foreach (var particle in pool)
+            int count = pool.NextFreeIndex;
+            for(int i = 0; i < count; i++)
             {
+                Particle particle = pool.FromIndex(i);
+
                 var life = 1f - (*((float*)particle[lifeField]));   // The Life field contains remaining life, so for sampling we take (1 - life)
 
-                (*((float*)particle[sizeField])) = WorldScale.X * SamplerMain.Evaluate(life);
+                if (pool.SpecificSizes != null)
+                {
+                    (*((float*)particle[sizeField])) = WorldScale.X * SamplerMain.Evaluate(life) * pool.SpecificSizes[i];
+                }
+                else
+                {
+                    (*((float*)particle[sizeField])) = WorldScale.X * SamplerMain.Evaluate(life);
+                }
             }
         }
 
@@ -114,8 +124,11 @@ private unsafe void UpdateDoubleSampler(ParticlePool pool)
             var lifeField = pool.GetField(ParticleFields.Life);
             var randField = pool.GetField(ParticleFields.RandomSeed);
 
-            foreach (var particle in pool)
+            int count = pool.NextFreeIndex;
+            for (int i = 0; i < count; i++)
             {
+                Particle particle = pool.FromIndex(i);
+
                 var life = 1f - (*((float*)particle[lifeField]));   // The Life field contains remaining life, so for sampling we take (1 - life)
 
                 var randSeed = particle.Get(randField);
@@ -124,7 +137,14 @@ private unsafe void UpdateDoubleSampler(ParticlePool pool)
                 var size1 = SamplerMain.Evaluate(life);
                 var size2 = SamplerOptional.Evaluate(life);
 
-                (*((float*)particle[sizeField])) = WorldScale.X * (size1 + (size2 - size1) * lerp);
+                if (pool.SpecificSizes != null)
+                {
+                    (*((float*)particle[sizeField])) = WorldScale.X * (size1 + (size2 - size1) * lerp) * pool.SpecificSizes[i];
+                }
+                else
+                {
+                    (*((float*)particle[sizeField])) = WorldScale.X * (size1 + (size2 - size1) * lerp);
+                }
             }
         }
 
diff --git a/sources/engine/Xenko.Particles/Xenko.Particles.csproj b/sources/engine/Xenko.Particles/Xenko.Particles.csproj
index 4a034edce7..0fb4924b32 100644
--- a/sources/engine/Xenko.Particles/Xenko.Particles.csproj
+++ b/sources/engine/Xenko.Particles/Xenko.Particles.csproj
@@ -11,107 +11,17 @@
     <XenkoAssemblyProcessorOptions>$(XenkoAssemblyProcessorDefaultOptions)</XenkoAssemblyProcessorOptions>
     <XenkoProjectPlatformDependentWindows>true</XenkoProjectPlatformDependentWindows>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoPackAssets>true</XenkoPackAssets>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-      <ItemGroup Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-      </ItemGroup>
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Update="Shaders\ComputeColorWhite.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorWhite.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleBaseEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleBaseEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleColor.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleColor.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleColorStream.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleColorStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleComputeColorShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleComputeColorShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleUtilities.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleUtilities.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Shaders\ParticleBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ParticleBase.xksl</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Shaders\ComputeColorWhite.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorWhite.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleBase.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleBaseEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleBaseEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleColor.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleColorStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleColorStream.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleComputeColorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleComputeColorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Shaders\ParticleUtilities.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ParticleUtilities.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Docs\VertexAttributes.txt" />
-  </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Physics.Tests/CharacterTest.cs b/sources/engine/Xenko.Physics.Tests/CharacterTest.cs
index 5b4ed93e92..618f18bc41 100644
--- a/sources/engine/Xenko.Physics.Tests/CharacterTest.cs
+++ b/sources/engine/Xenko.Physics.Tests/CharacterTest.cs
@@ -29,7 +29,8 @@ public static bool ScreenPositionToWorldPositionRaycast(Vector2 screenPos, Camer
             var vectorFar = Vector3.Transform(sPos, invViewProj);
             vectorFar /= vectorFar.W;
 
-            var result = simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ());
+            var result = new FastList<HitResult>();
+            simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ(), result);
             foreach (var hitResult in result)
             {
                 if (hitResult.Succeeded)
diff --git a/sources/engine/Xenko.Physics.Tests/ColliderShapesTest.cs b/sources/engine/Xenko.Physics.Tests/ColliderShapesTest.cs
index 8990fc02a0..4141e81b82 100644
--- a/sources/engine/Xenko.Physics.Tests/ColliderShapesTest.cs
+++ b/sources/engine/Xenko.Physics.Tests/ColliderShapesTest.cs
@@ -29,7 +29,8 @@ public static bool ScreenPositionToWorldPositionRaycast(Vector2 screenPos, Camer
             var vectorFar = Vector3.Transform(sPos, invViewProj);
             vectorFar /= vectorFar.W;
 
-            var result = simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ());
+            var result = new FastList<HitResult>();
+            simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ(), result);
             foreach (var hitResult in result)
             {
                 if (hitResult.Succeeded)
diff --git a/sources/engine/Xenko.Physics.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.Physics.Tests/Properties/AndroidManifest.xml
index 1310ca07fd..b747624495 100644
--- a/sources/engine/Xenko.Physics.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.Physics.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.Physics.Tests" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
 	<application android:icon="@drawable/icon" android:label="Xenko Physics" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Physics.Tests/SkinnedTest.cs b/sources/engine/Xenko.Physics.Tests/SkinnedTest.cs
index 0436c14c18..de831adbfc 100644
--- a/sources/engine/Xenko.Physics.Tests/SkinnedTest.cs
+++ b/sources/engine/Xenko.Physics.Tests/SkinnedTest.cs
@@ -29,7 +29,8 @@ public static bool ScreenPositionToWorldPositionRaycast(Vector2 screenPos, Camer
             var vectorFar = Vector3.Transform(sPos, invViewProj);
             vectorFar /= vectorFar.W;
 
-            var result = simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ());
+            var result = new FastList<HitResult>();
+            simulation.RaycastPenetrating(vectorNear.XYZ(), vectorFar.XYZ(), result);
             foreach (var hitResult in result)
             {
                 if (hitResult.Succeeded)
diff --git a/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Android.csproj b/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Android.csproj
index 96d1affbff..452b0078f5 100644
--- a/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Android.csproj
+++ b/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Android.csproj
@@ -24,7 +24,6 @@
     <MandroidI18n />
     <JavaMaximumHeapSize />
     <JavaOptions />
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoPlatform>Android</XenkoPlatform>
     <XenkoBuildProfile>Android</XenkoBuildProfile>
     <XenkoPackageGuid>{6d251236-da95-409a-8f4b-7d42ae1fd32c}</XenkoPackageGuid>
diff --git a/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Windows.csproj b/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Windows.csproj
index 348edd0ccc..42b9a9b5d0 100644
--- a/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Physics.Tests</RootNamespace>
@@ -45,6 +45,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.iOS.csproj b/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.iOS.csproj
index 6748392529..e2155aba4b 100644
--- a/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.iOS.csproj
+++ b/sources/engine/Xenko.Physics.Tests/Xenko.Physics.Tests.iOS.csproj
@@ -22,7 +22,6 @@
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
   </PropertyGroup>
   <PropertyGroup>
     <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.Physics.Tests.xkpkg</XenkoCurrentPackagePath>
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuCharacterController.cs b/sources/engine/Xenko.Physics/Bepu/BepuCharacterController.cs
new file mode 100644
index 0000000000..8a9be42da8
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuCharacterController.cs
@@ -0,0 +1,593 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using BepuPhysics.Collidables;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Games;
+using Xenko.Rendering.Images;
+using Xenko.VirtualReality;
+
+namespace Xenko.Physics.Bepu
+{
+    /// <summary>
+    /// Helper object for handling character movement with a base physical body (and optional child camera/VR).
+    /// </summary>
+    public class BepuCharacterController
+    {
+        /// <summary>
+        /// Generated rigidbody
+        /// </summary>
+        public BepuRigidbodyComponent Body { get; internal set; }
+
+        /// <summary>
+        /// Camera, if found off of the baseBody
+        /// </summary>
+        public CameraComponent Camera { get; internal set; }
+
+        /// <summary>
+        /// What transform will we be moving with the mouse? Get's set to the Camera's if found, but can be replaced by anything.
+        /// </summary>
+        public TransformComponent LookTransform { get; set; }
+
+        private VRFOV fovReduction;
+        private static Game internalGame;
+        private bool VR;
+
+        public float Height { get; internal set; }
+        public float Radius { get; internal set; }
+
+        private static ConcurrentDictionary<Vector2, Capsule> CapsuleCache = new ConcurrentDictionary<Vector2, Capsule>();
+
+        private Capsule getCapsule(float radius, float height)
+        {
+            var key = new Vector2(radius, height);
+            if (CapsuleCache.TryGetValue(key, out var cap))
+                return cap;
+
+            float capsule_len = height - radius * 2f;
+            if (capsule_len <= 0f)
+                throw new ArgumentOutOfRangeException("Height cannot be less than 2*radius for capsule shape (BepuCharacterController for " + Body.Entity.Name);
+
+            cap = new BepuPhysics.Collidables.Capsule(radius, capsule_len);
+            CapsuleCache[key] = cap;
+
+            return cap;
+        }
+
+        /// <summary>
+        /// Make a new BepuCharacterController helper for an entity, also useful for VR. Automatically will break off VR-tracked from Camera to base if using VR
+        /// </summary>
+        public BepuCharacterController(Entity baseBody, float height = 1.7f, float radius = 0.5f, bool VRMode = false, CollisionFilterGroups physics_group = CollisionFilterGroups.CharacterFilter,
+                                       CollisionFilterGroupFlags collides_with = CollisionFilterGroupFlags.StaticFilter | CollisionFilterGroupFlags.KinematicFilter | CollisionFilterGroupFlags.DefaultFilter |
+                                       CollisionFilterGroupFlags.EnemyFilter | CollisionFilterGroupFlags.CharacterFilter, HashSet<Entity> AdditionalVREntitiesToDisconnectFromCamera = null)
+        {
+            Height = height;
+            Radius = radius;
+
+            Body = baseBody.Get<BepuRigidbodyComponent>();
+
+            if (Body == null)
+            {
+                Body = new BepuRigidbodyComponent(getCapsule(radius, height));
+                baseBody.Add(Body);
+            }
+            else if (!(Body.ColliderShape is Capsule))
+                throw new ArgumentException(baseBody.Name + " already has a rigidbody, but it isn't a Capsule shape!");
+
+            Body.CollisionGroup = physics_group;
+            Body.CanCollideWith = collides_with;
+            VR = VRMode;
+
+            if (AdditionalVREntitiesToDisconnectFromCamera == null)
+                AdditionalVREntitiesToDisconnectFromCamera = new HashSet<Entity>();
+
+            // can we find an attached camera?
+            foreach (Entity e in baseBody.GetChildren())
+            {
+                var camCheck = e.Get<CameraComponent>();
+                if (camCheck != null)
+                {
+                    Camera = camCheck;
+                    LookTransform = Camera.Entity.Transform;
+                    break;
+                }
+            }
+
+            Body.AttachEntityBottomSlider = 1f;
+            Body.IgnorePhysicsRotation = true;
+            Body.RotationLock = true;
+            Body.ActionPerSimulationTick = UpdatePerSimulationTick;
+
+            if (internalGame == null) internalGame = ServiceRegistry.instance?.GetService<IGame>() as Game;
+
+            if (Camera != null && VRMode)
+            {
+                // can we get a fov reduction?
+                var pp = internalGame.SceneSystem.GraphicsCompositor.PostProcessing;
+                if (pp != null)
+                {
+                    for (int i = 0; i < pp.Count; i++)
+                    {
+                        var p = pp[i];
+                        if (p.VRFOVFilter != null)
+                        {
+                            fovReduction = p.VRFOVFilter;
+                            p.Enabled = true;
+                            break;
+                        }
+                    }
+                }
+
+                // VR sets the camera transform
+                Camera.VRHeadSetsTransform = true;
+
+                // can we find any tracked stuff to pick off?
+                foreach (Entity e in Camera.Entity.GetChildren())
+                {
+                    if (e.Transform.TrackVRHand != TouchControllerHand.None)
+                        AdditionalVREntitiesToDisconnectFromCamera.Add(e);
+                }
+
+                foreach (Entity e in AdditionalVREntitiesToDisconnectFromCamera)
+                    if (e.Transform.Parent == Camera.Entity.Transform) e.Transform.Parent = baseBody.Transform;
+            }
+        }
+
+        /// <summary>
+        /// If flying is true, gravity is set to zero and Donttouch_Y is set to false
+        /// </summary>
+        public bool Flying
+        {
+            get => Body.OverrideGravity;
+            set
+            {
+                Body.OverrideGravity = value;
+                Body.Gravity = Vector3.Zero;
+                DontTouch_Y = !value;
+            }
+        }
+
+        /// <summary>
+        /// This uses some CPU, but can monitor things like OnGround() functionality
+        /// </summary>
+        public bool TrackCollisions
+        {
+            set
+            {
+                Body.CollectCollisionMaximumCount = value ? 8 : 0;
+                Body.CollectCollisions = value;
+                Body.SleepThreshold = value ? -1f : 0.01f;
+                if (value) Body.IsActive = true;
+            }
+            get => Body.CollectCollisions;
+        }
+
+        /// <summary>
+        /// Returns a contact if this is considered on the ground. Requires TrackCollisions to be true
+        /// </summary>
+        /// <param name="threshold"></param>
+        /// <returns></returns>
+        public BepuContact? OnGround(float threshold = 0.75f)
+        {
+            if (TrackCollisions == false)
+                throw new InvalidOperationException("You need to set TrackCollisions to true for OnGround to work for CharacterCollision: " + Body.Entity.Name);
+
+            try
+            {
+                Vector3 reverseGravity = -(Body.OverrideGravity ? Body.Gravity : BepuSimulation.instance.Gravity);
+                reverseGravity.Normalize();
+                for (int i = 0; i < Body.CurrentPhysicalContactsCount; i++)
+                {
+                    var contact = Body.CurrentPhysicalContacts[i];
+                    if (Vector3.Dot(contact.Normal, reverseGravity) > threshold) return contact;
+                }
+            }
+            catch (Exception) { }
+            return null;
+        }
+
+        private bool lockFOVheal;
+
+        public enum RESIZE_POSITION_OPTION
+        {
+            RepositionNone = 0,
+            RepositionAll = 1,
+            RepositionBaseEntityOnly = 2
+        }
+
+        /// <summary>
+        /// This can change the shape of the rigidbody easily
+        /// </summary>
+        public void Resize(float? height, float? radius = null, RESIZE_POSITION_OPTION reposition = RESIZE_POSITION_OPTION.RepositionAll)
+        {
+            float useh = height ?? Height;
+            float user = radius ?? Radius;
+
+            if (useh == Height && user == Radius) return;
+
+            Body.ColliderShape = getCapsule(user, useh);
+
+            Height = useh;
+            Radius = user;
+
+            switch (reposition)
+            {
+                case RESIZE_POSITION_OPTION.RepositionAll:
+                    SetPosition(Body.Entity.Transform.Position);
+                    break;
+                case RESIZE_POSITION_OPTION.RepositionBaseEntityOnly:
+                    SetPosition(Body.Entity.Transform.Position, false);
+                    break;
+            }
+        }
+
+        /// <summary>
+        /// Jump! Will set ApplySingleImpulse (overwriting anything that was there already)
+        /// </summary>
+        public void Jump(float amount)
+        {
+            ApplySingleImpulse = new Vector3(0f, amount, 0f);
+        }
+
+        /// <summary>
+        /// Set how you want this character to move
+        /// </summary>
+        public Vector3 DesiredMovement;
+
+        /// <summary>
+        /// How to dampen the different axis during updating? Defaults to (0.000003f,1,0.000003f). Set to null (or Vector3.One) to disable.
+        /// </summary>
+        public Vector3? MoveDampening = new Vector3(0.000003f, 1f, 0.000003f);
+
+        /// <summary>
+        /// Applying a single impulse to this (useful for jumps or pushes)
+        /// </summary>
+        public Vector3? ApplySingleImpulse;
+
+        /// <summary>
+        /// Only operate on X/Z in all situations? Useful for non-flying characters
+        /// </summary>
+        public bool DontTouch_Y = true;
+
+        /// <summary>
+        /// Even if we are flying, should we ignore VR headset Y changes for physics positioning? You generally should leave this as true.
+        /// </summary>
+        public bool IgnoreVRHeadsetYPhysics = true;
+
+        /// <summary>
+        /// Push the character with forces (true) or set velocity directly (false)
+        /// </summary>
+        public bool UseImpulseMovement = true;
+
+        /// <summary>
+        /// Multiplier for the impulse movement (defaults to 100)
+        /// </summary>
+        public float ImpulseMovementMultiplier = 125f;
+
+        /// <summary>
+        /// Multiplier for velocity movement (defaults to 3)
+        /// </summary>
+        public float VelocityMovementMultiplier = 3f;
+
+        /// <summary>
+        /// How height to set the camera when positioning, if using camera?
+        /// </summary>
+        public float CameraHeightPercent = 0.95f;
+
+        /// <summary>
+        /// If you'd like to perform an additional physics tick action on this rigidbody, use this
+        /// </summary>
+        public Action<BepuRigidbodyComponent, float> AdditionalPerPhysicsAction = null;
+
+        private Vector3 oldPos;
+
+        /// <summary>
+        /// If you need to set a velocity to this body, do it here so it doesn't conflict with the character controller velocity
+        /// </summary>
+        public Vector3? SetVelocity = null;
+
+        private void UpdatePerSimulationTick(BepuRigidbodyComponent _body, float frame_time)
+        {
+            // make sure we are awake if we want to be moving
+            if (Body.IsActive == false)
+                Body.IsActive = DesiredMovement != Vector3.Zero || ApplySingleImpulse.HasValue;
+
+            if (SetVelocity == null)
+            {
+                // try to push our body
+                if (UseImpulseMovement)
+                {
+                    // get rid of y if we are not operating on it
+                    if (DontTouch_Y) DesiredMovement.Y = 0f;
+                    Body.InternalBody.ApplyLinearImpulse(BepuHelpers.ToBepu(DesiredMovement * frame_time * Body.Mass * ImpulseMovementMultiplier));
+                }
+                else if (DontTouch_Y)
+                {
+                    Vector3 originalVel = Body.LinearVelocity;
+                    Vector3 newmove = new Vector3(DesiredMovement.X * VelocityMovementMultiplier, originalVel.Y, DesiredMovement.Z * VelocityMovementMultiplier);
+                    Body.InternalBody.Velocity.Linear = BepuHelpers.ToBepu(newmove);
+                }
+                else Body.InternalBody.Velocity.Linear = BepuHelpers.ToBepu(DesiredMovement * VelocityMovementMultiplier);
+
+                // single impulse to apply?
+                if (ApplySingleImpulse.HasValue)
+                {
+                    Body.InternalBody.ApplyLinearImpulse(BepuHelpers.ToBepu(ApplySingleImpulse.Value));
+                    ApplySingleImpulse = null;
+                }
+
+                // apply MoveDampening, if any
+                if (MoveDampening.HasValue && MoveDampening.Value != Vector3.One)
+                {
+                    var vel = Body.InternalBody.Velocity.Linear;
+                    vel.X *= (float)Math.Pow(MoveDampening.Value.X, frame_time);
+                    vel.Y *= (float)Math.Pow(MoveDampening.Value.Y, frame_time);
+                    vel.Z *= (float)Math.Pow(MoveDampening.Value.Z, frame_time);
+                    Body.InternalBody.Velocity.Linear = vel;
+                }
+            }
+            else
+            {
+                Body.InternalBody.Velocity.Linear = BepuHelpers.ToBepu(SetVelocity.Value);
+                SetVelocity = null;
+            }
+
+            if (Camera != null && VR && VRBlackoutThroughWall < 1f && fovReduction != null)
+            {
+                Vector3 finalpos = Camera.Entity.Transform.WorldPosition() + Camera.Entity.Transform.Forward(true) * (Camera.NearClipPlane + 0.1f);
+                var hit = BepuSimulation.instance.Raycast(Body.Position, finalpos, CollisionFilterGroupFlags.StaticFilter | CollisionFilterGroupFlags.KinematicFilter | CollisionFilterGroupFlags.StaticFeaturesFilter);
+                if (hit.Succeeded)
+                {
+                    // wall blackout
+                    fovReduction.Radius = VRBlackoutThroughWall;
+                    fovReduction.Enabled = true;
+                }
+            }
+
+            if (AdditionalPerPhysicsAction != null)
+                AdditionalPerPhysicsAction(_body, frame_time);
+        }
+
+        private float desiredPitch, pitch, yaw, desiredYaw;
+        private bool shouldFlickTurn = true;
+
+        public float MouseSensitivity = 3f;
+        public bool InvertY = false;
+        public bool VRSmoothTurn = false;
+        public float VRSmoothTurnRate = 125f;
+        public float VRSnapTurnAmount = 45f;
+        public bool VRPressToTurn = false;
+        public bool VRComfortMode = false;
+        public float VRFOVReductionMin = 0.55f;
+        public float VRFOVReductionSpeed = 10f;
+
+        /// <summary>
+        /// Set this to 1f to disable blacking out when trying to look through walls. Defaults to 0.1f, 0 will completely black out the screen.
+        /// </summary>
+        public float VRBlackoutThroughWall = 0.025f;
+
+        /// <summary>
+        /// Sets the VR field of view reduction immediately to the select value. 1 is off (reset), 0 is completely black. Radius can be null to skip setting it, useful for locking/unlocking.
+        /// </summary>
+        public void SetVRFov(float? radius, bool lockAt = false)
+        {
+            lockFOVheal = lockAt;
+
+            if (!VR || fovReduction == null) return;
+
+            if (radius.HasValue)
+            {
+                fovReduction.Enabled = radius.Value < 1f;
+                fovReduction.Radius = radius.Value;
+            }
+        }
+
+        private void UpdateVRFOV(bool ForceFOVReduction, float frameTime)
+        {
+            float desiredRadius = 1f;
+            if (ForceFOVReduction)
+            {
+                desiredRadius = VRFOVReductionMin;
+            }
+            else if (VRComfortMode)
+            {
+                Vector3 vel = Body.LinearVelocity;
+                float speed = vel.Length();
+                if (speed < 0.1f)
+                {
+                    desiredRadius = 1f;
+                }
+                else
+                {
+                    desiredRadius = Vector3.Dot(Camera.Entity.Transform.Forward(true), vel.Normalized());
+                    if (desiredRadius < VRFOVReductionMin) desiredRadius = VRFOVReductionMin;
+                    desiredRadius *= desiredRadius;
+                }
+            }
+            if (fovReduction.Radius > desiredRadius)
+            {
+                frameTime *= VRFOVReductionSpeed;
+                if (frameTime > 1f) frameTime = 1f;
+            }
+            fovReduction.Radius = desiredRadius * frameTime + fovReduction.Radius * (1f - frameTime);
+            fovReduction.Enabled = fovReduction.Radius < 1f;
+        }
+
+        /// <summary>
+        /// Sets how the camera is looking for a player character. Has no effect in VR
+        /// </summary>
+        public void SetPlayerLook(float? yaw = null, float? pitch = null)
+        {
+            if (LookTransform == null || VR) return;
+            this.yaw = this.desiredYaw = yaw ?? this.yaw;
+            this.pitch = this.desiredPitch = pitch ?? this.pitch;
+            LookTransform.Rotation = Quaternion.RotationYawPitchRoll(this.yaw, this.pitch, 0f);
+        }
+
+        /// <summary>
+        /// Moves the camera look for a player character. Has no effect in VR
+        /// </summary>
+        public void MovePlayerLook(float? yaw = null, float? pitch = null)
+        {
+            if (LookTransform == null || VR) return;
+            this.yaw = this.desiredYaw += yaw ?? 0f;
+            this.pitch = this.desiredPitch += pitch ?? 0f;
+            LookTransform.Rotation = Quaternion.RotationYawPitchRoll(this.yaw, this.pitch, 0f);
+        }
+
+        /// <summary>
+        /// Makes this character look at the target. flattenY will always be true in VR
+        /// </summary>
+        public void LookAt(Vector3 target, bool flattenY = false)
+        {
+            Vector3 myPos = LookTransform != null ? LookTransform.WorldPosition() : Body.Position;
+            Vector3 diff = target - myPos;
+            if (flattenY || VR) diff.Y = 0f;
+            if (LookTransform != null)
+            {
+                if (!VR)
+                {
+                    Quaternion.LookAt(ref LookTransform.Rotation, diff);
+                    var ypr = LookTransform.Rotation.YawPitchRoll;
+                    yaw = desiredYaw = ypr.X;
+                    pitch = desiredPitch = ypr.Y;
+                }
+                else if (VRDeviceSystem.GetSystem?.Device is OpenXRHmd hmd)
+                {
+                    Quaternion temp = Quaternion.Identity;
+                    Quaternion camrot;
+                    if (LookTransform.Parent != null)
+                    {
+                        camrot = LookTransform.Parent.WorldRotation();
+                        camrot.Invert();
+                    }
+                    else
+                    {
+                        camrot = Quaternion.Identity;
+                    }
+                    Quaternion.LookAt(ref temp, diff);
+                    hmd.BodyRotation = temp * camrot;
+                }
+            }
+            else Quaternion.LookAt(ref Body.Entity.Transform.Rotation, diff);
+        }
+
+        /// <summary>
+        /// Use this to handle mouse/VR look, which operates on a camera (if found)
+        /// </summary>
+        public void HandleMouseAndVRLook()
+        {
+            float frame_time = (float)internalGame.UpdateTime.Elapsed.TotalSeconds;
+
+            if (LookTransform == null)
+                throw new ArgumentNullException("No LookTransform/camera to look with!");
+
+            if (VR && VRDeviceSystem.GetSystem?.Device is OpenXRHmd hmd)
+            {
+                bool fov_check = false;
+
+                if (VRSmoothTurn)
+                {
+                    // smooth turning
+                    var rightController = VRDeviceSystem.GetSystem?.GetController(TouchControllerHand.Right);
+                    if (rightController != null)
+                    {
+                        // wait, are we suppose to be pressing?
+                        if (VRPressToTurn && rightController.IsPressed(TouchControllerButton.Thumbstick) == false) return;
+                        // are we pushing enough?
+                        Vector2 thumb = rightController.ThumbstickAxis;
+                        if (thumb.X > 0.1f || thumb.X < -0.1f)
+                        {
+                            hmd.BodyRotation *= Quaternion.RotationYDeg(thumb.X * frame_time * -VRSmoothTurnRate);
+                            fov_check = true;
+                        }
+                    }
+                }
+                else
+                {
+                    // snap turning
+                    if (VRPressToTurn)
+                    {
+                        if (VRButtons.LeftThumbstickLeft.IsPressed())
+                            hmd.BodyRotation *= Quaternion.RotationYDeg(VRSnapTurnAmount);
+                        else if (VRButtons.LeftThumbstickRight.IsPressed())
+                            hmd.BodyRotation *= Quaternion.RotationYDeg(-VRSnapTurnAmount);
+                    }
+                    else
+                    {
+                        // flick to snap turn
+                        var rightController = VRDeviceSystem.GetSystem?.GetController(TouchControllerHand.Right);
+                        if (rightController != null)
+                        {
+                            Vector2 thumb = rightController.ThumbstickAxis;
+                            if (thumb.X > 0.5f)
+                            {
+                                if (shouldFlickTurn)
+                                {
+                                    hmd.BodyRotation *= Quaternion.RotationYDeg(-VRSnapTurnAmount);
+                                    shouldFlickTurn = false;
+                                }
+                            }
+                            else if (thumb.X < -0.5f)
+                            {
+                                if (shouldFlickTurn)
+                                {
+                                    hmd.BodyRotation *= Quaternion.RotationYDeg(VRSnapTurnAmount);
+                                    shouldFlickTurn = false;
+                                }
+                            }
+                            else shouldFlickTurn = true;
+                        }
+                    }
+                }
+
+                if (fovReduction != null && !lockFOVheal)
+                {
+                    if (VRComfortMode || fovReduction.Enabled)
+                        UpdateVRFOV(fov_check, frame_time);
+                    else
+                        fovReduction.Enabled = false;
+                }
+
+                return;
+            }
+
+            Vector2 rotationDelta = internalGame.Input.MouseDelta;
+
+            // Take shortest path
+            float deltaPitch = desiredPitch - pitch;
+            float deltaYaw = (desiredYaw - yaw) % MathUtil.TwoPi;
+            if (deltaYaw < 0) deltaYaw += MathUtil.TwoPi;
+            if (deltaYaw > MathUtil.Pi) deltaYaw -= MathUtil.TwoPi;
+            desiredYaw = yaw + deltaYaw;
+
+            // Perform orientation transition
+            yaw = Math.Abs(deltaYaw) < frame_time ? desiredYaw : yaw + frame_time * Math.Sign(deltaYaw);
+            pitch = Math.Abs(deltaPitch) < frame_time ? desiredPitch : pitch + frame_time * Math.Sign(deltaPitch);
+
+            desiredYaw = yaw -= 1.333f * rotationDelta.X * MouseSensitivity; // we want to rotate faster Horizontally and Vertically
+            desiredPitch = pitch = MathUtil.Clamp(pitch - rotationDelta.Y * (InvertY ? -MouseSensitivity : MouseSensitivity), -MathUtil.PiOverTwo + 0.05f, MathUtil.PiOverTwo - 0.05f);
+
+            LookTransform.Rotation = Quaternion.RotationYawPitchRoll(yaw, pitch, 0);
+        }
+
+        /// <summary>
+        /// Set our position and center the camera (if used) on this
+        /// </summary>
+        public void SetPosition(Vector3 position, bool updateCamera = true)
+        {
+            if (LookTransform != null && !VR && updateCamera) {
+                LookTransform.Position.X = 0f;
+                LookTransform.Position.Y = Height * CameraHeightPercent;
+                LookTransform.Position.Z = 0f;
+            }
+            Body.Entity.Transform.Position = position;
+            position.Y += Height * 0.5f;
+            Body.Position = position;
+            oldPos = position;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuContact.cs b/sources/engine/Xenko.Physics/Bepu/BepuContact.cs
new file mode 100644
index 0000000000..227962f6da
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuContact.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Xenko.Engine;
+
+namespace Xenko.Physics.Bepu
+{
+    public struct BepuContact
+    {
+        public BepuPhysicsComponent A, B;
+        public Xenko.Core.Mathematics.Vector3 Normal, Offset;
+
+        /// <summary>
+        /// Swaps A and B so that B is always the "other" body, and A is myBody (if it wasn't already)
+        /// </summary>
+        /// <param name="myBody">The "host" body of the contact</param>
+        /// <returns>Returns the "other" body that hit myBody</returns>
+        public BepuPhysicsComponent SwapIfNeeded(BepuRigidbodyComponent myBody)
+        {
+            if (B == myBody) Swap();
+            return B;
+        }
+
+        /// <summary>
+        /// Swaps A and B. Also flips the normal and corrects offset
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void Swap()
+        {
+            Normal.X = -Normal.X;
+            Normal.Y = -Normal.Y;
+            Normal.Z = -Normal.Z;
+            Offset = B.Position - (A.Position + Offset);
+            var C = A;
+            A = B;
+            B = C;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuHelpers.cs b/sources/engine/Xenko.Physics/Bepu/BepuHelpers.cs
new file mode 100644
index 0000000000..3606717d29
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuHelpers.cs
@@ -0,0 +1,748 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using BepuPhysics.Collidables;
+using BepuPhysics.Constraints;
+using BepuUtilities.Memory;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
+using Xenko.Engine;
+using Xenko.Games;
+using Xenko.Graphics;
+using Xenko.Rendering.Rendering;
+
+namespace Xenko.Physics.Bepu
+{
+    /// <summary>
+    /// Useful class with lots of static functions to do common bepu physics things. Can help making collider shapes and all sorts of goodies here.
+    /// </summary>
+    public class BepuHelpers
+    {
+        internal static object creationLocker = new object();
+        internal static PhysicsSystem physicsSystem;
+
+        /// <summary>
+        /// Good to call this at the start of your application. Will automatically get called in some situations, but not be soon enough.
+        /// </summary>
+        public static void AssureBepuSystemCreated()
+        {
+            // do we have the physics system already?
+            if (physicsSystem == null)
+            {
+                // do we have a service registry ready to go?
+                if (ServiceRegistry.instance == null) return;
+
+                // is it already added somewhere else?
+                physicsSystem = ServiceRegistry.instance.GetService<IPhysicsSystem>() as PhysicsSystem;
+                if (physicsSystem == null)
+                {
+                    // ok, appears we need to make it...
+                    lock (creationLocker)
+                    {
+                        // lock and check so we only make it once...
+                        if (physicsSystem == null)
+                        {
+                            physicsSystem = new PhysicsSystem(ServiceRegistry.instance);
+                            ServiceRegistry.instance.AddService<IPhysicsSystem>(physicsSystem);
+                            var gameSystems = ServiceRegistry.instance.GetSafeServiceAs<IGameSystemCollection>();
+                            gameSystems.Add(physicsSystem);
+                            ((IReferencable)physicsSystem).AddReference();
+                            physicsSystem.Create(null, PhysicsEngineFlags.None, true);
+                        }
+                    }
+                }
+                else
+                {
+                    // make sure we only do this once too
+                    lock (creationLocker)
+                    {
+                        if (physicsSystem.HasSimulation<BepuSimulation>() == false)
+                            physicsSystem.Create(null, PhysicsEngineFlags.None, true);
+                    }
+                }
+            }
+        }
+
+        private static Vector3 getBounds(Entity e, out Vector3 center, bool updateWorldMatrix)
+        {
+            if (updateWorldMatrix) e.Transform.UpdateWorldMatrix();
+            ModelComponent mc = e.Get<ModelComponent>();
+            center = new Vector3();
+            if (mc == null || mc.Model == null || mc.Model.Meshes.Count <= 0f)
+                throw new ArgumentException("Entity '" + e.Name + "' has no valid mesh to get sizing from!");
+
+            Vector3 biggest = new Vector3(0.05f, 0.05f, 0.05f);
+            int count = mc.Model.Meshes.Count;
+            for (int i=0; i<count; i++)
+            {
+                Xenko.Rendering.Mesh m = mc.Model.Meshes[i];
+                BoundingBox bb = m.BoundingBox;
+                Vector3 extent = bb.Extent;
+                if (extent.X > biggest.X) biggest.X = extent.X;
+                if (extent.Y > biggest.Y) biggest.Y = extent.Y;
+                if (extent.Z > biggest.Z) biggest.Z = extent.Z;
+                center += bb.Center;
+            }
+            center /= count;
+            return biggest * e.Transform.WorldScale();
+        }
+
+        /// <summary>
+        /// Is this an OK shape? Checks for 0 or negative sizes, or compounds with no children etc...
+        /// </summary>
+        /// <param name="shape">Shape to check</param>
+        /// <returns>true is this shape is sane, false if it has problems</returns>
+        public static bool SanityCheckShape(IShape shape)
+        {
+            if (shape is Box box)
+                return box.HalfHeight > 0f && box.HalfLength > 0f && box.HalfWidth > 0f;
+
+            if (shape is Sphere sphere)
+                return sphere.Radius > 0f;
+
+            if (shape is Cylinder cylinder)
+                return cylinder.Radius > 0f && cylinder.HalfLength > 0f;
+
+            if (shape is Capsule capsule)
+                return capsule.HalfLength > 0f && capsule.Radius > 0f;
+
+            if (shape is Triangle triangle)
+                return triangle.A != triangle.B && triangle.A != triangle.C && triangle.B != triangle.C;
+
+            if (shape is ICompoundShape compound)
+                return compound.ChildCount > 0;
+
+            if (shape is Mesh mesh)
+                return mesh.ChildCount > 0;
+
+            return shape != null;
+        }
+
+        /// <summary>
+        /// Takes a shape and offsets it using compound shapes.
+        /// </summary>
+        public static IShape OffsetSingleShape(IConvexShape shape, Vector3? offset = null, Quaternion? rotation = null, bool kinematic = false)
+        {
+            if (offset.HasValue == false && rotation.HasValue == false) return shape;
+
+            if (shape is ICompoundShape) throw new InvalidOperationException("Cannot offset a compound shape. Can't support nested compounds.");
+
+            using (var compoundBuilder = new CompoundBuilder(BepuSimulation.safeBufferPool, BepuSimulation.instance.internalSimulation.Shapes, 1))
+            {
+                using (BepuSimulation.instance.simulationLocker.WriteLock())
+                {
+                    if (kinematic)
+                    {
+                        compoundBuilder.AddForKinematicEasy(shape, new BepuPhysics.RigidPose(ToBepu(offset ?? Vector3.Zero), ToBepu(rotation ?? Quaternion.Identity)), 1f);
+                    }
+                    else
+                    {
+                        compoundBuilder.AddEasy(shape, new BepuPhysics.RigidPose(ToBepu(offset ?? Vector3.Zero), ToBepu(rotation ?? Quaternion.Identity)), 1f);
+                    }
+
+                    return compoundBuilder.BuildCompleteCompoundShape(BepuSimulation.instance.internalSimulation.Shapes, BepuSimulation.safeBufferPool, kinematic);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Generates a box collider shape of an entity. Entity must have a mesh to get sizing from.
+        /// </summary>
+        public static IShape GenerateBoxOfEntity(Entity e, Vector3? scale = null, bool allowOffsetCompound = true, bool updateWorldMatrix = true)
+        {
+            Vector3 b = getBounds(e, out Vector3 center, updateWorldMatrix) * 2f;
+            if (scale.HasValue) b *= scale.Value;
+            var box = new Box(b.X, b.Y, b.Z);
+            if (allowOffsetCompound && center.LengthSquared() > 0.01f) return OffsetSingleShape(box, center);
+            return box;
+        }
+
+        /// <summary>
+        /// Generates a physics box shape based on a bounding box
+        /// </summary>
+        /// <param name="bb">Bounding box</param>
+        /// <param name="scale">Should we scale this bounding box by something? Defaults to null (no)</param>
+        /// <param name="allowOffsetCompound">Allow us to move the center using a compound shape? Defaults to true (yes)</param>
+        /// <returns>A physics box</returns>
+        public static IShape GenerateBoxOfBounding(BoundingBox bb, Vector3? scale = null, bool allowOffsetCompound = true)
+        {
+            if (scale.HasValue)
+            {
+                bb.Maximum *= scale.Value;
+                bb.Minimum *= scale.Value;
+            }
+
+            var center = bb.Center;
+            var box = new Box(bb.Extent.X * 2f, bb.Extent.Y * 2f, bb.Extent.Z * 2f);
+            if (allowOffsetCompound && center.LengthSquared() > 0.01f) return OffsetSingleShape(box, center);
+            return box;
+        }
+
+        /// <summary>
+        /// Generates a sphere collider shape of an entity. Entity must have a mesh to get sizing from.
+        /// </summary>
+        public static IShape GenerateSphereOfEntity(Entity e, float scale = 1f, bool allowOffsetCompound = true, bool updateWorldMatrix = true) 
+        {
+            Vector3 b = getBounds(e, out Vector3 center, updateWorldMatrix);
+            var box = new Sphere(Math.Max(b.Z, Math.Max(b.X, b.Y)) * scale);
+            if (allowOffsetCompound && center.LengthSquared() > 0.01f) return OffsetSingleShape(box, center);
+            return box;
+        }
+
+        /// <summary>
+        /// Generates a capsule collider shape of an entity. Entity must have a mesh to get sizing from.
+        /// </summary>
+        public static IShape GenerateCapsuleOfEntity(Entity e, Vector3? scale = null, bool XZradius = true, bool allowOffsetCompound = true, bool updateWorldMatrix = true)
+        {
+            Vector3 b = getBounds(e, out Vector3 center, updateWorldMatrix);
+            if (scale.HasValue) b *= scale.Value;
+            var box = XZradius ? new Capsule(Math.Max(b.X, b.Z), b.Y * 2f) : new Capsule(b.Y, 2f * Math.Max(b.X, b.Z));
+            if (allowOffsetCompound && center.LengthSquared() > 0.01f) return OffsetSingleShape(box, center);
+            return box;
+        }
+
+        /// <summary>
+        /// Generates a cylinder collider shape of an entity. Entity must have a mesh to get sizing from.
+        /// </summary>
+        public static IShape GenerateCylinderOfEntity(Entity e, Vector3? scale = null, bool XZradius = true, bool allowOffsetCompound = true, bool updateWorldMatrix = true)
+        {
+            Vector3 b = getBounds(e, out Vector3 center, updateWorldMatrix);
+            if (scale.HasValue) b *= scale.Value;
+            var box = XZradius ? new Cylinder(Math.Max(b.X, b.Z), b.Y * 2f) : new Cylinder(b.Y, 2f * Math.Max(b.X, b.Z));
+            if (allowOffsetCompound && center.LengthSquared() > 0.01f) return OffsetSingleShape(box, center);
+            return box;
+        }
+
+        /// <summary>
+        /// Since you can't have non-convex shapes (e.g. mesh's) in a compound object, this helper will generate a bunch of individual static components to attach to an entity, with each shape.
+        /// </summary>
+        /// <param name="e">Entity to add static components to</param>
+        /// <param name="shapes">shapes that will generate a static component for each</param>
+        /// <param name="offsets">optional offset for each</param>
+        /// <param name="rotations">optional rotation for each</param>
+        public static void GenerateStaticComponents(Entity e, List<IShape> shapes, List<Vector3> offsets = null, List<Quaternion> rotations = null,
+                                                    CollisionFilterGroups group = CollisionFilterGroups.DefaultFilter, CollisionFilterGroupFlags collidesWith = CollisionFilterGroupFlags.AllFilter,
+                                                    float FrictionCoefficient = 0.5f, float MaximumRecoverableVelocity = 2f, SpringSettings? springSettings = null)
+        {
+            for (int i=0; i<shapes.Count; i++)
+            {
+                BepuStaticColliderComponent sc = new BepuStaticColliderComponent();
+                sc.ColliderShape = shapes[i];
+                if (offsets != null && offsets.Count > i) sc.Position = offsets[i];
+                if (rotations != null && rotations.Count > i) sc.Rotation = rotations[i];
+                sc.CanCollideWith = collidesWith;
+                sc.CollisionGroup = group;
+                sc.FrictionCoefficient = FrictionCoefficient;
+                sc.MaximumRecoveryVelocity = MaximumRecoverableVelocity;
+                if (springSettings.HasValue) sc.SpringSettings = springSettings.Value;
+                e.Add(sc);
+            }
+        }
+
+        /// <summary>
+        /// Easily makes a Compound shape for you, given a list of individual shapes and how they should be offset.
+        /// </summary>
+        /// <param name="shapes">List of convex shapes</param>
+        /// <param name="offsets">Matching length list of offsets of bodies, can be null if nothing has an offset</param>
+        /// <param name="rotations">Matching length list of rotations of bodies, can be null if nothing is rotated</param>
+        /// <param name="isDynamic">True if intended to use in a dynamic situation, false if kinematic or static</param>
+        /// <param name="bigThreshold">How many compound shapes before we should use a "big" compound object internally? Defaults to 5, which is usually fine.</param>
+        /// <returns>Compound shape</returns>
+        public static ICompoundShape MakeCompound(List<IConvexShape> shapes, List<Vector3> offsets = null, List<Quaternion> rotations = null, bool isDynamic = true, int bigThreshold = 5)
+        {
+            using (var compoundBuilder = new CompoundBuilder(BepuSimulation.safeBufferPool, BepuSimulation.instance.internalSimulation.Shapes, shapes.Count))
+            {
+                bool allConvex = true;
+
+                //All allocations from the buffer pool used for the final compound shape will be disposed when the demo is disposed. Don't have to worry about leaks in these demos.
+                for (int i=0; i<shapes.Count; i++)
+                {
+                    if (shapes[i] is ICompoundShape) throw new InvalidOperationException("Cannot include compounds in another compound shape.");
+
+                    using (BepuSimulation.instance.simulationLocker.WriteLock())
+                    {
+                        if (isDynamic)
+                        {
+                            compoundBuilder.AddEasy(shapes[i] as IConvexShape, new BepuPhysics.RigidPose(ToBepu(offsets?[i] ?? Vector3.Zero), ToBepu(rotations?[i] ?? Quaternion.Identity)), 1f);
+                        }
+                        else
+                        {
+                            if (shapes[i] is IConvexShape == false) allConvex = false;
+
+                            compoundBuilder.AddForKinematicEasy(shapes[i], new BepuPhysics.RigidPose(ToBepu(offsets?[i] ?? Vector3.Zero), ToBepu(rotations?[i] ?? Quaternion.Identity)), 1f);
+                        }
+                    }
+                }
+
+                using (BepuSimulation.instance.simulationLocker.WriteLock())
+                {
+                    return compoundBuilder.BuildCompleteCompoundShape(BepuSimulation.instance.internalSimulation.Shapes, BepuSimulation.safeBufferPool, isDynamic, allConvex ? bigThreshold : int.MaxValue);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Goes through the whole scene and adds bepu physics objects to the simulation. Only will add if AllowHelperToAdd is true (which is set to true by default)
+        /// and if the body isn't added already.
+        /// </summary>
+        /// <param name="rootScene"></param>
+        public static void SetBodiesInSimulation(Scene rootScene, bool add = true)
+        {
+            foreach (Entity e in rootScene.Entities)
+                SetBodiesInSimulation(e, add);
+        }
+
+        /// <summary>
+        /// Goes through the entity and children and adds/removes bepu physics objects to the simulation. Only will add/remove if AllowHelperToManage is true (which is set to true by default)
+        /// and if the body isn't added already.
+        /// </summary>
+        /// <param name="rootEntity"></param>
+        public static void SetBodiesInSimulation(Entity rootEntity, bool add = true)
+        {
+            foreach (BepuPhysicsComponent pc in rootEntity.GetAll<BepuPhysicsComponent>())
+                if (pc.AutomaticAdd && pc.ColliderShape != null) pc.AddedToScene = add;
+            foreach (Entity e in rootEntity.GetChildren())
+                SetBodiesInSimulation(e, add);
+        }
+
+        /// <summary>
+        /// Shortcut to clearing the simulation of all bodies. Optionally clears all the buffers too (e.g. mesh colliders), which is enabled by default
+        /// </summary>
+        public static void ClearSimulation(bool clearBuffers = true)
+        {
+            BepuSimulation.instance.Clear(clearBuffers);
+        }
+
+        private static unsafe bool getMeshOutputs(Xenko.Rendering.Mesh modelMesh, out List<Vector3> positions, out List<int> indicies)
+        {
+            if (modelMesh.Draw is StagedMeshDraw)
+            {
+                StagedMeshDraw smd = modelMesh.Draw as StagedMeshDraw;
+
+                object verts = smd.Verticies;
+
+                if (verts is VertexPositionNormalColor[])
+                {
+                    VertexPositionNormalColor[] vpnc = verts as VertexPositionNormalColor[];
+                    positions = new List<Vector3>(vpnc.Length);
+                    for (int k = 0; k < vpnc.Length; k++)
+                        positions.Add(vpnc[k].Position);
+                }
+                else if (verts is VertexPositionNormalTexture[])
+                {
+                    VertexPositionNormalTexture[] vpnc = verts as VertexPositionNormalTexture[];
+                    positions = new List<Vector3>(vpnc.Length);
+                    for (int k = 0; k < vpnc.Length; k++)
+                        positions.Add(vpnc[k].Position);
+                }
+                else if (verts is VertexPositionNormalTextureTangent[])
+                {
+                    VertexPositionNormalTextureTangent[] vpnc = verts as VertexPositionNormalTextureTangent[];
+                    positions = new List<Vector3>(vpnc.Length);
+                    for (int k = 0; k < vpnc.Length; k++)
+                        positions.Add(vpnc[k].Position);
+                }
+                else
+                {
+                    throw new ArgumentException("Couldn't get StageMeshDraw mesh, unknown vert type for " + modelMesh.Name);
+                }
+
+                // take care of indicies
+                indicies = new List<int>(smd.Indicies.Length);
+                for (int i = 0; i < smd.Indicies.Length; i++)
+                    indicies.Add((int)smd.Indicies[i]);
+            }
+            else
+            {
+                Xenko.Graphics.Buffer buf = modelMesh.Draw?.VertexBuffers[0].Buffer;
+                Xenko.Graphics.Buffer ibuf = modelMesh.Draw?.IndexBuffer.Buffer;
+                if (buf == null || buf.VertIndexData == null ||
+                    ibuf == null || ibuf.VertIndexData == null)
+                {
+                    throw new ArgumentException("Couldn't get mesh for " + modelMesh.Name + ", buffer wasn't stored probably. Try Xenko.Graphics.Buffer.CaptureAllModelBuffers to true.");
+                }
+
+                if (ModelBatcher.UnpackRawVertData(buf.VertIndexData, modelMesh.Draw.VertexBuffers[0].Declaration,
+                                                   out Vector3[] arraypositions, out Core.Mathematics.Vector3[] normals, out Core.Mathematics.Vector2[] uvs,
+                                                   out Color4[] colors, out Vector4[] tangents, modelMesh.Draw.VertexBuffers[0].Offset) == false)
+                {
+                    throw new ArgumentException("Couldn't unpack mesh for " + modelMesh.Name + ", buffer wasn't stored or data packed weird.");
+                }
+
+                // indicies
+                fixed (byte* pdst = ibuf.VertIndexData)
+                {
+                    int numIndices = modelMesh.Draw.IndexBuffer.Count;
+                    indicies = new List<int>(numIndices);
+                    if (modelMesh.Draw.IndexBuffer.Is32Bit)
+                    {
+                        var dst = (uint*)(pdst + modelMesh.Draw.IndexBuffer.Offset);
+                        for (var k = 0; k < numIndices; k++)
+                            indicies.Add((int)dst[k]);
+                    }
+                    else
+                    {
+                        var dst = (ushort*)(pdst + modelMesh.Draw.IndexBuffer.Offset);
+                        for (var k = 0; k < numIndices; k++)
+                            indicies.Add(dst[k]);
+                    }
+                }
+
+                // take care of positions
+                positions = new List<Vector3>(arraypositions);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate a mesh collider from a given mesh. The mesh must have a readable buffer behind it to generate veriticies from
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe bool GenerateMeshShape(Xenko.Rendering.Mesh modelMesh, out BepuPhysics.Collidables.Mesh outMesh, out BepuUtilities.Memory.BufferPool poolUsed, Vector3? scale = null)
+        {
+            getMeshOutputs(modelMesh, out var positions, out var indicies);
+            return GenerateMeshShape(positions, indicies, out outMesh, out poolUsed, scale);
+        }
+
+        /// <summary>
+        /// Generate a mesh collider from a given mesh. The mesh must have a readable buffer behind it to generate veriticies from
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe bool GenerateMeshShape(Xenko.Rendering.Model model, out BepuPhysics.Collidables.Mesh outMesh, out BepuUtilities.Memory.BufferPool poolUsed, Vector3? scale = null)
+        {
+            List<Vector3> allPositions = new List<Vector3>();
+            List<int> allIndicies = new List<int>();
+            for (int i = 0; i < model.Meshes.Count; i++)
+            {
+                getMeshOutputs(model.Meshes[i], out var pos, out var indicies);
+                for (int j = 0; j < indicies.Count; j++)
+                    allIndicies.Add(indicies[j] + allPositions.Count);
+                allPositions.AddRange(pos);
+            }
+
+            if (allIndicies.Count == 0 || allPositions.Count == 0)
+            {
+                outMesh = default;
+                poolUsed = null;
+                return false;
+            }
+
+            return GenerateMeshShape(allPositions, allIndicies, out outMesh, out poolUsed, scale);
+        }
+
+        /// <summary>
+        /// Generate a mesh collider from all meshes in an entity. The meshes must have a readable buffer behind it to generate veriticies from.
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe bool GenerateMeshShape(Entity e, out BepuPhysics.Collidables.Mesh outMesh, out BepuUtilities.Memory.BufferPool poolUsed, bool skipAlreadyHasCollider = false)
+        {
+            // strike out my transform so it isn't included in shape
+            Vector3 originalPosition = e.Transform.Position;
+            Quaternion originalRotation = e.Transform.Rotation;
+            Vector3 originalScale = e.Transform.Scale;
+            e.Transform.Position = Vector3.Zero;
+            e.Transform.Scale = Vector3.One;
+            e.Transform.Rotation = Quaternion.Identity;
+            // get all meshes
+            List<MeshTransformed> meshes = new List<MeshTransformed>();
+            CollectMeshes(e, meshes, skipAlreadyHasCollider);
+            // restore e transform
+            e.Transform.Position = originalPosition;
+            e.Transform.Scale = originalScale;
+            e.Transform.Rotation = originalRotation;
+            e.Transform.UpdateWorldMatrix(true, false);
+            List<Vector3> allPositions = new List<Vector3>();
+            List<int> allIndicies = new List<int>();
+            for (int i = 0; i < meshes.Count; i++)
+            {
+                MeshTransformed mt = meshes[i];
+                getMeshOutputs(mt.mesh, out var pos, out var indicies);
+                for (int j = 0; j < indicies.Count; j++)
+                    allIndicies.Add(indicies[j] + allPositions.Count);
+                if (mt.matrix.Equals(Matrix.Identity))
+                    allPositions.AddRange(pos);
+                else
+                {
+                    for (int j = 0; j < pos.Count; j++)
+                        allPositions.Add((Vector3)Vector3.Transform(pos[j], mt.matrix));
+                }
+            }
+
+            if (allIndicies.Count == 0 || allPositions.Count == 0)
+            {
+                outMesh = default;
+                poolUsed = null;
+                return false;
+            }
+
+            return GenerateMeshShape(allPositions, allIndicies, out outMesh, out poolUsed, e.Transform.WorldScale());
+        }
+
+        private class MeshTransformed
+        {
+            public Xenko.Rendering.Mesh mesh;
+            public Matrix matrix;
+        }
+
+        private static void CollectMeshes(Entity e, List<MeshTransformed> meshes, bool skipAlreadyDone)
+        {
+            // skip stuff that already has a component (so we don't double it up)
+            if (skipAlreadyDone && e.Get<BepuStaticColliderComponent>() != null) return;
+
+            // make sure worldmatrix is updated
+            e.Transform.UpdateWorldMatrix(true, false);
+
+            foreach(ModelComponent mc in e.GetAll<ModelComponent>())
+            {
+                if (mc.Model == null) continue;
+                Matrix wm = e.Transform.WorldMatrix;
+                for (int i=0;i<mc.Model.Meshes.Count; i++)
+                {
+                    var m = mc.Model.Meshes[i];
+                    if (m != null) meshes.Add(new MeshTransformed() { matrix = wm, mesh = m });
+                }
+            }
+            foreach (Entity child in e.GetChildren())
+                CollectMeshes(child, meshes, skipAlreadyDone);
+        }
+
+        /// <summary>
+        /// Scans all BepuStaticColliderComponents in entity (and children) and repositions them to the Entity's transform world position.
+        /// </summary>
+        /// <param name="e"></param>
+        public static void RepositionAllStatics(Entity e)
+        {
+            foreach (BepuStaticColliderComponent scc in e.GetAll<BepuStaticColliderComponent>())
+                scc.UpdatePhysicalTransform();
+            foreach (Entity child in e.GetChildren())
+                RepositionAllStatics(child);
+        }
+
+        /// <summary>
+        /// Frees up memory used by mesh colliders in entity
+        /// </summary>
+        /// <param name="e"></param>
+        public static void DisposeAllMeshes(Entity e)
+        {
+            foreach (BepuStaticColliderComponent scc in e.GetAll<BepuStaticColliderComponent>())
+                scc.DisposeMesh();
+            foreach (Entity child in e.GetChildren())
+                DisposeAllMeshes(child);
+        }
+
+        /// <summary>
+        /// Adds or removes all colliders in all entities from e
+        /// </summary>
+        public static void SetAllColliders(Entity e, bool enabled)
+        {
+            foreach (BepuPhysicsComponent pc in e.GetAll<BepuPhysicsComponent>())
+                pc.AddedToScene = enabled;
+            foreach (Entity child in e.GetChildren())
+                SetAllColliders(child, enabled);
+        }
+
+        /// <summary>
+        /// Generate a mesh collider from all meshes in an entity. The meshes must have a readable buffer behind it to generate veriticies from
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe bool GenerateBigMeshStaticColliders(Entity e, CollisionFilterGroups group = CollisionFilterGroups.DefaultFilter, CollisionFilterGroupFlags collidesWith = CollisionFilterGroupFlags.AllFilter,
+                                                                 float friction = 0.5f, float maximumRecoverableVelocity = 1f, SpringSettings? springSettings = null, bool disposeOnDetach = false, bool skipAlreadyHasCollider = true)
+        {
+            // strike out my transform so it isn't included in shape
+            Vector3 originalPosition = e.Transform.Position;
+            Quaternion originalRotation = e.Transform.Rotation;
+            Vector3 originalScale = e.Transform.Scale;
+            e.Transform.Position = Vector3.Zero;
+            e.Transform.Scale = Vector3.One;
+            e.Transform.Rotation = Quaternion.Identity;
+            // get all meshes
+            List<MeshTransformed> meshes = new List<MeshTransformed>();
+            CollectMeshes(e, meshes, skipAlreadyHasCollider);
+            // restore e transform
+            e.Transform.Position = originalPosition;
+            e.Transform.Scale = originalScale;
+            e.Transform.Rotation = originalRotation;
+            e.Transform.UpdateWorldMatrix(true, false);
+            List<Vector3> allPositions = new List<Vector3>();
+            List<int> allIndicies = new List<int>();
+            for (int i=0; i<meshes.Count; i++)
+            {
+                MeshTransformed mt = meshes[i];
+                getMeshOutputs(mt.mesh, out var pos, out var indicies);
+                for (int j=0; j<indicies.Count; j++)
+                    allIndicies.Add(indicies[j] + allPositions.Count);
+                if (mt.matrix.Equals(Matrix.Identity))
+                    allPositions.AddRange(pos);
+                else
+                {
+                    for (int j = 0; j < pos.Count; j++)
+                        allPositions.Add((Vector3)Vector3.Transform(pos[j], mt.matrix));
+                }
+            }
+
+            if (allIndicies.Count == 0 || allPositions.Count == 0) return false;
+
+            GenerateBigMeshStaticColliders(e, allPositions, allIndicies, e.Transform.WorldScale(), group, collidesWith, friction, maximumRecoverableVelocity, springSettings, disposeOnDetach);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate a big mesh collider from a given mesh using multithreading. The mesh must have a readable buffer behind it to generate veriticies from
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe bool GenerateBigMeshStaticColliders(Entity e, Xenko.Rendering.Mesh modelMesh, Vector3? scale = null,
+                                                                 CollisionFilterGroups group = CollisionFilterGroups.DefaultFilter, CollisionFilterGroupFlags collidesWith = CollisionFilterGroupFlags.AllFilter,
+                                                                 float friction = 0.5f, float maximumRecoverableVelocity = 1f, SpringSettings? springSettings = null, bool disposeOnDetach = false)
+        {
+            getMeshOutputs(modelMesh, out var positions, out var indicies);
+            GenerateBigMeshStaticColliders(e, positions, indicies, scale, group, collidesWith, friction, maximumRecoverableVelocity, springSettings, disposeOnDetach);
+            return true;
+        }
+
+        /// <summary>
+        /// Generate a mesh collider from a given mesh. The mesh must have a readable buffer behind it to generate veriticies from
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe bool GenerateMeshShape(List<Vector3> positions, List<int> indicies, out BepuPhysics.Collidables.Mesh outMesh, out BepuUtilities.Memory.BufferPool poolUsed, Vector3? scale = null)
+        {
+            poolUsed = BepuSimulation.safeBufferPool;
+
+            // ok, should have what we need to make triangles
+            int triangleCount = indicies.Count / 3;
+
+            BepuUtilities.Memory.Buffer<Triangle> triangles;
+            lock (poolUsed)
+            {
+                poolUsed.Take<Triangle>(triangleCount, out triangles);
+            }
+
+            Xenko.Core.Threading.Dispatcher.For(0, triangleCount, (i) =>
+            {
+                int shiftedi = i * 3;
+                triangles[i].A = ToBepu(positions[indicies[shiftedi]]);
+                triangles[i].B = ToBepu(positions[indicies[shiftedi + 1]]);
+                triangles[i].C = ToBepu(positions[indicies[shiftedi + 2]]);
+            });
+
+            lock (poolUsed)
+            {
+                outMesh = new Mesh(triangles, new System.Numerics.Vector3(scale?.X ?? 1f, scale?.Y ?? 1f, scale?.Z ?? 1f), poolUsed);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Generate a big mesh collider from a given mesh using multithreading. The mesh must have a readable buffer behind it to generate veriticies from
+        /// </summary>
+        /// <returns>Returns false if no mesh could be made</returns>
+        public static unsafe void GenerateBigMeshStaticColliders(Entity e, List<Vector3> positions, List<int> indicies, Vector3? scale = null,
+                                                                 CollisionFilterGroups group = CollisionFilterGroups.DefaultFilter, CollisionFilterGroupFlags collidesWith = CollisionFilterGroupFlags.AllFilter,
+                                                                 float friction = 0.5f, float maximumRecoverableVelocity = 1f, SpringSettings? springSettings = null, bool disposeOnDetach = false)
+        {
+            // ok, should have what we need to make triangles
+            int triangleCount = indicies.Count / 3;
+
+            if (triangleCount < Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism * 2f)
+            {
+                // if we have a really small mesh, doesn't make sense to split it up a bunch
+                var scc = new BepuStaticColliderComponent();
+                scc.CanCollideWith = collidesWith;
+                scc.CollisionGroup = group;
+                scc.FrictionCoefficient = friction;
+                scc.DisposeMeshOnDetach = disposeOnDetach;
+                scc.MaximumRecoveryVelocity = maximumRecoverableVelocity;
+                if (springSettings.HasValue) scc.SpringSettings = springSettings.Value;
+                GenerateMeshShape(positions, indicies, out var outMesh, out scc.PoolUsedForMesh, scale);
+                scc.ColliderShape = outMesh;
+                e.Add(scc);
+            }
+            else
+            {
+                int trianglesPerThread = 1 + (triangleCount / Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism);
+                BepuStaticColliderComponent[] scs = new BepuStaticColliderComponent[Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism];
+                var scalev3 = new System.Numerics.Vector3(scale?.X ?? 1f, scale?.Y ?? 1f, scale?.Z ?? 1f);
+                Xenko.Core.Threading.Dispatcher.For(0, scs.Length, (index) =>
+                {
+                    var pool = BepuSimulation.safeBufferPool;
+                    int triangleStart = index * trianglesPerThread;
+                    int triangleEnd = Math.Min(triangleStart + trianglesPerThread, triangleCount);
+                    int triangleLen = triangleEnd - triangleStart;
+                    if (triangleLen <= 0) return;
+                    BepuUtilities.Memory.Buffer<Triangle> buf;
+                    lock (pool)
+                    {
+                        pool.Take<Triangle>(triangleLen, out buf);
+                    }
+                    int pos = 0;
+                    for (int i=triangleStart; i<triangleEnd; i++)
+                    {
+                        int shiftedi = i * 3;
+                        buf[pos].A = ToBepu(positions[indicies[shiftedi]]);
+                        buf[pos].B = ToBepu(positions[indicies[shiftedi + 1]]);
+                        buf[pos].C = ToBepu(positions[indicies[shiftedi + 2]]);
+                        pos++;
+                    }
+                    scs[index] = new BepuStaticColliderComponent();
+                    ref var sc = ref scs[index];
+                    sc.PoolUsedForMesh = pool;
+                    sc.CanCollideWith = collidesWith;
+                    sc.CollisionGroup = group;
+                    sc.FrictionCoefficient = friction;
+                    sc.DisposeMeshOnDetach = disposeOnDetach;
+                    sc.MaximumRecoveryVelocity = maximumRecoverableVelocity;
+                    if (springSettings.HasValue) sc.SpringSettings = springSettings.Value;
+
+                    lock (sc.PoolUsedForMesh)
+                    {
+                        sc.ColliderShape = new Mesh(buf, scalev3, sc.PoolUsedForMesh);
+                    }
+                });
+
+                for (int i = 0; i < scs.Length; i++)
+                    if (scs[i] != null) e.Add(scs[i]);
+            }
+        }
+
+        /// <summary>
+        /// Helper function to convert from Focus Engine's Vector3 to Bepu Vector3
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static unsafe System.Numerics.Vector3 ToBepu(Xenko.Core.Mathematics.Vector3 v)
+        {
+            return *((System.Numerics.Vector3*)(void*)&v);
+        }
+
+        /// <summary>
+        /// Helper function to convert from Bepu Vector3 to Focus Engine's Vector3
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static unsafe Xenko.Core.Mathematics.Vector3 ToXenko(System.Numerics.Vector3 v)
+        {
+            return *((Xenko.Core.Mathematics.Vector3*)(void*)&v);
+        }
+
+        /// <summary>
+        /// Helper function to convert from Bepu Vector3 to Focus Engine's Quaternion
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static unsafe Xenko.Core.Mathematics.Quaternion ToXenko(System.Numerics.Quaternion q)
+        {
+            return *((Xenko.Core.Mathematics.Quaternion*)(void*)&q);
+        }
+
+        /// <summary>
+        /// Helper function to convert from Focus Engine's Vector3 to Bepu Quaternion
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static unsafe System.Numerics.Quaternion ToBepu(Xenko.Core.Mathematics.Quaternion q)
+        {
+            return *((System.Numerics.Quaternion*)(void*)&q);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuHitResult.cs b/sources/engine/Xenko.Physics/Bepu/BepuHitResult.cs
new file mode 100644
index 0000000000..0bde35c6a3
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuHitResult.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Runtime.InteropServices;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+
+namespace Xenko.Physics.Bepu
+{
+    /// <summary>
+    /// The result of a Physics Raycast or ShapeSweep operation
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    public struct BepuHitResult
+    {
+        public Vector3 Normal;
+
+        public Vector3 Point;
+
+        public float HitFraction;
+
+        public bool Succeeded;
+
+        /// <summary>
+        /// The Collider hit if Succeeded
+        /// </summary>
+        public BepuPhysicsComponent Collider;
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuManagedRaycast.cs b/sources/engine/Xenko.Physics/Bepu/BepuManagedRaycast.cs
new file mode 100644
index 0000000000..a7d5e08bdc
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuManagedRaycast.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+
+namespace Xenko.Physics.Bepu
+{
+    /// <summary>
+    /// Handles requesting a raycast to be performed at a good time. Result will be populated with the latest one, when its ready.
+    /// This is faster than doing an immediate Raycast and more reliable than a TryFastRaycast, but will likely delay results.
+    /// </summary>
+    public class BepuManagedRaycast
+    {
+        private class BepuRequest
+        {
+            public BepuHitResult res;
+            public Vector3 start, end;
+            public BepuPhysicsComponent skip;
+            public CollisionFilterGroupFlags hits;
+            public int ticks;
+            public object user_data;
+        }
+
+        private ConcurrentQueue<BepuRequest> internalRequests, internalResults;
+
+        private Action<float> internalRayAction;
+
+        /// <summary>
+        /// Pop out the oldest result from the requested queue
+        /// </summary>
+        /// <param name="ageMS">How old is this request in Environment.Ticks?</param>
+        /// <param name="user_data">Data that was part of the request</param>
+        /// <returns>null if there are no results</returns>
+        public bool PopResult(out BepuHitResult result, out int ageMS, out object user_data)
+        {
+            if (internalResults.TryDequeue(out var res) == false)
+            {
+                user_data = null;   
+                ageMS = int.MaxValue;
+                result = default;
+                return false;
+            }
+
+            ageMS = Environment.TickCount - res.ticks;
+            result = res.res;
+            user_data = res.user_data;
+            return true;
+        }
+
+        /// <summary>
+        /// Make a request and setting parameters at the same time. user_data stays with this request
+        /// </summary>
+        public void Request(object user_data, Vector3 start, Vector3 end, CollisionFilterGroupFlags hits = CollisionFilterGroupFlags.AllFilter, BepuPhysicsComponent skipComponent = null)
+        {
+            Request(new BepuRequest()
+            {
+                ticks = Environment.TickCount,
+                end = end,
+                start = start,
+                hits = hits,
+                skip = skipComponent,
+                user_data = user_data               
+            });
+        }
+
+        /// <summary>
+        /// Make a request and setting parameters at the same time. user_data stays with this request
+        /// </summary>
+        public void Request(object user_data, Vector3 start, Vector3 direction, float length, CollisionFilterGroupFlags hits = CollisionFilterGroupFlags.AllFilter, BepuPhysicsComponent skipComponent = null)
+        {
+            Request(new BepuRequest()
+            {
+                ticks = Environment.TickCount,
+                end = start + direction * length,
+                start = start,
+                hits = hits,
+                skip = skipComponent,
+                user_data = user_data
+            });
+        }
+
+        private void Request(BepuRequest br)
+        {
+            if (internalRayAction == null)
+            {
+                internalRayAction = (tpf) =>
+                {
+                    if (internalRequests.TryDequeue(out var req))
+                    {
+                        req.res = BepuSimulation.instance.Raycast(req.start, req.end, req.hits, req.skip);
+                        req.ticks = Environment.TickCount;
+                        internalResults.Enqueue(req);
+                    }
+                };
+            }
+
+            internalRequests.Enqueue(br);
+            BepuSimulation.instance.ActionsAfterSimulationStep.Enqueue(internalRayAction);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuPhysicsComponent.cs b/sources/engine/Xenko.Physics/Bepu/BepuPhysicsComponent.cs
new file mode 100644
index 0000000000..d2312dede2
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuPhysicsComponent.cs
@@ -0,0 +1,319 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using BepuPhysics;
+using BepuPhysics.Collidables;
+using BepuPhysics.Constraints;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Core.MicroThreading;
+using Xenko.Engine.Design;
+using Xenko.Extensions;
+using Xenko.Games;
+using Xenko.Graphics.GeometricPrimitives;
+using Xenko.Physics;
+using Xenko.Physics.Bepu;
+using Xenko.Physics.Engine;
+using Xenko.Rendering;
+using Xenko.Rendering.Materials;
+using Xenko.Rendering.Materials.ComputeColors;
+
+namespace Xenko.Engine
+{
+    [DataContract("BepuPhysicsComponent", Inherited = true)]
+    [Display("BepuPhysics", Expand = ExpandRule.Once)]
+    [AllowMultipleComponents]
+    [ComponentOrder(3100)]
+    public abstract class BepuPhysicsComponent : EntityComponent
+    {
+        protected static Logger logger = GlobalLogger.GetLogger("BepuPhysicsComponent");
+
+        private static int GlobalStoredShapeIndex;
+        private static ConcurrentDictionary<int, IShape> StoredShapes;
+
+        /// <summary>
+        /// Allow the physics system to automatically add, based on changes to the entity in the scene?
+        /// </summary>
+        [DataMember]
+        public bool AutomaticAdd { get; set; } = true;
+
+        [DataMemberIgnore]
+        public virtual bool AddedToScene { get; set; }
+
+        public virtual int HandleIndex { get => -1; }
+
+        // are we safe to make changes to bodies (e.g. not simulating)
+        internal static volatile bool safeRun;
+
+        public BepuPhysicsComponent()
+        {
+            BepuHelpers.AssureBepuSystemCreated();
+        }
+
+        /// <summary>
+        /// Gets or sets the collision group.
+        /// </summary>
+        /// <value>
+        /// The collision group.
+        /// </value>
+        /// <userdoc>
+        /// Which collision group the component belongs to. This can't be changed at runtime. The default is DefaultFilter. 
+        /// </userdoc>
+        /// <remarks>
+        /// The collider will still produce events, to allow non trigger rigidbodies or static colliders to act as a trigger if required for certain filtering groups.
+        /// </remarks>
+        [DataMember(30)]
+        [Display("Collision group")]
+        [DefaultValue(CollisionFilterGroups.DefaultFilter)]
+        public CollisionFilterGroups CollisionGroup { get; set; } = CollisionFilterGroups.DefaultFilter;
+
+        /// <summary>
+        /// Gets or sets the can collide with.
+        /// </summary>
+        /// <value>
+        /// The can collide with.
+        /// </value>
+        /// <userdoc>
+        /// Which collider groups this component collides with. With nothing selected, it collides with all groups. This can't be changed at runtime.
+        /// </userdoc>
+        /// /// <remarks>
+        /// The collider will still produce events, to allow non trigger rigidbodies or static colliders to act as a trigger if required for certain filtering groups.
+        /// </remarks>
+        [DataMember(40)]
+        [Display("Collides with...")]
+        [DefaultValue(CollisionFilterGroupFlags.AllFilter)]
+        public CollisionFilterGroupFlags CanCollideWith { get; set; } = CollisionFilterGroupFlags.AllFilter;
+
+        /// <summary>
+        /// Gets or sets the tag.
+        /// </summary>
+        /// <value>
+        /// The tag.
+        /// </value>
+        [DataMember]
+        public string Tag { get; set; }
+
+        /// <summary>
+        /// Store what index we are using for BepuHelpers.StoredShapes
+        /// </summary>
+        [DataMember]
+        public int StoredShapeIndex { get; internal set; } = -1;
+
+        /// <summary>
+        /// Object useful for storing more information regarding this physics body
+        /// </summary>
+        [DataMemberIgnore]
+        public object UserObject { get; set; }
+
+        [DataMember]
+        public float FrictionCoefficient = 0.5f;
+
+        [DataMember]
+        public float MaximumRecoveryVelocity = 2f;
+
+        [DataMember]
+        public SpringSettings SpringSettings = new SpringSettings(30f, 20f);
+
+        [DataMemberIgnore]
+        private IShape internalShape;
+
+        [DataMemberIgnore]
+        virtual public IShape ColliderShape
+        {
+            get
+            {
+                if (internalShape != null)
+                    return internalShape;
+
+                if (StoredShapeIndex >= 0 && StoredShapes.TryGetValue(StoredShapeIndex, out internalShape))
+                    return internalShape;
+
+                return null;
+            }
+            set
+            {
+                internalShape = value;
+            }
+        }
+
+        [DataMemberIgnore]
+        virtual public TypedIndex ShapeIndex { get; }
+
+        /// <summary>
+        /// Stores my current ColliderShape, so if I get cloned, I will use this shape again by default
+        /// </summary>
+        public void StoreMyShapeForCloning()
+        {
+            if (ColliderShape == null)
+                throw new Exception("This physics component has no ColliderShape to store!");
+
+            if (StoredShapes == null) StoredShapes = new ConcurrentDictionary<int, IShape>();
+            int myindex = Interlocked.Increment(ref GlobalStoredShapeIndex);
+            StoredShapes[myindex] = ColliderShape;
+            StoredShapeIndex = myindex;
+        }
+
+        /// <summary>
+        /// Removes the shared stored shape from storage
+        /// </summary>
+        public IShape RemoveStoredShape()
+        {
+            if (StoredShapeIndex == -1) return null;
+            int oldIndex = StoredShapeIndex;
+            StoredShapeIndex = -1;
+            StoredShapes.TryRemove(oldIndex, out var oldShape);
+            return oldShape;
+        }
+
+        /// <summary>
+        /// Computes the physics transformation from the TransformComponent values
+        /// </summary>
+        /// <returns></returns>
+        internal void DerivePhysicsTransform(ref Matrix fromMatrix, out Matrix outMatrix)
+        {
+            fromMatrix.Decompose(out Vector3 scale, out Matrix rotation, out Vector3 translation);
+            DerivePhysicsTransform(translation, rotation, scale, out outMatrix);
+        }
+
+        internal void DerivePhysicsTransform(Vector3? worldPosition, Matrix? worldRotation, Vector3? worldScale, out Matrix outMatrix)
+        {
+            Vector3 translation = worldPosition ?? Entity.Transform.WorldPosition(), scale;
+            Matrix rotation;
+
+            if( worldScale.HasValue ) {
+                scale = worldScale.Value;
+            } else {
+                Entity.Transform.WorldMatrix.GetScale(out scale);
+            }
+
+            if (worldRotation.HasValue) {
+                rotation = worldRotation.Value;
+            } else {
+                Entity.Transform.WorldMatrix.GetRotationMatrix(out rotation);
+            }
+
+            var translationMatrix = Matrix.Translation(translation);
+            Matrix.Multiply(ref rotation, ref translationMatrix, out outMatrix);
+        }
+
+        [DataMemberIgnore]
+        public virtual Vector3 Position { get; set; }
+
+        [DataMemberIgnore]
+        public virtual Quaternion Rotation { get; set; }
+
+        /// <summary>
+        /// transfer from one entity to another, preserving transform information
+        /// </summary>
+        internal override void PrepareForTransfer(Entity toEntity)
+        {
+            Position = Entity.Transform.WorldPosition(true) - toEntity.Transform.WorldPosition(true);
+            Core.Mathematics.Quaternion inverted = toEntity.Transform.WorldRotation();
+            inverted.Invert();
+            Rotation = Entity.Transform.WorldRotation() * inverted;
+        }
+
+        /// <summary>
+        /// Is this a "ghost"? Useful for triggers that detect collisions, but don't cause them
+        /// </summary>
+        [DataMember]
+        public bool GhostBody { get; set; }
+
+        /// <summary>
+        /// How much ahead-of-time to look for contacts? Defaults to 0.1
+        /// </summary>
+        [DataMember]
+        virtual public float SpeculativeMargin { get; set; } = 0.1f;
+
+        private static Material[] debugShapeMaterial;
+        private static Xenko.Rendering.Mesh cubeMesh;
+
+        /// <summary>
+        /// Helpful function to quickly generate a colored, visible bounding box over this physics component. This component must be attached to an Entity already if attaching as a child (default behavior).
+        /// </summary>
+        /// <returns>Child entity generated</returns>
+        public Entity GenerateDebugBoundingBox(bool attachAsChild = true)
+        {
+            System.Numerics.Vector3 min, max;
+            if (ColliderShape is IConvexShape ics)
+            {
+                ics.ComputeBounds(BepuHelpers.ToBepu(Quaternion.Identity), out min, out max);
+            }
+            else if (ColliderShape is BepuPhysics.Collidables.Mesh cm)
+            {
+                cm.ComputeBounds(BepuHelpers.ToBepu(Quaternion.Identity), out min, out max);
+            }
+            else return null;
+
+            Vector3 centerOffset = BepuHelpers.ToXenko(max + min) * 0.5f;
+
+            Game g = ServiceRegistry.instance.GetService<IGame>() as Game;
+
+            if (debugShapeMaterial == null)
+            {
+                debugShapeMaterial = new Material[3];
+
+                for (int i=0; i<debugShapeMaterial.Length; i++) {
+                    var materialDescription = new MaterialDescriptor
+                    {
+                        Attributes = {
+                            DiffuseModel = new MaterialDiffuseLambertModelFeature(),
+                            Diffuse = new MaterialDiffuseMapFeature(new ComputeColor { Key = MaterialKeys.DiffuseValue })
+                        }
+                    };
+
+                    debugShapeMaterial[i] = Material.New(g.GraphicsDevice, materialDescription);
+                }
+
+                debugShapeMaterial[0].Passes[0].Parameters.Set(MaterialKeys.DiffuseValue, Color.OrangeRed);
+                debugShapeMaterial[1].Passes[0].Parameters.Set(MaterialKeys.DiffuseValue, Color.Blue);
+                debugShapeMaterial[2].Passes[0].Parameters.Set(MaterialKeys.DiffuseValue, Color.Pink);
+
+                var meshDraw = GeometricPrimitive.Cube.New(g.GraphicsDevice, Vector3.One).ToMeshDraw();
+
+                cubeMesh = new Rendering.Mesh { Draw = meshDraw };
+            }
+
+            Entity e = new Entity((Entity?.Name ?? "unattached") + "-physicsBB");
+
+            Model m = new Model();
+
+            // pick material based on rigidbody type
+            if (this is BepuStaticColliderComponent)
+                m.Add(debugShapeMaterial[0]);
+            else if (this is BepuRigidbodyComponent brc)
+                m.Add(debugShapeMaterial[brc.RigidBodyType == RigidBodyTypes.Dynamic ? 1 : 2]);
+
+            m.Meshes.Add(cubeMesh);
+
+            ModelComponent mc = e.GetOrCreate<ModelComponent>();
+            mc.Model = m;
+
+            if (attachAsChild)
+            {
+                e.Transform.Scale = new Vector3(max.X - min.X, max.Y - min.Y, max.Z - min.Z) / Entity.Transform.WorldScale();
+                e.Transform.Position = centerOffset / Entity.Transform.WorldScale();
+                if (this is BepuRigidbodyComponent rb && rb.LocalPhysicsOffset.HasValue)
+                    e.Transform.Position -= rb.LocalPhysicsOffset.Value;
+                e.Transform.Parent = Entity.Transform;
+            }
+            else
+            {
+                e.Transform.Scale = new Vector3(max.X - min.X, max.Y - min.Y, max.Z - min.Z);
+                e.Transform.Position = Position + centerOffset;
+                e.Transform.Rotation = Rotation;
+            }
+
+            return e;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuRigidbodyComponent.cs b/sources/engine/Xenko.Physics/Bepu/BepuRigidbodyComponent.cs
new file mode 100644
index 0000000000..fb57effdf2
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuRigidbodyComponent.cs
@@ -0,0 +1,887 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Rendering;
+using BepuPhysics;
+using BepuUtilities;
+using Xenko.Engine;
+using Xenko.Physics;
+using BepuPhysics.Collidables;
+using BepuPhysics.Constraints;
+using System.Runtime.CompilerServices;
+using Xenko.Core.Threading;
+using System.Threading;
+using System.Collections.Concurrent;
+using BulletSharp.SoftBody;
+using System.Collections;
+
+namespace Xenko.Physics.Bepu
+{
+    [DataContract("BepuRigidbodyComponent")]
+    [Display("Bepu Rigidbody (No GameStudio integration)")]
+    public sealed class BepuRigidbodyComponent : BepuPhysicsComponent
+    {
+        /// <summary>
+        /// Description of the body to be created when added to the scene
+        /// </summary>
+        [DataMember]
+        public BodyDescription bodyDescription;
+
+        [DataMemberIgnore]
+        public BodyReference InternalBody;
+
+        public override int HandleIndex => InternalBody.Handle.Value;
+
+        /// <summary>
+        /// Action to be called after simulation, but before transforms are set to new positions. Arguments are this and simulation time.
+        /// </summary>
+        [DataMemberIgnore]
+        public Action<BepuRigidbodyComponent, float> ActionPerSimulationTick;
+
+        /// <summary>
+        /// Any actions to take with this rigidbody each tick, after it has been fully processed
+        /// </summary>
+        [DataMemberIgnore]
+        public List<Action<BepuRigidbodyComponent, float>> PostSimulationTickActions = new List<Action<BepuRigidbodyComponent, float>>();
+
+        [DataMemberIgnore]
+        internal ConcurrentQueue<Action<BepuRigidbodyComponent>> queuedActions = new ConcurrentQueue<Action<BepuRigidbodyComponent>>();
+
+        // default to true, since any new rigidbody added starts awake
+        internal bool wasAwake = true;
+
+        internal void SafeRun(Action<BepuRigidbodyComponent> a)
+        {
+            if (safeRun)
+                a(this);
+            else
+                queuedActions.Enqueue(a);
+        }
+
+        internal enum RB_ACTION
+        {
+            Awake,
+            Sleep,
+            CcdMotionThreshold,
+            SleepThreshold,
+            UpdateInertia,
+            SpeculativeMargin,
+            ColliderShape,
+            ApplyImpulse,
+            ApplyImpulseOffset,
+            ApplyTorqueImpulse,
+            AngularVelocity,
+            LinearVelocity
+        }
+
+        private static Action<BepuRigidbodyComponent>[] CachedDelegates;
+
+        private static void PrepareDelegates()
+        {
+            CachedDelegates = new Action<BepuRigidbodyComponent>[13];
+
+            CachedDelegates[(int)RB_ACTION.CcdMotionThreshold] = (rb) =>
+            {
+                rb.InternalBody.Collidable.Continuity = rb.bodyDescription.Collidable.Continuity;
+            };
+
+            CachedDelegates[(int)RB_ACTION.SleepThreshold] = (rb) =>
+            {
+                rb.InternalBody.Activity.SleepThreshold = rb.bodyDescription.Activity.SleepThreshold;
+            };
+
+            CachedDelegates[(int)RB_ACTION.UpdateInertia] = (rb) =>
+            {
+                rb.InternalBody.LocalInertia = rb.bodyDescription.LocalInertia;
+            };
+
+            CachedDelegates[(int)RB_ACTION.SpeculativeMargin] = (rb) =>
+            {
+                rb.InternalBody.Collidable.SpeculativeMargin = rb.bodyDescription.Collidable.SpeculativeMargin;
+            };
+
+            CachedDelegates[(int)RB_ACTION.ApplyImpulse] = (rb) =>
+            {
+                rb.IsActive = true;
+                lock (rb.impulsesToApply)
+                {
+                    while (rb.impulsesToApply.Count > 0)
+                        rb.InternalBody.ApplyLinearImpulse(BepuHelpers.ToBepu(rb.impulsesToApply.Dequeue()));
+
+                    // update changed velocity
+                    rb.bodyDescription.Velocity.Linear = rb.InternalBody.Velocity.Linear;
+                }
+            };
+
+            CachedDelegates[(int)RB_ACTION.ApplyImpulseOffset] = (rb) =>
+            {
+                rb.IsActive = true;
+                lock (rb.impulsesToApply)
+                {
+                    while (rb.impulsePairs.Count > 0)
+                    {
+                        Vector3[] pair = rb.impulsePairs.Dequeue();
+                        rb.InternalBody.ApplyImpulse(BepuHelpers.ToBepu(pair[0]), BepuHelpers.ToBepu(pair[1]));
+                    }
+
+                    // update changed velocities
+                    rb.bodyDescription.Velocity.Linear = rb.InternalBody.Velocity.Linear;
+                    rb.bodyDescription.Velocity.Angular = rb.InternalBody.Velocity.Angular;
+                }
+            };
+
+            CachedDelegates[(int)RB_ACTION.ApplyTorqueImpulse] = (rb) =>
+            {
+                rb.IsActive = true;
+                lock (rb.impulsesToApply)
+                {
+                    while (rb.torquesToApply.Count > 0)
+                        rb.InternalBody.ApplyAngularImpulse(BepuHelpers.ToBepu(rb.torquesToApply.Dequeue()));
+
+                    // update changed velocity
+                    rb.bodyDescription.Velocity.Angular = rb.InternalBody.Velocity.Angular;
+                }
+            };
+
+            CachedDelegates[(int)RB_ACTION.AngularVelocity] = rb =>
+            {
+                if (rb.bodyDescription.Velocity.Angular != System.Numerics.Vector3.Zero)
+                    rb.IsActive = true;
+
+                ref BodyVelocity v = ref rb.InternalBody.Velocity;
+
+                v.Angular.X = rb.bodyDescription.Velocity.Angular.X;
+                v.Angular.Y = rb.bodyDescription.Velocity.Angular.Y;
+                v.Angular.Z = rb.bodyDescription.Velocity.Angular.Z;
+            };
+
+            CachedDelegates[(int)RB_ACTION.LinearVelocity] = rb =>
+            {
+                if (rb.bodyDescription.Velocity.Linear != System.Numerics.Vector3.Zero)
+                    rb.IsActive = true;
+
+                ref BodyVelocity v = ref rb.InternalBody.Velocity;
+
+                v.Linear.X = rb.bodyDescription.Velocity.Linear.X;
+                v.Linear.Y = rb.bodyDescription.Velocity.Linear.Y;
+                v.Linear.Z = rb.bodyDescription.Velocity.Linear.Z;
+            };
+        }
+
+        internal void InternalColliderShapeReadd()
+        {
+            BepuSimulation bs = BepuSimulation.instance;
+
+            using (bs.simulationLocker.WriteLock())
+            {
+                // let's check handle again now that we are in the lock, just in case
+                if (InternalBody.Handle.Value == -1) return;
+
+                // remove me with the old shape
+                bs.internalSimulation.Bodies.Remove(InternalBody.Handle);
+                BepuSimulation.RigidMappings[InternalBody.Handle.Value] = null;
+
+                // add me with the new shape
+                bodyDescription.Collidable = ColliderShape.GenerateDescription(bs.internalSimulation, SpeculativeMargin);
+                InternalBody.Handle = bs.internalSimulation.Bodies.Add(bodyDescription);
+                BepuSimulation.AddBodyReference(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is active (awake).
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if this instance is active; otherwise, <c>false</c>.
+        /// </value>
+        [DataMemberIgnore]
+        public bool IsActive
+        {
+            get
+            {
+                return wasAwake;
+            }
+            set
+            {
+                if (wasAwake == value) return;
+
+                wasAwake = value;
+
+                if (AddedToScene)
+                {
+                    BepuSimulation.instance.CriticalActions.Enqueue(new BepuSimulation.RBCriticalAction()
+                    {
+                        Action = value ? RB_ACTION.Awake : RB_ACTION.Sleep,
+                        Body = this
+                    });
+                }
+            }
+        }
+
+        /// <summary>
+        /// Use continuous collision detection? Set greater than 0 to use, 0 or less to disable
+        /// </summary>
+        [DataMember(67)]
+        public float CcdMotionThreshold
+        {
+            get
+            {
+                return bodyDescription.Collidable.Continuity.SweepConvergenceThreshold;
+            }
+            set
+            {
+                if (bodyDescription.Collidable.Continuity.SweepConvergenceThreshold == value) return;
+
+                bodyDescription.Collidable.Continuity.SweepConvergenceThreshold = value;
+                bodyDescription.Collidable.Continuity.Mode = value > 0 ? ContinuousDetectionMode.Continuous : ContinuousDetectionMode.Discrete;
+                bodyDescription.Collidable.Continuity.MinimumSweepTimestep = value > 0 ? 1e-3f : 0f;
+
+                if (AddedToScene)
+                {
+                    SafeRun(CachedDelegates[(int)RB_ACTION.CcdMotionThreshold]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// If we are collecting collisions, how many to store before we stop storing them? Defaults to 32. Prevents crazy counts when objects are heavily overlapping.
+        /// </summary>
+        [DataMember]
+        public int CollectCollisionMaximumCount
+        {
+            get
+            {
+                return CurrentPhysicalContacts == null ? 0 : CurrentPhysicalContacts.Length;
+            }
+            set
+            {
+                if (value <= 0)
+                {
+                    _collectCollisions = false;
+                    CurrentPhysicalContacts = null;
+                    return;
+                }
+
+                if (CurrentPhysicalContacts == null || CurrentPhysicalContacts.Length != value)
+                    CurrentPhysicalContacts = new BepuContact[value];
+            }
+        }
+        
+        /// <summary>
+        /// Gets or sets if this element will store collisions in CurrentPhysicalContacts. Uses less CPU than ProcessCollisions
+        /// </summary>
+        /// <value>
+        /// true, false
+        /// </value>
+        /// <userdoc>
+        /// Stores contact points in a simple CurrentPhysicalContacts list, instead of new/update/ended events. Uses less CPU than ProcessCollisions and is multithreading supported
+        /// </userdoc>
+        [Display("Simple collision storage")]
+        [DataMemberIgnore]
+        public bool CollectCollisions
+        {
+            get
+            {
+                return _collectCollisions;
+            }
+            set
+            {
+                if (_collectCollisions == value) return;
+
+                if (value)
+                {
+                    if (CurrentPhysicalContacts == null)
+                        CurrentPhysicalContacts = new BepuContact[32];
+                }
+                else
+                {
+                    CurrentPhysicalContacts = null;
+                }
+
+                _collectCollisions = value;
+            }
+        }
+
+        [DataMemberIgnore]
+        private bool _collectCollisions = false;
+
+        internal void resetProcessingContactsList()
+        {
+            if (CurrentPhysicalContacts == null || AddedToScene == false || IsActive == false) return;
+
+            CurrentPhysicalContactsCount = Math.Min(CurrentPhysicalContacts.Length, processingPhysicalContactCount);
+            processingPhysicalContactCount = 0;
+        }
+
+        [DataMemberIgnore]
+        public BepuContact[] CurrentPhysicalContacts;
+
+        [DataMemberIgnore]
+        public int CurrentPhysicalContactsCount;
+
+        [DataMemberIgnore]
+        internal int processingPhysicalContactCount;
+
+        private static readonly BodyInertia KinematicInertia = new BodyInertia()
+        {
+            InverseMass = 0f,
+            InverseInertiaTensor = default
+        };
+
+        private RigidBodyTypes type = RigidBodyTypes.Dynamic;
+        private Vector3 gravity = Vector3.Zero;
+
+        private void setInternalBodyDefaults()
+        {
+            if (CachedDelegates == null)
+                PrepareDelegates();
+
+            bodyDescription.Pose.Orientation.W = 1f;
+            bodyDescription.LocalInertia.InverseMass = 1f;
+            bodyDescription.Activity.MinimumTimestepCountUnderThreshold = 32;
+            bodyDescription.Activity.SleepThreshold = 0.01f;
+            InternalBody.Bodies = BepuSimulation.instance?.internalSimulation?.Bodies;
+            InternalBody.Handle.Value = -1;
+        }
+
+        /// <summary>
+        /// Generates a rigid body component for an Entity. Has shortcuts for setting the collidershape and mass.
+        /// </summary>
+        /// <param name="collider_shape">Sets a collider shape. If null, one must be set later.</param>
+        /// <param name="mass">Sets mass IF collider_shape is not null.</param>
+        public BepuRigidbodyComponent(IShape collider_shape = null, float mass = 1f) : base()
+        {
+            setInternalBodyDefaults();
+            
+            if (collider_shape != null)
+            {
+                ColliderShape = collider_shape;
+                Mass = mass;
+            }
+        }
+
+        /// <summary>
+        /// Default constructor with no shortcut for making a collider shape. Make sure to add one later!
+        /// </summary>
+        public BepuRigidbodyComponent() : base()
+        {
+            setInternalBodyDefaults();
+        }
+
+        public override TypedIndex ShapeIndex { get => bodyDescription.Collidable.Shape; }
+
+        /// <summary>
+        /// How slow does this need to be to sleep? Set less than 0 to never sleep
+        /// </summary>
+        [DataMember]
+        public float SleepThreshold
+        {
+            get
+            {
+                return bodyDescription.Activity.SleepThreshold;
+            }
+            set
+            {
+                if (bodyDescription.Activity.SleepThreshold == value) return;
+
+                bodyDescription.Activity.SleepThreshold = value;
+
+                if (AddedToScene)
+                {
+                    SafeRun(CachedDelegates[(int)RB_ACTION.SleepThreshold]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Forcefully cap the velocity of this rigidbody to this magnitude. Can prevent weird issues without the need of continuous collision detection.
+        /// </summary>
+        [DataMember]
+        public float MaximumSpeed = 0f;
+
+        /// <summary>
+        /// Prevent this rigidbody from rotating or falling over?
+        /// </summary>
+        [DataMember]
+        public bool RotationLock
+        {
+            get
+            {
+                return _rotationLock;
+            }
+            set
+            {
+                if (_rotationLock == value) return;
+
+                _rotationLock = value;
+
+                UpdateInertia();
+            }
+        }
+
+        private bool _rotationLock = false;
+
+        /// <summary>
+        /// Gets or sets the mass of this Rigidbody
+        /// </summary>
+        /// <value>
+        /// true, false
+        /// </value>
+        /// <userdoc>
+        /// Objects with higher mass push objects with lower mass more when they collide. For large differences, use point values; for example, write 0.1 or 10, not 1 or 100000.
+        /// </userdoc>
+        [DataMember(80)]
+        [DataMemberRange(0, 6)]
+        public float Mass
+        {
+            get
+            {
+                return mass;
+            }
+            set
+            {
+                if (mass <= 0.00001f) mass = 0.00001f;
+
+                mass = value;
+
+                UpdateInertia();
+            }
+        }
+
+        private void UpdateInertia(bool skipset = false)
+        {
+            if (type == RigidBodyTypes.Kinematic)
+            {
+                bodyDescription.LocalInertia = KinematicInertia;
+            }
+            else if (ColliderShape is IConvexShape ics && !_rotationLock)
+            { 
+                ics.ComputeInertia(mass, out bodyDescription.LocalInertia);
+            }
+            else if (_rotationLock)
+            {
+                bodyDescription.LocalInertia.InverseMass = 1f / mass;
+                bodyDescription.LocalInertia.InverseInertiaTensor = default;
+            }
+            else if (ColliderShape is BepuPhysics.Collidables.Mesh m)
+            {
+                m.ComputeInertia(mass, out bodyDescription.LocalInertia);
+            }
+
+            if (skipset == false && AddedToScene)
+            {
+                SafeRun(CachedDelegates[(int)RB_ACTION.UpdateInertia]);
+            }
+        }
+
+        [DataMember]
+        public override float SpeculativeMargin
+        {
+            get => bodyDescription.Collidable.SpeculativeMargin;
+            set
+            {
+                if (bodyDescription.Collidable.SpeculativeMargin == value) return;
+
+                bodyDescription.Collidable.SpeculativeMargin = value;
+
+                if (AddedToScene)
+                {
+                    SafeRun(CachedDelegates[(int)RB_ACTION.SpeculativeMargin]);
+                }
+            }
+        }
+
+        [DataMemberIgnore]
+        public override IShape ColliderShape
+        {
+            get => base.ColliderShape;
+            set
+            {
+                if (value == null || value.Equals(ColliderShape)) return;
+
+                if (AddedToScene && ColliderShape != null)
+                {
+                    base.ColliderShape = value;
+
+                    UpdateInertia(true);
+
+                    BepuSimulation.instance.CriticalActions.Enqueue(new BepuSimulation.RBCriticalAction()
+                    {
+                        Action = RB_ACTION.ColliderShape,
+                        Body = this
+                    });
+                }
+                else
+                {
+                    base.ColliderShape = value;
+
+                    UpdateInertia();
+                }
+            }
+        }
+
+        private float mass = 1f;
+
+        /// <summary>
+        /// Gets or sets the linear damping of this rigidbody
+        /// </summary>
+        /// <value>
+        /// true, false
+        /// </value>
+        /// <userdoc>
+        /// The amount of damping for directional forces
+        /// </userdoc>
+        [DataMember(85)]
+        public float LinearDamping = 0f;
+
+        /// <summary>
+        /// Gets or sets the angular damping of this rigidbody
+        /// </summary>
+        /// <value>
+        /// true, false
+        /// </value>
+        /// <userdoc>
+        /// The amount of damping for rotational forces
+        /// </userdoc>
+        [DataMember(90)]
+        public float AngularDamping = 0f;
+
+        /// <summary>
+        /// Gets or sets if this Rigidbody overrides world gravity
+        /// </summary>
+        /// <value>
+        /// true, false
+        /// </value>
+        /// <userdoc>
+        /// Override gravity with the vector specified in Gravity
+        /// </userdoc>
+        [DataMember(95)]
+        public bool OverrideGravity;
+
+        /// <summary>
+        /// Gets or sets the gravity acceleration applied to this RigidBody
+        /// </summary>
+        /// <value>
+        /// A vector representing moment and direction
+        /// </value>
+        /// <userdoc>
+        /// The gravity acceleration applied to this rigidbody
+        /// </userdoc>
+        [DataMember(100)]
+        public Vector3 Gravity;
+
+        /// <summary>
+        /// Gets or sets the type.
+        /// </summary>
+        /// <value>
+        /// The type.
+        /// </value>
+        public RigidBodyTypes RigidBodyType
+        {
+            get
+            {
+                return type;
+            }
+            set
+            {
+                if (type == value) return;
+
+                type = value;
+
+                UpdateInertia();
+            }
+        }
+
+        /// <summary>
+        /// Set this to true to add this object to the physics simulation. Will automatically remove itself when the entity. is removed from the scene. Will NOT automatically add the rigidbody
+        /// to the scene when the entity is added, though.
+        /// </summary>
+        [DataMemberIgnore]
+        public override bool AddedToScene
+        {
+            get
+            {
+                return InternalBody.Handle.Value != -1; 
+            }
+            set
+            {
+                if (value)
+                {
+                    if (ColliderShape == null)
+                        throw new InvalidOperationException(Entity.Name + " has no ColliderShape, can't be added!");
+
+                    if (BepuHelpers.SanityCheckShape(ColliderShape) == false)
+                        throw new InvalidOperationException(Entity.Name + " has a broken ColliderShape! Check sizes and/or children count.");
+
+                    lock (BepuSimulation.instance.ToBeAdded)
+                    {
+                        BepuSimulation.instance.ToBeAdded.Add(this);
+                        BepuSimulation.instance.ToBeRemoved.Remove(this);
+                    }
+                }
+                else
+                {
+                    lock (BepuSimulation.instance.ToBeAdded)
+                    {
+                        BepuSimulation.instance.ToBeRemoved.Add(this);
+                        BepuSimulation.instance.ToBeAdded.Remove(this);
+                    }
+                }
+            }
+        }
+
+        private Queue<Vector3> impulsesToApply = new Queue<Vector3>();
+
+        /// <summary>
+        /// Applies the impulse.
+        /// </summary>
+        /// <param name="impulse">The impulse.</param>
+        public void ApplyImpulse(Vector3 impulse)
+        {
+            if (AddedToScene)
+            {
+                lock (impulsesToApply)
+                {
+                    impulsesToApply.Enqueue(impulse);
+                }
+
+                SafeRun(CachedDelegates[(int)RB_ACTION.ApplyImpulse]);
+            }
+        }
+
+        private Queue<Vector3[]> impulsePairs;
+
+        /// <summary>
+        /// Applies the impulse.
+        /// </summary>
+        /// <param name="impulse">The impulse.</param>
+        /// <param name="localOffset">The local offset.</param>
+        public void ApplyImpulse(Vector3 impulse, Vector3 localOffset)
+        {
+            if (AddedToScene)
+            {
+                if (impulsePairs == null)
+                    impulsePairs = new Queue<Vector3[]>();
+
+                lock (impulsesToApply)
+                {
+                    impulsePairs.Enqueue(new Vector3[] { impulse, localOffset });
+                }
+
+                SafeRun(CachedDelegates[(int)RB_ACTION.ApplyImpulseOffset]);
+            }
+        }
+
+        private Queue<Vector3> torquesToApply;
+
+        /// <summary>
+        /// Applies the torque impulse.
+        /// </summary>
+        /// <param name="torque">The torque.</param>
+        public void ApplyTorqueImpulse(Vector3 torque)
+        {
+            if (AddedToScene)
+            {
+                if (torquesToApply == null)
+                    torquesToApply = new Queue<Vector3>();
+
+                lock (impulsesToApply)
+                {
+                    torquesToApply.Enqueue(torque);
+                }
+
+                SafeRun(CachedDelegates[(int)RB_ACTION.ApplyTorqueImpulse]);
+            }
+        }
+
+        internal bool newPos = false, newRotation = false;
+
+        [DataMemberIgnore]
+        public override Vector3 Position
+        {
+            get
+            {
+                return BepuHelpers.ToXenko(bodyDescription.Pose.Position);
+            }
+            set
+            {
+                bodyDescription.Pose.Position.X = value.X;
+                bodyDescription.Pose.Position.Y = value.Y;
+                bodyDescription.Pose.Position.Z = value.Z;
+                newPos = true;
+            }
+        }
+
+        [DataMemberIgnore]
+        public override Xenko.Core.Mathematics.Quaternion Rotation
+        {
+            get
+            {
+                return BepuHelpers.ToXenko(bodyDescription.Pose.Orientation);
+            }
+            set
+            {
+                bodyDescription.Pose.Orientation.X = value.X;
+                bodyDescription.Pose.Orientation.Y = value.Y;
+                bodyDescription.Pose.Orientation.Z = value.Z;
+                bodyDescription.Pose.Orientation.W = value.W;
+                newRotation = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the angular velocity.
+        /// </summary>
+        /// <value>
+        /// The angular velocity.
+        /// </value>
+        [DataMemberIgnore]
+        public Vector3 AngularVelocity
+        {
+            get
+            {
+                return BepuHelpers.ToXenko(bodyDescription.Velocity.Angular);
+            }
+            set
+            {
+                if (bodyDescription.Velocity.Angular == BepuHelpers.ToBepu(value)) return;
+
+                lock (impulsesToApply)
+                {
+                    // since we are applying a velocity, get rid of previous impulses which would normally be overwritten
+                    torquesToApply?.Clear();
+
+                    bodyDescription.Velocity.Angular.X = value.X;
+                    bodyDescription.Velocity.Angular.Y = value.Y;
+                    bodyDescription.Velocity.Angular.Z = value.Z;
+                }
+
+                if (AddedToScene)
+                {
+                    SafeRun(CachedDelegates[(int)RB_ACTION.AngularVelocity]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the linear velocity.
+        /// </summary>
+        /// <value>
+        /// The linear velocity.
+        /// </value>
+        [DataMemberIgnore]
+        public Vector3 LinearVelocity
+        {
+            get
+            {
+                return BepuHelpers.ToXenko(bodyDescription.Velocity.Linear);
+            }
+            set
+            {
+                if (bodyDescription.Velocity.Linear == BepuHelpers.ToBepu(value)) return;
+
+                lock (impulsesToApply)
+                {
+                    // since we are applying a velocity, get rid of previous impulses which would normally be overwritten
+                    impulsesToApply.Clear();
+                    impulsePairs?.Clear();
+
+                    bodyDescription.Velocity.Linear.X = value.X;
+                    bodyDescription.Velocity.Linear.Y = value.Y;
+                    bodyDescription.Velocity.Linear.Z = value.Z;
+                }
+
+                if (AddedToScene)
+                {
+                    SafeRun(CachedDelegates[(int)RB_ACTION.LinearVelocity]);
+                }
+            }
+        }
+
+        /// <summary>
+        /// When updating the associated TransformComponent, should we not set rotation?
+        /// </summary>
+        [DataMember(69)]
+        public bool IgnorePhysicsRotation = false;
+
+        /// <summary>
+        /// When updating the associated TransformComponent, should we not set position?
+        /// </summary>
+        [DataMember(75)]
+        public bool IgnorePhysicsPosition = false;
+
+        /// <summary>
+        /// Automatically grab the pose from the attached entity every simulation step? Works best with Kinematic objects
+        /// </summary>
+        [DataMember(85)]
+        public bool GetPoseFromEntity = false;
+
+        [DataMemberIgnore]
+        public Vector3? LocalPhysicsOffset = null;
+
+        /// <summary>
+        /// If set non-zero, the attached entity will be slid up or down by this % of the body's Y size
+        /// </summary>
+        [DataMemberIgnore]
+        public float AttachEntityBottomSlider { get; set; } = 0f;
+
+        [DataMemberIgnore]
+        public Vector3 VelocityLinearChange { get; private set; }
+            
+        [DataMemberIgnore]
+        public Vector3 VelocityAngularChange { get; private set; }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void UpdateCachedPoseAndVelocity()
+        {
+            wasAwake = InternalBody.Awake;
+            if (GetPoseFromEntity)
+            {
+                InternalBody.Pose.Position = BepuHelpers.ToBepu(Entity.Transform.WorldPosition());
+                InternalBody.Pose.Orientation = BepuHelpers.ToBepu(Entity.Transform.WorldRotation());
+                if (!wasAwake) InternalBody.UpdateBounds();
+            }
+            else if (newPos || newRotation)
+            {
+                if (newPos) { newPos = false; InternalBody.Pose.Position = bodyDescription.Pose.Position; }
+                if (newRotation) { newRotation = false; InternalBody.Pose.Orientation = bodyDescription.Pose.Orientation; }
+                if (!wasAwake) InternalBody.UpdateBounds();
+            }
+            bodyDescription.Pose = InternalBody.Pose;
+            BodyVelocity bv = InternalBody.Velocity;
+            VelocityLinearChange = BepuHelpers.ToXenko(bv.Linear - bodyDescription.Velocity.Linear);
+            VelocityAngularChange = BepuHelpers.ToXenko(bv.Angular - bodyDescription.Velocity.Angular);
+            bodyDescription.Velocity = bv;
+        }
+
+        /// <summary>
+        /// Updades the graphics transformation from the given physics transformation
+        /// </summary>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal void UpdateTransformationComponent(Entity entity)
+        {
+            if (GetPoseFromEntity) return;
+            if (IgnorePhysicsPosition == false)
+            {
+                if (AttachEntityBottomSlider == 0f && LocalPhysicsOffset.HasValue == false)
+                    entity.Transform.Position = Position;
+                else
+                {
+                    Vector3 offset = LocalPhysicsOffset ?? Vector3.Zero;
+                    if (AttachEntityBottomSlider != 0f) offset.Y -= (Position.Y - InternalBody.BoundingBox.Min.Y) * AttachEntityBottomSlider;
+                    if (IgnorePhysicsRotation)
+                        entity.Transform.Position = Position + offset;
+                    else
+                        entity.Transform.Position = Position + offset * Rotation;
+                }
+            }
+            if (IgnorePhysicsRotation == false) entity.Transform.Rotation = Rotation;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuShapeTest.cs b/sources/engine/Xenko.Physics/Bepu/BepuShapeTest.cs
new file mode 100644
index 0000000000..8b6f6bf7bc
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuShapeTest.cs
@@ -0,0 +1,140 @@
+using BepuPhysics;
+using BepuPhysics.Collidables;
+using BepuPhysics.CollisionDetection;
+using BepuUtilities;
+using BepuUtilities.Collections;
+using BepuUtilities.Memory;
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+using System.Runtime.CompilerServices;
+using System.Text;
+using Xenko.Core.Threading;
+using Xenko.Engine;
+
+namespace Xenko.Physics.Bepu
+{
+    /// <summary>
+    /// Shows one way of handling collision queries that require contact-level test accuracy.
+    /// </summary>
+    public class BepuShapeTest
+    {
+        /// <summary>
+        /// Provides callbacks for filtering and data collection to the CollisionBatcher we'll be using to test query shapes against the detected environment.
+        /// </summary>
+        public struct BatcherCallbacks : ICollisionCallbacks
+        {
+            public List<BepuContact> contactList;
+
+            //These callbacks provide filtering and reporting for pairs being processed by the collision batcher.
+            //"Pair id" refers to the identifier given to the pair when it was added to the batcher.
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowCollisionTesting(int pairId, int childA, int childB)
+            {
+                //If you wanted to filter based on the children of an encountered nonconvex object, here would be the place to do it.
+                //The pairId could be used to look up the involved objects and any metadata necessary for filtering.
+                return true;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnChildPairCompleted(int pairId, int childA, int childB, ref ConvexContactManifold manifold)
+            {
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnPairCompleted<TManifold>(int pairId, ref TManifold manifold) where TManifold : unmanaged, IContactManifold<TManifold>
+            {
+                if (manifold.Count > 0)
+                {
+                    contactList.Add(new BepuContact()
+                    {
+                        Normal = BepuHelpers.ToXenko(manifold.SimpleGetNormal()),
+                        Offset = BepuHelpers.ToXenko(manifold.SimpleGetOffset())
+                    });
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called by the BroadPhase.GetOverlaps to collect all encountered collidables.
+        /// </summary>
+        struct BroadPhaseOverlapEnumerator : IBreakableForEach<CollidableReference>
+        {
+            public List<BepuPhysicsComponent> components;
+            public uint lookingFor;
+
+            public bool LoopBody(CollidableReference reference)
+            {
+                BepuPhysicsComponent bpc = BepuSimulation.getFromReference(reference);
+                if (((uint)bpc.CollisionGroup & lookingFor) != 0) components.Add(bpc);
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Adds a shape query to the collision batcher.
+        /// </summary>
+        /// <param name="queryShapeType">Type of the shape to test.</param>
+        /// <param name="queryShapeData">Shape data to test.</param>
+        /// <param name="queryShapeSize">Size of the shape data in bytes.</param>
+        /// <param name="queryBoundsMin">Minimum of the query shape's bounding box.</param>
+        /// <param name="queryBoundsMax">Maximum of the query shape's bounding box.</param>
+        /// <param name="queryPose">Pose of the query shape.</param>
+        /// <param name="queryId">Id to use to refer to this query when the collision batcher finishes processing it.</param>
+        /// <param name="batcher">Batcher to add the query's tests to.</param>
+        static private unsafe void RunQuery(int queryShapeType, void* queryShapeData, int queryShapeSize, in Vector3 queryBoundsMin,
+                                                  in Vector3 queryBoundsMax, Vector3 queryPos, System.Numerics.Quaternion queryRot,
+                                                  ref CollisionBatcher<BatcherCallbacks> batcher, CollisionFilterGroupFlags lookingFor)
+        {
+            var broadPhaseEnumerator = new BroadPhaseOverlapEnumerator { components = new List<BepuPhysicsComponent>(), lookingFor = (uint)lookingFor };
+            BepuSimulation.instance.internalSimulation.BroadPhase.GetOverlaps(queryBoundsMin, queryBoundsMax, ref broadPhaseEnumerator);
+            BepuUtilities.Memory.Buffer<byte>[] shapeMemories = new BepuUtilities.Memory.Buffer<byte>[broadPhaseEnumerator.components.Count];
+            for (int overlapIndex = 0; overlapIndex < broadPhaseEnumerator.components.Count; ++overlapIndex)
+            {
+                BepuPhysicsComponent bpc = broadPhaseEnumerator.components[overlapIndex];
+                if (bpc == null || bpc.ColliderShape == null) continue;
+                batcher.CacheShapeB(bpc.ColliderShape.TypeId, queryShapeType, queryShapeData, queryShapeSize, out var cachedQueryShapeData);
+                int size = bpc.ColliderShape.GetSize();
+                lock (batcher.Pool)
+                {
+                    batcher.Pool.Take<byte>(size, out shapeMemories[overlapIndex]);
+                }
+                bpc.ColliderShape.CopyData(shapeMemories[overlapIndex].Memory);
+                batcher.AddDirectly(bpc.ColliderShape.TypeId, queryShapeType,
+                                    shapeMemories[overlapIndex].Memory, cachedQueryShapeData,
+                                    queryPos - BepuHelpers.ToBepu(bpc.Position), queryRot, BepuHelpers.ToBepu(bpc.Rotation), 0, new PairContinuation(0));
+            }
+            // do it if we haven't already
+            batcher.Flush();
+            // free memory used
+            for (int i = 0; i < shapeMemories.Length; i++)
+                 if (shapeMemories[i].Allocated) batcher.Pool.Return<byte>(ref shapeMemories[i]);
+        }
+
+        /// <summary>
+        /// Adds a shape query to the collision batcher.
+        /// </summary>
+        /// <typeparam name="TShape">Type of the query shape.</typeparam>
+        /// <param name="shape">Shape to use in the query.</param>
+        /// <param name="pose">Pose of the query shape.</param>
+        /// <param name="queryId">Id to use to refer to this query when the collision batcher finishes processing it.</param>
+        /// <param name="batcher">Batcher to add the query's tests to.</param>
+        static public unsafe List<BepuContact> SingleQuery<TShape>(TShape shape, Xenko.Core.Mathematics.Vector3 position, Xenko.Core.Mathematics.Quaternion rotation, CollisionFilterGroupFlags lookingFor) where TShape : struct, IConvexShape
+        {
+            List<BepuContact> contacts = new List<BepuContact>();
+            var batcher = new CollisionBatcher<BatcherCallbacks>(BepuSimulation.safeBufferPool, BepuSimulation.instance.internalSimulation.Shapes,
+                                                                 BepuSimulation.instance.internalSimulation.NarrowPhase.CollisionTaskRegistry, 0f, new BatcherCallbacks() { contactList = contacts });
+            System.Numerics.Quaternion q = BepuHelpers.ToBepu(rotation);
+            Vector3 v = BepuHelpers.ToBepu(position);
+            shape.ComputeBounds(q, out var boundingBoxMin, out var boundingBoxMax);
+            boundingBoxMin += v;
+            boundingBoxMax += v;
+            using(BepuSimulation.instance.simulationLocker.ReadLock())
+            {
+                RunQuery(shape.TypeId, Unsafe.AsPointer(ref shape), shape.GetSize(), boundingBoxMin, boundingBoxMax, v, q, ref batcher, lookingFor);
+            }
+            return contacts;
+        }
+    }
+}
+
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuSimpleThreadDispatcher.cs b/sources/engine/Xenko.Physics/Bepu/BepuSimpleThreadDispatcher.cs
new file mode 100644
index 0000000000..7a0e16764d
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuSimpleThreadDispatcher.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading;
+using BepuUtilities;
+using BepuUtilities.Memory;
+
+namespace Xenko.Physics.Engine
+{
+    internal class BepuSimpleThreadDispatcher : IThreadDispatcher, IDisposable
+    {
+        public int ThreadCount => Xenko.Core.Threading.Dispatcher.MaxPhysicsParallelism;
+        private BepuUtilities.Memory.BufferPool[] buffers;
+
+        public BepuSimpleThreadDispatcher()
+        {
+            buffers = new BufferPool[ThreadCount];
+            for (int i=0; i<ThreadCount; i++)
+            {
+                buffers[i] = new BufferPool();
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public void DispatchWorkers(Action<int> workerBody)
+        {
+            Xenko.Core.Threading.Dispatcher.For(0, ThreadCount, workerBody);
+        }
+
+        public void Dispose()
+        {
+            for (int i = 0; i < buffers.Length; i++)
+            {
+                buffers[i].Clear();
+                buffers[i] = null;
+            }
+
+            buffers = null;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public BufferPool GetThreadMemoryPool(int workerIndex)
+        {
+            return buffers[workerIndex];
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuSimulation.cs b/sources/engine/Xenko.Physics/Bepu/BepuSimulation.cs
new file mode 100644
index 0000000000..ffa18bc012
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuSimulation.cs
@@ -0,0 +1,1000 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Runtime.ExceptionServices;
+using System.Security;
+using System.Threading;
+using BepuPhysics;
+using BepuPhysics.Collidables;
+using BepuPhysics.CollisionDetection;
+using BepuPhysics.Constraints;
+using BepuPhysics.Trees;
+using BepuUtilities;
+using BepuUtilities.Memory;
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
+using Xenko.Engine;
+using Xenko.Engine.Design;
+using Xenko.Games;
+using Xenko.Physics.Engine;
+using Xenko.Rendering;
+
+namespace Xenko.Physics.Bepu
+{
+    public class BepuSimulation : IDisposable
+    {
+        private const CollisionFilterGroups DefaultGroup = CollisionFilterGroups.DefaultFilter;
+        private const CollisionFilterGroupFlags DefaultFlags = CollisionFilterGroupFlags.AllFilter;
+
+        public BepuPhysics.Simulation internalSimulation;
+
+        internal HashSet<BepuPhysicsComponent> ToBeAdded = new HashSet<BepuPhysicsComponent>(), ToBeRemoved = new HashSet<BepuPhysicsComponent>();
+
+        public ReaderWriterLockSlim simulationLocker { get; private set; } = new ReaderWriterLockSlim();
+
+        public Action<float> AlwaysExecuteBeforeSimulationStep = null;
+        public ConcurrentQueue<Action<float>> ActionsBeforeSimulationStep = new ConcurrentQueue<Action<float>>();
+        public ConcurrentQueue<Action<float>> ActionsAfterSimulationStep = new ConcurrentQueue<Action<float>>();
+        internal ConcurrentQueue<RBCriticalAction> CriticalActions = new ConcurrentQueue<RBCriticalAction>();
+
+        internal struct RBCriticalAction
+        {
+            public BepuRigidbodyComponent.RB_ACTION Action;
+            public BepuRigidbodyComponent Body;
+        }
+
+        public static float TimeScale = 1f;
+        public static int MaxSubSteps = 1;
+
+        private static BepuSimulation _instance;
+        public static BepuSimulation instance
+        {
+            get
+            {
+                if (_instance == null) BepuHelpers.AssureBepuSystemCreated();
+                return _instance;
+            }
+            private set
+            {
+                _instance = value;
+            }
+        }
+
+        [ThreadStatic]
+        private static BufferPool threadStaticPool;
+
+        /// <summary>
+        /// Gets a thread-safe buffer pool
+        /// </summary>
+        public static BufferPool safeBufferPool
+        {
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            get
+            {
+                if (threadStaticPool == null)
+                {
+                    threadStaticPool = new BufferPool();
+                    allBufferPools.Enqueue(threadStaticPool);
+                }
+                return threadStaticPool;
+            }
+        }
+
+        private PoseIntegratorCallbacks poseCallbacks;
+
+        private static ConcurrentQueue<BufferPool> allBufferPools = new ConcurrentQueue<BufferPool>();
+
+        internal int clearRequested;
+        private BepuSimpleThreadDispatcher threadDispatcher = new BepuSimpleThreadDispatcher();
+
+#if DEBUG
+        private static readonly Logger Log = GlobalLogger.GetLogger(typeof(Simulation).FullName);
+#endif
+
+        /// <summary>
+        /// Totally disable the simulation if set to true. This points to the same Simulation.DisableSimulation boolean
+        /// </summary>
+        public static bool DisableSimulation
+        {
+            get => Simulation.DisableSimulation;
+            set
+            {
+                Simulation.DisableSimulation = value;
+            }
+        }
+
+        internal static BepuStaticColliderComponent[] StaticMappings = new BepuStaticColliderComponent[64];
+        internal static BepuRigidbodyComponent[] RigidMappings = new BepuRigidbodyComponent[64];
+
+        internal List<BepuRigidbodyComponent> AllRigidbodies = new List<BepuRigidbodyComponent>();
+
+        /// <summary>
+        /// Clears out the whole simulation of bodies, optionally clears all related buffers (like meshes) too
+        /// </summary>
+        /// <param name="clearBuffers">Clear out all buffers, like mesh shapes? Defaults to true</param>
+        /// <param name="forceRightNow">Clear everything right now. Might cause crashes if simulation is happening at the same time!</param>
+        public void Clear(bool clearBuffers = true, bool forceRightNow = false)
+        {
+            if (forceRightNow)
+            {
+                clearRequested = 0;
+
+                using (simulationLocker.WriteLock())
+                {
+                    internalSimulation.Clear();
+
+                    if (clearBuffers)
+                    {
+                        while(allBufferPools.TryDequeue(out var pool))
+                            pool.Clear();
+                    }
+
+                    for (int i = 0; i < RigidMappings.Length; i++)
+                        RigidMappings[i] = null;
+                    for (int i = 0; i < StaticMappings.Length; i++)
+                        StaticMappings[i] = null;
+
+                    AllRigidbodies.Clear();
+                }
+
+                return;
+            }
+
+            clearRequested = clearBuffers ? 2 : 1;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static BepuRigidbodyComponent getRigidFromIndex(int index)
+        {
+            return RigidMappings[instance.internalSimulation.Bodies.ActiveSet.IndexToHandle[index].Value];
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static BepuPhysicsComponent getFromHandle(int handle, CollidableMobility mobility)
+        {
+            return mobility == CollidableMobility.Static ? (BepuPhysicsComponent)StaticMappings[handle] : (BepuPhysicsComponent)RigidMappings[handle];
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static BepuPhysicsComponent getFromReference(CollidableReference cref)
+        {
+            return cref.Mobility == CollidableMobility.Static ? (BepuPhysicsComponent)StaticMappings[cref.StaticHandle.Value] : (BepuPhysicsComponent)RigidMappings[cref.BodyHandle.Value];
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool CanCollide(int source, CollidableMobility sourcemob, int target, CollidableMobility targetmob)
+        {
+            return ((uint)getFromHandle(source, sourcemob).CollisionGroup & (uint)getFromHandle(target, targetmob).CanCollideWith) != 0;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static bool CanCollide(CollidableReference a, CollidableReference b)
+        {
+            return ((uint)getFromReference(a).CollisionGroup & (uint)getFromReference(b).CanCollideWith) != 0;
+        }
+
+        unsafe struct NarrowPhaseCallbacks : INarrowPhaseCallbacks
+        {
+            /// <summary>
+            /// Performs any required initialization logic after the Simulation instance has been constructed.
+            /// </summary>
+            /// <param name="simulation">Simulation that owns these callbacks.</param>
+            public void Initialize(BepuPhysics.Simulation simulation)
+            {
+                //Often, the callbacks type is created before the simulation instance is fully constructed, so the simulation will call this function when it's ready.
+                //Any logic which depends on the simulation existing can be put here.
+            }
+
+            /// <summary>
+            /// Chooses whether to allow contact generation to proceed for two overlapping collidables.
+            /// </summary>
+            /// <param name="workerIndex">Index of the worker that identified the overlap.</param>
+            /// <param name="a">Reference to the first collidable in the pair.</param>
+            /// <param name="b">Reference to the second collidable in the pair.</param>
+            /// <returns>True if collision detection should proceed, false otherwise.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowContactGeneration(int workerIndex, CollidableReference a, CollidableReference b)
+            {
+                //Before creating a narrow phase pair, the broad phase asks this callback whether to bother with a given pair of objects.
+                //This can be used to implement arbitrary forms of collision filtering. See the RagdollDemo or NewtDemo for examples.
+                //Here, we'll make sure at least one of the two bodies is dynamic.
+                //The engine won't generate static-static pairs, but it will generate kinematic-kinematic pairs.
+                //That's useful if you're trying to make some sort of sensor/trigger object, but since kinematic-kinematic pairs
+                //can't generate constraints (both bodies have infinite inertia), simple simulations can just ignore such pairs.
+                return (a.Mobility == CollidableMobility.Dynamic || b.Mobility == CollidableMobility.Dynamic) && CanCollide(a, b);
+            }
+
+            /// <summary>
+            /// Chooses whether to allow contact generation to proceed for the children of two overlapping collidables in a compound-including pair.
+            /// </summary>
+            /// <param name="pair">Parent pair of the two child collidables.</param>
+            /// <param name="childIndexA">Index of the child of collidable A in the pair. If collidable A is not compound, then this is always 0.</param>
+            /// <param name="childIndexB">Index of the child of collidable B in the pair. If collidable B is not compound, then this is always 0.</param>
+            /// <returns>True if collision detection should proceed, false otherwise.</returns>
+            /// <remarks>This is called for each sub-overlap in a collidable pair involving compound collidables. If neither collidable in a pair is compound, this will not be called.
+            /// For compound-including pairs, if the earlier call to AllowContactGeneration returns false for owning pair, this will not be called. Note that it is possible
+            /// for this function to be called twice for the same subpair if the pair has continuous collision detection enabled; 
+            /// the CCD sweep test that runs before the contact generation test also asks before performing child pair tests.</remarks>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowContactGeneration(int workerIndex, CollidablePair pair, int childIndexA, int childIndexB)
+            {
+                //This is similar to the top level broad phase callback above. It's called by the narrow phase before generating
+                //subpairs between children in parent shapes. 
+                //This only gets called in pairs that involve at least one shape type that can contain multiple children, like a Compound.
+                return CanCollide(pair.A, pair.B);
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void RecordContact<TManifold>(BepuPhysicsComponent A, BepuPhysicsComponent B, ref TManifold manifold) where TManifold : struct, IContactManifold<TManifold>
+            {
+                // sanity checking
+                if (A == null || B == null || manifold.Count == 0) return;
+
+                BepuRigidbodyComponent ar = (A as BepuRigidbodyComponent);
+                BepuRigidbodyComponent br = (B as BepuRigidbodyComponent);
+                // do we want to store this collision?
+                if ((ar?.CollectCollisions ?? false))
+                {
+                    int index = Interlocked.Increment(ref ar.processingPhysicalContactCount) - 1;
+                    if (index < ar.CurrentPhysicalContacts.Length)
+                    {
+                        ar.CurrentPhysicalContacts[index].A = A;
+                        ar.CurrentPhysicalContacts[index].B = B;
+                        ar.CurrentPhysicalContacts[index].Normal = BepuHelpers.ToXenko(manifold.SimpleGetNormal());
+                        ar.CurrentPhysicalContacts[index].Offset = BepuHelpers.ToXenko(manifold.SimpleGetOffset());
+                    }
+                }
+                if ((br?.CollectCollisions ?? false))
+                {
+                    int index = Interlocked.Increment(ref br.processingPhysicalContactCount) - 1;
+                    if (index < br.CurrentPhysicalContacts.Length)
+                    {
+                        br.CurrentPhysicalContacts[index].A = B;
+                        br.CurrentPhysicalContacts[index].B = A;
+                        br.CurrentPhysicalContacts[index].Normal = -BepuHelpers.ToXenko(manifold.SimpleGetNormal());
+                        br.CurrentPhysicalContacts[index].Offset = B.Position - (A.Position + BepuHelpers.ToXenko(manifold.SimpleGetOffset()));
+                    }
+                }
+            }
+
+            /// <summary>
+            /// Provides a notification that a manifold has been created between the children of two collidables in a compound-including pair.
+            /// Offers an opportunity to change the manifold's details. 
+            /// </summary>
+            /// <param name="workerIndex">Index of the worker thread that created this manifold.</param>
+            /// <param name="pair">Pair of collidables that the manifold was detected between.</param>
+            /// <param name="childIndexA">Index of the child of collidable A in the pair. If collidable A is not compound, then this is always 0.</param>
+            /// <param name="childIndexB">Index of the child of collidable B in the pair. If collidable B is not compound, then this is always 0.</param>
+            /// <param name="manifold">Set of contacts detected between the collidables.</param>
+            /// <returns>True if this manifold should be considered for constraint generation, false otherwise.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool ConfigureContactManifold(int workerIndex, CollidablePair pair, int childIndexA, int childIndexB, ref ConvexContactManifold manifold)
+            {
+                BepuPhysicsComponent A = getFromReference(pair.A);
+                BepuPhysicsComponent B = getFromReference(pair.B);
+                if (((uint)A.CanCollideWith & (uint)B.CollisionGroup) != 0)
+                {
+                    RecordContact(A, B, ref manifold);
+                    return !A.GhostBody && !B.GhostBody;
+                }
+                return false;
+            }
+
+            /// <summary>
+            /// Releases any resources held by the callbacks. Called by the owning narrow phase when it is being disposed.
+            /// </summary>
+            public void Dispose()
+            {
+            }
+
+            /// <summary>
+            /// Provides a notification that a manifold has been created for a pair. Offers an opportunity to change the manifold's details. 
+            /// </summary>
+            /// <param name="workerIndex">Index of the worker thread that created this manifold.</param>
+            /// <param name="pair">Pair of collidables that the manifold was detected between.</param>
+            /// <param name="manifold">Set of contacts detected between the collidables.</param>
+            /// <param name="pairMaterial">Material properties of the manifold.</param>
+            /// <returns>True if a constraint should be created for the manifold, false otherwise.</returns>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool ConfigureContactManifold<TManifold>(int workerIndex, CollidablePair pair, ref TManifold manifold, out PairMaterialProperties pairMaterial) where TManifold : unmanaged, IContactManifold<TManifold>
+            {
+                BepuPhysicsComponent a = getFromReference(pair.A);
+                BepuPhysicsComponent b = getFromReference(pair.B);
+                pairMaterial.FrictionCoefficient = a.FrictionCoefficient * b.FrictionCoefficient;
+                pairMaterial.MaximumRecoveryVelocity = (a.MaximumRecoveryVelocity + b.MaximumRecoveryVelocity) * 0.5f;
+                pairMaterial.SpringSettings.AngularFrequency = (a.SpringSettings.AngularFrequency + b.SpringSettings.AngularFrequency) * 0.5f;
+                pairMaterial.SpringSettings.TwiceDampingRatio = (a.SpringSettings.TwiceDampingRatio + b.SpringSettings.TwiceDampingRatio) * 0.5f;
+                if (((uint)a.CanCollideWith & (uint)b.CollisionGroup) != 0)
+                {
+                    RecordContact(a, b, ref manifold);
+                    return !a.GhostBody && !b.GhostBody;
+                }
+                return false;
+            }
+        }
+
+        //Note that the engine does not require any particular form of gravity- it, like all the contact callbacks, is managed by a callback.
+        private struct PoseIntegratorCallbacks : IPoseIntegratorCallbacks
+        {
+            System.Numerics.Vector3 gravityDt;
+            float indt;
+
+            /// <summary>
+            /// Gets how the pose integrator should handle angular velocity integration.
+            /// </summary>
+            public AngularIntegrationMode AngularIntegrationMode => AngularIntegrationMode.Nonconserving; //Don't care about fidelity in this demo!
+
+            /// <summary>
+            /// Called prior to integrating the simulation's active bodies. When used with a substepping timestepper, this could be called multiple times per frame with different time step values.
+            /// </summary>
+            /// <param name="dt">Current time step duration.</param>
+            public void PrepareForIntegration(float dt)
+            {
+                //No reason to recalculate gravity * dt for every body; just cache it ahead of time.
+                gravityDt = instance._gravity * dt;
+                indt = dt;
+            }
+
+            /// <summary>
+            /// Callback called for each active body within the simulation during body integration.
+            /// </summary>
+            /// <param name="bodyIndex">Index of the body being visited.</param>
+            /// <param name="pose">Body's current pose.</param>
+            /// <param name="localInertia">Body's current local inertia.</param>
+            /// <param name="workerIndex">Index of the worker thread processing this body.</param>
+            /// <param name="velocity">Reference to the body's current velocity to integrate.</param>
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void IntegrateVelocity(int bodyIndex, in RigidPose pose, in BodyInertia localInertia, int workerIndex, ref BodyVelocity velocity)
+            {
+                //Note that we avoid accelerating kinematics. Kinematics are any body with an inverse mass of zero (so a mass of ~infinity). No force can move them.
+                if (localInertia.InverseMass > 0f)
+                {
+                    BepuRigidbodyComponent rb = BepuSimulation.getRigidFromIndex(bodyIndex) as BepuRigidbodyComponent;
+
+                    velocity.Linear += rb.OverrideGravity ? BepuHelpers.ToBepu(rb.Gravity) * indt : gravityDt;
+
+                    // damping?
+                    if (rb.LinearDamping > 0f)
+                        velocity.Linear -= velocity.Linear * indt * rb.LinearDamping;
+
+                    if (rb.AngularDamping > 0f)
+                        velocity.Angular -= velocity.Angular * indt * rb.AngularDamping;
+
+                    // velocity cap?
+                    if (rb.MaximumSpeed > 0f)
+                    {
+                        float sqrmag = velocity.Linear.LengthSquared();
+                        if (sqrmag > rb.MaximumSpeed * rb.MaximumSpeed)
+                            velocity.Linear *= rb.MaximumSpeed / (float)Math.Sqrt(sqrmag);
+                    }
+                }
+            }
+
+            public void Initialize(BepuPhysics.Simulation simulation) { }
+        }
+
+        /// <summary>
+        /// Initializes the Physics engine using the specified flags.
+        /// </summary>
+        /// <param name="processor"></param>
+        /// <param name="configuration"></param>
+        /// <exception cref="System.NotImplementedException">SoftBody processing is not yet available</exception>
+        internal BepuSimulation(int iterations)
+        {
+            Game GameService = ServiceRegistry.instance.GetService<IGame>() as Game;
+            GameService.SceneSystem.SceneInstance.EntityAdded += EntityAdded;
+            GameService.SceneSystem.SceneInstance.EntityRemoved += EntityRemoved;
+            GameService.SceneSystem.SceneInstance.ComponentChanged += ComponentChanged;
+
+            poseCallbacks = new PoseIntegratorCallbacks();
+
+            // we will give the simulation its own bufferpool
+            internalSimulation = BepuPhysics.Simulation.Create(new BufferPool(), new NarrowPhaseCallbacks(), poseCallbacks, new BepuPhysics.PositionLastTimestepper(), iterations);
+            instance = this;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void EntityAdded(object sender, Entity e)
+        {
+            foreach (BepuPhysicsComponent bpc in e.GetAll<BepuPhysicsComponent>())
+                if (bpc.AutomaticAdd && bpc.ColliderShape != null) bpc.AddedToScene = true;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void EntityRemoved(object sender, Entity e)
+        {
+            foreach (BepuPhysicsComponent bpc in e.GetAll<BepuPhysicsComponent>())
+                bpc.AddedToScene = false;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ComponentChanged(object sender, EntityComponentEventArgs e)
+        {
+            if (e.PreviousComponent is BepuPhysicsComponent rem) rem.AddedToScene = false;
+            if (e.NewComponent is BepuPhysicsComponent add && add.AutomaticAdd && add.ColliderShape != null) add.AddedToScene = true;
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Clear(true, true);
+        }
+
+        public RenderGroup ColliderShapesRenderGroup { get; set; } = RenderGroup.Group0;
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static void AddBodyReference(BepuStaticColliderComponent component)
+        {
+            if (component.HandleIndex >= StaticMappings.Length)
+                Array.Resize(ref StaticMappings, StaticMappings.Length * 2);
+
+            StaticMappings[component.HandleIndex] = component;
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        internal static void AddBodyReference(BepuRigidbodyComponent component)
+        {
+            if (component.HandleIndex >= RigidMappings.Length)
+                Array.Resize(ref RigidMappings, RigidMappings.Length * 2);
+
+            RigidMappings[component.HandleIndex] = component;
+        }
+
+        internal void ProcessAdds()
+        {
+            foreach (BepuPhysicsComponent component in ToBeAdded)
+            {
+                if (component.HandleIndex > -1) continue; // already added
+                if (component is BepuStaticColliderComponent scc)
+                {
+                    // static stuff needs positions set first
+                    scc.preparePose();
+                    using (simulationLocker.WriteLock())
+                    {
+                        scc.staticDescription.Collidable = scc.ColliderShape.GenerateDescription(internalSimulation, scc.SpeculativeMargin);
+                        scc.myStaticHandle = internalSimulation.Statics.Add(scc.staticDescription);
+                        AddBodyReference(scc);
+                    }
+                }
+                else if (component is BepuRigidbodyComponent rigidBody)
+                {
+                    if (!rigidBody.IgnorePhysicsPosition)
+                    {
+                        if (!rigidBody.newPos) rigidBody.bodyDescription.Pose.Position = BepuHelpers.ToBepu(component.Entity.Transform.WorldPosition());
+                        if (rigidBody.LocalPhysicsOffset.HasValue) rigidBody.bodyDescription.Pose.Position -= BepuHelpers.ToBepu(rigidBody.LocalPhysicsOffset.Value);
+                    }
+                    if (!rigidBody.RotationLock && !rigidBody.IgnorePhysicsRotation && !rigidBody.newRotation) rigidBody.bodyDescription.Pose.Orientation = BepuHelpers.ToBepu(component.Entity.Transform.WorldRotation());
+                    using (simulationLocker.WriteLock())
+                    {
+                        rigidBody.bodyDescription.Collidable = rigidBody.ColliderShape.GenerateDescription(internalSimulation, rigidBody.SpeculativeMargin);
+                        AllRigidbodies.Add(rigidBody);
+                        rigidBody.InternalBody.Handle = internalSimulation.Bodies.Add(rigidBody.bodyDescription);
+                        AddBodyReference(rigidBody);
+                        // are we starting inactive?
+                        if (rigidBody.wasAwake == false) rigidBody.InternalBody.Awake = false;
+                    }
+                }
+            }
+            ToBeAdded.Clear();
+        }
+
+        internal void ProcessRemovals()
+        {
+            foreach (BepuPhysicsComponent component in ToBeRemoved)
+            {
+                if (component.HandleIndex == -1) continue; // already removed
+                if (component is BepuStaticColliderComponent scc)
+                {
+                    StaticHandle sh = scc.myStaticHandle;
+                    using(simulationLocker.WriteLock())
+                    {
+                        scc.myStaticHandle.Value = -1;
+                        internalSimulation.Statics.Remove(sh);
+                        StaticMappings[sh.Value] = null;
+                    }
+                    if (scc.DisposeMeshOnDetach) scc.DisposeMesh();
+                } 
+                else if (component is BepuRigidbodyComponent rigidBody)
+                {
+                    BodyHandle bh = rigidBody.InternalBody.Handle;
+                    using(simulationLocker.WriteLock())
+                    {
+                        rigidBody.InternalBody.Handle.Value = -1;
+                        internalSimulation.Bodies.Remove(bh);
+                        RigidMappings[bh.Value] = null;
+                        AllRigidbodies.Remove(rigidBody);
+                    }
+                    rigidBody.wasAwake = true; // don't remember whether we were asleep or not, go to default
+                    rigidBody.processingPhysicalContactCount = 0;
+                    rigidBody.CurrentPhysicalContactsCount = 0;
+                }
+            }
+            ToBeRemoved.Clear();
+        }
+
+        struct RayHitClosestHandler : IRayHitHandler
+        {
+            public CollisionFilterGroupFlags findGroups;
+            public float furthestHitSoFar, startLength;
+            public BepuHitResult HitCollidable;
+            public BepuPhysicsComponent skipComponent;
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)findGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable, int childIndex)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)findGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnRayHit(in RayData ray, ref float maximumT, float t, in System.Numerics.Vector3 normal, CollidableReference collidable, int childIndex)
+            {
+                if (t < furthestHitSoFar)
+                {
+                    var component = getFromReference(collidable);
+                    if (component == skipComponent) return;
+
+                    //Cache the earliest impact.
+                    furthestHitSoFar = t;
+                    HitCollidable.HitFraction = t / startLength;
+                    HitCollidable.Normal.X = normal.X;
+                    HitCollidable.Normal.Y = normal.Y;
+                    HitCollidable.Normal.Z = normal.Z;
+                    HitCollidable.Point.X = ray.Origin.X + ray.Direction.X * t;
+                    HitCollidable.Point.Y = ray.Origin.Y + ray.Direction.Y * t;
+                    HitCollidable.Point.Z = ray.Origin.Z + ray.Direction.Z * t;
+                    HitCollidable.Collider = component;
+                    HitCollidable.Succeeded = true;
+                }
+
+                //We are only interested in the earliest hit. This callback is executing within the traversal, so modifying maximumT informs the traversal
+                //that it can skip any AABBs which are more distant than the new maximumT.
+                if (t < maximumT)
+                    maximumT = t;
+            }
+        }
+
+        struct RayHitAllHandler : IRayHitHandler
+        {
+            public CollisionFilterGroupFlags hitGroups;
+            public float startLength;
+            public List<BepuHitResult> HitCollidables;
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)hitGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable, int childIndex)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)hitGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnRayHit(in RayData ray, ref float maximumT, float t, in System.Numerics.Vector3 normal, CollidableReference collidable, int childIndex)
+            {
+                BepuHitResult HitCollidable = new BepuHitResult();
+                HitCollidable.HitFraction = t / startLength;
+                HitCollidable.Normal.X = normal.X;
+                HitCollidable.Normal.Y = normal.Y;
+                HitCollidable.Normal.Z = normal.Z;
+                HitCollidable.Point.X = ray.Origin.X + ray.Direction.X * t;
+                HitCollidable.Point.Y = ray.Origin.Y + ray.Direction.Y * t;
+                HitCollidable.Point.Z = ray.Origin.Z + ray.Direction.Z * t;
+                HitCollidable.Collider = getFromReference(collidable);
+                HitCollidable.Succeeded = true;
+                HitCollidables.Add(HitCollidable);
+            }
+        }
+
+        /// <summary>
+        /// Raycasts and returns the closest hit
+        /// </summary>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="hitGroups">The collision group that this raycast can collide with</param>
+        /// <returns>The list with hit results.</returns>
+        public BepuHitResult Raycast(Vector3 from, Vector3 to, CollisionFilterGroupFlags hitGroups = DefaultFlags, BepuPhysicsComponent skipComponent = null)
+        {
+            Vector3 diff = to - from;
+            float length = diff.Length();
+            float inv = 1.0f / length;
+            diff.X *= inv;
+            diff.Y *= inv;
+            diff.Z *= inv;
+            return Raycast(from, diff, length, hitGroups, skipComponent);
+        }
+
+        /// <summary>
+        /// Raycasts and returns the closest hit, if possible without locking the broadphase
+        /// </summary>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="hitGroups">The collision group that this raycast can collide with</param>
+        /// <returns>true if result was successfully updated, false otherwise</returns>
+        public bool TryFastRaycast(out BepuHitResult result, Vector3 from, Vector3 to, CollisionFilterGroupFlags hitGroups = DefaultFlags, BepuPhysicsComponent skipComponent = null)
+        {
+            Vector3 diff = to - from;
+            float length = diff.Length();
+            float inv = 1.0f / length;
+            diff.X *= inv;
+            diff.Y *= inv;
+            diff.Z *= inv;
+            return TryFastRaycast(out result, from, diff, length, hitGroups, skipComponent);
+        }
+
+        /// <summary>
+        /// Raycasts and returns the closest hit
+        /// </summary>
+        /// <param name="from">From.</param>
+        /// <param name="direction">normalized direction<param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="hitGroups">The collision group that this raycast can collide with</param>
+        /// <returns>The list with hit results.</returns>
+        public BepuHitResult Raycast(Vector3 from, Vector3 direction, float length, CollisionFilterGroupFlags hitGroups = DefaultFlags, BepuPhysicsComponent skipComponent = null)
+        {
+            RayHitClosestHandler rhch = new RayHitClosestHandler()
+            {
+                findGroups = hitGroups,
+                startLength = length,
+                furthestHitSoFar = float.MaxValue,
+                skipComponent = skipComponent
+            };
+            using(simulationLocker.ReadLock())
+            {
+                using (internalSimulation.BroadphaseLocker.ReadLock())
+                {
+                    internalSimulation.RayCast(new System.Numerics.Vector3(from.X, from.Y, from.Z), new System.Numerics.Vector3(direction.X, direction.Y, direction.Z), length, ref rhch);
+                }
+            }
+            return rhch.HitCollidable;
+        }
+
+        /// <summary>
+        /// Tries to do a raycast right now without locking the broadphase
+        /// </summary>
+        /// <param name="from">From.</param>
+        /// <param name="direction">normalized direction</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="hitGroups">The collision group that this raycast can collide with</param>
+        /// <returns>true if a successful raycast was done, false if result is left untouched</returns>
+        public bool TryFastRaycast(out BepuHitResult result, Vector3 from, Vector3 direction, float length, CollisionFilterGroupFlags hitGroups = DefaultFlags, BepuPhysicsComponent skipComponent = null)
+        {
+            RayHitClosestHandler rhch = new RayHitClosestHandler()
+            {
+                findGroups = hitGroups,
+                startLength = length,
+                furthestHitSoFar = float.MaxValue,
+                skipComponent = skipComponent
+            };
+            using (simulationLocker.ReadLock())
+            {
+                if (internalSimulation.BroadphaseLocker.TryEnterReadLock(0))
+                {
+                    internalSimulation.RayCast(new System.Numerics.Vector3(from.X, from.Y, from.Z), new System.Numerics.Vector3(direction.X, direction.Y, direction.Z), length, ref rhch);
+                    internalSimulation.BroadphaseLocker.ExitReadLock();
+                    result = rhch.HitCollidable;
+                    return true;
+                }
+            }
+            result = default;
+            return false;
+        }
+
+        /// <summary>
+        /// Raycasts penetrating any shape the ray encounters.
+        /// Filtering by CollisionGroup
+        /// </summary>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="hitGroups">The collision group that this raycast can collide with</param>
+        public void RaycastPenetrating(Vector3 from, Vector3 to, List<BepuHitResult> resultsOutput, CollisionFilterGroupFlags hitGroups = DefaultFlags)
+        {
+            Vector3 diff = to - from;
+            float length = diff.Length();
+            float inv = 1.0f / length;
+            diff.X *= inv;
+            diff.Y *= inv;
+            diff.Z *= inv;
+            RaycastPenetrating(from, diff, length, resultsOutput, hitGroups);
+        }
+
+        /// <summary>
+        /// Raycasts penetrating any shape the ray encounters.
+        /// Filtering by CollisionGroup
+        /// </summary>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="hitGroups">The collision group that this raycast can collide with</param>
+        public void RaycastPenetrating(Vector3 from, Vector3 direction, float length, List<BepuHitResult> resultsOutput, CollisionFilterGroupFlags hitGroups = DefaultFlags)
+        {
+            RayHitAllHandler rhch = new RayHitAllHandler()
+            {
+                hitGroups = hitGroups,
+                HitCollidables = resultsOutput,
+                startLength = length
+            };
+            using (simulationLocker.ReadLock())
+            {
+                using (internalSimulation.BroadphaseLocker.ReadLock())
+                {
+                    internalSimulation.RayCast(new System.Numerics.Vector3(from.X, from.Y, from.Z), new System.Numerics.Vector3(direction.X, direction.Y, direction.Z), length, ref rhch);
+                }
+            }
+        }
+
+        struct SweepTestFirst : ISweepHitHandler
+        {
+            public CollisionFilterGroupFlags hitGroups;
+            public BepuHitResult result;
+            public float furthestHitSoFar, startLength;
+            public BepuPhysicsComponent skipComponent;
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)hitGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable, int child)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)hitGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnHit(ref float maximumT, float t, in System.Numerics.Vector3 hitLocation, in System.Numerics.Vector3 hitNormal, CollidableReference collidable)
+            {
+                if (t < furthestHitSoFar)
+                {
+                    var component = getFromReference(collidable);
+                    if (component == skipComponent) return;
+
+                    furthestHitSoFar = t;
+                    result.Succeeded = true;
+                    result.Collider = component;
+                    result.Normal.X = hitNormal.X;
+                    result.Normal.Y = hitNormal.Y;
+                    result.Normal.Z = hitNormal.Z;
+                    result.Point.X = hitLocation.X;
+                    result.Point.Y = hitLocation.Y;
+                    result.Point.Z = hitLocation.Z;
+                    result.HitFraction = t / startLength;
+                }
+
+                //Changing the maximum T value prevents the traversal from visiting any leaf nodes more distant than that later in the traversal.
+                //It is effectively an optimization that you can use if you only care about the time of first impact.
+                if (t < maximumT)
+                    maximumT = t;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnHitAtZeroT(ref float maximumT, CollidableReference collidable)
+            {
+                var component = getFromReference(collidable);
+                if (component == skipComponent) return;
+
+                result.Succeeded = true;
+                result.Collider = component;
+                maximumT = 0;
+                furthestHitSoFar = 0;
+            }
+        }
+
+        struct SweepTestAll : ISweepHitHandler
+        {
+            public CollisionFilterGroupFlags hitGroups;
+            public List<BepuHitResult> results;
+            public float startLength;
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)hitGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public bool AllowTest(CollidableReference collidable, int child)
+            {
+                return ((uint)getFromReference(collidable).CollisionGroup & (uint)hitGroups) != 0;
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnHit(ref float maximumT, float t, in System.Numerics.Vector3 hitLocation, in System.Numerics.Vector3 hitNormal, CollidableReference collidable)
+            {
+                BepuHitResult result = new BepuHitResult();
+                result.Succeeded = true;
+                result.Collider = getFromReference(collidable);
+                result.Normal.X = hitNormal.X;
+                result.Normal.Y = hitNormal.Y;
+                result.Normal.Z = hitNormal.Z;
+                result.Point.X = hitLocation.X;
+                result.Point.Y = hitLocation.Y;
+                result.Point.Z = hitLocation.Z;
+                result.HitFraction = t / startLength;
+                results.Add(result);
+            }
+
+            [MethodImpl(MethodImplOptions.AggressiveInlining)]
+            public void OnHitAtZeroT(ref float maximumT, CollidableReference collidable)
+            {
+                BepuHitResult result = new BepuHitResult();
+                result.Succeeded = true;
+                result.Collider = getFromReference(collidable);
+                results.Add(result);
+            }
+        }
+
+        /// <summary>
+        /// Performs a sweep test using a collider shape and returns the closest hit
+        /// </summary>
+        /// <param name="shape">The shape.</param>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="filterGroup">The collision group of this shape sweep</param>
+        /// <param name="filterFlags">The collision group that this shape sweep can collide with</param>
+        /// <returns></returns>
+        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
+        public BepuHitResult ShapeSweep<TShape>(TShape shape, Vector3 position, Xenko.Core.Mathematics.Quaternion rotation, Vector3 endpoint, CollisionFilterGroupFlags hitGroups = DefaultFlags, BepuPhysicsComponent skipComponent = null) where TShape : unmanaged, IConvexShape
+        {
+            Vector3 diff = endpoint - position;
+            float length = diff.Length();
+            float inv = 1.0f / length;
+            diff.X *= inv;
+            diff.Y *= inv;
+            diff.Z *= inv;
+            return ShapeSweep(shape, position, rotation, diff, length, hitGroups, skipComponent);
+        }
+
+        /// <summary>
+        /// Performs a sweep test using a collider shape and returns the closest hit
+        /// </summary>
+        /// <param name="shape">The shape.</param>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="filterGroup">The collision group of this shape sweep</param>
+        /// <param name="filterFlags">The collision group that this shape sweep can collide with</param>
+        /// <returns></returns>
+        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
+        public BepuHitResult ShapeSweep<TShape>(TShape shape, Vector3 position, Xenko.Core.Mathematics.Quaternion rotation, Vector3 direction, float length, CollisionFilterGroupFlags hitGroups = DefaultFlags, BepuPhysicsComponent skipComponent = null) where TShape : unmanaged, IConvexShape
+        {
+            SweepTestFirst sshh = new SweepTestFirst()
+            {
+                hitGroups = hitGroups,
+                startLength = length,
+                furthestHitSoFar = float.MaxValue,
+                skipComponent = skipComponent
+            };
+            RigidPose rp = new RigidPose();
+            rp.Position.X = position.X;
+            rp.Position.Y = position.Y;
+            rp.Position.Z = position.Z;
+            rp.Orientation.X = rotation.X;
+            rp.Orientation.Y = rotation.Y;
+            rp.Orientation.Z = rotation.Z;
+            rp.Orientation.W = rotation.W;
+            using (simulationLocker.ReadLock())
+            {
+                using (internalSimulation.BroadphaseLocker.ReadLock())
+                {
+                    internalSimulation.Sweep(shape, rp, new BodyVelocity(new System.Numerics.Vector3(direction.X, direction.Y, direction.Z)), length, safeBufferPool, ref sshh);
+                }
+            }
+            return sshh.result;
+        }
+
+        /// <summary>
+        /// Performs a sweep test using a collider shape and never stops until "to"
+        /// </summary>
+        /// <param name="shape">The shape.</param>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <param name="filterGroup">The collision group of this shape sweep</param>
+        /// <param name="filterFlags">The collision group that this shape sweep can collide with</param>
+        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
+        public void ShapeSweepPenetrating<TShape>(TShape shape, Vector3 position, Xenko.Core.Mathematics.Quaternion rotation, Vector3 endpoint, List<BepuHitResult> output, CollisionFilterGroupFlags hitGroups = DefaultFlags) where TShape : unmanaged, IConvexShape
+        {
+            Vector3 diff = endpoint - position;
+            float length = diff.Length();
+            float inv = 1.0f / length;
+            diff.X *= inv;
+            diff.Y *= inv;
+            diff.Z *= inv;
+            ShapeSweepPenetrating(shape, position, rotation, diff, length, output, hitGroups);
+        }
+
+        /// <summary>
+        /// Performs a sweep test using a collider shape and never stops until "to"
+        /// </summary>
+        /// <param name="shape">The shape.</param>
+        /// <param name="from">From.</param>
+        /// <param name="to">To.</param>
+        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <param name="filterGroup">The collision group of this shape sweep</param>
+        /// <param name="filterFlags">The collision group that this shape sweep can collide with</param>
+        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
+        public void ShapeSweepPenetrating<TShape>(TShape shape, Vector3 position, Xenko.Core.Mathematics.Quaternion rotation, Vector3 direction, float length, List<BepuHitResult> output, CollisionFilterGroupFlags hitGroups = DefaultFlags) where TShape : unmanaged, IConvexShape
+        {
+            SweepTestAll sshh = new SweepTestAll()
+            {
+                hitGroups = hitGroups,
+                startLength = length,
+                results = output
+            };
+            RigidPose rp = new RigidPose();
+            rp.Position.X = position.X;
+            rp.Position.Y = position.Y;
+            rp.Position.Z = position.Z;
+            rp.Orientation.X = rotation.X;
+            rp.Orientation.Y = rotation.Y;
+            rp.Orientation.Z = rotation.Z;
+            rp.Orientation.W = rotation.W;
+            using (simulationLocker.ReadLock())
+            {
+                using (internalSimulation.BroadphaseLocker.ReadLock())
+                {
+                    internalSimulation.Sweep(shape, rp, new BodyVelocity(new System.Numerics.Vector3(direction.X, direction.Y, direction.Z)), length, safeBufferPool, ref sshh);
+                }
+            }
+        }
+
+        private System.Numerics.Vector3 _gravity = new System.Numerics.Vector3(0f, -9.81f, 0f);
+
+        /// <summary>
+        /// Gets or sets the gravity.
+        /// </summary>
+        /// <value>
+        /// The gravity.
+        /// </value>
+        /// <exception cref="System.Exception">
+        /// Cannot perform this action when the physics engine is set to CollisionsOnly
+        /// or
+        /// Cannot perform this action when the physics engine is set to CollisionsOnly
+        /// </exception>
+        public Vector3 Gravity
+        {
+            get
+            {
+                return new Vector3(_gravity.X, _gravity.Y, _gravity.Z);
+            }
+            set
+            {
+                _gravity.X = value.X;
+                _gravity.Y = value.Y;
+                _gravity.Z = value.Z;
+            }
+        }
+
+        internal void Simulate(float deltaTime)
+        {
+            if (internalSimulation == null) return;
+
+            using (simulationLocker.ReadLock())
+            {
+                internalSimulation.Timestep(deltaTime * TimeScale, threadDispatcher);
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bepu/BepuStaticColliderComponent.cs b/sources/engine/Xenko.Physics/Bepu/BepuStaticColliderComponent.cs
new file mode 100644
index 0000000000..40271c7bdd
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Bepu/BepuStaticColliderComponent.cs
@@ -0,0 +1,202 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
+using BepuPhysics;
+using BepuPhysics.Collidables;
+using Xenko.Core;
+using Xenko.Core.Threading;
+using Xenko.Engine;
+
+namespace Xenko.Physics.Bepu
+{
+    [DataContract("BepuStaticColliderComponent")]
+    [Display("Bepu StaticCollider (No GameStudio integration)")]
+    public sealed class BepuStaticColliderComponent : BepuPhysicsComponent
+    {
+        public StaticDescription staticDescription;
+        private StaticReference _internalStatic;
+
+        public StaticHandle myStaticHandle;
+
+        public override int HandleIndex => myStaticHandle.Value;
+
+        internal static ConcurrentQueue<BepuStaticColliderComponent> NeedsRepositioning = new ConcurrentQueue<BepuStaticColliderComponent>();
+
+        public StaticReference InternalStatic
+        {
+            get
+            {
+                _internalStatic.Statics = BepuSimulation.instance.internalSimulation.Statics;
+                _internalStatic.Handle = myStaticHandle;
+                return _internalStatic;
+            }
+        }
+
+        public override TypedIndex ShapeIndex { get => staticDescription.Collidable.Shape; }
+
+        /// <summary>
+        /// Generates a static collider for an Entity. Has a shortcut for setting the shape.
+        /// </summary>
+        /// <param name="collider_shape">Sets the shape. If null, one must be set later.</param>
+        public BepuStaticColliderComponent(IShape collider_shape = null) : base ()
+        {
+            staticDescription.Pose.Orientation.W = 1f;
+            myStaticHandle.Value = -1;
+            ColliderShape = collider_shape;
+        }
+
+        /// <summary>
+        /// Default constructor with no collider shape shortcut.
+        /// </summary>
+        public BepuStaticColliderComponent() : base ()
+        {
+            staticDescription.Pose.Orientation.W = 1f;
+            myStaticHandle.Value = -1;
+            CollisionGroup = CollisionFilterGroups.StaticFilter;
+        }
+
+        [DataMember]
+        private Xenko.Core.Mathematics.Vector3? usePosition;
+
+        [DataMember]
+        private Xenko.Core.Mathematics.Quaternion? useRotation;
+
+        [DataMemberIgnore]
+        public override Xenko.Core.Mathematics.Vector3 Position
+        {
+            get
+            {
+                return usePosition ?? Entity.Transform.WorldPosition();
+            }
+            set
+            {
+                usePosition = value;
+            }
+        }
+
+        [DataMemberIgnore]
+        public override Xenko.Core.Mathematics.Quaternion Rotation
+        {
+            get
+            {
+                return useRotation ?? Entity.Transform.WorldRotation();
+            }
+            set
+            {
+                useRotation = value;
+            }
+        }
+
+        [DataMemberIgnore]
+        public BepuUtilities.Memory.BufferPool PoolUsedForMesh;
+
+        [DataMember]
+        public bool DisposeMeshOnDetach { get; set; } = false;
+
+        /// <summary>
+        /// Dispose the mesh right now. Should best be done after confirmed removed from simulation, which DisposeMeshOnDetach boolean can do for you.
+        /// </summary>
+        /// <returns>true if dispose worked</returns>
+        public bool DisposeMesh()
+        {
+            if (ColliderShape is Mesh m && PoolUsedForMesh != null)
+            {
+                lock (PoolUsedForMesh)
+                {
+                    m.Dispose(PoolUsedForMesh);
+                }
+                ColliderShape = null;
+                PoolUsedForMesh = null;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Let the physics engine know this static collider moved
+        /// </summary>
+        public void UpdatePhysicalTransform()
+        {
+            if (AddedToScene == false || ColliderShape == null)
+                return;
+
+            preparePose();
+
+            if (safeRun)
+            {
+                using (BepuSimulation.instance.simulationLocker.WriteLock())
+                {
+                    InternalStatic.ApplyDescription(staticDescription);
+                }
+            }
+            else NeedsRepositioning.Enqueue(this);
+        }
+
+        internal void preparePose()
+        {
+            TransformComponent et = Entity.Transform;
+            et.UpdateLocalMatrix();
+            et.UpdateWorldMatrixInternal(true, false);
+            Xenko.Core.Mathematics.Vector3 usepos = et.WorldPosition();
+            Xenko.Core.Mathematics.Quaternion q = et.WorldRotation();
+            if (usePosition.HasValue) usepos += usePosition.Value;
+            if (useRotation.HasValue) q *= useRotation.Value;
+            staticDescription.Pose.Position = BepuHelpers.ToBepu(usepos);
+            staticDescription.Pose.Orientation = BepuHelpers.ToBepu(q);
+        }
+
+        [DataMember]
+        public override float SpeculativeMargin
+        {
+            get => base.SpeculativeMargin;
+            set
+            {
+                base.SpeculativeMargin = value;
+
+                if (AddedToScene)
+                    InternalStatic.Collidable.SpeculativeMargin = value;
+            }
+        }
+
+        /// <summary>
+        /// Set this to true to add this object to the physics simulation. Will automatically remove itself when the entity. is removed from the scene. Will NOT automatically add the rigidbody
+        /// to the scene when the entity is added, though.
+        /// </summary>
+        [DataMemberIgnore]
+        public override bool AddedToScene
+        {
+            get
+            {
+                return myStaticHandle.Value != -1;
+            }
+            set
+            {
+                if (value)
+                {
+                    if (ColliderShape == null)
+                        throw new InvalidOperationException(Entity.Name + " has no ColliderShape, can't be added!");
+
+                    if (BepuHelpers.SanityCheckShape(ColliderShape) == false)
+                        throw new InvalidOperationException(Entity.Name + " has a broken ColliderShape! Check sizes and/or children count.");
+
+                    lock (BepuSimulation.instance.ToBeAdded)
+                    {
+                        BepuSimulation.instance.ToBeAdded.Add(this);
+                        BepuSimulation.instance.ToBeRemoved.Remove(this);
+                    }
+                }
+                else
+                {
+                    lock (BepuSimulation.instance.ToBeAdded)
+                    {
+                        BepuSimulation.instance.ToBeAdded.Remove(this);
+                        BepuSimulation.instance.ToBeRemoved.Add(this);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Bullet2PhysicsSystem.cs b/sources/engine/Xenko.Physics/Bullet2PhysicsSystem.cs
deleted file mode 100644
index 285c0649dc..0000000000
--- a/sources/engine/Xenko.Physics/Bullet2PhysicsSystem.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System.Collections.Generic;
-using System.Linq;
-using Xenko.Core;
-using Xenko.Engine;
-using Xenko.Games;
-
-namespace Xenko.Physics
-{
-    public class Bullet2PhysicsSystem : GameSystem, IPhysicsSystem
-    {
-        private class PhysicsScene
-        {
-            public PhysicsProcessor Processor;
-            public Simulation Simulation;
-        }
-
-        private readonly List<PhysicsScene> scenes = new List<PhysicsScene>();
-
-        static Bullet2PhysicsSystem()
-        {
-            // Preload proper libbulletc native library (depending on CPU type)
-            NativeLibrary.PreloadLibrary("libbulletc.dll", typeof(Bullet2PhysicsSystem));
-        }
-
-        public Bullet2PhysicsSystem(IServiceRegistry registry)
-            : base(registry)
-        {
-            UpdateOrder = -1000; //make sure physics runs before everything
-
-            Enabled = true; //enabled by default
-        }
-
-        private PhysicsSettings physicsConfiguration;
-
-        public override void Initialize()
-        {
-            physicsConfiguration = Game?.Settings != null ? Game.Settings.Configurations.Get<PhysicsSettings>() : new PhysicsSettings();
-        }
-
-        protected override void Destroy()
-        {
-            base.Destroy();
-
-            lock (this)
-            {
-                foreach (var scene in scenes)
-                {
-                    scene.Simulation.Dispose();
-                }
-            }
-        }
-
-        public Simulation Create(PhysicsProcessor sceneProcessor, PhysicsEngineFlags flags = PhysicsEngineFlags.None)
-        {
-            var scene = new PhysicsScene { Processor = sceneProcessor, Simulation = new Simulation(sceneProcessor, physicsConfiguration) };
-            lock (this)
-            {
-                scenes.Add(scene);
-            }
-            return scene.Simulation;
-        }
-
-        public void Release(PhysicsProcessor processor)
-        {
-            lock (this)
-            {
-                var scene = scenes.SingleOrDefault(x => x.Processor == processor);
-                if (scene == null) return;
-                scenes.Remove(scene);
-                scene.Simulation.Dispose();
-            }
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            if (Simulation.DisableSimulation) return;
-
-            lock (this)
-            {
-                //read skinned meshes bone positions
-                foreach (var physicsScene in scenes)
-                {
-                    //first process any needed cleanup
-                    physicsScene.Processor.UpdateRemovals();
-
-                    //read skinned meshes bone positions and write them to the physics engine
-                    physicsScene.Processor.UpdateBones();
-                    
-                    //simulate physics
-                    physicsScene.Simulation.Simulate((float)gameTime.Elapsed.TotalSeconds);
-
-                    //update character bound entity's transforms from physics engine simulation
-                    physicsScene.Processor.UpdateCharacters();
-
-                    //Perform clean ups before test contacts in this frame
-                    physicsScene.Simulation.BeginContactTesting();
-                   
-                    //handle frame contacts
-                    physicsScene.Processor.UpdateContacts();
-
-                    //This is the heavy contact logic
-                    physicsScene.Simulation.EndContactTesting();
-
-                    //send contact events
-                    physicsScene.Simulation.SendEvents();                   
-                }
-            }
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Physics/ByteHeightStickArraySource.cs b/sources/engine/Xenko.Physics/ByteHeightStickArraySource.cs
new file mode 100644
index 0000000000..180377553f
--- /dev/null
+++ b/sources/engine/Xenko.Physics/ByteHeightStickArraySource.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [Display("Byte")]
+    public class ByteHeightStickArraySource : IHeightStickArraySource
+    {
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => HeightfieldTypes.Byte;
+
+        [DataMember(10)]
+        [Display("Size")]
+        public Int2 HeightStickSize { get; set; } = new Int2(65, 65);
+
+        [DataMember(20)]
+        public Vector2 HeightRange { get; set; } = new Vector2(0, 10);
+
+        [DataMemberIgnore]
+        public float HeightScale => HeightScaleCalculator.Calculate(this);
+
+        /// <summary>
+        /// Select how to calculate HeightScale.
+        /// </summary>
+        [DataMember(30)]
+        [NotNull]
+        [Display("HeightScale", Expand = ExpandRule.Always)]
+        public IHeightScaleCalculator HeightScaleCalculator { get; set; } = new HeightScaleCalculator();
+
+        /// <summary>
+        /// The value to fill the height stick array.
+        /// </summary>
+        [DataMember(40)]
+        [DataMemberRange(0, 255, 1, 10, 0)]
+        public byte InitialByte { get; set; } = 0;
+
+        public bool IsValid() => HeightmapUtils.CheckHeightParameters(HeightStickSize, HeightType, HeightRange, HeightScale, false) &&
+            MathUtil.IsInRange(InitialByte, byte.MinValue, byte.MaxValue);
+
+        public void CopyTo<T>(UnmanagedArray<T> heightStickArray, int index) where T : struct
+        {
+            if (heightStickArray == null) throw new ArgumentNullException(nameof(heightStickArray));
+            if (heightStickArray is UnmanagedArray<byte> unmanagedArray)
+            {
+                unmanagedArray.Fill(InitialByte, index, HeightStickSize.X * HeightStickSize.Y);
+            }
+            else
+            {
+                throw new NotSupportedException($"{ typeof(UnmanagedArray<T>) } type is not supported.");
+            }
+        }
+
+        public bool Match(object obj)
+        {
+            var other = obj as ByteHeightStickArraySource;
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return other.HeightStickSize == HeightStickSize &&
+                other.HeightRange == HeightRange &&
+                Math.Abs(other.HeightScale - HeightScale) < float.Epsilon &&
+                other.InitialByte == InitialByte;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/ColliderShape.cs b/sources/engine/Xenko.Physics/ColliderShape.cs
index 7b6ee4cde6..0aa985b9a8 100644
--- a/sources/engine/Xenko.Physics/ColliderShape.cs
+++ b/sources/engine/Xenko.Physics/ColliderShape.cs
@@ -48,8 +48,7 @@ public virtual void UpdateLocalTransformations()
         {
             //cache matrices used to translate the position from and to physics engine / gfx engine
             PositiveCenterMatrix = Matrix.RotationQuaternion(LocalRotation) * (Parent == null ? Matrix.Translation(LocalOffset * cachedScaling) : Matrix.Translation(LocalOffset));
-            NegativeCenterMatrix = PositiveCenterMatrix;
-            NegativeCenterMatrix.Invert();
+            Matrix.Invert(ref PositiveCenterMatrix, out NegativeCenterMatrix);
         }
 
         /// <summary>
@@ -68,7 +67,7 @@ public virtual void UpdateLocalTransformations()
         /// </value>
         public Matrix NegativeCenterMatrix;
 
-        protected Vector3 cachedScaling;
+        protected Vector3 cachedScaling = Vector3.One;
 
         /// <summary>
         /// Gets or sets the scaling.
@@ -142,7 +141,10 @@ public virtual void UpdateDebugPrimitive(CommandList commandList, IDebugPrimitiv
 
         internal bool NeedsCustomCollisionCallback;
 
-        internal bool IsPartOfAsset = false;
+        /// <summary>
+        /// If you want the ColliderShape to stick around after a Detach or Dispose for reuse, set this to true.
+        /// </summary>
+        public bool DoNotDispose = false;
 
         internal Entity DebugEntity;
     }
diff --git a/sources/engine/Xenko.Physics/ColliderShapeTypes.cs b/sources/engine/Xenko.Physics/ColliderShapeTypes.cs
index 9419c868ef..a2ac568c17 100644
--- a/sources/engine/Xenko.Physics/ColliderShapeTypes.cs
+++ b/sources/engine/Xenko.Physics/ColliderShapeTypes.cs
@@ -31,6 +31,8 @@ public enum ColliderShapeTypes
 
         StaticPlane,
 
+        StaticMesh,
+
         Cone,
 
         Heightfield,
diff --git a/sources/engine/Xenko.Physics/Constraints/ConeTwistConstraint.cs b/sources/engine/Xenko.Physics/Constraints/ConeTwistConstraint.cs
index aa7f6efe51..effd058a70 100644
--- a/sources/engine/Xenko.Physics/Constraints/ConeTwistConstraint.cs
+++ b/sources/engine/Xenko.Physics/Constraints/ConeTwistConstraint.cs
@@ -139,7 +139,7 @@ public void SetLimit(float swingSpan1, float swingSpan2, float twistSpan, float
         /// <param name="angularOnly">if set to <c>true</c> [angular only].</param>
         public void SetAngularOnly(bool angularOnly)
         {
-            InternalConeTwistConstraint.SetAngularOnly(angularOnly);
+            InternalConeTwistConstraint.AngularOnly = angularOnly;
         }
 
         /// <summary>
@@ -148,7 +148,7 @@ public void SetAngularOnly(bool angularOnly)
         /// <param name="damping">The damping.</param>
         public void SetDamping(float damping)
         {
-            InternalConeTwistConstraint.SetDamping(damping);
+            InternalConeTwistConstraint.Damping = damping;
         }
 
         /// <summary>
@@ -166,7 +166,7 @@ public void EnableMotor(bool b)
         /// <param name="maxMotorImpulse">The maximum motor impulse.</param>
         public void SetMaxMotorImpulse(float maxMotorImpulse)
         {
-            InternalConeTwistConstraint.SetMaxMotorImpulse(maxMotorImpulse);
+            InternalConeTwistConstraint.MaxMotorImpulse = maxMotorImpulse;
         }
 
         /// <summary>
@@ -184,7 +184,7 @@ public void SetMaxMotorImpulseNormalized(float maxMotorImpulse)
         /// <param name="q">The q.</param>
         public void SetMotorTarget(Quaternion q)
         {
-            InternalConeTwistConstraint.SetMotorTarget(q);
+            InternalConeTwistConstraint.MotorTarget = q;
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Physics/Constraints/HingeConstraint.cs b/sources/engine/Xenko.Physics/Constraints/HingeConstraint.cs
index bfa6ca33e0..3011e8ee8c 100644
--- a/sources/engine/Xenko.Physics/Constraints/HingeConstraint.cs
+++ b/sources/engine/Xenko.Physics/Constraints/HingeConstraint.cs
@@ -60,7 +60,7 @@ public float MaxMotorImpulse
         /// </value>
         public float MotorTargetVelocity
         {
-            get { return InternalHingeConstraint.MotorTargetVelosity; }
+            get { return InternalHingeConstraint.MotorTargetVelocity; }
         }
 
         /// <summary>
@@ -170,7 +170,7 @@ public void EnableAngularMotor(bool enableMotor, float targetVelocity, float max
         /// <param name="enableMotor">if set to <c>true</c> [enable motor].</param>
         public void EnableMotor(bool enableMotor)
         {
-            InternalHingeConstraint.EnableMotor(enableMotor);
+            InternalHingeConstraint.EnableMotor = enableMotor;
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Physics/Constraints/Point2PointConstraint.cs b/sources/engine/Xenko.Physics/Constraints/Point2PointConstraint.cs
index 13c43fd3c7..089e19ce74 100644
--- a/sources/engine/Xenko.Physics/Constraints/Point2PointConstraint.cs
+++ b/sources/engine/Xenko.Physics/Constraints/Point2PointConstraint.cs
@@ -16,7 +16,7 @@ public class Point2PointConstraint : Constraint
         public Vector3 PivotInA 
         {
             get { return InternalPoint2PointConstraint.PivotInA; }
-            set { InternalPoint2PointConstraint.SetPivotA(value); } 
+            set { InternalPoint2PointConstraint.PivotInA = value; } 
         }
 
         /// <summary>
@@ -28,7 +28,7 @@ public Vector3 PivotInA
         public Vector3 PivotInB
         {
             get { return InternalPoint2PointConstraint.PivotInB; }
-            set { InternalPoint2PointConstraint.SetPivotB(value); }
+            set { InternalPoint2PointConstraint.PivotInB = value; }
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Physics/Constraints/RotationalLimitMotor.cs b/sources/engine/Xenko.Physics/Constraints/RotationalLimitMotor.cs
index a73e05055f..c713adf603 100644
--- a/sources/engine/Xenko.Physics/Constraints/RotationalLimitMotor.cs
+++ b/sources/engine/Xenko.Physics/Constraints/RotationalLimitMotor.cs
@@ -189,8 +189,8 @@ public float MaxMotorForce
         /// </value>
         public float NormalCfm
         {
-            get { return mMotor.NormalCFM; }
-            set { mMotor.NormalCFM = value; }
+            get { return mMotor.NormalCfm; }
+            set { mMotor.NormalCfm = value; }
         }
 
         /// <summary>
@@ -201,8 +201,8 @@ public float NormalCfm
         /// </value>
         public float StopCfm
         {
-            get { return mMotor.StopCFM; }
-            set { mMotor.StopCFM = value; }
+            get { return mMotor.StopCfm; }
+            set { mMotor.StopCfm = value; }
         }
 
         /// <summary>
@@ -213,8 +213,8 @@ public float StopCfm
         /// </value>
         public float StopErp
         {
-            get { return mMotor.StopERP; }
-            set { mMotor.StopERP = value; }
+            get { return mMotor.StopErp; }
+            set { mMotor.StopErp = value; }
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Physics/Constraints/SliderConstraint.cs b/sources/engine/Xenko.Physics/Constraints/SliderConstraint.cs
index 16ea0d14a4..7eb7a41e50 100644
--- a/sources/engine/Xenko.Physics/Constraints/SliderConstraint.cs
+++ b/sources/engine/Xenko.Physics/Constraints/SliderConstraint.cs
@@ -170,7 +170,7 @@ public float LinearDepth
         /// </value>
         public float LinearPosition
         {
-            get { return InternalSliderConstraint.LinearPos; }
+            get { return InternalSliderConstraint.LinearPosition; }
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Physics/Constraints/TranslationalLimitMotor.cs b/sources/engine/Xenko.Physics/Constraints/TranslationalLimitMotor.cs
index 1e407720e6..f520d7b583 100644
--- a/sources/engine/Xenko.Physics/Constraints/TranslationalLimitMotor.cs
+++ b/sources/engine/Xenko.Physics/Constraints/TranslationalLimitMotor.cs
@@ -120,8 +120,8 @@ public Vector3 MaxMotorForce
         /// </value>
         public Vector3 NormalCFM
         {
-            get { return mMotor.NormalCFM; }
-            set { mMotor.NormalCFM = value; }
+            get { return mMotor.NormalCfm; }
+            set { mMotor.NormalCfm = value; }
         }
 
         /// <summary>
@@ -144,8 +144,8 @@ public float Restitution
         /// </value>
         public Vector3 StopCFM
         {
-            get { return mMotor.StopCFM; }
-            set { mMotor.StopCFM = value; }
+            get { return mMotor.StopCfm; }
+            set { mMotor.StopCfm = value; }
         }
 
         /// <summary>
@@ -156,8 +156,8 @@ public Vector3 StopCFM
         /// </value>
         public Vector3 StopERP
         {
-            get { return mMotor.StopERP; }
-            set { mMotor.StopERP = value; }
+            get { return mMotor.StopErp; }
+            set { mMotor.StopErp = value; }
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Physics/CustomHeightScaleCalculator.cs b/sources/engine/Xenko.Physics/CustomHeightScaleCalculator.cs
new file mode 100644
index 0000000000..3738ef0016
--- /dev/null
+++ b/sources/engine/Xenko.Physics/CustomHeightScaleCalculator.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [Display("Custom")]
+    public class CustomHeightScaleCalculator : IHeightScaleCalculator
+    {
+        [DataMember(10)]
+        public float Numerator { get; set; } = 1;
+
+        [DataMember(20)]
+        public float Denominator { get; set; } = 255;
+
+        public float Calculate(IHeightStickParameters heightDescription) => MathUtil.IsZero(Denominator) ? 0 : (Numerator / Denominator);
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Data/BoxColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/BoxColliderShapeDesc.cs
index 3c0673d300..048031dbe9 100644
--- a/sources/engine/Xenko.Physics/Data/BoxColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/BoxColliderShapeDesc.cs
@@ -41,5 +41,10 @@ public bool Match(object obj)
             var other = obj as BoxColliderShapeDesc;
             return other?.Is2D == Is2D && other.Size == Size && other.LocalOffset == LocalOffset && other.LocalRotation == LocalRotation;
         }
+
+        public ColliderShape CreateShape()
+        {
+            return new BoxColliderShape(Is2D, Size) { LocalOffset = LocalOffset, LocalRotation = LocalRotation };
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/CapsuleColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/CapsuleColliderShapeDesc.cs
index f9e98f5925..29f6c99bd3 100644
--- a/sources/engine/Xenko.Physics/Data/CapsuleColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/CapsuleColliderShapeDesc.cs
@@ -64,5 +64,10 @@ public bool Match(object obj)
                    other.LocalOffset == LocalOffset &&
                    other.LocalRotation == LocalRotation;
         }
+
+        public ColliderShape CreateShape()
+        {
+            return new CapsuleColliderShape(Is2D, Radius, Length, Orientation) { LocalOffset = LocalOffset, LocalRotation = LocalRotation };
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/ColliderShapeAssetDesc.cs b/sources/engine/Xenko.Physics/Data/ColliderShapeAssetDesc.cs
index 6b9feef09b..9bf4d5c308 100644
--- a/sources/engine/Xenko.Physics/Data/ColliderShapeAssetDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/ColliderShapeAssetDesc.cs
@@ -39,5 +39,20 @@ public bool Match(object obj)
             // TODO: shouldn't we return true here?
             return other.Shape == Shape;
         }
+
+        public ColliderShape CreateShape()
+        {
+            if (Shape == null)
+            {
+                return null;
+            }
+
+            if (Shape.Shape == null)
+            {
+                Shape.Shape = PhysicsColliderShape.Compose(Shape.Descriptions);
+            }
+
+            return this.Shape.Shape;
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/ConeColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/ConeColliderShapeDesc.cs
index fa8089954b..00f5c10174 100644
--- a/sources/engine/Xenko.Physics/Data/ConeColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/ConeColliderShapeDesc.cs
@@ -58,5 +58,10 @@ public bool Match(object obj)
                    other.LocalOffset == LocalOffset &&
                    other.LocalRotation == LocalRotation;
         }
+
+        public ColliderShape CreateShape()
+        {
+            return new ConeColliderShape(Height, Radius, Orientation) { LocalOffset = LocalOffset, LocalRotation = LocalRotation };
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/ConvexHullColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/ConvexHullColliderShapeDesc.cs
index 03dba607fa..bf399ecfc0 100644
--- a/sources/engine/Xenko.Physics/Data/ConvexHullColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/ConvexHullColliderShapeDesc.cs
@@ -9,13 +9,11 @@
 using Xenko.Core.Serialization.Contents;
 using Xenko.Rendering;
 
-namespace Xenko.Physics
-{
+namespace Xenko.Physics {
     [ContentSerializer(typeof(DataContentSerializer<ConvexHullColliderShapeDesc>))]
     [DataContract("ConvexHullColliderShapeDesc")]
     [Display(500, "Convex Hull")]
-    public class ConvexHullColliderShapeDesc : IAssetColliderShapeDesc
-    {
+    public class ConvexHullColliderShapeDesc : IAssetColliderShapeDesc {
 
         [Display(Browsable = false)]
         [DataMember(10)]
@@ -56,8 +54,7 @@ public class ConvexHullColliderShapeDesc : IAssetColliderShapeDesc
         [NotNull]
         public ConvexHullDecompositionParameters Decomposition { get; set; } = new ConvexHullDecompositionParameters();
 
-        public bool Match(object obj)
-        {
+        public bool Match(object obj) {
             var other = obj as ConvexHullColliderShapeDesc;
             if (other == null)
                 return false;
@@ -69,5 +66,89 @@ public bool Match(object obj)
                    other.Scaling == Scaling &&
                    other.Decomposition.Match(Decomposition);
         }
+
+        public ColliderShape CreateShape()
+        {
+            if (ConvexHulls == null) return null;
+            ColliderShape shape;
+
+            //Optimize performance and focus on less shapes creation since this shape could be nested
+
+            if (ConvexHulls.Count == 1) {
+                if (ConvexHulls[0].Count == 1 && ConvexHullsIndices[0][0].Count > 0) {
+                    shape = new ConvexHullColliderShape(ConvexHulls[0][0], ConvexHullsIndices[0][0], Scaling) {
+                        NeedsCustomCollisionCallback = true,
+                    };
+
+                    //shape.UpdateLocalTransformations();
+                    shape.Description = this;
+
+                    return shape;
+                }
+
+                if (ConvexHulls[0].Count <= 1) return null;
+
+                var subCompound = new CompoundColliderShape {
+                    NeedsCustomCollisionCallback = true,
+                };
+
+                for (var i = 0; i < ConvexHulls[0].Count; i++) {
+                    var verts = ConvexHulls[0][i];
+                    var indices = ConvexHullsIndices[0][i];
+
+                    if (indices.Count == 0) continue;
+
+                    var subHull = new ConvexHullColliderShape(verts, indices, Scaling);
+                    //subHull.UpdateLocalTransformations();
+                    subCompound.AddChildShape(subHull);
+                }
+
+                //subCompound.UpdateLocalTransformations();
+                subCompound.Description = this;
+
+                return subCompound;
+            }
+
+            if (ConvexHulls.Count <= 1) return null;
+
+            var compound = new CompoundColliderShape {
+                NeedsCustomCollisionCallback = true,
+            };
+
+            for (var i = 0; i < ConvexHulls.Count; i++) {
+                var verts = ConvexHulls[i];
+                var indices = ConvexHullsIndices[i];
+
+                if (verts.Count == 1) {
+                    if (indices[0].Count == 0) continue;
+
+                    var subHull = new ConvexHullColliderShape(verts[0], indices[0], Scaling);
+                    //subHull.UpdateLocalTransformations();
+                    compound.AddChildShape(subHull);
+                } else if (verts.Count > 1) {
+                    var subCompound = new CompoundColliderShape();
+
+                    for (var b = 0; b < verts.Count; b++) {
+                        var subVerts = verts[b];
+                        var subIndex = indices[b];
+
+                        if (subIndex.Count == 0) continue;
+
+                        var subHull = new ConvexHullColliderShape(subVerts, subIndex, Scaling);
+                        //subHull.UpdateLocalTransformations();
+                        subCompound.AddChildShape(subHull);
+                    }
+
+                    //subCompound.UpdateLocalTransformations();
+
+                    compound.AddChildShape(subCompound);
+                }
+            }
+
+            //compound.UpdateLocalTransformations();
+            compound.Description = this;
+
+            return compound;
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/CylinderColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/CylinderColliderShapeDesc.cs
index edc2e52591..fd02526784 100644
--- a/sources/engine/Xenko.Physics/Data/CylinderColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/CylinderColliderShapeDesc.cs
@@ -59,5 +59,10 @@ public bool Match(object obj)
                    other.LocalOffset == LocalOffset &&
                    other.LocalRotation == LocalRotation;
         }
+
+        public ColliderShape CreateShape()
+        {
+            return new CylinderColliderShape(Height, Radius, Orientation) { LocalOffset = LocalOffset, LocalRotation = LocalRotation };
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/HeightfieldColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/HeightfieldColliderShapeDesc.cs
new file mode 100644
index 0000000000..39118827b6
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Data/HeightfieldColliderShapeDesc.cs
@@ -0,0 +1,157 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization.Contents;
+
+namespace Xenko.Physics
+{
+    [ContentSerializer(typeof(DataContentSerializer<HeightfieldColliderShapeDesc>))]
+    [DataContract("HeightfieldColliderShapeDesc")]
+    [Display(300, "Heightfield")]
+    public class HeightfieldColliderShapeDesc : IInlineColliderShapeDesc
+    {
+        /// <summary>
+        /// The source to initialize the height stick array.
+        /// </summary>
+        [DataMember(10)]
+        [NotNull]
+        [Display("Source", Expand = ExpandRule.Always)]
+        public IHeightStickArraySource HeightStickArraySource { get; set; } = new HeightStickArraySourceFromHeightmap();
+
+        [DataMember(70)]
+        public bool FlipQuadEdges = false;
+
+        /// <summary>
+        /// Add a value to local offset in order to center specific height.
+        /// </summary>
+        /// <remarks>
+        /// NOTE: The center height is the middle point of the range, if this is disabled with asymmetrical range.
+        /// </remarks>
+        [DataMember(80)]
+        public HeightfieldCenteringParameters Centering { get; set; } = new HeightfieldCenteringParameters
+        {
+            Enabled = true,
+            CenterHeight = 0,
+        };
+
+        [DataMember(100)]
+        public Vector3 LocalOffset;
+
+        [DataMember(110)]
+        public Quaternion LocalRotation = Quaternion.Identity;
+
+        public bool Match(object obj)
+        {
+            var other = obj as HeightfieldColliderShapeDesc;
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            if (LocalOffset != other.LocalOffset || LocalRotation != other.LocalRotation)
+            {
+                return false;
+            }
+
+            var sourceMatch = other.HeightStickArraySource?.Match(HeightStickArraySource) ?? HeightStickArraySource == null;
+
+            var centeringMatch = other.Centering.Match(Centering);
+
+            return sourceMatch &&
+                centeringMatch &&
+                other.FlipQuadEdges == FlipQuadEdges;
+        }
+
+        /// <summary>
+        /// Get the offset required in order to center specific height.
+        /// </summary>
+        /// <param name="heightRange">The range of the height.</param>
+        /// <param name="centerHeight">The height to be centered.</param>
+        /// <returns>The value in y axis required in order to center specific height.</returns>
+        public static float GetCenteringOffset(Vector2 heightRange, float centerHeight)
+        {
+            return (heightRange.X + heightRange.Y) * 0.5f - centerHeight;
+        }
+
+        private static UnmanagedArray<T> CreateHeights<T>(IHeightStickArraySource heightStickArraySource) where T : struct
+        {
+            if (!heightStickArraySource?.IsValid() ?? false)
+            {
+                return null;
+            }
+
+            var arrayLength = heightStickArraySource.HeightStickSize.X * heightStickArraySource.HeightStickSize.Y;
+
+            var unmanagedArray = new UnmanagedArray<T>(arrayLength);
+
+            heightStickArraySource.CopyTo(unmanagedArray, 0);
+
+            return unmanagedArray;
+        }
+
+        /// <summary>
+        /// Get the centering offset that will be added to the local offset of the collider shape.
+        /// </summary>
+        /// <returns>The value that will be added to the local offset of the collider shape in order to center specific height.</returns>
+        public float GetCenteringOffset()
+        {
+            if (HeightStickArraySource == null) throw new InvalidOperationException($"{ nameof(HeightStickArraySource) } is a null.");
+
+            return Centering.Enabled ?
+                GetCenteringOffset(HeightStickArraySource.HeightRange, Centering.CenterHeight) :
+                0f;
+        }
+
+        public ColliderShape CreateShape()
+        {
+            object unmanagedArray;
+
+            switch (HeightStickArraySource.HeightType)
+            {
+                case HeightfieldTypes.Float:
+                {
+                    unmanagedArray = CreateHeights<float>(HeightStickArraySource);
+                    break;
+                }
+                case HeightfieldTypes.Short:
+                {
+                    unmanagedArray = CreateHeights<short>(HeightStickArraySource);
+                    break;
+                }
+                case HeightfieldTypes.Byte:
+                {
+                    unmanagedArray = CreateHeights<byte>(HeightStickArraySource);
+                    break;
+                }
+
+                default:
+                    return null;
+            }
+
+            if (unmanagedArray == null) return null;
+
+            var shape = new HeightfieldColliderShape
+                        (
+                            HeightStickArraySource.HeightStickSize.X,
+                            HeightStickArraySource.HeightStickSize.Y,
+                            HeightStickArraySource.HeightType,
+                            unmanagedArray,
+                            HeightStickArraySource.HeightScale,
+                            HeightStickArraySource.HeightRange.X,
+                            HeightStickArraySource.HeightRange.Y,
+                            FlipQuadEdges
+                        )
+                        {
+                            LocalOffset = LocalOffset + new Vector3(0, GetCenteringOffset(), 0),
+                            LocalRotation = LocalRotation,
+                        };
+
+            return shape;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Data/IColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/IColliderShapeDesc.cs
index dfe203099e..13518d290e 100644
--- a/sources/engine/Xenko.Physics/Data/IColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/IColliderShapeDesc.cs
@@ -8,6 +8,7 @@ namespace Xenko.Physics
     public interface IColliderShapeDesc
     {
         bool Match(object obj);
+        ColliderShape CreateShape();
     }
 
     public interface IAssetColliderShapeDesc : IColliderShapeDesc
diff --git a/sources/engine/Xenko.Physics/Data/SphereColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/SphereColliderShapeDesc.cs
index e73f4e0e1e..6f42f740c3 100644
--- a/sources/engine/Xenko.Physics/Data/SphereColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/SphereColliderShapeDesc.cs
@@ -38,5 +38,10 @@ public bool Match(object obj)
             var other = obj as SphereColliderShapeDesc;
             return other?.Is2D == Is2D && Math.Abs(other.Radius - Radius) < float.Epsilon && other.LocalOffset == LocalOffset;
         }
+
+        public ColliderShape CreateShape()
+        {
+            return new SphereColliderShape(Is2D, Radius) { LocalOffset = LocalOffset };
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Data/StaticPlaneColliderShapeDesc.cs b/sources/engine/Xenko.Physics/Data/StaticPlaneColliderShapeDesc.cs
index 257d7dcdcd..fea232dc74 100644
--- a/sources/engine/Xenko.Physics/Data/StaticPlaneColliderShapeDesc.cs
+++ b/sources/engine/Xenko.Physics/Data/StaticPlaneColliderShapeDesc.cs
@@ -31,5 +31,10 @@ public bool Match(object obj)
             if (other == null) return false;
             return other.Normal == Normal && Math.Abs(other.Offset - Offset) < float.Epsilon;
         }
+
+        public ColliderShape CreateShape()
+        {
+            return new StaticPlaneColliderShape(Normal, Offset);
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Elements/CharacterComponent.cs b/sources/engine/Xenko.Physics/Elements/CharacterComponent.cs
index 72828b187b..5eea214380 100644
--- a/sources/engine/Xenko.Physics/Elements/CharacterComponent.cs
+++ b/sources/engine/Xenko.Physics/Elements/CharacterComponent.cs
@@ -15,35 +15,32 @@ public sealed class CharacterComponent : PhysicsComponent
     {
         public CharacterComponent()
         {
+            Orientation = Quaternion.Identity;
             StepHeight = 0.1f;
-            ProcessCollisions = true;
         }
-
+        
         /// <summary>
         /// Jumps this instance.
         /// </summary>
-        public void Jump(Vector3 jumpDirection)
-        {
-            if (KinematicCharacter == null)
-            {
+        public void Jump(Vector3 jumpDirection) {
+            if (KinematicCharacter == null) {
                 throw new InvalidOperationException("Attempted to call a Physics function that is avaliable only when the Entity has been already added to the Scene.");
             }
 
-            KinematicCharacter.Jump(ref jumpDirection);
+            BulletSharp.Math.Vector3 v = jumpDirection;
+            KinematicCharacter.Jump(ref v);
         }
-
+        
         /// <summary>
-        /// Jumps this instance.
-        /// </summary>
+                 /// Jumps this instance.
+                 /// </summary>
         public void Jump()
         {
             if (KinematicCharacter == null)
             {
                 throw new InvalidOperationException("Attempted to call a Physics function that is avaliable only when the Entity has been already added to the Scene.");
             }
-
-            var zeroV = Vector3.Zero; //passing zero will jump on Up Axis
-            KinematicCharacter.Jump(ref zeroV);
+            KinematicCharacter.Jump();
         }
 
         /// <summary>
@@ -80,8 +77,8 @@ public float FallSpeed
             set
             {
                 fallSpeed = value;
-                
-                KinematicCharacter?.SetFallSpeed(value);
+
+                if( KinematicCharacter != null ) KinematicCharacter.FallSpeed = fallSpeed;
             }
         }
 
@@ -137,7 +134,7 @@ public float JumpSpeed
             {
                 jumpSpeed = value;
 
-                KinematicCharacter?.SetJumpSpeed(value);
+                if (KinematicCharacter != null) KinematicCharacter.JumpSpeed = jumpSpeed;
             }
         }
 
@@ -177,7 +174,7 @@ public Vector3 Gravity
         /// <value>
         /// <c>true</c> if this instance is grounded; otherwise, <c>false</c>.
         /// </value>
-        public bool IsGrounded => KinematicCharacter?.OnGround() ?? false;
+        public bool IsGrounded => KinematicCharacter?.OnGround ?? false;
 
         /// <summary>
         /// Teleports the specified target position.
@@ -194,7 +191,8 @@ public void Teleport(Vector3 targetPosition)
             var entityPos = Entity.Transform.Position;
             var physPos = PhysicsWorldTransform.TranslationVector;
             var diff = physPos - entityPos;
-            KinematicCharacter.Warp(targetPosition + diff);
+            BulletSharp.Math.Vector3 bV3 = targetPosition + diff;
+            KinematicCharacter.Warp(ref bV3);
         }
 
         /// <summary>
@@ -241,6 +239,11 @@ public void SetVelocity(Vector3 velocity)
 
         protected override void OnAttach()
         {
+            BulletSharp.ConvexShape cshape = ColliderShape.InternalShape as BulletSharp.ConvexShape;
+
+            if (cshape == null)
+                throw new ArgumentException(Entity.Name + " needs a convex shape for its CharacterComponent!");
+
             NativeCollisionObject = new BulletSharp.PairCachingGhostObject
             {
                 CollisionShape = ColliderShape.InternalShape,
@@ -256,7 +259,8 @@ protected override void OnAttach()
 
             NativeCollisionObject.ContactProcessingThreshold = !Simulation.CanCcd ? 1e18f : 1e30f;
 
-            KinematicCharacter = new BulletSharp.KinematicCharacterController((BulletSharp.PairCachingGhostObject)NativeCollisionObject, (BulletSharp.ConvexShape)ColliderShape.InternalShape, StepHeight, Vector3.UnitY);
+            BulletSharp.Math.Vector3 unitY = new BulletSharp.Math.Vector3(0f, 1f, 0f);
+            KinematicCharacter = new BulletSharp.KinematicCharacterController((BulletSharp.PairCachingGhostObject)NativeCollisionObject, cshape, StepHeight, ref unitY);
 
             base.OnAttach();
 
diff --git a/sources/engine/Xenko.Physics/Elements/CollisionFilterGroups.cs b/sources/engine/Xenko.Physics/Elements/CollisionFilterGroups.cs
index 8d7474e613..55242537db 100644
--- a/sources/engine/Xenko.Physics/Elements/CollisionFilterGroups.cs
+++ b/sources/engine/Xenko.Physics/Elements/CollisionFilterGroups.cs
@@ -39,7 +39,19 @@ namespace Xenko.Physics
 
         CustomFilter10 = 0x8000,
 
-        AllFilter = 0xFFFF,
+        ProjectileFilter = 0x10000,
+
+        StaticFeaturesFilter = 0x20000,
+
+        HazardFilter = 0x40000,
+
+        PlayerFilter = 0x80000,
+
+        EnemyFilter = 0x100000,
+
+        CheckpointFilter = 0x200000,
+
+        AllFilter = 0xFFFFFFF,
     }
 
     [Flags]
@@ -77,6 +89,18 @@ public enum CollisionFilterGroupFlags
 
         CustomFilter10 = 0x8000,
 
-        AllFilter = 0xFFFF,
+        ProjectileFilter = 0x10000,
+
+        StaticFeaturesFilter = 0x20000,
+
+        HazardFilter = 0x40000,
+
+        PlayerFilter = 0x80000,
+
+        EnemyFilter = 0x100000,
+
+        CheckpointFilter = 0x200000,
+
+        AllFilter = 0xFFFFFFF,
     }
 }
diff --git a/sources/engine/Xenko.Physics/Elements/RigidbodyComponent.cs b/sources/engine/Xenko.Physics/Elements/RigidbodyComponent.cs
index 650c621c04..6d378a7930 100644
--- a/sources/engine/Xenko.Physics/Elements/RigidbodyComponent.cs
+++ b/sources/engine/Xenko.Physics/Elements/RigidbodyComponent.cs
@@ -18,22 +18,11 @@ public sealed class RigidbodyComponent : PhysicsSkinnedComponentBase
         [DataMemberIgnore]
         internal BulletSharp.RigidBody InternalRigidBody;
 
-        internal delegate void GetWorldTransformDelegate(out Matrix transform);
-
-        [DataMemberIgnore]
-        internal GetWorldTransformDelegate GetWorldTransformCallback;
-
-        internal delegate void SetWorldTransformDelegate(Matrix transform);
-
-        [DataMemberIgnore]
-        internal SetWorldTransformDelegate SetWorldTransformCallback;
-
         [DataMemberIgnore]
         internal XenkoMotionState MotionState;
 
-        private bool isKinematic;
         private float mass = 1.0f;
-        private RigidBodyTypes type;
+        private RigidBodyTypes type = RigidBodyTypes.Dynamic;
         private Vector3 gravity = Vector3.Zero;
         private float angularDamping;
         private float linearDamping;
@@ -51,27 +40,6 @@ public sealed class RigidbodyComponent : PhysicsSkinnedComponentBase
         public RigidbodyComponent()
         {
             LinkedConstraints = new List<Constraint>();
-            ProcessCollisions = true;
-        }
-
-        /// <summary>
-        /// Gets or sets the kinematic property
-        /// </summary>
-        /// <value>true, false</value>
-        /// <userdoc>
-        /// Move the rigidbody only by the transform property, not other forces
-        /// </userdoc>
-        [DataMember(75)]
-        public bool IsKinematic
-        {
-            get { return isKinematic; }
-            set
-            {
-                isKinematic = value;
-
-                if (InternalRigidBody == null) return;
-                RigidBodyType = value ? RigidBodyTypes.Kinematic : RigidBodyTypes.Dynamic;
-            }
         }
 
         /// <summary>
@@ -258,7 +226,6 @@ public Vector3 Gravity
         /// <value>
         /// The type.
         /// </value>
-        [DataMemberIgnore]
         public RigidBodyTypes RigidBodyType
         {
             get
@@ -267,49 +234,29 @@ public RigidBodyTypes RigidBodyType
             }
             set
             {
+                if (type == value) return;
+
                 type = value;
 
                 if (InternalRigidBody == null) return;
 
+                InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
+                InternalRigidBody.LinearVelocity = Vector3.Zero;
+                InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
+                InternalRigidBody.AngularVelocity = Vector3.Zero;
+
                 switch (value)
                 {
                     case RigidBodyTypes.Dynamic:
-                        if (((int)InternalRigidBody.CollisionFlags & (int)BulletSharp.CollisionFlags.StaticObject) != 0) InternalRigidBody.CollisionFlags ^= BulletSharp.CollisionFlags.StaticObject;
-                        if (((int)InternalRigidBody.CollisionFlags & (int)BulletSharp.CollisionFlags.KinematicObject) != 0) InternalRigidBody.CollisionFlags ^= BulletSharp.CollisionFlags.KinematicObject;
-                        if (InternalRigidBody != null && Simulation != null && !OverrideGravity) InternalRigidBody.Gravity = Simulation.Gravity;
-                        if (InternalRigidBody != null)
-                        {
-                            InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
-                            InternalRigidBody.LinearVelocity = Vector3.Zero;
-                            InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
-                            InternalRigidBody.AngularVelocity = Vector3.Zero;
-                        }
-                        break;
-
-                    case RigidBodyTypes.Static:
-                        if (((int)InternalRigidBody.CollisionFlags & (int)BulletSharp.CollisionFlags.KinematicObject) != 0) InternalRigidBody.CollisionFlags ^= BulletSharp.CollisionFlags.KinematicObject;
-                        InternalRigidBody.CollisionFlags |= BulletSharp.CollisionFlags.StaticObject;
-                        if (InternalRigidBody != null && !OverrideGravity) InternalRigidBody.Gravity = Vector3.Zero;
-                        if (InternalRigidBody != null)
-                        {
-                            InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
-                            InternalRigidBody.LinearVelocity = Vector3.Zero;
-                            InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
-                            InternalRigidBody.AngularVelocity = Vector3.Zero;
-                        }
+                        if (Simulation != null && !OverrideGravity) InternalRigidBody.Gravity = Simulation.Gravity;
+                        InternalRigidBody.CollisionFlags &= ~BulletSharp.CollisionFlags.StaticObject;
+                        InternalRigidBody.CollisionFlags &= ~BulletSharp.CollisionFlags.KinematicObject;
                         break;
 
                     case RigidBodyTypes.Kinematic:
-                        if (((int)InternalRigidBody.CollisionFlags & (int)BulletSharp.CollisionFlags.StaticObject) != 0) InternalRigidBody.CollisionFlags ^= BulletSharp.CollisionFlags.StaticObject;
+                        InternalRigidBody.CollisionFlags &= ~BulletSharp.CollisionFlags.StaticObject;
                         InternalRigidBody.CollisionFlags |= BulletSharp.CollisionFlags.KinematicObject;
-                        if (InternalRigidBody != null && !OverrideGravity) InternalRigidBody.Gravity = Vector3.Zero;
-                        if (InternalRigidBody != null)
-                        {
-                            InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
-                            InternalRigidBody.LinearVelocity = Vector3.Zero;
-                            InternalRigidBody.InterpolationAngularVelocity = Vector3.Zero;
-                            InternalRigidBody.AngularVelocity = Vector3.Zero;
-                        }
+                        if (!OverrideGravity) InternalRigidBody.Gravity = Vector3.Zero;
                         break;
                 }
             }
@@ -317,21 +264,22 @@ public RigidBodyTypes RigidBodyType
 
         protected override void OnAttach()
         {
-            MotionState = new XenkoMotionState(this);
-
-            SetupBoneLink();
+            if (NativeCollisionObject == null)
+            {
+                MotionState = new XenkoMotionState(this);
 
-            GetWorldTransformCallback = (out Matrix transform) => RigidBodyGetWorldTransform(out transform);
-            SetWorldTransformCallback = transform => RigidBodySetWorldTransform(ref transform);
+                SetupBoneLink();
 
-            InternalRigidBody = new BulletSharp.RigidBody(0.0f, MotionState, ColliderShape.InternalShape, Vector3.Zero)
-            {
-                UserObject = this,
-            };
+                var rbci = new BulletSharp.RigidBodyConstructionInfo(0.0f, MotionState, ColliderShape.InternalShape, Vector3.Zero);
+                InternalRigidBody = new BulletSharp.RigidBody(rbci)
+                {
+                    UserObject = this,
+                };
 
-            NativeCollisionObject = InternalRigidBody;
+                NativeCollisionObject = InternalRigidBody;
 
-            NativeCollisionObject.ContactProcessingThreshold = !Simulation.CanCcd ? 1e18f : 1e30f;
+                NativeCollisionObject.ContactProcessingThreshold = !Simulation.CanCcd ? 1e18f : 1e30f;
+            }
 
             if (ColliderShape.NeedsCustomCollisionCallback)
             {
@@ -355,13 +303,21 @@ protected override void OnAttach()
             AngularDamping = angularDamping;
             OverrideGravity = overrideGravity;
             Gravity = gravity;
-            RigidBodyType = IsKinematic ? RigidBodyTypes.Kinematic : RigidBodyTypes.Dynamic;
+            RigidBodyType = type;
 
             Simulation.AddRigidBody(this, (CollisionFilterGroupFlags)CollisionGroup, CanCollideWith);
         }
 
         protected override void OnDetach()
         {
+            if (DoNotDispose)
+            {
+                // we might want to reuse this, just detach from scene/simulation
+                Simulation.RemoveRigidBody(this);
+                base.OnDetach();
+                return;
+            }
+
             MotionState.Dispose();
             MotionState.Clear();
 
@@ -398,8 +354,8 @@ protected internal override void OnUpdateDraw()
             {
                 //write to ModelViewHierarchy
                 var model = Data.ModelComponent;
-                model.Skeleton.NodeTransformations[BoneIndex].Flags = !IsKinematic ? ModelNodeFlags.EnableRender | ModelNodeFlags.OverrideWorldMatrix : ModelNodeFlags.Default;
-                if (!IsKinematic) model.Skeleton.NodeTransformations[BoneIndex].WorldMatrix = BoneWorldMatrixOut;
+                model.Skeleton.NodeTransformations[BoneIndex].Flags = type != RigidBodyTypes.Kinematic ? ModelNodeFlags.EnableRender | ModelNodeFlags.OverrideWorldMatrix : ModelNodeFlags.Default;
+                if (type != RigidBodyTypes.Kinematic) model.Skeleton.NodeTransformations[BoneIndex].WorldMatrix = BoneWorldMatrixOut;
             }
         }
 
@@ -417,6 +373,17 @@ private void RigidBodySetWorldTransform(ref Matrix physicsTransform)
             {
                 UpdateBoneTransformation(ref physicsTransform);
             }
+
+            if (PhysicsSystem.timeToSimulate > 0f)
+            {
+                // interpolate awaiting simulation time
+                Entity.Transform.Position += (Vector3)InternalRigidBody.InterpolationLinearVelocity * PhysicsSystem.timeToSimulate;
+                if (IgnorePhysicsRotation == false)
+                {
+                    Vector3 angSpeed = (Vector3)InternalRigidBody.InterpolationAngularVelocity * PhysicsSystem.timeToSimulate;
+                    Entity.Transform.Rotation *= Quaternion.RotationYawPitchRoll(angSpeed.X, angSpeed.Y, angSpeed.Z);
+                }
+            }
         }
 
         //This is valid for Dynamic rigidbodies (called once at initialization)
@@ -426,13 +393,10 @@ private void RigidBodyGetWorldTransform(out Matrix physicsTransform)
             Data.PhysicsComponent.Simulation.SimulationProfiler.Mark();
             Data.PhysicsComponent.Simulation.UpdatedRigidbodies++;
 
-            if (BoneIndex == -1)
-            {
-                DerivePhysicsTransformation(out physicsTransform);
-            }
-            else
-            {
-                DeriveBonePhysicsTransformation(out physicsTransform);
+            if (BoneIndex == -1) {
+                DerivePhysicsTransform(ref Entity.Transform.WorldMatrix, out physicsTransform);
+            } else {
+                DerivePhysicsTransform(ref BoneWorldMatrix, out physicsTransform);
             }
         }
 
@@ -650,5 +614,32 @@ public Vector3 LinearFactor
                 InternalRigidBody.LinearFactor = value;
             }
         }
+
+        internal class XenkoMotionState : BulletSharp.MotionState
+        {
+            public RigidbodyComponent rigidBody;
+
+            public XenkoMotionState(RigidbodyComponent rb)
+            {
+                rigidBody = rb;
+            }
+
+            public void Clear()
+            {
+                rigidBody = null;
+            }
+
+            public override void GetWorldTransform(out BulletSharp.Math.Matrix transform)
+            {
+                rigidBody.RigidBodyGetWorldTransform(out var xenkoMatrix);
+                transform = xenkoMatrix;
+            }
+
+            public override void SetWorldTransform(ref BulletSharp.Math.Matrix transform)
+            {
+                Matrix asXenkoMatrix = transform;
+                rigidBody.RigidBodySetWorldTransform(ref asXenkoMatrix);
+            }
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Elements/StaticColliderComponent.cs b/sources/engine/Xenko.Physics/Elements/StaticColliderComponent.cs
index e86d2a3aee..56bc524626 100644
--- a/sources/engine/Xenko.Physics/Elements/StaticColliderComponent.cs
+++ b/sources/engine/Xenko.Physics/Elements/StaticColliderComponent.cs
@@ -9,6 +9,9 @@ namespace Xenko.Physics
     [Display("Static collider")]
     public sealed class StaticColliderComponent : PhysicsTriggerComponentBase
     {
+        [DataMember(100)]
+        public bool AlwaysUpdateNaviMeshCache { get; set; } = false;
+
         protected override void OnAttach()
         {
             NativeCollisionObject = new BulletSharp.CollisionObject
@@ -18,7 +21,7 @@ protected override void OnAttach()
                 UserObject = this,
             };
 
-            NativeCollisionObject.CollisionFlags |= BulletSharp.CollisionFlags.NoContactResponse;
+            NativeCollisionObject.CollisionFlags |= BulletSharp.CollisionFlags.NoContactResponse | BulletSharp.CollisionFlags.StaticObject;
 
             if (ColliderShape.NeedsCustomCollisionCallback)
             {
diff --git a/sources/engine/Xenko.Physics/Engine/Heightmap.cs b/sources/engine/Xenko.Physics/Engine/Heightmap.cs
new file mode 100644
index 0000000000..992980649c
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Engine/Heightmap.cs
@@ -0,0 +1,104 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Engine.Design;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [ContentSerializer(typeof(DataContentSerializer<Heightmap>))]
+    [DataSerializerGlobal(typeof(CloneSerializer<Heightmap>), Profile = "Clone")]
+    [ReferenceSerializer, DataSerializerGlobal(typeof(ReferenceSerializer<Heightmap>), Profile = "Content")]
+    public class Heightmap
+    {
+        /// <summary>
+        /// Float height array.
+        /// </summary>
+        [DataMember(10)]
+        [Display(Browsable = false)]
+        public float[] Floats;
+
+        /// <summary>
+        /// Short height array.
+        /// </summary>
+        [DataMember(20)]
+        [Display(Browsable = false)]
+        public short[] Shorts;
+
+        /// <summary>
+        /// Byte height array.
+        /// </summary>
+        [DataMember(30)]
+        [Display(Browsable = false)]
+        public byte[] Bytes;
+
+        /// <summary>
+        /// The type of the height.
+        /// </summary>
+        [DataMember(40)]
+        [Display(Browsable = false)]
+        public HeightfieldTypes HeightType;
+
+        /// <summary>
+        /// The size of the heightmap.
+        /// </summary>
+        /// <remarks>
+        /// X is width and Y is length.
+        /// They should be greater than or equal to 2.
+        /// For example, this size should be 65 * 65 when you want 64 * 64 size in a scene.
+        /// </remarks>
+        [DataMember(50)]
+        public Int2 Size;
+
+        /// <summary>
+        /// The range of the height.
+        /// </summary>
+        /// <remarks>
+        /// X is min height and Y is max height.
+        /// (height * HeightScale) should be in this range.
+        /// Positive and negative heights can not be handle at the same time when the height type is Byte.
+        /// </remarks>
+        [DataMember(60)]
+        public Vector2 HeightRange;
+
+        /// <summary>
+        /// Used to calculate the height when the height type is Short or Byte. HeightScale should be 1 when the height type is Float.
+        /// </summary>
+        [DataMember(70)]
+        public float HeightScale;
+
+        public static Heightmap Create<T>(Int2 size, HeightfieldTypes heightType, Vector2 heightRange, float heightScale, T[] data)
+        {
+            if (data == null) throw new ArgumentNullException(nameof(data));
+
+            HeightmapUtils.CheckHeightParameters(size, heightType, heightRange, heightScale, true);
+
+            var length = size.X * size.Y;
+
+            switch (data)
+            {
+                case float[] floats when floats.Length == length: break;
+                case short[] shorts when shorts.Length == length: break;
+                case byte[] bytes when bytes.Length == length: break;
+                default: throw new ArgumentException($"{ typeof(T[]) } is not supported in { heightType } height type. Or { nameof(data) }.{ nameof(data).Length } doesn't match { nameof(size) }.");
+            }
+
+            var heightmap = new Heightmap
+            {
+                HeightType = heightType,
+                Size = size,
+                HeightRange = heightRange,
+                HeightScale = heightScale,
+                Floats = data as float[],
+                Shorts = data as short[],
+                Bytes = data as byte[],
+            };
+
+            return heightmap;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Engine/HeightmapExtensions.cs b/sources/engine/Xenko.Physics/Engine/HeightmapExtensions.cs
new file mode 100644
index 0000000000..14083805aa
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Engine/HeightmapExtensions.cs
@@ -0,0 +1,70 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Linq;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+
+namespace Xenko.Physics
+{
+    public static class HeightmapExtensions
+    {
+        public static bool IsValid([NotNull] this Heightmap heightmap)
+        {
+            if (heightmap == null) throw new ArgumentNullException(nameof(heightmap));
+
+            bool IsValidHeights()
+            {
+                var length = heightmap.Size.X * heightmap.Size.Y;
+
+                switch (heightmap.HeightType)
+                {
+                    case HeightfieldTypes.Float when heightmap.Floats != null && heightmap.Floats.Length == length:
+                        return true;
+
+                    case HeightfieldTypes.Short when heightmap.Shorts != null && heightmap.Shorts.Length == length:
+                        return true;
+
+                    case HeightfieldTypes.Byte when heightmap.Bytes != null && heightmap.Bytes.Length == length:
+                        return true;
+                }
+
+                return false;
+            }
+
+            return HeightmapUtils.CheckHeightParameters(heightmap.Size, heightmap.HeightType, heightmap.HeightRange, heightmap.HeightScale, false) &&
+                IsValidHeights();
+        }
+
+        public static Texture CreateTexture([NotNull] this Heightmap heightmap, GraphicsDevice device)
+        {
+            if (heightmap == null) throw new ArgumentNullException(nameof(heightmap));
+
+            if (device == null || !heightmap.IsValid())
+            {
+                return null;
+            }
+
+            var min = heightmap.HeightRange.X / heightmap.HeightScale;
+            var max = heightmap.HeightRange.Y / heightmap.HeightScale;
+
+            switch (heightmap.HeightType)
+            {
+                case HeightfieldTypes.Float:
+                    return Texture.New2D(device, heightmap.Size.X, heightmap.Size.Y, PixelFormat.R8_UNorm, HeightmapUtils.ConvertToByteHeights(heightmap.Floats, min, max));
+
+                case HeightfieldTypes.Short:
+                    return Texture.New2D(device, heightmap.Size.X, heightmap.Size.Y, PixelFormat.R8_UNorm,
+                        heightmap.Shorts.Select((h) => (byte)MathUtil.Clamp(MathUtil.Lerp(byte.MinValue, byte.MaxValue, MathUtil.InverseLerp(min, max, h)), byte.MinValue, byte.MaxValue)).ToArray());
+
+                case HeightfieldTypes.Byte:
+                    return Texture.New2D(device, heightmap.Size.X, heightmap.Size.Y, PixelFormat.R8_UNorm,
+                        heightmap.Bytes.Select((h) => (byte)MathUtil.Clamp(MathUtil.Lerp(byte.MinValue, byte.MaxValue, MathUtil.InverseLerp(min, max, h)), byte.MinValue, byte.MaxValue)).ToArray());
+
+                default:
+                    return null;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Engine/HeightmapUtils.cs b/sources/engine/Xenko.Physics/Engine/HeightmapUtils.cs
new file mode 100644
index 0000000000..0374a7c4f0
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Engine/HeightmapUtils.cs
@@ -0,0 +1,111 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Linq;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    public class HeightmapUtils
+    {
+        public static bool CheckHeightParameters(Int2 size, HeightfieldTypes heightType, Vector2 heightRange, float heightScale, bool throwExceptionWhenInvalid)
+        {
+            try
+            {
+                // Size
+
+                if (size.X < HeightfieldColliderShape.MinimumHeightStickWidth || size.Y < HeightfieldColliderShape.MinimumHeightStickLength)
+                {
+                    throw new ArgumentException($"{ nameof(size) } parameters should be greater than or equal to 2.");
+                }
+
+                // HeightScale
+
+                if (MathUtil.IsZero(heightScale))
+                {
+                    throw new ArgumentException($"{ nameof(heightScale) } is 0.");
+                }
+
+                if ((heightType == HeightfieldTypes.Float) && !MathUtil.IsOne(heightScale))
+                {
+                    throw new ArgumentException($"{ nameof(heightScale) } should be 1 in { heightType } type.");
+                }
+
+                // HeightRange
+
+                if (heightRange.Y < heightRange.X)
+                {
+                    throw new ArgumentException($"{ nameof(heightRange) }.{ nameof(heightRange.Y) } should be greater than { nameof(heightRange.X) }.");
+                }
+
+                if (Math.Abs((heightRange.Y / heightScale) - (heightRange.X / heightScale)) < 1)
+                {
+                    throw new ArgumentException($"{ nameof(heightRange) } is too short.");
+                }
+
+                if ((heightType == HeightfieldTypes.Byte) &&
+                    (Math.Sign(heightRange.X) + Math.Sign(heightRange.Y)) == 0)
+                {
+                    throw new ArgumentException($"Can't handle { nameof(heightRange) } included both of positive and negative in { heightType } type.");
+                }
+            }
+            catch (ArgumentException)
+            {
+                if (throwExceptionWhenInvalid) throw;
+
+                return false;
+            }
+
+            return true;
+        }
+
+        public static float ConvertToFloatHeight(float minValue, float maxValue, float value) => MathUtil.InverseLerp(minValue, maxValue, MathUtil.Clamp(value, minValue, maxValue)) * 2 - 1;
+        public static short ConvertToShortHeight(float minValue, float maxValue, float value) => (short)Math.Round(ConvertToFloatHeight(minValue, maxValue, value) * short.MaxValue, MidpointRounding.AwayFromZero);
+        public static byte ConvertToByteHeight(float minValue, float maxValue, float value) => (byte)Math.Round(MathUtil.InverseLerp(minValue, maxValue, MathUtil.Clamp(value, minValue, maxValue)) * byte.MaxValue, MidpointRounding.AwayFromZero);
+
+        public static float[] ConvertToFloatHeights(float[] values, float minValue, float maxValue) => values.Select((v) => ConvertToFloatHeight(minValue, maxValue, v)).ToArray();
+        public static float[] ConvertToFloatHeights(short[] values, short minValue = short.MinValue, short maxValue = short.MaxValue) => values.Select((v) => ConvertToFloatHeight(minValue, maxValue, v)).ToArray();
+        public static float[] ConvertToFloatHeights(byte[] values, byte minValue = byte.MinValue, byte maxValue = byte.MaxValue) => values.Select((v) => ConvertToFloatHeight(minValue, maxValue, v)).ToArray();
+
+        public static short[] ConvertToShortHeights(float[] values, float minValue, float maxValue) => values.Select((v) => ConvertToShortHeight(minValue, maxValue, v)).ToArray();
+        public static short[] ConvertToShortHeights(short[] values, short minValue = short.MinValue, short maxValue = short.MaxValue) => values.Select((v) => ConvertToShortHeight(minValue, maxValue, v)).ToArray();
+        public static short[] ConvertToShortHeights(byte[] values, byte minValue = byte.MinValue, byte maxValue = byte.MaxValue) => values.Select((v) => ConvertToShortHeight(minValue, maxValue, v)).ToArray();
+
+        public static byte[] ConvertToByteHeights(float[] values, float minValue, float maxValue) => values.Select((v) => ConvertToByteHeight(minValue, maxValue, v)).ToArray();
+        public static byte[] ConvertToByteHeights(short[] values, short minValue = short.MinValue, short maxValue = short.MaxValue) => values.Select((v) => ConvertToByteHeight(minValue, maxValue, v)).ToArray();
+
+        public static T[] Resize<T>(T[] pixels, Int2 originalSize, Int2 newSize)
+        {
+            if (originalSize.X < 1 || originalSize.Y < 1) throw new ArgumentException($"{ nameof(originalSize) }.{ nameof(originalSize.X) } and { nameof(originalSize.Y) } should be greater than 0.");
+            if (newSize.X < 1 || newSize.Y < 1) throw new ArgumentException($"{ nameof(newSize) }.{ nameof(newSize.X) } and { nameof(newSize.Y) } should be greater than 0.");
+
+            if (originalSize.Equals(newSize))
+            {
+                return pixels.ToArray();
+            }
+
+            var originalWidth = originalSize.X;
+            var originalLength = originalSize.Y;
+            var newWidth = newSize.X;
+            var newLength = newSize.Y;
+
+            var scaleX = (newWidth - 1) == 0 ? 0d : ((double)(originalWidth - 1)) / (newWidth - 1);
+            var scaleY = (newLength - 1) == 0 ? 0d : ((double)(originalLength - 1)) / (newLength - 1);
+
+            int GetOriginalIndex(int x, int y) =>
+                (int)Math.Round(y * scaleY, MidpointRounding.AwayFromZero) * originalWidth +
+                (int)Math.Round(x * scaleX, MidpointRounding.AwayFromZero);
+
+            T[] newPixels = new T[newWidth * newLength];
+            for (int y = 0; y < newLength; ++y)
+            {
+                for (int x = 0; x < newWidth; ++x)
+                {
+                    newPixels[y * newWidth + x] = pixels[GetOriginalIndex(x, y)];
+                }
+            }
+
+            return newPixels;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Engine/PhysicsColliderShape.cs b/sources/engine/Xenko.Physics/Engine/PhysicsColliderShape.cs
index 9cb1b941b8..41b3473061 100644
--- a/sources/engine/Xenko.Physics/Engine/PhysicsColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Engine/PhysicsColliderShape.cs
@@ -60,7 +60,7 @@ internal static ColliderShape Compose(IReadOnlyList<IAssetColliderShapeDesc> des
             {
                 res = CreateShape(descs[0]);
                 if (res == null) return null;
-                res.IsPartOfAsset = true;
+                res.DoNotDispose = true;
             }
             else if (descs.Count > 1) //need a compound shape in this case
             {
@@ -72,7 +72,7 @@ internal static ColliderShape Compose(IReadOnlyList<IAssetColliderShapeDesc> des
                     compound.AddChildShape(subShape);
                 }
                 res = compound;
-                res.IsPartOfAsset = true;
+                res.DoNotDispose = true;
             }
 
             return res;
@@ -83,152 +83,9 @@ internal static ColliderShape CreateShape(IColliderShapeDesc desc)
             if (desc == null)
                 return null;
 
-            ColliderShape shape = null;
-
-            var type = desc.GetType();
-            if (type == typeof(BoxColliderShapeDesc))
-            {
-                var boxDesc = (BoxColliderShapeDesc)desc;
-                shape = new BoxColliderShape(boxDesc.Is2D, boxDesc.Size) { LocalOffset = boxDesc.LocalOffset, LocalRotation = boxDesc.LocalRotation };
-            }
-            else if (type == typeof(CapsuleColliderShapeDesc))
-            {
-                var capsuleDesc = (CapsuleColliderShapeDesc)desc;
-                shape = new CapsuleColliderShape(capsuleDesc.Is2D, capsuleDesc.Radius, capsuleDesc.Length, capsuleDesc.Orientation) { LocalOffset = capsuleDesc.LocalOffset, LocalRotation = capsuleDesc.LocalRotation };
-            }
-            else if (type == typeof(CylinderColliderShapeDesc))
-            {
-                var cylinderDesc = (CylinderColliderShapeDesc)desc;
-                shape = new CylinderColliderShape(cylinderDesc.Height, cylinderDesc.Radius, cylinderDesc.Orientation) { LocalOffset = cylinderDesc.LocalOffset, LocalRotation = cylinderDesc.LocalRotation };
-            }
-            else if (type == typeof(ConeColliderShapeDesc))
-            {
-                var coneDesc = (ConeColliderShapeDesc)desc;
-                shape = new ConeColliderShape(coneDesc.Height, coneDesc.Radius, coneDesc.Orientation) { LocalOffset = coneDesc.LocalOffset, LocalRotation = coneDesc.LocalRotation };
-            }
-            else if (type == typeof(SphereColliderShapeDesc))
-            {
-                var sphereDesc = (SphereColliderShapeDesc)desc;
-                shape = new SphereColliderShape(sphereDesc.Is2D, sphereDesc.Radius) { LocalOffset = sphereDesc.LocalOffset };
-            }
-            else if (type == typeof(StaticPlaneColliderShapeDesc))
-            {
-                var planeDesc = (StaticPlaneColliderShapeDesc)desc;
-                shape = new StaticPlaneColliderShape(planeDesc.Normal, planeDesc.Offset);
-            }
-            else if (type == typeof(ConvexHullColliderShapeDesc))
-            {
-                var convexDesc = (ConvexHullColliderShapeDesc)desc;
-
-                if (convexDesc.ConvexHulls == null) return null;
-
-                //Optimize performance and focus on less shapes creation since this shape could be nested
-
-                if (convexDesc.ConvexHulls.Count == 1)
-                {
-                    if (convexDesc.ConvexHulls[0].Count == 1 && convexDesc.ConvexHullsIndices[0][0].Count > 0)
-                    {
-                        shape = new ConvexHullColliderShape(convexDesc.ConvexHulls[0][0], convexDesc.ConvexHullsIndices[0][0], convexDesc.Scaling)
-                        {
-                            NeedsCustomCollisionCallback = true,
-                        };
-
-                        //shape.UpdateLocalTransformations();
-                        shape.Description = desc;
-
-                        return shape;
-                    }
-
-                    if (convexDesc.ConvexHulls[0].Count <= 1) return null;
-
-                    var subCompound = new CompoundColliderShape
-                    {
-                        NeedsCustomCollisionCallback = true,
-                    };
-
-                    for (var i = 0; i < convexDesc.ConvexHulls[0].Count; i++)
-                    {
-                        var verts = convexDesc.ConvexHulls[0][i];
-                        var indices = convexDesc.ConvexHullsIndices[0][i];
-
-                        if (indices.Count == 0) continue;
-
-                        var subHull = new ConvexHullColliderShape(verts, indices, convexDesc.Scaling);
-                        //subHull.UpdateLocalTransformations();
-                        subCompound.AddChildShape(subHull);
-                    }
-
-                    //subCompound.UpdateLocalTransformations();
-                    subCompound.Description = desc;
-
-                    return subCompound;
-                }
-
-                if (convexDesc.ConvexHulls.Count <= 1) return null;
-
-                var compound = new CompoundColliderShape
-                {
-                    NeedsCustomCollisionCallback = true,
-                };
-
-                for (var i = 0; i < convexDesc.ConvexHulls.Count; i++)
-                {
-                    var verts = convexDesc.ConvexHulls[i];
-                    var indices = convexDesc.ConvexHullsIndices[i];
-
-                    if (verts.Count == 1)
-                    {
-                        if (indices[0].Count == 0) continue;
-
-                        var subHull = new ConvexHullColliderShape(verts[0], indices[0], convexDesc.Scaling);
-                        //subHull.UpdateLocalTransformations();
-                        compound.AddChildShape(subHull);
-                    }
-                    else if (verts.Count > 1)
-                    {
-                        var subCompound = new CompoundColliderShape();
-
-                        for (var b = 0; b < verts.Count; b++)
-                        {
-                            var subVerts = verts[b];
-                            var subIndex = indices[b];
-
-                            if (subIndex.Count == 0) continue;
-
-                            var subHull = new ConvexHullColliderShape(subVerts, subIndex, convexDesc.Scaling);
-                            //subHull.UpdateLocalTransformations();
-                            subCompound.AddChildShape(subHull);
-                        }
-
-                        //subCompound.UpdateLocalTransformations();
-
-                        compound.AddChildShape(subCompound);
-                    }
-                }
-
-                //compound.UpdateLocalTransformations();
-                compound.Description = desc;
-
-                return compound;
-            }
-            else if (type == typeof(ColliderShapeAssetDesc))
-            {
-                var assetDesc = (ColliderShapeAssetDesc)desc;
-
-                if (assetDesc.Shape == null)
-                {
-                    return null;
-                }
-
-                if (assetDesc.Shape.Shape == null)
-                {
-                    assetDesc.Shape.Shape = Compose(assetDesc.Shape.Descriptions);
-                }
-
-                shape = assetDesc.Shape.Shape;
-            }
-
-            if (shape == null) return shape;
+            ColliderShape shape = desc.CreateShape();
+            
+            if (shape == null) return null;
 
             //shape.UpdateLocalTransformations();
             shape.Description = desc;
diff --git a/sources/engine/Xenko.Physics/Engine/PhysicsComponent.cs b/sources/engine/Xenko.Physics/Engine/PhysicsComponent.cs
index bc815cfc31..eb4a641503 100644
--- a/sources/engine/Xenko.Physics/Engine/PhysicsComponent.cs
+++ b/sources/engine/Xenko.Physics/Engine/PhysicsComponent.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using Xenko.Core;
 using Xenko.Core.Annotations;
@@ -16,6 +17,12 @@
 
 namespace Xenko.Engine
 {
+    public enum CollisionState
+    {
+        Ignore,
+        Detect
+    }
+    
     [DataContract("PhysicsComponent", Inherited = true)]
     [Display("Physics", Expand = ExpandRule.Once)]
     [DefaultEntityComponentProcessor(typeof(PhysicsProcessor))]
@@ -28,19 +35,13 @@ public abstract class PhysicsComponent : ActivableEntityComponent
 
         static PhysicsComponent()
         {
-            // Preload proper libbulletc native library (depending on CPU type)
-            NativeLibrary.PreloadLibrary("libbulletc.dll", typeof(PhysicsComponent));
         }
 
         protected PhysicsComponent()
         {
             CanScaleShape = true;
 
-            ColliderShapes = new TrackingCollection<IInlineColliderShapeDesc>();
-            ColliderShapes.CollectionChanged += (sender, args) =>
-            {
-                ColliderShapeChanged = true;
-            };
+            ColliderShapes = new ColliderShapeCollection(this);
 
             NewPairChannel = new Channel<Collision> { Preference = ChannelPreference.PreferSender };
             PairEndedChannel = new Channel<Collision> { Preference = ChannelPreference.PreferSender };
@@ -49,13 +50,23 @@ protected PhysicsComponent()
         [DataMemberIgnore]
         internal BulletSharp.CollisionObject NativeCollisionObject;
 
+        /// <summary>
+        /// Get the internal native collision object
+        /// </summary>
+        [DataMemberIgnore]
+        public object NativeObject {
+            get {
+                return NativeCollisionObject;
+            }
+        }
+
         /// <userdoc>
         /// The reference to the collider shape of this element.
         /// </userdoc>
         [DataMember(200)]
         [Category]
         [MemberCollection(NotNullItems = true)]
-        public TrackingCollection<IInlineColliderShapeDesc> ColliderShapes { get; }
+        public ColliderShapeCollection ColliderShapes { get; }
 
         /// <summary>
         /// Gets or sets the collision group.
@@ -92,7 +103,7 @@ protected PhysicsComponent()
         public CollisionFilterGroupFlags CanCollideWith { get; set; } = CollisionFilterGroupFlags.AllFilter;
 
         /// <summary>
-        /// Gets or sets if this element will store collisions
+        /// Gets or sets if this element will use async methods to process collisions & populate Collisions
         /// </summary>
         /// <value>
         /// true, false
@@ -104,6 +115,57 @@ protected PhysicsComponent()
         [DataMemberIgnore]
         public bool ProcessCollisions { get; set; } = false;
 
+        /// <summary>
+        /// Gets or sets if this element will store collisions in CurrentPhysicalContacts. Uses less CPU than ProcessCollisions
+        /// </summary>
+        /// <value>
+        /// true, false
+        /// </value>
+        /// <userdoc>
+        /// Stores contact points in a simple CurrentPhysicalContacts list, instead of new/update/ended events. Uses less CPU than ProcessCollisions and is multithreading supported
+        /// </userdoc>
+        [Display("Simple collision storage")]
+        [DataMemberIgnore]
+        public bool ProcessCollisionsSlim {
+            get {
+                return _ProcessCollisionsSlim;
+            }
+            set {
+                if (value && processingPhysicalContacts == null)
+                {
+                    processingPhysicalContacts = new List<ContactPoint>[2];
+                    processingPhysicalContacts[0] = new List<ContactPoint>();
+                    processingPhysicalContacts[1] = new List<ContactPoint>();
+                }
+                _ProcessCollisionsSlim = value;
+            }
+        }
+        private bool _ProcessCollisionsSlim = false;
+
+        /// <summary>
+        /// If we are using ProcessCollisionSlim, this list will maintain all current collisions
+        /// </summary>
+        [DataMemberIgnore]
+        public List<ContactPoint> CollectCurrentSlimContacts
+        {
+            get
+            {
+                if (processingPhysicalContacts == null) return null;
+
+                if (Simulation.simulationLocker == null)
+                {
+                    // not multithreaded, just return the current list
+                    return processingPhysicalContacts[processingPhysicalContactsIndex];
+                }
+
+                // multithreaded, construct a new list
+                return new List<ContactPoint>(processingPhysicalContacts[processingPhysicalContactsIndex]);
+            }
+        }
+
+        internal List<ContactPoint>[] processingPhysicalContacts;
+        internal int processingPhysicalContactsIndex;
+
         /// <summary>
         /// Gets or sets if this element is enabled in the physics engine
         /// </summary>
@@ -331,6 +393,21 @@ public float CcdSweptSphereRadius
             }
         }
 
+
+        private Dictionary<PhysicsComponent, CollisionState> ignoreCollisionBuffer;
+        
+        /// <summary>
+        /// When updating the associated TransformComponent, should we not set rotation?
+        /// </summary>
+        [DataMember(69)]
+        public bool IgnorePhysicsRotation = false;
+
+        /// <summary>
+        /// Keep this rigidbody around for reuse when detached? Defaults to false
+        /// </summary>
+        [DataMember(70)]
+        public bool DoNotDispose;
+
         #region Ignore or Private/Internal
 
         [DataMemberIgnore]
@@ -361,6 +438,9 @@ public ChannelMicroThreadAwaiter<Collision> CollisionEnded()
         [DataMemberIgnore]
         public bool ColliderShapeChanged { get; private set; }
 
+        [DataMemberIgnore]
+        public Vector3? LocalPhysicsOffset = null;
+
         [DataMemberIgnore]
         protected ColliderShape colliderShape;
 
@@ -443,6 +523,19 @@ public void RemoveDebugEntity(Scene scene)
             DebugEntity = null;
         }
 
+        /// <summary>
+        /// Sets the physics transformation. You can supply any or all parameters; null parameters will be filled in with the current
+        /// entity's WorldMatrix information. Returns false if no native physics object exists yet, and the entity's transform should
+        /// be set instead.
+        /// </summary>
+        public bool SetPhysicsTransform(Vector3? worldPosition = null, Matrix? worldRotation = null, Vector3? worldScale = null) 
+        {
+            if (NativeCollisionObject == null) return false;
+            DerivePhysicsTransform(worldPosition, worldRotation, worldScale, out Matrix outMatrix);
+            PhysicsWorldTransform = outMatrix;
+            return true;
+        }
+
         #endregion Ignore or Private/Internal
 
         #region Utility
@@ -451,51 +544,31 @@ public void RemoveDebugEntity(Scene scene)
         /// Computes the physics transformation from the TransformComponent values
         /// </summary>
         /// <returns></returns>
-        internal void DerivePhysicsTransformation(out Matrix derivedTransformation)
+        internal void DerivePhysicsTransform(ref Matrix fromMatrix, out Matrix outMatrix)
         {
-            Matrix rotation;
-            Vector3 translation;
-            Vector3 scale;
-            Entity.Transform.WorldMatrix.Decompose(out scale, out rotation, out translation);
+            fromMatrix.Decompose(out Vector3 scale, out Matrix rotation, out Vector3 translation);
+            DerivePhysicsTransform(translation, rotation, scale, out outMatrix);
+        }
 
-            var translationMatrix = Matrix.Translation(translation);
-            Matrix.Multiply(ref rotation, ref translationMatrix, out derivedTransformation);
+        internal void DerivePhysicsTransform(Vector3? worldPosition, Matrix? worldRotation, Vector3? worldScale, out Matrix outMatrix)
+        {
+            Vector3 translation = worldPosition ?? Entity.Transform.WorldPosition(), scale;
+            Matrix rotation;
 
-            //handle dynamic scaling if allowed (aka not using assets)
-            if (CanScaleShape)
-            {
-                if (ColliderShape.Scaling != scale)
-                {
-                    ColliderShape.Scaling = scale;
-                }
+            if( worldScale.HasValue ) {
+                scale = worldScale.Value;
+            } else {
+                Entity.Transform.WorldMatrix.GetScale(out scale);
             }
 
-            //Handle collider shape offset
-            if (ColliderShape.LocalOffset != Vector3.Zero || ColliderShape.LocalRotation != Quaternion.Identity)
-            {
-                derivedTransformation = Matrix.Multiply(ColliderShape.PositiveCenterMatrix, derivedTransformation);
+            if (worldRotation.HasValue) {
+                rotation = worldRotation.Value;
+            } else {
+                Entity.Transform.WorldMatrix.GetRotationMatrix(out rotation);
             }
 
-            if (DebugEntity == null) return;
-
-            derivedTransformation.Decompose(out scale, out rotation, out translation);
-            DebugEntity.Transform.Position = translation;
-            DebugEntity.Transform.Rotation = Quaternion.RotationMatrix(rotation);
-        }
-
-        /// <summary>
-        /// Computes the physics transformation from the TransformComponent values
-        /// </summary>
-        /// <returns></returns>
-        internal void DeriveBonePhysicsTransformation(out Matrix derivedTransformation)
-        {
-            Matrix rotation;
-            Vector3 translation;
-            Vector3 scale;
-            BoneWorldMatrix.Decompose(out scale, out rotation, out translation);
-
             var translationMatrix = Matrix.Translation(translation);
-            Matrix.Multiply(ref rotation, ref translationMatrix, out derivedTransformation);
+            Matrix.Multiply(ref rotation, ref translationMatrix, out outMatrix);
 
             //handle dynamic scaling if allowed (aka not using assets)
             if (CanScaleShape)
@@ -509,12 +582,12 @@ internal void DeriveBonePhysicsTransformation(out Matrix derivedTransformation)
             //Handle collider shape offset
             if (ColliderShape.LocalOffset != Vector3.Zero || ColliderShape.LocalRotation != Quaternion.Identity)
             {
-                derivedTransformation = Matrix.Multiply(ColliderShape.PositiveCenterMatrix, derivedTransformation);
+                outMatrix = Matrix.Multiply(ColliderShape.PositiveCenterMatrix, outMatrix);
             }
 
             if (DebugEntity == null) return;
 
-            derivedTransformation.Decompose(out scale, out rotation, out translation);
+            outMatrix.Decompose(out scale, out rotation, out translation);
             DebugEntity.Transform.Position = translation;
             DebugEntity.Transform.Rotation = Quaternion.RotationMatrix(rotation);
         }
@@ -542,10 +615,9 @@ internal void UpdateTransformationComponent(ref Matrix physicsTransform)
 
             entity.Transform.UpdateLocalFromWorld();
 
-            Quaternion rotQuat;
-            entity.Transform.LocalMatrix.Decompose(out scale, out rotQuat, out translation);
-            entity.Transform.Position = translation;
-            entity.Transform.Rotation = rotQuat;
+            entity.Transform.Position = entity.Transform.LocalMatrix.TranslationVector;
+            if (LocalPhysicsOffset.HasValue) entity.Transform.Position += LocalPhysicsOffset.Value;
+            if (IgnorePhysicsRotation == false) entity.Transform.LocalMatrix.GetRotationQuaternion(out entity.Transform.Rotation);
 
             if (DebugEntity == null) return;
 
@@ -600,15 +672,11 @@ internal void UpdateBoneTransformation(ref Matrix physicsTransform)
         public void UpdatePhysicsTransformation()
         {
             Matrix transform;
-            if (BoneIndex == -1)
-            {
-                DerivePhysicsTransformation(out transform);
-            }
-            else
-            {
-                DeriveBonePhysicsTransformation(out transform);
+            if (BoneIndex == -1) {
+                DerivePhysicsTransform(ref Entity.Transform.WorldMatrix, out transform);
+            } else {
+                DerivePhysicsTransform(ref BoneWorldMatrix, out transform);
             }
-            //finally copy back to bullet
             PhysicsWorldTransform = transform;
         }
 
@@ -618,7 +686,7 @@ public void ComposeShape()
 
             if (ColliderShape != null)
             {
-                if (!ColliderShape.IsPartOfAsset)
+                if (!ColliderShape.DoNotDispose && !SceneSystem.physicsDoNotDisposeNextRemoval)
                 {
                     ColliderShape.Dispose();
                     ColliderShape = null;
@@ -640,13 +708,6 @@ public void ComposeShape()
                 }
 
                 ColliderShape = PhysicsColliderShape.CreateShape(ColliderShapes[0]);
-
-                if (ColliderShape != null)
-                {
-                    ColliderShape.Scaling = Vector3.One;
-                }
-
-                //ColliderShape?.UpdateLocalTransformations();
             }
             else if (ColliderShapes.Count > 1) //need a compound shape in this case
             {
@@ -667,10 +728,12 @@ public void ComposeShape()
                 }
 
                 ColliderShape = compound;
+            }
 
-                ColliderShape.Scaling = Vector3.One;
-
-                //ColliderShape.UpdateLocalTransformations();
+            if (ColliderShape != null)
+            {
+                // Force update internal shape and gizmo scaling
+                ColliderShape.Scaling = ColliderShape.Scaling;
             }
         }
 
@@ -689,28 +752,44 @@ internal void Attach(PhysicsProcessor.AssociatedData data)
             //this is not optimal as UpdateWorldMatrix will end up being called twice this frame.. but we need to ensure that we have valid data.
             Entity.Transform.UpdateWorldMatrix();
 
-            if (ColliderShapes.Count == 0)
+            // if we don't already have a collidershape, try to construct one with ColliderShapes
+            if (ColliderShape == null)
             {
-                logger.Error($"Entity {Entity.Name} has a PhysicsComponent without any collider shape.");
-                return; //no shape no purpose
-            }
+                if (ColliderShapes.Count == 0)
+                {
+                    logger.Error($"Entity {Entity.Name} has a PhysicsComponent without any collider shape.");
+                    return; //no shape no purpose
+                }
 
-            if (ColliderShape == null) ComposeShape();
+                ComposeShape();
 
-            if (ColliderShape == null)
-            {
-                logger.Error($"Entity {Entity.Name} has a PhysicsComponent but it failed to compose the collider shape.");
-                return; //no shape no purpose
+                if (ColliderShape == null)
+                {
+                    logger.Error($"Entity {Entity.Name} has a PhysicsComponent but it failed to compose the collider shape.");
+                    return; //no shape no purpose
+                }
+
+                // carry over DoNotDispose state
+                ColliderShape.DoNotDispose = DoNotDispose;
             }
 
             BoneIndex = -1;
 
             OnAttach();
+
+            if(ignoreCollisionBuffer != null && NativeCollisionObject != null)
+            {
+                foreach(var kvp in ignoreCollisionBuffer)
+                {
+                    IgnoreCollisionWith(kvp.Key, kvp.Value);
+                }
+                ignoreCollisionBuffer = null;
+            }
         }
 
         internal void Detach()
         {
-            Data = null;
+            if (!DoNotDispose) Data = null;
 
             //this is mostly required for the game studio gizmos
             if (Simulation.DisableSimulation)
@@ -721,7 +800,7 @@ internal void Detach()
             // Actually call the detach
             OnDetach();
 
-            if (ColliderShape != null && !ColliderShape.IsPartOfAsset)
+            if (ColliderShape != null && !ColliderShape.DoNotDispose && !Xenko.Engine.SceneSystem.physicsDoNotDisposeNextRemoval)
             {
                 ColliderShape.Dispose();
                 ColliderShape = null;
@@ -742,7 +821,13 @@ protected virtual void OnAttach()
 
         protected virtual void OnDetach()
         {
-            if (NativeCollisionObject == null) return;
+            if (processingPhysicalContacts != null)
+            {
+                processingPhysicalContacts[0].Clear();
+                processingPhysicalContacts[1].Clear();
+            }
+
+            if (NativeCollisionObject == null || DoNotDispose) return;
 
             NativeCollisionObject.UserObject = null;
             NativeCollisionObject.Dispose();
@@ -779,5 +864,113 @@ protected virtual void OnUpdateBones()
             var model = Data.ModelComponent;
             BoneWorldMatrix = model.Skeleton.NodeTransformations[BoneIndex].WorldMatrix;
         }
+
+        public void IgnoreCollisionWith(PhysicsComponent other, CollisionState state)
+        {
+            var otherNative = other.NativeCollisionObject;
+            if(NativeCollisionObject == null || other.NativeCollisionObject == null)
+            {
+                if(ignoreCollisionBuffer != null || other.ignoreCollisionBuffer == null)
+                {
+                    if(ignoreCollisionBuffer == null)
+                        ignoreCollisionBuffer = new Dictionary<PhysicsComponent, CollisionState>();
+                    if(ignoreCollisionBuffer.ContainsKey(other))
+                        ignoreCollisionBuffer[other] = state;
+                    else
+                        ignoreCollisionBuffer.Add(other, state);
+                }
+                else
+                {
+                    other.IgnoreCollisionWith(this, state);
+                }
+                return;
+            }
+            
+            switch(state)
+            {
+                // Note that we're calling 'SetIgnoreCollisionCheck' on both objects as bullet doesn't
+                // do it itself ; One of the object in the pair will report that it doesn't ignore
+                // collision with the other even though you set the other as ignoring the former.
+                case CollisionState.Ignore:
+                {
+                    // Bullet uses an array per collision object to store all of the objects to ignore,
+                    // when calling this method it adds the referenced object without checking for duplicates,
+                    // so if a user where to call 'Ignore' of this function on this object n-times he'll have to call it
+                    // that same amount of time to re-detect them instead of just once.
+                    // We're calling false here to remove a previous ignore if there was any and re-ignoring
+                    // to force it to have only a single instance.
+                    otherNative.SetIgnoreCollisionCheck(NativeCollisionObject, false);
+                    NativeCollisionObject.SetIgnoreCollisionCheck(otherNative, false);
+                    otherNative.SetIgnoreCollisionCheck(NativeCollisionObject, true);
+                    NativeCollisionObject.SetIgnoreCollisionCheck(otherNative, true);
+                    break;
+                }
+                case CollisionState.Detect:
+                {
+                    otherNative.SetIgnoreCollisionCheck(NativeCollisionObject, false);
+                    NativeCollisionObject.SetIgnoreCollisionCheck(otherNative, false);
+                    break;
+                }
+            }
+        }
+
+        public bool IsIgnoringCollisionWith(PhysicsComponent other)
+        {
+            if(ignoreCollisionBuffer != null)
+            {
+                return ignoreCollisionBuffer.TryGetValue(other, out var state) && state == CollisionState.Ignore;
+            }
+            else if(other.ignoreCollisionBuffer != null)
+            {
+                return other.IsIgnoringCollisionWith(this);
+            }
+            else if(other.NativeCollisionObject == null || NativeCollisionObject == null)
+            {
+                return false;
+            }
+            else
+            {
+                return ! NativeCollisionObject.CheckCollideWith(other.NativeCollisionObject);
+            }
+        }
+
+        [DataContract]
+        public class ColliderShapeCollection : FastCollection<IInlineColliderShapeDesc>
+        {
+            PhysicsComponent component;
+
+            public ColliderShapeCollection(PhysicsComponent componentParam)
+            {
+                component = componentParam;
+            }
+
+            /// <inheritdoc/>
+            protected override void InsertItem(int index, IInlineColliderShapeDesc item)
+            {
+                base.InsertItem(index, item);
+                component.ColliderShapeChanged = true;
+            }
+
+            /// <inheritdoc/>
+            protected override void RemoveItem(int index)
+            {
+                base.RemoveItem(index);
+                component.ColliderShapeChanged = true;
+            }
+
+            /// <inheritdoc/>
+            protected override void ClearItems()
+            {
+                base.ClearItems();
+                component.ColliderShapeChanged = true;
+            }
+
+            /// <inheritdoc/>
+            protected override void SetItem(int index, IInlineColliderShapeDesc item)
+            {
+                base.SetItem(index, item);
+                component.ColliderShapeChanged = true;
+            }
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Engine/PhysicsDebugShapeMaterial.cs b/sources/engine/Xenko.Physics/Engine/PhysicsDebugShapeMaterial.cs
index 478db31a36..278877f411 100644
--- a/sources/engine/Xenko.Physics/Engine/PhysicsDebugShapeMaterial.cs
+++ b/sources/engine/Xenko.Physics/Engine/PhysicsDebugShapeMaterial.cs
@@ -43,10 +43,11 @@ private static Material CreateInternal(GraphicsDevice device, Color color, float
             });
 
             // set the color to the material
-            material.Passes[0].Parameters.Set(MaterialKeys.DiffuseValue, new Color4(color).ToColorSpace(device.ColorSpace));
+            var materialColor = new Color4(color).ToColorSpace(device.ColorSpace);
+            material.Passes[0].Parameters.Set(MaterialKeys.DiffuseValue, ref materialColor);
 
             material.Passes[0].Parameters.Set(MaterialKeys.EmissiveIntensity, intensity);
-            material.Passes[0].Parameters.Set(MaterialKeys.EmissiveValue, new Color4(color).ToColorSpace(device.ColorSpace));
+            material.Passes[0].Parameters.Set(MaterialKeys.EmissiveValue, ref materialColor);
 
             return material;
         }
diff --git a/sources/engine/Xenko.Physics/Engine/PhysicsProcessor.cs b/sources/engine/Xenko.Physics/Engine/PhysicsProcessor.cs
index e6d61ef1f0..8c63b3f2b8 100644
--- a/sources/engine/Xenko.Physics/Engine/PhysicsProcessor.cs
+++ b/sources/engine/Xenko.Physics/Engine/PhysicsProcessor.cs
@@ -9,6 +9,7 @@
 using Xenko.Games;
 using Xenko.Physics.Engine;
 using Xenko.Rendering;
+using System;
 
 namespace Xenko.Physics
 {
@@ -22,11 +23,11 @@ public class AssociatedData
             public bool BoneMatricesUpdated;
         }
 
-        private readonly List<PhysicsComponent> elements = new List<PhysicsComponent>();
-        private readonly List<PhysicsSkinnedComponentBase> boneElements = new List<PhysicsSkinnedComponentBase>();
-        private readonly List<CharacterComponent> characters = new List<CharacterComponent>();
+        private readonly HashSet<PhysicsComponent> elements = new HashSet<PhysicsComponent>();
+        private readonly HashSet<PhysicsSkinnedComponentBase> boneElements = new HashSet<PhysicsSkinnedComponentBase>();
+        private readonly HashSet<CharacterComponent> characters = new HashSet<CharacterComponent>();
 
-        private Bullet2PhysicsSystem physicsSystem;
+        private PhysicsSystem physicsSystem;
         private SceneSystem sceneSystem;
         private Scene debugScene;
 
@@ -103,12 +104,26 @@ protected override bool IsAssociatedDataValid(Entity entity, PhysicsComponent ph
 
         protected override void OnEntityComponentAdding(Entity entity, PhysicsComponent component, AssociatedData data)
         {
+            // wait, are we already added?
+            if (elements.Contains(component))
+            {
+                // make sure we are not removing it
+                lock (currentFrameRemovals)
+                {
+                    currentFrameRemovals.Remove(component);
+                }
+                return;
+            }
+
             component.Attach(data);
 
             var character = component as CharacterComponent;
             if (character != null)
             {
-                characters.Add(character);
+                lock (characters)
+                {
+                    characters.Add(character);
+                }
             }
 
             if (colliderShapesRendering)
@@ -120,7 +135,10 @@ protected override void OnEntityComponentAdding(Entity entity, PhysicsComponent
 
             if (component.BoneIndex != -1)
             {
-                boneElements.Add((PhysicsSkinnedComponentBase)component);
+                lock (boneElements)
+                {
+                    boneElements.Add((PhysicsSkinnedComponentBase)component);
+                }
             }
         }
 
@@ -130,7 +148,10 @@ private void ComponentRemoval(PhysicsComponent component)
 
             if (component.BoneIndex != -1)
             {
-                boneElements.Remove((PhysicsSkinnedComponentBase)component);
+                lock (boneElements)
+                {
+                    boneElements.Remove((PhysicsSkinnedComponentBase)component);
+                }
             }
 
             elements.Remove(component);
@@ -143,25 +164,31 @@ private void ComponentRemoval(PhysicsComponent component)
             var character = component as CharacterComponent;
             if (character != null)
             {
-                characters.Remove(character);
+                lock (characters)
+                {
+                    characters.Remove(character);
+                }
             }
 
             component.Detach();
         }
 
-        private readonly List<PhysicsComponent> currentFrameRemovals = new List<PhysicsComponent>();
+        private readonly HashSet<PhysicsComponent> currentFrameRemovals = new HashSet<PhysicsComponent>();
 
         protected override void OnEntityComponentRemoved(Entity entity, PhysicsComponent component, AssociatedData data)
         {
-            currentFrameRemovals.Add(component);
+            lock (currentFrameRemovals)
+            {
+                currentFrameRemovals.Add(component);
+            }
         }
 
-        protected override void OnSystemAdd()
+        protected internal override void OnSystemAdd()
         {
-            physicsSystem = (Bullet2PhysicsSystem)Services.GetService<IPhysicsSystem>();
+            physicsSystem = (PhysicsSystem)Services.GetService<IPhysicsSystem>();
             if (physicsSystem == null)
             {
-                physicsSystem = new Bullet2PhysicsSystem(Services);
+                physicsSystem = new PhysicsSystem(Services);
                 Services.AddService<IPhysicsSystem>(physicsSystem);
                 var gameSystems = Services.GetSafeServiceAs<IGameSystemCollection>();
                 gameSystems.Add(physicsSystem);
@@ -177,12 +204,12 @@ protected override void OnSystemAdd()
                 gameSystems.Add(debugShapeRendering);
             }
 
-            Simulation = physicsSystem.Create(this);
+            Simulation = OverlapTest.mySimulation = physicsSystem.Create(this) as Simulation;
 
             sceneSystem = Services.GetSafeServiceAs<SceneSystem>();
         }
 
-        protected override void OnSystemRemove()
+        protected internal override void OnSystemRemove()
         {
             physicsSystem.Release(this);
             ((IReferencable)physicsSystem).Release();
@@ -193,24 +220,27 @@ internal void UpdateCharacters()
             var charactersProfilingState = Profiler.Begin(PhysicsProfilingKeys.CharactersProfilingKey);
             var activeCharacters = 0;
             //characters need manual updating
-            foreach (var element in characters)
+            lock (characters)
             {
-                if (!element.Enabled || element.ColliderShape == null) continue;
+                foreach (var element in characters)
+                {
+                    if (!element.Enabled || element.ColliderShape == null) continue;
 
-                var worldTransform = Matrix.RotationQuaternion(element.Orientation) * element.PhysicsWorldTransform;
-                element.UpdateTransformationComponent(ref worldTransform);
+                    var worldTransform = Matrix.RotationQuaternion(element.Orientation) * element.PhysicsWorldTransform;
+                    element.UpdateTransformationComponent(ref worldTransform);
 
-                if (element.DebugEntity != null)
-                {
-                    Vector3 scale, pos;
-                    Quaternion rot;
-                    worldTransform.Decompose(out scale, out rot, out pos);
-                    element.DebugEntity.Transform.Position = pos;
-                    element.DebugEntity.Transform.Rotation = rot;
-                }
+                    if (element.DebugEntity != null)
+                    {
+                        Vector3 scale, pos;
+                        Quaternion rot;
+                        worldTransform.Decompose(out scale, out rot, out pos);
+                        element.DebugEntity.Transform.Position = pos;
+                        element.DebugEntity.Transform.Rotation = rot;
+                    }
 
-                charactersProfilingState.Mark();
-                activeCharacters++;
+                    charactersProfilingState.Mark();
+                    activeCharacters++;
+                }
             }
             charactersProfilingState.End("Active characters: {0}", activeCharacters);
         }
@@ -227,33 +257,51 @@ public override void Draw(RenderContext context)
 
         internal void UpdateBones()
         {
-            foreach (var element in boneElements)
+            lock (boneElements)
             {
-                element.UpdateBones();
+                foreach (var element in boneElements)
+                {
+                    element.UpdateBones();
+                }
             }
         }
 
         public void UpdateContacts()
         {
-            foreach (var dataPair in ComponentDatas)
+            for (int i=0; i<ComponentDataValues.Count; i++)
             {
-                var data = dataPair.Value;
-                var shouldProcess = data.PhysicsComponent.ProcessCollisions || ((data.PhysicsComponent as PhysicsTriggerComponentBase)?.IsTrigger ?? false);
-                if (data.PhysicsComponent.Enabled && shouldProcess && data.PhysicsComponent.ColliderShape != null)
+                try
                 {
-                    Simulation.ContactTest(data.PhysicsComponent);
+                    var data = ComponentDataValues[i];
+                    if (data != null)
+                    {
+                        var shouldProcess = data.PhysicsComponent.ProcessCollisionsSlim || data.PhysicsComponent.ProcessCollisions || ((data.PhysicsComponent as PhysicsTriggerComponentBase)?.IsTrigger ?? false);
+                        if (data.PhysicsComponent.Enabled && shouldProcess && data.PhysicsComponent.ColliderShape != null)
+                        {
+                            Simulation.ContactTest(data.PhysicsComponent);
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    // simple, rare threading blip, just ignore it for this frame and continue
                 }
             }
         }
 
         public void UpdateRemovals()
         {
-            foreach (var currentFrameRemoval in currentFrameRemovals)
+            lock (currentFrameRemovals)
             {
-                ComponentRemoval(currentFrameRemoval);
+                foreach (var currentFrameRemoval in currentFrameRemovals)
+                {
+                    ComponentRemoval(currentFrameRemoval);
+                }
+
+                currentFrameRemovals.Clear();
             }
 
-            currentFrameRemovals.Clear();
+            SceneSystem.physicsDoNotDisposeNextRemoval = false;
         }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Engine/PhysicsShapesRenderingService.cs b/sources/engine/Xenko.Physics/Engine/PhysicsShapesRenderingService.cs
index ab2e3dd921..3cce11a24a 100644
--- a/sources/engine/Xenko.Physics/Engine/PhysicsShapesRenderingService.cs
+++ b/sources/engine/Xenko.Physics/Engine/PhysicsShapesRenderingService.cs
@@ -8,7 +8,6 @@
 using Xenko.Engine;
 using Xenko.Games;
 using Xenko.Graphics;
-using Xenko.Physics.Shapes;
 using Xenko.Rendering;
 
 namespace Xenko.Physics.Engine
@@ -65,7 +64,7 @@ public override void Update(GameTime gameTime)
             var unusedShapes = new List<ColliderShape>();
             foreach (var keyValuePair in updatableDebugMeshes)
             {
-                if (keyValuePair.Value != null && keyValuePair.Key.DebugEntity?.Scene != null)
+                if (keyValuePair.Value != null && keyValuePair.Key.DebugEntity?.Scene != null && keyValuePair.Key.InternalShape != null)
                 {
                     keyValuePair.Key.UpdateDebugPrimitive(Game.GraphicsContext.CommandList, keyValuePair.Value);
                 }
@@ -157,10 +156,11 @@ private Entity CreateChildEntity(PhysicsComponent component, ColliderShape shape
                 case ColliderShapeTypes.Cone:
                 case ColliderShapeTypes.StaticPlane:
                 case ColliderShapeTypes.Heightfield:
+                case ColliderShapeTypes.StaticMesh:
                     {
                         IDebugPrimitive debugPrimitive;
                         var type = shape.GetType();
-                        if (type == typeof(HeightfieldColliderShape))
+                        if (type == typeof(HeightfieldColliderShape) || type.BaseType == typeof(HeightfieldColliderShape))
                         {
                             if (!updatableDebugMeshCache.TryGetValue(shape, out debugPrimitive))
                             {
@@ -172,7 +172,7 @@ private Entity CreateChildEntity(PhysicsComponent component, ColliderShape shape
                                 updatableDebugMeshes.Add(shape, debugPrimitive);
                             }
                         }
-                        else if (type == typeof(CapsuleColliderShape) || type == typeof(ConvexHullColliderShape))
+                        else if (type == typeof(CapsuleColliderShape) || type == typeof(ConvexHullColliderShape) || type == typeof(StaticMeshColliderShape))
                         {
                             if (!debugMeshCache2.TryGetValue(shape, out debugPrimitive))
                             {
@@ -229,8 +229,18 @@ private Material GetMaterial(EntityComponent component, ColliderShape shape)
             var rigidbodyComponent = component as RigidbodyComponent;
             if (rigidbodyComponent != null)
             {
-                componentType = rigidbodyComponent.IsTrigger ? ComponentType.Trigger : 
-                    rigidbodyComponent.IsKinematic ? ComponentType.Kinematic : ComponentType.Dynamic;
+                if( rigidbodyComponent.IsTrigger ) {
+                    componentType = ComponentType.Trigger;
+                } else {
+                    switch( rigidbodyComponent.RigidBodyType ) {
+                        case RigidBodyTypes.Dynamic:
+                            componentType = ComponentType.Dynamic;
+                            break;
+                        case RigidBodyTypes.Kinematic:
+                            componentType = ComponentType.Kinematic;
+                            break;
+                    }
+                }
             }
             else if (component is CharacterComponent)
             {
diff --git a/sources/engine/Xenko.Physics/FloatHeightStickArraySource.cs b/sources/engine/Xenko.Physics/FloatHeightStickArraySource.cs
new file mode 100644
index 0000000000..f58c4387d6
--- /dev/null
+++ b/sources/engine/Xenko.Physics/FloatHeightStickArraySource.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [Display("Float")]
+    public class FloatHeightStickArraySource : IHeightStickArraySource
+    {
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => HeightfieldTypes.Float;
+
+        [DataMember(10)]
+        [Display("Size")]
+        public Int2 HeightStickSize { get; set; } = new Int2(65, 65);
+
+        [DataMember(20)]
+        public Vector2 HeightRange { get; set; } = new Vector2(-10, 10);
+
+        [DataMemberIgnore]
+        public float HeightScale => 1f;
+
+        /// <summary>
+        /// The value to fill the height stick array.
+        /// </summary>
+        [DataMember(30)]
+        public float InitialHeight { get; set; } = 0;
+
+        public bool IsValid() => HeightmapUtils.CheckHeightParameters(HeightStickSize, HeightType, HeightRange, HeightScale, false) &&
+            MathUtil.IsInRange(InitialHeight, HeightRange.X, HeightRange.Y);
+
+        public void CopyTo<T>(UnmanagedArray<T> heightStickArray, int index) where T : struct
+        {
+            if (heightStickArray == null) throw new ArgumentNullException(nameof(heightStickArray));
+            if (heightStickArray is UnmanagedArray<float> unmanagedArray)
+            {
+                unmanagedArray.Fill(InitialHeight, index, HeightStickSize.X * HeightStickSize.Y);
+            }
+            else
+            {
+                throw new NotSupportedException($"{ typeof(UnmanagedArray<T>) } type is not supported.");
+            }
+        }
+
+        public bool Match(object obj)
+        {
+            var other = obj as FloatHeightStickArraySource;
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return other.HeightStickSize == HeightStickSize &&
+                other.HeightRange == HeightRange &&
+                Math.Abs(other.InitialHeight - InitialHeight) < float.Epsilon;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/HeightScaleCalculator.cs b/sources/engine/Xenko.Physics/HeightScaleCalculator.cs
new file mode 100644
index 0000000000..b16644764c
--- /dev/null
+++ b/sources/engine/Xenko.Physics/HeightScaleCalculator.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [Display("Auto")]
+    public class HeightScaleCalculator : IHeightScaleCalculator
+    {
+        public float Calculate(IHeightStickParameters heightDescription)
+        {
+            var heightRange = heightDescription.HeightRange;
+
+            switch (heightDescription.HeightType)
+            {
+                case HeightfieldTypes.Float:
+                    return 1f;
+
+                case HeightfieldTypes.Short:
+                    return Math.Max(Math.Abs(heightRange.X), Math.Abs(heightRange.Y)) / short.MaxValue;
+
+                case HeightfieldTypes.Byte:
+                    if (Math.Abs(heightRange.X) <= Math.Abs(heightRange.Y))
+                    {
+                        return heightRange.Y / byte.MaxValue;
+                    }
+                    else
+                    {
+                        return heightRange.X / byte.MaxValue;
+                    }
+
+                default:
+                    return 1f;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/HeightStickArraySourceFromHeightmap.cs b/sources/engine/Xenko.Physics/HeightStickArraySourceFromHeightmap.cs
new file mode 100644
index 0000000000..f8d659612b
--- /dev/null
+++ b/sources/engine/Xenko.Physics/HeightStickArraySourceFromHeightmap.cs
@@ -0,0 +1,82 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [Display("Heightmap")]
+    public class HeightStickArraySourceFromHeightmap : IHeightStickArraySource
+    {
+        /// <summary>
+        /// The heightmap to initialize the height stick array.
+        /// </summary>
+        [DataMember(10)]
+        public Heightmap Heightmap { get; set; }
+
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => Heightmap?.HeightType ?? default;
+
+        [DataMemberIgnore]
+        public Int2 HeightStickSize => Heightmap?.Size ?? default;
+
+        [DataMemberIgnore]
+        public Vector2 HeightRange => Heightmap?.HeightRange ?? default;
+
+        [DataMemberIgnore]
+        public float HeightScale => Heightmap?.HeightScale ?? default;
+
+        public bool IsValid() => Heightmap?.IsValid() ?? false;
+
+        public void CopyTo<T>(UnmanagedArray<T> heightStickArray, int index) where T : struct
+        {
+            if (Heightmap == null) throw new InvalidOperationException($"{ nameof(Heightmap) } is a null");
+            if (heightStickArray == null) throw new ArgumentNullException(nameof(heightStickArray));
+
+            var heightStickArrayLength = heightStickArray.Length - index;
+            if (heightStickArrayLength <= 0) throw new IndexOutOfRangeException(nameof(index));
+
+            var typeOfT = typeof(T);
+            T[] heights;
+
+            if (typeOfT == typeof(float))
+            {
+                if (Heightmap.Floats == null) throw new InvalidOperationException($"{ nameof(Heightmap.Floats) } is a null.");
+                heights = (T[])(object)Heightmap.Floats;
+            }
+            else if (typeOfT == typeof(short))
+            {
+                if (Heightmap.Shorts == null) throw new InvalidOperationException($"{ nameof(Heightmap.Shorts) } is a null.");
+                heights = (T[])(object)Heightmap.Shorts;
+            }
+            else if (typeOfT == typeof(byte))
+            {
+                if (Heightmap.Bytes == null) throw new InvalidOperationException($"{ nameof(Heightmap.Bytes) } is a null.");
+                heights = (T[])(object)Heightmap.Bytes;
+            }
+            else
+            {
+                throw new NotSupportedException($"{ typeof(UnmanagedArray<T>) } type is not supported.");
+            }
+
+            var heightsLength = heights.Length;
+            if (heightStickArrayLength < heightsLength) throw new ArgumentException($"{ nameof(heightStickArray) }.{ nameof(heightStickArray.Length) } is not enough to copy.");
+
+            heightStickArray.Write(heights, index * Utilities.SizeOf<T>(), 0, heightsLength);
+        }
+
+        public bool Match(object obj)
+        {
+            var other = obj as HeightStickArraySourceFromHeightmap;
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return other.Heightmap == Heightmap;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/HeightfieldCenteringParameters.cs b/sources/engine/Xenko.Physics/HeightfieldCenteringParameters.cs
new file mode 100644
index 0000000000..7722bc140f
--- /dev/null
+++ b/sources/engine/Xenko.Physics/HeightfieldCenteringParameters.cs
@@ -0,0 +1,28 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    public struct HeightfieldCenteringParameters
+    {
+        [DataMember(10)]
+        public bool Enabled { get; set; }
+
+        /// <summary>
+        /// The height to be centered.
+        /// </summary>
+        [DataMember(20)]
+        [InlineProperty]
+        public float CenterHeight { get; set; }
+
+        public bool Match(HeightfieldCenteringParameters other)
+        {
+            return other.Enabled == Enabled &&
+                Math.Abs(other.CenterHeight - CenterHeight) < float.Epsilon;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/IHeightScaleCalculator.cs b/sources/engine/Xenko.Physics/IHeightScaleCalculator.cs
new file mode 100644
index 0000000000..3f80d95cb7
--- /dev/null
+++ b/sources/engine/Xenko.Physics/IHeightScaleCalculator.cs
@@ -0,0 +1,10 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Xenko.Physics
+{
+    public interface IHeightScaleCalculator
+    {
+        float Calculate(IHeightStickParameters heightDescription);
+    }
+}
diff --git a/sources/engine/Xenko.Physics/IHeightStickArraySource.cs b/sources/engine/Xenko.Physics/IHeightStickArraySource.cs
new file mode 100644
index 0000000000..9a7a049032
--- /dev/null
+++ b/sources/engine/Xenko.Physics/IHeightStickArraySource.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    public interface IHeightStickArraySource : IHeightStickParameters
+    {
+        /// <summary>
+        /// The size of the source.
+        /// </summary>
+        /// <remarks>
+        /// X is width and Y is length.
+        /// They should be greater than or equal to 2.
+        /// For example, this size should be 65 * 65 when you want 64 * 64 size in a scene.
+        /// </remarks>
+        Int2 HeightStickSize { get; }
+
+        /// <summary>
+        /// Copy the source data to the height stick array.
+        /// </summary>
+        /// <typeparam name="T">The data type of the height</typeparam>
+        /// <param name="heightStickArray">The destination to copy the data.</param>
+        /// <param name="index">The start index of the destination to copy the data.</param>
+        void CopyTo<T>(UnmanagedArray<T> heightStickArray, int index) where T : struct;
+
+        bool IsValid();
+
+        bool Match(object obj);
+    }
+}
diff --git a/sources/engine/Xenko.Physics/IHeightStickParameters.cs b/sources/engine/Xenko.Physics/IHeightStickParameters.cs
new file mode 100644
index 0000000000..32a8d77500
--- /dev/null
+++ b/sources/engine/Xenko.Physics/IHeightStickParameters.cs
@@ -0,0 +1,29 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    public interface IHeightStickParameters
+    {
+        /// <summary>
+        /// The type of the height.
+        /// </summary>
+        HeightfieldTypes HeightType { get; }
+
+        /// <summary>
+        /// The range of the height.
+        /// </summary>
+        /// <remarks>
+        /// X is min height and Y is max height.
+        /// (height * HeightScale) should be in this range.
+        /// Positive and negative heights can not be handle at the same time when the height type is Byte.
+        /// </remarks>
+        Vector2 HeightRange { get; }
+
+        /// <summary>
+        /// Used to calculate the height when the height type is Short or Byte. HeightScale should be 1 when the height type is Float.
+        /// </summary>
+        float HeightScale { get; }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/IPhysicsSystem.cs b/sources/engine/Xenko.Physics/IPhysicsSystem.cs
index 59e2eed6e2..2fb6e929d7 100644
--- a/sources/engine/Xenko.Physics/IPhysicsSystem.cs
+++ b/sources/engine/Xenko.Physics/IPhysicsSystem.cs
@@ -7,7 +7,7 @@ namespace Xenko.Physics
 {
     public interface IPhysicsSystem : IGameSystemBase
     {
-        Simulation Create(PhysicsProcessor processor, PhysicsEngineFlags flags = PhysicsEngineFlags.None);
+        object Create(PhysicsProcessor processor, PhysicsEngineFlags flags = PhysicsEngineFlags.None, bool bepu = false);
         void Release(PhysicsProcessor processor);
     }
 }
diff --git a/sources/engine/Xenko.Physics/Module.cs b/sources/engine/Xenko.Physics/Module.cs
index 7de4d17b46..9152a7bcaf 100644
--- a/sources/engine/Xenko.Physics/Module.cs
+++ b/sources/engine/Xenko.Physics/Module.cs
@@ -13,6 +13,8 @@ internal class Module
         public static void Initialize()
         {
             AssemblyRegistry.Register(typeof(Module).GetTypeInfo().Assembly, AssemblyCommonCategories.Assets);
+            // Preload proper libbulletc native library (depending on CPU type)
+            NativeLibrary.PreloadLibrary("libbulletc.dll", typeof(PhysicsComponent));
         }
     }
 }
diff --git a/sources/engine/Xenko.Physics/OverlapTest.cs b/sources/engine/Xenko.Physics/OverlapTest.cs
new file mode 100644
index 0000000000..dca9e9f63b
--- /dev/null
+++ b/sources/engine/Xenko.Physics/OverlapTest.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+
+namespace Xenko.Physics
+{
+    public class OverlapTest
+    {
+        public struct OverlapContactPoint
+        {
+            public PhysicsComponent ContactComponent;
+            public float Distance;
+            public Xenko.Core.Mathematics.Vector3 Position, Normal;
+        }
+
+        [ThreadStatic]
+        private static BulletSharp.PairCachingGhostObject ghostObject;
+
+        internal static Simulation mySimulation;
+
+        [ThreadStatic]
+        private static OverlapCallback internalResults;
+
+        [ThreadStatic]
+        public static HashSet<object> NativeOverlappingObjects;
+
+        public static HashSet<OverlapContactPoint> ContactTestResults
+        {
+            get
+            {
+                return internalResults.Contacts;
+            }
+        }
+
+        class OverlapCallback : BulletSharp.ContactResultCallback
+        {
+            public readonly HashSet<OverlapContactPoint> Contacts = new HashSet<OverlapContactPoint>();
+
+            public override float AddSingleResult(BulletSharp.ManifoldPoint contact, BulletSharp.CollisionObjectWrapper obj0, int partId0, int index0, BulletSharp.CollisionObjectWrapper obj1, int partId1, int index1)
+            {
+                var component0 = obj0.CollisionObject.UserObject as PhysicsComponent;
+                var component1 = obj1.CollisionObject.UserObject as PhysicsComponent;
+
+                Contacts.Add(new OverlapContactPoint
+                {
+                    ContactComponent = component0 ?? component1,
+                    Distance = contact.m_distance1,
+                    Normal = contact.m_normalWorldOnB,
+                    Position = contact.m_positionWorldOnB,
+                });
+
+                return 0f;
+            }
+
+            public void Remove(OverlapContactPoint contact) => Contacts.Remove(contact);
+            public bool Contains(OverlapContactPoint contact) => Contacts.Contains(contact);
+            public void Clear() => Contacts.Clear();
+            public HashSet<OverlapContactPoint>.Enumerator GetEnumerator() => Contacts.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Counts how many objects are overlapping with a given ColliderShape. If trackObjects are true, you can
+        /// use OverlappedWith to check if another PhysicsComponent was part of the overlapping objects
+        /// </summary>
+        /// <param name="shape">ColliderShape to check for overlaps with</param>
+        /// <param name="position">Position to move the ColliderShape, in addition to its LocalOffset</param>
+        /// <param name="myGroup">What collision group is the ColliderShape in?</param>
+        /// <param name="overlapsWith">What collision groups does the ColliderShape overlap with?</param>
+        /// <param name="contactTest">If true, contact test overlapping objects. See ContactResults for output. Defaults to false</param>
+        /// <param name="stopAfterFirstContact">If contact testing, should we stop contact testing after our first contact was found?</param>
+        /// <returns>Number of overlapping objects</returns>
+        public static int PerformOverlapTest(ColliderShape shape, Xenko.Core.Mathematics.Vector3? position = null,
+                                             CollisionFilterGroups myGroup = CollisionFilterGroups.DefaultFilter,
+                                             CollisionFilterGroupFlags overlapsWith = CollisionFilterGroupFlags.AllFilter,
+                                             bool contactTest = false, bool stopAfterFirstContact = false)
+        {
+            // doesn't support multithreading
+            if (mySimulation.simulationLocker != null)
+                throw new InvalidOperationException("Overlap testing not supported with multithreaded physics");
+
+            if (ghostObject == null)
+            {
+                ghostObject = new BulletSharp.PairCachingGhostObject
+                {
+                    ContactProcessingThreshold = 1e18f,
+                    UserObject = shape
+                };
+                ghostObject.CollisionFlags |= BulletSharp.CollisionFlags.NoContactResponse;
+
+                internalResults = new OverlapCallback();
+
+                NativeOverlappingObjects = new HashSet<object>();
+            }
+
+            ghostObject.CollisionShape = shape.InternalShape;
+            ghostObject.WorldTransform = Matrix.Transformation(shape.Scaling, shape.LocalRotation, position.HasValue ? position.Value + shape.LocalOffset : shape.LocalOffset);
+
+            mySimulation.collisionWorld.AddCollisionObject(ghostObject, (BulletSharp.CollisionFilterGroups)myGroup, (BulletSharp.CollisionFilterGroups)overlapsWith);
+
+            int overlapCount = ghostObject.NumOverlappingObjects;
+
+            NativeOverlappingObjects.Clear();
+            for (int i = 0; i < overlapCount; i++)
+                NativeOverlappingObjects.Add(ghostObject.OverlappingPairs[i]);
+
+            if (contactTest)
+            {
+                internalResults.Clear();
+                internalResults.CollisionFilterGroup = (int)myGroup;
+                internalResults.CollisionFilterMask = (int)overlapsWith;
+
+                foreach (object nativeobj in NativeOverlappingObjects)
+                {
+                    mySimulation.collisionWorld.ContactPairTest(ghostObject, (BulletSharp.CollisionObject)nativeobj, internalResults);
+                    if (stopAfterFirstContact && internalResults.Contacts.Count > 0) break;
+                }
+            }
+
+            mySimulation.collisionWorld.RemoveCollisionObject(ghostObject);
+
+            return overlapCount;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/PhysicsEngineFlags.cs b/sources/engine/Xenko.Physics/PhysicsEngineFlags.cs
index 0d7dc573b5..4d95f917b4 100644
--- a/sources/engine/Xenko.Physics/PhysicsEngineFlags.cs
+++ b/sources/engine/Xenko.Physics/PhysicsEngineFlags.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using Xenko.Core;
 
 namespace Xenko.Physics
 {
@@ -18,6 +19,8 @@ public enum PhysicsEngineFlags
 
         UseHardwareWhenPossible = 0x8,
 
-        ContinuosCollisionDetection = 0x10,
+        // Typo before 3.1 (https://github.com/xenko3d/xenko/issues/152)
+        [DataAlias("ContinuosCollisionDetection")]
+        ContinuousCollisionDetection = 0x10,
     }
 }
diff --git a/sources/engine/Xenko.Physics/PhysicsScriptComponentExtensions.cs b/sources/engine/Xenko.Physics/PhysicsScriptComponentExtensions.cs
index 4d5d3f47a9..8bbc87802f 100644
--- a/sources/engine/Xenko.Physics/PhysicsScriptComponentExtensions.cs
+++ b/sources/engine/Xenko.Physics/PhysicsScriptComponentExtensions.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using Xenko.Engine;
+using Xenko.Physics.Bepu;
 
 namespace Xenko.Physics
 {
@@ -19,5 +20,15 @@ public static Simulation GetSimulation(this ScriptComponent scriptComponent)
         {
             return scriptComponent.SceneSystem.SceneInstance.GetProcessor<PhysicsProcessor>()?.Simulation;
         }
+
+        /// <summary>
+        /// Gets the curent <see cref="BepuSimulation"/>.
+        /// </summary>
+        /// <param name="scriptComponent">The script component to query bepu physics from</param>
+        /// <returns>The simulation object or null if there are no bepu simulation running for the current scene.</returns>
+        public static BepuSimulation GetBepuSimulation(this ScriptComponent scriptComponent)
+        {
+            return BepuSimulation.instance;
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/PhysicsSettings.cs b/sources/engine/Xenko.Physics/PhysicsSettings.cs
index ce164a5291..a28ae72755 100644
--- a/sources/engine/Xenko.Physics/PhysicsSettings.cs
+++ b/sources/engine/Xenko.Physics/PhysicsSettings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using Xenko.Core;
@@ -17,12 +17,17 @@ public class PhysicsSettings : Configuration
         /// The maximum number of simulations the the physics engine can run in a frame to compensate for slowdown
         /// </userdoc>
         [DataMember(20)]
-        public int MaxSubSteps = 1;
+        public int MaxSubSteps = 2;
 
         /// <userdoc>
         /// The length in seconds of a physics simulation frame. The default is 0.016667 (one sixtieth of a second)
         /// </userdoc>
         [DataMember(30)]
         public float FixedTimeStep = 1.0f / 60.0f;
+
+        /// <summary>
+        /// If set to true, forcefully disable any Bullet physics processing.
+        /// </summary>
+        public bool OnlyUseBepu = true;
     }
 }
diff --git a/sources/engine/Xenko.Physics/PhysicsSystem.cs b/sources/engine/Xenko.Physics/PhysicsSystem.cs
new file mode 100644
index 0000000000..34c89eee9c
--- /dev/null
+++ b/sources/engine/Xenko.Physics/PhysicsSystem.cs
@@ -0,0 +1,330 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using Xenko.Core;
+using Xenko.Core.Threading;
+using Xenko.Engine;
+using Xenko.Games;
+using Xenko.Physics.Bepu;
+
+namespace Xenko.Physics
+{
+    public class PhysicsSystem : GameSystem, IPhysicsSystem
+    {
+        private class PhysicsScene
+        {
+            public PhysicsProcessor Processor;
+            public Simulation Simulation;
+            public BepuSimulation BepuSimulation;
+        }
+
+        internal static volatile float timeToSimulate;
+        private bool runThread;
+        private ManualResetEventSlim doUpdateEvent;
+        private Thread physicsThread;
+        private static Thread simulationThread;
+
+        // by default, don't do more substeps (since running the simulation twice will lead to just more lag)
+        public static int MaxSubSteps = 1, SolverIterations = 8;
+
+        // only slow down physics if going under 30fps
+        public static float MaximumSimulationTime = 0.034f;
+
+        private readonly List<PhysicsScene> scenes = new List<PhysicsScene>();
+
+        public PhysicsSystem(IServiceRegistry registry)
+            : base(registry)
+        {
+            UpdateOrder = -1000; //make sure physics runs before everything
+
+            Enabled = true; //enabled by default
+        }
+
+        private PhysicsSettings physicsConfiguration;
+
+        public bool isMultithreaded
+        {
+            get
+            {
+                return ((physicsConfiguration?.Flags ?? 0) & PhysicsEngineFlags.MultiThreaded) != 0;
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static bool IsSimulationThread(Thread t)
+        {
+            return t == simulationThread;
+        }
+
+        public override void Initialize()
+        {
+            physicsConfiguration = Game?.Settings != null ? Game.Settings.Configurations.Get<PhysicsSettings>() : new PhysicsSettings();
+            EntityManager.preventPhysicsProcessor = physicsConfiguration.OnlyUseBepu;
+
+            if (isMultithreaded)
+            {
+                doUpdateEvent = new ManualResetEventSlim(false);
+                runThread = true;
+                physicsThread = new Thread(new ThreadStart(PhysicsProcessingThreadBody));
+                physicsThread.Name = "BulletPhysics Processing Thread";
+                physicsThread.IsBackground = true;
+                simulationThread = physicsThread;
+                physicsThread.Start();
+            }
+            else
+            {
+                simulationThread = Thread.CurrentThread;
+            }
+        }
+
+        private void EndThread()
+        {
+            runThread = false;
+            if (physicsThread != null && physicsThread.IsAlive)
+                physicsThread.Join(5000);
+        }
+
+        protected override void Destroy()
+        {
+            EndThread();
+
+            base.Destroy();
+
+            foreach (var scene in scenes)
+            {
+                scene.Simulation?.Dispose();
+                scene.BepuSimulation?.Dispose();
+            }
+        }
+
+        public object Create(PhysicsProcessor sceneProcessor, PhysicsEngineFlags flags = PhysicsEngineFlags.None, bool bepu = false)
+        {
+            var scene = new PhysicsScene
+            { 
+                Processor = sceneProcessor,
+                Simulation = bepu == false ? new Simulation(sceneProcessor, physicsConfiguration) : null,
+                BepuSimulation = bepu ? new BepuSimulation(SolverIterations) : null
+            };
+            scenes.Add(scene);
+            return bepu ? (object)scene.BepuSimulation : (object)scene.Simulation;
+        }
+
+        public bool HasSimulation<T>()
+        {
+            for (int i=0; i<scenes.Count; i++)
+            {
+                if (scenes[i].Simulation is T s && s != null) return true;
+                if (scenes[i].BepuSimulation is T bs && bs != null) return true;
+            }
+            return false;
+        }
+
+        public void Release(PhysicsProcessor processor)
+        {
+            EndThread();
+
+            var scene = scenes.SingleOrDefault(x => x.Processor == processor);
+            if (scene == null) return;
+
+            scenes.Remove(scene);
+            scene.Simulation?.Dispose();
+            scene.BepuSimulation?.Dispose();
+        }
+
+        private void RunPhysicsSimulation(float time)
+        {
+            //read skinned meshes bone positions
+            for (int i=0; i<scenes.Count; i++)
+            {
+                var physicsScene = scenes[i];
+
+                if (physicsScene.Simulation != null)
+                {
+                    //first process any needed cleanup
+                    physicsScene.Processor.UpdateRemovals();
+
+                    // after we took care of cleanup, are we disabled?
+                    if (Simulation.DisableSimulation == false)
+                    {
+                        //read skinned meshes bone positions and write them to the physics engine
+                        physicsScene.Processor.UpdateBones();
+
+                        //simulate physics
+                        physicsScene.Simulation.Simulate(time);
+
+                        //update character bound entity's transforms from physics engine simulation
+                        physicsScene.Processor.UpdateCharacters();
+
+                        //Perform clean ups before test contacts in this frame
+                        physicsScene.Simulation.BeginContactTesting();
+
+                        //handle frame contacts
+                        physicsScene.Processor.UpdateContacts();
+
+                        //This is the heavy contact logic
+                        physicsScene.Simulation.EndContactTesting();
+
+                        //send contact events
+                        physicsScene.Simulation.SendEvents();
+                    }
+                } 
+
+                if (physicsScene.BepuSimulation != null)
+                {
+                    physicsScene.BepuSimulation.AlwaysExecuteBeforeSimulationStep?.Invoke(time);
+
+                    // do anything before simulation (which might modify ToBeAdded or ToBeRemoved)
+                    while (physicsScene.BepuSimulation.ActionsBeforeSimulationStep.TryDequeue(out Action<float> a)) a(time);
+
+                    // any static objects need to be moved?
+                    while (BepuStaticColliderComponent.NeedsRepositioning.TryDequeue(out var scc))
+                    {
+                        // might need a writelock here because ApplyDescription can wake bodies (which can move them around)
+                        using (physicsScene.BepuSimulation.simulationLocker.WriteLock())
+                        {
+                            scc.InternalStatic.ApplyDescription(scc.staticDescription);
+                        }
+                    }
+
+                    lock (physicsScene.BepuSimulation.ToBeAdded)
+                    {
+                        // remove all bodies set to be removed
+                        physicsScene.BepuSimulation.ProcessRemovals();
+
+                        // did we request a clear?
+                        int clearMode = physicsScene.BepuSimulation.clearRequested;
+                        if (clearMode > 0) physicsScene.BepuSimulation.Clear(clearMode == 2, true);
+
+                        // add everyone waiting (which could have been something just removed)
+                        physicsScene.BepuSimulation.ProcessAdds();
+                    }
+
+                    // critical actions for rigidbodies
+                    while (physicsScene.BepuSimulation.CriticalActions.TryDequeue(out var a))
+                    {
+                        // don't worry about this if we are to be removed (or have been removed)
+                        if (a.Body.InternalBody.Handle.Value == -1 || BepuSimulation.instance.ToBeRemoved.Contains(a.Body))
+                            continue;
+
+                        switch (a.Action)
+                        {
+                            case BepuRigidbodyComponent.RB_ACTION.Awake:
+                                if (!a.Body.InternalBody.Awake)
+                                {
+                                    using (physicsScene.BepuSimulation.simulationLocker.WriteLock())
+                                    {
+                                        a.Body.InternalBody.Awake = true;
+                                    }
+                                }
+                                break;
+                            case BepuRigidbodyComponent.RB_ACTION.Sleep:
+                                if (a.Body.InternalBody.Awake)
+                                {
+                                    using (physicsScene.BepuSimulation.simulationLocker.WriteLock())
+                                    {
+                                        a.Body.InternalBody.Awake = false;
+                                    }
+                                }
+                                break;
+                            case BepuRigidbodyComponent.RB_ACTION.ColliderShape:
+                                a.Body.InternalColliderShapeReadd();
+                                break;
+                        }
+                    }
+
+                    if (Simulation.DisableSimulation == false)
+                    {
+                        // don't make changes to rigidbodies while simulating
+                        BepuRigidbodyComponent.safeRun = false;
+
+                        // simulate!
+                        float totalTime = time;
+                        for(int k=0; k<MaxSubSteps && totalTime > 0f; k++)
+                        {
+                            float simtime = Math.Min(MaximumSimulationTime, totalTime);
+                            physicsScene.BepuSimulation.Simulate(simtime);
+                            totalTime -= simtime;
+                        }
+
+                        BepuRigidbodyComponent.safeRun = true;
+
+                        // update all rigidbodies
+                        Xenko.Core.Threading.Dispatcher.For(0, physicsScene.BepuSimulation.AllRigidbodies.Count, (j) =>
+                        {
+                            BepuRigidbodyComponent rb = physicsScene.BepuSimulation.AllRigidbodies[j];
+
+                            // if we lost the entity, just return
+                            Entity e = rb.Entity;
+                            if (e == null) return;
+
+                            rb.resetProcessingContactsList();
+
+                            // pre-sync
+                            while (rb.queuedActions.TryDequeue(out var action))
+                                action(rb);
+
+                            rb.UpdateCachedPoseAndVelocity();
+
+                            // per-rigidbody update
+                            if (rb.ActionPerSimulationTick != null)
+                                rb.ActionPerSimulationTick(rb, time);
+
+                            rb.UpdateTransformationComponent(e);
+
+                            for (int i = 0; i < rb.PostSimulationTickActions.Count; i++)
+                                rb.PostSimulationTickActions[i](rb, time);
+                        });
+                    }
+
+                    // do anything after simulation
+                    while (physicsScene.BepuSimulation.ActionsAfterSimulationStep.TryDequeue(out Action<float> a)) a(time);
+                }
+            }
+        }
+
+        private void PhysicsProcessingThreadBody()
+        {
+            while (runThread)
+            {
+                if (doUpdateEvent.Wait(1000)) {
+                    float simulateThisInterval = timeToSimulate;
+                    if (simulateThisInterval > 0f)
+                    {
+                        RunPhysicsSimulation(simulateThisInterval);
+                        timeToSimulate -= simulateThisInterval;
+                    }
+                }
+
+                doUpdateEvent.Reset();
+            }
+        }
+
+        public override void Update(GameTime gameTime)
+        {
+            if (isMultithreaded)
+            {
+                float gt = (float)gameTime.WarpElapsed.TotalSeconds;
+                float totalTimeCap = MaximumSimulationTime * MaxSubSteps;
+                if (timeToSimulate + gt > totalTimeCap)
+                {
+                    timeToSimulate = totalTimeCap;
+                }
+                else
+                {
+                    timeToSimulate += gt;
+                }
+
+                doUpdateEvent.Set();
+            } 
+            else
+            {
+                RunPhysicsSimulation((float)Math.Min(MaximumSimulationTime * MaxSubSteps, gameTime.WarpElapsed.TotalSeconds));
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/RigidBodyTypes.cs b/sources/engine/Xenko.Physics/RigidBodyTypes.cs
index 31f339be92..79ce637635 100644
--- a/sources/engine/Xenko.Physics/RigidBodyTypes.cs
+++ b/sources/engine/Xenko.Physics/RigidBodyTypes.cs
@@ -5,14 +5,6 @@ namespace Xenko.Physics
 {
     public enum RigidBodyTypes
     {
-        /// <summary>
-        ///     They are supposed to never move, they are not automatically updated by the engine.
-        ///     They can be moved tho by an explicit call to UpdateTransformation(), results are not realist for dynamic simulation
-        ///     so use it wisely.
-        ///     If you plan to move the entity it is advised to use Kinematic, which allows the normal dynamic simulation.
-        /// </summary>
-        Static,
-
         /// <summary>
         ///     The Physics engine is the authority for this kind of rigidbody, you should move them using forces and/or impulses,
         ///     never directly editing the Transformation
diff --git a/sources/engine/Xenko.Physics/Shapes/BoxColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/BoxColliderShape.cs
index c6b11879ea..0147b4971a 100644
--- a/sources/engine/Xenko.Physics/Shapes/BoxColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/BoxColliderShape.cs
@@ -11,15 +11,18 @@ namespace Xenko.Physics
 {
     public class BoxColliderShape : ColliderShape
     {
+        public readonly Vector3 BoxSize;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="BoxColliderShape"/> class.
         /// </summary>
         /// <param name="is2D">If this cube is a 2D quad</param>
         /// <param name="size">The size of the cube</param>
-        public BoxColliderShape(bool is2D, Vector3 size)
+        public BoxColliderShape(bool is2D, Vector3 size, Vector3? offset = null, Quaternion? localrot = null)
         {
             Type = ColliderShapeTypes.Box;
             Is2D = is2D;
+            BoxSize = size;
 
             //Box is not working properly when in a convex2dshape, Z cannot be 0
 
@@ -42,6 +45,13 @@ public BoxColliderShape(bool is2D, Vector3 size)
             }
 
             DebugPrimitiveMatrix = Matrix.Scaling(size * DebugScaling);
+
+            if (offset.HasValue || localrot.HasValue)
+            {
+                LocalOffset = offset ?? Vector3.Zero;
+                LocalRotation = localrot ?? Quaternion.Identity;
+                UpdateLocalTransformations();
+            }
         }
 
         public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
diff --git a/sources/engine/Xenko.Physics/Shapes/CapsuleColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/CapsuleColliderShape.cs
index 3aedfdcb57..bf195b8954 100644
--- a/sources/engine/Xenko.Physics/Shapes/CapsuleColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/CapsuleColliderShape.cs
@@ -13,9 +13,9 @@ namespace Xenko.Physics
 {
     public class CapsuleColliderShape : ColliderShape
     {
-        private readonly float capsuleLength;
-        private readonly float capsuleRadius;
-        private readonly ShapeOrientation shapeOrientation;
+        public readonly float Length;
+        public readonly float Radius;
+        public readonly ShapeOrientation Orientation;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CapsuleColliderShape"/> class.
@@ -24,14 +24,14 @@ public class CapsuleColliderShape : ColliderShape
         /// <param name="radius">The radius.</param>
         /// <param name="length">The length of the capsule.</param>
         /// <param name="orientation">Up axis.</param>
-        public CapsuleColliderShape(bool is2D, float radius, float length, ShapeOrientation orientation)
+        public CapsuleColliderShape(bool is2D, float radius, float length, ShapeOrientation orientation, Vector3? offset = null, Quaternion? localrot = null)
         {
             Type = ColliderShapeTypes.Capsule;
             Is2D = is2D;
 
-            capsuleLength = length;
-            capsuleRadius = radius;
-            shapeOrientation = orientation;
+            Length = length;
+            Radius = radius;
+            Orientation = orientation;
 
             Matrix rotation;
             CapsuleShape shape;
@@ -71,11 +71,18 @@ public CapsuleColliderShape(bool is2D, float radius, float length, ShapeOrientat
             InternalShape = Is2D ? (CollisionShape)new Convex2DShape(shape) { LocalScaling = cachedScaling } : shape;
 
             DebugPrimitiveMatrix = Matrix.Scaling(new Vector3(DebugScaling)) * rotation;
+
+            if (offset.HasValue || localrot.HasValue)
+            {
+                LocalOffset = offset ?? Vector3.Zero;
+                LocalRotation = localrot ?? Quaternion.Identity;
+                UpdateLocalTransformations();
+            }
         }
 
         public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
         {
-            return GeometricPrimitive.Capsule.New(device, capsuleLength, capsuleRadius).ToMeshDraw();
+            return GeometricPrimitive.Capsule.New(device, Length, Radius).ToMeshDraw();
         }
 
         public override Vector3 Scaling
@@ -84,7 +91,7 @@ public override Vector3 Scaling
             set
             {
                 Vector3 newScaling;
-                switch (shapeOrientation)
+                switch (Orientation)
                 {
                     case ShapeOrientation.UpX:
                         {
diff --git a/sources/engine/Xenko.Physics/Shapes/CompoundColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/CompoundColliderShape.cs
index 79e0437f34..b5bc9293e2 100644
--- a/sources/engine/Xenko.Physics/Shapes/CompoundColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/CompoundColliderShape.cs
@@ -32,7 +32,7 @@ public override void Dispose()
             {
                 InternalCompoundShape.RemoveChildShape(shape.InternalShape);
 
-                if (!shape.IsPartOfAsset)
+                if (!shape.DoNotDispose && !Xenko.Engine.SceneSystem.physicsDoNotDisposeNextRemoval)
                 {
                     shape.Dispose();
                 }
diff --git a/sources/engine/Xenko.Physics/Shapes/ConeColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/ConeColliderShape.cs
index 16b65f684f..e4161925ba 100644
--- a/sources/engine/Xenko.Physics/Shapes/ConeColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/ConeColliderShape.cs
@@ -12,49 +12,63 @@ namespace Xenko.Physics
 {
     public class ConeColliderShape : ColliderShape
     {
+        public readonly float Height;
+        public readonly float Radius;
+        public readonly ShapeOrientation Orientation;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ConeColliderShape"/> class.
         /// </summary>
         /// <param name="orientation">Up axis.</param>
         /// <param name="radius">The radius of the cone</param>
         /// <param name="height">The height of the cone</param>
-        public ConeColliderShape(float height, float radius, ShapeOrientation orientation)
+        public ConeColliderShape(float heightParam, float radiusParam, ShapeOrientation orientationParam, Vector3? offset = null, Quaternion? localrot = null)
         {
             Type = ColliderShapeTypes.Cone;
             Is2D = false; //always false for cone
+            Height = heightParam;
+            Radius = radiusParam;
+            Orientation = orientationParam;
 
             Matrix rotation;
 
             cachedScaling = Vector3.One;
 
-            switch (orientation)
+            switch (Orientation)
             {
                 case ShapeOrientation.UpX:
-                    InternalShape = new BulletSharp.ConeShapeX(radius, height)
+                    InternalShape = new BulletSharp.ConeShapeX(Radius, Height)
                     {
                         LocalScaling = cachedScaling,
                     };
                     rotation = Matrix.RotationZ((float)Math.PI / 2.0f);
                     break;
                 case ShapeOrientation.UpY:
-                    InternalShape = new BulletSharp.ConeShape(radius, height)
+                    InternalShape = new BulletSharp.ConeShape(Radius, Height)
                     {
                         LocalScaling = cachedScaling,
                     };
                     rotation = Matrix.Identity;
                     break;
                 case ShapeOrientation.UpZ:
-                    InternalShape = new BulletSharp.ConeShapeZ(radius, height)
+                    InternalShape = new BulletSharp.ConeShapeZ(Radius, Height)
                     {
                         LocalScaling = cachedScaling,
                     };
                     rotation = Matrix.RotationX((float)Math.PI / 2.0f);
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(orientation));
+                    throw new ArgumentOutOfRangeException(nameof(Orientation));
             }
 
-            DebugPrimitiveMatrix = Matrix.Scaling(new Vector3(radius * 2, height, radius * 2) * DebugScaling) * rotation;
+            DebugPrimitiveMatrix = Matrix.Scaling(new Vector3(Radius * 2, Height, Radius * 2) * DebugScaling) * rotation;
+
+            if (offset.HasValue || localrot.HasValue)
+            {
+                LocalOffset = offset ?? Vector3.Zero;
+                LocalRotation = localrot ?? Quaternion.Identity;
+                UpdateLocalTransformations();
+            }
         }
 
         public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
diff --git a/sources/engine/Xenko.Physics/Shapes/ConvexHullColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/ConvexHullColliderShape.cs
index 71d8daa87b..b5e68f0877 100644
--- a/sources/engine/Xenko.Physics/Shapes/ConvexHullColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/ConvexHullColliderShape.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Xenko.Core.Mathematics;
@@ -9,44 +10,41 @@
 using Xenko.Graphics.GeometricPrimitives;
 using Xenko.Rendering;
 
-namespace Xenko.Physics
-{
-    public class ConvexHullColliderShape : ColliderShape
-    {
+namespace Xenko.Physics {
+    public class ConvexHullColliderShape : ColliderShape {
         private readonly IReadOnlyList<Vector3> pointsList;
-        private readonly IReadOnlyList<uint> indicesList; 
+        private readonly IReadOnlyList<uint> indicesList;
 
-        public ConvexHullColliderShape(IReadOnlyList<Vector3> points, IReadOnlyList<uint> indices, Vector3 scaling)
-        {
+        public ConvexHullColliderShape(IReadOnlyList<Vector3> points, IReadOnlyList<int> indices, Vector3? scaling) : this(points, (IReadOnlyList<uint>)(object)indices, scaling) {
+
+        }
+
+        public ConvexHullColliderShape(IReadOnlyList<Vector3> points, IReadOnlyList<uint> indices, Vector3? scaling = null) {
             Type = ColliderShapeTypes.ConvexHull;
             Is2D = false;
 
-            cachedScaling = scaling;
-            InternalShape = new BulletSharp.ConvexHullShape(points)
-            {
-                LocalScaling = cachedScaling,
-            };
-
-            DebugPrimitiveMatrix = Matrix.Scaling(new Vector3(1, 1, 1) * DebugScaling);
+            cachedScaling = scaling ?? Vector3.One;
 
             pointsList = points;
             indicesList = indices;
+
+            InternalShape = new BulletSharp.ConvexHullShape(PointsAsBullet()) {
+                LocalScaling = cachedScaling,
+            };
+
+            DebugPrimitiveMatrix = Matrix.Scaling(Vector3.One * DebugScaling);
         }
 
-        public IReadOnlyList<Vector3> Points
-        {
+        public IReadOnlyList<Vector3> Points {
             get { return pointsList; }
         }
-        public IReadOnlyList<uint> Indices
-        {
+        public IReadOnlyList<uint> Indices {
             get { return indicesList; }
         }
 
-        public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
-        {
+        public override MeshDraw CreateDebugPrimitive(GraphicsDevice device) {
             var verts = new VertexPositionNormalTexture[pointsList.Count];
-            for (var i = 0; i < pointsList.Count; i++)
-            {
+            for (var i = 0; i < pointsList.Count; i++) {
                 verts[i].Position = pointsList[i];
                 verts[i].TextureCoordinate = Vector2.Zero;
                 verts[i].Normal = Vector3.Zero;
@@ -56,8 +54,7 @@ public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
 
             ////calculate basic normals
             ////todo verify, winding order might be wrong?
-            for (var i = 0; i < indicesList.Count; i += 3)
-            {
+            for (var i = 0; i < indicesList.Count; i += 3) {
                 var i1 = intIndices[i];
                 var i2 = intIndices[i + 1];
                 var i3 = intIndices[i + 2];
@@ -73,5 +70,10 @@ public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
 
             return new GeometricPrimitive(device, meshData).ToMeshDraw();
         }
+
+        IEnumerable<BulletSharp.Math.Vector3> PointsAsBullet() {
+            for (int i = 0; i < pointsList.Count; i++)
+                yield return pointsList[i];
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/Shapes/CylinderColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/CylinderColliderShape.cs
index 8eae8307ba..89d3e4a2c8 100644
--- a/sources/engine/Xenko.Physics/Shapes/CylinderColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/CylinderColliderShape.cs
@@ -12,7 +12,9 @@ namespace Xenko.Physics
 {
     public class CylinderColliderShape : ColliderShape
     {
-        private readonly ShapeOrientation shapeOrientation;
+        public readonly ShapeOrientation Orientation;
+        public readonly float Height;
+        public readonly float Radius;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CylinderColliderShape"/> class.
@@ -20,44 +22,53 @@ public class CylinderColliderShape : ColliderShape
         /// <param name="orientation">Up axis.</param>
         /// <param name="radius">The radius of the cylinder</param>
         /// <param name="height">The height of the cylinder</param>
-        public CylinderColliderShape(float height, float radius, ShapeOrientation orientation)
+        public CylinderColliderShape(float heightParam, float radiusParam, ShapeOrientation orientationParam, Vector3? offset = null, Quaternion? localrot = null)
         {
             Type = ColliderShapeTypes.Cylinder;
             Is2D = false; //always false for cylinders
+            Height = heightParam;
+            Radius = radiusParam;
 
             Matrix rotation;
 
             cachedScaling = Vector3.One;
-            shapeOrientation = orientation;
+            Orientation = orientationParam;
 
-            switch (orientation)
+            switch (Orientation)
             {
                 case ShapeOrientation.UpX:
-                    InternalShape = new BulletSharp.CylinderShapeX(new Vector3(height / 2, radius, radius))
+                    InternalShape = new BulletSharp.CylinderShapeX(new Vector3(Height / 2, Radius, Radius))
                     {
                         LocalScaling = cachedScaling,
                     };
                     rotation = Matrix.RotationZ((float)Math.PI / 2.0f);
                     break;
                 case ShapeOrientation.UpY:
-                    InternalShape = new BulletSharp.CylinderShape(new Vector3(radius, height / 2, radius))
+                    InternalShape = new BulletSharp.CylinderShape(new Vector3(Radius, Height / 2, Radius))
                     {
                         LocalScaling = cachedScaling,
                     };
                     rotation = Matrix.Identity;
                     break;
                 case ShapeOrientation.UpZ:
-                    InternalShape = new BulletSharp.CylinderShapeZ(new Vector3(radius, radius, height / 2))
+                    InternalShape = new BulletSharp.CylinderShapeZ(new Vector3(Radius, Radius, Height / 2))
                     {
                         LocalScaling = cachedScaling,
                     };
                     rotation = Matrix.RotationX((float)Math.PI / 2.0f);
                     break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(orientation));
+                    throw new ArgumentOutOfRangeException(nameof(Orientation));
             }
 
-            DebugPrimitiveMatrix = Matrix.Scaling(new Vector3(radius * 2, height, radius * 2) * DebugScaling) * rotation;
+            DebugPrimitiveMatrix = Matrix.Scaling(new Vector3(Radius * 2, Height, Radius * 2) * DebugScaling) * rotation;
+
+            if (offset.HasValue || localrot.HasValue)
+            {
+                LocalOffset = offset ?? Vector3.Zero;
+                LocalRotation = localrot ?? Quaternion.Identity;
+                UpdateLocalTransformations();
+            }
         }
 
         public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
diff --git a/sources/engine/Xenko.Physics/Shapes/HeightfieldColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/HeightfieldColliderShape.cs
index 55c5a33056..0e599eb864 100644
--- a/sources/engine/Xenko.Physics/Shapes/HeightfieldColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/HeightfieldColliderShape.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
 using Xenko.Core.Threading;
@@ -11,10 +12,33 @@
 using Xenko.Rendering;
 using Buffer = Xenko.Graphics.Buffer;
 
-namespace Xenko.Physics.Shapes
+namespace Xenko.Physics
 {
+    namespace Shapes
+    {
+        [Obsolete("This class will be deprecated. Use 'Xenko.Physics.HeightfieldColliderShape'.", false)]
+        public class HeightfieldColliderShape : Xenko.Physics.HeightfieldColliderShape
+        {
+            public HeightfieldColliderShape(int heightStickWidth, int heightStickLength, UnmanagedArray<short> dynamicFieldData, float heightScale, float minHeight, float maxHeight, bool flipQuadEdges)
+                : base(heightStickWidth, heightStickLength, dynamicFieldData, heightScale, minHeight, maxHeight, flipQuadEdges)
+            {
+            }
+            public HeightfieldColliderShape(int heightStickWidth, int heightStickLength, UnmanagedArray<byte> dynamicFieldData, float heightScale, float minHeight, float maxHeight, bool flipQuadEdges)
+                : base(heightStickWidth, heightStickLength, dynamicFieldData, heightScale, minHeight, maxHeight, flipQuadEdges)
+            {
+            }
+            public HeightfieldColliderShape(int heightStickWidth, int heightStickLength, UnmanagedArray<float> dynamicFieldData, float heightScale, float minHeight, float maxHeight, bool flipQuadEdges)
+                : base(heightStickWidth, heightStickLength, dynamicFieldData, heightScale, minHeight, maxHeight, flipQuadEdges)
+            {
+            }
+        }
+    }
+
     public class HeightfieldColliderShape : ColliderShape
     {
+        public static readonly int MinimumHeightStickWidth = 2;
+        public static readonly int MinimumHeightStickLength = 2;
+
         public HeightfieldColliderShape(int heightStickWidth, int heightStickLength, UnmanagedArray<short> dynamicFieldData, float heightScale, float minHeight, float maxHeight, bool flipQuadEdges)
             : this(heightStickWidth, heightStickLength, HeightfieldTypes.Short, dynamicFieldData, heightScale, minHeight, maxHeight, flipQuadEdges)
         {
@@ -59,7 +83,7 @@ bool flipQuadEdges
                 case HeightfieldTypes.Short:
                     ShortArray = dynamicFieldData as UnmanagedArray<short>;
 
-                    InternalShape = new BulletSharp.HeightfieldShape(HeightStickWidth, HeightStickLength, ShortArray.Pointer, HeightScale, MinHeight, MaxHeight, 1, (int)BulletPhyScalarType.PhyShort, flipQuadEdges)
+                    InternalShape = new BulletSharp.HeightfieldTerrainShape(HeightStickWidth, HeightStickLength, ShortArray.Pointer, HeightScale, MinHeight, MaxHeight, 1, BulletSharp.PhyScalarType.Int16, flipQuadEdges)
                     {
                         LocalScaling = cachedScaling,
                     };
@@ -69,7 +93,7 @@ bool flipQuadEdges
                 case HeightfieldTypes.Byte:
                     ByteArray = dynamicFieldData as UnmanagedArray<byte>;
 
-                    InternalShape = new BulletSharp.HeightfieldShape(HeightStickWidth, HeightStickLength, ByteArray.Pointer, HeightScale, MinHeight, MaxHeight, 1, (int)BulletPhyScalarType.PhyUchar, flipQuadEdges)
+                    InternalShape = new BulletSharp.HeightfieldTerrainShape(HeightStickWidth, HeightStickLength, ByteArray.Pointer, HeightScale, MinHeight, MaxHeight, 1, BulletSharp.PhyScalarType.Byte, flipQuadEdges)
                     {
                         LocalScaling = cachedScaling,
                     };
@@ -79,7 +103,7 @@ bool flipQuadEdges
                 case HeightfieldTypes.Float:
                     FloatArray = dynamicFieldData as UnmanagedArray<float>;
 
-                    InternalShape = new BulletSharp.HeightfieldShape(HeightStickWidth, HeightStickLength, FloatArray.Pointer, HeightScale, MinHeight, MaxHeight, 1, (int)BulletPhyScalarType.PhyFloat, flipQuadEdges)
+                    InternalShape = new BulletSharp.HeightfieldTerrainShape(HeightStickWidth, HeightStickLength, FloatArray.Pointer, HeightScale, MinHeight, MaxHeight, 1, BulletSharp.PhyScalarType.Single, flipQuadEdges)
                     {
                         LocalScaling = cachedScaling,
                     };
@@ -94,12 +118,12 @@ bool flipQuadEdges
 
         public bool UseDiamondSubdivision
         {
-            set { ((BulletSharp.HeightfieldShape)InternalShape).SetUseDiamondSubdivision(value); }
+            set { ((BulletSharp.HeightfieldTerrainShape)InternalShape).SetUseDiamondSubdivision(value); }
         }
 
         public bool UseZigzagSubdivision
         {
-            set { ((BulletSharp.HeightfieldShape)InternalShape).SetUseZigzagSubdivision(value); }
+            set { ((BulletSharp.HeightfieldTerrainShape)InternalShape).SetUseZigzagSubdivision(value); }
         }
 
         public UnmanagedArray<short> ShortArray { get; private set; }
@@ -132,26 +156,86 @@ public override void UpdateDebugPrimitive(CommandList commandList, IDebugPrimiti
             heightfieldDebugPrimitive.Update(commandList);
         }
 
+        private readonly ReaderWriterLockSlim lockSlim = new ReaderWriterLockSlim();
+
+        ~HeightfieldColliderShape()
+        {
+            lockSlim.Dispose();
+        }
+
         public override void Dispose()
         {
             base.Dispose();
 
-            ShortArray?.Dispose();
-            ShortArray = null;
-            ByteArray?.Dispose();
-            ByteArray = null;
-            FloatArray?.Dispose();
-            FloatArray = null;
+            using (LockToReadAndWriteHeights())
+            {
+                ShortArray?.Dispose();
+                ShortArray = null;
+                ByteArray?.Dispose();
+                ByteArray = null;
+                FloatArray?.Dispose();
+                FloatArray = null;
+            }
+        }
+
+        public HeightArrayLock LockToReadHeights()
+        {
+            return new HeightArrayLock(HeightArrayLock.LockTypes.Read, lockSlim);
+        }
+
+        public HeightArrayLock LockToReadAndWriteHeights()
+        {
+            return new HeightArrayLock(HeightArrayLock.LockTypes.ReadWrite, lockSlim);
         }
 
-        private enum BulletPhyScalarType
+        public class HeightArrayLock : IDisposable
         {
-            PhyFloat,
-            PhyDouble,
-            PhyInteger,
-            PhyShort,
-            PhyFixedpoint88,
-            PhyUchar,
+            public enum LockTypes
+            {
+                Read = 0,
+                ReadWrite = 1,
+            }
+
+            private readonly ReaderWriterLockSlim readerWriterLockSlim;
+
+            internal HeightArrayLock(LockTypes lockType, ReaderWriterLockSlim lockSlim)
+            {
+                if (lockSlim == null)
+                {
+                    throw new ArgumentNullException(nameof(lockSlim));
+                }
+
+                readerWriterLockSlim = lockSlim;
+
+                switch (lockType)
+                {
+                    case LockTypes.Read:
+                        readerWriterLockSlim.EnterReadLock();
+                        break;
+                    case LockTypes.ReadWrite:
+                        readerWriterLockSlim.EnterWriteLock();
+                        break;
+                    default:
+                        throw new ArgumentException($"{ nameof(lockType) } is invalid type");
+                }
+            }
+
+            public void Unlock()
+            {
+                if (readerWriterLockSlim.IsReadLockHeld)
+                {
+                    readerWriterLockSlim.ExitReadLock();
+                }
+                else if (readerWriterLockSlim.IsWriteLockHeld)
+                {
+                    readerWriterLockSlim.ExitWriteLock();
+                }
+            }
+
+            public void Dispose()
+            {
+                Unlock();
+            }
         }
 
         public class HeightfieldDebugPrimitive : IDebugPrimitive
diff --git a/sources/engine/Xenko.Physics/Shapes/SphereColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/SphereColliderShape.cs
index 256882051e..8bd5faa9ab 100644
--- a/sources/engine/Xenko.Physics/Shapes/SphereColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/SphereColliderShape.cs
@@ -11,19 +11,22 @@ namespace Xenko.Physics
 {
     public class SphereColliderShape : ColliderShape
     {
+        public readonly float Radius;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SphereColliderShape"/> class.
         /// </summary>
         /// <param name="is2D">if set to <c>true</c> [is2 d].</param>
         /// <param name="radius">The radius.</param>
-        public SphereColliderShape(bool is2D, float radius)
+        public SphereColliderShape(bool is2D, float radiusParam, Vector3? offset = null)
         {
             Type = ColliderShapeTypes.Sphere;
             Is2D = is2D;
+            Radius = radiusParam;
 
             cachedScaling = Is2D ? new Vector3(1, 1, 0) : Vector3.One;
 
-            var shape = new BulletSharp.SphereShape(radius)
+            var shape = new BulletSharp.SphereShape(Radius)
             {
                 LocalScaling = cachedScaling,
             };
@@ -37,11 +40,17 @@ public SphereColliderShape(bool is2D, float radius)
                 InternalShape = shape;
             }
 
-            DebugPrimitiveMatrix = Matrix.Scaling(2 * radius * DebugScaling);
+            DebugPrimitiveMatrix = Matrix.Scaling(2 * Radius * DebugScaling);
             if (Is2D)
             {
                 DebugPrimitiveMatrix.M33 = 0f;
             }
+
+            if (offset.HasValue)
+            {
+                LocalOffset = offset.Value;
+                UpdateLocalTransformations();
+            }
         }
 
         public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
diff --git a/sources/engine/Xenko.Physics/Shapes/StaticMeshColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/StaticMeshColliderShape.cs
new file mode 100644
index 0000000000..ca5dba7ff9
--- /dev/null
+++ b/sources/engine/Xenko.Physics/Shapes/StaticMeshColliderShape.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Xenko.Core.Mathematics;
+using Xenko.Extensions;
+using Xenko.Graphics;
+using Xenko.Graphics.GeometricPrimitives;
+using Xenko.Rendering;
+
+namespace Xenko.Physics
+{
+    public class StaticMeshColliderShape : ColliderShape
+    {
+        private readonly Vector3[] vertices;
+        private readonly int[] indices;
+
+        public IReadOnlyList<Vector3> Vertices => vertices;
+        public IReadOnlyList<int> Indices => indices;
+
+
+
+
+        /// <summary>
+        /// Create a static collider from the vertices provided, ICollection will be duplicated before useage, 
+        /// your changes to the collection won't be reflected on the collision or <see cref="Vertices"/> and <see cref="Indices"/>.
+        /// </summary>
+        public StaticMeshColliderShape(ICollection<Vector3> vertices, ICollection<int> indices, Vector3 scaling) : this(vertices.ToArray(), indices.ToArray(), scaling)
+        {
+
+        }
+
+        /// <summary>
+        /// Internal constructor, the given arrays won't be 
+        /// </summary>
+        StaticMeshColliderShape(Vector3[] verticesParam, int[] indicesParam, Vector3 scaling)
+        {
+            Type = ColliderShapeTypes.StaticMesh;
+            Is2D = false;
+
+            // Enfore static data
+            vertices = verticesParam;
+            indices = indicesParam;
+            
+            var meshData = new BulletSharp.TriangleIndexVertexArray(indices, new XenkoToBulletWrapper(vertices));
+            var baseCollider = new BulletSharp.BvhTriangleMeshShape(meshData, true);
+            InternalShape = new BulletSharp.ScaledBvhTriangleMeshShape(baseCollider, scaling);
+            DebugPrimitiveMatrix = Matrix.Scaling(Vector3.One * DebugScaling);
+            Scaling = scaling;
+        }
+
+        public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
+        {
+            var verts = new VertexPositionNormalTexture[vertices.Length];
+            for(int i = 0; i < vertices.Length; i++)
+            {
+                verts[i].Position = vertices[i];
+            }
+            var meshData = new GeometricMeshData<VertexPositionNormalTexture>(verts, indices, false);
+
+            return new GeometricPrimitive(device, meshData).ToMeshDraw();
+        }
+        
+        class XenkoToBulletWrapper : ICollection<BulletSharp.Math.Vector3>
+        {
+            ICollection<Vector3> internalColl;
+            public XenkoToBulletWrapper(ICollection<Vector3> collectionToConvert)
+            {
+                internalColl = collectionToConvert;
+            }
+
+            public int Count => internalColl.Count;
+
+            public bool IsReadOnly => true;
+
+            public bool Contains(BulletSharp.Math.Vector3 item) => internalColl.Contains(item);
+
+            public void CopyTo(BulletSharp.Math.Vector3[] array, int arrayIndex)
+            {
+                foreach (var value in internalColl)
+                {
+                    if (arrayIndex >= array.Length)
+                        return;
+                    array[arrayIndex++] = value;
+                }
+            }
+
+            public void Add(BulletSharp.Math.Vector3 item) { throw new System.InvalidOperationException("Collection is read only"); }
+
+            public bool Remove(BulletSharp.Math.Vector3 item) { throw new System.InvalidOperationException("Collection is read only"); }
+
+            public void Clear() { throw new System.InvalidOperationException("Collection is read only"); }
+
+            public IEnumerator<BulletSharp.Math.Vector3> GetEnumerator()
+            {
+                foreach (var value in internalColl)
+                    yield return value;
+            }
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Shapes/StaticPlaneColliderShape.cs b/sources/engine/Xenko.Physics/Shapes/StaticPlaneColliderShape.cs
index 7d620c91f7..e1089dfae2 100644
--- a/sources/engine/Xenko.Physics/Shapes/StaticPlaneColliderShape.cs
+++ b/sources/engine/Xenko.Physics/Shapes/StaticPlaneColliderShape.cs
@@ -12,6 +12,9 @@ namespace Xenko.Physics
 {
     public class StaticPlaneColliderShape : ColliderShape
     {
+        public readonly Vector3 Normal;
+        public readonly float Offset;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="StaticPlaneColliderShape"/> class.
         /// A static plane that is solid to infinity on one side.
@@ -20,22 +23,24 @@ public class StaticPlaneColliderShape : ColliderShape
         /// </summary>
         /// <param name="normal">The normal.</param>
         /// <param name="offset">The offset.</param>
-        public StaticPlaneColliderShape(Vector3 normal, float offset)
+        public StaticPlaneColliderShape(Vector3 normalParam, float offsetParam)
         {
             Type = ColliderShapeTypes.StaticPlane;
             Is2D = false;
+            Normal = normalParam;
+            Offset = offsetParam;
 
             cachedScaling = Vector3.One;
 
-            InternalShape = new BulletSharp.StaticPlaneShape(normal, offset)
+            InternalShape = new BulletSharp.StaticPlaneShape(Normal, Offset)
             {
                 LocalScaling = cachedScaling,
             };
 
             Matrix rotationMatrix;
-            var oY = Vector3.Normalize(normal);
+            var oY = Vector3.Normalize(Normal);
             var oZ = Vector3.Cross(Vector3.UnitX, oY);
-            if (oZ.Length() > MathUtil.ZeroTolerance)
+            if (oZ.LengthSquared() > MathUtil.ZeroTolerance)
             {
                 oZ.Normalize();
                 var oX = Vector3.Cross(oY, oZ);
@@ -55,7 +60,7 @@ public StaticPlaneColliderShape(Vector3 normal, float offset)
                     0, 0, 0, 1);
             }
 
-            DebugPrimitiveMatrix = Matrix.Translation(offset * Vector3.UnitY) * rotationMatrix;
+            DebugPrimitiveMatrix = Matrix.Translation(Offset * Vector3.UnitY) * rotationMatrix;
         }
 
         public override MeshDraw CreateDebugPrimitive(GraphicsDevice device)
diff --git a/sources/engine/Xenko.Physics/ShortHeightStickArraySource.cs b/sources/engine/Xenko.Physics/ShortHeightStickArraySource.cs
new file mode 100644
index 0000000000..d9b92f2662
--- /dev/null
+++ b/sources/engine/Xenko.Physics/ShortHeightStickArraySource.cs
@@ -0,0 +1,73 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Physics
+{
+    [DataContract]
+    [Display("Short")]
+    public class ShortHeightStickArraySource : IHeightStickArraySource
+    {
+        [DataMemberIgnore]
+        public HeightfieldTypes HeightType => HeightfieldTypes.Short;
+
+        [DataMember(10)]
+        [Display("Size")]
+        public Int2 HeightStickSize { get; set; } = new Int2(65, 65);
+
+        [DataMember(20)]
+        public Vector2 HeightRange { get; set; } = new Vector2(-10, 10);
+
+        [DataMemberIgnore]
+        public float HeightScale => HeightScaleCalculator.Calculate(this);
+
+        /// <summary>
+        /// Select how to calculate HeightScale.
+        /// </summary>
+        [DataMember(30)]
+        [NotNull]
+        [Display("HeightScale", Expand = ExpandRule.Always)]
+        public IHeightScaleCalculator HeightScaleCalculator { get; set; } = new HeightScaleCalculator();
+
+        /// <summary>
+        /// The value to fill the height stick array.
+        /// </summary>
+        [DataMember(40)]
+        [DataMemberRange(-32767, 32767, 1, 10, 0)]
+        public short InitialShort { get; set; } = 0;
+
+        public bool IsValid() => HeightmapUtils.CheckHeightParameters(HeightStickSize, HeightType, HeightRange, HeightScale, false) &&
+            MathUtil.IsInRange(InitialShort, -short.MaxValue, short.MaxValue);
+
+        public void CopyTo<T>(UnmanagedArray<T> heightStickArray, int index) where T : struct
+        {
+            if (heightStickArray == null) throw new ArgumentNullException(nameof(heightStickArray));
+            if (heightStickArray is UnmanagedArray<short> unmanagedArray)
+            {
+                unmanagedArray.Fill(InitialShort, index, HeightStickSize.X * HeightStickSize.Y);
+            }
+            else
+            {
+                throw new NotSupportedException($"{ typeof(UnmanagedArray<T>) } type is not supported.");
+            }
+        }
+
+        public bool Match(object obj)
+        {
+            var other = obj as ShortHeightStickArraySource;
+
+            if (other == null)
+            {
+                return false;
+            }
+
+            return other.HeightStickSize == HeightStickSize &&
+                other.HeightRange == HeightRange &&
+                Math.Abs(other.HeightScale - HeightScale) < float.Epsilon &&
+                other.InitialShort == InitialShort;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Simulation.cs b/sources/engine/Xenko.Physics/Simulation.cs
index 2fe0a6d0f7..fdff794261 100644
--- a/sources/engine/Xenko.Physics/Simulation.cs
+++ b/sources/engine/Xenko.Physics/Simulation.cs
@@ -3,6 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Runtime.ExceptionServices;
+using System.Security;
+using System.Threading;
+using BulletSharp;
 using Xenko.Core.Collections;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.Mathematics;
@@ -13,12 +17,16 @@ namespace Xenko.Physics
 {
     public class Simulation : IDisposable
     {
+        const CollisionFilterGroups DefaultGroup = (CollisionFilterGroups)BulletSharp.CollisionFilterGroups.DefaultFilter;
+        const CollisionFilterGroupFlags DefaultFlags = (CollisionFilterGroupFlags)BulletSharp.CollisionFilterGroups.AllFilter;
+
         private readonly PhysicsProcessor processor;
 
-        private readonly BulletSharp.DiscreteDynamicsWorld discreteDynamicsWorld;
-        private readonly BulletSharp.CollisionWorld collisionWorld;
+        private readonly BulletSharp.DiscreteDynamicsWorldMultiThreaded discreteDynamicsWorld;
+        internal readonly BulletSharp.CollisionWorld collisionWorld;
 
         private readonly BulletSharp.CollisionDispatcher dispatcher;
+        private readonly BulletSharp.ConstraintSolverPoolMultiThreaded constraints;
         private readonly BulletSharp.CollisionConfiguration collisionConfiguration;
         private readonly BulletSharp.DbvtBroadphase broadphase;
 
@@ -60,6 +68,8 @@ public bool ContinuousCollisionDetection
         /// </summary>
         public static bool DisableSimulation = false;
 
+        internal ReaderWriterLockSlim simulationLocker;
+
         public delegate PhysicsEngineFlags OnSimulationCreationDelegate();
 
         /// <summary>
@@ -76,18 +86,19 @@ public bool ContinuousCollisionDetection
         internal Simulation(PhysicsProcessor processor, PhysicsSettings configuration)
         {
             this.processor = processor;
+            
+            if (configuration.Flags.HasFlag(PhysicsEngineFlags.MultiThreaded))
+                simulationLocker = new ReaderWriterLockSlim(LockRecursionPolicy.NoRecursion);
 
             if (configuration.Flags == PhysicsEngineFlags.None)
             {
                 configuration.Flags = OnSimulationCreation?.Invoke() ?? configuration.Flags;              
             }
 
-            MaxSubSteps = configuration.MaxSubSteps;
-            FixedTimeStep = configuration.FixedTimeStep;
-
             collisionConfiguration = new BulletSharp.DefaultCollisionConfiguration();
-            dispatcher = new BulletSharp.CollisionDispatcher(collisionConfiguration);
+            dispatcher = new BulletSharp.CollisionDispatcherMultiThreaded(collisionConfiguration);
             broadphase = new BulletSharp.DbvtBroadphase();
+            constraints = new ConstraintSolverPoolMultiThreaded(8);
 
             //this allows characters to have proper physics behavior
             broadphase.OverlappingPairCache.SetInternalGhostPairCallback(new BulletSharp.GhostPairCallback());
@@ -104,7 +115,7 @@ internal Simulation(PhysicsProcessor processor, PhysicsSettings configuration)
             //~2D pipeline
 
             //default solver
-            var solver = new BulletSharp.SequentialImpulseConstraintSolver();
+            var solver = new BulletSharp.SequentialImpulseConstraintSolverMultiThreaded();
 
             if (configuration.Flags.HasFlag(PhysicsEngineFlags.CollisionsOnly))
             {
@@ -119,7 +130,8 @@ internal Simulation(PhysicsProcessor processor, PhysicsSettings configuration)
             }
             else
             {
-                discreteDynamicsWorld = new BulletSharp.DiscreteDynamicsWorld(dispatcher, broadphase, solver, collisionConfiguration);
+                discreteDynamicsWorld = new BulletSharp.DiscreteDynamicsWorldMultiThreaded(dispatcher, broadphase, constraints, solver, collisionConfiguration);
+                discreteDynamicsWorld.SetInternalTickCallback(OnPreSimulationTick, new object(), true);
                 collisionWorld = discreteDynamicsWorld;
             }
 
@@ -128,9 +140,9 @@ internal Simulation(PhysicsProcessor processor, PhysicsSettings configuration)
                 solverInfo = discreteDynamicsWorld.SolverInfo; //we are required to keep this reference, or the GC will mess up
                 dispatchInfo = discreteDynamicsWorld.DispatchInfo;
 
-                solverInfo.SolverMode |= BulletSharp.SolverModes.CacheFriendly; //todo test if helps with performance or not
+                solverInfo.SolverMode |= BulletSharp.SolverModes.CacheFriendly | SolverModes.Simd | SolverModes.UseWarmStarting; //todo test if helps with performance or not
 
-                if (configuration.Flags.HasFlag(PhysicsEngineFlags.ContinuosCollisionDetection))
+                if (configuration.Flags.HasFlag(PhysicsEngineFlags.ContinuousCollisionDetection))
                 {
                     CanCcd = true;
                     solverInfo.SolverMode |= BulletSharp.SolverModes.Use2FrictionDirections | BulletSharp.SolverModes.RandomizeOrder;
@@ -219,12 +231,22 @@ internal void SendEvents()
         /// <summary>
         /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
         /// </summary>
+        [HandleProcessCorruptedStateExceptionsAttribute, SecurityCriticalAttribute]
         public void Dispose()
         {
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
+
             //if (mSoftRigidDynamicsWorld != null) mSoftRigidDynamicsWorld.Dispose();
             if (discreteDynamicsWorld != null)
             {
-                discreteDynamicsWorld.Dispose();
+                try
+                {
+                    discreteDynamicsWorld.Dispose();
+                }
+                catch(System.AccessViolationException e)
+                {
+                    // probably trying to dispose while threading is still happening... just ignore for now, we are likely quitting
+                }
             }
             else
             {
@@ -234,6 +256,8 @@ public void Dispose()
             broadphase?.Dispose();
             dispatcher?.Dispose();
             collisionConfiguration?.Dispose();
+
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
         }
 
         /// <summary>
@@ -251,26 +275,34 @@ public bool ColliderShapesRendering
 
         internal void AddCollider(PhysicsComponent component, CollisionFilterGroupFlags group, CollisionFilterGroupFlags mask)
         {
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
             collisionWorld.AddCollisionObject(component.NativeCollisionObject, (BulletSharp.CollisionFilterGroups)group, (BulletSharp.CollisionFilterGroups)mask);
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
         }
 
         internal void RemoveCollider(PhysicsComponent component)
         {
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
             collisionWorld.RemoveCollisionObject(component.NativeCollisionObject);
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
         }
 
         internal void AddRigidBody(RigidbodyComponent rigidBody, CollisionFilterGroupFlags group, CollisionFilterGroupFlags mask)
         {
             if (discreteDynamicsWorld == null) throw new Exception("Cannot perform this action when the physics engine is set to CollisionsOnly");
 
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
             discreteDynamicsWorld.AddRigidBody(rigidBody.InternalRigidBody, (short)group, (short)mask);
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
         }
 
         internal void RemoveRigidBody(RigidbodyComponent rigidBody)
         {
             if (discreteDynamicsWorld == null) throw new Exception("Cannot perform this action when the physics engine is set to CollisionsOnly");
 
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
             discreteDynamicsWorld.RemoveRigidBody(rigidBody.InternalRigidBody);
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
         }
 
         internal void AddCharacter(CharacterComponent character, CollisionFilterGroupFlags group, CollisionFilterGroupFlags mask)
@@ -279,8 +311,12 @@ internal void AddCharacter(CharacterComponent character, CollisionFilterGroupFla
 
             var collider = character.NativeCollisionObject;
             var action = character.KinematicCharacter;
+
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
             discreteDynamicsWorld.AddCollisionObject(collider, (BulletSharp.CollisionFilterGroups)group, (BulletSharp.CollisionFilterGroups)mask);
-            discreteDynamicsWorld.AddCharacter(action);
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
+
+            discreteDynamicsWorld.AddAction(action);
 
             character.Simulation = this;
         }
@@ -291,8 +327,12 @@ internal void RemoveCharacter(CharacterComponent character)
 
             var collider = character.NativeCollisionObject;
             var action = character.KinematicCharacter;
+
+            if (simulationLocker != null) simulationLocker.EnterWriteLock();
             discreteDynamicsWorld.RemoveCollisionObject(collider);
-            discreteDynamicsWorld.RemoveCharacter(action);
+            if (simulationLocker != null) simulationLocker.ExitWriteLock();
+
+            discreteDynamicsWorld.RemoveAction(action);
 
             character.Simulation = null;
         }
@@ -314,111 +354,9 @@ internal void RemoveCharacter(CharacterComponent character)
         /// </exception>
         public static Constraint CreateConstraint(ConstraintTypes type, RigidbodyComponent rigidBodyA, Matrix frameA, bool useReferenceFrameA = false)
         {
-            if (rigidBodyA == null) throw new Exception("Both RigidBodies must be valid");
-
-            var rbA = rigidBodyA.InternalRigidBody;
-
-            switch (type)
-            {
-                case ConstraintTypes.Point2Point:
-                    {
-                        var constraint = new Point2PointConstraint
-                        {
-                            InternalPoint2PointConstraint = new BulletSharp.Point2PointConstraint(rbA, frameA.TranslationVector),
-
-                            RigidBodyA = rigidBodyA,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalPoint2PointConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
-                case ConstraintTypes.Hinge:
-                    {
-                        var constraint = new HingeConstraint
-                        {
-                            InternalHingeConstraint = new BulletSharp.HingeConstraint(rbA, frameA, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalHingeConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
-                case ConstraintTypes.Slider:
-                    {
-                        var constraint = new SliderConstraint
-                        {
-                            InternalSliderConstraint = new BulletSharp.SliderConstraint(rbA, frameA, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalSliderConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
-                case ConstraintTypes.ConeTwist:
-                    {
-                        var constraint = new ConeTwistConstraint
-                        {
-                            InternalConeTwistConstraint = new BulletSharp.ConeTwistConstraint(rbA, frameA),
-
-                            RigidBodyA = rigidBodyA,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalConeTwistConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
-                case ConstraintTypes.Generic6DoF:
-                    {
-                        var constraint = new Generic6DoFConstraint
-                        {
-                            InternalGeneric6DofConstraint = new BulletSharp.Generic6DofConstraint(rbA, frameA, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalGeneric6DofConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
-                case ConstraintTypes.Generic6DoFSpring:
-                    {
-                        var constraint = new Generic6DoFSpringConstraint
-                        {
-                            InternalGeneric6DofSpringConstraint = new BulletSharp.Generic6DofSpringConstraint(rbA, frameA, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalGeneric6DofConstraint = constraint.InternalGeneric6DofSpringConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
-                case ConstraintTypes.Gear:
-                    {
-                        throw new Exception("A Gear constraint always needs two rigidbodies to be created.");
-                    }
-            }
-
-            return null;
+            return CreateConstraintInternal(type, rigidBodyA, frameA, useReferenceFrameA:useReferenceFrameA);
         }
-
+        
         /// <summary>
         /// Creates the constraint.
         /// </summary>
@@ -437,137 +375,133 @@ public static Constraint CreateConstraint(ConstraintTypes type, RigidbodyCompone
         public static Constraint CreateConstraint(ConstraintTypes type, RigidbodyComponent rigidBodyA, RigidbodyComponent rigidBodyB, Matrix frameA, Matrix frameB, bool useReferenceFrameA = false)
         {
             if (rigidBodyA == null || rigidBodyB == null) throw new Exception("Both RigidBodies must be valid");
-            //todo check if the 2 rbs are on the same engine instance!
+            return CreateConstraintInternal(type, rigidBodyA, frameA, rigidBodyB, frameB, useReferenceFrameA);
+        }
 
-            var rbA = rigidBodyA.InternalRigidBody;
-            var rbB = rigidBodyB.InternalRigidBody;
 
+        static Constraint CreateConstraintInternal(ConstraintTypes type, RigidbodyComponent rigidBodyA, Matrix frameA, RigidbodyComponent rigidBodyB = null, Matrix frameB = default, bool useReferenceFrameA = false)
+        {
+            if (rigidBodyA == null) throw new Exception($"{nameof(rigidBodyA)} must be valid");
+            if (rigidBodyB != null && rigidBodyB.Simulation != rigidBodyA.Simulation) throw new Exception("Both RigidBodies must be on the same simulation");
+
+            Constraint constraintBase;
+            var rbA = rigidBodyA.InternalRigidBody;
+            var rbB = rigidBodyB?.InternalRigidBody;
             switch (type)
             {
                 case ConstraintTypes.Point2Point:
+                {
+                    var constraint = new Point2PointConstraint
                     {
-                        var constraint = new Point2PointConstraint
-                        {
-                            InternalPoint2PointConstraint = new BulletSharp.Point2PointConstraint(rbA, rbB, frameA.TranslationVector, frameB.TranslationVector),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalPoint2PointConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
+                        InternalPoint2PointConstraint = 
+                            rigidBodyB == null ? 
+                            new BulletSharp.Point2PointConstraint(rbA, frameA.TranslationVector ) :
+                            new BulletSharp.Point2PointConstraint(rbA, rbB, frameA.TranslationVector, frameB.TranslationVector),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalPoint2PointConstraint;
+                    break;
+                }
                 case ConstraintTypes.Hinge:
+                {
+                    var constraint = new HingeConstraint
                     {
-                        var constraint = new HingeConstraint
-                        {
-                            InternalHingeConstraint = new BulletSharp.HingeConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalHingeConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
+                        InternalHingeConstraint = 
+                            rigidBodyB == null ? 
+                                new BulletSharp.HingeConstraint(rbA, frameA ) :
+                                new BulletSharp.HingeConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalHingeConstraint;
+                    break;
+                }
                 case ConstraintTypes.Slider:
+                {
+                    var constraint = new SliderConstraint
                     {
-                        var constraint = new SliderConstraint
-                        {
-                            InternalSliderConstraint = new BulletSharp.SliderConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalSliderConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
+                        InternalSliderConstraint = 
+                            rigidBodyB == null ? 
+                                new BulletSharp.SliderConstraint(rbA, frameA, useReferenceFrameA ) :
+                                new BulletSharp.SliderConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalSliderConstraint;
+                    break;
+                }
                 case ConstraintTypes.ConeTwist:
+                {
+                    var constraint = new ConeTwistConstraint
                     {
-                        var constraint = new ConeTwistConstraint
-                        {
-                            InternalConeTwistConstraint = new BulletSharp.ConeTwistConstraint(rbA, rbB, frameA, frameB),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalConeTwistConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
+                        InternalConeTwistConstraint =  
+                            rigidBodyB == null ? 
+                                new BulletSharp.ConeTwistConstraint(rbA, frameA) :
+                                new BulletSharp.ConeTwistConstraint(rbA, rbB, frameA, frameB),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalConeTwistConstraint;
+                    break;
+                }
                 case ConstraintTypes.Generic6DoF:
+                {
+                    var constraint = new Generic6DoFConstraint
                     {
-                        var constraint = new Generic6DoFConstraint
-                        {
-                            InternalGeneric6DofConstraint = new BulletSharp.Generic6DofConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalGeneric6DofConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
+                        InternalGeneric6DofConstraint =  
+                            rigidBodyB == null ? 
+                                new BulletSharp.Generic6DofConstraint(rbA, frameA, useReferenceFrameA) :
+                                new BulletSharp.Generic6DofConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalGeneric6DofConstraint;
+                    break;
+                }
                 case ConstraintTypes.Generic6DoFSpring:
+                {
+                    var constraint = new Generic6DoFSpringConstraint
                     {
-                        var constraint = new Generic6DoFSpringConstraint
-                        {
-                            InternalGeneric6DofSpringConstraint = new BulletSharp.Generic6DofSpringConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalGeneric6DofConstraint = constraint.InternalGeneric6DofSpringConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
-
-                        return constraint;
-                    }
+                        InternalGeneric6DofSpringConstraint =  
+                            rigidBodyB == null ? 
+                                new BulletSharp.Generic6DofSpringConstraint(rbA, frameA, useReferenceFrameA) :
+                                new BulletSharp.Generic6DofSpringConstraint(rbA, rbB, frameA, frameB, useReferenceFrameA),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalGeneric6DofConstraint = constraint.InternalGeneric6DofSpringConstraint;
+                    break;
+                }
                 case ConstraintTypes.Gear:
+                {
+                    var constraint = new GearConstraint
                     {
-                        var constraint = new GearConstraint
-                        {
-                            InternalGearConstraint = new BulletSharp.GearConstraint(rbA, rbB, frameA.TranslationVector, frameB.TranslationVector),
-
-                            RigidBodyA = rigidBodyA,
-                            RigidBodyB = rigidBodyB,
-                        };
-
-                        constraint.InternalConstraint = constraint.InternalGearConstraint;
-
-                        rigidBodyA.LinkedConstraints.Add(constraint);
-                        rigidBodyB.LinkedConstraints.Add(constraint);
+                        InternalGearConstraint =  
+                            rigidBodyB == null ? 
+                                throw new Exception("A Gear constraint always needs two rigidbodies to be created.") :
+                                new BulletSharp.GearConstraint(rbA, rbB, frameA.TranslationVector, frameB.TranslationVector),
+                    };
+                    constraintBase = constraint;
+
+                    constraint.InternalConstraint = constraint.InternalGearConstraint;
+                    break;
+                }
+                default:
+                    throw new ArgumentException(type.ToString());
+            }
 
-                        return constraint;
-                    }
+            if(rigidBodyB != null)
+            {
+                constraintBase.RigidBodyB = rigidBodyB;
+                rigidBodyB.LinkedConstraints.Add(constraintBase);
             }
+            rigidBodyA.LinkedConstraints.Add(constraintBase);
 
-            return null;
+            return constraintBase;
         }
 
+
         /// <summary>
         /// Adds the constraint to the engine processing pipeline.
         /// </summary>
@@ -608,131 +542,40 @@ public void RemoveConstraint(Constraint constraint)
             constraint.Simulation = null;
         }
 
-        private class XenkoAllHitsConvexResultCallback : BulletSharp.AllHitsConvexResultCallback
-        {
-            private IList<HitResult> resultsList;
-
-            public XenkoAllHitsConvexResultCallback(IList<HitResult> results)
-            {
-                resultsList = results;
-            }
-
-            public override void AddSingleResult(BulletSharp.CollisionObject collisionObject, ref Vector3 point, ref Vector3 normal, float hitFraction)
-            {
-                resultsList.Add(new HitResult
-                {
-                    Succeeded = true,
-                    Collider = collisionObject.UserObject as PhysicsComponent,
-                    Point = point,
-                    Normal = normal,
-                    HitFraction = hitFraction,
-                });
-            }
-        }
-
-        private class XenkoAllHitsRayResultCallback : BulletSharp.AllHitsRayResultCallback
-        {
-            private IList<HitResult> resultsList;
-
-            public XenkoAllHitsRayResultCallback(ref Vector3 from, ref Vector3 to, IList<HitResult> results) : base(ref from, ref to)
-            {
-                resultsList = results;
-            }
-
-            public override void AddSingleResult(BulletSharp.CollisionObject collisionObject, ref Vector3 point, ref Vector3 normal, float hitFraction)
-            {
-                resultsList.Add(new HitResult
-                {
-                    Succeeded = true,
-                    Collider = collisionObject.UserObject as PhysicsComponent,
-                    Point = point,
-                    Normal = normal,
-                    HitFraction = hitFraction,
-                });
-            }
-        }
-
-        /// <summary>
-        /// Raycasts and stops at the first hit.
-        /// </summary>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
-        /// <returns></returns>
-        public HitResult Raycast(Vector3 from, Vector3 to)
-        {
-            var result = new HitResult(); //result.Succeeded is false by default
-
-            using (var rcb = new BulletSharp.ClosestRayResultCallback(from, to))
-            {
-                collisionWorld.RayTest(ref from, ref to, rcb);
-
-                if (rcb.CollisionObject == null) return result;
-                result.Succeeded = true;
-                result.Collider = (PhysicsComponent)rcb.CollisionObject.UserObject;
-                result.Normal = rcb.HitNormalWorld;
-                result.Point = rcb.HitPointWorld;
-                result.HitFraction = rcb.ClosestHitFraction;
-            }
-
-            return result;
-        }
-
         /// <summary>
-        /// Raycasts and stops at the first hit.
+        /// Raycasts and returns the closest hit
         /// </summary>
         /// <param name="from">From.</param>
         /// <param name="to">To.</param>
-        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
-        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="filterFlags">The collision group that this raycast can collide with</param>
         /// <returns>The list with hit results.</returns>
-        public HitResult Raycast(Vector3 from, Vector3 to, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        public HitResult Raycast(Vector3 from, Vector3 to, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
-            var result = new HitResult(); //result.Succeeded is false by default
-
-            using (var rcb = new BulletSharp.ClosestRayResultCallback(from, to)
-            {
-                CollisionFilterGroup = (short)collisionFilterGroups,
-                CollisionFilterMask = (short)collisionFilterGroupFlags,
-            })
-            {
-                collisionWorld.RayTest(ref from, ref to, rcb);
-
-                if (rcb.CollisionObject == null) return result;
-                result.Succeeded = true;
-                result.Collider = (PhysicsComponent)rcb.CollisionObject.UserObject;
-                result.Normal = rcb.HitNormalWorld;
-                result.Point = rcb.HitPointWorld;
-                result.HitFraction = rcb.ClosestHitFraction;
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Raycasts penetrating any shape the ray encounters.
-        /// </summary>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
-        /// <param name="resultsOutput">The list to fill with results.</param>
-        public void RaycastPenetrating(Vector3 from, Vector3 to, IList<HitResult> resultsOutput)
-        {
-            using (var rcb = new XenkoAllHitsRayResultCallback(ref from, ref to, resultsOutput))
-            {
-                collisionWorld.RayTest(ref from, ref to, rcb);
-            }
+            var callback = XenkoClosestRayResultCallback.Shared(ref from, ref to, filterGroup, filterFlags);
+            if (simulationLocker != null) simulationLocker.EnterReadLock();
+            collisionWorld.RayTest(from, to, callback);
+            if (simulationLocker != null) simulationLocker.ExitReadLock();
+            return callback.Result;
         }
 
         /// <summary>
-        /// Raycasts penetrating any shape the ray encounters.
+        /// Raycasts, returns true when it hit something
         /// </summary>
         /// <param name="from">From.</param>
         /// <param name="to">To.</param>
+        /// <param name="result">Raycast info</param>
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="filterFlags">The collision group that this raycast can collide with</param>
         /// <returns>The list with hit results.</returns>
-        public FastList<HitResult> RaycastPenetrating(Vector3 from, Vector3 to)
+        public bool Raycast(Vector3 from, Vector3 to, out HitResult result, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
-            var results = new FastList<HitResult>();
-            RaycastPenetrating(from, to, results);
-            return results;
+            var callback = XenkoClosestRayResultCallback.Shared(ref from, ref to, filterGroup, filterFlags);
+            if (simulationLocker != null) simulationLocker.EnterReadLock();
+            collisionWorld.RayTest(from, to, callback);
+            if (simulationLocker != null) simulationLocker.ExitReadLock();
+            result = callback.Result;
+            return result.Succeeded;
         }
 
         /// <summary>
@@ -742,133 +585,69 @@ public FastList<HitResult> RaycastPenetrating(Vector3 from, Vector3 to)
         /// <param name="from">From.</param>
         /// <param name="to">To.</param>
         /// <param name="resultsOutput">The list to fill with results.</param>
-        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
-        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
-        public void RaycastPenetrating(Vector3 from, Vector3 to, IList<HitResult> resultsOutput, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
-        {
-            using (var rcb = new XenkoAllHitsRayResultCallback(ref from, ref to, resultsOutput)
-            {
-                CollisionFilterGroup = (short)collisionFilterGroups,
-                CollisionFilterMask = (short)collisionFilterGroupFlags,
-            })
-            {
-                collisionWorld.RayTest(ref from, ref to, rcb);
-            }
-        }
-
-        /// <summary>
-        /// Raycasts penetrating any shape the ray encounters.
-        /// </summary>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
-        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
-        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
-        /// <returns>The list with hit results.</returns>
-        public FastList<HitResult> RaycastPenetrating(Vector3 from, Vector3 to, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        /// <param name="filterGroup">The collision group of this raycast</param>
+        /// <param name="filterFlags">The collision group that this raycast can collide with</param>
+        public void RaycastPenetrating(Vector3 from, Vector3 to, IList<HitResult> resultsOutput, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
-            var results = new FastList<HitResult>();
-            RaycastPenetrating(from, to, results, collisionFilterGroups, collisionFilterGroupFlags);
-            return results;
+            var callback = XenkoAllHitsRayResultCallback.Shared(ref from, ref to, resultsOutput, filterGroup, filterFlags);
+            if (simulationLocker != null) simulationLocker.EnterReadLock();
+            collisionWorld.RayTest(from, to, callback);
+            if (simulationLocker != null) simulationLocker.ExitReadLock();
         }
 
         /// <summary>
-        /// Performs a sweep test using a collider shape and stops at the first hit
+        /// Performs a test to see if a collider shape collides with anything, and if so, returns the closest hit to the center of the shape.
         /// </summary>
         /// <param name="shape">The shape.</param>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
+        /// <param name="position">Where to test.</param>
+        /// <param name="filterGroup">Group of the shape.</param>
+        /// <param name="filterFlags">What the shape should collide with</param>
         /// <returns></returns>
-        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
-        public HitResult ShapeSweep(ColliderShape shape, Matrix from, Matrix to)
+        public HitResult ShapeTest(ColliderShape shape, Vector3 position, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
-            var sh = shape.InternalShape as BulletSharp.ConvexShape;
-            if (sh == null) throw new Exception("This kind of shape cannot be used for a ShapeSweep.");
+            Matrix from = Matrix.Transformation(Vector3.Zero, Quaternion.Identity, position);
+            Matrix to = Matrix.Translation(position);
 
-            var result = new HitResult(); //result.Succeeded is false by default
-
-            using (var rcb = new BulletSharp.ClosestConvexResultCallback(from.TranslationVector, to.TranslationVector))
-            {
-                collisionWorld.ConvexSweepTest(sh, from, to, rcb);
-
-                if (rcb.HitCollisionObject == null) return result;
-                result.Succeeded = true;
-                result.Collider = (PhysicsComponent)rcb.HitCollisionObject.UserObject;
-                result.Normal = rcb.HitNormalWorld;
-                result.Point = rcb.HitPointWorld;
-                result.HitFraction = rcb.ClosestHitFraction;
-            }
-
-            return result;
+            return ShapeSweep(shape, from, to, filterGroup, filterFlags);
         }
 
         /// <summary>
-        /// Performs a sweep test using a collider shape and stops at the first hit
+        /// Performs a test to see if a collider shape collides with anything, and if so, returns all results in a list
         /// </summary>
         /// <param name="shape">The shape.</param>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
-        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
-        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
+        /// <param name="position">Where to test.</param>
+        /// <param name="resultsOutput">Where to store results</param>
+        /// <param name="filterGroup">Group of the shape.</param>
+        /// <param name="filterFlags">What the shape should collide with</param>
         /// <returns></returns>
-        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
-        public HitResult ShapeSweep(ColliderShape shape, Matrix from, Matrix to, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        public void ShapeTestPenetrating(ColliderShape shape, Vector3 position, IList<HitResult> resultsOutput, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
-            var sh = shape.InternalShape as BulletSharp.ConvexShape;
-            if (sh == null) throw new Exception("This kind of shape cannot be used for a ShapeSweep.");
+            Matrix from = Matrix.Transformation(Vector3.Zero, Quaternion.Identity, position);
+            Matrix to = Matrix.Translation(position);
 
-            var result = new HitResult(); //result.Succeeded is false by default
-
-            using (var rcb = new BulletSharp.ClosestConvexResultCallback(from.TranslationVector, to.TranslationVector)
-            {
-                CollisionFilterGroup = (BulletSharp.CollisionFilterGroups)collisionFilterGroups,
-                CollisionFilterMask = (BulletSharp.CollisionFilterGroups)collisionFilterGroupFlags,
-            })
-            {
-                collisionWorld.ConvexSweepTest(sh, from, to, rcb);
-
-                if (rcb.HitCollisionObject == null) return result;
-                result.Succeeded = true;
-                result.Collider = (PhysicsComponent)rcb.HitCollisionObject.UserObject;
-                result.Normal = rcb.HitNormalWorld;
-                result.Point = rcb.HitPointWorld;
-                result.HitFraction = rcb.ClosestHitFraction;
-            }
-
-            return result;
+            ShapeSweepPenetrating(shape, from, to, resultsOutput, filterGroup, filterFlags);
         }
 
         /// <summary>
-        /// Performs a sweep test using a collider shape and never stops until "to"
+        /// Performs a sweep test using a collider shape and returns the closest hit
         /// </summary>
         /// <param name="shape">The shape.</param>
         /// <param name="from">From.</param>
         /// <param name="to">To.</param>
-        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <param name="filterGroup">The collision group of this shape sweep</param>
+        /// <param name="filterFlags">The collision group that this shape sweep can collide with</param>
+        /// <returns></returns>
         /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
-        public void ShapeSweepPenetrating(ColliderShape shape, Matrix from, Matrix to, IList<HitResult> resultsOutput)
+        public HitResult ShapeSweep(ColliderShape shape, Matrix from, Matrix to, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
             var sh = shape.InternalShape as BulletSharp.ConvexShape;
             if (sh == null) throw new Exception("This kind of shape cannot be used for a ShapeSweep.");
 
-            using (var rcb = new XenkoAllHitsConvexResultCallback(resultsOutput))
-            {
-                collisionWorld.ConvexSweepTest(sh, from, to, rcb);
-            }
-        }
-
-        /// <summary>
-        /// Performs a sweep test using a collider shape and never stops until "to"
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
-        /// <returns>The list with hit results.</returns>
-        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
-        public FastList<HitResult> ShapeSweepPenetrating(ColliderShape shape, Matrix from, Matrix to)
-        {
-            var results = new FastList<HitResult>();
-            ShapeSweepPenetrating(shape, from, to, results);
-            return results;
+            var callback = XenkoClosestConvexResultCallback.Shared(filterGroup, filterFlags);
+            if (simulationLocker != null) simulationLocker.EnterReadLock();
+            collisionWorld.ConvexSweepTest(sh, from, to, callback);
+            if (simulationLocker != null) simulationLocker.ExitReadLock();
+            return callback.Result;
         }
 
         /// <summary>
@@ -878,39 +657,21 @@ public FastList<HitResult> ShapeSweepPenetrating(ColliderShape shape, Matrix fro
         /// <param name="from">From.</param>
         /// <param name="to">To.</param>
         /// <param name="resultsOutput">The list to fill with results.</param>
-        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
-        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
+        /// <param name="filterGroup">The collision group of this shape sweep</param>
+        /// <param name="filterFlags">The collision group that this shape sweep can collide with</param>
         /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
-        public void ShapeSweepPenetrating(ColliderShape shape, Matrix from, Matrix to, IList<HitResult> resultsOutput, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        public void ShapeSweepPenetrating(ColliderShape shape, Matrix from, Matrix to, IList<HitResult> resultsOutput, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterFlags = DefaultFlags)
         {
             var sh = shape.InternalShape as BulletSharp.ConvexShape;
-            if (sh == null) throw new Exception("This kind of shape cannot be used for a ShapeSweep.");
-
-            using (var rcb = new XenkoAllHitsConvexResultCallback(resultsOutput)
-            {
-                CollisionFilterGroup = (BulletSharp.CollisionFilterGroups)collisionFilterGroups,
-                CollisionFilterMask = (BulletSharp.CollisionFilterGroups)collisionFilterGroupFlags,
-            })
+            if (sh == null)
             {
-                collisionWorld.ConvexSweepTest(sh, from, to, rcb);
+                throw new Exception("This kind of shape cannot be used for a ShapeSweep.");
             }
-        }
-
-        /// <summary>
-        /// Performs a sweep test using a collider shape and never stops until "to"
-        /// </summary>
-        /// <param name="shape">The shape.</param>
-        /// <param name="from">From.</param>
-        /// <param name="to">To.</param>
-        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
-        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
-        /// <returns>The list with hit results.</returns>
-        /// <exception cref="System.Exception">This kind of shape cannot be used for a ShapeSweep.</exception>
-        public FastList<HitResult> ShapeSweepPenetrating(ColliderShape shape, Matrix from, Matrix to, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
-        {
-            var results = new FastList<HitResult>();
-            ShapeSweepPenetrating(shape, from, to, results, collisionFilterGroups, collisionFilterGroupFlags);
-            return results;
+            
+            var rcb = XenkoAllHitsConvexResultCallback.Shared(resultsOutput, filterGroup, filterFlags);
+            if (simulationLocker != null) simulationLocker.EnterReadLock();
+            collisionWorld.ConvexSweepTest(sh, from, to, rcb);
+            if (simulationLocker != null) simulationLocker.ExitReadLock();
         }
 
         /// <summary>
@@ -938,13 +699,6 @@ public Vector3 Gravity
             }
         }
 
-        /// <summary>
-        /// The maximum number of steps that the Simulation is allowed to take each tick.
-        /// If the engine is running slow (large deltaTime), then you must increase the number of maxSubSteps to compensate for this, otherwise your simulation is “losing” time.
-        /// It's important that frame DeltaTime is always less than MaxSubSteps*FixedTimeStep, otherwise you are losing time.
-        /// </summary>
-        public int MaxSubSteps { get; set; }
-
         /// <summary>
         /// By decreasing the size of fixedTimeStep, you are increasing the “resolution” of the simulation.
         /// Default is 1.0f / 60.0f or 60fps
@@ -1006,8 +760,16 @@ internal void Simulate(float deltaTime)
 
             SimulationProfiler = Profiler.Begin(PhysicsProfilingKeys.SimulationProfilingKey);
 
-            if (discreteDynamicsWorld != null) discreteDynamicsWorld.StepSimulation(deltaTime, MaxSubSteps, FixedTimeStep);
-            else collisionWorld.PerformDiscreteCollisionDetection();
+            if (discreteDynamicsWorld != null)
+            {
+                if (simulationLocker != null) simulationLocker.EnterWriteLock();
+                discreteDynamicsWorld.StepSimulation(deltaTime, PhysicsSystem.MaxSubSteps, PhysicsSystem.MaximumSimulationTime);
+                if (simulationLocker != null) simulationLocker.ExitWriteLock();
+            }
+            else
+            {
+                collisionWorld.PerformDiscreteCollisionDetection();
+            }
 
             SimulationProfiler.End("Alive rigidbodies: {0}", UpdatedRigidbodies);
 
@@ -1020,12 +782,23 @@ internal void Simulate(float deltaTime)
         /// </summary>
         public event EventHandler<SimulationArgs> SimulationEnd;
 
+        /// <summary>
+        /// Called right before processing a tick of the physics simulation.
+        /// </summary>
+        public event EventHandler<float> PreSimulationTick;
+
         protected virtual void OnSimulationEnd(SimulationArgs e)
         {
             var handler = SimulationEnd;
             handler?.Invoke(this, e);
         }
 
+        protected virtual void OnPreSimulationTick(BulletSharp.DynamicsWorld world, float timeStep)
+        {
+            var handler = PreSimulationTick;
+            handler?.Invoke(this, timeStep);
+        }
+
         private readonly FastList<ContactPoint> newContacts = new FastList<ContactPoint>();
         private readonly FastList<ContactPoint> updatedContacts = new FastList<ContactPoint>();
         private readonly FastList<ContactPoint> removedContacts = new FastList<ContactPoint>();
@@ -1052,7 +825,7 @@ internal void BeginContactTesting()
             var previous = currentFrameContacts;
             currentFrameContacts = previousFrameContacts;
             currentFrameContacts.Clear();
-            previousFrameContacts = previous;         
+            previousFrameContacts = previous;
         }
 
         private void ContactRemoval(ContactPoint contact, PhysicsComponent component0, PhysicsComponent component1)
@@ -1215,37 +988,82 @@ internal void EndContactTesting()
             }     
         }
 
-        private HashSet<ContactPoint> currentFrameContacts = new HashSet<ContactPoint>(ContactPointEqualityComparer.Default);
-        private HashSet<ContactPoint> previousFrameContacts = new HashSet<ContactPoint>(ContactPointEqualityComparer.Default);
+        private DefaultContactResultCallback currentFrameContacts = new DefaultContactResultCallback();
+        private DefaultContactResultCallback previousFrameContacts = new DefaultContactResultCallback();
+        private SimpleContactResultCallback simpleFrameContacts = new SimpleContactResultCallback();
 
-        internal unsafe void ContactTest(PhysicsComponent component)
+        class SimpleContactResultCallback : BulletSharp.ContactResultCallback {
+            public override float AddSingleResult(BulletSharp.ManifoldPoint contact, BulletSharp.CollisionObjectWrapper obj0, int partId0, int index0, BulletSharp.CollisionObjectWrapper obj1, int partId1, int index1) {
+                var component0 = (PhysicsComponent)obj0.CollisionObject.UserObject;
+                var component1 = (PhysicsComponent)obj1.CollisionObject.UserObject;
+
+                //disable static-static
+                if ((component0 is StaticColliderComponent && component1 is StaticColliderComponent) || !component0.Enabled || !component1.Enabled)
+                    return 0f;
+
+                if (component0.ProcessCollisionsSlim) {
+                    ContactPoint cp = new ContactPoint {
+                        ColliderA = component0,
+                        ColliderB = component1,
+                        Distance = contact.m_distance1,
+                        Normal = contact.m_normalWorldOnB,
+                        PositionOnA = contact.m_positionWorldOnA,
+                        PositionOnB = contact.m_positionWorldOnB,
+                    };
+                    component0.processingPhysicalContacts[component0.processingPhysicalContactsIndex ^ 1].Add(cp);
+                }
+
+                return 0f;
+            }
+        }
+
+        class DefaultContactResultCallback : BulletSharp.ContactResultCallback
         {
-            IntPtr buffer;
-            int bufferSize;
-            collisionWorld.GetCollisions(component.NativeCollisionObject, (short)component.CanCollideWith, (short)component.CollisionGroup, out buffer, out bufferSize);
-            var contacts = (NativeContactPoint*)buffer;
-            for (var i = 0; i < bufferSize; i++)
-            {
-                var contact = contacts[i];
+            HashSet<ContactPoint> contacts = new HashSet<ContactPoint>(ContactPointEqualityComparer.Default);
 
-                var obj0 = BulletSharp.CollisionObject.GetManaged(contact.ColliderA);
-                var obj1 = BulletSharp.CollisionObject.GetManaged(contact.ColliderB);
-                var component0 = (PhysicsComponent)obj0.UserObject;
-                var component1 = (PhysicsComponent)obj1.UserObject;
+            public override float AddSingleResult(BulletSharp.ManifoldPoint contact, BulletSharp.CollisionObjectWrapper obj0, int partId0, int index0, BulletSharp.CollisionObjectWrapper obj1, int partId1, int index1)
+            {
+                var component0 = (PhysicsComponent)obj0.CollisionObject.UserObject;
+                var component1 = (PhysicsComponent)obj1.CollisionObject.UserObject;
 
                 //disable static-static
                 if ((component0 is StaticColliderComponent && component1 is StaticColliderComponent) || !component0.Enabled || !component1.Enabled)
-                    continue;
+                    return 0f;
 
-                currentFrameContacts.Add(new ContactPoint
+                contacts.Add(new ContactPoint
                 {
                     ColliderA = component0,
                     ColliderB = component1,
-                    Distance = contact.Distance,
-                    Normal = contact.Normal,
-                    PositionOnA = contact.PositionOnA,
-                    PositionOnB = contact.PositionOnB,
+                    Distance = contact.m_distance1,
+                    Normal = contact.m_normalWorldOnB,
+                    PositionOnA = contact.m_positionWorldOnA,
+                    PositionOnB = contact.m_positionWorldOnB,
                 });
+                return 0f;
+            }
+
+            public void Remove(ContactPoint contact) => contacts.Remove(contact);
+            public bool Contains(ContactPoint contact) => contacts.Contains(contact);
+            public void Clear() => contacts.Clear();
+            public HashSet<ContactPoint>.Enumerator GetEnumerator() => contacts.GetEnumerator();
+        }
+
+        internal unsafe void ContactTest(PhysicsComponent component)
+        {
+            if( component.ProcessCollisionsSlim ) {
+                simpleFrameContacts.CollisionFilterMask = (int)component.CanCollideWith;
+                simpleFrameContacts.CollisionFilterGroup = (int)component.CollisionGroup;
+                component.processingPhysicalContacts[component.processingPhysicalContactsIndex ^ 1].Clear();
+                if (simulationLocker != null) simulationLocker.EnterReadLock();
+                collisionWorld.ContactTest(component.NativeCollisionObject, simpleFrameContacts);
+                if (simulationLocker != null) simulationLocker.ExitReadLock();
+                component.processingPhysicalContactsIndex ^= 1; // switch what list to return
+            } else {
+                currentFrameContacts.CollisionFilterMask = (int)component.CanCollideWith;
+                currentFrameContacts.CollisionFilterGroup = (int)component.CollisionGroup;
+                if (simulationLocker != null) simulationLocker.EnterReadLock();
+                collisionWorld.ContactTest(component.NativeCollisionObject, currentFrameContacts);
+                if (simulationLocker != null) simulationLocker.ExitReadLock();
             }
         }
 
@@ -1271,5 +1089,234 @@ internal void CleanContacts(PhysicsComponent component)
                 currentFrameContacts.Remove(contactPoint);
             }
         }
+
+        private class XenkoAllHitsConvexResultCallback : XenkoReusableConvexResultCallback
+        {
+            [ThreadStatic]
+            static XenkoAllHitsConvexResultCallback shared;
+
+            public IList<HitResult> ResultsList { get; set; }
+
+            public XenkoAllHitsConvexResultCallback(IList<HitResult> results)
+            {
+                ResultsList = results;
+            }
+
+            public override float AddSingleResult(ref BulletSharp.LocalConvexResult convexResult, bool normalInWorldSpace)
+            {
+                ResultsList.Add(ComputeHitResult(ref convexResult, normalInWorldSpace));
+                return convexResult.m_hitFraction;
+            }
+
+            public static XenkoAllHitsConvexResultCallback Shared(IList<HitResult> buffer, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                if (shared == null)
+                {
+                    shared = new XenkoAllHitsConvexResultCallback(buffer);
+                }
+                shared.ResultsList = buffer;
+                shared.Recycle(filterGroup, filterMask);
+                return shared;
+            }
+        }
+
+        private class XenkoClosestConvexResultCallback : XenkoReusableConvexResultCallback
+        {
+            [ThreadStatic]
+            static XenkoClosestConvexResultCallback shared;
+
+            BulletSharp.LocalConvexResult closestHit;
+            bool normalInWorldSpace;
+            float? closestFraction;
+            public HitResult Result => ComputeHitResult(ref closestHit, normalInWorldSpace);
+
+            public override float AddSingleResult(ref BulletSharp.LocalConvexResult convexResult, bool normalInWorldSpaceParam)
+            {
+                float fraction = convexResult.m_hitFraction;
+                // First hit or closest hit yet
+                if (closestFraction == null || closestFraction > fraction)
+                {
+                    closestHit = convexResult;
+                    closestFraction = fraction;
+                    normalInWorldSpace = normalInWorldSpaceParam;
+                }
+                return fraction;
+            }
+
+            public override void Recycle(CollisionFilterGroups filterGroup = CollisionFilterGroups.DefaultFilter, CollisionFilterGroupFlags filterMask = (CollisionFilterGroupFlags)(-1))
+            {
+                base.Recycle(filterGroup, filterMask);
+                closestFraction = null;
+                closestHit = default;
+            }
+
+            public static XenkoClosestConvexResultCallback Shared(CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                if (shared == null)
+                {
+                    shared = new XenkoClosestConvexResultCallback();
+                }
+                shared.Recycle(filterGroup, filterMask);
+                return shared;
+            }
+        }
+
+        private class XenkoAllHitsRayResultCallback : XenkoReusableRayResultCallback
+        {
+            [ThreadStatic]
+            static XenkoAllHitsRayResultCallback shared;
+
+            public IList<HitResult> ResultsList { get; set; }
+
+            public XenkoAllHitsRayResultCallback(ref Vector3 from, ref Vector3 to, IList<HitResult> results) : base(ref from, ref to)
+            {
+                ResultsList = results;
+            }
+
+            public override float AddSingleResult(ref BulletSharp.LocalRayResult rayResult, bool normalInWorldSpace)
+            {
+                ResultsList.Add(ComputeHitResult(ref rayResult, normalInWorldSpace));
+                return rayResult.m_hitFraction;
+            }
+
+            public static XenkoAllHitsRayResultCallback Shared(ref Vector3 from, ref Vector3 to, IList<HitResult> buffer, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                if (shared == null)
+                {
+                    shared = new XenkoAllHitsRayResultCallback(ref from, ref to, buffer);
+                }
+                shared.ResultsList = buffer;
+                shared.Recycle(ref from, ref to, filterGroup, filterMask);
+                return shared;
+            }
+        }
+
+        private class XenkoClosestRayResultCallback : XenkoReusableRayResultCallback
+        {
+            [ThreadStatic]
+            static XenkoClosestRayResultCallback shared;
+
+            BulletSharp.LocalRayResult closestHit;
+            bool normalInWorldSpace;
+            float? closestFraction;
+            public HitResult Result => ComputeHitResult(ref closestHit, normalInWorldSpace);
+
+            public XenkoClosestRayResultCallback(ref Vector3 from, ref Vector3 to) : base(ref from, ref to)
+            {
+            }
+
+            public override float AddSingleResult(ref BulletSharp.LocalRayResult rayResult, bool normalInWorldSpaceParam)
+            {
+                float fraction = rayResult.m_hitFraction;
+                // First hit or closest hit yet
+                if (closestFraction == null || closestFraction > fraction)
+                {
+                    closestHit = rayResult;
+                    closestFraction = fraction;
+                    normalInWorldSpace = normalInWorldSpaceParam;
+                    CollisionObject = rayResult.CollisionObject;
+                    ClosestHitFraction = fraction;
+                }
+                return fraction;
+            }
+
+            public override void Recycle(ref Vector3 from, ref Vector3 to, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                base.Recycle(ref from, ref to, filterGroup, filterMask);
+                closestFraction = null;
+                closestHit = default;
+            }
+
+            public static XenkoClosestRayResultCallback Shared(ref Vector3 from, ref Vector3 to, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                if (shared == null)
+                {
+                    shared = new XenkoClosestRayResultCallback(ref from, ref to);
+                }
+                shared.Recycle(ref from, ref to, filterGroup, filterMask);
+                return shared;
+            }
+        }
+
+        private abstract class XenkoReusableRayResultCallback : BulletSharp.RayResultCallback
+        {
+            public Vector3 RayFromWorld { get; protected set; }
+            public Vector3 RayToWorld { get; protected set; }
+
+            public XenkoReusableRayResultCallback(ref Vector3 from, ref Vector3 to) : base()
+            {
+                RayFromWorld = from;
+                RayToWorld = to;
+            }
+
+            public HitResult ComputeHitResult(ref BulletSharp.LocalRayResult rayResult, bool normalInWorldSpace)
+            {
+                var obj = rayResult.CollisionObject;
+                if (obj == null)
+                {
+                    return new HitResult() { Succeeded = false };
+                }
+
+                Vector3 normal = rayResult.m_hitNormalLocal;
+                if (!normalInWorldSpace)
+                {
+                    normal = Vector3.TransformNormal(normal, obj.WorldTransform.Basis);
+                }
+
+                return new HitResult
+                {
+                    Succeeded = true,
+                    Collider = obj.UserObject as PhysicsComponent,
+                    Point = Vector3.Lerp(RayFromWorld, RayToWorld, rayResult.m_hitFraction),
+                    Normal = normal,
+                    HitFraction = rayResult.m_hitFraction,
+                };
+            }
+
+            public virtual void Recycle(ref Vector3 from, ref Vector3 to, CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                RayFromWorld = from;
+                RayToWorld = to;
+                ClosestHitFraction = float.PositiveInfinity;
+                CollisionObject = null;
+                Flags = 0;
+                CollisionFilterGroup = (int)filterGroup;
+                CollisionFilterMask = (int)filterMask;
+            }
+        }
+
+        private abstract class XenkoReusableConvexResultCallback : BulletSharp.ConvexResultCallback
+        {
+            public HitResult ComputeHitResult(ref BulletSharp.LocalConvexResult convexResult, bool normalInWorldSpace)
+            {
+                var obj = convexResult.HitCollisionObject;
+                if ( obj == null )
+                {
+                    return new HitResult() { Succeeded = false };
+                }
+
+                Vector3 normal = convexResult.m_hitNormalLocal;
+                if (!normalInWorldSpace)
+                {
+                    normal = Vector3.TransformNormal(normal, obj.WorldTransform.Basis);
+                }
+
+                return new HitResult
+                {
+                    Succeeded = true,
+                    Collider = obj.UserObject as PhysicsComponent,
+                    Point = convexResult.m_hitPointLocal,
+                    Normal = normal,
+                    HitFraction = convexResult.m_hitFraction,
+                };
+            }
+
+            public virtual void Recycle(CollisionFilterGroups filterGroup = DefaultGroup, CollisionFilterGroupFlags filterMask = DefaultFlags)
+            {
+                ClosestHitFraction = float.PositiveInfinity;
+                CollisionFilterGroup = (int)filterGroup;
+                CollisionFilterMask = (int)filterMask;
+            }
+        }
     }
 }
diff --git a/sources/engine/Xenko.Physics/UnmanagedArrayExtensions.cs b/sources/engine/Xenko.Physics/UnmanagedArrayExtensions.cs
new file mode 100644
index 0000000000..5df6570a1d
--- /dev/null
+++ b/sources/engine/Xenko.Physics/UnmanagedArrayExtensions.cs
@@ -0,0 +1,34 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using Xenko.Core;
+
+namespace Xenko.Physics
+{
+    public static class UnmanagedArrayExtensions
+    {
+        /// <summary>
+        /// Fill the array with specific value.
+        /// </summary>
+        /// <typeparam name="T">The type param of UnmanagedArray</typeparam>
+        /// <param name="unmanagedArray">The destination to fill.</param>
+        /// <param name="value">The value used to fill.</param>
+        /// <param name="index">The start index of the destination to fill.</param>
+        /// <param name="fillLength">The filling length.</param>
+        public static void Fill<T>(this UnmanagedArray<T> unmanagedArray, T value, int index, int fillLength) where T : struct
+        {
+            if (unmanagedArray == null) throw new ArgumentNullException(nameof(unmanagedArray));
+
+            var length = unmanagedArray.Length;
+            var endIndex = index + fillLength;
+
+            if (length <= index) throw new IndexOutOfRangeException(nameof(index));
+            if (length < endIndex) throw new ArgumentException($"{ nameof(unmanagedArray) }.{ nameof(unmanagedArray.Length) } is not enough to fill.");
+
+            for (int i = index; i < endIndex; ++i)
+            {
+                unmanagedArray[i] = value;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Physics/Xenko.Physics.csproj b/sources/engine/Xenko.Physics/Xenko.Physics.csproj
index 5a5e654c4b..84c6dbce80 100644
--- a/sources/engine/Xenko.Physics/Xenko.Physics.csproj
+++ b/sources/engine/Xenko.Physics/Xenko.Physics.csproj
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -13,46 +12,53 @@
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
-    <XenkoBulletPlatform>Windows</XenkoBulletPlatform>
-    <XenkoBulletPlatform Condition="'$(XenkoPlatform)' == 'iOS'">iOS</XenkoBulletPlatform>
-    <XenkoBulletSignedDir Condition="'$(XenkoSign)' == 'true'">Signed\</XenkoBulletSignedDir>
+    <XenkoBulletPlatform></XenkoBulletPlatform>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
+    <XenkoPublicApi>true</XenkoPublicApi>
   </PropertyGroup>
   <ItemGroup>
     <XenkoNativeLib Include="..\..\..\deps\BulletPhysics\$(XenkoPlatform)\**\libbulletc.*">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </XenkoNativeLib>
-    <XenkoContent Condition="'$(XenkoPlatform)' == 'Linux'" Include="..\..\..\deps\BulletPhysics\BulletSharp.dll.config">
+    <XenkoContent Condition="'$(XenkoPlatform)' == 'Linux'" Include="..\..\..\deps\BulletPhysics\BulletSharp.NetStandard.dll.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </XenkoContent>
-  </ItemGroup>
-  <ItemGroup>
+    <Reference Include="BepuPhysics">
+      <HintPath>..\..\..\deps\bepuphysics2\BepuPhysics.dll</HintPath>
+    </Reference>
+    <Reference Include="BepuUtilities">
+      <HintPath>..\..\..\deps\bepuphysics2\BepuUtilities.dll</HintPath>
+    </Reference>
     <Reference Include="BulletSharp">
-      <HintPath>..\..\..\deps\BulletPhysics\$(XenkoBulletPlatform)\$(XenkoBulletSignedDir)BulletSharp.dll</HintPath>
+      <HintPath>..\..\..\deps\BulletPhysics\$(XenkoBulletPlatform)\BulletSharp.NetStandard.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
   <Target Name="IncludeExtraAssemblies">
     <ItemGroup>
-      <BuildOutputInPackage Include="$(OutputPath)BulletSharp.dll" />
+      <BuildOutputInPackage Include="$(OutputPath)BulletSharp.NetStandard.dll" />
+      <BuildOutputInPackage Include="$(OutputPath)BepuPhysics.dll" />
+      <BuildOutputInPackage Include="$(OutputPath)BepuUtilities.dll" />
     </ItemGroup>
   </Target>
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Physics/XenkoMotionState.cs b/sources/engine/Xenko.Physics/XenkoMotionState.cs
deleted file mode 100644
index e584c2ddd9..0000000000
--- a/sources/engine/Xenko.Physics/XenkoMotionState.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using Xenko.Core.Mathematics;
-
-namespace Xenko.Physics
-{
-    internal class XenkoMotionState : BulletSharp.SharpMotionState
-    {
-        private RigidbodyComponent rigidBody;
-
-        public XenkoMotionState(RigidbodyComponent rb)
-        {
-            rigidBody = rb;
-        }
-
-        public void Clear()
-        {
-            rigidBody = null;
-        }
-
-        public override void GetWorldTransform(out Matrix transform)
-        {
-            if (rigidBody.GetWorldTransformCallback != null)
-            {
-                rigidBody.GetWorldTransformCallback(out transform);
-            }
-            else
-            {
-                transform = Matrix.Identity;
-            }
-        }
-
-        public override void SetWorldTransform(Matrix transform)
-        {
-            rigidBody.SetWorldTransformCallback?.Invoke(transform);
-        }
-    }
-}
diff --git a/sources/engine/Xenko.Rendering/Extensions/IndexExtensions.cs b/sources/engine/Xenko.Rendering/Extensions/IndexExtensions.cs
index 3b931c2585..10f2a564ca 100644
--- a/sources/engine/Xenko.Rendering/Extensions/IndexExtensions.cs
+++ b/sources/engine/Xenko.Rendering/Extensions/IndexExtensions.cs
@@ -293,7 +293,7 @@ public static unsafe void GenerateIndexBufferAEN(this MeshDraw meshData)
             meshData.PrimitiveType = PrimitiveType.PatchList.ControlPointCount(12);
         }
 
-        private struct EdgeKeyAEN
+        private struct EdgeKeyAEN : IEquatable<EdgeKeyAEN>
         {
             public readonly int PositionIndex0;
             public readonly int PositionIndex1;
@@ -309,6 +309,16 @@ public EdgeKeyAEN(EdgeAEN edge)
             {
             }
 
+            public bool Equals(EdgeKeyAEN other)
+            {
+                return PositionIndex0 == other.PositionIndex0 && PositionIndex1 == other.PositionIndex1;
+            }
+
+            public override bool Equals(object obj)
+            {
+                return obj is EdgeKeyAEN key && Equals(key);
+            }
+
             public override int GetHashCode()
             {
                 unchecked
diff --git a/sources/engine/Xenko.Rendering/Rendering/ActiveRenderStage.cs b/sources/engine/Xenko.Rendering/Rendering/ActiveRenderStage.cs
index 685fc2314d..8100aff6c8 100644
--- a/sources/engine/Xenko.Rendering/Rendering/ActiveRenderStage.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/ActiveRenderStage.cs
@@ -6,12 +6,29 @@ namespace Xenko.Rendering
     public struct ActiveRenderStage
     {
         public bool Active => EffectSelector != null;
+        public bool TemporaryDisable, IsShadowStage;
 
-        public EffectSelector EffectSelector;
+        private EffectSelector _es;
+        public EffectSelector EffectSelector
+        {
+            get
+            {
+                if (TemporaryDisable)
+                    return null;
+
+                return _es;
+            }
+            set
+            {
+                _es = value;
+            }
+        }
 
-        public ActiveRenderStage(string effectName)
+        public ActiveRenderStage(string effectName, bool isShadow = false)
         {
-            EffectSelector = new EffectSelector(effectName);
+            _es = new EffectSelector(effectName);
+            TemporaryDisable = false;
+            IsShadowStage = isShadow;
         }
     }
 }
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleColorStream.cs b/sources/engine/Xenko.Rendering/Rendering/BRDF/BRDFMicrofacet.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ParticleColorStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/BRDF/BRDFMicrofacet.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundCubemapShader.cs b/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundCubemapShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Background/BackgroundCubemapShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Background/BackgroundCubemapShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundRenderFeature.cs
index edf6d42cb7..8fb36c4d39 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundRenderFeature.cs
@@ -17,6 +17,7 @@ public class BackgroundRenderFeature : RootRenderFeature
         private DynamicEffectInstance backgroundCubemapEffect;
         private DynamicEffectInstance skyboxTextureEffect;
         private DynamicEffectInstance skyboxCubemapEffect;
+        private DynamicEffectInstance skyboxTextureHorizonEffect;
 
         public override Type SupportedRenderObjectType => typeof(RenderBackground);
 
@@ -46,7 +47,7 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                 var renderNode = GetRenderNode(renderNodeReference);
                 var renderBackground = (RenderBackground)renderNode.RenderObject;
 
-                if (renderBackground.Texture == null)
+                if (renderBackground?.Texture == null)
                     continue;
                     
                 if (renderBackground.Is2D)
@@ -65,12 +66,14 @@ protected override void InitializeCore()
             background2DEffect = new DynamicEffectInstance("BackgroundShader");
             backgroundCubemapEffect = new DynamicEffectInstance("BackgroundCubemapShader");
             skyboxTextureEffect = new DynamicEffectInstance("SkyboxShaderTexture");
+            skyboxTextureHorizonEffect = new DynamicEffectInstance("SkyboxShaderTextureHorizon");
             skyboxCubemapEffect = new DynamicEffectInstance("SkyboxShaderCubemap");
 
             background2DEffect.Initialize(Context.Services);
             backgroundCubemapEffect.Initialize(Context.Services);
             skyboxTextureEffect.Initialize(Context.Services);
             skyboxCubemapEffect.Initialize(Context.Services);
+            skyboxTextureHorizonEffect.Initialize(Context.Services);
 
             spriteBatch = new SpriteBatch(RenderSystem.GraphicsDevice) { VirtualResolution = new Vector3(1) };
         }
@@ -129,9 +132,20 @@ private void Draw3D([NotNull] RenderDrawContext context, [NotNull] RenderView re
             // Setup the effect depending on the type of texture
             if (renderBackground.Texture.ViewDimension == TextureDimension.Texture2D)
             {
-                skyboxTextureEffect.UpdateEffect(graphicsDevice);
-                spriteBatch.Begin(context.GraphicsContext, SpriteSortMode.FrontToBack, BlendStates.Opaque, null, DepthStencilStates.DepthRead, null, skyboxTextureEffect);
-                spriteBatch.Parameters.Set(SkyboxShaderTextureKeys.Texture, renderBackground.Texture);
+                if (renderBackground.IsHorizon)
+                {
+                    skyboxTextureHorizonEffect.UpdateEffect(graphicsDevice);
+                    spriteBatch.Begin(context.GraphicsContext, SpriteSortMode.FrontToBack, BlendStates.Opaque, null, DepthStencilStates.DepthRead, null, skyboxTextureHorizonEffect);
+                    spriteBatch.Parameters.Set(SkyboxShaderTextureHorizonKeys.Texture, renderBackground.Texture);
+                    spriteBatch.Parameters.Set(SkyboxShaderTextureHorizonKeys.AlphaColor, renderBackground.FullAlpha);
+                    spriteBatch.Parameters.Set(SkyboxShaderTextureHorizonKeys.ZeroColor, renderBackground.ZeroAlpha);
+                }
+                else
+                {
+                    skyboxTextureEffect.UpdateEffect(graphicsDevice);
+                    spriteBatch.Begin(context.GraphicsContext, SpriteSortMode.FrontToBack, BlendStates.Opaque, null, DepthStencilStates.DepthRead, null, skyboxTextureEffect);
+                    spriteBatch.Parameters.Set(SkyboxShaderTextureKeys.Texture, renderBackground.Texture);
+                }
             }
             else if (renderBackground.Texture.ViewDimension == TextureDimension.TextureCube)
             {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundShader.cs b/sources/engine/Xenko.Rendering/Rendering/Background/BackgroundShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Background/BackgroundShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Background/BackgroundShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Background/RenderBackground.cs b/sources/engine/Xenko.Rendering/Rendering/Background/RenderBackground.cs
index dcecf6a2da..02ecb9bfc3 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Background/RenderBackground.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Background/RenderBackground.cs
@@ -7,9 +7,10 @@ namespace Xenko.Rendering.Background
 {
     public class RenderBackground : RenderObject
     {
-        public bool Is2D;
+        public bool Is2D, IsHorizon;
         public Texture Texture;
         public float Intensity;
         public Quaternion Rotation;
+        public Color4 FullAlpha, ZeroAlpha;
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Colors/ColorRgbProvider.cs b/sources/engine/Xenko.Rendering/Rendering/Colors/ColorRgbProvider.cs
index ac0f8bf018..5dd9dcc4ad 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Colors/ColorRgbProvider.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Colors/ColorRgbProvider.cs
@@ -20,7 +20,7 @@ public class ColorRgbProvider : IColorProvider
         /// </summary>
         public ColorRgbProvider()
         {
-            Value = new Color3(1.0f);
+            Value = Color3.White;
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAADepthResolverShader.cs b/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAADepthResolverShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Compositing/MSAADepthResolverShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Compositing/MSAADepthResolverShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolver.cs b/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolver.cs
index cbb67afca5..3aef7ab699 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolver.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolver.cs
@@ -162,9 +162,7 @@ protected override void DrawCore(RenderDrawContext drawContext)
             var svPosUnpack = new Vector4(0.5f * inputSize.Width, -0.5f * inputSize.Height, 0.5f * inputSize.Width, 0.5f * inputSize.Height);
             var textureSizeLess1 = new Vector2(inputSize.Width - 1.0f, inputSize.Height - 1.0f);
 
-            if (GraphicsDevice.Platform == GraphicsPlatform.OpenGL ||
-                GraphicsDevice.Platform == GraphicsPlatform.OpenGLES ||
-                FilterType == FilterTypes.Default)
+            if (FilterType == FilterTypes.Default)
             {
                 // We currently only support the default hardware MSAA resolve on OpenGL and OpenGL ES.
                 drawContext.CommandList.CopyMultisample(input, 0, output, 0);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverShader.cs b/sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Compositing/MSAAResolverShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Compositing/RenderTextureSceneRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Compositing/RenderTextureSceneRenderer.cs
index 1e436cc96f..8a07c062dc 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Compositing/RenderTextureSceneRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Compositing/RenderTextureSceneRenderer.cs
@@ -35,7 +35,11 @@ protected override void DrawCore(RenderContext context, RenderDrawContext drawCo
 
             using (drawContext.PushRenderTargetsAndRestore())
             {
-                var depthBuffer = PushScopedResource(context.Allocator.GetTemporaryTexture2D(RenderTexture.ViewWidth, RenderTexture.ViewHeight, drawContext.CommandList.DepthStencilBuffer.ViewFormat, TextureFlags.DepthStencil));
+                var depthBufferTextureFlags = TextureFlags.DepthStencil;
+                if (context.GraphicsDevice.Features.HasDepthAsSRV)
+                    depthBufferTextureFlags |= TextureFlags.ShaderResource;
+
+                var depthBuffer = PushScopedResource(context.Allocator.GetTemporaryTexture2D(RenderTexture.ViewWidth, RenderTexture.ViewHeight, drawContext.CommandList.DepthStencilBuffer.ViewFormat, depthBufferTextureFlags));
                 drawContext.CommandList.SetRenderTargetAndViewport(depthBuffer, RenderTexture);
 
                 Child?.Draw(drawContext);
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeEffectShader1.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeEffectShader.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeEffectShader1.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeEffectShader.xkfx.cs
diff --git a/sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeShaderBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Particles/Shaders/ParticleComputeColorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeShaderBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/BRDF/BRDFMicrofacet.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/Hammersley.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/BRDF/BRDFMicrofacet.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/Hammersley.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeShaderBase.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/ImportanceSamplingGGX.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/ComputeShaderBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/ImportanceSamplingGGX.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXEffect.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeEffect.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeShader.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXNoComputeShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXShader.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/RadiancePrefilteringGGXShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSH1.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSH.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSH1.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSH.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputeEffect.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputeEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputeEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputeEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass1.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass1.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass1.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass1.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/Hammersley.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/Hammersley.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass2.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass1.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass1.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass1.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass1.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass2.cs b/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass2.cs
rename to sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHPass2.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocity.cs b/sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocity.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocity.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocity.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocityEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocityEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocityEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/BackgroundVelocityEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/ImportanceSamplingGGX.cs b/sources/engine/Xenko.Rendering/Rendering/Core/ColorBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/GGXPrefiltering/ImportanceSamplingGGX.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/ColorBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass2.cs b/sources/engine/Xenko.Rendering/Rendering/Core/DynamicSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ComputeEffect/LambertianPrefiltering/LambertianPrefilteringSHNoComputePass2.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/DynamicSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/ColorBase.cs b/sources/engine/Xenko.Rendering/Rendering/Core/DynamicTexture.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/ColorBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/DynamicTexture.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/DynamicSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureCube.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/DynamicSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureCube.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/DynamicTexture.cs b/sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/DynamicTexture.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/MeshVelocity.cs b/sources/engine/Xenko.Rendering/Rendering/Core/MeshVelocity.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/MeshVelocity.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/MeshVelocity.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureCube.cs b/sources/engine/Xenko.Rendering/Rendering/Core/NormalBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureCube.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/NormalBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureStream.cs b/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromMesh.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/DynamicTextureStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/NormalFromMesh.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/NormalBase.cs b/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMapping.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/NormalBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMapping.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMappingNoTangent.xksl b/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMappingNoTangent.xksl
new file mode 100644
index 0000000000..04d7cb02e8
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMappingNoTangent.xksl
@@ -0,0 +1,20 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+/// <summary>
+/// Computes normals in view space.
+/// </summary>
+shader NormalFromNormalMappingNoTangent : NormalBase, Transformation
+{
+    override stage void GenerateNormal_PS()
+    {
+        // Normalize just once the normal coming from the vertex shader
+        if (dot(streams.normalWS, streams.normalWS) > 0)
+            streams.normalWS = normalize(streams.normalWS);
+        streams.meshNormalWS = streams.normalWS;
+    }
+    
+    stage override void UpdateNormalFromTangentSpace(float3 normalInTangentSpace)
+    {
+        streams.normalWS = mul(normalInTangentSpace, (float3x3)WorldInverseTranspose);
+    }
+};
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromMesh.cs b/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMappingNoTangent.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/NormalFromMesh.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMappingNoTangent.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMapping.cs b/sources/engine/Xenko.Rendering/Rendering/Core/NormalStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/NormalFromNormalMapping.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/NormalStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/NormalUpdate.cs b/sources/engine/Xenko.Rendering/Rendering/Core/NormalUpdate.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/NormalUpdate.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/NormalUpdate.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/NormalStream.cs b/sources/engine/Xenko.Rendering/Rendering/Core/PositionHStream4.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/NormalStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/PositionHStream4.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/PositionHStream4.cs b/sources/engine/Xenko.Rendering/Rendering/Core/PositionStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/PositionHStream4.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/PositionStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/PositionStream2.cs b/sources/engine/Xenko.Rendering/Rendering/Core/PositionStream4.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/PositionStream2.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/PositionStream4.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/PositionStream4.cs b/sources/engine/Xenko.Rendering/Rendering/Core/PositionVertexTransform.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/PositionStream4.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/PositionVertexTransform.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/PositionVertexTransform.cs b/sources/engine/Xenko.Rendering/Rendering/Core/ScreenPositionBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/PositionVertexTransform.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/ScreenPositionBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/ScreenPositionBase.cs b/sources/engine/Xenko.Rendering/Rendering/Core/ShadingBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/ScreenPositionBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/ShadingBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/ShadingBase.cs b/sources/engine/Xenko.Rendering/Rendering/Core/ShadingColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/ShadingBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/ShadingColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/ShadingColor.cs b/sources/engine/Xenko.Rendering/Rendering/Core/VelocityOutput.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/ShadingColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/VelocityOutput.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/VelocityOutput.cs b/sources/engine/Xenko.Rendering/Rendering/Core/VelocityStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/VelocityOutput.cs
rename to sources/engine/Xenko.Rendering/Rendering/Core/VelocityStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Core/VelocityStream.cs b/sources/engine/Xenko.Rendering/Rendering/Deferred/GBuffer.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Core/VelocityStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Deferred/GBuffer.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Deferred/GBuffer1.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/CompilationErrorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Deferred/GBuffer1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/CompilationErrorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/CompilationErrorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/EffectCompiling.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/CompilationErrorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/EffectCompiling.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/EffectCompiling.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/LightConstantWhite.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/EffectCompiling.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/LightConstantWhite.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/SelectedSpriteShader.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/SelectedSpriteShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/SelectedSpriteShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/SelectedSpriteShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/LightConstantWhite.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/SharedTextureCoordinate.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/LightConstantWhite.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/SharedTextureCoordinate.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/Sprite3DBase.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/Sprite3DBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/Sprite3DBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/Sprite3DBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/SharedTextureCoordinate.cs b/sources/engine/Xenko.Rendering/Rendering/Editor/SpritePicking.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/SharedTextureCoordinate.cs
rename to sources/engine/Xenko.Rendering/Rendering/Editor/SpritePicking.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/EffectSystem.cs b/sources/engine/Xenko.Rendering/Rendering/EffectSystem.cs
index 84434106e6..b93057f372 100644
--- a/sources/engine/Xenko.Rendering/Rendering/EffectSystem.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/EffectSystem.cs
@@ -22,10 +22,10 @@ namespace Xenko.Rendering
     public class EffectSystem : GameSystemBase
     {
         private static readonly Logger Log = GlobalLogger.GetLogger("EffectSystem");
+        public static HashSet<string> ShaderCompilerErrors = new HashSet<string>();
 
         private EffectCompilerParameters effectCompilerParameters = EffectCompilerParameters.Default;
 
-        private IGraphicsDeviceService graphicsDeviceService;
         private EffectCompilerBase compiler;
         private readonly Dictionary<string, List<CompilerResults>> earlyCompilerCache = new Dictionary<string, List<CompilerResults>>();
         private Dictionary<EffectBytecode, Effect> cachedEffects = new Dictionary<EffectBytecode, Effect>();
@@ -64,10 +64,9 @@ public override void Initialize()
         {
             base.Initialize();
 
-            isInitialized = true;
 
             // Get graphics device service
-            graphicsDeviceService = Services.GetSafeServiceAs<IGraphicsDeviceService>();
+            base.InitGraphicsDeviceService();
 
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
             Enabled = true;
@@ -75,6 +74,8 @@ public override void Initialize()
             directoryWatcher.Modified += FileModifiedEvent;
             // TODO: xkfx too
 #endif
+
+            isInitialized = true;
         }
 
         public void SetCompilationMode(CompilationMode compilationMode)
@@ -156,8 +157,7 @@ public TaskOrResult<Effect> LoadEffect(string effectName, CompilerParameters com
             // Only take the sub-effect
             var bytecode = compilerResult.Bytecode;
 
-            if (bytecode.Task != null && !bytecode.Task.IsCompleted)
-            {
+            if (bytecode.Task != null && !bytecode.Task.IsCompleted) {
                 // Result was async, keep it async
                 // NOTE: There was some hangs when doing ContinueWith() (note: it might switch from EffectPriorityScheduler to TaskScheduler.Default, maybe something doesn't work well in this case?)
                 //       it seems that TaskContinuationOptions.ExecuteSynchronously is helping in this case (also it will force continuation to execute right away on the thread pool, which is probably better)
@@ -166,21 +166,21 @@ public TaskOrResult<Effect> LoadEffect(string effectName, CompilerParameters com
                     x => CreateEffect(effectName, x.Result, compilerResult),
                     TaskContinuationOptions.ExecuteSynchronously);
                 return result;
-            }
-            else
-            {
+            } else if (bytecode.Task != null && bytecode.Task.IsFaulted) {
+                throw new InvalidOperationException("faultedEffectCompilationTask");
+            } else {
                 return CreateEffect(effectName, bytecode.WaitForResult(), compilerResult);
             }
         }
 
-        // TODO: THIS IS JUST A WORKAROUND, REMOVE THIS
-
         private static void CheckResult(LoggerResult compilerResult)
         {
             // Check errors
             if (compilerResult.HasErrors)
             {
-                throw new InvalidOperationException("Could not compile shader. See error messages." + compilerResult.ToText());
+                string compileOutput = "Could not compile shader: " + compilerResult.ToText();
+                ShaderCompilerErrors.Add(compileOutput);
+                throw new InvalidOperationException(compileOutput);
             }
         }
 
@@ -210,7 +210,7 @@ private Effect CreateEffect(string effectName, EffectBytecodeCompilerResult effe
 
                 if (!cachedEffects.TryGetValue(bytecode, out effect))
                 {
-                    effect = new Effect(graphicsDeviceService.GraphicsDevice, bytecode) { Name = effectName };
+                    effect = new Effect(GraphicsDevice, bytecode) { Name = effectName };
                     cachedEffects.Add(bytecode, effect);
 
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
diff --git a/sources/engine/Xenko.Rendering/Rendering/EffectValidator.cs b/sources/engine/Xenko.Rendering/Rendering/EffectValidator.cs
index aaeb1ec19f..fd7537f407 100644
--- a/sources/engine/Xenko.Rendering/Rendering/EffectValidator.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/EffectValidator.cs
@@ -31,7 +31,8 @@ public struct EffectValidator
         public void Initialize()
         {
             EffectValues = new FastListStruct<EffectParameterEntry>(4);
-            
+            addLocker = new object();
+
             // Add a dummy value so that an effect without parameter fails validation first time
             EffectValues.Add(new EffectParameterEntry());
         }
@@ -43,6 +44,8 @@ public void BeginEffectValidation()
             ShouldSkip = false;
         }
 
+        private object addLocker;
+
         [RemoveInitLocals]
         public void ValidateParameter<T>(PermutationParameterKey<T> key, T value)
         {
@@ -68,7 +71,37 @@ public void ValidateParameter<T>(PermutationParameterKey<T> key, T value)
                 effectChanged = true;
             }
         }
-        
+
+        [RemoveInitLocals]
+        public void ValidateParameterThreaded<T>(PermutationParameterKey<T> key, T value)
+        {
+            // Check if value was existing and/or same
+            var index = effectValuesValidated++;
+            if (index < EffectValues.Count)
+            {
+                var currentEffectValue = EffectValues.Items[index];
+                if (currentEffectValue.Key == key && EqualityComparer<T>.Default.Equals((T)currentEffectValue.Value, value))
+                {
+                    // Everything same, let's keep going
+                    return;
+                }
+
+                // Something was different, let's replace item and clear end of list
+                EffectValues[index] = new EffectParameterEntry(key, value);
+                EffectValues.Count = effectValuesValidated;
+                effectChanged = true;
+            }
+            else
+            {
+                var epe = new EffectParameterEntry(key, value);
+                lock (addLocker)
+                {
+                    EffectValues.Add(epe);
+                }
+                effectChanged = true;
+            }
+        }
+
         public bool EndEffectValidation()
         {
             if (effectValuesValidated < EffectValues.Count)
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusion.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusion.cs
index 184a6ec4ec..fba61da2d9 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusion.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusion.cs
@@ -18,10 +18,7 @@ namespace Xenko.Rendering.Images
     public class AmbientOcclusion : ImageEffect
     {
         private ImageEffectShader aoRawImageEffect;
-        private ImageEffectShader blurH;
-        private ImageEffectShader blurV;
-        private string nameGaussianBlurH;
-        private string nameGaussianBlurV;
+        private ImageEffectShader blur;
         private float[] offsetsWeights;
 
         private ImageEffectShader aoApplyImageEffect;
@@ -35,14 +32,14 @@ public AmbientOcclusion()
             ParamIntensity = 0.2f;
             ParamBias = 0.01f;
             ParamRadius = 1f;
-            NumberOfBounces = 2;
+            Blur = true;
             BlurScale = 1.85f;
             EdgeSharpness = 3f;
-            TempSize = TemporaryBufferSize.SizeFull;
+            ResolutionScale = 1f;
         }
 
         /// <userdoc>
-        /// The number of pixels sampled to determine how occluded a point is. Higher values reduce noise, but affect performance. 
+        /// The number of pixels sampled to determine how occluded a point is. Higher values reduce noise, but affect performance.
         /// Use with "Blur count to find a balance between results and performance.
         /// </userdoc>
         [DataMember(10)]
@@ -59,6 +56,14 @@ public AmbientOcclusion()
         [Display("Projection scale")]
         public float ParamProjScale { get; set; } = 0.5f;
 
+        /// <userdoc>
+        /// Scales the sample radius. In most cases, 1 (no scaling) produces the most accurate result.
+        /// </userdoc>
+        [DataMember(25)]
+        [DefaultValue(300f)]
+        [Display("Fade Distance")]
+        public float ParamDistance { get; set; } = 300f;
+
         /// <userdoc>
         /// The strength of the darkening effect in occluded areas
         /// </userdoc>
@@ -87,10 +92,9 @@ public AmbientOcclusion()
         /// The number of times the ambient occlusion image is blurred. Higher numbers reduce noise, but can produce artifacts.
         /// </userdoc>
         [DataMember(70)]
-        [DefaultValue(2)]
-        [DataMemberRange(0, 3, 1, 1, 0)]
-        [Display("Blur count")]
-        public int NumberOfBounces { get; set; } = 2;
+        [DefaultValue(true)]
+        [Display("Apply Blur")]
+        public bool Blur { get; set; } = true;
 
         /// <userdoc>
         /// The blur radius in pixels
@@ -109,13 +113,26 @@ public AmbientOcclusion()
         public float EdgeSharpness { get; set; } = 3f;
 
         /// <userdoc>
-        /// The resolution the ambient occlusion is calculated at. The result is upscaled to the game resolution. 
+        /// The resolution the ambient occlusion is calculated at. The result is upscaled to the game resolution.
         /// Larger sizes produce better results but use more memory and affect performance.
         /// </userdoc>
         [DataMember(100)]
-        [DefaultValue(TemporaryBufferSize.SizeFull)]
-        [Display("Buffer size")]
-        public TemporaryBufferSize TempSize { get; set; } = TemporaryBufferSize.SizeFull;
+        [DefaultValue(1f)]
+        [Display("Scale Resolution")]
+        public float ResolutionScale {
+            get => _resolutionScale;
+            set
+            {
+                if (value > 1f)
+                    _resolutionScale = 1f;
+                else if (value < 0.01f)
+                    _resolutionScale = 0.01f;
+                else
+                    _resolutionScale = value;
+            }
+        }
+
+        private float _resolutionScale = 1f;
 
         protected override void InitializeCore()
         {
@@ -126,14 +143,8 @@ protected override void InitializeCore()
             aoRawImageEffect = ToLoadAndUnload(new ImageEffectShader("AmbientOcclusionRawAOEffect"));
             aoRawImageEffect.Initialize(Context);
 
-            blurH = ToLoadAndUnload(new ImageEffectShader("AmbientOcclusionBlurEffect"));
-            blurV = ToLoadAndUnload(new ImageEffectShader("AmbientOcclusionBlurEffect", true));
-            blurH.Initialize(Context);
-            blurV.Initialize(Context);
-
-            // Setup Horizontal parameters
-            blurH.Parameters.Set(AmbientOcclusionBlurKeys.VerticalBlur, false);
-            blurV.Parameters.Set(AmbientOcclusionBlurKeys.VerticalBlur, true);
+            blur = ToLoadAndUnload(new ImageEffectShader("AmbientOcclusionBlurEffect"));
+            blur.Initialize(Context);
         }
 
         protected override void Destroy()
@@ -165,11 +176,6 @@ protected override void DrawCore(RenderDrawContext context)
             // Ambient Occlusion
             //---------------------------------
 
-            var tempWidth = (originalColorBuffer.Width * (int)TempSize) / (int)TemporaryBufferSize.SizeFull;
-            var tempHeight = (originalColorBuffer.Height * (int)TempSize) / (int)TemporaryBufferSize.SizeFull;
-            var aoTexture1 = NewScopedRenderTarget2D(tempWidth, tempHeight, PixelFormat.R8_UNorm, 1);
-            var aoTexture2 = NewScopedRenderTarget2D(tempWidth, tempHeight, PixelFormat.R8_UNorm, 1);
-
             aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOKeys.Count, NumberOfSamples > 0 ? NumberOfSamples : 9);
 
             // Set Near/Far pre-calculated factors to speed up the linear depth reconstruction
@@ -177,7 +183,6 @@ protected override void DrawCore(RenderDrawContext context)
 
             Vector4 screenSize = new Vector4(originalColorBuffer.Width, originalColorBuffer.Height, 0, 0);
             screenSize.Z = screenSize.X / screenSize.Y;
-            aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ScreenInfo, screenSize);
 
             // Projection infor used to reconstruct the View space position from linear depth
             var p00 = renderView.Projection.M11;
@@ -189,86 +194,62 @@ protected override void DrawCore(RenderDrawContext context)
 
             //**********************************
             // User parameters
+            aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ScreenInfo, screenSize);
             aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ParamProjScale, ParamProjScale);
+            aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ParamDistance, ParamDistance);
             aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ParamIntensity, ParamIntensity);
             aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ParamBias, ParamBias);
             aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ParamRadius, ParamRadius);
             aoRawImageEffect.Parameters.Set(AmbientOcclusionRawAOShaderKeys.ParamRadiusSquared, ParamRadius * ParamRadius);
 
+            var tempWidth = (int)((float)originalColorBuffer.Width * ResolutionScale);
+            var tempHeight = (int)((float)originalColorBuffer.Height * ResolutionScale);
+            var aoTexture1 = NewScopedRenderTarget2D(tempWidth, tempHeight, PixelFormat.R8_UNorm, 1);
+
             aoRawImageEffect.SetInput(0, originalDepthBuffer);
             aoRawImageEffect.SetOutput(aoTexture1);
             aoRawImageEffect.Draw(context, "AmbientOcclusionRawAO");
 
-            for (int bounces = 0; bounces < NumberOfBounces; bounces++)
+            if (Blur)
             {
+                var aoTexture2 = NewScopedRenderTarget2D(tempWidth, tempHeight, PixelFormat.R8_UNorm, 1);
+
                 if (offsetsWeights == null)
-                {                    
+                {
                     offsetsWeights = new[]
                     {
-                        //  0.356642f, 0.239400f, 0.072410f, 0.009869f,
-                        //  0.398943f, 0.241971f, 0.053991f, 0.004432f, 0.000134f, // stddev = 1.0
-                            0.153170f, 0.144893f, 0.122649f, 0.092902f, 0.062970f, // stddev = 2.0
-                        //  0.111220f, 0.107798f, 0.098151f, 0.083953f, 0.067458f, 0.050920f, 0.036108f, // stddev = 3.0
+                        0.153170f, 0.144893f, 0.122649f, 0.092902f, 0.062970f, // stddev = 2.0
                     };
-
-                    nameGaussianBlurH = string.Format("AmbientOcclusionBlurH{0}x{0}", offsetsWeights.Length);
-                    nameGaussianBlurV = string.Format("AmbientOcclusionBlurV{0}x{0}", offsetsWeights.Length);
                 }
 
                 // Set Near/Far pre-calculated factors to speed up the linear depth reconstruction
-                blurH.Parameters.Set(CameraKeys.ZProjection, CameraKeys.ZProjectionACalculate(renderView.NearClipPlane, renderView.FarClipPlane));
-                blurV.Parameters.Set(CameraKeys.ZProjection, CameraKeys.ZProjectionACalculate(renderView.NearClipPlane, renderView.FarClipPlane));
-
-                // Update permutation parameters
-                blurH.Parameters.Set(AmbientOcclusionBlurKeys.Count, offsetsWeights.Length);
-                blurH.Parameters.Set(AmbientOcclusionBlurKeys.BlurScale, BlurScale);
-                blurH.Parameters.Set(AmbientOcclusionBlurKeys.EdgeSharpness, EdgeSharpness);
-                blurH.EffectInstance.UpdateEffect(context.GraphicsDevice);
-
-                blurV.Parameters.Set(AmbientOcclusionBlurKeys.Count, offsetsWeights.Length);
-                blurV.Parameters.Set(AmbientOcclusionBlurKeys.BlurScale, BlurScale);
-                blurV.Parameters.Set(AmbientOcclusionBlurKeys.EdgeSharpness, EdgeSharpness);
-                blurV.EffectInstance.UpdateEffect(context.GraphicsDevice);
-
-                // Update parameters
-                blurH.Parameters.Set(AmbientOcclusionBlurShaderKeys.Weights, offsetsWeights);
-                blurV.Parameters.Set(AmbientOcclusionBlurShaderKeys.Weights, offsetsWeights);
-
-                // Horizontal pass
-                blurH.SetInput(0, aoTexture1);
-                blurH.SetInput(1, originalDepthBuffer);
-                blurH.SetOutput(aoTexture2);
-                blurH.Draw(context, nameGaussianBlurH);
-
-                // Vertical pass
-                blurV.SetInput(0, aoTexture2);
-                blurV.SetInput(1, originalDepthBuffer);
-                blurV.SetOutput(aoTexture1);
-                blurV.Draw(context, nameGaussianBlurV);
-            }
+                var zProj = CameraKeys.ZProjectionACalculate(renderView.NearClipPlane, renderView.FarClipPlane);
+                blur.Parameters.Set(CameraKeys.ZProjection, ref zProj);
 
-            aoApplyImageEffect.SetInput(0, originalColorBuffer);
-            aoApplyImageEffect.SetInput(1, aoTexture1);
-            aoApplyImageEffect.SetOutput(outputTexture);
-            aoApplyImageEffect.Draw(context, "AmbientOcclusionApply");
-        }
+                blur.Parameters.Set(AmbientOcclusionBlurKeys.Count, offsetsWeights.Length);
+                blur.Parameters.Set(AmbientOcclusionBlurKeys.BlurScale, BlurScale * 0.01f);
+                blur.Parameters.Set(AmbientOcclusionBlurKeys.EdgeSharpness, EdgeSharpness);
+                blur.EffectInstance.UpdateEffect(context.GraphicsDevice);
 
-        public enum TemporaryBufferSize
-        {
-            [Display("Full size")]
-            SizeFull = 12,
+                blur.Parameters.Set(AmbientOcclusionBlurShaderKeys.Weights, offsetsWeights);
+                blur.Parameters.Set(AmbientOcclusionBlurShaderKeys.BlurDistance, ParamDistance);
 
-            [Display("5/6 size")]
-            Size1012 = 10,
+                blur.SetInput(0, aoTexture1);
+                blur.SetInput(1, originalDepthBuffer);
+                blur.SetInput(2, originalColorBuffer);
+                blur.SetOutput(aoTexture2);
+                blur.Draw(context);
 
-            [Display("3/4 size")]
-            Size0912 = 9,
-
-            [Display("2/3 size")]
-            Size0812 = 8,
+                aoApplyImageEffect.SetInput(1, aoTexture2);
+            }
+            else
+            {
+                aoApplyImageEffect.SetInput(1, aoTexture1);
+            }
 
-            [Display("1/2 size")]
-            Size0612 = 6,
+            aoApplyImageEffect.SetInput(0, originalColorBuffer);
+            aoApplyImageEffect.SetOutput(outputTexture);
+            aoApplyImageEffect.Draw(context, "AmbientOcclusionApply");
         }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx
index cdbb7cd9f2..3f112c7e27 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx
@@ -10,6 +10,6 @@ namespace Xenko.Rendering.Images
         using params AmbientOcclusionBlurKeys;
 
         // Mixin 
-        mixin AmbientOcclusionBlurShader<AmbientOcclusionBlurKeys.Count, AmbientOcclusionBlurKeys.VerticalBlur, AmbientOcclusionBlurKeys.BlurScale, AmbientOcclusionBlurKeys.EdgeSharpness>;
+        mixin AmbientOcclusionBlurShader<AmbientOcclusionBlurKeys.Count, AmbientOcclusionBlurKeys.BlurScale, AmbientOcclusionBlurKeys.EdgeSharpness>;
     };
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect1.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx.cs
similarity index 85%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx.cs
index 8ac917345f..9822b4977d 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect1.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurEffect.xkfx.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Do not edit this file yourself!
 //
 // This code was generated by Xenko Shader Mixin Code Generator.
@@ -22,7 +22,7 @@ internal partial class AmbientOcclusionBlurEffect  : IShaderMixinBuilder
         {
             public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
             {
-                context.Mixin(mixin, "AmbientOcclusionBlurShader", context.GetParam(AmbientOcclusionBlurKeys.Count), context.GetParam(AmbientOcclusionBlurKeys.VerticalBlur), context.GetParam(AmbientOcclusionBlurKeys.BlurScale), context.GetParam(AmbientOcclusionBlurKeys.EdgeSharpness));
+                context.Mixin(mixin, "AmbientOcclusionBlurShader", context.GetParam(AmbientOcclusionBlurKeys.Count), context.GetParam(AmbientOcclusionBlurKeys.BlurScale), context.GetParam(AmbientOcclusionBlurKeys.EdgeSharpness));
             }
 
             [ModuleInitializer]
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurKeys.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurKeys.cs
index cde0c10616..db8ffbc4c8 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurKeys.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurKeys.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System.Linq;
+using Xenko.Core.Mathematics;
 
 namespace Xenko.Rendering.Images
 {
@@ -12,8 +13,6 @@ internal static class AmbientOcclusionBlurKeys
     {
         public static readonly PermutationParameterKey<int> Count = ParameterKeys.NewPermutation<int>(9);
 
-        public static readonly PermutationParameterKey<bool> VerticalBlur = ParameterKeys.NewPermutation<bool>();
-
         public static readonly PermutationParameterKey<float> BlurScale = ParameterKeys.NewPermutation<float>(2f);
 
         public static readonly PermutationParameterKey<float> EdgeSharpness = ParameterKeys.NewPermutation<float>(4f);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl
index c6ace4475d..b7d24d4094 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl
@@ -6,8 +6,9 @@ namespace Xenko.Rendering.Images
     /// <summary>
     /// A gaussian blur shader
     /// </summary>
-    internal shader AmbientOcclusionBlurShader<int BlurCount, bool IsVertical, float BlurScale, float EdgeSharpness> : ImageEffectShader, Camera
+    internal shader AmbientOcclusionBlurShader<int BlurCount, float BlurScale, float EdgeSharpness> : ImageEffectShader, Camera
     {
+        stage float  BlurDistance;
         stage float  Weights[BlurCount];
 
         stage float reconstructCSZ(float depth)
@@ -19,34 +20,52 @@ namespace Xenko.Rendering.Images
         {
             const float epsilon = 0.0001;
 
-            // Direction in texel size: (float2(1,0) or float2(0,1)) * texel size
-            float2 direction = (IsVertical ? float2(0, 1) : float2(1, 0)) * Texture0TexelSize;
-
             // Add center
             float totalWeight = Weights[0];
             float3 sum = Texture0.Sample(LinearSampler, streams.TexCoord).rgb * totalWeight;
 
             float linearDepth = reconstructCSZ(Texture1.Sample(LinearSampler, streams.TexCoord).x);
-            if (linearDepth >= 300)
+            if (linearDepth >= BlurDistance)
             {
                 sum /= (totalWeight + epsilon);
                 return float4(sum, 1);
             }
 
-                // mirrored samples using bilinear filtering
-            [
-            unroll]
+            // mirrored samples using bilinear filtering
+            [unroll]
             for(int i = 1; i < BlurCount; i++)
             {
-                // Handle both directions
+                float2 coordBase = float2(i * BlurScale, 0);
+                float origweight = 0.3 + Weights[i];
+
+                // Handle all directions
+                [unroll]
+                for (int j = -1; j <= 1; j += 2)
+                {
+                    float weight = origweight;
+                    float2 coord = streams.TexCoord + coordBase * j;
+
+                    float value = Texture0.Sample(LinearSampler, coord).rgb;
+
+                    float linearDepthOther = reconstructCSZ(Texture1.Sample(LinearSampler, coord).x);
+                    weight *= max(0.0, 1.0 - EdgeSharpness * abs(linearDepth - linearDepthOther));
+
+                    sum += value * weight;
+
+                    totalWeight += weight;
+                }
+
+                coordBase = float2(0, i * BlurScale);
+
                 [unroll]
                 for (int j = -1; j <= 1; j += 2)
                 {
-                    float weight = 0.3 + Weights[i];
+                    float weight = origweight;
+                    float2 coord = streams.TexCoord + coordBase * j;
 
-                    float value = Texture0.Sample(LinearSampler, streams.TexCoord + direction * j * i * BlurScale).rgb;
+                    float value = Texture0.Sample(LinearSampler, coord).rgb;
 
-                    float linearDepthOther = reconstructCSZ(Texture1.Sample(LinearSampler, streams.TexCoord + direction * j * i * BlurScale).x);
+                    float linearDepthOther = reconstructCSZ(Texture1.Sample(LinearSampler, coord).x);
                     weight *= max(0.0, 1.0 - EdgeSharpness * abs(linearDepth - linearDepthOther));
 
                     sum += value * weight;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl.cs
similarity index 83%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl.cs
index 3aa62cecf3..866c20ca77 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionBlurShader.xksl.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Do not edit this file yourself!
 //
 // This code was generated by Xenko Shader Mixin Code Generator.
@@ -18,6 +18,7 @@ namespace Xenko.Rendering.Images
 {
     internal static partial class AmbientOcclusionBlurShaderKeys
     {
+        public static readonly ValueParameterKey<float> BlurDistance = ParameterKeys.NewValue<float>();
         public static readonly ValueParameterKey<float> Weights = ParameterKeys.NewValue<float>();
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOEffect.xkfx.cs
similarity index 97%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOEffect.xkfx.cs
index 2441a45b67..09725f28b2 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOEffect.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOEffect.xkfx.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Do not edit this file yourself!
 //
 // This code was generated by Xenko Shader Mixin Code Generator.
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl
index 61af346ceb..72b80ed0cb 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl
@@ -13,6 +13,7 @@ namespace Xenko.Rendering.Images
         float    ParamBias = 0.01f;
         float    ParamRadius = 1;
         float    ParamRadiusSquared = 1;
+        float    ParamDistance = 1000;
 
         stage float reconstructCSZ(float depth)
         {
@@ -29,12 +30,12 @@ namespace Xenko.Rendering.Images
             return normalize(cross(ddy(position), ddx(position)));
         }
 
-        stage float sampleAO(int2 screenPosition, float3 viewPosition, float3 viewNormal, float diskRadius, int i, float randomPatternRotationAngle)
+        stage float sampleAO(float3 viewPosition, float3 viewNormal, float diskRadius, int i, float randomPatternRotationAngle)
         {
             //*****************************
             //  Sample Offset
-            float alpha = 1 * (i + 0.5) * 0.675f / SamplesCount;
-            float angle = 1 * 43.9822971503f * alpha + randomPatternRotationAngle;
+            float alpha = (i + 0.5) * 0.675f / SamplesCount;
+            float angle = 43.9822971503f * alpha + randomPatternRotationAngle;
 
             float2 offset = float2(cos(angle), sin(angle));
             float ssRadius = alpha * diskRadius;
@@ -49,13 +50,13 @@ namespace Xenko.Rendering.Images
 
             //*****************************
             // View Position
-            float3 position = reconstructCSPosition(samplePosInt + float2(0.5, 0.5), linearDepth);
-                   position.x *= -1;
+            float3 position = reconstructCSPosition(samplePosInt, linearDepth);
+                   position.x = -position.x;
 
             //*****************************
             // View Normal
             float3 v = position - viewPosition;
-            v.z *= -1;
+            v.z = -v.z;
             
             //*****************************
             // Ambient Occlusion
@@ -74,12 +75,16 @@ namespace Xenko.Rendering.Images
             //*****************************
             // Reconstruct View space linear depth Z from the depth buffer
             float depth = Texture0.SampleLevel(Sampler, streams.TexCoord, 0).x;
+
+            // ignore stuff too close or far away
             float linearDepth = reconstructCSZ(depth);
+            if (linearDepth > ParamDistance) return float4(1,1,1,1);
+
+            float finalStrength = ParamIntensity * (1.0 - linearDepth / ParamDistance) * saturate(linearDepth * 2.0 - 0.5);
 
             //*****************************
             // Reconstruct View space position XYZ
-            int2 screenPosition = streams.TexCoord.xy * ScreenInfo.xy;
-            float3 viewPosition = reconstructCSPosition(screenPosition + float2(0.5, 0.5), linearDepth);
+            float3 viewPosition = reconstructCSPosition(streams.TexCoord.xy * ScreenInfo.xy, linearDepth);
                    viewPosition.x *= -1;
 
             //*****************************
@@ -87,15 +92,10 @@ namespace Xenko.Rendering.Images
             float3 viewNormal = reconstructCSNormal(viewPosition.xyz);
                    viewNormal.xy *= -1;
 
-            //*****************************
-            // Hash function used in the HPG12 AlchemyAO paper
-            int linearDepthInt = (int)linearDepth;
-            //float randomPatternRotationAngle = (3 * screenPosition.x ^ screenPosition.y + screenPosition.x * screenPosition.y) * 10;
-            float randomPatternRotationAngle = (15 * linearDepthInt + 3 * screenPosition.x ^ 2 * screenPosition.y + screenPosition.x * screenPosition.y) * 10;
+            float randomPatternRotationAngle = sin(dot(streams.TexCoord,float2(12.9898,78.233))) * 43758.5453;
 
             //*****************************
             // Choose a sample radius proportional to the projected area of the half-sphere
-            //float diskRadius = -projScale * radius / linearDepth;
             float diskRadius = ParamProjScale / linearDepth;
 
             //*****************************
@@ -103,50 +103,14 @@ namespace Xenko.Rendering.Images
             float sum = 0.0;
             for (int i = 0; i < SamplesCount; i++)
             {
-                sum += sampleAO(screenPosition, viewPosition, viewNormal, diskRadius, i, randomPatternRotationAngle);
+                sum += sampleAO(viewPosition, viewNormal, diskRadius, i, randomPatternRotationAngle);
             }
 
             float temp = ParamRadiusSquared * ParamRadius;
             sum /= temp * temp;
-	        float A = max(0.0, 1.0 - sum * 5 * ParamIntensity / SamplesCount);
+	        float A = max(0.0, 1.0 - sum * 5 * finalStrength / SamplesCount);
             
-            float nearPlaneFade = saturate(linearDepth * 2.0 - 0.5);
-            A = lerp(1, A, nearPlaneFade);
-
-            //*****************************
-            // Bilateral box-filter over a quad for free, respecting depth edges
-	        // (the difference that this makes is subtle)
-            if (abs(ddx(linearDepth)) < 0.02)
-            {
-		        A -= ddx(A) * ((screenPosition.x & 1) - 0.5);
-	        }
-	        if (abs(ddy(linearDepth)) < 0.02)
-            {
-                A -= ddy(A) * ((screenPosition.y & 1) - 0.5);
-	        }
-
-            //************************
-            // A now contains the light intensity factor (0 to 1) which can be applied to the ambient light illuminating the pixel
-
-
-
-            //************************
-            // Debug - visualize different
-            //************************
-
-            /************************
-            // Visualize depth as color bands
-            //************************
-            linearDepth = sum;
-            float4 color = Texture0.Sample(Sampler, streams.TexCoord);
-            color.r = ((float)(linearDepth % 4)) / 4.0;
-            color.g = ((float)((linearDepth / 4) % 4)) / 4.0;
-            color.b = ((float)((linearDepth / 16) % 4)) / 4.0;
-            return color; //*/
-
-
-
-            return float4(A, A, A, A);
+            return float4(A, A, A, 1.0);
         }
     };
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl.cs
similarity index 92%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl.cs
index cdd1835ccf..1fb89c91ff 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/AmbientOcclusionRawAOShader.xksl.cs
@@ -21,6 +21,7 @@ public static partial class AmbientOcclusionRawAOShaderKeys
         public static readonly ValueParameterKey<Vector4> ProjInfo = ParameterKeys.NewValue<Vector4>();
         public static readonly ValueParameterKey<Vector4> ScreenInfo = ParameterKeys.NewValue<Vector4>();
         public static readonly ValueParameterKey<float> ParamProjScale = ParameterKeys.NewValue<float>(1);
+        public static readonly ValueParameterKey<float> ParamDistance = ParameterKeys.NewValue<float>(1000f);
         public static readonly ValueParameterKey<float> ParamIntensity = ParameterKeys.NewValue<float>(1);
         public static readonly ValueParameterKey<float> ParamBias = ParameterKeys.NewValue<float>(0.01f);
         public static readonly ValueParameterKey<float> ParamRadius = ParameterKeys.NewValue<float>(1);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.xksl
index 503511c60b..168693c0a4 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.xksl
@@ -19,12 +19,7 @@ namespace Xenko.Rendering.Images
             float4 color     = Texture0.SampleLevel(Sampler, streams.TexCoord, 0);
             float  occlusion = Texture1.SampleLevel(Sampler, streams.TexCoord, 0).x;
 
-            // TODO Enable debug output as a mixin
-            // color.rgba = occlusion;
-
-            color.rgba *= occlusion;
-
-            return color;
+            return color * occlusion;
         }
     };
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Editor/SpritePicking.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Editor/SpritePicking.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAEffect.cs
index 05b56faad4..d6aa9b337f 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAEffect.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAEffect.cs
@@ -28,6 +28,8 @@ public FXAAEffect() : this("FXAAShaderEffect")
 
         public bool NeedRangeDecompress => true;
 
+        public bool RequiresDepthBuffer => false;
+
         public bool RequiresVelocityBuffer => false;
 
         /// <summary>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AmbientOcclusion/ApplyAmbientOcclusionShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShaderEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShaderEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShaderEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShaderEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/IScreenSpaceAntiAliasingEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/IScreenSpaceAntiAliasingEffect.cs
index bfbab8786b..840cbc7493 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/IScreenSpaceAntiAliasingEffect.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/IScreenSpaceAntiAliasingEffect.cs
@@ -9,6 +9,7 @@ namespace Xenko.Rendering.Images
     public interface IScreenSpaceAntiAliasingEffect : IImageEffect
     {
         bool NeedRangeDecompress { get; }
+        bool RequiresDepthBuffer { get; }
         bool RequiresVelocityBuffer { get; }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasEffect.cs
index 570a478c29..c3fa18a597 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasEffect.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasEffect.cs
@@ -46,6 +46,8 @@ public TemporalAntiAliasEffect() : base("TemporalAntiAliasShader")
 
         public bool NeedRangeDecompress => false;
 
+        public bool RequiresDepthBuffer => true;
+
         public bool RequiresVelocityBuffer => true;
 
         [DefaultValue(0.01f)]
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/TemporalAntiAliasShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageCombineShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/AntiAliasing/FXAAShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageCombineShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilter.cs b/sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilter.cs
index a9cbc35462..8c56ae0233 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilter.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilter.cs
@@ -26,7 +26,7 @@ public BrightFilter()
         {
             Threshold = 0.2f;
             Steepness = 1.0f;
-            Color = new Color3(1.0f);
+            Color = Color3.White;
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ protected override void InitializeCore()
 
         protected override void SetDefaultParameters()
         {
-            Color = new Color3(1.0f);
+            Color = Color3.White;
 
             base.SetDefaultParameters();
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilterShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilterShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilterShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/BrightFilter/BrightFilterShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorCombiner/ColorCombinerShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroup.cs
index 9a88474fa4..329c869c78 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroup.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroup.cs
@@ -65,6 +65,9 @@ protected override void InitializeCore()
             transformGroupEffect.Initialize(Context);
             Parameters = transformGroupEffect.Parameters;
 
+            // Set initial transforms
+            Parameters.Set(ColorTransformGroupKeys.Transforms, enabledTransforms);
+
             // we are adding parameter collections after as transform parameters should override previous parameters
             // TODO GRAPHICS REFACTOR
             //transformGroupEffect.ParameterCollections.Add(transformsParameters);
@@ -156,7 +159,7 @@ protected void AddTemporaryTransform(ColorTransform transform)
                 collectTransforms.Add(transform);
         }
 
-        private void CollectTransforms()
+        private bool CollectTransforms()
         {
             collectTransforms.Clear();
             CollectPreTransforms();
@@ -170,6 +173,7 @@ private void CollectTransforms()
             if (collectTransforms.Count != enabledTransforms.Count)
             {
                 enabledTransforms = new List<ColorTransform>(collectTransforms);
+                return true;
             }
             else
             {
@@ -178,10 +182,12 @@ private void CollectTransforms()
                     if (collectTransforms[i] != enabledTransforms[i])
                     {
                         enabledTransforms = new List<ColorTransform>(collectTransforms);
-                        break;
+                        return true;
                     }
                 }
             }
+
+            return false;
         }
 
         private void CollectTransformsParameters(RenderDrawContext context)
@@ -193,12 +199,14 @@ private void CollectTransformsParameters(RenderDrawContext context)
             }
 
             // Grab all color transforms
-            CollectTransforms();
+            var enabledTransformsChanged = CollectTransforms();
 
-            // Update effect
-            // TODO: if the list was the same than previous one, we could optimize this and not setup the value
-            Parameters.Set(ColorTransformGroupKeys.Transforms, enabledTransforms);
-            if (transformGroupEffect.EffectInstance.UpdateEffect(context.GraphicsDevice))
+            if (enabledTransformsChanged)
+            {
+                Parameters.Set(ColorTransformGroupKeys.Transforms, enabledTransforms);
+            }
+            // Update the effect and should it or the set of enabled transforms have changed prepare their parameters
+            if (transformGroupEffect.EffectInstance.UpdateEffect(context.GraphicsDevice) || enabledTransformsChanged)
             {
                 // Update layouts
                 for (int i = 0; i < enabledTransforms.Count; i++)
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageCombineShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/Bloom/BloomAfterimageCombineShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformGroupShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/LuminanceToChannelShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ColorTransformShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/LuminanceToChannelShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Noise/FilmGrainShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Noise/FilmGrainShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Noise/FilmGrainShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Noise/FilmGrainShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapCommonOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapCommonOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapCommonOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapCommonOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapDragoOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapDragoOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapDragoOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapDragoOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/LuminanceToChannelShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapExponentialOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/LuminanceToChannelShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapExponentialOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejl2OperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejl2OperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejl2OperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejl2OperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapExponentialOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejlDawsonOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapExponentialOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejlDawsonOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejlDawsonOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapLogarithmicOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapHejlDawsonOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapLogarithmicOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapMikeDayOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapMikeDayOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapMikeDayOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapMikeDayOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapLogarithmicOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapLogarithmicOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapReinhardOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapReinhardOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapU2FilmicOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapU2FilmicOperatorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapU2FilmicOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapU2FilmicOperatorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/Vignetting.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/Vignetting.cs
index 78f39237d6..eb0a52184c 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/Vignetting.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/Vignetting.cs
@@ -25,7 +25,7 @@ public Vignetting(string effect) : base(effect)
         {
             Amount = 0.8f;
             Radius = 0.7f;
-            Color = new Color3(0f);
+            Color = Color3.Black;
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/VignettingShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/VignettingShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/VignettingShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/Vignetting/VignettingShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthMinMax/DepthMinMaxShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapReinhardOperatorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshCombineShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ColorTransforms/ToneMap/ToneMapReinhardOperatorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshCombineShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshCombineShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshCombineShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/TripleRhombiCombineShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/TripleRhombiCombineShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/TripleRhombiCombineShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/TripleRhombiCombineShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CircleOfConfusion.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CircleOfConfusion.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CircleOfConfusion.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CircleOfConfusion.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCLinearDepthShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/BokehTechnique/Hexagonal/McIntoshOptimizedShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCLinearDepthShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCMapBlurShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCLinearDepthShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CoCLinearDepthShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineLevelsFromCoCShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/CombineFrontCoCShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurUtil.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurUtil.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurUtil.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurUtil.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthOfField.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthOfField.cs
index 8a9a3fed47..93e196d61b 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthOfField.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthOfField.cs
@@ -194,7 +194,7 @@ public int[] LevelDownscaleFactors
 
         // For auto-focus
         private ImageEffect pointDepthShader;
-        private ImageReadback<Half> depthReadBack;
+        private ImageReadback<Xenko.Core.Mathematics.Half> depthReadBack;
         private Texture depthCenter1x1;
         private float autoFocusDistanceTarget = 10f;
         private float autoFocusDistanceCurrent = 10f;
@@ -255,7 +255,7 @@ protected override void InitializeCore()
             thresholdAlphaCoC = ToLoadAndUnload(new ImageEffectShader("ThresholdAlphaCoC"));
             thresholdAlphaCoCFront = ToLoadAndUnload(new ImageEffectShader("ThresholdAlphaCoCFront"));
             pointDepthShader = ToLoadAndUnload(new ImageEffectShader("PointDepth"));
-            depthReadBack = ToLoadAndUnload(new ImageReadback<Half>());
+            depthReadBack = ToLoadAndUnload(new ImageReadback<Xenko.Core.Mathematics.Half>());
             depthCenter1x1 = Texture.New2D(GraphicsDevice, 1, 1, 1, PixelFormat.R16_Float, TextureFlags.ShaderResource | TextureFlags.RenderTarget).DisposeBy(this);
         }
 
@@ -376,7 +376,7 @@ protected override void DrawCore(RenderDrawContext context)
 
             coclinearDepthMapEffect.SetInput(0, originalDepthBuffer);
             coclinearDepthMapEffect.SetOutput(cocLinearDepthTexture);
-            coclinearDepthMapEffect.Parameters.Set(CircleOfConfusionKeys.depthAreas, depthAreas);
+            coclinearDepthMapEffect.Parameters.Set(CircleOfConfusionKeys.depthAreas, ref depthAreas);
             coclinearDepthMapEffect.Parameters.Set(CameraKeys.ZProjection, CameraKeys.ZProjectionACalculate(renderView.NearClipPlane, renderView.FarClipPlane));
             coclinearDepthMapEffect.Draw(context, "CoC_LinearDepth");
 
@@ -428,6 +428,7 @@ protected override void DrawCore(RenderDrawContext context)
             // Creates all the levels with different CoC strengths.
             // (Skips level with CoC 0 which is always the original buffer.)
             combineLevelsEffect.Parameters.Set(CombineLevelsFromCoCKeys.LevelCount, cocLevels.Count);
+            combineLevelsEffect.EffectInstance.UpdateEffect(GraphicsDevice); //update needed if permutation changed and shader has a value array parameter
             combineLevelsEffect.SetInput(0, cocLinearDepthTexture);
             combineLevelsEffect.SetInput(1, blurredCoCTexture);
             combineLevelsEffect.SetInput(2, originalColorBuffer);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/PointDepth.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/PointDepth.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/PointDepth.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/PointDepth.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoC.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoC.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoC.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoC.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoCFront.cs b/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoCFront.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoCFront.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/ThresholdAlphaCoCFront.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Dither/Dither2.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Dither/Dither.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/Dither/Dither2.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/Dither/Dither.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Fog/Fog.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Fog/Fog.cs
new file mode 100644
index 0000000000..32027d3ae9
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/Fog/Fog.cs
@@ -0,0 +1,92 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.ComponentModel;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+
+namespace Xenko.Rendering.Images {
+    /// <summary>
+    /// A fog filter.
+    /// </summary>
+    [DataContract("Fog")]
+    public class Fog : ImageEffect {
+        private readonly ImageEffectShader fogFilter;
+        private Texture depthTexture;
+        private float zMin, zMax;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Fog"/> class.
+        /// </summary>
+        public Fog()
+            : this("FogEffect") {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Fog"/> class.
+        /// </summary>
+        /// <param name="brightPassShaderName">Name of the bright pass shader.</param>
+        public Fog(string ShaderName) : base(ShaderName) {
+            if (ShaderName == null) throw new ArgumentNullException("fogFilterName");
+            fogFilter = new ImageEffectShader(ShaderName);
+            Enabled = false;
+        }
+
+        [DataMember(10)]
+        public float Density { get; set; } = 0.1f;
+
+        [DataMember(20)]
+        public Color3 Color { get; set; } = new Color3(1.0f);
+
+        [DataMember(30)]
+        public float FogStart { get; set; } = 0f;
+
+        [DataMember(40)]
+        public bool SkipBackground { get; set; } = false;
+
+        protected override void InitializeCore() {
+            base.InitializeCore();
+            ToLoadAndUnload(fogFilter);
+        }
+
+        /// <summary>
+        /// Provides a color buffer and a depth buffer to apply the fog to.
+        /// </summary>
+        /// <param name="colorBuffer">A color buffer to process.</param>
+        /// <param name="depthBuffer">The depth buffer corresponding to the color buffer provided.</param>
+        public void SetColorDepthInput(Texture colorBuffer, Texture depthBuffer, float zMin, float zMax) {
+            SetInput(0, colorBuffer);
+            depthTexture = depthBuffer;
+            this.zMin = zMin;
+            this.zMax = zMax;
+        }
+
+        protected override void SetDefaultParameters() {
+            Color = new Color3(1.0f);
+            Density = 0.1f;
+            base.SetDefaultParameters();
+        }
+
+        protected override void DrawCore(RenderDrawContext context) {
+            Texture color = GetInput(0);
+            Texture output = GetOutput(0);
+            if (color == null || output == null || depthTexture == null) {
+                return;
+            }
+
+            fogFilter.Parameters.Set(FogEffectKeys.FogColor, Color);
+            fogFilter.Parameters.Set(FogEffectKeys.Density, Density);
+            fogFilter.Parameters.Set(FogEffectKeys.DepthTexture, depthTexture);
+            fogFilter.Parameters.Set(FogEffectKeys.zFar, zMax);
+            fogFilter.Parameters.Set(FogEffectKeys.zNear, zMin);
+            fogFilter.Parameters.Set(FogEffectKeys.FogStart, FogStart);
+            fogFilter.Parameters.Set(FogEffectKeys.skipBG, SkipBackground);
+
+            fogFilter.SetInput(0, color);
+            fogFilter.SetOutput(output);
+            ((RendererBase)fogFilter).Draw(context);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Fog/FogEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Fog/FogEffect.cs
new file mode 100644
index 0000000000..172f81158a
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/Fog/FogEffect.cs
@@ -0,0 +1,29 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    internal static partial class FogEffectKeys
+    {
+        public static readonly ValueParameterKey<Color3> FogColor = ParameterKeys.NewValue<Color3>(new Color3(1,1,1));
+        public static readonly ValueParameterKey<float> Density = ParameterKeys.NewValue<float>(1.0f);
+        public static readonly ValueParameterKey<float> FogStart = ParameterKeys.NewValue<float>(0f);
+        public static readonly ValueParameterKey<bool> skipBG = ParameterKeys.NewValue<bool>(false);
+        public static readonly ValueParameterKey<float> zFar = ParameterKeys.NewValue<float>(1000f);
+        public static readonly ValueParameterKey<float> zNear = ParameterKeys.NewValue<float>(0.1f);
+        public static readonly ObjectParameterKey<Texture> DepthTexture = ParameterKeys.NewObject<Texture>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Fog/FogEffect.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/Fog/FogEffect.xksl
new file mode 100644
index 0000000000..c687035049
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/Fog/FogEffect.xksl
@@ -0,0 +1,35 @@
+namespace Xenko.Rendering.Images
+{
+    /// <summary>
+    /// Simple fog
+    /// </summary>
+    internal shader FogEffect : ImageEffectShader
+    {
+        stage float FogStart;
+        stage float Density;
+        stage float zFar;
+        stage float zNear;
+        stage bool skipBG;
+
+        stage float3 FogColor;
+        stage Texture2D DepthTexture;
+
+        stage override float4 Shading() 
+        {
+            float4 color = Texture0.Sample(PointSampler, streams.TexCoord);
+            float z_b = DepthTexture.SampleLevel(PointSampler, streams.TexCoord, 0.0).x;
+            
+            if (!skipBG || z_b < 1.0) {
+                float z_n = 2.0 * z_b - 1.0;
+                float dist = 2.0 * zNear * zFar / (zFar + zNear - z_n * (zFar - zNear));
+                dist -= FogStart;
+            
+                float fogAmount = clamp(exp(dist * -Density), 0.0, 1.0);
+            
+                color.xyz = lerp(FogColor, color.xyz, fogAmount);
+            }
+
+            return color;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/GaussianBlur/GaussianBlurShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/IPostProcessingEffects.cs b/sources/engine/Xenko.Rendering/Rendering/Images/IPostProcessingEffects.cs
index 4fd0a5170a..7067fd6a30 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/IPostProcessingEffects.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/IPostProcessingEffects.cs
@@ -18,5 +18,9 @@ public interface IPostProcessingEffects : ISharedRenderer, IDisposable
         bool RequiresNormalBuffer { get; }
 
         bool RequiresSpecularRoughnessBuffer { get; }
+
+        bool RequiresRenderTargetChange { get; }
+
+        bool Enabled { get; set; }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader.cs
index b197848182..ca74c99513 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader.cs
@@ -117,10 +117,11 @@ protected virtual void UpdateParameters()
                 var texture = GetInput(i);
                 if (i < TexturingKeys.DefaultTextures.Count)
                 {
-                    var texturingKeys = texture.ViewDimension == TextureDimension.TextureCube ? TexturingKeys.TextureCubes : TexturingKeys.DefaultTextures;
+                    var texturingKeys = texture != null && texture.ViewDimension == TextureDimension.TextureCube ? TexturingKeys.TextureCubes : TexturingKeys.DefaultTextures;
+                    var texelSize = texture != null ? new Vector2(1.0f / texture.ViewWidth, 1.0f / texture.ViewHeight) : default;
                     // TODO GRAPHICS REFACTOR Do not use slow version
                     Parameters.Set(texturingKeys[i], texture);
-                    Parameters.Set(TexturingKeys.TexturesTexelSize[i], new Vector2(1.0f / texture.ViewWidth, 1.0f / texture.ViewHeight));
+                    Parameters.Set(TexturingKeys.TexturesTexelSize[i], texelSize);
                 }
                 else
                 {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/DepthOfField/DepthAwareDirectionalBlurShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffects.cd b/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffects.cd
index f0f6f60582..8f1e0e3623 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffects.cd
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffects.cd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
   <Class Name="Xenko.Rendering.Images.ImageEffect" Collapsed="true">
     <Position X="9.25" Y="0.5" Width="1.5" />
@@ -48,6 +48,20 @@
       <Field Name="afterimage" />
     </ShowAsAssociation>
   </Class>
+  <Class Name="Xenko.Rendering.Images.Outline" Collapsed="true">
+    <Position X="4.5" Y="6" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>gAAAAAAAACCCAAAAAAAAAAAAAACAAAAAEAAggAAAAAA=</HashCode>
+      <FileName>Rendering\Images\Outline\Outline.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="Xenko.Rendering.Images.Fog" Collapsed="true">
+    <Position X="4.5" Y="6" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>gAAAAAAAABBBAAAAAAAAAAAAAACAAAAAEAAggAAAAAA=</HashCode>
+      <FileName>Rendering\Images\Fog\Fog.cs</FileName>
+    </TypeIdentifier>
+  </Class>
   <Class Name="Xenko.Rendering.Images.BrightFilter" Collapsed="true">
     <Position X="4.5" Y="6" Width="1.5" />
     <TypeIdentifier>
@@ -172,6 +186,8 @@
     <Members>
       <Field Name="bloom" Hidden="true" />
       <Field Name="brightFilter" Hidden="true" />
+      <Field Name="Oultine" Hidden="true" />
+      <Field Name="Fog" Hidden="true" />
       <Property Name="Camera" Hidden="true" />
       <Field Name="colorTransformsGroup" Hidden="true" />
       <Field Name="depthOfField" Hidden="true" />
@@ -199,6 +215,20 @@
         <Point X="4.5" Y="11.596" />
       </Path>
     </AssociationLine>
+    <AssociationLine Name="Fog" Type="Xenko.Rendering.Images.Fog" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="2.562" Y="2.691" />
+        <Point X="2.562" Y="6.346" />
+        <Point X="4.5" Y="6.346" />
+      </Path>
+    </AssociationLine>
+    <AssociationLine Name="Outline" Type="Xenko.Rendering.Images.Outline" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="2.562" Y="2.691" />
+        <Point X="2.562" Y="6.346" />
+        <Point X="4.5" Y="6.346" />
+      </Path>
+    </AssociationLine>
     <AssociationLine Name="BrightFilter" Type="Xenko.Rendering.Images.BrightFilter" FixedFromPoint="true" FixedToPoint="true">
       <Path>
         <Point X="2.562" Y="2.691" />
@@ -248,6 +278,8 @@
     <ShowAsAssociation>
       <Field Name="luminanceEffect" />
       <Property Name="DepthOfField" />
+      <Property Name="Outline" />
+      <Property Name="Fog" />
       <Property Name="BrightFilter" />
       <Property Name="Bloom" />
       <Property Name="LightStreak" />
@@ -444,4 +476,4 @@
     </TypeIdentifier>
   </Interface>
   <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>
\ No newline at end of file
+</ClassDiagram>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScaler.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScaler.cs
index 159a380305..bef002af5a 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScaler.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScaler.cs
@@ -35,6 +35,11 @@ public ImageScaler()
         /// <value>The color multiplier.</value>
         public Color4 Color { get; set; }
 
+        /// <summary>
+        /// Scale the UV texture scale, can be used to stretch the scaling out
+        /// </summary>
+        public Vector2 TexScale { get; set; } = Vector2.One;
+
         /// <summary>
         /// Copy only the red channel. Default is <c>false</c>
         /// </summary>
@@ -80,6 +85,7 @@ protected override void UpdateParameters()
 
             // Use actual ColorSpace
             Parameters.Set(ImageScalerShaderKeys.Color, Color.ToColorSpace(GraphicsDevice.ColorSpace));
+            Parameters.Set(ImageScalerShaderKeys.Scale, TexScale);
         }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl
index d4ec49fbe2..911f6b0db7 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl
@@ -11,12 +11,13 @@ namespace Xenko.Rendering.Images
         // TODO: Color and IsOnlyChannelRed could be part of a color filter that we can pre-prend automatically
         [Color]
         stage float4 Color;
+        stage float2 Scale;
         stage float IsOnlyChannelRed;
 
         // Shading of the sprite
         stage override float4 Shading()
         {
-            float4 color = base.Shading();
+            float4 color = Texture0.Sample(Sampler, streams.TexCoord * Scale);
             if (IsOnlyChannelRed != 0)
             {
                 color = float4(color.rrr, 1);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl.cs
similarity index 85%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl.cs
index b42200836f..5ef5b837be 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/ImageScaler/ImageScalerShader.xksl.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Do not edit this file yourself!
 //
 // This code was generated by Xenko Shader Mixin Code Generator.
@@ -19,6 +19,7 @@ namespace Xenko.Rendering.Images
     internal static partial class ImageScalerShaderKeys
     {
         public static readonly ValueParameterKey<Color4> Color = ParameterKeys.NewValue<Color4>();
+        public static readonly ValueParameterKey<Vector2> Scale = ParameterKeys.NewValue<Vector2>();
         public static readonly ValueParameterKey<float> IsOnlyChannelRed = ParameterKeys.NewValue<float>();
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareArtifactShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareReplicate.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareReplicate.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareReplicate.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LensFlare/FlareReplicate.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightEffect.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightEffect.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/AdditiveLightShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShafts.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShafts.cs
index 56bb787e17..e3c5b442b6 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShafts.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShafts.cs
@@ -160,7 +160,7 @@ protected override void DrawCore(RenderDrawContext context)
 
             var renderView = context.RenderContext.RenderView;
             var viewInverse = Matrix.Invert(renderView.View);
-            lightShaftsParameters.Set(TransformationKeys.ViewInverse, viewInverse);
+            lightShaftsParameters.Set(TransformationKeys.ViewInverse, ref viewInverse);
             lightShaftsParameters.Set(TransformationKeys.Eye, new Vector4(viewInverse.TranslationVector, 1));
 
             // Setup parameters for Z reconstruction
@@ -251,7 +251,7 @@ protected override void DrawCore(RenderDrawContext context)
 
                 // Additive blend pass
                 Color3 lightColor = lightShaft.Light2.ComputeColor(context.GraphicsDevice.ColorSpace, lightShaft.Light.Intensity);
-                applyLightEffectShader.Parameters.Set(AdditiveLightShaderKeys.LightColor, lightColor);
+                applyLightEffectShader.Parameters.Set(AdditiveLightShaderKeys.LightColor, ref lightColor);
                 applyLightEffectShader.Parameters.Set(AdditiveLightEffectKeys.Color, needsColorLightBuffer);
                 applyLightEffectShader.SetInput(lightBuffer);
                 applyLightEffectShader.Draw(context);
@@ -412,7 +412,7 @@ private bool DrawBoundingVolumes(RenderDrawContext context, IReadOnlyList<Render
 
                     // Update parameters for the minmax shader
                     Matrix worldViewProjection = Matrix.Multiply(volume.World, viewProjection);
-                    minmaxVolumeEffectShader.Parameters.Set(VolumeMinMaxShaderKeys.WorldViewProjection, worldViewProjection);
+                    minmaxVolumeEffectShader.Parameters.Set(VolumeMinMaxShaderKeys.WorldViewProjection, ref worldViewProjection);
 
                     foreach (var mesh in volume.Model.Meshes)
                     {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/LightShaftsShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader1.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/PostEffectBoundingRay.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/ImageEffectShader1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/PostEffectBoundingRay.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/VolumeMinMaxShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/VolumeMinMaxShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/VolumeMinMaxShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/VolumeMinMaxShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreak.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreak.cs
index 56dacc1d91..a21cef83b8 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreak.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreak.cs
@@ -260,7 +260,7 @@ protected override void DrawCore(RenderDrawContext contextParameters)
             colorAberration.Y = (float)MathUtil.Lerp(1.0, ColorAberrationCoefficients.Y, ColorAberrationStrength);
             colorAberration.Z = (float)MathUtil.Lerp(1.0, ColorAberrationCoefficients.Z, ColorAberrationStrength);
 
-            lightStreakEffect.Parameters.Set(LightStreakShaderKeys.ColorAberrationCoefficients, colorAberration);
+            lightStreakEffect.Parameters.Set(LightStreakShaderKeys.ColorAberrationCoefficients, ref colorAberration);
 
             for (int streak = 0; streak < StreakCount; streak++)
             {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LightStreak/LightStreakShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRBlurPass.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRBlurPass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRBlurPass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRBlurPass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCombinePass.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCombinePass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCombinePass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCombinePass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCommon.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCommon.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCommon.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRCommon.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRDepthPass.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRDepthPass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRDepthPass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRDepthPass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRRayTracePass.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRRayTracePass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRRayTracePass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRRayTracePass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRResolvePass.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRResolvePass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRResolvePass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRResolvePass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRTemporalPass.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRTemporalPass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRTemporalPass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LocalReflections/SSLRTemporalPass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceEffect.cs
index 74ffe430db..992fc24221 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceEffect.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceEffect.cs
@@ -21,7 +21,7 @@ public class LuminanceEffect : ImageEffect
         private GaussianBlur blur;
 
         private ImageMultiScaler multiScaler;
-        private ImageReadback<Half> readback;
+        private ImageReadback<Xenko.Core.Mathematics.Half> readback;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LuminanceEffect" /> class.
@@ -32,7 +32,7 @@ public LuminanceEffect()
             DownscaleCount = 6;
             UpscaleCount = 4;
             EnableAverageLuminanceReadback = true;
-            readback = new ImageReadback<Half>();
+            readback = new ImageReadback<Xenko.Core.Mathematics.Half>();
         }
 
         protected override void InitializeCore()
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/PostEffectBoundingRay.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceLogShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LightShafts/PostEffectBoundingRay.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceLogShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceLogShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceUtils.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceLogShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceUtils.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Outline/Outline.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Outline/Outline.cs
new file mode 100644
index 0000000000..bd2b4117fa
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/Outline/Outline.cs
@@ -0,0 +1,95 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.ComponentModel;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+
+namespace Xenko.Rendering.Images {
+    /// <summary>
+    /// A fog filter.
+    /// </summary>
+    [DataContract("Outline")]
+    public class Outline : ImageEffect {
+        private readonly ImageEffectShader outlineFilter;
+        private Texture depthTexture;
+        private float zMin, zMax;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Outline"/> class.
+        /// </summary>
+        public Outline()
+            : this("OutlineEffect") {
+            Enabled = false;
+        }
+
+        [DataMember(10)]
+        public float NormalWeight { get; set; } = 2f;
+
+        [DataMember(20)]
+        public float DepthWeight { get; set; } = 0.2f;
+
+        [DataMember(30)]
+        public float NormalNearCutoff { get; set; } = 0.1f;
+
+        [DataMember(40)]
+        public float ThicknessFactor { get; set; } = 1f;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CartoonFilter"/> class.
+        /// </summary>
+        /// <param name="brightPassShaderName">Name of the bright pass shader.</param>
+        public Outline(string ShaderName) : base(ShaderName) {
+            if (ShaderName == null) throw new ArgumentNullException("outlineFilterName");
+            outlineFilter = new ImageEffectShader(ShaderName);
+        }
+
+        protected override void InitializeCore() {
+            base.InitializeCore();
+            ToLoadAndUnload(outlineFilter);
+        }
+
+        /// <summary>
+        /// Provides a color buffer and a depth buffer to apply the fog to.
+        /// </summary>
+        /// <param name="colorBuffer">A color buffer to process.</param>
+        /// <param name="depthBuffer">The depth buffer corresponding to the color buffer provided.</param>
+        public void SetColorDepthInput(Texture colorBuffer, Texture depthBuffer, float zMin, float zMax) {
+            SetInput(0, colorBuffer);
+            depthTexture = depthBuffer;
+            this.zMin = zMin;
+            this.zMax = zMax;
+        }
+
+        protected override void SetDefaultParameters() {
+            NormalWeight = 2f;
+            DepthWeight = 0.2f;
+            NormalNearCutoff = 0.1f;
+            ThicknessFactor = 1f;
+            base.SetDefaultParameters();
+        }
+
+        protected override void DrawCore(RenderDrawContext context) {
+            Texture color = GetInput(0);
+            Texture output = GetOutput(0);
+            if (color == null || output == null || depthTexture == null) {
+                return;
+            }
+
+            outlineFilter.Parameters.Set(OutlineEffectKeys.ScreenDiffs, new Vector2(ThicknessFactor / color.Width, ThicknessFactor / color.Height));
+            outlineFilter.Parameters.Set(OutlineEffectKeys.DepthTexture, depthTexture);
+            outlineFilter.Parameters.Set(OutlineEffectKeys.zFar, zMax);
+            outlineFilter.Parameters.Set(OutlineEffectKeys.zNear, zMin);
+
+            outlineFilter.Parameters.Set(OutlineEffectKeys.NormalWeight, NormalWeight);
+            outlineFilter.Parameters.Set(OutlineEffectKeys.DepthWeight, DepthWeight);
+            outlineFilter.Parameters.Set(OutlineEffectKeys.NormalNearCutoff, NormalNearCutoff);
+
+            outlineFilter.SetInput(0, color);
+            outlineFilter.SetOutput(output);
+            ((RendererBase)outlineFilter).Draw(context);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Outline/OutlineEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/Outline/OutlineEffect.cs
new file mode 100644
index 0000000000..9f2c3dbab8
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/Outline/OutlineEffect.cs
@@ -0,0 +1,29 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    internal static partial class OutlineEffectKeys
+    {
+        public static readonly ValueParameterKey<Vector2> ScreenDiffs = ParameterKeys.NewValue<Vector2>();
+        public static readonly ValueParameterKey<float> zFar = ParameterKeys.NewValue<float>(1000f);
+        public static readonly ValueParameterKey<float> zNear = ParameterKeys.NewValue<float>(0.1f);
+        public static readonly ValueParameterKey<float> NormalWeight = ParameterKeys.NewValue<float>(2f);
+        public static readonly ValueParameterKey<float> DepthWeight = ParameterKeys.NewValue<float>(0.2f);
+        public static readonly ValueParameterKey<float> NormalNearCutoff = ParameterKeys.NewValue<float>(0.1f);
+        public static readonly ObjectParameterKey<Texture> DepthTexture = ParameterKeys.NewObject<Texture>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/Outline/OutlineEffect.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/Outline/OutlineEffect.xksl
new file mode 100644
index 0000000000..9642ffba49
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/Outline/OutlineEffect.xksl
@@ -0,0 +1,69 @@
+namespace Xenko.Rendering.Images
+{
+    /// <summary>
+    /// Simple fog
+    /// </summary>
+    internal shader OutlineEffect : ImageEffectShader
+    {
+        stage float2 ScreenDiffs;  // .x = Width, .y = Height
+
+        stage float zFar;
+        stage float zNear;
+
+        stage float NormalWeight;
+        stage float DepthWeight;
+        stage float NormalNearCutoff;
+
+        stage Texture2D DepthTexture;
+        
+        float3 normal_from_depth(float depth, float2 texcoords) {
+          const float2 offset1 = float2(0.0,ScreenDiffs.y);
+          const float2 offset2 = float2(ScreenDiffs.x,0.0);
+  
+          float depth1 = DepthTexture.SampleLevel(PointSampler, texcoords + offset1, 0.0).x;
+          float depth2 = DepthTexture.SampleLevel(PointSampler, texcoords + offset2, 0.0).x;
+  
+          float3 p1 = float3(offset1, depth1 - depth);
+          float3 p2 = float3(offset2, depth2 - depth);
+  
+          float3 normal = cross(p1, p2);
+          normal.z = -normal.z;
+  
+          return normalize(normal);
+        }
+
+        float4 fetchNormalDepth(float2 tc){
+            float4 nd; // return value
+
+            // get depth
+            float z_b = DepthTexture.SampleLevel(PointSampler, tc, 0.0).x;
+            float z_n = 2.0 * z_b - 1.0;
+            float linearDepth = 2.0 * zNear * zFar / (zFar + zNear - z_n * (zFar - zNear));
+
+            // linear depth
+            nd.w = DepthWeight * linearDepth;
+            
+            // normal, but skip stuff really close
+            nd.xyz = step(NormalNearCutoff, linearDepth) * normal_from_depth(z_b, tc) * NormalWeight;
+            
+            return nd;
+        }
+
+        stage override float4 Shading() {
+            float4 color = Texture0.Sample(PointSampler, streams.TexCoord);
+
+            float4 n1 = fetchNormalDepth(streams.TexCoord + float2(-ScreenDiffs.x, -ScreenDiffs.y));
+            float4 n2 = fetchNormalDepth(streams.TexCoord + float2( ScreenDiffs.x,  ScreenDiffs.y));
+            float4 n3 = fetchNormalDepth(streams.TexCoord + float2(-ScreenDiffs.x,  ScreenDiffs.y));
+            float4 n4 = fetchNormalDepth(streams.TexCoord + float2( ScreenDiffs.x, -ScreenDiffs.y));
+
+            // Work out how much the normal and depth values are changing.
+            float4 diagonalDelta = abs(n1 - n2) + abs(n3 - n4);
+
+            float normalDelta = dot(diagonalDelta.xyz, float3(1.0, 1.0, 1.0));
+            float totalDelta = diagonalDelta.w + normalDelta * 0.4;
+            
+            return float4(color.xyz * (1.0 - clamp(totalDelta, 0.0, 1.0)), 1.0);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/PostProcessingEffects.cs b/sources/engine/Xenko.Rendering/Rendering/Images/PostProcessingEffects.cs
index 9bfc34a802..f35390d745 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/PostProcessingEffects.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/PostProcessingEffects.cs
@@ -39,6 +39,9 @@ public PostProcessingEffects(IServiceRegistry services)
         /// </summary>
         public PostProcessingEffects()
         {
+            OutlineEffect = new Outline();
+            FogEffect = new Fog();
+            VRFOVFilter = new VRFOV();
             AmbientOcclusion = new AmbientOcclusion();
             LocalReflections = new LocalReflections();
             DepthOfField = new DepthOfField();
@@ -68,6 +71,28 @@ public PostProcessingEffects(RenderContext context)
         [NonOverridable]
         public Guid Id { get; set; } = Guid.NewGuid();
 
+        /// <summary>
+        /// Is this enabled?
+        /// </summary>
+        [DataMember(0)]
+        [DefaultValue(true)]
+        [Display("Enable", "Enable Post Processing")]
+        public override bool Enabled { get => base.Enabled; set => base.Enabled = value; }
+
+        /// <summary>
+        /// Gets the outline effect.
+        /// </summary>
+        [DataMember(6)]
+        [Category]
+        public Outline OutlineEffect { get; private set; }
+
+        /// <summary>
+        /// Gets the fog effect.
+        /// </summary>
+        [DataMember(7)]
+        [Category]
+        public Fog FogEffect { get; private set; }
+
         /// <summary>
         /// Gets the ambient occlusion effect.
         /// </summary>
@@ -77,7 +102,7 @@ public PostProcessingEffects(RenderContext context)
         [DataMember(8)]
         [Category]
         public AmbientOcclusion AmbientOcclusion { get; private set; }
-
+        
         /// <summary>
         /// Gets the local reflections effect.
         /// </summary>
@@ -96,6 +121,14 @@ public PostProcessingEffects(RenderContext context)
         [Category]
         public DepthOfField DepthOfField { get; private set; }
 
+        /// <summary>
+        /// Gets the VR FOV effect.
+        /// </summary>
+        [DataMember(15)]
+        [Category]
+        [Display("VR FOV Reduction")]
+        public VRFOV VRFOVFilter { get; private set; }
+
         /// <summary>
         /// Gets the bright pass-filter.
         /// </summary>
@@ -156,6 +189,9 @@ public PostProcessingEffects(RenderContext context)
         /// </summary>
         public void DisableAll()
         {
+            OutlineEffect.Enabled = false;
+            FogEffect.Enabled = false;
+            VRFOVFilter.Enabled = false;
             AmbientOcclusion.Enabled = false;
             LocalReflections.Enabled = false;
             DepthOfField.Enabled = false;
@@ -180,7 +216,9 @@ public override void Reset()
         protected override void InitializeCore()
         {
             base.InitializeCore();
-
+            OutlineEffect = ToLoadAndUnload(OutlineEffect);
+            FogEffect = ToLoadAndUnload(FogEffect);
+            VRFOVFilter = ToLoadAndUnload(VRFOVFilter);
             AmbientOcclusion = ToLoadAndUnload(AmbientOcclusion);
             LocalReflections = ToLoadAndUnload(LocalReflections);
             DepthOfField = ToLoadAndUnload(DepthOfField);
@@ -247,6 +285,8 @@ public void Draw(RenderDrawContext drawContext, RenderOutputValidator outputVali
 
         public bool RequiresSpecularRoughnessBuffer => LocalReflections.Enabled;
 
+        public bool RequiresRenderTargetChange => BrightFilter.Enabled || ColorTransforms.Enabled;
+
         protected override void DrawCore(RenderDrawContext context)
         {
             var input = GetInput(0);
@@ -284,6 +324,15 @@ protected override void DrawCore(RenderDrawContext context)
             bool aaFirst = Bloom != null && Bloom.StableConvolution;
             bool needAA = Antialiasing != null && Antialiasing.Enabled;
 
+            if (OutlineEffect.Enabled && inputDepthTexture != null) {
+                // Outline
+                var outlineOutput = NewScopedRenderTarget2D(input.Width, input.Height, input.Format);
+                OutlineEffect.SetColorDepthInput(currentInput, inputDepthTexture, context.RenderContext.RenderView.NearClipPlane, context.RenderContext.RenderView.FarClipPlane);
+                OutlineEffect.SetOutput(outlineOutput);
+                OutlineEffect.Draw(context);
+                currentInput = outlineOutput;
+            }
+
             // do AA here, first. (hybrid method from Karis2013)
             if (aaFirst && needAA)
             {
@@ -291,12 +340,14 @@ protected override void DrawCore(RenderDrawContext context)
                 if (fxaa != null)
                     fxaa.InputLuminanceInAlpha = true;
 
-                Antialiasing.SetInput(1, inputDepthTexture);
+                var bufferIndex = 1;
+                if (Antialiasing.RequiresDepthBuffer)
+                    Antialiasing.SetInput(bufferIndex++, inputDepthTexture);
 
                 bool requiresVelocityBuffer = Antialiasing.RequiresVelocityBuffer;
                 if (requiresVelocityBuffer)
                 {
-                    Antialiasing.SetInput(2, GetInput(6));
+                    Antialiasing.SetInput(bufferIndex++, GetInput(6));
                 }
 
                 var aaSurface = NewScopedRenderTarget2D(input.Width, input.Height, input.Format);
@@ -373,6 +424,15 @@ protected override void DrawCore(RenderDrawContext context)
                 currentInput = dofOutput;
             }
 
+            if (FogEffect.Enabled && inputDepthTexture != null) {
+                // Fog
+                var fogOutput = NewScopedRenderTarget2D(input.Width, input.Height, input.Format);
+                FogEffect.SetColorDepthInput(currentInput, inputDepthTexture, context.RenderContext.RenderView.NearClipPlane, context.RenderContext.RenderView.FarClipPlane);
+                FogEffect.SetOutput(fogOutput);
+                FogEffect.Draw(context);
+                currentInput = fogOutput;
+            }
+
             // Luminance pass (only if tone mapping is enabled)
             // TODO: This is not super pluggable to have this kind of dependencies. Check how to improve this
             var toneMap = colorTransformsGroup.Transforms.Get<ToneMap>();
@@ -455,7 +515,17 @@ protected override void DrawCore(RenderDrawContext context)
             {
                 luminanceToChannelTransform.Enabled = false;
             }
-            
+
+            // fov filter
+            if (VRFOVFilter.Enabled && VRFOVFilter.Radius < 1f && VRFOVFilter.Intensity > 0f)
+            {
+                var vrOutput = NewScopedRenderTarget2D(currentInput.Width, currentInput.Height, currentInput.Format, 1);
+                VRFOVFilter.SetColorInput(currentInput);
+                VRFOVFilter.SetOutput(vrOutput);
+                VRFOVFilter.Draw(context);
+                currentInput = vrOutput;
+            }
+
             // Color transform group pass (tonemap, color grading)
             var lastEffect = colorTransformsGroup.Enabled ? (ImageEffect)colorTransformsGroup : Scaler;
             lastEffect.SetInput(currentInput);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceUtils.cs b/sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeCompressorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/LuminanceEffect/LuminanceUtils.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeCompressorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeCompressorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeDecompressorShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeCompressorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeDecompressorShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeDecompressorShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/RangeConversion/RangeDecompressorShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsParameters.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsParameters.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsParameters.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsParameters.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRenderer1.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRenderer.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRenderer1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRenderer.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRendererEffect1.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRendererEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRendererEffect1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsRendererEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsBase.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsUtils.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsUtils.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlur.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlur.cs
index 30d52719f5..3b33a3daa8 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlur.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlur.cs
@@ -70,7 +70,7 @@ public enum RenderMode
             materialScatteringKernelBuffer?.Dispose();
             materialScatteringKernelBuffer = null;
         }
-        
+
         private void SetPermutationParameterForBothShaders<T>(PermutationParameterKey<T> parameter, T value) where T : struct
         {
             blurHShader.Parameters.Set(parameter, value);
@@ -83,6 +83,12 @@ private void SetValueParameterForBothShaders<T>(ValueParameterKey<T> parameter,
             blurVShader.Parameters.Set(parameter, value);
         }
 
+        private void SetValueParameterForBothShaders<T>(ValueParameterKey<T> parameter, ref T value) where T : struct
+        {
+            blurHShader.Parameters.Set(parameter, ref value);
+            blurVShader.Parameters.Set(parameter, ref value);
+        }
+
         private void SetValueParameterForBothShaders<T>(ValueParameterKey<T> parameter, T[] value) where T : struct
         {
             blurHShader.Parameters.Set(parameter, value);
@@ -133,7 +139,7 @@ private bool UsesOrthographicProjection(RenderView renderView)
             Vector2 projectedSphereDimensionsOnFarPlane = CalculateProjectionSizeOnPlane(renderView, renderView.FarClipPlane);
 
             Vector2 nearFarPlaneRatio = projectedSphereDimensionsOnFarPlane / projectedSphereDimensionsOnNearPlane;
-            
+
             return nearFarPlaneRatio.Y > 0.01f ? true : false;
         }
 
@@ -183,7 +189,7 @@ private void UpdateParameters(RenderDrawContext context, RenderView renderView)
             SetValueParameterForBothShaders(SubsurfaceScatteringBlurShaderKeys.ProjectionSizeOnUnitPlaneInClipSpace, projectionSizeOnUnitPlaneInClipSpace);
 
             // Other parameters:
-            SetValueParameterForBothShaders(SubsurfaceScatteringBlurShaderKeys.ViewProjectionMatrix, renderView.ViewProjection);    // This is used for debugging only.
+            SetValueParameterForBothShaders(SubsurfaceScatteringBlurShaderKeys.ViewProjectionMatrix, ref renderView.ViewProjection);    // This is used for debugging only.
 
             // Supply the material arrays of this frame to the shaders:
             SetValueParameterForBothShaders(SubsurfaceScatteringBlurShaderKeys.ScatteringWidths, materialScatteringWidths);  // TODO: PERFORMANCE: Only upload the actual number of elements used?
@@ -203,7 +209,7 @@ protected override void DrawCore(RenderDrawContext context)
         {
             UpdatePermutationParameters(context);
             UpdateParameters(context, context.RenderContext.RenderView);
-            
+
             // Get the render target attachments to sample from:
             Texture inputFrameBufferColorAttachment = GetSafeInput(ColorInputIndex);
             Texture inputFrameBufferDepthAttachment = GetSafeInput(DepthStencilInputIndex);
@@ -254,7 +260,7 @@ public void SetScatteringKernel(uint materialIndex, Vector4[] scatteringKernel)
             {
                 throw new Exception("Too many scattering materials present in order to be able to fit them all into a single array! Maximum count is " + MaxMaterialCount + ".");
             }
-            
+
             scatteringKernel.CopyTo(materialScatteringKernels, (int)materialIndex * SubsurfaceScatteringSettings.SamplesPerScatteringKernel2);   // Insert into the global scattering kernel array.
         }
 
@@ -267,7 +273,7 @@ public void SetScatteringKernel(uint materialIndex, Vector4[] scatteringKernel)
         [DefaultValue(true)]
         [Display("Follow surface")]
         public bool FollowSurface { get; set; } = true;
-        
+
         /// <userdoc>
         /// Specifies the number of times the blur should be executed.
         /// The higher the number of passes, the smoother the final result (less noise & banding).
@@ -277,7 +283,7 @@ public void SetScatteringKernel(uint materialIndex, Vector4[] scatteringKernel)
         [DataMemberRange(1, 10, 1, 1, 0)]
         [Display("Number of passes")]
         public int NumberOfPasses { get; set; } = 1;
-        
+
         /// <userdoc>
         // This reduces the banding artifacts caused by undersampling (visible on closeups) by introducing a bit of noise.
         // This might create a less mathematically correct falloff, since it messes with the sample offsets.
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurShader.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringBlurShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringRenderFeature.cs
index 5af7701284..295f31d265 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/SubsurfaceScattering/SubsurfaceScatteringRenderFeature.cs
@@ -185,7 +185,7 @@ public override void Prepare(RenderDrawContext context)
             //Dispatcher.ForEach(((RootEffectRenderFeature)RootRenderFeature).RenderNodes, (ref RenderNode renderNode) =>   // TODO: PERFORMANCE: Use this instead?
             foreach (RenderNode renderNode in ((RootEffectRenderFeature)RootRenderFeature).RenderNodes)
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                 if (perDrawLayout == null)
                 { 
                     continue;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOV.cs b/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOV.cs
new file mode 100644
index 0000000000..e5b451c69f
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOV.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.ComponentModel;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+
+namespace Xenko.Rendering.Images {
+    /// <summary>
+    /// A fog filter.
+    /// </summary>
+    [DataContract("VRFOV")]
+    [Display("VR FOV Reduction")]
+    public class VRFOV : ImageEffect {
+        private readonly ImageEffectShader vrfovFilter;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VRFOV"/> class.
+        /// </summary>
+        public VRFOV()
+            : this("VRFOVEffect") {
+            Enabled = false;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="VRFOV"/> class.
+        /// </summary>
+        /// <param name="brightPassShaderName">Name of the bright pass shader.</param>
+        public VRFOV(string ShaderName) : base(ShaderName) {
+            if (ShaderName == null) throw new ArgumentNullException("vrfovFilterName");
+            vrfovFilter = new ImageEffectShader(ShaderName);
+        }
+
+        [DataMember(10)]
+        public float Intensity { get; set; } = 1f;
+
+        [DataMember(20)]
+        public Color3 Color { get; set; } = new Color3(0f, 0f, 0f);
+
+        [DataMember(30)]
+        public float Radius { get; set; } = 0.5f;
+
+        [DataMember(40)]
+        public float VerticalScale { get; set; } = 1f;
+
+        protected override void InitializeCore() {
+            base.InitializeCore();
+            ToLoadAndUnload(vrfovFilter);
+        }
+
+        /// <summary>
+        /// Provides a color buffer and a depth buffer to apply the fog to.
+        /// </summary>
+        /// <param name="colorBuffer">A color buffer to process.</param>
+        /// <param name="depthBuffer">The depth buffer corresponding to the color buffer provided.</param>
+        public void SetColorInput(Texture colorBuffer) {
+            SetInput(0, colorBuffer);
+        }
+
+        protected override void SetDefaultParameters() {
+            Color = new Color3(0f, 0f, 0f);
+            Intensity = 1f;
+            Radius = 0.5f;
+            base.SetDefaultParameters();
+        }
+
+        protected override void DrawCore(RenderDrawContext context) {
+            Texture color = GetInput(0);
+            Texture output = GetOutput(0);
+            if (color == null || output == null) {
+                return;
+            }
+
+            vrfovFilter.Parameters.Set(VRFOVEffectKeys.Color, Color);
+
+            // scale these to more useful numbers
+            vrfovFilter.Parameters.Set(VRFOVEffectKeys.Radius, Radius * 0.5f);
+            vrfovFilter.Parameters.Set(VRFOVEffectKeys.Intensity, Intensity * 100f);
+            vrfovFilter.Parameters.Set(VRFOVEffectKeys.VerticalScale, VerticalScale * 0.5f);
+
+            vrfovFilter.SetInput(0, color);
+            vrfovFilter.SetOutput(output);
+            ((RendererBase)vrfovFilter).Draw(context);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOVEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOVEffect.cs
new file mode 100644
index 0000000000..cf9245adf3
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOVEffect.cs
@@ -0,0 +1,26 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    internal static partial class VRFOVEffectKeys
+    {
+        public static readonly ValueParameterKey<Color3> Color = ParameterKeys.NewValue<Color3>(new Color3(0f,0f,0f));
+        public static readonly ValueParameterKey<float> Radius = ParameterKeys.NewValue<float>(0.5f);
+        public static readonly ValueParameterKey<float> Intensity = ParameterKeys.NewValue<float>(1f);
+        public static readonly ValueParameterKey<float> VerticalScale = ParameterKeys.NewValue<float>(1f);
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOVEffect.xksl b/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOVEffect.xksl
new file mode 100644
index 0000000000..e1e44e5094
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Images/VRFOV/VRFOVEffect.xksl
@@ -0,0 +1,31 @@
+namespace Xenko.Rendering.Images
+{
+    /// <summary>
+    /// Simple fog
+    /// </summary>
+    internal shader VRFOVEffect : ImageEffectShader
+    {
+        stage float Intensity;
+        stage float Radius;
+        stage float VerticalScale;
+        stage float3 Color;
+
+        stage override float4 Shading() 
+        {
+            float4 color = Texture0.Sample(PointSampler, streams.TexCoord);
+
+            float centerDown = VerticalScale * (streams.TexCoord.y - 0.5);
+            float2 fromCenterVectorLeft = float2(streams.TexCoord.x - 0.25, centerDown);
+            float2 fromCenterVectorRight = float2(streams.TexCoord.x - 0.75, centerDown);
+            float squareDistanceToCenterLeft = dot(fromCenterVectorLeft, fromCenterVectorLeft);
+            float squareDistanceToCenterRight = dot(fromCenterVectorRight, fromCenterVectorRight);
+            float distanceToCenter = sqrt(min(squareDistanceToCenterLeft, squareDistanceToCenterRight));
+
+            float vignette = smoothstep(Radius, 1.0, distanceToCenter / 0.707);
+            vignette = clamp(Intensity * vignette, 0.0, 1.0);
+            color.rgb = color.rgb * (1.0 - vignette) + vignette * Color;
+
+            return color;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/LightProbes/BakeLightProbeShader.cs b/sources/engine/Xenko.Rendering/Rendering/LightProbes/BakeLightProbeShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/LightProbes/BakeLightProbeShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/LightProbes/BakeLightProbeShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/LightProbes/ComputeSphericalHarmonics.cs b/sources/engine/Xenko.Rendering/Rendering/LightProbes/ComputeSphericalHarmonics.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/LightProbes/ComputeSphericalHarmonics.cs
rename to sources/engine/Xenko.Rendering/Rendering/LightProbes/ComputeSphericalHarmonics.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/LightProbes/LightProbeShader.cs b/sources/engine/Xenko.Rendering/Rendering/LightProbes/LightProbeShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/LightProbes/LightProbeShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/LightProbes/LightProbeShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/LightProbes/XenkoBakeLightProbeEffect.cs b/sources/engine/Xenko.Rendering/Rendering/LightProbes/XenkoBakeLightProbeEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/LightProbes/XenkoBakeLightProbeEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/LightProbes/XenkoBakeLightProbeEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/ColorLightBase.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/ColorLightBase.cs
index c87f638019..1f3cbe2b84 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/ColorLightBase.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/ColorLightBase.cs
@@ -36,7 +36,7 @@ protected ColorLightBase()
         /// <returns>Gets the color of this light in linear space.</returns>
         public Color3 ComputeColor(ColorSpace colorSpace, float intensity)
         {
-            var color = (Color != null ? Color.ComputeColor() : new Color3(1.0f));
+            var color = (Color != null ? Color.ComputeColor() : Color3.White);
             color = color.ToColorSpace(colorSpace) * intensity;
             return color;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsUtils.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Images/SphericalHarmonics/SphericalHarmonicsUtils.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupArray.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupArray.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupArray.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupFixed.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupArray.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupFixed.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerDraw.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerDraw.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerDraw.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerDraw.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerView.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerView.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerView.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupPerView.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupFixed.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLight.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/DirectLightGroupFixed.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLight.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLight.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLightArray.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLight.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLightArray.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/ForwardLightingRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/ForwardLightingRenderFeature.cs
index efc5e53d57..97d032ab77 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/ForwardLightingRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/ForwardLightingRenderFeature.cs
@@ -23,11 +23,6 @@ namespace Xenko.Rendering.Lights
     /// </summary>
     public class ForwardLightingRenderFeature : SubRenderFeature
     {
-        /// <summary>
-        /// Property key to access the current collection of <see cref="CameraComponent"/> from <see cref="RenderContext.Tags"/>.
-        /// </summary>
-        public static readonly PropertyKey<RenderLightCollection> CurrentLights = new PropertyKey<RenderLightCollection>("ForwardLightingRenderFeature.CurrentLights", typeof(ForwardLightingRenderFeature));
-
         public class RenderViewLightData
         {
             /// <summary>
@@ -201,7 +196,7 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
             {
                 foreach (var lightShadowMapRenderer in ShadowMapRenderer.Renderers)
                 {
-                    var shadowMapEffectSlot = lightShadowMapRenderer != null ? ((RootEffectRenderFeature)RootRenderFeature).GetEffectPermutationSlot(lightShadowMapRenderer.ShadowCasterRenderStage) : EffectPermutationSlot.Invalid;
+                    var shadowMapEffectSlot = lightShadowMapRenderer != null && lightShadowMapRenderer.ShadowCasterRenderStage != null ? ((RootEffectRenderFeature)RootRenderFeature).GetEffectPermutationSlot(lightShadowMapRenderer.ShadowCasterRenderStage) : EffectPermutationSlot.Invalid;
                     ignoredEffectSlots.Add(shadowMapEffectSlot.Index);
                 }
             }
@@ -302,8 +297,8 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
                     if (renderEffect == null || !renderEffect.IsUsedDuringThisFrame(RenderSystem))
                         continue;
 
-                    renderEffect.EffectValidator.ValidateParameter(LightingKeys.DirectLightGroups, directLightShaders);
-                    renderEffect.EffectValidator.ValidateParameter(LightingKeys.EnvironmentLights, environmentLightShaders);
+                    renderEffect.EffectValidator.ValidateParameterThreaded(LightingKeys.DirectLightGroups, directLightShaders);
+                    renderEffect.EffectValidator.ValidateParameterThreaded(LightingKeys.EnvironmentLights, environmentLightShaders);
 
                     // Some light groups have additional effect permutation
                     foreach (var lightGroup in shaderPermutation.PermutationLightGroups)
@@ -410,10 +405,10 @@ public override void Prepare(RenderDrawContext context)
                     var renderNode = RootRenderFeature.GetRenderNode(renderNodeReference);
 
                     // Ignore fallback effects
-                    if (renderNode.RenderEffect.State != RenderEffectState.Normal)
+                    if (renderNode.RenderEffect?.State != RenderEffectState.Normal)
                         return;
 
-                    var drawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                    var drawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                     if (drawLayout == null)
                         return;
 
@@ -548,7 +543,7 @@ private void CollectVisibleLights()
                 renderViewLightData.VisibleLights.Clear();
                 renderViewLightData.VisibleLightsWithShadows.Clear();
 
-                var lights = Context.VisibilityGroup.Tags.Get(CurrentLights);
+                var lights = Context.Lights;
 
                 // No light processors means no light in the scene, so we can early exit
                 if (lights == null)
@@ -615,6 +610,10 @@ private void PrepareLightGroups(RenderDrawContext context, FastList<RenderView>
                 // Find lights
                 var lightCollection = activeRenderer.LightGroup.FindLightCollectionByGroup(group);
 
+                // Light collections aren't cleared (see ClearCache). Can be null after switching to empty scenes.
+                if (lightCollection is null)
+                    continue;
+
                 // Indices of lights in lightCollection that need processing
                 lightIndicesToProcess.Clear();
                 for (int i = 0; i < lightCollection.Count; i++)
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightAmbientRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightAmbientRenderer.cs
index 9124629d65..16bb758359 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightAmbientRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightAmbientRenderer.cs
@@ -79,7 +79,7 @@ public override void Reset()
                 {
                     for (int i = 0; i < AmbientColor.Length; i++)
                     {
-                        AmbientColor[i] = new Color3(0.0f);
+                        AmbientColor[i] = new Color3();
                     }
                 }
             }
@@ -93,7 +93,7 @@ public override void ApplyViewParameters(RenderDrawContext context, int viewInde
             {
                 base.ApplyViewParameters(context, viewIndex, parameters);
 
-                parameters.Set(ambientLightKey, AmbientColor[viewIndex]);
+                parameters.Set(ambientLightKey, ref AmbientColor[viewIndex]);
             }
         }
     }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClustered.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClustered.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightClustered.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightClustered.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.xksl
index d55ee2af11..dbdfd5f1f3 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.xksl
@@ -34,7 +34,7 @@ namespace Xenko.Rendering.Lights
         {
             // What we had so far was just a loop index
             // Note: we have lightIndex as a parameter but we ignore it since we want to preserve it between point and spot lights
-            int realLightIndex = LightIndices.Load(streams.lightIndex);
+            int realLightIndex = (LightIndices.Load(streams.lightIndex >> 2) >> ((streams.lightIndex & 3) << 3)) & 0xFF; // grab the right byte
             streams.lightIndex++;
 
             // Build PointLightData
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroupLinear.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroupLinear.xksl
new file mode 100644
index 0000000000..21c560e475
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointGroupLinear.xksl
@@ -0,0 +1,31 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Lights
+{
+    /// <summary>
+    /// Defines a group of point lights in clustered shading.
+    /// </summary>
+    shader LightClusteredPointGroupLinear : LightClusteredPointGroup, DirectLightGroup, LightClustered, LightPoint
+    {
+        /// <summary>
+        /// Compute the light color/direction for the specified index within this group
+        /// </summary>
+        override void PrepareDirectLightCore(int lightIndexIgnored)
+        {
+            // What we had so far was just a loop index
+            // Note: we have lightIndex as a parameter but we ignore it since we want to preserve it between point and spot lights
+            int realLightIndex = (LightIndices.Load(streams.lightIndex >> 2) >> ((streams.lightIndex & 3) << 3)) & 0xFF; // grab the right byte
+            streams.lightIndex++;
+
+            // Build PointLightData
+            PointLightDataInternal pointLight;
+            float4 pointLight1 = PointLights.Load(realLightIndex * 2);
+            float4 pointLight2 = PointLights.Load(realLightIndex * 2 + 1);
+            pointLight.PositionWS = pointLight1.xyz;
+            pointLight.InvSquareRadius = pointLight1.w;
+            pointLight.Color = pointLight2.xyz;
+
+            ProcessLightLinear(pointLight);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointSpotGroupRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointSpotGroupRenderer.cs
index d950b3073d..2847be35c7 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointSpotGroupRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredPointSpotGroupRenderer.cs
@@ -2,10 +2,14 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Threading;
 using Xenko.Core;
 using Xenko.Core.Collections;
 using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
 using Xenko.Engine;
 using Xenko.Graphics;
 using Xenko.Rendering.Shadows;
@@ -22,6 +26,8 @@ namespace Xenko.Rendering.Lights
     /// </remarks>
     public class LightClusteredPointSpotGroupRenderer : LightGroupRendererBase
     {
+        internal static bool UseLinearLighting = false;
+
         private readonly List<int> selectedLightIndices = new List<int>();
 
         private PointLightShaderGroupData pointGroup;
@@ -157,8 +163,7 @@ internal class PointLightShaderGroupData : LightShaderGroupDynamic
             // Artifically increase range of first slice to not waste too much slices in very short area
             public float SpecialNearPlane = 2.0f;
 
-            private FastListStruct<LightClusterLinkedNode> lightNodes = new FastListStruct<LightClusterLinkedNode>(8);
-            private FastListStruct<Int2> clusterInfos = new FastListStruct<Int2>(8);
+            private FastConcurrentCollector<int>[] lightNodes;
             private RenderViewInfo[] renderViewInfos;
             private Int2 maxClusterCount;
             //private Plane[] zPlanes;
@@ -167,7 +172,7 @@ public PointLightShaderGroupData(RenderContext renderContext, LightClusteredPoin
                 : base(renderContext, null)
             {
                 this.clusteredGroupRenderer = clusteredGroupRenderer;
-                ShaderSource = new ShaderClassSource("LightClusteredPointGroup");
+                ShaderSource = new ShaderClassSource(UseLinearLighting ? "LightClusteredPointGroupLinear" : "LightClusteredPointGroup");
             }
 
             protected override void UpdateLightCount()
@@ -175,7 +180,7 @@ protected override void UpdateLightCount()
                 base.UpdateLightCount();
 
                 var mixin = new ShaderMixinSource();
-                mixin.Mixins.Add(new ShaderClassSource("LightClusteredPointGroup"));
+                mixin.Mixins.Add(new ShaderClassSource(UseLinearLighting ? "LightClusteredPointGroupLinear" : "LightClusteredPointGroup"));
                 ShadowGroup?.ApplyShader(mixin);
 
                 ShaderSource = mixin;
@@ -198,7 +203,6 @@ public override void Reset()
                     {
                         renderViewInfos[i].PointLights.Clear();
                         renderViewInfos[i].SpotLights.Clear();
-                        renderViewInfos[i].LightIndices.Clear();
                     }
                 }
             }
@@ -218,7 +222,6 @@ public override void SetViews(FastList<RenderView> views)
                         // first time
                         renderViewInfos[i].PointLights = new FastListStruct<PointLightData>(8);
                         renderViewInfos[i].SpotLights = new FastListStruct<SpotLightData>(8);
-                        renderViewInfos[i].LightIndices = new FastListStruct<int>(8);
                     }
 
                     renderViewInfos[i].RenderView = views[i];
@@ -278,15 +281,6 @@ public void ComputeViewParameter(int viewIndex)
                 //    zPlanes[z].Normalize();
                 //}
 
-                // Initialize cluster with no light (-1)
-                for (int i = 0; i < maxClusterCount.X * maxClusterCount.Y * ClusterSlices; ++i)
-                {
-                    lightNodes.Add(new LightClusterLinkedNode(InternalLightType.Point, -1, -1));
-                }
-
-                // List of clusters moved by this light
-                var movedClusters = new Dictionary<LightClusterLinkedNode, int>();
-
                 // Try to use SpecialNearPlane to not waste too much slices in very small depth
                 // Make sure we don't go to more than 10% of max depth
                 var nearPlane = Math.Max(Math.Min(SpecialNearPlane, renderView.FarClipPlane * 0.1f), renderView.NearClipPlane);
@@ -299,33 +293,61 @@ public void ComputeViewParameter(int viewIndex)
                 float clusterDepthScale = renderViewInfo.ClusterDepthScale = (float)(Math.Pow(2.0f, ClusterSlices) - 2.0f) / (renderView.FarClipPlane - nearPlane);
                 float clusterDepthBias = renderViewInfo.ClusterDepthBias = 2.0f - clusterDepthScale * nearPlane;
 
-                //---------------- SPOT LIGHTS -------------------
-                var lightRange = clusteredGroupRenderer.spotGroup.LightRanges[viewIndex];
-                for (int i = lightRange.Start; i < lightRange.End; ++i)
+                // count lights
+                var pointLightRanges = lightRanges[viewIndex];
+                int totalLights = pointLightRanges.End - pointLightRanges.Start;
+
+                var spotLightRanges = clusteredGroupRenderer.spotGroup.LightRanges[viewIndex];
+                totalLights += spotLightRanges.End - spotLightRanges.Start;
+
+                // make sure we have enough lists
+                if (lightNodes == null || lightNodes.Length < totalClusterCount)
                 {
-                    var light = clusteredGroupRenderer.spotGroup.Lights[i].Light;
-                    var spotLight = (LightSpot)light.Type;
+                    int nodesize = Math.Max(totalLights, 16);
+                    lightNodes = new FastConcurrentCollector<int>[totalClusterCount];
+                    for (int i = 0; i < totalClusterCount; i++)
+                        lightNodes[i] = new FastConcurrentCollector<int>(nodesize);
+                }
+                else if (lightNodes[0].Capacity < totalLights)
+                {
+                    for (int i = 0; i < totalClusterCount; i++)
+                        lightNodes[i] = new FastConcurrentCollector<int>(totalLights);
+                }
 
-                    // Create spot light data
-                    var spotLightData = new SpotLightData
+                //---------------- POINT LIGHTS -------------------
+
+                // make point light data
+                for (int i = pointLightRanges.Start; i < pointLightRanges.End; i++)
+                {
+                    var light = lights[i].Light;
+                    var pointLight = (LightPoint)light.Type;
+
+                    // Create point light data
+                    var pointLightData = new PointLightData
                     {
                         PositionWS = light.Position,
-                        DirectionWS = light.Direction,
-                        AngleOffsetAndInvSquareRadius = new Vector3(spotLight.LightAngleScale, spotLight.LightAngleOffset, spotLight.InvSquareRange),
+                        InvSquareRadius = pointLight.InvSquareRadius,
                         Color = light.Color,
                     };
 
-                    // Fill list of spot lights
-                    renderViewInfo.SpotLights.Add(spotLightData);
+                    renderViewInfo.PointLights.Add(pointLightData);
+                }
 
-                    movedClusters.Clear();
+                Xenko.Core.Threading.Dispatcher.For(pointLightRanges.Start, pointLightRanges.End, (i) =>
+                {
+                    var light = lights[i].Light;
+                    var pointLight = (LightPoint)light.Type;
+                    int lightIndex = i - pointLightRanges.Start;
+                    var pointLightData = renderViewInfos[viewIndex].PointLights[lightIndex];
 
-                    var radius = (float)Math.Sqrt(1.0f / spotLightData.AngleOffsetAndInvSquareRadius.Z);
+                    var radius = LightClusteredPointSpotGroupRenderer.UseLinearLighting ? pointLightData.InvSquareRadius : (float)Math.Sqrt(1.0f / pointLightData.InvSquareRadius);
 
                     Vector3 positionVS;
-                    Vector3.TransformCoordinate(ref spotLightData.PositionWS, ref renderView.View, out positionVS);
+                    Vector3.TransformCoordinate(ref pointLightData.PositionWS, ref renderView.View, out positionVS);
+
+                    //Vector3 positionScreen;
+                    //Vector3.TransformCoordinate(ref pointLightData.PositionWS, ref renderView.ViewProjection, out positionScreen);
 
-                    // TODO: culling (first do it on PointLight, then backport it to SpotLight and improve for SpotLight case)
                     // Find x/y ranges
                     Vector2 clipMin, clipMax;
                     ComputeClipRegion(positionVS, radius, ref renderView.Projection, out clipMin, out clipMax);
@@ -339,49 +361,68 @@ public void ComputeViewParameter(int viewIndex)
                     var startZ = -positionVS.Z - radius;
                     var endZ = -positionVS.Z + radius;
 
+                    //var centerZ = (int)(positionVS.Z * ClusterDepthScale + ClusterDepthBias);
                     var tileStartZ = MathUtil.Clamp((int)Math.Log(startZ * clusterDepthScale + clusterDepthBias, 2.0f), 0, ClusterSlices);
                     var tileEndZ = MathUtil.Clamp((int)Math.Log(endZ * clusterDepthScale + clusterDepthBias, 2.0f) + 1, 0, ClusterSlices);
 
+                    int myNode = lightIndex << 1;
+
                     for (int z = tileStartZ; z < tileEndZ; ++z)
                     {
+                        // TODO: Additional culling on x/y (to remove corner clusters)
+                        // See "Practical Clustered Shading" for details
+                        //if (z != centerZ)
+                        //{
+                        //    var plane = z < centerZ ? zPlanes[z + 1] : -zPlanes[z];
+                        //    
+                        //    positionScreen = Plane.DotCoordinate(ref plane, ref positionScreen, out )
+                        //}
+
+                        int zcc = z * clusterCountY;
                         for (int y = tileStartY; y < tileEndY; ++y)
                         {
+                            int ycc = (y + zcc) * clusterCountX;
                             for (int x = tileStartX; x < tileEndX; ++x)
                             {
-                                AddLightToCluster(movedClusters, InternalLightType.Spot, i - lightRange.Start, x + (y + z * clusterCountY) * clusterCountX);
+                                lightNodes[x + ycc].Add(myNode);
                             }
                         }
                     }
-                }
+                });
 
-                //---------------- POINT LIGHTS -------------------
-                lightRange = lightRanges[viewIndex];
-                for (int i = lightRange.Start; i < lightRange.End; ++i)
+                //---------------- SPOT LIGHTS -------------------
+
+                // make spotlight data
+                for (int i = spotLightRanges.Start; i < spotLightRanges.End; i++)
                 {
-                    var light = lights[i].Light;
-                    var pointLight = (LightPoint)light.Type;
+                    var light = clusteredGroupRenderer.spotGroup.Lights[i].Light;
+                    var spotLight = (LightSpot)light.Type;
 
-                    // Create point light data
-                    var pointLightData = new PointLightData
+                    // Create spot light data
+                    var spotLightData = new SpotLightData
                     {
                         PositionWS = light.Position,
-                        InvSquareRadius = pointLight.InvSquareRadius,
+                        DirectionWS = light.Direction,
+                        AngleOffsetAndInvSquareRadius = new Vector3(spotLight.LightAngleScale, spotLight.LightAngleOffset, spotLight.InvSquareRange),
                         Color = light.Color,
                     };
 
-                    // Fill list of point lights
-                    renderViewInfo.PointLights.Add(pointLightData);
+                    renderViewInfo.SpotLights.Add(spotLightData);
+                }
 
-                    movedClusters.Clear();
+                Xenko.Core.Threading.Dispatcher.For(spotLightRanges.Start, spotLightRanges.End, (i) =>
+                {
+                    var light = clusteredGroupRenderer.spotGroup.Lights[i].Light;
+                    var spotLight = (LightSpot)light.Type;
+                    int lightIndex = i - spotLightRanges.Start;
+                    var spotLightData = renderViewInfos[viewIndex].SpotLights[lightIndex];
 
-                    var radius = (float)Math.Sqrt(1.0f / pointLightData.InvSquareRadius);
+                    var radius = UseLinearLighting ? spotLightData.AngleOffsetAndInvSquareRadius.Z : (float)Math.Sqrt(1.0f / spotLightData.AngleOffsetAndInvSquareRadius.Z);
 
                     Vector3 positionVS;
-                    Vector3.TransformCoordinate(ref pointLightData.PositionWS, ref renderView.View, out positionVS);
-
-                    //Vector3 positionScreen;
-                    //Vector3.TransformCoordinate(ref pointLightData.PositionWS, ref renderView.ViewProjection, out positionScreen);
+                    Vector3.TransformCoordinate(ref spotLightData.PositionWS, ref renderView.View, out positionVS);
 
+                    // TODO: culling (first do it on PointLight, then backport it to SpotLight and improve for SpotLight case)
                     // Find x/y ranges
                     Vector2 clipMin, clipMax;
                     ComputeClipRegion(positionVS, radius, ref renderView.Projection, out clipMin, out clipMax);
@@ -395,48 +436,77 @@ public void ComputeViewParameter(int viewIndex)
                     var startZ = -positionVS.Z - radius;
                     var endZ = -positionVS.Z + radius;
 
-                    //var centerZ = (int)(positionVS.Z * ClusterDepthScale + ClusterDepthBias);
                     var tileStartZ = MathUtil.Clamp((int)Math.Log(startZ * clusterDepthScale + clusterDepthBias, 2.0f), 0, ClusterSlices);
                     var tileEndZ = MathUtil.Clamp((int)Math.Log(endZ * clusterDepthScale + clusterDepthBias, 2.0f) + 1, 0, ClusterSlices);
 
+                    var myNode = 1 | (lightIndex << 1);
+
                     for (int z = tileStartZ; z < tileEndZ; ++z)
                     {
-                        // TODO: Additional culling on x/y (to remove corner clusters)
-                        // See "Practical Clustered Shading" for details
-                        //if (z != centerZ)
-                        //{
-                        //    var plane = z < centerZ ? zPlanes[z + 1] : -zPlanes[z];
-                        //    
-                        //    positionScreen = Plane.DotCoordinate(ref plane, ref positionScreen, out )
-                        //}
-
+                        int zcc = z * clusterCountY;
                         for (int y = tileStartY; y < tileEndY; ++y)
                         {
+                            int ycc = (y + zcc) * clusterCountX;
                             for (int x = tileStartX; x < tileEndX; ++x)
                             {
-                                AddLightToCluster(movedClusters, InternalLightType.Point, i - lightRange.Start, x + (y + z * clusterCountY) * clusterCountX);
+                                lightNodes[x + ycc].Add(myNode);
                             }
                         }
                     }
-                }
+                });
 
-                // Finish clusters by making their last element unique and building clusterInfos
-                movedClusters.Clear();
-                for (int i = 0; i < totalClusterCount; ++i)
-                {
-                    FinishCluster(movedClusters, ref renderViewInfo.LightIndices, i);
-                }
+                // setup for a fast indicies calculation (makes for a bigger indicies list, but it is super fast generating it)
+                int clustersPerThread = 1 + (totalClusterCount / Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism);
+                renderViewInfo.LightIndicesCount = totalClusterCount * totalLights;
+                if (renderViewInfo.LightIndices == null || renderViewInfo.LightIndices.Length < renderViewInfo.LightIndicesCount)
+                    renderViewInfo.LightIndices = new byte[renderViewInfo.LightIndicesCount];
 
-                // Prepare light clusters
-                for (int i = 0; i < totalClusterCount; ++i)
+                Xenko.Core.Threading.Dispatcher.For(0, Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism, (thread) =>
                 {
-                    var clusterId = lightNodes[i].NextNode;
-                    renderViewInfo.LightClusters[i] = clusterId != -1 ? clusterInfos[clusterId] : new Int2(0, 0);
-                }
+                    for (int clusterIndex = thread * clustersPerThread; clusterIndex < (thread + 1) * clustersPerThread && clusterIndex < totalClusterCount; clusterIndex++)
+                    {
+                        ref var rvinfo = ref renderViewInfos[viewIndex];
+                        ref var lnds = ref lightNodes[clusterIndex];
+
+                        if (lnds.Count == 0)
+                        {
+                            rvinfo.LightClusters[clusterIndex] = Int2.Zero;
+                            continue;
+                        }
+
+                        // Build light indices
+                        int pointLightCounter = 0;
+                        int spotLightCounter = 0;
+                        int indexStart = clusterIndex * totalLights;
+
+                        for (int i=0; i<lnds.Count; i++)
+                        {
+                            int cluster = lnds.Collected[i];
+
+                            rvinfo.LightIndices[indexStart + i] = (byte)(cluster >> 1);
 
-                // Clear data
-                lightNodes.Clear();
-                clusterInfos.Clear();
+                            switch (cluster & 1)
+                            {
+                                case 0:
+                                    pointLightCounter++;
+                                    break;
+                                case 1:
+                                    spotLightCounter++;
+                                    break;
+                            }
+                        }
+
+                        lnds.Clear();
+
+                        // Add new light cluster range
+                        // Stored in the format:
+                        //   x          = start_index
+                        //   y & 0xFFFF = point_light_count
+                        //   y >> 16    =  spot_light_count
+                        rvinfo.LightClusters[clusterIndex].X = indexStart;
+                        rvinfo.LightClusters[clusterIndex].Y = pointLightCounter | (spotLightCounter << 16);
+                    }
+                });
             }
 
             public unsafe void ComputeViewsParameter(RenderDrawContext drawContext)
@@ -456,16 +526,16 @@ public unsafe void ComputeViewsParameter(RenderDrawContext drawContext)
                     var renderViewInfo = renderViewInfos[viewIndex];
 
                     // Update sizes
-                    maxLightIndicesCount = Math.Max(maxLightIndicesCount, renderViewInfo.LightIndices.Count);
+                    maxLightIndicesCount = Math.Max(maxLightIndicesCount, renderViewInfo.LightIndicesCount);
                     maxPointLightsCount = Math.Max(maxPointLightsCount, renderViewInfo.PointLights.Count);
                     maxSpotLightsCount = Math.Max(maxSpotLightsCount, renderViewInfo.SpotLights.Count);
                 }
 
                 // (Re)allocate buffers if necessary
-                if (maxLightIndicesCount > 0 && (clusteredGroupRenderer.lightIndicesBuffer == null || clusteredGroupRenderer.lightIndicesBuffer.SizeInBytes < maxLightIndicesCount * sizeof(int)))
+                if (maxLightIndicesCount > 0 && (clusteredGroupRenderer.lightIndicesBuffer == null || clusteredGroupRenderer.lightIndicesBuffer.SizeInBytes < maxLightIndicesCount * sizeof(byte)))
                 {
                     clusteredGroupRenderer.lightIndicesBuffer?.Dispose();
-                    clusteredGroupRenderer.lightIndicesBuffer = Buffer.New(drawContext.GraphicsDevice, MathUtil.NextPowerOfTwo(maxLightIndicesCount * sizeof(int)), 0, BufferFlags.ShaderResource, PixelFormat.R32_UInt);
+                    clusteredGroupRenderer.lightIndicesBuffer = Buffer.New(drawContext.GraphicsDevice, MathUtil.NextPowerOfTwo(maxLightIndicesCount * sizeof(byte)), 0, BufferFlags.ShaderResource, PixelFormat.R32_UInt);
                 }
                 if (maxPointLightsCount > 0 && (clusteredGroupRenderer.pointLightsBuffer == null || clusteredGroupRenderer.pointLightsBuffer.SizeInBytes < maxPointLightsCount * sizeof(PointLightData)))
                 {
@@ -553,10 +623,10 @@ public override unsafe void UpdateViewResources(RenderDrawContext context, int v
                 }
 #endif
                 // LightIndices: Ensure size and update
-                if (renderViewInfo.LightIndices.Count > 0)
+                if (renderViewInfo.LightIndicesCount > 0)
                 {
-                    fixed (int* lightIndicesPtr = renderViewInfo.LightIndices.Items)
-                        context.CommandList.UpdateSubresource(clusteredGroupRenderer.lightIndicesBuffer, 0, new DataBox((IntPtr)lightIndicesPtr, 0, 0), new ResourceRegion(0, 0, 0, renderViewInfo.LightIndices.Count * sizeof(int), 1, 1));
+                    fixed (byte* lightIndicesPtr = renderViewInfo.LightIndices)
+                        context.CommandList.UpdateSubresource(clusteredGroupRenderer.lightIndicesBuffer, 0, new DataBox((IntPtr)lightIndicesPtr, 0, 0), new ResourceRegion(0, 0, 0, renderViewInfo.LightIndicesCount * sizeof(byte), 1, 1));
                 }
 #if XENKO_PLATFORM_MACOS
                 // See previous macOS comment.
@@ -568,75 +638,33 @@ public override unsafe void UpdateViewResources(RenderDrawContext context, int v
 #endif
             }
 
-            private void FinishCluster(Dictionary<LightClusterLinkedNode, int> movedClusters, ref FastListStruct<int> lightIndices, int clusterIndex)
+            private struct IndexPattern : IEquatable<IndexPattern>
             {
-                var clusterId = -1;
-                if (lightNodes.Items[clusterIndex].LightIndex != -1)
-                {
-                    var movedCluster = lightNodes.Items[clusterIndex];
-
-                    // Try to check if same linked-list doesn't already exist
-                    if (!movedClusters.TryGetValue(movedCluster, out clusterId))
-                    {
-                        // First time, let's add it
-                        clusterId = movedClusters.Count;
-                        movedClusters.Add(movedCluster, clusterId);
-
-                        int lightIndex = lightNodes.Count;
-                        lightNodes.Add(movedCluster);
-
-                        // Build light indices
-                        int pointLightCounter = 0;
-                        int spotLightCounter = 0;
-
-                        while (lightIndex != -1)
-                        {
-                            movedCluster = lightNodes[lightIndex];
-                            lightIndices.Add(movedCluster.LightIndex);
-                            switch (movedCluster.LightType)
-                            {
-                                case InternalLightType.Point:
-                                    pointLightCounter++;
-                                    break;
-                                case InternalLightType.Spot:
-                                    spotLightCounter++;
-                                    break;
-                            }
-                            lightIndex = movedCluster.NextNode;
-                        }
+                public List<int> pattern;
 
-                        // Add new light cluster range
-                        // Stored in the format:
-                        //   x          = start_index
-                        //   y & 0xFFFF = point_light_count
-                        //   y >> 16    =  spot_light_count
-                        clusterInfos.Add(new Int2(lightIndices.Count - pointLightCounter - spotLightCounter, pointLightCounter | (spotLightCounter << 16)));
-                    }
+                public bool Equals(IndexPattern other)
+                {
+                    if (other.pattern.Count != pattern.Count) return false;
+                    for (int i = 0; i < pattern.Count; i++)
+                        if (pattern[i] != other.pattern[i]) return false;
+                    return true;
                 }
 
-                // Last pass: store cluster id (instead of next node)
-                lightNodes.Items[clusterIndex] = new LightClusterLinkedNode(InternalLightType.Point, -1, clusterId);
-            }
+                public override bool Equals(object obj)
+                {
+                    return obj is IndexPattern ip && Equals(ip);
+                }
 
-            private void AddLightToCluster(Dictionary<LightClusterLinkedNode, int> movedClusters, InternalLightType lightType, int lightIndex, int clusterIndex)
-            {
-                var nextNode = -1;
-                if (lightNodes.Items[clusterIndex].LightIndex != -1)
+                public override int GetHashCode()
                 {
-                    var movedCluster = lightNodes.Items[clusterIndex];
-                    
-                    // Try to check if same linked-list doesn't already exist
-                    if (!movedClusters.TryGetValue(movedCluster, out nextNode))
+                    unchecked
                     {
-                        // First time, let's add it
-                        nextNode = lightNodes.Count;
-                        movedClusters.Add(movedCluster, nextNode);
-                        lightNodes.Add(movedCluster);
+                        int res = pattern.Count * 857;
+                        for (int i = 0; i < pattern.Count; i++)
+                            res ^= pattern[i] * 257 * (i + 1);
+                        return res;
                     }
                 }
-
-                // Replace new linked-list head
-                lightNodes.Items[clusterIndex] = new LightClusterLinkedNode(lightType, lightIndex, nextNode);
             }
 
             private static void UpdateClipRegionRoot(
@@ -704,43 +732,6 @@ private static void ComputeClipRegion(Vector3 lightPosView, float lightRadius, r
                 UpdateClipRegion(lightPosView.Y, -lightPosView.Z, lightRadius, projection.M22, projection.M32, ref clipMin.Y, ref clipMax.Y);
             }
 
-            // Single linked list of lights (stored in an array)
-            private struct LightClusterLinkedNode : IEquatable<LightClusterLinkedNode>
-            {
-                public readonly InternalLightType LightType;
-                public readonly int LightIndex;
-                public readonly int NextNode;
-
-                public LightClusterLinkedNode(InternalLightType lightType, int lightIndex, int nextNode)
-                {
-                    LightType = lightType;
-                    LightIndex = lightIndex;
-                    NextNode = nextNode;
-                }
-
-                public bool Equals(LightClusterLinkedNode other)
-                {
-                    return LightType == other.LightType && LightIndex == other.LightIndex && NextNode == other.NextNode;
-                }
-
-                public override bool Equals(object obj)
-                {
-                    if (ReferenceEquals(null, obj)) return false;
-                    return obj is LightClusterLinkedNode && Equals((LightClusterLinkedNode)obj);
-                }
-
-                public override int GetHashCode()
-                {
-                    unchecked
-                    {
-                        var hashCode = (int)LightType;
-                        hashCode = (hashCode * 397) ^ LightIndex;
-                        hashCode = (hashCode * 397) ^ NextNode;
-                        return hashCode;
-                    }
-                }
-            }
-
             private struct RenderViewInfo
             {
                 public RenderView RenderView;
@@ -750,7 +741,8 @@ private struct RenderViewInfo
 
                 public FastListStruct<PointLightData> PointLights;
                 public FastListStruct<SpotLightData> SpotLights;
-                public FastListStruct<int> LightIndices;
+                public byte[] LightIndices;
+                public int LightIndicesCount;
                 public Int2[] LightClusters;
                 public Int2 ClusterCount;
             }
@@ -761,7 +753,7 @@ private class PointSpotShaderGroupData : LightShaderGroupDynamic
             public PointSpotShaderGroupData(RenderContext renderContext)
                 : base(renderContext, null)
             {
-                ShaderSource = new ShaderClassSource("LightClusteredSpotGroup");
+                ShaderSource = new ShaderClassSource(UseLinearLighting ? "LightClusteredSpotGroupLinear" : "LightClusteredSpotGroup");
             }
 
             // Makes LightRanges and Lights public
@@ -769,11 +761,5 @@ public PointSpotShaderGroupData(RenderContext renderContext)
 
             public FastListStruct<LightDynamicEntry> Lights => lights;
         }
-
-        private enum InternalLightType
-        {
-            Point,
-            Spot,
-        }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.xksl
index 201b0db9a9..f2143f73d7 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.xksl
@@ -33,7 +33,7 @@ namespace Xenko.Rendering.Lights
         {
             // What we had so far was just a loop index
             // Note: we have lightIndex as a parameter but we ignore it since we want to preserve it between point and spot lights
-            int realLightIndex = LightIndices.Load(streams.lightIndex);
+            int realLightIndex = (LightIndices.Load(streams.lightIndex >> 2) >> ((streams.lightIndex & 3) << 3)) & 0xFF; // grab the right byte
             streams.lightIndex++;
 
             // Build SpotLightData
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroupLinear.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroupLinear.xksl
new file mode 100644
index 0000000000..19e0ad2c9c
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightClusteredSpotGroupLinear.xksl
@@ -0,0 +1,40 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Lights
+{
+    /// <summary>
+    /// Defines a group of spot lights in clustered shading.
+    /// </summary>
+    shader LightClusteredSpotGroupLinear :
+        LightClusteredSpotGroup,
+        DirectLightGroup,
+        LightClustered,
+        LightSpot,  // Required for "ProcessLight()".
+        SpotLightDataInternalShader    // Required for "SpotLightDataInternal"
+    {
+        /// <summary>
+        /// Compute the light color/direction for the specified index within this group
+        /// </summary>
+        override void PrepareDirectLightCore(int lightIndexIgnored)
+        {
+            // What we had so far was just a loop index
+            // Note: we have lightIndex as a parameter but we ignore it since we want to preserve it between point and spot lights
+            int realLightIndex = (LightIndices.Load(streams.lightIndex >> 2) >> ((streams.lightIndex & 3) << 3)) & 0xFF; // grab the right byte
+            streams.lightIndex++;
+
+            // Build SpotLightData
+            SpotLightDataInternal spotLight;
+            float4 spotLight1 = SpotLights.Load(realLightIndex * 4);
+            float4 spotLight2 = SpotLights.Load(realLightIndex * 4 + 1);
+            float4 spotLight3 = SpotLights.Load(realLightIndex * 4 + 2);
+            float4 spotLight4 = SpotLights.Load(realLightIndex * 4 + 3);
+            spotLight.PositionWS = spotLight1.xyz;
+            spotLight.DirectionWS = spotLight2.xyz;
+            spotLight.AngleOffsetAndInvSquareRadius = spotLight3.xyz;
+            spotLight.Color = spotLight4.xyz;
+
+            // Perform lighting
+            ProcessLightLinear(spotLight);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLightArray.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectional.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/EnvironmentLightArray.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectional.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroupRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroupRenderer.cs
index 06fb29bdd5..1aebc41e26 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroupRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalGroupRenderer.cs
@@ -35,8 +35,9 @@ public override LightShaderGroupDynamic CreateLightShaderGroup(RenderDrawContext
         private class DirectionalLightShaderGroup : LightShaderGroupDynamic
         {
             private ValueParameterKey<int> countKey;
+            [ThreadStatic]
+            private static FastListStruct<DirectionalLightData> lightsData;
             private ValueParameterKey<DirectionalLightData> lightsKey;
-            private FastListStruct<DirectionalLightData> lightsData = new FastListStruct<DirectionalLightData>(8);
 
             public DirectionalLightShaderGroup(RenderContext renderContext, ILightShadowMapShaderGroupData shadowGroupData)
                 : base(renderContext, shadowGroupData)
@@ -66,7 +67,13 @@ protected override void UpdateLightCount()
 
             public override void ApplyViewParameters(RenderDrawContext context, int viewIndex, ParameterCollection parameters)
             {
-                currentLights.Clear();
+                if (currentLights.Items == null)
+                {
+                    currentLights = new FastListStruct<LightDynamicEntry>(8);
+                }
+                else currentLights.Clear();
+                if (lightsData.Items == null) lightsData = new FastListStruct<DirectionalLightData>(8);
+
                 var lightRange = lightRanges[viewIndex];
                 for (int i = lightRange.Start; i < lightRange.End; ++i)
                     currentLights.Add(lights[i]);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalShadowMap.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalShadowMap.cs
index 8947967857..b7ffc5544c 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalShadowMap.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectionalShadowMap.cs
@@ -20,7 +20,7 @@ public class LightDirectionalShadowMap : LightShadowMap
         /// </summary>
         public LightDirectionalShadowMap()
         {
-            CascadeCount = LightShadowMapCascadeCount.FourCascades;
+            CascadeCount = LightShadowMapCascadeCount.OneCascade;
             DepthRange = new DepthRangeParameters();
             PartitionMode = new PartitionLogarithmic();
             StabilizationMode = LightShadowMapStabilizationMode.ProjectionSnapping;
@@ -32,7 +32,7 @@ public LightDirectionalShadowMap()
         /// <value>The number of cascades for this shadow.</value>
         /// <userdoc>The number of cascades for the shadows.</userdoc>
         [DataMember(50)]
-        [DefaultValue(LightShadowMapCascadeCount.FourCascades)]
+        [DefaultValue(LightShadowMapCascadeCount.OneCascade)]
         public LightShadowMapCascadeCount CascadeCount { get; set; }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.cs
index 6fc4958d86..d9d8b43e92 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.cs
@@ -53,7 +53,7 @@ public override bool HasBoundingBox
         public override bool Update(RenderLight light)
         {
             var range = Math.Max(0.001f, Radius);
-            InvSquareRadius = 1.0f / (range * range);
+            InvSquareRadius = LightClusteredPointSpotGroupRenderer.UseLinearLighting ? range : 1.0f / (range * range);
             return true;
         }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.xksl
index 50800f39b1..394a6307ee 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.xksl
@@ -23,6 +23,25 @@ namespace Xenko.Rendering.Lights
             float3 Color;
         };
 
+        void ProcessLightLinear(PointLightDataInternal light)
+        {
+            float3 lightVectorNorm;
+            float attenuation = ComputeAttenuationLinear(light, streams.PositionWS.xyz, lightVectorNorm);
+
+            streams.lightPositionWS = light.PositionWS;
+            streams.lightColor = light.Color * attenuation;
+            streams.lightDirectionWS = lightVectorNorm;
+        }
+
+        float ComputeAttenuationLinear(PointLightDataInternal light, float3 position, inout float3 lightVectorNorm)
+        {
+            float3 lightVector = light.PositionWS - position;
+            float lightVectorLength = length(lightVector);
+            lightVectorNorm = lightVector / lightVectorLength;
+
+            return max(0.0, 1.0 - (lightVectorLength / light.InvSquareRadius));
+        }
+
         void ProcessLight(PointLightDataInternal light)
         {
             float3 lightVectorNorm;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectional1.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightDirectional1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupLinear.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupLinear.xksl
new file mode 100644
index 0000000000..9bf1beb69b
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupLinear.xksl
@@ -0,0 +1,45 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Lights
+{
+    /// <summary>
+    /// Defines a group of point lights
+    /// </summary>
+    shader LightPointGroupLinear<int TMaxLightCount> : DirectLightGroupPerDraw, LightPoint
+    {
+        cbuffer PerDraw.Lighting
+        {
+            PointLightData Lights[TMaxLightCount];
+        }
+
+        override int GetMaxLightCount()
+        {
+            return TMaxLightCount;
+        }
+
+        /// <summary>
+        /// Compute the light color/direction for the specified index within this group
+        /// </summary>
+        override void PrepareDirectLightCore(int lightIndex)
+        {
+            // TODO: Workaraound for SPIR-V compiler. Revert later
+            PointLightDataInternal data;
+            data.PositionWS = Lights[lightIndex].PositionWS;
+            data.InvSquareRadius = Lights[lightIndex].InvSquareRadius;
+            data.Color = Lights[lightIndex].Color;
+
+            ProcessLightLinear(data);
+        }
+
+        override float ComputeAttenuation(float3 position, int lightIndex)
+        {
+            // TODO: Workaraound for SPIR-V compiler. Revert later
+            PointLightDataInternal data;
+            data.PositionWS = Lights[lightIndex].PositionWS;
+            data.InvSquareRadius = Lights[lightIndex].InvSquareRadius;
+
+            float3 lightVectorNorm;
+            return ComputeAttenuation(data, position, lightVectorNorm);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupLinear.xksl.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupLinear.xksl.cs
new file mode 100644
index 0000000000..9fcc6baa06
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupLinear.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Lights
+{
+    public static partial class LightPointGroupLinearKeys
+    {
+        public static readonly ValueParameterKey<PointLightData> Lights = ParameterKeys.NewValue<PointLightData>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupRenderer.cs
index c0d974c492..8ab5848064 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointGroupRenderer.cs
@@ -25,9 +25,9 @@ public override LightShaderGroupDynamic CreateLightShaderGroup(RenderDrawContext
         private class PointLightShaderGroup : LightShaderGroupDynamic
         {
             private ValueParameterKey<int> countKey;
+            [ThreadStatic]
+            private static FastListStruct<PointLightData> lightsData;
             private ValueParameterKey<PointLightData> lightsKey;
-            private FastListStruct<PointLightData> lightsData = new FastListStruct<PointLightData>(8);
-            private readonly object applyLock = new object();
 
             public PointLightShaderGroup(RenderContext renderContext, ILightShadowMapShaderGroupData shadowGroupData)
                 : base(renderContext, shadowGroupData)
@@ -39,7 +39,7 @@ public override void UpdateLayout(string compositionName)
                 base.UpdateLayout(compositionName);
 
                 countKey = DirectLightGroupPerDrawKeys.LightCount.ComposeWith(compositionName);
-                lightsKey = LightPointGroupKeys.Lights.ComposeWith(compositionName);
+                lightsKey = LightClusteredPointSpotGroupRenderer.UseLinearLighting ? LightPointGroupLinearKeys.Lights.ComposeWith(compositionName) : LightPointGroupKeys.Lights.ComposeWith(compositionName);
             }
 
             protected override void UpdateLightCount()
@@ -47,7 +47,7 @@ protected override void UpdateLightCount()
                 base.UpdateLightCount();
 
                 var mixin = new ShaderMixinSource();
-                mixin.Mixins.Add(new ShaderClassSource("LightPointGroup", LightCurrentCount));
+                mixin.Mixins.Add(new ShaderClassSource(LightClusteredPointSpotGroupRenderer.UseLinearLighting ? "LightPointGroupLinear" : "LightPointGroup", LightCurrentCount));
                 // Old fixed path kept in case we need it again later
                 //mixin.Mixins.Add(new ShaderClassSource("LightPointGroup", LightCurrentCount));
                 //mixin.Mixins.Add(new ShaderClassSource("DirectLightGroupFixed", LightCurrentCount));
@@ -67,44 +67,46 @@ public override int AddView(int viewIndex, RenderView renderView, int lightCount
 
             public override void ApplyDrawParameters(RenderDrawContext context, int viewIndex, ParameterCollection parameters, ref BoundingBoxExt boundingBox)
             {
-                // TODO THREADING: Make CurrentLights and lightData (thread-) local
-                lock (applyLock)
+                if (currentLights.Items == null)
                 {
-                    currentLights.Clear();
-                    var lightRange = lightRanges[viewIndex];
-                    for (int i = lightRange.Start; i < lightRange.End; ++i)
-                        currentLights.Add(lights[i]);
+                    currentLights = new FastListStruct<LightDynamicEntry>(8);
+                }
+                else currentLights.Clear();
+                if (lightsData.Items == null) lightsData = new FastListStruct<PointLightData>(8);
 
-                    base.ApplyDrawParameters(context, viewIndex, parameters, ref boundingBox);
+                var lightRange = lightRanges[viewIndex];
+                for (int i = lightRange.Start; i < lightRange.End; ++i)
+                    currentLights.Add(lights[i]);
 
-                    // TODO: Since we cull per object, we could maintain a higher number of allowed light than the shader support (i.e. 4 lights active per object even though the scene has many more of them)
-                    // TODO: Octree structure to select best lights quicker
-                    var boundingBox2 = (BoundingBox)boundingBox;
-                    foreach (var lightEntry in currentLights)
-                    {
-                        var light = lightEntry.Light;
+                base.ApplyDrawParameters(context, viewIndex, parameters, ref boundingBox);
+
+                // TODO: Since we cull per object, we could maintain a higher number of allowed light than the shader support (i.e. 4 lights active per object even though the scene has many more of them)
+                // TODO: Octree structure to select best lights quicker
+                var boundingBox2 = (BoundingBox)boundingBox;
+                foreach (var lightEntry in currentLights)
+                {
+                    var light = lightEntry.Light;
 
-                        if (light.BoundingBox.Intersects(ref boundingBox2))
+                    if (light.BoundingBox.Intersects(ref boundingBox2))
+                    {
+                        var pointLight = (LightPoint)light.Type;
+                        lightsData.Add(new PointLightData
                         {
-                            var pointLight = (LightPoint)light.Type;
-                            lightsData.Add(new PointLightData
-                            {
-                                PositionWS = light.Position,
-                                InvSquareRadius = pointLight.InvSquareRadius,
-                                Color = light.Color,
-                            });
-
-                            // Did we reach max number of simultaneous lights?
-                            // TODO: Still collect everything but sort by importance and remove the rest?
-                            if (lightsData.Count >= LightCurrentCount)
-                                break;
-                        }
+                            PositionWS = light.Position,
+                            InvSquareRadius = pointLight.InvSquareRadius,
+                            Color = light.Color,
+                        });
+
+                        // Did we reach max number of simultaneous lights?
+                        // TODO: Still collect everything but sort by importance and remove the rest?
+                        if (lightsData.Count >= LightCurrentCount)
+                            break;
                     }
-
-                    parameters.Set(countKey, lightsData.Count);
-                    parameters.Set(lightsKey, lightsData.Count, ref lightsData.Items[0]);
-                    lightsData.Clear();
                 }
+
+                parameters.Set(countKey, lightsData.Count);
+                parameters.Set(lightsKey, lightsData.Count, ref lightsData.Items[0]);
+                lightsData.Clear();
             }
         }
     }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointShadowMap.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointShadowMap.cs
index df3d9b130e..db38aa34c3 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointShadowMap.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightPointShadowMap.cs
@@ -18,5 +18,12 @@ public sealed class LightPointShadowMap : LightShadowMap
         /// </summary>
         [DefaultValue(LightPointShadowMapType.CubeMap)]
         public LightPointShadowMapType Type { get; set; } = LightPointShadowMapType.CubeMap;
+
+        /// <summary>
+        /// If you don't need shadows facing up or down, skip them here to speed up rendering
+        /// </summary>
+        [DataMember]
+        [DefaultValue(false)]
+        public bool SkipUpDownMaps { get; set; } = false;
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroup.cs
index eae4950e95..ef0360168d 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroup.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroup.cs
@@ -2,6 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System.Collections.Generic;
+using Xenko.Core.Collections;
 using Xenko.Core.Mathematics;
 using Xenko.Engine;
 using Xenko.Rendering.Shadows;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroupDynamic.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroupDynamic.cs
index 77f0a33474..0aa99e888f 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroupDynamic.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightShaderGroupDynamic.cs
@@ -26,7 +26,8 @@ public abstract class LightShaderGroupDynamic : LightShaderGroup
         /// <summary>
         /// List of lights selected for this rendering.
         /// </summary>
-        protected FastListStruct<LightDynamicEntry> currentLights = new FastListStruct<LightDynamicEntry>(8);
+        [ThreadStatic]
+        protected static FastListStruct<LightDynamicEntry> currentLights;
 
         public ILightShadowMapShaderGroupData ShadowGroup { get; }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSimpleAmbient.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSimpleAmbient.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSimpleAmbient.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSimpleAmbient.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxRenderer.cs
index 37ac4bfce3..97ca72322c 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxRenderer.cs
@@ -90,6 +90,8 @@ private class LightSkyBoxShaderGroup : LightShaderGroup
             private ObjectParameterKey<Texture> specularCubeMapkey;
             private ValueParameterKey<float> specularMipCountKey;
 
+            private Color3[] sphericalColors;
+
             public RenderLight Light { get; set; }
 
             public LightSkyBoxShaderGroup(ShaderSource mixin) : base(mixin)
@@ -122,8 +124,8 @@ public override void ApplyEffectPermutations(RenderEffect renderEffect)
                 var lightDiffuseColorShader = diffuseParameters.Get(SkyboxKeys.Shader) ?? EmptyComputeEnvironmentColorSource;
                 var lightSpecularColorShader = specularParameters.Get(SkyboxKeys.Shader) ?? EmptyComputeEnvironmentColorSource;
 
-                renderEffect.EffectValidator.ValidateParameter(lightDiffuseColorKey, lightDiffuseColorShader);
-                renderEffect.EffectValidator.ValidateParameter(lightSpecularColorKey, lightSpecularColorShader);
+                renderEffect.EffectValidator.ValidateParameterThreaded(lightDiffuseColorKey, lightDiffuseColorShader);
+                renderEffect.EffectValidator.ValidateParameterThreaded(lightSpecularColorKey, lightSpecularColorShader);
             }
 
             public override void ApplyViewParameters(RenderDrawContext context, int viewIndex, ParameterCollection parameters)
@@ -146,14 +148,13 @@ public override void ApplyViewParameters(RenderDrawContext context, int viewInde
                 {
                     specularCubemapLevels = specularCubemap.MipLevels;
                 }
-                var sphericalColors = diffuseParameters.GetValues(SphericalHarmonicsEnvironmentColorKeys.SphericalColors);
 
                 // global parameters
                 parameters.Set(intensityKey, intensity);
                 parameters.Set(skyMatrixKey, skyMatrix);
 
                 // This need to be working with new system
-                parameters.Set(sphericalColorsKey, sphericalColors);
+                diffuseParameters.CopyTo(SphericalHarmonicsEnvironmentColorKeys.SphericalColors, parameters, sphericalColorsKey);
                 parameters.Set(specularCubeMapkey, specularCubemap);
                 parameters.Set(specularMipCountKey, specularCubemapLevels);
             }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxShader.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSkyboxShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.cs
index 4ecc879ed8..c3d644ae9c 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.cs
@@ -63,7 +63,7 @@ public LightSpot()
         /// <value>The spot angle in degrees.</value>
         /// <userdoc>The angle of the main beam of the light spot.</userdoc>
         [DataMember(20)]
-        [DataMemberRange(0.01, 90, 1, 10, 1)]
+        [DataMemberRange(0.01, 180, 1, 10, 1)]
         [DefaultValue(30.0f)]
         public float AngleInner { get; set; }
 
@@ -73,7 +73,7 @@ public LightSpot()
         /// <value>The spot angle in degrees.</value>
         /// <userdoc>The angle of secondary beam of the light spot</userdoc>
         [DataMember(30)]
-        [DataMemberRange(0.01, 90, 1, 10, 1)]
+        [DataMemberRange(0.01, 180, 1, 10, 1)]
         [DefaultValue(35.0f)]
         public float AngleOuter { get; set; }
 
@@ -144,7 +144,7 @@ public LightSpot()
         public override bool Update(RenderLight light)
         {
             var range = Math.Max(0.001f, Range);
-            InvSquareRange = 1.0f / (range * range);
+            InvSquareRange = LightClusteredPointSpotGroupRenderer.UseLinearLighting ? range : 1.0f / (range * range);
             var innerAngle = Math.Min(AngleInner, AngleOuter);
             var outerAngle = Math.Max(AngleInner, AngleOuter);
             AngleOuterInRadians = MathUtil.DegreesToRadians(outerAngle);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.xksl
index 70c8bcb11a..271158277b 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.xksl
@@ -32,5 +32,18 @@ namespace Xenko.Rendering.Lights
             streams.lightColor = light.Color * attenuation;
             streams.lightDirectionWS = lightVectorNorm;
         }
+
+        void ProcessLightLinear(SpotLightDataInternal light)
+        {
+            float3 lightVectorNorm;
+            //float attenuation = ComputeAttenuation(light, streams.PositionWS.xyz, lightVectorNorm);
+            float attenuation = ComputeAttenuationLinear(light.PositionWS,  // TODO: Revert to the above line as soon as the shader compiler is fixed.
+                                                         light.AngleOffsetAndInvSquareRadius,
+                                                         light.DirectionWS,
+                                                         streams.PositionWS.xyz, lightVectorNorm);
+
+            streams.lightColor = light.Color * attenuation;
+            streams.lightDirectionWS = lightVectorNorm;
+        }
     };
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint1.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightPoint1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.xksl
index 9050222e1c..2c92486730 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.xksl
@@ -36,5 +36,33 @@ namespace Xenko.Rendering.Lights
             attenuation *= GetAngularAttenuation(lightVectorNorm, lightDirection, lightAngleAndOffset.x, lightAngleAndOffset.y);
             return attenuation;
         }
+
+        //override float ComputeAttenuation(SpotLightDataInternal light, float3 position, inout float3 lightVectorNorm)
+        float ComputeAttenuationLinear(float3 PositionWS, // TODO: Revert to the above line as soon as the shader compiler is fixed.
+                                       float3 AngleOffsetAndInvSquareRadius,
+                                       float3 DirectionWS,
+                                       float3 position,
+                                       inout float3 lightVectorNorm)   // This overload is a temporary fix for a compiler error rendering us unable to override "ComputeAttenution()".
+        {
+            // TODO: There's duplicate code here. See "LightSpotAttenuationRectangular".
+
+            //float3 lightVector = light.PositionWS - position;
+            float3 lightVector = PositionWS - position; // TODO: Revert to the above line as soon as the shader compiler is fixed.
+            float lightVectorLength = length(lightVector);
+            lightVectorNorm = lightVector / lightVectorLength;
+            
+            //float3 lightAngleOffsetAndInvSquareRadius = light.AngleOffsetAndInvSquareRadius;
+            float3 lightAngleOffsetAndInvSquareRadius = AngleOffsetAndInvSquareRadius;  // TODO: Revert to the above line as soon as the shader compiler is fixed.
+            float2 lightAngleAndOffset = lightAngleOffsetAndInvSquareRadius.xy;
+            float lightInvSquareRadius = lightAngleOffsetAndInvSquareRadius.z;
+
+            // TODO: Add support for disk based Directional light
+            //float3 lightDirection = -light.DirectionWS;
+            float3 lightDirection = -DirectionWS;   // TODO: Revert to the above line as soon as the shader compiler is fixed.
+            
+            float attenuation = max(0.0, 1.0 - (lightVectorLength / lightInvSquareRadius));
+            attenuation *= GetAngularAttenuation(lightVectorNorm, lightDirection, lightAngleAndOffset.x, lightAngleAndOffset.y);
+            return attenuation;
+        }
     };
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot1.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSpot1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationRectangular.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationDefault.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationRectangular.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupLinear.xksl b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupLinear.xksl
new file mode 100644
index 0000000000..fb07a28285
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupLinear.xksl
@@ -0,0 +1,54 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Lights
+{
+    /// <summary>
+    /// Defines a group of spot lights
+    /// </summary>
+    shader LightSpotGroupLinear<int TMaxLightCount> :
+        DirectLightGroupPerDraw,    // Required for "PrepareDirectLightCore()", "PrepareDirectLight()", "ComputeAttenuation()" and other stuff.
+        LightSpot,  // Required for "SpotLightData".
+        LightSpotAttenuationDefault    // Required for "ComputeAttenuation()"
+    {
+        cbuffer PerDraw.Lighting
+        {
+            SpotLightData Lights[TMaxLightCount];
+        }
+
+        override int GetMaxLightCount()
+        {
+            return TMaxLightCount;
+        }
+
+        /// <summary>
+        /// Compute the light color/direction for the specified index within this group
+        /// </summary>
+        override void PrepareDirectLightCore(int lightIndex)
+        {
+            // TODO: Workaraound for SPIR-V compiler. Revert later
+            SpotLightDataInternal data;
+            data.PositionWS = Lights[lightIndex].PositionWS;
+            data.DirectionWS = Lights[lightIndex].DirectionWS;
+            data.AngleOffsetAndInvSquareRadius = Lights[lightIndex].AngleOffsetAndInvSquareRadius;
+            data.Color = Lights[lightIndex].Color;
+
+            ProcessLightLinear(data);
+        }
+
+        override float ComputeAttenuation(float3 position, int lightIndex)
+        {
+            // TODO: Workaraound for SPIR-V compiler. Revert later
+            SpotLightDataInternal data;
+            data.PositionWS = Lights[lightIndex].PositionWS;
+            data.DirectionWS = Lights[lightIndex].DirectionWS;
+            data.AngleOffsetAndInvSquareRadius = Lights[lightIndex].AngleOffsetAndInvSquareRadius;
+
+            float3 lightVectorNorm;
+            //return ComputeAttenuation(data, position, lightVectorNorm);
+            return ComputeAttenuation(data.PositionWS,  // TODO: Revert to the above line as soon as the shader compiler is fixed.
+                                      data.AngleOffsetAndInvSquareRadius,
+                                      data.DirectionWS,
+                                      position, lightVectorNorm);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupLinearKeys.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupLinearKeys.cs
new file mode 100644
index 0000000000..a47a19d445
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupLinearKeys.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Lights
+{
+    public static partial class LightSpotGroupLinearKeys
+    {
+        public static readonly ValueParameterKey<SpotLightData> Lights = ParameterKeys.NewValue<SpotLightData>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupRenderer.cs
index de31f1e8b4..e47230a4ab 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotGroupRenderer.cs
@@ -347,9 +347,9 @@ public override string ToString()
         private class SpotLightShaderGroup : LightShaderGroupDynamic
         {
             private ValueParameterKey<int> countKey;
+            [ThreadStatic]
+            private static FastListStruct<SpotLightData> lightsData;
             private ValueParameterKey<SpotLightData> lightsKey;
-            private FastListStruct<SpotLightData> lightsData = new FastListStruct<SpotLightData>(8);
-            private readonly object applyLock = new object();
 
             public ITextureProjectionShaderGroupData TextureProjectionShaderGroupData { get; }
 
@@ -365,7 +365,8 @@ public override void UpdateLayout(string compositionName)
                 TextureProjectionShaderGroupData?.UpdateLayout(compositionName);
 
                 countKey = DirectLightGroupPerDrawKeys.LightCount.ComposeWith(compositionName);
-                lightsKey = LightSpotGroupKeys.Lights.ComposeWith(compositionName);
+                lightsKey = LightClusteredPointSpotGroupRenderer.UseLinearLighting ? LightSpotGroupLinearKeys.Lights.ComposeWith(compositionName) :
+                            LightSpotGroupKeys.Lights.ComposeWith(compositionName);
             }
 
             protected override void UpdateLightCount()
@@ -378,7 +379,7 @@ protected override void UpdateLightCount()
                 // Old fixed path kept in case we need it again later
                 //mixin.Mixins.Add(new ShaderClassSource("LightSpotGroup", LightCurrentCount));
                 //mixin.Mixins.Add(new ShaderClassSource("DirectLightGroupFixed", LightCurrentCount));
-                mixin.Mixins.Add(new ShaderClassSource("LightSpotGroup", LightCurrentCount));   // Add the base shader for the light group.
+                mixin.Mixins.Add(new ShaderClassSource(LightClusteredPointSpotGroupRenderer.UseLinearLighting ? "LightSpotGroupLinear" : "LightSpotGroup", LightCurrentCount));   // Add the base shader for the light group.
                 ShadowGroup?.ApplyShader(mixin);    // Add the shader for shadow mapping.
                 TextureProjectionShaderGroupData?.ApplyShader(mixin);   // Add the shader for texture projection.
 
@@ -396,46 +397,49 @@ public override int AddView(int viewIndex, RenderView renderView, int lightCount
 
             public override void ApplyDrawParameters(RenderDrawContext context, int viewIndex, ParameterCollection parameters, ref BoundingBoxExt boundingBox)
             {
-                // TODO THREADING: Make CurrentLights and lightData (thread-) local
-                lock (applyLock)
+                if (currentLights.Items == null)
                 {
-                    currentLights.Clear();
-                    var lightRange = lightRanges[viewIndex];
-                    for (int i = lightRange.Start; i < lightRange.End; ++i)
-                        currentLights.Add(lights[i]);
+                    currentLights = new FastListStruct<LightDynamicEntry>(8);
+                }
+                else currentLights.Clear();
+                if (lightsData.Items == null) lightsData = new FastListStruct<SpotLightData>(8);
 
-                    base.ApplyDrawParameters(context, viewIndex, parameters, ref boundingBox);
+                var lightRange = lightRanges[viewIndex];
+                for (int i = lightRange.Start; i < lightRange.End; ++i)
+                    currentLights.Add(lights[i]);
 
-                    // TODO: Octree structure to select best lights quicker
-                    var boundingBox2 = (BoundingBox)boundingBox;
-                    for (int i = 0; i < currentLights.Count; i++)
-                    {
-                        var light = currentLights[i].Light;
+                base.ApplyDrawParameters(context, viewIndex, parameters, ref boundingBox);
 
-                        if (light.BoundingBox.Intersects(ref boundingBox2))
+                // TODO: Octree structure to select best lights quicker
+                var boundingBox2 = (BoundingBox)boundingBox;
+                for (int i = 0; i < currentLights.Count; i++)
+                {
+                    var light = currentLights[i].Light;
+
+                    if (light.BoundingBox.Intersects(ref boundingBox2))
+                    {
+                        var spotLight = (LightSpot)light.Type;
+                        lightsData.Add(new SpotLightData
                         {
-                            var spotLight = (LightSpot)light.Type;
-                            lightsData.Add(new SpotLightData
-                            {
-                                PositionWS = light.Position,
-                                DirectionWS = light.Direction,
-                                AngleOffsetAndInvSquareRadius = new Vector3(spotLight.LightAngleScale, spotLight.LightAngleOffset, spotLight.InvSquareRange),
-                                Color = light.Color,
-                            });
-
-                            // Did we reach max number of simultaneous lights?
-                            // TODO: Still collect everything but sort by importance and remove the rest?
-                            if (lightsData.Count >= LightCurrentCount)
-                                break;
-                        }
+                            PositionWS = light.Position,
+                            DirectionWS = light.Direction,
+                            AngleOffsetAndInvSquareRadius = new Vector3(spotLight.LightAngleScale, spotLight.LightAngleOffset, spotLight.InvSquareRange),
+                            Color = light.Color,
+                        });
+
+                        // Did we reach max number of simultaneous lights?
+                        // TODO: Still collect everything but sort by importance and remove the rest?
+                        if (lightsData.Count >= LightCurrentCount)
+                            break;
                     }
+                }
 
-                    parameters.Set(countKey, lightsData.Count);
-                    parameters.Set(lightsKey, lightsData.Count, ref lightsData.Items[0]);
-                    lightsData.Clear();
+                parameters.Set(countKey, lightsData.Count);
+                parameters.Set(lightsKey, lightsData.Count, ref lightsData.Items[0]);
 
-                    TextureProjectionShaderGroupData?.ApplyDrawParameters(context, parameters, currentLights, ref boundingBox);
-                }
+                TextureProjectionShaderGroupData?.ApplyDrawParameters(context, parameters, currentLights, ref boundingBox);
+
+                lightsData.Clear();
             }
         }
     }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotTextureProjectionRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotTextureProjectionRenderer.cs
index fd89066b3c..e7d7934f91 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotTextureProjectionRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotTextureProjectionRenderer.cs
@@ -112,8 +112,7 @@ private static Matrix ComputeWorldToTextureUVMatrix(RenderLight light)
         {
             var spotLight = (LightSpot)light.Type;
 
-            Matrix viewMatrix = light.WorldMatrix;
-            viewMatrix.Invert();
+            Matrix.Invert(ref light.WorldMatrix, out var viewMatrix);
 
             // TODO: PERFORMANCE: This does redundant work. The view projection matrix is already calculated within "LightSpotShadowMapRenderer".
 
@@ -157,7 +156,7 @@ private static Matrix ComputeProjectorPlaneMatrix(RenderLight light)
             viewMatrix.M21 *= -height;
             viewMatrix.M22 *= -height;   // Invert the matrix so we don't have to do it in the shader.
             viewMatrix.M23 *= -height;
-            
+
             return viewMatrix; // Model matrix of the projector plane.
         }
 
@@ -179,8 +178,8 @@ public void Collect(RenderContext context, RenderView sourceView, LightShadowMap
         // TODO: Find a way to use this class!
         private class LightSpotTextureProjectionShaderData : ILightShadowMapShaderData
         {
-            public float ProjectiveTextureMipMapLevel; 
-            public Matrix WorldToTextureUV; 
+            public float ProjectiveTextureMipMapLevel;
+            public Matrix WorldToTextureUV;
         }
 
         public class LightSpotTextureProjectionGroupShaderData : ITextureProjectionShaderGroupData // TODO: Make private
@@ -264,7 +263,7 @@ public void ApplyDrawParameters(RenderDrawContext context, ParameterCollection p
                         /*
                         // TODO: Just save the shaderdata struct directly within "LightDynamicEntry"?
                         var singleLightData = (LightSpotTextureProjectionShaderData)lightEntry.ShadowMapTexture.ShaderData;   // TODO: This must not depend on the shadow map texture!
-                        
+
                         worldToTextureUV[lightIndex] = singleLightData.WorldToTextureUV;
                         projectionTextureMipMapLevels[lightIndex] = singleLightData.ProjectiveTextureMipMapLevel;
                         projectiveTexture = singleLightData.ProjectiveTexture;
@@ -286,11 +285,11 @@ public void ApplyDrawParameters(RenderDrawContext context, ParameterCollection p
                 }
 
                 // TODO: Why is this set if it's already in the collection?
-                // TODO: Does this get set once per group or something? 
+                // TODO: Does this get set once per group or something?
                 parameters.Set(projectiveTextureKey, lightParameters.ProjectionTexture);
                 parameters.Set(uvScale, lightParameters.UVScale);
                 parameters.Set(uvOffset, lightParameters.UVOffset);
-                parameters.Set(worldToProjectiveTextureUVsKey, worldToTextureUV); 
+                parameters.Set(worldToProjectiveTextureUVsKey, worldToTextureUV);
                 parameters.Set(projectorPlaneMatricesKey, projectorPlaneMatrices);
                 parameters.Set(projectionTextureMipMapLevelsKey, projectionTextureMipMapLevels);
                 parameters.Set(transitionAreasKey, transitionAreas);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationRectangular.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightSpotAttenuationRectangular.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightStream.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/LightUtil.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/LightUtil.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/LightUtil.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/SpotLightDataInternalShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/LightUtil.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/SpotLightDataInternalShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/SpotLightDataInternalShader.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionCommon.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/SpotLightDataInternalShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionCommon.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionCommon.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionFilterDefault.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionCommon.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionFilterDefault.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionFilterDefault.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionFilterDefault.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverBase.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverSpot.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverSpot.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/LogicalGroup.cs b/sources/engine/Xenko.Rendering/Rendering/LogicalGroup.cs
index 9d7219684b..f41067a430 100644
--- a/sources/engine/Xenko.Rendering/Rendering/LogicalGroup.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/LogicalGroup.cs
@@ -6,7 +6,7 @@ namespace Xenko.Rendering
 {
     /// <summary>
     /// Defines a group of descriptors and cbuffer range that are updated together.
-    /// It can be declared in shader using the syntax <c>cbuffer PerView_LogicalGroupName</c> (also works with <c>rgroup</c>).
+    /// It can be declared in shader using the syntax <c>cbuffer PerView.LogicalGroupName</c> (also works with <c>rgroup</c>).
     /// </summary>
     public struct LogicalGroup
     {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Material.cs b/sources/engine/Xenko.Rendering/Rendering/Material.cs
index 7f72aa87eb..65d6b37733 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Material.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Material.cs
@@ -26,6 +26,12 @@ public Material()
             Passes = new MaterialPassCollection(this);
         }
 
+        /// <summary>
+        /// Shortcut to getting the first pass's parameters
+        /// </summary>
+        [DataMemberIgnore]
+        public ParameterCollection BaseParameters => Passes[0].Parameters;
+
         /// <summary>
         /// The passes contained in this material (usually one).
         /// </summary>
@@ -38,6 +44,28 @@ public Material()
         [DataMemberIgnore]
         public MaterialDescriptor Descriptor { get; set; }
 
+        /// <summary>
+        /// Returns a new clone of this material
+        /// </summary>
+        /// <returns></returns>
+        public Material Clone() {
+            Material clone = new Material();
+            clone.Descriptor = Descriptor;
+            for(int i=0;i<Passes.Count;i++) {
+                MaterialPass p = Passes[i];
+                MaterialPass newp = new MaterialPass();
+                newp.BlendState = p.BlendState;
+                newp.CullMode = p.CullMode;
+                newp.HasTransparency = p.HasTransparency;
+                newp.IsLightDependent = p.IsLightDependent;
+                newp.PassIndex = p.PassIndex;
+                newp.TessellationMethod = p.TessellationMethod;
+                newp.Parameters = new ParameterCollection(p.Parameters);
+                clone.Passes.Add(newp);
+            }
+            return clone;
+        }
+
         /// <summary>
         /// Creates a new material from the specified descriptor.
         /// </summary>
@@ -49,7 +77,7 @@ public Material()
         public static Material New(GraphicsDevice device, MaterialDescriptor descriptor)
         {
             if (descriptor == null) throw new ArgumentNullException("descriptor");
-            var context = new MaterialGeneratorContext(new Material())
+            var context = new MaterialGeneratorContext(new Material(), device)
             {
                 GraphicsProfile = device.Features.RequestedProfile,
             };
diff --git a/sources/engine/Xenko.Rendering/Rendering/MaterialInstance.cs b/sources/engine/Xenko.Rendering/Rendering/MaterialInstance.cs
index 8502dd2f61..7b097a2036 100644
--- a/sources/engine/Xenko.Rendering/Rendering/MaterialInstance.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/MaterialInstance.cs
@@ -30,7 +30,6 @@ public MaterialInstance() : this(null)
         public MaterialInstance(Material material)
         {
             Material = material;
-            IsShadowCaster = true;
         }
 
         /// <summary>
@@ -42,16 +41,6 @@ public MaterialInstance(Material material)
         [InlineProperty]
         public Material Material { get; set; }
 
-        /// <summary>
-        /// Gets or sets if this instance is casting shadows.
-        /// </summary>
-        /// <value>A boolean indicating whether this instance is casting shadows. Default is <c>true</c>.</value>
-        /// <userdoc>Generate a shadow (when shadow maps are enabled)</userdoc>
-        [DataMember(20)]
-        [Display("Cast Shadows?")]
-        [DefaultValue(true)]
-        public bool IsShadowCaster { get; set; }
-
         /// <summary>
         /// Performs an explicit conversion from <see cref="Material"/> to <see cref="MaterialInstance"/>.
         /// </summary>
@@ -62,13 +51,15 @@ public static implicit operator MaterialInstance(Material material)
             return material == null ? null : new MaterialInstance(material);
         }
 
+        public static implicit operator Material(MaterialInstance mi) => mi.Material;
+
         public override bool Equals(object obj)
         {
             if (obj == null)
                 return false;
 
             var instance = (MaterialInstance)obj;
-            return Material == instance.Material && IsShadowCaster == instance.IsShadowCaster;
+            return Material == instance.Material;
         }
 
         public bool Equals(MaterialInstance other)
@@ -77,7 +68,7 @@ public bool Equals(MaterialInstance other)
                 return false;
             if (ReferenceEquals(this, other))
                 return true;
-            return Equals(Material, other.Material) && IsShadowCaster == other.IsShadowCaster;
+            return Equals(Material, other.Material);
         }
 
         public override int GetHashCode()
@@ -85,7 +76,6 @@ public override int GetHashCode()
             unchecked
             {
                 var hashCode = Material?.GetHashCode() ?? 0;
-                hashCode = (hashCode * 397) ^ IsShadowCaster.GetHashCode();
                 return hashCode;
             }
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/MaterialPass.cs b/sources/engine/Xenko.Rendering/Rendering/MaterialPass.cs
index d8b4aaa2f0..30010fe558 100644
--- a/sources/engine/Xenko.Rendering/Rendering/MaterialPass.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/MaterialPass.cs
@@ -59,6 +59,11 @@ public MaterialPass(ParameterCollection parameters)
         /// <value><c>true</c> if this instance has transparent; otherwise, <c>false</c>.</value>
         public bool HasTransparency { get; set; }
 
+        /// <summary>
+        /// Whether or not to use the alpha-to-coverage multisampling technique.
+        /// </summary>
+        public bool? AlphaToCoverage { get; set; }
+
         /// <summary>
         /// Determines if this material is affected by lighting.
         /// </summary>
@@ -73,4 +78,4 @@ public MaterialPass(ParameterCollection parameters)
         /// </remarks>
         public int PassIndex { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/IMaterialCelShadingLightFunction.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/IMaterialCelShadingLightFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/IMaterialCelShadingLightFunction.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/IMaterialCelShadingLightFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightDefault.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightDefault.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightDefault.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightDefault.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightRamp2.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightRamp.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightRamp2.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/CelShading/MaterialCelShadingLightRamp.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs
index 06c31be030..dc0fc3bd8e 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeBinaryBase.cs
@@ -82,8 +82,8 @@ public override IEnumerable<IComputeNode> GetChildren(object context = null)
 
         public override ShaderSource GenerateShaderSource(ShaderGeneratorContext context, MaterialComputeColorKeys baseKeys)
         {
-            var leftShaderSource = LeftChild.GenerateShaderSource(context, baseKeys);
-            var rightShaderSource = RightChild.GenerateShaderSource(context, baseKeys);
+            var leftShaderSource = LeftChild?.GenerateShaderSource(context, baseKeys);
+            var rightShaderSource = RightChild?.GenerateShaderSource(context, baseKeys);
 
             var shaderSource = new ShaderClassSource(GetCorrespondingShaderSourceName(Operator));
             var mixin = new ShaderMixinSource();
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColorParameter.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColorParameter.cs
index 2282c3a5dc..655243fe29 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColorParameter.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColorParameter.cs
@@ -104,7 +104,7 @@ public class ComputeColorParameterSampler : IComputeColorParameter
         /// The texture filtering mode.
         /// </summary>
         [DataMember(10)]
-        [DefaultValue(TextureFilter.Linear)]
+        [DefaultValue(TextureFilter.Anisotropic)]
         public TextureFilter Filtering { get; set; }
 
         /// <summary>
@@ -123,7 +123,7 @@ public class ComputeColorParameterSampler : IComputeColorParameter
 
         public ComputeColorParameterSampler()
         {
-            Filtering = TextureFilter.Linear;
+            Filtering = TextureFilter.Anisotropic;
             AddressModeU = TextureAddressMode.Wrap;
             AddressModeV = TextureAddressMode.Wrap;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd
index 7b8d1a84f7..bd0e0d1fd7 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeColors.cd
@@ -17,7 +17,7 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeBinaryColor" Collapsed="true">
     <Position X="8" Y="5.75" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAQAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeBinaryColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -33,7 +33,7 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeColor" Collapsed="true">
     <Position X="2" Y="7" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEAAAAAAAEAAAAAAAAAAAAAAAAAAIAAAAAAAA=</HashCode>
+      <HashCode>IAAAAAAEAAAAAIAEIAAAAAAABAAAAAAAAAIAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -49,7 +49,7 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeFloat4" Collapsed="true">
     <Position X="2" Y="8.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>IAAAAAAEAAQAAAAEIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeFloat4.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -72,14 +72,14 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeShaderClassBase&lt;T&gt;" Collapsed="true">
     <Position X="9.75" Y="4.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AACAAAAGAACIAAAEACAAAAAAAQAQQAAAAAAEgAAAgAA=</HashCode>
+      <HashCode>AAAAAAAGAAAAAAAEACAAAAAAAAAAQAAAAAAEAAAAgAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeShaderClassBase.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeShaderClassColor" Collapsed="true">
     <Position X="12" Y="5.75" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAgAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeShaderClassColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -95,14 +95,14 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeTextureBase" Collapsed="true">
     <Position X="4.25" Y="5.75" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAEAAAQAAAEAAIAAAAAAAACAAAQAAIAIAIAgAA=</HashCode>
+      <HashCode>AAAAAAAUAAAQAIAEAAIgAAAAAAACAAAQAAIAIAIAgAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeTextureBase.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeTextureColor" Collapsed="true">
     <Position X="5.5" Y="7" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>IAAIAAAQAgAQAAAAIAAAAAAAAAAAAAAAAAAAAAEAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeTextureColor.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -110,24 +110,24 @@
   <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeTextureScalar" Collapsed="true">
     <Position X="5.5" Y="8.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAgAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAIAAAwAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\ComputeColors\ComputeTextureScalar.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeStreamBase" Collapsed="true">
+  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeVertexStreamBase" Collapsed="true">
     <Position X="14.25" Y="4.25" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAEAAAEAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\ComputeColors\ComputeStreamBase.cs</FileName>
+      <FileName>Rendering\Materials\ComputeColors\ComputeVertexStreamBase.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeStreamColor" Collapsed="true">
+  <Class Name="Xenko.Rendering.Materials.ComputeColors.ComputeVertexStreamScalar" Collapsed="true">
     <Position X="16" Y="5.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\ComputeColors\ComputeStreamColor.cs</FileName>
+      <HashCode>AAAEAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Rendering\Materials\ComputeColors\ComputeVertexStreamScalar.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
@@ -156,15 +156,15 @@
   <Interface Name="Xenko.Rendering.Materials.IComputeColor" Collapsed="true">
     <Position X="2.75" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IComputeColor.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="Xenko.Rendering.Materials.ComputeColors.IComputeStream" Collapsed="true">
-    <Position X="5" Y="1.75" Width="1.5" />
+  <Interface Name="Xenko.Rendering.Materials.ComputeColors.IComputeVertexStream" Collapsed="true">
+    <Position X="5" Y="1.75" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\ComputeColors\IComputeStream.cs</FileName>
+      <FileName>Rendering\Materials\ComputeColors\IComputeVertexStream.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Font Name="Segoe UI" Size="9" />
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeTextureBase.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeTextureBase.cs
index bdf6c2e4c5..8bd863a600 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeTextureBase.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/ComputeTextureBase.cs
@@ -81,7 +81,7 @@ protected ComputeTextureBase(Texture texture, TextureCoordinate texcoordIndex, V
         /// The texture filtering method
         /// </userdoc>
         [DataMember(41)]
-        [DefaultValue(TextureFilter.Linear)]
+        [DefaultValue(TextureFilter.Anisotropic)]
         public TextureFilter Filtering
         {
             get
@@ -154,6 +154,13 @@ public TextureAddressMode AddressModeV
         [DataMember(60)]
         public Vector2 Offset { get; set; }
 
+        /// <summary>
+        /// Is this texture being tinted?
+        /// </summary>
+        [NotNull]
+        [DataMember(65)]
+        public Color3 Tint { get; set; } = Color3.White;
+
         /// <summary>
         /// Uses random texture coordinates.
         /// </summary>
@@ -235,20 +242,22 @@ public override ShaderSource GenerateShaderSource(ShaderGeneratorContext context
                 // Try to avoid shader permutations, by putting UV scaling/offset in shader parameters
                 var textureScale = (ValueParameterKey<Vector2>)context.GetParameterKey(MaterialKeys.TextureScale);
                 var textureOffset = (ValueParameterKey<Vector2>)context.GetParameterKey(MaterialKeys.TextureOffset);
+                var textureTint = (ValueParameterKey<Color3>)context.GetParameterKey(MaterialKeys.TextureTint);
 
                 context.Parameters.Set(textureScale, scale);
                 context.Parameters.Set(textureOffset, Offset);
+                context.Parameters.Set(textureTint, Tint);
 
                 if (context.IsNotPixelStage)
                 {
-                    shaderSource = new ShaderClassSource("ComputeColorTextureLodScaledOffsetDynamicSampler", textureKey, usedTexcoord, samplerKey, channelStr, textureScale, textureOffset, 0.0f);
+                    shaderSource = new ShaderClassSource("ComputeColorTextureLodScaledOffsetDynamicSampler", textureKey, usedTexcoord, samplerKey, channelStr, textureScale, textureOffset, textureTint, 0.0f);
                 }
                 else
                 {
                     if (UseRandomTextureCoordinates)
-                        shaderSource = new ShaderClassSource("ComputeColorTextureScaledOffsetDynamicSamplerRandomUV", textureKey, usedTexcoord, samplerKey, channelStr, textureScale, textureOffset);
+                        shaderSource = new ShaderClassSource("ComputeColorTextureScaledOffsetDynamicSamplerRandomUV", textureKey, usedTexcoord, samplerKey, channelStr, textureScale, textureOffset, textureTint);
                     else
-                        shaderSource = new ShaderClassSource("ComputeColorTextureScaledOffsetDynamicSampler", textureKey, usedTexcoord, samplerKey, channelStr, textureScale, textureOffset);
+                        shaderSource = new ShaderClassSource("ComputeColorTextureScaledOffsetDynamicSampler", textureKey, usedTexcoord, samplerKey, channelStr, textureScale, textureOffset, textureTint);
                 }
             }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverSpot.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorAdd3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Lights/TextureProjection/TextureProjectionReceiverSpot.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorAdd3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorAdd3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDarken3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorAdd3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDarken3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDarken3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDifference3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDarken3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDifference3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDifference3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorLighten3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorDifference3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorLighten3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorLighten3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMask3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorLighten3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMask3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMask3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMultiply3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMask3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMultiply3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMultiply3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOver3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorMultiply3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOver3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOver3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOverlay3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOver3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOverlay3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOverlay3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorSubtract3ds.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorOverlay3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorSubtract3ds.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorSubtract3ds.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/3dsMax/ComputeColorSubtract3ds.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor3.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor3.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor3.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColor3.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd3.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd3.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd3.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAverage.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAdd3.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAverage.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAverage.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorCave.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorAverage.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorCave.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorCave.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorCave.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorBurn.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorBurn.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorBurn.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorDodge.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorBurn.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorDodge.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorDodge.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantColorLink.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorColorDodge.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantColorLink.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantColorLink.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantFloatLink.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantColorLink.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantFloatLink.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantFloatLink.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantLink.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantFloatLink.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantLink.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantLink.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDesaturate.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorConstantLink.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDesaturate.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDesaturate.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDivide.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDesaturate.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDivide.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDivide.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorExclusion.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorDivide.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorExclusion.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorExclusion.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFixed.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorExclusion.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFixed.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFixed.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFromStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFixed.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFromStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFromStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardLight.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorFromStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardLight.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardLight.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardMix.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardLight.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardMix.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardMix.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHue.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHardMix.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHue.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHue.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIlluminate.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorHue.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIlluminate.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIlluminate.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIn.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIlluminate.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIn.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIn.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLerpAlpha.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorIn.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLerpAlpha.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLerpAlpha.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearBurn.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLerpAlpha.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearBurn.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearBurn.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearDodge.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearBurn.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearDodge.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearDodge.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMask.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorLinearDodge.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMask.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMask.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMultiply.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMask.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMultiply.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMultiply.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOne.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorMultiply.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOne.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOne.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOut.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOne.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOut.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOut.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOutdoor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOut.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOutdoor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOutdoor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOverlay.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOutdoor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOverlay.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorParameter.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorParameter.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorParameter.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorParameter.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOverlay.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorPinLight.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorOverlay.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorPinLight.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorPinLight.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturate.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorPinLight.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturate.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturate.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturation.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturate.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturation.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturation.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScaler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSaturation.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScaler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScaler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScreen.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScaler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScreen.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScreen.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSoftLight.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorScreen.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSoftLight.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSoftLight.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSoftLight.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlpha.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlpha.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlpha.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlphaWithColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlpha.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlphaWithColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlphaWithColor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubtract.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubstituteAlphaWithColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubtract.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubtract1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSynthetic.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSubtract1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSynthetic.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSynthetic.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTexture.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorSynthetic.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTexture.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureDynamicScaledOffset.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureDynamicScaledOffset.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureDynamicScaledOffset.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureDynamicScaledOffset.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTexture.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTexture.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.xksl b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.xksl
index 107de71217..d5f3fdd5cc 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.xksl
@@ -16,6 +16,7 @@ shader ComputeColorTextureLodScaledOffsetDynamicSampler<LinkType TTextureName,
                                              MemberName TRgba, 
                                              LinkType TScale, 
                                              LinkType TOffset,
+                                             LinkType TTint,
 											 float TLod> : ComputeColor, 
                                                                DynamicTexture<TTextureName, PerMaterial>, 
                                                                DynamicSampler<TSampler, PerMaterial>, 
@@ -28,9 +29,12 @@ shader ComputeColorTextureLodScaledOffsetDynamicSampler<LinkType TTextureName,
 
         [Link("TOffset")]
         stage float2 offset;
+
+        [Link("TTint")]
+        stage float3 tint;
     }
     
     override float4 Compute() {
-        return Texture.SampleLevel(Sampler, streams.TexCoord * scale + offset, TLod).TRgba;
+        return Texture.SampleLevel(Sampler, streams.TexCoord * scale + offset, TLod).TRgba * float4(tint, 1.0);
     }
 };
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetDynamicSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledOffsetSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureRepeat.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureLodScaledSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureRepeat.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureRepeat.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureRepeat.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaled.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaled.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaled.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffset.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaled.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffset.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.xksl b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.xksl
index 31a01662f8..a1ec287f5c 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.xksl
@@ -15,7 +15,8 @@ shader ComputeColorTextureScaledOffsetDynamicSampler<LinkType TTextureName,
                                              LinkType TSampler, 
                                              MemberName TRgba, 
                                              LinkType TScale, 
-                                             LinkType TOffset> : ComputeColor, 
+                                             LinkType TOffset,
+                                             LinkType TTint> : ComputeColor, 
                                                                DynamicTexture<TTextureName, PerMaterial>, 
                                                                DynamicSampler<TSampler, PerMaterial>, 
                                                                DynamicTextureStream<TStream>
@@ -27,9 +28,12 @@ shader ComputeColorTextureScaledOffsetDynamicSampler<LinkType TTextureName,
 
         [Link("TOffset")]
         stage float2 offset;
+
+        [Link("TTint")]
+        stage float3 tint;
     }
 
     override float4 Compute() {
-        return Texture.Sample(Sampler, streams.TexCoord * scale + offset).TRgba;
+        return Texture.Sample(Sampler, streams.TexCoord * scale + offset).TRgba * float4(tint, 1.0);
     }
 };
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffset.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffset.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl
index f6c2c53e03..79e50a5cfb 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl
@@ -15,7 +15,8 @@ shader ComputeColorTextureScaledOffsetDynamicSamplerRandomUV<LinkType TTextureNa
                                              LinkType TSampler, 
                                              MemberName TRgba, 
                                              LinkType TScale, 
-                                             LinkType TOffset> : ComputeColor, 
+                                             LinkType TOffset,
+                                             LinkType TTint> : ComputeColor, 
                                                                DynamicTexture<TTextureName, PerMaterial>, 
                                                                DynamicSampler<TSampler, PerMaterial>, 
                                                                DynamicTextureStream<TStream>
@@ -27,6 +28,9 @@ shader ComputeColorTextureScaledOffsetDynamicSamplerRandomUV<LinkType TTextureNa
 
         [Link("TOffset")]
         stage float2 offset;
+        
+        [Link("TTint")]
+        stage float3 tint;
     }
     
     //------------------------------------------------------------------------------
@@ -84,6 +88,6 @@ shader ComputeColorTextureScaledOffsetDynamicSamplerRandomUV<LinkType TTextureNa
     }
 
     override float4 Compute() {
-        return Texture.Sample(Sampler, RandomUV(streams.TexCoord * scale + offset)).TRgba;
+        return Texture.Sample(Sampler, RandomUV(streams.TexCoord * scale + offset)).TRgba * float4(tint, 1.0);
     }
-};
\ No newline at end of file
+};
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledOffsetSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledSampler.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledSampler.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorThreshold.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorTextureScaledSampler.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorThreshold.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorThreshold.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorValue.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorThreshold.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorValue.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorValue.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorAddMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/ComputeColorValue.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorAddMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorAddMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDarkenMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorAddMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDarkenMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDarkenMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDifferenceMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDarkenMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDifferenceMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDifferenceMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorLightenMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorDifferenceMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorLightenMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorLightenMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorMultiplyMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorLightenMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorMultiplyMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorMultiplyMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorOverMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorMultiplyMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorOverMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorOverMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorSubtractMaya.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorOverMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorSubtractMaya.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/GlobalFog.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/GlobalFog.cs
new file mode 100644
index 0000000000..800dcf368c
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/GlobalFog.cs
@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Storage;
+using Xenko.Graphics;
+using Xenko.Rendering.Compositing;
+using Xenko.Rendering.Materials;
+using Xenko.Rendering.Materials.ComputeColors;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Rendering.Materials
+{
+    /// <summary>
+    /// A fog system that is integrated into the shading of individual objects and does not use a post-processing filter. This can be important, as this doesn't rely on the depth buffer.
+    /// Takes in a global color and density that will be applied to all materials that have this feature enabled. Uses static methods to configure and modify at runtime.
+    /// </summary>
+    [DataContract("MaterialFogFeature")]
+    [Display("GlobalFog")]
+    public class GlobalFog : MaterialFeature, IMaterialFogFeature
+    {
+        [StructLayout(LayoutKind.Sequential)]
+        private struct FogData
+        {
+            public Vector4 FogColor;
+            public float FogStart;
+        }
+
+        private static Dictionary<RootEffectRenderFeature, ConstantBufferOffsetReference> effectReferences = new Dictionary<RootEffectRenderFeature, ConstantBufferOffsetReference>();
+
+        private static FogData GlobalFogParameters;
+        private static bool UseLinear = true;
+
+        public static void SetGlobalFog(Color3? color = null, float? density = null, float? fogstart = null)
+        {
+            if (color.HasValue)
+            {
+                GlobalFogParameters.FogColor.X = color.Value.R;
+                GlobalFogParameters.FogColor.Y = color.Value.G;
+                GlobalFogParameters.FogColor.Z = color.Value.B;
+            }
+
+            if (density.HasValue)
+            {
+                GlobalFogParameters.FogColor.W = density.Value;
+            }
+
+            if (fogstart.HasValue)
+            {
+                GlobalFogParameters.FogStart = fogstart.Value;
+            }
+        }
+
+        public static void GetGlobalFog(out Color3 color, out float density, out float fogstart)
+        {
+            color = ((Color4)GlobalFogParameters.FogColor).ToColor3();
+            density = GlobalFogParameters.FogColor.W;
+            fogstart = GlobalFogParameters.FogStart;
+        }
+
+        public static bool IsLinearColorspace
+        {
+            get => UseLinear;
+            set { UseLinear = value; }
+        }
+
+        [DataMember]
+        public Color3 FogColor
+        {
+            get => ((Color4)GlobalFogParameters.FogColor).ToColor3();
+            set
+            {
+                GlobalFogParameters.FogColor.X = value.R;
+                GlobalFogParameters.FogColor.Y = value.G;
+                GlobalFogParameters.FogColor.Z = value.B;
+            }
+        }
+        
+        [DataMember]
+        public float FogDensity
+        {
+            get => GlobalFogParameters.FogColor.W;
+            set
+            {
+                GlobalFogParameters.FogColor.W = value;
+            }
+        }
+
+        [DataMember]
+        public float FogStart
+        {
+            get => GlobalFogParameters.FogStart;
+            set
+            {
+                GlobalFogParameters.FogStart = value;
+            }
+        }
+
+        [DataMember]
+        public bool UseLinearColorSpace {
+            get => UseLinear;
+            set { UseLinear = value; }
+        }
+
+        public bool Equals(IMaterialShadingModelFeature other)
+        {
+            return other is GlobalFog;
+        }
+
+        internal static unsafe void PrepareFogConstantBuffer(RenderContext context)
+        {
+            // adjust for differences in DirectX and Vulkan
+            Vector4 usecolor = GlobalFogParameters.FogColor;
+            if (UseLinear)
+            {
+                usecolor.X = MathUtil.SRgbToLinear(usecolor.X);
+                usecolor.Y = MathUtil.SRgbToLinear(usecolor.Y);
+                usecolor.Z = MathUtil.SRgbToLinear(usecolor.Z);
+            }
+
+            usecolor.W = -usecolor.W; // flip this here so we don't need to do it in the shader
+
+            for (int i=0; i<context.RenderSystem.RenderFeatures.Count; i++)
+            {
+                var renderFeature = context.RenderSystem.RenderFeatures[i];
+                RootEffectRenderFeature rooteff = renderFeature as RootEffectRenderFeature;
+
+                if (rooteff == null) continue;
+
+                if (effectReferences.TryGetValue(rooteff, out var offsetref) == false)
+                    effectReferences[rooteff] = offsetref = ((RootEffectRenderFeature)renderFeature).CreateFrameCBufferOffsetSlot(FogFeatureKeys.FogColor.Name);
+
+                foreach (var frameLayout in ((RootEffectRenderFeature)renderFeature).FrameLayouts)
+                {
+                    var fogOffset = frameLayout.GetConstantBufferOffset(offsetref);
+                    if (fogOffset == -1)
+                        continue;
+
+                    var resourceGroup = frameLayout.Entry.Resources;
+
+                    var mappedCB = (FogData*)(resourceGroup.ConstantBuffer.Data + fogOffset);
+                    mappedCB->FogColor = usecolor;
+                    mappedCB->FogStart = GlobalFogParameters.FogStart;
+                }
+            }
+        }
+
+        public override void GenerateShader(MaterialGeneratorContext context)
+        {
+            var shaderBuilder = context.AddShading(this);
+            shaderBuilder.ShaderSources.Add(new ShaderClassSource("FogFeature"));
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorSubtractMaya.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/IMaterialHairDirectionFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/ComputeColors/Shaders/Maya/ComputeColorSubtractMaya.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/IMaterialHairDirectionFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/IMaterialHairDirectionFunction1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionBitangent.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/IMaterialHairDirectionFunction1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionBitangent.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionBitangent1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionTangent.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionBitangent1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionTangent.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionTangent1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/IMaterialHairDiscardFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DirectionFunction/MaterialHairDirectionFunctionTangent1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/IMaterialHairDiscardFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/IMaterialHairDiscardFunction1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionOpaquePass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/IMaterialHairDiscardFunction1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionOpaquePass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionOpaquePass1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionTransparentPass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionOpaquePass1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionTransparentPass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionTransparentPass1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/IMaterialHairLightAttenuationFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/DiscardFunction/MaterialHairDiscardFunctionTransparentPass1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/IMaterialHairLightAttenuationFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/IMaterialHairLightAttenuationFunction1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionDirectional.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/IMaterialHairLightAttenuationFunction1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionDirectional.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionDirectional2.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionNone.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionDirectional2.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionNone.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialHairShared1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialHairShared.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialHairShared1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialHairShared.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionNone1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingDiffuseHair.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/LightAttenuationFunction/MaterialHairLightAttenuationFunctionNone1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingDiffuseHair.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingSpecularHair.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingSpecularHair.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingSpecularHair.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingSpecularHair.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingDiffuseHair.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/IMaterialHairShadowingFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/MaterialSurfaceShadingDiffuseHair.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/IMaterialHairShadowingFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/IMaterialHairShadowingFunction1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionScattering.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/IMaterialHairShadowingFunction1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionScattering.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionScattering1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionShadowing.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionScattering1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionShadowing.xksl.cs
diff --git a/sources/engine/Xenko.Graphics/Direct3D12/MappedResource.Direct3D12.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialFogFeature.cs
similarity index 53%
rename from sources/engine/Xenko.Graphics/Direct3D12/MappedResource.Direct3D12.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialFogFeature.cs
index a7873cc37b..e46adfac13 100644
--- a/sources/engine/Xenko.Graphics/Direct3D12/MappedResource.Direct3D12.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialFogFeature.cs
@@ -1,13 +1,12 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
-#if XENKO_GRAPHICS_API_DIRECT3D12
-namespace Xenko.Graphics
+namespace Xenko.Rendering.Materials
 {
-    public partial struct MappedResource
+    /// <summary>
+    /// Base interface for the transparency material feature.
+    /// </summary>
+    public interface IMaterialFogFeature : IMaterialShadingModelFeature
     {
-        internal SharpDX.Direct3D12.Resource UploadResource;
-        internal int UploadOffset;
     }
 }
-#endif
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionShadowing1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialSurfaceDomain.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Hair/ShadowingFunction/MaterialHairShadowingFunctionShadowing1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialSurfaceDomain.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialSurfaceDomain.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/IStreamInitializer.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/IMaterialSurfaceDomain.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/IStreamInitializer.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialAttributes.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialAttributes.cs
index 92b283d252..730fb115d4 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialAttributes.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialAttributes.cs
@@ -5,6 +5,7 @@
 using Xenko.Core;
 using Xenko.Core.Annotations;
 using Xenko.Graphics;
+using Xenko.Rendering.Rendering.Materials;
 
 namespace Xenko.Rendering.Materials
 {
@@ -154,6 +155,16 @@ public MaterialAttributes()
         [DataMember(110)]
         public IMaterialTransparencyFeature Transparency { get; set; }
 
+        /// <summary>
+        /// Gets or sets fog.
+        /// </summary>
+        /// <value>The fog.</value>
+        /// <userdoc>The method used to determine the fog</userdoc>
+        [Display("Fog", "Misc")]
+        [DefaultValue(null)]
+        [DataMember(115)]
+        public IMaterialFogFeature FogFeature { get; set; }
+
         /// <summary>
         /// Gets or sets the overrides.
         /// </summary>
@@ -224,6 +235,7 @@ public void Visit(MaterialGeneratorContext context)
             context.Visit(Occlusion);
             context.Visit(Emissive);
             context.Visit(SubsurfaceScattering);
+            context.Visit(FogFeature);
 
             // If hair shading is enabled, ignore the transparency feature to avoid errors during shader compilation.
             // Allowing the transparency feature while hair shading is on makes no sense anyway.
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayer.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayer.cs
index b32faac62a..2ec71205e0 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayer.cs
@@ -87,7 +87,7 @@ public virtual void Visit(MaterialGeneratorContext context)
             }
 
             // Find the material from the reference
-            var material = context.FindAsset(Material) as IMaterialDescriptor;
+            var material = Material.Descriptor ?? context.FindAsset(Material) as IMaterialDescriptor;
             if (material == null)
             {
                 context.Log.Error($"Unable to find material [{Material}]");
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs
index b269797d5b..ac2f1d0abc 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialBlendLayerContext.cs
@@ -155,14 +155,14 @@ public ShaderSource GenerateStreamInitializers(MaterialShaderStage stage)
             // the streams coming from the material layers
             foreach (var streamInitializer in stageContext.StreamInitializers)
             {
-                mixin.Mixins.Add(streamInitializer);
+                mixin.Mixins.Add(new ShaderClassSource(streamInitializer));
             }
             stageContext.StreamInitializers.Clear();
 
             // the streams specific to a stage
             // TODO: Use StreamInitializers instead of streams initializers hardcoded in MaterialPixelShadingStream.ResetStream
             if (stage == MaterialShaderStage.Pixel)
-                mixin.Mixins.Add("MaterialPixelShadingStream");
+                mixin.Mixins.Add(new ShaderClassSource("MaterialPixelShadingStream"));
 
             return mixin;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/IStreamInitializer.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDisplacementStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/IStreamInitializer.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDisplacementStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDisplacementStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDomainStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDisplacementStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDomainStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialGeneratorContext.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialGeneratorContext.cs
index 4418b37fd9..e8cf20469a 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialGeneratorContext.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialGeneratorContext.cs
@@ -48,7 +48,8 @@ public class MaterialGeneratorContext : ShaderGeneratorContext
         /// Initializes a new instance of <see cref="MaterialGeneratorContext"/>.
         /// </summary>
         /// <param name="material"></param>
-        public MaterialGeneratorContext(Material material = null)
+        public MaterialGeneratorContext(Material material = null, GraphicsDevice graphicsDevice = null)
+            : base(graphicsDevice)
         {
             this.Material = material ?? new Material();
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialNormalMapFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialNormalMapFeature.cs
index 70fb19cb7b..5b618084bf 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialNormalMapFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialNormalMapFeature.cs
@@ -77,6 +77,11 @@ public MaterialNormalMapFeature(IComputeColor normalMap)
         [Display("Reconstruct Z")]
         public bool IsXYNormal { get; set; }
 
+        [DataMember(40)]
+        [DefaultValue(false)]
+        [Display("Skip Tangents")]
+        public bool SkipTangents { get; set; }
+
         public override void GenerateShader(MaterialGeneratorContext context)
         {
             if (NormalMap != null)
@@ -84,6 +89,7 @@ public override void GenerateShader(MaterialGeneratorContext context)
                 // Inform the context that we are using matNormal (from the MaterialSurfaceNormalMap shader)
                 context.UseStreamWithCustomBlend(MaterialShaderStage.Pixel, NormalStream.Stream, new ShaderClassSource("MaterialStreamNormalBlend"));
                 context.Parameters.Set(MaterialKeys.HasNormalMap, true);
+                context.Parameters.Set(MaterialKeys.SkipTangents, SkipTangents);
 
                 var normalMap = NormalMap;
                 // Workaround to make sure that normal map are setup 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialRenderFeature.cs
index 361d2811fd..715f8a8c95 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialRenderFeature.cs
@@ -8,6 +8,7 @@
 using Xenko.Core.Threading;
 using Xenko.Extensions;
 using Xenko.Graphics;
+using Xenko.Rendering.Materials.ComputeColors;
 using Xenko.Shaders;
 using Buffer = Xenko.Graphics.Buffer;
 
@@ -18,6 +19,8 @@ namespace Xenko.Rendering.Materials
     /// </summary>
     public class MaterialRenderFeature : SubRenderFeature
     {
+        internal static Material fallbackMaterial;
+
         private StaticObjectPropertyKey<RenderEffect> renderEffectKey;
         private StaticObjectPropertyKey<TessellationState> tessellationStateKey;
 
@@ -74,14 +77,16 @@ internal class MaterialInfo : MaterialInfoBase
             public ShaderSource PixelStageSurfaceShaders;
             public ShaderSource PixelStageStreamInitializer;
 
-            public bool HasNormalMap;
+            public bool HasNormalMap, SkipTangents;
 
             /// <summary>
-            /// Indicates that material requries using pixel shader stage during depth-only pass (Z prepass or shadow map rendering).
+            /// Indicates that material requires using pixel shader stage during depth-only pass (Z prepass or shadow map rendering).
             /// Used by transparent and cut off materials.
             /// </summary>
             public bool UsePixelShaderWithDepthPass;
 
+            public bool UseDitheredShadows;
+
             public MaterialInfo(MaterialPass materialPass)
             {
                 MaterialPass = materialPass;
@@ -94,6 +99,20 @@ protected override void InitializeCore()
         {
             base.InitializeCore();
 
+            if (fallbackMaterial == null)
+            {
+                var graphicsDevice = ServiceRegistry.instance.GetSafeServiceAs<IGraphicsDeviceService>().GraphicsDevice;
+
+                fallbackMaterial = Material.New(graphicsDevice, new MaterialDescriptor
+                {
+                    Attributes =
+                    {
+                        Diffuse = new MaterialDiffuseMapFeature(new ComputeTextureColor()),
+                        DiffuseModel = new MaterialDiffuseLambertModelFeature(),
+                    },
+                });
+            }
+
             renderEffectKey = ((RootEffectRenderFeature)RootRenderFeature).RenderEffectKey;
             tessellationStateKey = RootRenderFeature.RenderData.CreateStaticObjectKey<TessellationState>();
 
@@ -161,10 +180,27 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
 
                     renderMesh.ActiveMeshDraw = tessellationState.MeshDraw;
                 }
-                else if (tessellationState.GeneratedIndicesAEN != null)
+                else
                 {
-                    // Not using tessellation anymore, dispose AEN indices if they were generated
-                    Utilities.Dispose(ref tessellationState.GeneratedIndicesAEN);
+                    renderMesh.ActiveMeshDraw = renderMesh.Mesh.Draw;
+                   
+                    if (renderMesh.ActiveMeshDraw.updateVerts != null)
+                    {
+                        for (int i=0; i<RenderSystem.Views.Count; i++)
+                        {
+                            if (RenderSystem.Views[i].Camera != null)
+                            {
+                                renderMesh.ActiveMeshDraw.updateVerts(RenderSystem.Views[i].Frustum);
+                                break;
+                            }
+                        }
+                    }
+
+                    if (tessellationState.GeneratedIndicesAEN != null)
+                    { 
+                        // Not using tessellation anymore, dispose AEN indices if they were generated
+                        Utilities.Dispose(ref tessellationState.GeneratedIndicesAEN);
+                    }
                 }
 
                 // Rebuild rasterizer state if culling mode changed
@@ -214,51 +250,65 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
                             if (isMaterialParametersChanged // parameter fast reload?
                                 || materialInfo.PermutationCounter != material.Parameters.PermutationCounter)
                             {
-                                materialInfo.VertexStageSurfaceShaders = material.Parameters.Get(MaterialKeys.VertexStageSurfaceShaders);
-                                materialInfo.VertexStageStreamInitializer = material.Parameters.Get(MaterialKeys.VertexStageStreamInitializer);
-
-                                materialInfo.DomainStageSurfaceShaders = material.Parameters.Get(MaterialKeys.DomainStageSurfaceShaders);
-                                materialInfo.DomainStageStreamInitializer = material.Parameters.Get(MaterialKeys.DomainStageStreamInitializer);
-
-                                materialInfo.TessellationShader = material.Parameters.Get(MaterialKeys.TessellationShader);
-
-                                materialInfo.PixelStageSurfaceShaders = material.Parameters.Get(MaterialKeys.PixelStageSurfaceShaders);
-                                materialInfo.PixelStageStreamInitializer = material.Parameters.Get(MaterialKeys.PixelStageStreamInitializer);
-                                materialInfo.HasNormalMap = material.Parameters.Get(MaterialKeys.HasNormalMap);
-                                materialInfo.UsePixelShaderWithDepthPass = material.Parameters.Get(MaterialKeys.UsePixelShaderWithDepthPass);
-
-                                materialInfo.MaterialParameters = material.Parameters;
-                                materialInfo.ParametersChanged = isMaterialParametersChanged;
-                                materialInfo.PermutationCounter = material.Parameters.PermutationCounter;
+                                try
+                                {
+                                    materialInfo.VertexStageSurfaceShaders = material.Parameters.Get(MaterialKeys.VertexStageSurfaceShaders);
+                                    materialInfo.VertexStageStreamInitializer = material.Parameters.Get(MaterialKeys.VertexStageStreamInitializer);
+
+                                    materialInfo.DomainStageSurfaceShaders = material.Parameters.Get(MaterialKeys.DomainStageSurfaceShaders);
+                                    materialInfo.DomainStageStreamInitializer = material.Parameters.Get(MaterialKeys.DomainStageStreamInitializer);
+
+                                    materialInfo.TessellationShader = material.Parameters.Get(MaterialKeys.TessellationShader);
+
+                                    materialInfo.PixelStageSurfaceShaders = material.Parameters.Get(MaterialKeys.PixelStageSurfaceShaders);
+                                    materialInfo.PixelStageStreamInitializer = material.Parameters.Get(MaterialKeys.PixelStageStreamInitializer);
+                                    materialInfo.HasNormalMap = material.Parameters.Get(MaterialKeys.HasNormalMap);
+                                    materialInfo.SkipTangents = material.Parameters.Get(MaterialKeys.SkipTangents);
+                                    materialInfo.UsePixelShaderWithDepthPass = material.Parameters.Get(MaterialKeys.UsePixelShaderWithDepthPass);
+                                	materialInfo.UseDitheredShadows = material.Parameters.Get(MaterialKeys.UseDitheredShadows);
+                                	
+                                    materialInfo.MaterialParameters = material.Parameters;
+                                    materialInfo.ParametersChanged = isMaterialParametersChanged;
+                                    materialInfo.PermutationCounter = material.Parameters.PermutationCounter;
+                                }
+                                catch (Exception)
+                                {
+                                    // material got corrupted, clear its broken parameters and render black for this material
+                                    material.Parameters.Clear();
+                                    // we will go through this process again next pass with empty parameters
+                                    continue;
+                                }
                             }
                         }
                     }
 
                     // VS
                     if (materialInfo.VertexStageSurfaceShaders != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.VertexStageSurfaceShaders, materialInfo.VertexStageSurfaceShaders);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.VertexStageSurfaceShaders, materialInfo.VertexStageSurfaceShaders);
                     if (materialInfo.VertexStageStreamInitializer != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.VertexStageStreamInitializer, materialInfo.VertexStageStreamInitializer);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.VertexStageStreamInitializer, materialInfo.VertexStageStreamInitializer);
 
                     // DS
                     if (materialInfo.DomainStageSurfaceShaders != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.DomainStageSurfaceShaders, materialInfo.DomainStageSurfaceShaders);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.DomainStageSurfaceShaders, materialInfo.DomainStageSurfaceShaders);
                     if (materialInfo.DomainStageStreamInitializer != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.DomainStageStreamInitializer, materialInfo.DomainStageStreamInitializer);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.DomainStageStreamInitializer, materialInfo.DomainStageStreamInitializer);
 
                     // Tessellation
                     if (materialInfo.TessellationShader != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.TessellationShader, materialInfo.TessellationShader);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.TessellationShader, materialInfo.TessellationShader);
 
                     // PS
                     if (materialInfo.PixelStageSurfaceShaders != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.PixelStageSurfaceShaders, materialInfo.PixelStageSurfaceShaders);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.PixelStageSurfaceShaders, materialInfo.PixelStageSurfaceShaders);
                     if (materialInfo.PixelStageStreamInitializer != null)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.PixelStageStreamInitializer, materialInfo.PixelStageStreamInitializer);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.PixelStageStreamInitializer, materialInfo.PixelStageStreamInitializer);
                     if (materialInfo.HasNormalMap)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.HasNormalMap, materialInfo.HasNormalMap);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.HasNormalMap, materialInfo.HasNormalMap);
+                    if (materialInfo.SkipTangents)
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.SkipTangents, materialInfo.SkipTangents);
                     if (materialInfo.UsePixelShaderWithDepthPass)
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.UsePixelShaderWithDepthPass, materialInfo.UsePixelShaderWithDepthPass);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.UsePixelShaderWithDepthPass, materialInfo.UsePixelShaderWithDepthPass);
                 }
             });
 
@@ -278,7 +328,7 @@ public override void Prepare(RenderDrawContext context)
                 var renderMesh = (RenderMesh)renderNode.RenderObject;
 
                 // Ignore fallback effects
-                if (renderNode.RenderEffect.State != RenderEffectState.Normal)
+                if (renderNode.RenderEffect?.State != RenderEffectState.Normal)
                     return;
 
                 // Collect materials and create associated MaterialInfo (includes reflection) first time
@@ -325,6 +375,9 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
 
         public static unsafe bool UpdateMaterial(RenderSystem renderSystem, RenderDrawContext context, MaterialInfoBase materialInfo, int materialSlotIndex, RenderEffect renderEffect, ParameterCollection materialParameters)
         {
+            if (renderEffect?.Reflection == null)
+                return false;
+
             var resourceGroupDescription = renderEffect.Reflection.ResourceGroupDescriptions[materialSlotIndex];
             if (resourceGroupDescription.DescriptorSetLayout == null)
                 return false;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDomainStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialStreamAdditiveBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/MaterialDomainStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/MaterialStreamAdditiveBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialStreamAdditiveBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDisplacement.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/MaterialStreamAdditiveBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDisplacement.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDisplacement1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDomainStageCompositor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDisplacement1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDomainStageCompositor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDomainStageCompositor1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTessellationStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/MaterialSurfaceDomainStageCompositor1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTessellationStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyAdditiveFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyAdditiveFeature.cs
index 4a861c09e0..0c7d234bb6 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyAdditiveFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyAdditiveFeature.cs
@@ -19,8 +19,6 @@ public class MaterialTransparencyAdditiveFeature : MaterialFeature, IMaterialTra
     {
         private static readonly MaterialStreamDescriptor AlphaBlendStream = new MaterialStreamDescriptor("DiffuseSpecularAlphaBlend", "matDiffuseSpecularAlphaBlend", MaterialKeys.DiffuseSpecularAlphaBlendValue.PropertyType);
 
-        private static readonly MaterialStreamDescriptor AlphaBlendColorStream = new MaterialStreamDescriptor("DiffuseSpecularAlphaBlend - Color", "matAlphaBlendColor", MaterialKeys.AlphaBlendColorValue.PropertyType);
-
         private static readonly PropertyKey<bool> HasFinalCallback = new PropertyKey<bool>("MaterialTransparencyAdditiveFeature.HasFinalCallback", typeof(MaterialTransparencyAdditiveFeature));
 
         /// <summary>
@@ -29,7 +27,6 @@ public class MaterialTransparencyAdditiveFeature : MaterialFeature, IMaterialTra
         public MaterialTransparencyAdditiveFeature()
         {
             Alpha = new ComputeFloat(0.5f);
-            Tint = new ComputeColor(Color.White);
         }
 
         /// <summary>
@@ -42,19 +39,15 @@ public MaterialTransparencyAdditiveFeature()
         [DataMemberRange(0.0, 1.0, 0.01, 0.1, 2)]
         public IComputeScalar Alpha { get; set; }
 
-        /// <summary>
-        /// Gets or sets the tint color.
-        /// </summary>
-        /// <value>The tint.</value>
-        /// <userdoc>The tint color to apply on the material during the blend.</userdoc>
-        [NotNull]
-        [DataMember(20)]
-        public IComputeColor Tint { get; set; }
+        /// <userdoc>
+        /// Dither shadows cast by this object to simulate semi-transparent shadows, works best at higher PCF filtering levels.
+        /// </userdoc>
+        [DataMember(30)]
+        public bool DitheredShadows { get; set; } = true;
 
         public override void GenerateShader(MaterialGeneratorContext context)
         {
             var alpha = Alpha ?? new ComputeFloat(0.5f);
-            var tint = Tint ?? new ComputeColor(Color.White);
 
             alpha.ClampFloat(0, 1);
 
@@ -62,6 +55,8 @@ public override void GenerateShader(MaterialGeneratorContext context)
             if (context.MaterialPass.BlendState == null)
                 context.MaterialPass.BlendState = BlendStates.AlphaBlend;
             context.MaterialPass.HasTransparency = true;
+            // Disable alpha-to-coverage. We wanna do alpha blending, not alpha testing.
+            context.MaterialPass.AlphaToCoverage = false;
             // TODO GRAPHICS REFACTOR
             //context.Parameters.SetResourceSlow(Effect.BlendStateKey, BlendState.NewFake(blendDesc));
 
@@ -72,9 +67,12 @@ public override void GenerateShader(MaterialGeneratorContext context)
             mixin.AddComposition("color", alphaColor);
 
             context.SetStream(MaterialShaderStage.Pixel, AlphaBlendStream.Stream, MaterialStreamType.Float2, mixin);
-            context.SetStream(AlphaBlendColorStream.Stream, tint, MaterialKeys.AlphaBlendColorMap, MaterialKeys.AlphaBlendColorValue, Color.White);
 
             context.MaterialPass.Parameters.Set(MaterialKeys.UsePixelShaderWithDepthPass, true);
+            if (DitheredShadows)
+            {
+                context.MaterialPass.Parameters.Set(MaterialKeys.UseDitheredShadows, true);
+            }
 
             if (!context.Tags.Get(HasFinalCallback))
             {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyBlendFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyBlendFeature.cs
index 905af45800..87429d0050 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyBlendFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyBlendFeature.cs
@@ -20,8 +20,6 @@ public class MaterialTransparencyBlendFeature : MaterialFeature, IMaterialTransp
 
         private static readonly MaterialStreamDescriptor AlphaBlendStream = new MaterialStreamDescriptor("DiffuseSpecularAlphaBlend", "matDiffuseSpecularAlphaBlend", MaterialKeys.DiffuseSpecularAlphaBlendValue.PropertyType);
 
-        private static readonly MaterialStreamDescriptor AlphaBlendColorStream = new MaterialStreamDescriptor("DiffuseSpecularAlphaBlend - Color", "matAlphaBlendColor", MaterialKeys.AlphaBlendColorValue.PropertyType);
-
         private static readonly PropertyKey<bool> HasFinalCallback = new PropertyKey<bool>("MaterialTransparencyAdditiveFeature.HasFinalCallback", typeof(MaterialTransparencyAdditiveFeature));
     
         /// <summary>
@@ -30,7 +28,6 @@ public class MaterialTransparencyBlendFeature : MaterialFeature, IMaterialTransp
         public MaterialTransparencyBlendFeature()
         {
             Alpha = new ComputeFloat(1f);
-            Tint = new ComputeColor(Color.White);
         }
     
         /// <summary>
@@ -43,19 +40,15 @@ public MaterialTransparencyBlendFeature()
         [DataMemberRange(0.0, 1.0, 0.01, 0.1, 2)]
         public IComputeScalar Alpha { get; set; }
 
-        /// <summary>
-        /// Gets or sets the tint color.
-        /// </summary>
-        /// <value>The tint.</value>
-        /// <userdoc>The tint color to apply on the material during the blend.</userdoc>
-        [NotNull]
-        [DataMember(20)]
-        public IComputeColor Tint { get; set; }
+        /// <userdoc>
+        /// Dither shadows cast by this object to simulate semi-transparent shadows, works best at higher PCF filtering levels.
+        /// </userdoc>
+        [DataMember(30)]
+        public bool DitheredShadows { get; set; } = true;
 
         public override void GenerateShader(MaterialGeneratorContext context)
         {
             var alpha = Alpha ?? new ComputeFloat(1f);
-            var tint = Tint ?? new ComputeColor(Color.White);
 
             alpha.ClampFloat(0, 1);
 
@@ -63,14 +56,19 @@ public override void GenerateShader(MaterialGeneratorContext context)
             if (context.MaterialPass.BlendState == null)
                 context.MaterialPass.BlendState = BlendStates.AlphaBlend;
             context.MaterialPass.HasTransparency = true;
+            // Disable alpha-to-coverage. We wanna do alpha blending, not alpha testing.
+            context.MaterialPass.AlphaToCoverage = false;
             // TODO GRAPHICS REFACTOR
             //context.Parameters.SetResourceSlow(Effect.BlendStateKey, BlendState.NewFake(blendDesc));
 
             context.SetStream(AlphaBlendStream.Stream, alpha, MaterialKeys.DiffuseSpecularAlphaBlendMap, MaterialKeys.DiffuseSpecularAlphaBlendValue, Color.White);
-            context.SetStream(AlphaBlendColorStream.Stream, tint, MaterialKeys.AlphaBlendColorMap, MaterialKeys.AlphaBlendColorValue, Color.White);
 
             context.MaterialPass.Parameters.Set(MaterialKeys.UsePixelShaderWithDepthPass, true);
-
+            if (DitheredShadows)
+            {
+                context.MaterialPass.Parameters.Set(MaterialKeys.UseDitheredShadows, true);
+            }
+            
             if (!context.Tags.Get(HasFinalCallback))
             {
                 context.Tags.Set(HasFinalCallback, true);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyCutoffFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyCutoffFeature.cs
index 44e30bf7fe..4e787d9dc9 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyCutoffFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTransparencyCutoffFeature.cs
@@ -43,7 +43,7 @@ public MaterialTransparencyCutoffFeature()
         public override void GenerateShader(MaterialGeneratorContext context)
         {
             var alpha = Alpha ?? new ComputeFloat(DefaultAlpha);
-            alpha.ClampFloat(0, 1);
+            
             context.SetStream(AlphaDiscardStream.Stream, alpha, MaterialKeys.AlphaDiscardMap, MaterialKeys.AlphaDiscardValue, new Color(DefaultAlpha));
 
             context.MaterialPass.Parameters.Set(MaterialKeys.UsePixelShaderWithDepthPass, true);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd b/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd
index b609febb56..981c2f4410 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/Materials.cd
@@ -6,92 +6,15 @@
       <Method Name="MaterialAttributes" Hidden="true" />
       <Method Name="Visit" Hidden="true" />
     </Members>
-    <AssociationLine Name="Tessellation" Type="Xenko.Rendering.Materials.IMaterialTessellationFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.438" Y="4.812" />
-        <Point X="2.438" Y="11.596" />
-        <Point X="3.5" Y="11.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Displacement" Type="Xenko.Rendering.Materials.IMaterialDisplacementFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.562" Y="4.812" />
-        <Point X="2.562" Y="10.096" />
-        <Point X="3.5" Y="10.096" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Surface" Type="Xenko.Rendering.Materials.IMaterialSurfaceFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.812" Y="4.812" />
-        <Point X="2.812" Y="7.096" />
-        <Point X="3.5" Y="7.096" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="MicroSurface" Type="Xenko.Rendering.Materials.IMaterialMicroSurfaceFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.688" Y="4.812" />
-        <Point X="2.688" Y="8.596" />
-        <Point X="3.5" Y="8.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Diffuse" Type="Xenko.Rendering.Materials.IMaterialDiffuseFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.312" Y="4.812" />
-        <Point X="2.312" Y="14.346" />
-        <Point X="3.5" Y="14.346" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="DiffuseModel" Type="Xenko.Rendering.Materials.IMaterialDiffuseModelFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.062" Y="4.812" />
-        <Point X="2.062" Y="19.096" />
-        <Point X="3.5" Y="19.096" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Specular" Type="Xenko.Rendering.Materials.IMaterialSpecularFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="2.188" Y="4.812" />
-        <Point X="2.188" Y="15.846" />
-        <Point X="3.5" Y="15.846" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="SpecularModel" Type="Xenko.Rendering.Materials.IMaterialSpecularModelFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.812" Y="4.812" />
-        <Point X="1.812" Y="22.346" />
-        <Point X="3.25" Y="22.346" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Occlusion" Type="Xenko.Rendering.Materials.IMaterialOcclusionFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.688" Y="4.812" />
-        <Point X="1.688" Y="23.596" />
-        <Point X="3.25" Y="23.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Emissive" Type="Xenko.Rendering.Materials.IMaterialEmissiveFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.938" Y="4.812" />
-        <Point X="1.938" Y="20.596" />
-        <Point X="3.5" Y="20.596" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="Transparency" Type="Xenko.Rendering.Materials.IMaterialTransparencyFeature" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="1.562" Y="4.812" />
-        <Point X="1.562" Y="25.096" />
-        <Point X="3.25" Y="25.096" />
-      </Path>
-    </AssociationLine>
     <AssociationLine Name="Overrides" Type="Xenko.Rendering.Materials.MaterialOverrides" FixedFromPoint="true" FixedToPoint="true">
       <Path>
-        <Point X="3" Y="4.75" />
-        <Point X="4" Y="4.75" />
+        <Point X="3" Y="4.656" />
+        <Point X="4" Y="4.656" />
         <Point X="4" Y="5.5" />
       </Path>
     </AssociationLine>
     <TypeIdentifier>
-      <HashCode>BEAACABAAQgAAAQAAgAAAAAEAACgAAAAAAAAACABAAA=</HashCode>
+      <HashCode>BEAACEBAAQgAAIQAAgBAAAAEAADgAAAAAAAAACABAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialAttributes.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -113,7 +36,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialBlendLayer" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="8.5" Y="5.5" Width="1.75" />
     <TypeIdentifier>
-      <HashCode>AEAAAAAAAQAAAIQAAAAAAAQAQACAAAAAAAAAAEAAAAA=</HashCode>
+      <HashCode>AEAAAAAAAQAAAIQAAAAAAAQAQACAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialBlendLayer.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -127,7 +50,7 @@
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialBlendLayers.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -135,7 +58,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialDiffuseLambertModelFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="18.75" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAABAAAQAgAAAAAAAAAAgAIAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAABAAAAAAgAAAAAAAAAAgAIAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDiffuseLambertModelFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -143,7 +66,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialDiffuseMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="14" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAEAAAAAAAAAAAQAAAABAAAAAAAAABAAAAAAAAAAQAA=</HashCode>
+      <HashCode>AAEAAAAAAAAAAAAAAAABAAAAAAAAABAAAAAAAABAQAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDiffuseMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -151,7 +74,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialDisplacementMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="9.75" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAQAAAAAAAAAAQAAAAAAAAIAAAAAgAAAAgACAAAAAA=</HashCode>
+      <HashCode>AAAQAAAAAAAAAAAAAAAAAAAIAAAAAgAAAAgACABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDisplacementMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -159,7 +82,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialEmissiveMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="20.25" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAQAAAAAAABAAAQAgQgBAAAIAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAQAAAAAAAAAAAAAgQgBAAAIAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialEmissiveMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -167,7 +90,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialGlossinessMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="8.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAEAAAAAAAAQAAAABAAEAAAAABAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAEAAAAAAAAAAAAABAAEAAAAABAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialGlossinessMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -175,7 +98,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialMetalnessMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="9.25" Y="15.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AACAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialMetalnessMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -183,7 +106,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialNormalMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="7" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAIABQAQAABAAAAAAAAAAAAAAAACAAAAAA=</HashCode>
+      <HashCode>ABAAAQAAAAAIABAAQAABAAAAAAAAAAAAAAAACABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialNormalMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -191,7 +114,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialOcclusionMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="23.75" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AFAAAAAAAAAAAAQAAACBAAAAAABAAAAAAECQAAAAAAA=</HashCode>
+      <HashCode>AFAAAAAAAAAAAAAAAACBAAAAAABAAAAAAECQAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialOcclusionMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -206,7 +129,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialSpecularMapFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.75" Y="15.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAABgAAIAAAgAAAABAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAABgAAIAAAgAAAABAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialSpecularMapFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -233,22 +156,8 @@
       <Compartment Name="Properties" Collapsed="true" />
       <Compartment Name="Methods" Collapsed="true" />
     </Compartments>
-    <AssociationLine Name="Visibility" Type="Xenko.Rendering.Materials.IMaterialSpecularMicrofacetVisibilityFunction" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="13.625" Y="22.562" />
-        <Point X="13.625" Y="27.346" />
-        <Point X="15.25" Y="27.346" />
-      </Path>
-    </AssociationLine>
-    <AssociationLine Name="NormalDistribution" Type="Xenko.Rendering.Materials.IMaterialSpecularMicrofacetNormalDistributionFunction" FixedFromPoint="true" FixedToPoint="true">
-      <Path>
-        <Point X="13.938" Y="22.562" />
-        <Point X="13.938" Y="25.096" />
-        <Point X="15.25" Y="25.096" />
-      </Path>
-    </AssociationLine>
     <TypeIdentifier>
-      <HashCode>AEAAAAAAAABAAAQAgAAAAAAAAAAAAIAAAAACAAAAAAI=</HashCode>
+      <HashCode>AEAAAAACABAAAAAAgAAAAAAAAAAAAIAAAAACAABAAAI=</HashCode>
       <FileName>Rendering\Materials\MaterialSpecularMicroFacetModelFeature.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -349,29 +258,29 @@
   <Class Name="Xenko.Rendering.Materials.MaterialTessellationBaseFeature" Collapsed="true">
     <Position X="6.75" Y="11.25" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AACAAAAACAAAAIQAAAAAAAQAAAAAAAQCAAAAAAAAAAA=</HashCode>
-      <FileName>Rendering\Materials\MaterialTesselationBaseFeature.cs</FileName>
+      <HashCode>AACEAAAACAAAAIAAAAAAAAQAAAAAAAACAAAAAABAAAA=</HashCode>
+      <FileName>Rendering\Materials\MaterialTessellationBaseFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialTessellationFlatFeature" Collapsed="true">
     <Position X="5" Y="12.5" Width="2.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTessellationFlatFeature.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialTessellationPNFeature" Collapsed="true">
     <Position X="8.25" Y="12.5" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTessellationPNFeature.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialTransparencyAdditiveFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="6.25" Y="25.25" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAEAAAAQABAAAAASAAAAAABAAAAAAAAIAAAA=</HashCode>
+      <HashCode>AAAAAAAAAEAAAAAABAAAAASAAAAAABAAAAAAAAJAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTransparencyAdditiveFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -379,7 +288,7 @@
   <Class Name="Xenko.Rendering.Materials.MaterialTransparencyCutoffFeature" Collapsed="true" BaseTypeListCollapsed="true">
     <Position X="9.25" Y="25.25" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAAAQABAAAAAQAAAAAABEAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAACAAAAABAAAAAQAAAAAABEAAAAAAABAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialTransparencyCutoffFeature.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
@@ -387,14 +296,14 @@
   <Class Name="Xenko.Rendering.Material" Collapsed="true">
     <Position X="13.75" Y="5.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAgAABEAAgCAAAAAAAAAAAAAAAAAAAIAAEAAAAAA=</HashCode>
+      <HashCode>AAAgAAAAAEAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Material.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Xenko.Rendering.Materials.MaterialDescriptor" Collapsed="true">
     <Position X="5" Y="4.25" Width="2" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAQAAAAAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAQAAAQAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\MaterialDescriptor.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
@@ -429,7 +338,7 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAQAAAAQAAAAAAAEAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IMaterialDescriptor.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -488,7 +397,7 @@
       </Path>
     </InheritanceLine>
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IMaterialFeature.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -539,7 +448,7 @@
   <Interface Name="Xenko.Rendering.Materials.IMaterialShadingModelFeature" Collapsed="true">
     <Position X="9" Y="17" Width="2.75" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>Rendering\Materials\IMaterialShadingModelFeature.cs</FileName>
     </TypeIdentifier>
   </Interface>
@@ -556,6 +465,8 @@
       <Path>
         <Point X="28.375" Y="22.562" />
         <Point X="28.375" Y="23.125" />
+        <Point X="18.708" Y="23.125" Type="JumpStart" />
+        <Point X="18.542" Y="23.125" Type="JumpEnd" />
         <Point X="16.875" Y="23.125" />
         <Point X="16.875" Y="23.5" />
       </Path>
@@ -578,6 +489,8 @@
       <Path>
         <Point X="28.375" Y="22.562" />
         <Point X="28.375" Y="24.45" />
+        <Point X="18.708" Y="24.45" Type="JumpStart" />
+        <Point X="18.542" Y="24.45" Type="JumpEnd" />
         <Point X="17.25" Y="24.45" />
         <Point X="17.25" Y="24.75" />
       </Path>
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTessellationStream1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/ComputeColorMaterialAlphaBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/MaterialTessellationStream1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/ComputeColorMaterialAlphaBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/FogFeature.xksl b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/FogFeature.xksl
new file mode 100644
index 0000000000..47fb294c37
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/FogFeature.xksl
@@ -0,0 +1,25 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Materials
+{
+    shader FogFeature : IMaterialSurfacePixel, MaterialPixelShadingStream, ShaderBaseStream
+    {
+        cbuffer PerFrame {
+            stage float4 FogColor;
+            stage float FogStart;
+        };
+
+        override void Compute()
+        {
+            float alpha = max(streams.matEmissive.a, streams.matDiffuse.a) * streams.matDiffuseSpecularAlphaBlend.r;
+            streams.shadingColorAlpha = alpha;
+#if XENKO_GRAPHICS_API_DIRECT3D
+            float fogAmount = clamp(exp((streams.ShadingPosition.w - FogStart) * FogColor.a), 0.0, 1.0);
+#else
+            float fogAmount = clamp(exp(((1.0 / streams.ShadingPosition.w) - FogStart) * FogColor.a), 0.0, 1.0);
+#endif
+            streams.shadingColor = lerp(FogColor.rgb, streams.shadingColor, fogAmount) * alpha;
+        }
+    };
+}
+
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/FogFeature.xksl.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/FogFeature.xksl.cs
new file mode 100644
index 0000000000..2823f617fc
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/FogFeature.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Materials
+{
+    public static partial class FogFeatureKeys
+    {
+        public static readonly ValueParameterKey<Vector4> FogColor = ParameterKeys.NewValue<Vector4>();
+        public static readonly ValueParameterKey<float> FogStart = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/ComputeColorMaterialAlphaBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputNormals.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/ComputeColorMaterialAlphaBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputNormals.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSpecularColorRoughness.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSpecularColorRoughness.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSpecularColorRoughness.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSpecularColorRoughness.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSubsurfaceScatteringMaterialIndex.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSubsurfaceScatteringMaterialIndex.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSubsurfaceScatteringMaterialIndex.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputSubsurfaceScatteringMaterialIndex.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputNormals.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetEnvironmentFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/GBufferOutputNormals.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetEnvironmentFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetEnvironmentFunction.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetFresnelFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetEnvironmentFunction.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetFresnelFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetFresnelFunction.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetNormalDistributionFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetFresnelFunction.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetNormalDistributionFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetNormalDistributionFunction.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetVisibilityFunction.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetNormalDistributionFunction.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetVisibilityFunction.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetVisibilityFunction.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialStreamBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSpecularMicrofacetVisibilityFunction.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialStreamBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialStreamBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurface.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialStreamBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurface.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurface.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfacePixel.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurface.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfacePixel.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfacePixel.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfacePixel.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceVertex.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceVertex.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialFrontBackBlendShader.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialFrontBackBlendShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialFrontBackBlendShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialFrontBackBlendShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialKeys.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialKeys.cs
index b7ae7d34f1..b232d4fd0a 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialKeys.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialKeys.cs
@@ -42,7 +42,6 @@ public class MaterialKeys
         public static readonly ValueParameterKey<float> DiffuseSpecularAlphaBlendValue = ParameterKeys.NewValue<float>();
 
         public static readonly ObjectParameterKey<Texture> AlphaBlendColorMap = ParameterKeys.NewObject<Texture>();
-        public static readonly ValueParameterKey<Color3> AlphaBlendColorValue = ParameterKeys.NewValue<Color3>();
 
         public static readonly ObjectParameterKey<Texture> AlphaDiscardMap = ParameterKeys.NewObject<Texture>();
         public static readonly ValueParameterKey<float> AlphaDiscardValue = ParameterKeys.NewValue<float>();
@@ -106,6 +105,11 @@ public class MaterialKeys
         /// </summary>
         public static readonly ValueParameterKey<Vector2> TextureOffset = ParameterKeys.NewValue<Vector2>();
 
+        /// <summary>
+        /// Texture color tint
+        /// </summary>
+        public static readonly ValueParameterKey<Color3> TextureTint = ParameterKeys.NewValue<Color3>();
+
         /// <summary>
         /// Generic texture key used by a material
         /// </summary>
@@ -122,11 +126,15 @@ public class MaterialKeys
 
         public static readonly PermutationParameterKey<bool> HasNormalMap = ParameterKeys.NewPermutation<bool>();
 
+        public static readonly PermutationParameterKey<bool> SkipTangents = ParameterKeys.NewPermutation<bool>();
+
         public static readonly PermutationParameterKey<bool> HasSkinningTangent = ParameterKeys.NewPermutation<bool>();
 
         public static readonly PermutationParameterKey<int> SkinningMaxBones = ParameterKeys.NewPermutation<int>(56);
         
         public static readonly PermutationParameterKey<bool> UsePixelShaderWithDepthPass = ParameterKeys.NewPermutation<bool>();
+        
+        public static readonly PermutationParameterKey<bool> UseDitheredShadows = ParameterKeys.NewPermutation<bool>();
 
         static MaterialKeys()
         {
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceVertex.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelShadingStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/IMaterialSurfaceVertex.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelShadingStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.xksl b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.xksl
index b208fd79a4..4234b87ef7 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.xksl
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.xksl
@@ -40,7 +40,6 @@ namespace Xenko.Rendering.Materials
 
         // Transparent attributes
         stage stream float2  matDiffuseSpecularAlphaBlend;
-        stage stream float3  matAlphaBlendColor;
         stage stream float   matAlphaDiscard;
 
         // Inputs while shading a material surface
@@ -90,7 +89,6 @@ namespace Xenko.Rendering.Materials
             streams.matScatteringStrength = 1.0f;
 
             streams.matDiffuseSpecularAlphaBlend = 1.0f;
-            streams.matAlphaBlendColor = 1.0f;
             streams.matAlphaDiscard = 0.1f;
         }
 
@@ -100,8 +98,8 @@ namespace Xenko.Rendering.Materials
             streams.lightDirectAmbientOcclusion = lerp(1.0, streams.matAmbientOcclusion, streams.matAmbientOcclusionDirectLightingFactor);
 
             // Diffuse visible 
-            streams.matDiffuseVisible = streams.matDiffuse.rgb * lerp(1.0f, streams.matCavity, streams.matCavityDiffuse) * streams.matDiffuseSpecularAlphaBlend.r * streams.matAlphaBlendColor;
-            streams.matSpecularVisible = streams.matSpecular.rgb * streams.matSpecularIntensity * lerp(1.0f, streams.matCavity, streams.matCavitySpecular) * streams.matDiffuseSpecularAlphaBlend.g * streams.matAlphaBlendColor;
+            streams.matDiffuseVisible = streams.matDiffuse.rgb * lerp(1.0f, streams.matCavity, streams.matCavityDiffuse) * streams.matDiffuseSpecularAlphaBlend.r;
+            streams.matSpecularVisible = streams.matSpecular.rgb * streams.matSpecularIntensity * lerp(1.0f, streams.matCavity, streams.matCavitySpecular) * streams.matDiffuseSpecularAlphaBlend.g;
 
             streams.NdotV = max(dot(streams.normalWS, streams.viewWS), 0.0001f);
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelShadingStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelShadingStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXLUT.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXPolynomial.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialPixelStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXPolynomial.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentThinGlass.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentThinGlass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentThinGlass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentThinGlass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXPolynomial.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelNone.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetEnvironmentGGXPolynomial.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelNone.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelNone.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelSchlick.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelNone.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelSchlick.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelSchlick.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelThinGlass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelSchlick.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelThinGlass.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelThinGlass.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBeckmann.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetFresnelThinGlass.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBeckmann.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBeckmann.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBlinnPhong.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBeckmann.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBlinnPhong.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBlinnPhong.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionGGX.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionBlinnPhong.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionGGX.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionGGX.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityCookTorrance.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetNormalDistributionGGX.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityCookTorrance.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityCookTorrance.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityImplicit.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityCookTorrance.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityImplicit.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityImplicit.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityKelemen.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityImplicit.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityKelemen.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityKelemen.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityNeumann.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityKelemen.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityNeumann.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityNeumann.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithBeckmann.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilityNeumann.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithBeckmann.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithBeckmann.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithBeckmann.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamLinearBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamLinearBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamLinearBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamNormalBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamLinearBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamNormalBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamNormalBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceArray.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialStreamNormalBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceArray.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceArray.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuse.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceArray.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuse.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuse.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseMetalFlakes.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuse.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseMetalFlakes.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseMetalFlakes.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseSpecularAlphaBlendColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseMetalFlakes.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseSpecularAlphaBlendColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseSpecularAlphaBlendColor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceEmissiveShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceDiffuseSpecularAlphaBlendColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceEmissiveShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceEmissiveShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMap.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceEmissiveShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMap.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMap.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMapMetalFlakes.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMap.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMapMetalFlakes.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMapMetalFlakes.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceLightingAndShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceGlossinessMapMetalFlakes.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceLightingAndShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceLightingAndShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceMetalness.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceLightingAndShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceMetalness.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceMetalness.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalMap.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceMetalness.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalMap.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalMap.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalStreamShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalMap.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalStreamShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalStreamShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfacePixelStageCompositor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceNormalStreamShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfacePixelStageCompositor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfacePixelStageCompositor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceSetStreamFromComputeColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfacePixelStageCompositor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceSetStreamFromComputeColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceSetStreamFromComputeColor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceSetStreamFromComputeColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingDiffuseLambert.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingDiffuseLambert.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingDiffuseLambert.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularBlinnPhong.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingDiffuseLambert.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularBlinnPhong.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularBlinnPhong.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularMicrofacet.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularBlinnPhong.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularMicrofacet.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularMicrofacet.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceShadingSpecularMicrofacet.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamsBlend.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamsBlend.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamsBlend.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransmittanceShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceStreamsBlend.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransmittanceShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransmittanceShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransparentAlphaDiscard.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransmittanceShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransparentAlphaDiscard.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransparentAlphaDiscard.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexDisplacement.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceTransparentAlphaDiscard.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexDisplacement.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexDisplacement.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexStageCompositor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexDisplacement.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexStageCompositor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialTransmittanceReflectanceStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialTransmittanceReflectanceStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialTransmittanceReflectanceStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialTransmittanceReflectanceStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexStageCompositor.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialVertexStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialSurfaceVertexStageCompositor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialVertexStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs
index d88af0fc7b..89e8b66729 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Materials/ShadingModelShaderBuilder.cs
@@ -20,4 +20,4 @@ public class ShadingModelShaderBuilder
 
         public ShaderSource LightDependentSurface { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/MaterialSurfaceSubsurfaceScatteringShading.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/MaterialSurfaceSubsurfaceScatteringShading.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/MaterialSurfaceSubsurfaceScatteringShading.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/MaterialSurfaceSubsurfaceScatteringShading.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialVertexStream.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/IMaterialSubsurfaceScatteringScatteringProfile.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/Shaders/MaterialVertexStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/IMaterialSubsurfaceScatteringScatteringProfile.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomUniform1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomUniform.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomUniform1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomUniform.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/IMaterialSubsurfaceScatteringScatteringProfile1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomVarying.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/IMaterialSubsurfaceScatteringScatteringProfile1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomVarying.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomVarying1.cs b/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileSkin.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileCustomVarying1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileSkin.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/MeshDraw.cs b/sources/engine/Xenko.Rendering/Rendering/MeshDraw.cs
index 9fe035f2b8..f188e82193 100644
--- a/sources/engine/Xenko.Rendering/Rendering/MeshDraw.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/MeshDraw.cs
@@ -1,8 +1,11 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System;
 using Xenko.Core;
+using Xenko.Core.Mathematics;
 using Xenko.Graphics;
+using Xenko.Rendering.Rendering;
 
 namespace Xenko.Rendering
 {
@@ -10,14 +13,22 @@ namespace Xenko.Rendering
     [DataContract]
     public class MeshDraw
     {
-        public PrimitiveType PrimitiveType;
+        virtual public PrimitiveType PrimitiveType { get; set; }
 
-        public int DrawCount;
+        virtual public int DrawCount { get; set; }
 
-        public int StartLocation;
+        virtual public int StartLocation { get; set; }
 
-        public VertexBufferBinding[] VertexBuffers;
+        virtual public VertexBufferBinding[] VertexBuffers { get; set; }
 
-        public IndexBufferBinding IndexBuffer;
+        virtual public IndexBufferBinding IndexBuffer { get; set; }
+
+        virtual internal Action<GraphicsDevice, StagedMeshDraw> performStage { get; set; }
+
+        virtual internal Action<BoundingFrustum> updateVerts { get; set; }
+
+        virtual internal Action<CommandList> uploadVerts { get; set; }
+
+        virtual internal StagedMeshDraw getStagedMeshDraw { get; set; }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/MeshPipelineProcessor.cs b/sources/engine/Xenko.Rendering/Rendering/MeshPipelineProcessor.cs
index 055c1ce838..b0ea062d87 100644
--- a/sources/engine/Xenko.Rendering/Rendering/MeshPipelineProcessor.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/MeshPipelineProcessor.cs
@@ -21,9 +21,24 @@ public override void Process(RenderNodeReference renderNodeReference, ref Render
             if (renderNode.RenderStage == TransparentRenderStage)
             {
                 pipelineState.BlendState = renderMesh.MaterialPass.BlendState ?? BlendStates.AlphaBlend;
-                pipelineState.DepthStencilState = DepthStencilStates.DepthRead;
                 if (isMultisample)
-                    pipelineState.BlendState.AlphaToCoverageEnable = true;
+                    pipelineState.BlendState.AlphaToCoverageEnable = renderMesh.MaterialPass.AlphaToCoverage ?? true;
+            }
+
+            switch (renderMesh.DepthMode)
+            {
+                case MESH_DEPTH_MODE.Default:
+                    pipelineState.DepthStencilState = renderNode.RenderStage == TransparentRenderStage ? DepthStencilStates.DepthRead : DepthStencilStates.Default;
+                    break;
+                case MESH_DEPTH_MODE.DefaultForceWrite:
+                    pipelineState.DepthStencilState = DepthStencilStates.Default;
+                    break;
+                case MESH_DEPTH_MODE.NoDepthTest:
+                    pipelineState.DepthStencilState = DepthStencilStates.None;
+                    break;
+                case MESH_DEPTH_MODE.ReverseDepthTest:
+                    pipelineState.DepthStencilState = DepthStencilStates.DefaultInverse;
+                    break;
             }
 
             var cullMode = pipelineState.RasterizerState.CullMode;
diff --git a/sources/engine/Xenko.Rendering/Rendering/MeshRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/MeshRenderFeature.cs
index 8771f95b4d..9c6d1d5fbb 100644
--- a/sources/engine/Xenko.Rendering/Rendering/MeshRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/MeshRenderFeature.cs
@@ -11,6 +11,7 @@
 using Xenko.Core.Mathematics;
 using Xenko.Core.Threading;
 using Xenko.Graphics;
+using Xenko.Rendering.Rendering;
 using Buffer = Xenko.Graphics.Buffer;
 
 namespace Xenko.Rendering
@@ -32,6 +33,12 @@ public class MeshRenderFeature : RootEffectRenderFeature
         [MemberCollection(CanReorderItems = true, NotNullItems = true)]
         public TrackingCollection<SubRenderFeature> RenderFeatures = new TrackingCollection<SubRenderFeature>();
 
+        /// <summary>
+        /// Use linear (fast) light attenuation? Defaults to false. Requires scene to be reloaded to be visible in editor
+        /// </summary>
+        [DataMember]
+        public bool LinearLightAttenuation { get; set; } = false;
+
         /// <inheritdoc/>
         public override Type SupportedRenderObjectType => typeof(RenderMesh);
 
@@ -91,19 +98,11 @@ public override void Extract()
         /// <inheritdoc/>
         public override void PrepareEffectPermutationsImpl(RenderDrawContext context)
         {
-            // Setup ActiveMeshDraw
-            Dispatcher.ForEach(RenderObjects, renderObject =>
-            {
-                var renderMesh = (RenderMesh)renderObject;
-
-                renderMesh.ActiveMeshDraw = renderMesh.Mesh.Draw;
-            });
-
             base.PrepareEffectPermutationsImpl(context);
 
-            foreach (var renderFeature in RenderFeatures)
+            for (int i=0; i<RenderFeatures.Count; i++)
             {
-                renderFeature.PrepareEffectPermutations(context);
+                RenderFeatures[i].PrepareEffectPermutations(context);
             }
         }
 
@@ -113,9 +112,9 @@ public override void Prepare(RenderDrawContext context)
             base.Prepare(context);
 
             // Prepare each sub render feature
-            foreach (var renderFeature in RenderFeatures)
+            for (int i=0; i<RenderFeatures.Count; i++)
             {
-                renderFeature.Prepare(context);
+                RenderFeatures[i].Prepare(context);
             }
         }
 
@@ -124,6 +123,9 @@ protected override void ProcessPipelineState(RenderContext context, RenderNodeRe
             var renderMesh = (RenderMesh)renderObject;
             var drawData = renderMesh.ActiveMeshDraw;
 
+            if (drawData.performStage != null)
+                drawData.performStage(context.GraphicsDevice, drawData.getStagedMeshDraw);
+
             pipelineState.InputElements = PrepareInputElements(pipelineState, drawData);
             pipelineState.PrimitiveType = drawData.PrimitiveType;
 
@@ -173,18 +175,30 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                 // Get effect
                 // TODO: Use real effect slot
                 var renderEffect = renderNode.RenderEffect;
-                if (renderEffect.Effect == null)
+                if (renderEffect?.Effect == null || renderEffect.Reflection == null || renderEffect.PipelineState.CurrentState() != PipelineState.PIPELINE_STATE.READY)
                     continue;
 
                 // Bind VB
                 if (currentDrawData != drawData)
                 {
+                    // make sure buffers are ready first
+                    if (drawData.IndexBuffer != null && drawData.IndexBuffer.Buffer.Ready == false) continue;
+                    for (int slot = 0; slot < drawData.VertexBuffers.Length; slot++)
+                        if (drawData.VertexBuffers[slot].Buffer.Ready == false) goto skip_loop;
+
+                    if (drawData.uploadVerts != null)
+                        drawData.uploadVerts(commandList);
+
+                    // ok, buffers ready, set
                     for (int slot = 0; slot < drawData.VertexBuffers.Length; slot++)
                     {
                         var vertexBuffer = drawData.VertexBuffers[slot];
                         commandList.SetVertexBuffer(slot, vertexBuffer.Buffer, vertexBuffer.Offset, vertexBuffer.Stride);
                     }
 
+                    if (drawData.IndexBuffer != null)
+                        commandList.SetIndexBuffer(drawData.IndexBuffer.Buffer, drawData.IndexBuffer.Offset, drawData.IndexBuffer.Is32Bit);
+
                     // If the mesh's vertex buffers miss any input streams, an additional input binding will have been added to the pipeline state.
                     // We bind an additional empty vertex buffer to that slot handle those streams gracefully.
                     if (emptyBufferSlot != drawData.VertexBuffers.Length)
@@ -193,8 +207,6 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                         emptyBufferSlot = drawData.VertexBuffers.Length;
                     }
 
-                    if (drawData.IndexBuffer != null)
-                        commandList.SetIndexBuffer(drawData.IndexBuffer.Buffer, drawData.IndexBuffer.Offset, drawData.IndexBuffer.Is32Bit);
                     currentDrawData = drawData;
                 }
 
@@ -212,7 +224,7 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                 }
 
                 commandList.SetPipelineState(renderEffect.PipelineState);
-                commandList.SetDescriptorSets(0, descriptorSetsLocal);
+                commandList.SetDescriptorSets(descriptorSetsLocal);
 
                 // Draw
                 if (drawData.IndexBuffer == null)
@@ -223,6 +235,7 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                 {
                     commandList.DrawIndexed(drawData.DrawCount, drawData.StartLocation);
                 }
+                skip_loop:;
             }
         }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/MeshVelocityRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/MeshVelocityRenderFeature.cs
index 21ec7c1f66..54b204cc28 100644
--- a/sources/engine/Xenko.Rendering/Rendering/MeshVelocityRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/MeshVelocityRenderFeature.cs
@@ -75,7 +75,7 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
 
                     if (renderEffect != null)
                     {
-                        renderEffect.EffectValidator.ValidateParameter(XenkoEffectBaseKeys.ComputeVelocityShader, new ShaderClassSource("MeshVelocity"));
+                        renderEffect.EffectValidator.ValidateParameterThreaded(XenkoEffectBaseKeys.ComputeVelocityShader, new ShaderClassSource("MeshVelocity"));
                     }
                 }
             });
@@ -149,7 +149,7 @@ public override unsafe void Prepare(RenderDrawContext context)
             // Update cbuffer for previous WVP matrix
             Dispatcher.ForEach(((RootEffectRenderFeature)RootRenderFeature).RenderNodes, (ref RenderNode renderNode) =>
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                 if (perDrawLayout == null)
                     return;
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Model.cs b/sources/engine/Xenko.Rendering/Rendering/Model.cs
index dc72719145..7b165ee37b 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Model.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Model.cs
@@ -30,21 +30,12 @@ public class Model : IEnumerable
     {
         private List<Mesh> meshes = new List<Mesh>();
         private readonly List<MaterialInstance> materials = new List<MaterialInstance>();
-        private IList<Model> children;
-        private Model parent;
 
         /// <summary>
-        /// Gets the views.
+        /// This really has no use, but required for serialization backwards compatibility.
         /// </summary>
-        /// <value>
-        /// The views.
-        /// </value>
         [MemberCollection(NotNullItems = true)]
-        public IList<Model> Children
-        {
-            get { return children; }
-            set { children = value; }
-        }
+        public IList<Model> Children { get; set; }
 
         /// <summary>
         /// Gets the materials.
@@ -93,21 +84,10 @@ public List<Mesh> Meshes
         /// <value>The bounding sphere.</value>
         public BoundingSphere BoundingSphere { get; set; }
 
-        // Temporarily removed
-        //[DataMemberConvert]
-        //public ParameterCollection Parameters
-        //{
-        //    get { return parameters; }
-        //}
-
         /// <summary>
-        /// Adds the specified model view (for collection Initializers).
+        /// Adjust smallness used for automatic culling. Can be useful for long and skinny things (lower number) or things you want to show more (higher number)
         /// </summary>
-        /// <param name="model">The model view.</param>
-        public void Add(Model model)
-        {
-            children.Add(model);
-        }
+        public float SmallFactorMultiplierOverride { get; set; } = 1f;
 
         /// <summary>
         /// Adds the specified mesh (for collection Initializers).
@@ -115,7 +95,35 @@ public void Add(Model model)
         /// <param name="mesh">The mesh.</param>
         public void Add(Mesh mesh)
         {
-            Meshes.Add(mesh);
+            if (mesh != null) Meshes.Add(mesh);
+        }
+
+        /// <summary>
+        /// Merges models
+        /// </summary>
+        /// <param name="model">Model to merge</param>
+        /// <param name="updateBoundingBox">Should we update the bounding box to include both models?</param>
+        /// <param name="shiftMeshMaterialIndicies">Should we shift mesh material indicies to align with existing materials in the model?</param>
+        public void Add(Model model, bool updateBoundingBox = true, bool shiftMeshMaterialIndicies = false)
+        {
+            if (model != null)
+            {
+                int indexShift = shiftMeshMaterialIndicies ? materials.Count : 0;
+
+                for (int i=0; i<model.meshes.Count; i++)
+                {
+                    Mesh m = model.meshes[i];
+                    m.MaterialIndex += indexShift;
+                    Add(m);
+                }
+                for (int i=0; i<model.materials.Count; i++)
+                {
+                    Add(model.materials[i]);
+                }
+
+                if (Skeleton == null) Skeleton = model.Skeleton;
+                if (updateBoundingBox) UpdateBoundingBox();
+            }
         }
 
         /// <summary>
@@ -124,7 +132,7 @@ public void Add(Mesh mesh)
         /// <param name="material">The mesh.</param>
         public void Add(MaterialInstance material)
         {
-            Materials.Add(material);
+            if (material != null) Materials.Add(material);
         }
 
         IEnumerator IEnumerable.GetEnumerator()
@@ -132,6 +140,32 @@ IEnumerator IEnumerable.GetEnumerator()
             return meshes.Cast<object>().Concat(materials).GetEnumerator();
         }
 
+        /// <summary>
+        /// Takes all meshes and updates my bounding box accordingly
+        /// </summary>
+        public void UpdateBoundingBox()
+        {
+            //handle boundng box/sphere for whole model
+            BoundingBox bb = new BoundingBox(new Vector3(float.PositiveInfinity, float.PositiveInfinity, float.PositiveInfinity),
+                                             new Vector3(float.NegativeInfinity, float.NegativeInfinity, float.NegativeInfinity));
+
+            for (int i = 0; i < meshes.Count; i++)
+            {
+                Vector3 max = meshes[i].BoundingBox.Maximum;
+                Vector3 min = meshes[i].BoundingBox.Minimum;
+
+                // update bounding box?
+                if (max.X > bb.Maximum.X) bb.Maximum.X = max.X;
+                if (max.Y > bb.Maximum.Y) bb.Maximum.Y = max.Y;
+                if (max.Z > bb.Maximum.Z) bb.Maximum.Z = max.Z;
+                if (min.X < bb.Minimum.X) bb.Minimum.X = min.X;
+                if (min.Y < bb.Minimum.Y) bb.Minimum.Y = min.Y;
+                if (min.Z < bb.Minimum.Z) bb.Minimum.Z = min.Z;
+            }
+
+            BoundingBox = bb;
+        }
+
         /// <summary>
         /// Create a clone with its own ParameterCollection.
         /// It allows reuse of a single Model for multiple ModelComponent.
@@ -139,14 +173,6 @@ IEnumerator IEnumerable.GetEnumerator()
         public Model Instantiate()
         {
             var result = new Model();
-            if (Children != null)
-            {
-                result.Children = new List<Model>();
-                foreach (var child in Children)
-                {
-                    result.Children.Add(child.Instantiate());
-                }
-            }
 
             foreach (var mesh in Meshes)
             {
@@ -159,23 +185,5 @@ public Model Instantiate()
 
             return result;
         }
-
-        private void Children_CollectionChanged(object sender, TrackingCollectionChangedEventArgs e)
-        {
-            var child = (Model)e.Item;
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    if (child.parent != null)
-                        throw new InvalidOperationException("Model already have a parent.");
-                    child.parent = this;
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    if (child.parent != this)
-                        throw new InvalidOperationException("Model doesn't have expected parent.");
-                    child.parent = null;
-                    break;
-            }
-        }
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/ProceduralModels/CameraCube.cs b/sources/engine/Xenko.Rendering/Rendering/ProceduralModels/CameraCube.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/ProceduralModels/CameraCube.cs
rename to sources/engine/Xenko.Rendering/Rendering/ProceduralModels/CameraCube.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/ProceduralModels/PrimitiveProceduralModelBase.cs b/sources/engine/Xenko.Rendering/Rendering/ProceduralModels/PrimitiveProceduralModelBase.cs
index 6f7a8caf6e..423761df18 100644
--- a/sources/engine/Xenko.Rendering/Rendering/ProceduralModels/PrimitiveProceduralModelBase.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/ProceduralModels/PrimitiveProceduralModelBase.cs
@@ -51,6 +51,16 @@ public void SetMaterial(string name, Material material)
         [DataMember(530)]
         public Vector3 LocalOffset { get; set; }
 
+        /// <summary>
+        /// Gets or sets the number of texture coordinates to generate. A value between 1 and 10, inclusive.
+        /// </summary>
+        /// <value>
+        /// The number of texure coordinates.
+        /// </value>
+        [DataMember(540)]
+        [DataMemberRange(1, 10)]
+        public int NumOfTexCoords { get; set; } = 10;
+
         /// <summary>
         /// Gets the material instance.
         /// </summary>
@@ -121,7 +131,8 @@ public void Generate(IServiceRegistry services, Model model)
             var resultWithTangentBiNormal = VertexHelper.GenerateTangentBinormal(originalLayout, data.Vertices, data.Indices);
 
             // Generate Multitexcoords
-            var result = VertexHelper.GenerateMultiTextureCoordinates(resultWithTangentBiNormal);
+            var maxTexCoords = MathUtil.Clamp(NumOfTexCoords, 1, 10) - 1;
+            var result = VertexHelper.GenerateMultiTextureCoordinates(resultWithTangentBiNormal, vertexStride: 0, maxTexCoords);
 
             var meshDraw = new MeshDraw();
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Properties.cs b/sources/engine/Xenko.Rendering/Rendering/Properties.cs
index 4a5d83be90..5bab5dadd1 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Properties.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Properties.cs
@@ -5,6 +5,8 @@
 #pragma warning disable SA1649 // File name must match first type name
 #pragma warning disable SA1402 // File may only contain a single class
 
+using System.Runtime.CompilerServices;
+
 namespace Xenko.Rendering
 {
     public enum DataType
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderContext.cs b/sources/engine/Xenko.Rendering/Rendering/RenderContext.cs
index 8c410ce6e2..62a4d58bfb 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderContext.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderContext.cs
@@ -9,6 +9,7 @@
 using Xenko.Engine;
 using Xenko.Games;
 using Xenko.Graphics;
+using Xenko.Rendering.Lights;
 using Xenko.Streaming;
 using ComponentBase = Xenko.Core.ComponentBase;
 using IServiceRegistry = Xenko.Core.IServiceRegistry;
@@ -115,6 +116,11 @@ internal RenderContext(IServiceRegistry services)
         [CanBeNull]
         public StreamingManager StreamingManager { get; set; }
 
+        /// <summary>
+        /// Lights for this context
+        /// </summary>
+        public RenderLightCollection Lights { get; set; }
+
         protected override void Destroy()
         {
             foreach (var renderDrawContext in threadContext.Values)
@@ -171,16 +177,20 @@ public RenderViewRestore PushRenderViewAndRestore(RenderView renderView)
 
         public void Reset()
         {
-            foreach (var context in threadContext.Values)
+            var contextList = threadContext.Values;     // returns IList so don't use foreach otherwise an object will be allocated
+            for (int i = 0; i < contextList.Count; i++)
             {
+                var context = contextList[i];
                 context.ResourceGroupAllocator.Reset(context.CommandList);
             }
         }
 
         public void Flush()
         {
-            foreach (var context in threadContext.Values)
+            var contextList = threadContext.Values;     // returns IList so don't use foreach otherwise an object will be allocated
+            for (int i = 0; i < contextList.Count; i++)
             {
+                var context = contextList[i];
                 context.ResourceGroupAllocator.Flush();
                 context.QueryManager.Flush();
             }
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderEffect.cs b/sources/engine/Xenko.Rendering/Rendering/RenderEffect.cs
index 1558e32c5e..d4aea6f5fd 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderEffect.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderEffect.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Xenko.Graphics;
 
@@ -31,10 +32,43 @@ public class RenderEffect
         public Effect Effect;
         public RenderEffectReflection Reflection;
 
+        private List<PipelineState> Pipelines = new List<PipelineState>();
+
+        public bool NeedsNewPipeline { get; private set; }
+
         /// <summary>
         /// Compiled pipeline state.
         /// </summary>
-        public PipelineState PipelineState;
+        public PipelineState PipelineState
+        {
+            get
+            {
+                // get first ready pipeline
+                for (int i=0; i < Pipelines.Count; i++)
+                {
+                    var p = Pipelines[i];
+                    if (p.CurrentState() == PipelineState.PIPELINE_STATE.READY)
+                    {
+                        // remove no longer needed pipeline references
+                        if (i + 1 < Pipelines.Count) Pipelines.RemoveRange(i + 1, Pipelines.Count - (i + 1));
+                        return p;
+                    }
+                }
+
+                // couldn't find a ready pipeline, just return the latest
+                return Pipelines.Count > 0 ? Pipelines[0] : null;
+            }
+            set
+            {
+                if (value == null)
+                    NeedsNewPipeline = true;
+                else
+                {
+                    NeedsNewPipeline = false;
+                    if (Pipelines.Contains(value) == false) Pipelines.Insert(0, value);
+                }                    
+            }
+        }
 
         /// <summary>
         /// Validates if effect needs to be compiled or recompiled.
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderMesh.cs b/sources/engine/Xenko.Rendering/Rendering/RenderMesh.cs
index b1dcb57001..534ee55075 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderMesh.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderMesh.cs
@@ -6,6 +6,32 @@
 
 namespace Xenko.Rendering
 {
+    /// <summary>
+    /// How should this mesh use depth testing?
+    /// </summary>
+    public enum MESH_DEPTH_MODE
+    {
+        /// <summary>
+        /// Default depth testing and writing (not seen behind walls etc.)
+        /// </summary>
+        Default,
+
+        /// <summary>
+        /// Default depth testing and always writing to the depth buffer, even if transparent
+        /// </summary>
+        DefaultForceWrite,
+
+        /// <summary>
+        /// Always draw this, regardless of depth
+        /// </summary>
+        NoDepthTest,
+
+        /// <summary>
+        /// Draw this only behind walls (inverse of default)
+        /// </summary>
+        ReverseDepthTest
+    }
+
     /// <summary>
     /// Used by <see cref="MeshRenderFeature"/> to render a <see cref="Rendering.Mesh"/>.
     /// </summary>
@@ -21,8 +47,19 @@ public class RenderMesh : RenderObject
         public Mesh Mesh;
 
         // Material
-        // TODO: Extract with MaterialRenderFeature
-        public MaterialPass MaterialPass;
+        private MaterialPass _mpass;
+
+        public MaterialPass MaterialPass
+        {
+            set
+            {
+                _mpass = value;
+            }
+            get
+            {
+                return _mpass ?? MaterialRenderFeature.fallbackMaterial.Passes[0];
+            }
+        }
 
         // TODO GRAPHICS REFACTOR store that in RenderData (StaticObjectNode?)
         internal MaterialRenderFeature.MaterialInfo MaterialInfo;
@@ -31,10 +68,14 @@ public class RenderMesh : RenderObject
 
         public bool IsScalingNegative;
 
+        public MESH_DEPTH_MODE DepthMode;
+
         public bool IsPreviousScalingNegative;
 
         public Matrix World = Matrix.Identity;
 
         public Matrix[] BlendMatrices;
+
+        public bool lastTransparency;
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderModel.cs b/sources/engine/Xenko.Rendering/Rendering/RenderModel.cs
index 5bf2ad0142..7587b67d73 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderModel.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderModel.cs
@@ -12,9 +12,15 @@ public class RenderModel
     {
         public Model Model;
         public RenderMesh[] Meshes;
+        /// <summary>
+        /// The number of <see cref="Mesh"/>es when <see cref="Meshes"/> was generated.
+        /// </summary>
+        /// <remarks>
+        /// A single mesh may be split into multiple RenderMeshes due to multiple material passes.
+        /// </remarks>
+        public int UniqueMeshCount;
         public MaterialInfo[] Materials;
 
-
         public struct MaterialInfo
         {
             public Material Material;
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderObject.cs b/sources/engine/Xenko.Rendering/Rendering/RenderObject.cs
index 1dc146225d..69351062e3 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderObject.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderObject.cs
@@ -29,6 +29,7 @@ public abstract class RenderObject
         public ActiveRenderStage[] ActiveRenderStages;
         public uint StateSortKey;
         public readonly int Index = Interlocked.Increment(ref currentIndex);
+        public float DistanceSortFudge = 0f, SmallFactorMultiplier = 1f;
 
         // TODO: Switch to a "StaticPropertyContainer" that will be optimized by assembly processor
         //public PropertyContainer Tags;
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderSystem.cs b/sources/engine/Xenko.Rendering/Rendering/RenderSystem.cs
index ba5bb614cd..55fa96f701 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderSystem.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderSystem.cs
@@ -225,21 +225,19 @@ public unsafe void Prepare(RenderDrawContext context)
         {
             // Sync point: after extract, before prepare (game simulation could resume now)
 
-            // Generate and execute prepare effect jobs
-            foreach (var renderFeature in RenderFeatures)
-            // We might be able to parallelize too as long as we resepect render feature dependency graph (probably very few dependencies in practice)
-            {
+            // Split up Prepare Effects
+            Dispatcher.For(0, RenderFeatures.Count, i => {
                 // Divide into task chunks for parallelism
+                RootRenderFeature renderFeature = RenderFeatures[i];
                 renderFeature.PrepareEffectPermutations(context);
-            }
+            });
 
-            // Generate and execute prepare jobs
-            foreach (var renderFeature in RenderFeatures)
-            // We might be able to parallelize too as long as we resepect render feature dependency graph (probably very few dependencies in practice)
-            {
+            // split up Prepares
+            Dispatcher.For(0, RenderFeatures.Count, i => {
                 // Divide into task chunks for parallelism
+                RootRenderFeature renderFeature = RenderFeatures[i];
                 renderFeature.Prepare(context);
-            }
+            });
 
             // Sort
             Dispatcher.ForEach(Views, view =>
@@ -344,7 +342,7 @@ public void Draw(RenderDrawContext renderDrawContext, RenderView renderView, Ren
             else
             {
                 // Create at most one batch per processor
-                int batchCount = Math.Min(Environment.ProcessorCount, renderNodeCount);
+                int batchCount = Math.Min(Xenko.Core.Threading.Dispatcher.MaxDegreeOfParallelism, renderNodeCount);
                 int batchSize = (renderNodeCount + (batchCount - 1)) / batchCount;
                 batchCount = (renderNodeCount + (batchSize - 1)) / batchSize;
 
@@ -452,6 +450,28 @@ protected override void Destroy()
             base.Destroy();
         }
 
+        /// <summary>
+        /// Wait for shaders to compile (true), or skip rendering until a shader compiles (false). Defaults to false. True can cause significant lockups.
+        /// </summary>
+        public static bool WaitForShaderCompilation = false;
+
+        /// <summary>
+        /// Returns how many shaders are currently compiling. Some geometry may be invisible while this is > 0.
+        /// </summary>
+        public static int CompilingShadersCount {
+            get {
+                if (WaitForShaderCompilation) return 0;
+                // status >= 5 means cancelled, faulted or rantocompletion
+                PossiblyCompilingEffects.RemoveWhere((RenderEffect re) => (re.PendingEffect == null || (int)re.PendingEffect.Status >= 5));
+                return PossiblyCompilingEffects.Count;
+            }
+        }
+
+        /// <summary>
+        /// Used to track compilation shaders for counting. Use CompilingShadersCount for proper determination. Set internally.
+        /// </summary>
+        public static HashSet<RenderEffect> PossiblyCompilingEffects { get; private set; } = new HashSet<RenderEffect>();
+
         /// <summary>
         /// Reset render objects and features. Should be called at beginning of Extract phase.
         /// </summary>
diff --git a/sources/engine/Xenko.Rendering/Rendering/RenderView.cs b/sources/engine/Xenko.Rendering/Rendering/RenderView.cs
index 207f81e002..4416e33165 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RenderView.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RenderView.cs
@@ -35,9 +35,14 @@ public class RenderView
         /// </summary>
         public int Index = -1;
 
+        /// <summary>
+        /// CameraComponent used for this renderview
+        /// </summary>
+        public object Camera;
+
         internal int LastFrameCollected;
 
-        internal float MinimumDistance;
+        internal float MinimumDistance, CameraFOV;
 
         internal float MaximumDistance;
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/ResolutionStretch.cs b/sources/engine/Xenko.Rendering/Rendering/ResolutionStretch.cs
index e1797c0b6b..ae023915ca 100644
--- a/sources/engine/Xenko.Rendering/Rendering/ResolutionStretch.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/ResolutionStretch.cs
@@ -25,5 +25,15 @@ public enum ResolutionStretch
         /// The resolution is determined by the height, the ratio of the target, and the depth.
         /// </summary>
         FixedHeightAdaptableWidth,
+
+        /// <summary>
+        /// Proportionally shrinks or grows in either direction as needed so nothing gets cut off, and screen is filled.
+        /// </summary>
+        AutoFit,
+
+        /// <summary>
+        /// Proportionally sizes UI up to the resolution, but no more. Shrinks if needed so nothing gets cut off.
+        /// </summary>
+        AutoShrink
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/ResourceResolver.cs b/sources/engine/Xenko.Rendering/Rendering/ResourceResolver.cs
index 1d272f69ff..93aaefc475 100644
--- a/sources/engine/Xenko.Rendering/Rendering/ResourceResolver.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/ResourceResolver.cs
@@ -33,8 +33,10 @@ public Texture GetDepthStencilAsRenderTarget(Texture texture, Texture readOnlyCa
             if (!renderContext.GraphicsDevice.Features.HasDepthAsSRV || !renderContext.GraphicsDevice.Features.HasDepthAsReadOnlyRT)
                 return texture;
 
-            // Check if changed
-            if (readOnlyCached != null && readOnlyCached.ParentTexture == texture)
+            // Check if changed (include size check too)
+            if (readOnlyCached != null && readOnlyCached.ParentTexture == texture &&
+                readOnlyCached.Description.Width == texture.Description.Width &&
+                readOnlyCached.Description.Height == texture.Description.Height )
                 return readOnlyCached;
 
             return texture.ToDepthStencilReadOnlyTexture();
diff --git a/sources/engine/Xenko.Rendering/Rendering/RootEffectRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/RootEffectRenderFeature.cs
index 62c6a1e538..051a7d4054 100644
--- a/sources/engine/Xenko.Rendering/Rendering/RootEffectRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/RootEffectRenderFeature.cs
@@ -359,25 +359,23 @@ private void PrepareRenderTargetExtensionsMixins(RenderDrawContext context)
             var renderEffectKey = RenderEffectKey;
             var renderEffects = RenderData.GetData(renderEffectKey);
 
-            // TODO dispatcher
-            foreach (var node in RenderNodes)
+            Xenko.Core.Threading.Dispatcher.ForEach<RenderNode>(RenderNodes, (renderNode) =>
             {
-                var renderNode = node;
                 var renderObject = renderNode.RenderObject;
 
                 // Get RenderEffect
                 var staticObjectNode = renderObject.StaticObjectNode;
                 var staticEffectObjectNode = staticObjectNode * EffectPermutationSlotCount + effectSlots[renderNode.RenderStage.Index].Index;
-                var renderEffect = renderEffects[staticEffectObjectNode];
+                RenderEffect renderEffect = renderEffects[staticEffectObjectNode];
 
                 if (renderEffect != null)
                 {
                     var renderStage = renderNode.RenderStage;
                     var renderStageShaderSource = renderStage.OutputValidator.ShaderSource;
                     if (renderStageShaderSource != null)
-                        renderEffect.EffectValidator.ValidateParameter(XenkoEffectBaseKeys.RenderTargetExtensions, renderStageShaderSource);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(XenkoEffectBaseKeys.RenderTargetExtensions, renderStageShaderSource);
                 }
-            }
+            });
         }
 
         /// <summary>
@@ -496,9 +494,10 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
                         if (staticCompilerParameters == null)
                             staticCompilerParameters = new CompilerParameters();
 
-                        foreach (var effectValue in renderEffect.EffectValidator.EffectValues)
+                        for (int k=0; k<renderEffect.EffectValidator.EffectValues.Count; k++)
                         {
-                            staticCompilerParameters.SetObject(effectValue.Key, effectValue.Value);
+                            var effectValue = renderEffect.EffectValidator.EffectValues[k];
+                            if (effectValue.Key != null) staticCompilerParameters.SetObject(effectValue.Key, effectValue.Value);
                         }
 
                         TaskOrResult<Effect> asyncEffect;
@@ -533,8 +532,9 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
             });
 
             // Step3: Uupdate reflection infos (offset, etc...)
-            foreach (var renderObject in RenderObjects)
+            for (int j = 0; j < RenderObjects.Count; j++)
             {
+                var renderObject = RenderObjects[j];
                 var staticObjectNode = renderObject.StaticObjectNode;
 
                 for (int i = 0; i < effectSlotCount; ++i)
@@ -549,8 +549,12 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
                     var effect = renderEffect.Effect;
                     if (effect == null && renderEffect.State == RenderEffectState.Compiling)
                     {
-                        // Need to wait for completion because we have nothing else
-                        renderEffect.PendingEffect.Wait();
+                        if (RenderSystem.WaitForShaderCompilation) {
+                            renderEffect.PendingEffect.Wait();
+                        } else if (renderEffect.PendingEffect.IsCompleted == false) {
+                            RenderSystem.PossiblyCompilingEffects.Add(renderEffect);
+                            continue; // still compiling... skip for now
+                        }
 
                         if (!renderEffect.PendingEffect.IsFaulted)
                         {
@@ -684,7 +688,7 @@ public override void Prepare(RenderDrawContext context)
                     var renderEffect = renderEffects[staticEffectObjectNode];
 
                     // Not compiled yet?
-                    if (renderEffect.Effect == null)
+                    if (renderEffect.Effect == null || renderEffect.Reflection == null)
                     {
                         renderNode.RenderEffect = renderEffect;
                         renderNode.EffectObjectNode = EffectObjectNodeReference.Invalid;
@@ -696,7 +700,7 @@ public override void Prepare(RenderDrawContext context)
                     var renderEffectReflection = renderEffect.Reflection;
 
                     // PerView resources/cbuffer
-                    var viewLayout = renderEffectReflection.PerViewLayout;
+                    var viewLayout = renderEffectReflection?.PerViewLayout;
                     if (viewLayout != null)
                     {
                         var viewCount = RenderSystem.Views.Count;
@@ -730,7 +734,7 @@ public override void Prepare(RenderDrawContext context)
                     }
 
                     // PerFrame resources/cbuffer
-                    var frameLayout = renderEffect.Reflection.PerFrameLayout;
+                    var frameLayout = renderEffect.Reflection?.PerFrameLayout;
                     if (frameLayout != null && frameLayout.Entry.MarkAsUsed(RenderSystem))
                     {
                         threadContext.ResourceGroupAllocator.PrepareResourceGroup(frameLayout, BufferPoolAllocationType.UsedMultipleTime, frameLayout.Entry.Resources);
@@ -784,8 +788,7 @@ public override void Prepare(RenderDrawContext context)
                     }
 
                     // Compile pipeline state object (if first time or need change)
-                    // TODO GRAPHICS REFACTOR how to invalidate if we want to change some state? (setting to null should be fine)
-                    if (renderEffect.PipelineState == null)
+                    if (renderEffect.NeedsNewPipeline)
                     {
                         var mutablePipelineState = batch.MutablePipelineState;
                         var pipelineState = mutablePipelineState.State;
@@ -805,7 +808,7 @@ public override void Prepare(RenderDrawContext context)
                         foreach (var pipelineProcessor in PipelineProcessors)
                             pipelineProcessor.Process(renderNodeReference, ref renderNode, renderObject, pipelineState);
 
-                        mutablePipelineState.Update();
+                        mutablePipelineState.Update(false);
                         renderEffect.PipelineState = mutablePipelineState.CurrentState;
                     }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/Camera.cs b/sources/engine/Xenko.Rendering/Rendering/Shaders/Camera.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shaders/Camera.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shaders/Camera.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/Global.cs b/sources/engine/Xenko.Rendering/Rendering/Shaders/Global.xksl.cs
similarity index 94%
rename from sources/engine/Xenko.Rendering/Rendering/Shaders/Global.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shaders/Global.xksl.cs
index 13d8d4e9c1..fc31373b8d 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shaders/Global.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shaders/Global.xksl.cs
@@ -20,5 +20,7 @@ public static partial class GlobalKeys
     {
         public static readonly ValueParameterKey<float> Time = ParameterKeys.NewValue<float>();
         public static readonly ValueParameterKey<float> TimeStep = ParameterKeys.NewValue<float>();
+
+        public static float TimeScale = 1f;
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/GlobalVR.cs b/sources/engine/Xenko.Rendering/Rendering/Shaders/GlobalVR.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shaders/GlobalVR.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shaders/GlobalVR.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/LinePrimitiveShader.cs b/sources/engine/Xenko.Rendering/Rendering/Shaders/LinePrimitiveShader.cs
new file mode 100644
index 0000000000..9ff731820f
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shaders/LinePrimitiveShader.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class LinePrimitiveShaderKeys
+    {
+        public static readonly ValueParameterKey<Matrix> ViewProjection = ParameterKeys.NewValue<Matrix>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/LinePrimitiveShader.xksl b/sources/engine/Xenko.Rendering/Rendering/Shaders/LinePrimitiveShader.xksl
new file mode 100644
index 0000000000..9df75a1eb5
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shaders/LinePrimitiveShader.xksl
@@ -0,0 +1,19 @@
+namespace Xenko.Rendering
+{
+
+    shader LinePrimitiveShader : ShaderBase, ColorBase {
+
+        float4x4 ViewProjection;
+        stream float3 Position : POSITION;
+
+        override stage void VSMain() {
+            streams.ShadingPosition = mul(float4(streams.Position, 1), ViewProjection);
+        }
+
+        override stage void PSMain() {
+            streams.ColorTarget = streams.Color;
+        }
+
+    };
+
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/PrimitiveShader.cs b/sources/engine/Xenko.Rendering/Rendering/Shaders/PrimitiveShader.cs
new file mode 100644
index 0000000000..f54a2b7639
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shaders/PrimitiveShader.cs
@@ -0,0 +1,27 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class PrimitiveShaderKeys
+    {
+        public static readonly ValueParameterKey<Matrix> ViewProjection = ParameterKeys.NewValue<Matrix>();
+        public static readonly ObjectParameterKey<Buffer> Transforms = ParameterKeys.NewObject<Buffer>();
+        public static readonly ObjectParameterKey<Buffer> Colors = ParameterKeys.NewObject<Buffer>();
+        public static readonly ValueParameterKey<int> InstanceOffset = ParameterKeys.NewValue<int>();
+        public static readonly ValueParameterKey<float> LineWidthMultiplier = ParameterKeys.NewValue<float>(1.0f);
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/PrimitiveShader.xksl b/sources/engine/Xenko.Rendering/Rendering/Shaders/PrimitiveShader.xksl
new file mode 100644
index 0000000000..a9a38bc0de
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shaders/PrimitiveShader.xksl
@@ -0,0 +1,59 @@
+namespace Xenko.Rendering
+{
+    /* Still doesn't compile on vulkan due to the following:
+    System.InvalidOperationException: 'Could not compile shader: Info: C:\Users\Phr00t\AppData\Local\Temp\tmp9081.vert
+    Info: ERROR: C:\Users\Phr00t\AppData\Local\Temp\tmp9081.vert:46: 'gl_InstanceID' : undeclared identifier (Did you mean gl_InstanceIndex?)
+    Info: ERROR: C:\Users\Phr00t\AppData\Local\Temp\tmp9081.vert:46: 'assign' :  cannot convert from ' temp float' to ' global highp uint'
+    Info: ERROR: C:\Users\Phr00t\AppData\Local\Temp\tmp9081.vert:46: '' : compilation terminated 
+    */
+
+    shader PrimitiveShader : ShaderBase, ColorBase
+    {
+        float4x4 ViewProjection;
+        Buffer<float4x4> Transforms;
+        Buffer<uint> Colors;
+        int InstanceOffset;
+
+        float LineWidthMultiplier = 1.0f;
+
+        stream float3 Position : POSITION;
+        stream float2 Uv : TEXCOORD0;
+
+        override stage void VSMain()
+        {
+            int offsetInstanceId = streams.InstanceID + InstanceOffset;
+            streams.ShadingPosition = mul(mul(float4(streams.Position, 1), Transforms[offsetInstanceId]), ViewProjection);
+            streams.Color = BitsToColor(Colors[offsetInstanceId]);
+        }
+
+        override stage void PSMain()
+        {
+
+            float lineWidth = (0.001f * LineWidthMultiplier);
+
+            float2 uv = streams.Uv;
+            float lx = step(lineWidth, uv.x);
+            float ly = step(lineWidth, uv.y);
+            float hx = step(uv.x, 1.0f - lineWidth);
+            float hy = step(uv.y, 1.0f - lineWidth);
+
+            streams.ColorTarget = lerp(streams.Color, float4(streams.Color.rgb, 0.0f), lx*ly*hx*hy);
+            if (streams.ColorTarget.a <= 0.1f) discard;
+
+        }
+
+        float4 BitsToColor(uint u)
+        {
+            float4 c; // it has to be split up like this, don't change it..
+            c = float4(
+                (u >> 0) % 256,
+                (u >> 8) % 256,
+                (u >> 16) % 256,
+                (u >> 24) % 256
+            ) / 255.0;
+            return c;
+        }
+
+    };
+
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shaders/Transformation.cs b/sources/engine/Xenko.Rendering/Rendering/Shaders/Transformation.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shaders/Transformation.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shaders/Transformation.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightDirectionalShadowMapRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightDirectionalShadowMapRenderer.cs
index 5a9e6d5fee..062bda6114 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightDirectionalShadowMapRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightDirectionalShadowMapRenderer.cs
@@ -121,8 +121,7 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
 
             // TODO: Min and Max distance can be auto-computed from readback from Z buffer
 
-            var viewToWorld = sourceView.View;
-            viewToWorld.Invert();
+            Matrix.Invert(ref sourceView.View, out var viewToWorld);
 
             // Update the frustum infos
             UpdateFrustum(sourceView);
@@ -221,10 +220,11 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
                     if (shadow.StabilizationMode == LightShadowMapStabilizationMode.ViewSnapping)
                     {
                         // Snap camera to texel units (so that shadow doesn't jitter when light doesn't change direction but camera is moving)
-                        // Technique from ShaderX7 - Practical Cascaded Shadows Maps -  p310-311 
-                        var shadowMapHalfSize = lightShadowMap.Size * 0.5f;
-                        float x = (float)Math.Ceiling(Vector3.Dot(target, upDirection) * shadowMapHalfSize / radius) * radius / shadowMapHalfSize;
-                        float y = (float)Math.Ceiling(Vector3.Dot(target, side) * shadowMapHalfSize / radius) * radius / shadowMapHalfSize;
+                        // Technique from ShaderX7 - Practical Cascaded Shadows Maps -  p310-311
+                        // 0.25f to stabilize the 4x4 dithered shadow pattern
+                        var snappingFactor = lightShadowMap.Size * 0.5f * 0.25f / radius;
+                        float x = (float)Math.Ceiling(Vector3.Dot(target, upDirection) * snappingFactor) / snappingFactor;
+                        float y = (float)Math.Ceiling(Vector3.Dot(target, side) * snappingFactor) / snappingFactor;
                         float z = Vector3.Dot(target, direction);
 
                         //target = up * x + side * y + direction * R32G32B32_Float.Dot(target, direction);
@@ -326,12 +326,10 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
 
         private void UpdateFrustum(RenderView renderView)
         {
-            var projectionToView = renderView.Projection;
-            projectionToView.Invert();
+            Matrix.Invert(ref renderView.Projection, out var projectionToView);
 
             // Compute frustum-dependent variables (common for all shadow maps)
-            var projectionToWorld = renderView.ViewProjection;
-            projectionToWorld.Invert();
+            Matrix.Invert(ref renderView.ViewProjection, out var projectionToWorld);
 
             // Transform Frustum corners in World Space (8 points) - algorithm is valid only if the view matrix does not do any kind of scale/shear transformation
             for (int i = 0; i < 8; ++i)
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererCubeMap.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererCubeMap.cs
index 018447712c..706fbfe932 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererCubeMap.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererCubeMap.cs
@@ -18,6 +18,17 @@ namespace Xenko.Rendering.Shadows
     /// </summary>
     public class LightPointShadowMapRendererCubeMap : LightShadowMapRendererBase
     {
+        // Face based on index in this array
+        private static readonly Matrix[] ViewFaceRotationMatrices = new[]
+        {
+            Matrix.RotationY(MathUtil.Pi),          // Front
+            Matrix.Identity,                        // Back
+            Matrix.RotationY(MathUtil.PiOverTwo),   // Right
+            Matrix.RotationY(-MathUtil.PiOverTwo),  // Left
+            Matrix.RotationX(-MathUtil.PiOverTwo),  // Up
+            Matrix.RotationX(MathUtil.PiOverTwo),   // Down
+        };
+
         // Number of border pixels to add to the cube map in order to allow filtering
         public const int BorderPixels = 8;
 
@@ -27,9 +38,9 @@ public LightPointShadowMapRendererCubeMap()
         {
             shaderDataPool = new PoolListStruct<ShaderData>(4, () => new ShaderData());
         }
-        
+
         public override void Reset(RenderContext context)
-        {   
+        {
             base.Reset(context);
 
             shaderDataPool.Clear();
@@ -54,51 +65,25 @@ public override LightShadowMapTexture CreateShadowMapTexture(RenderView renderVi
             shadowMapTexture.CascadeCount = 6; // 6 faces
             return shadowMapTexture;
         }
-        
-        private Vector2 GetLightClippingPlanes(LightPoint pointLight)
+
+        private static Vector2 GetLightClippingPlanes(LightPoint pointLight)
         {
             // Note: we don't take exactly the required depth range since this will result in a very poor resolution in most of the light's range
             return new Vector2(0.1f, pointLight.Radius * 2);
         }
 
-        private void GetViewParameters(LightShadowMapTexture shadowMapTexture, int index, out Matrix view)
+        private static void GetViewParameters(LightShadowMapTexture shadowMapTexture, int index, out Matrix view)
         {
-            Matrix rotation = Matrix.Identity;
-
             // Apply light position
-            view = Matrix.Translation(-shadowMapTexture.RenderLight.Position);
-
-            // Select face based on index
-            switch (index)
-            {
-                case 0: // Front
-                    rotation *= Matrix.RotationY(MathUtil.Pi);
-                    break;
-                case 1: // Back
-                    break;
-                case 2: // Right
-                    rotation *= Matrix.RotationY(MathUtil.PiOverTwo);
-                    break;
-                case 3: // Left
-                    rotation *= Matrix.RotationY(-MathUtil.PiOverTwo);
-                    break;
-                case 4: // Up
-                    rotation *= Matrix.RotationX(-MathUtil.PiOverTwo);
-                    break;
-                case 5: // Down
-                    rotation *= Matrix.RotationX(MathUtil.PiOverTwo);
-                    break;
-                default:
-                    throw new IndexOutOfRangeException(nameof(index));
-            }
+            var translationMatrix = Matrix.Translation(-shadowMapTexture.RenderLight.Position);
 
-            view *= rotation;
+            Matrix.Multiply(ref translationMatrix, ref ViewFaceRotationMatrices[index], out view);
         }
 
         /// <returns>
         /// x = Near; y = 1/(Far-Near)
         /// </returns>
-        private Vector2 GetShadowMapDepthParameters(LightShadowMapTexture shadowMapTexture)
+        private static Vector2 GetShadowMapDepthParameters(LightShadowMapTexture shadowMapTexture)
         {
             var lightPoint = shadowMapTexture.Light as LightPoint;
             Vector2 clippingPlanes = GetLightClippingPlanes(lightPoint);
@@ -115,7 +100,8 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
             shaderData.OffsetScale = lightShadowMap.Light.Shadow.BiasParameters.NormalOffsetScale;
             shaderData.DepthParameters = GetShadowMapDepthParameters(lightShadowMap);
 
-            var clippingPlanes = GetLightClippingPlanes((LightPoint)lightShadowMap.Light);
+            var pointlight = (LightPoint)lightShadowMap.Light;
+            var clippingPlanes = GetLightClippingPlanes(pointlight);
 
             var textureMapSize = lightShadowMap.GetRectangle(0).Size;
 
@@ -125,7 +111,9 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
             shaderData.Projection = Matrix.PerspectiveFovRH(halfFov * 2, 1.0f, clippingPlanes.X, clippingPlanes.Y);
 
             Vector2 atlasSize = new Vector2(lightShadowMap.Atlas.Width, lightShadowMap.Atlas.Height);
-            
+
+            bool skipUpDown = ((pointlight.Shadow as LightPointShadowMap)?.SkipUpDownMaps ?? false);
+
             for (int i = 0; i < 6; i++)
             {
                 Rectangle faceRectangle = lightShadowMap.GetRectangle(i);
@@ -138,15 +126,18 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
                 var shadowRenderView = CreateRenderView();
                 shadowRenderView.RenderView = sourceView;
                 shadowRenderView.ShadowMapTexture = lightShadowMap;
-                shadowRenderView.Rectangle = lightShadowMap.GetRectangle(i);
-                shadowRenderView.ViewSize = new Vector2(lightShadowMap.GetRectangle(i).Width, lightShadowMap.GetRectangle(i).Height);
+                shadowRenderView.Rectangle = faceRectangle;
+                shadowRenderView.ViewSize = new Vector2(faceRectangle.Width, faceRectangle.Height);
 
                 shadowRenderView.NearClipPlane = clippingPlanes.X;
                 shadowRenderView.FarClipPlane = clippingPlanes.Y;
 
+                // if we are up/down, don't render anything so its just open for these directions
+                shadowRenderView.CullingMask = skipUpDown && i >= 4 ? RenderGroupMask.None : RenderGroupMask.All;
+
                 shadowRenderView.View = shaderData.View[i];
                 shadowRenderView.Projection = shaderData.Projection;
-                shadowRenderView.ViewProjection = shadowRenderView.View * shadowRenderView.Projection;
+                Matrix.Multiply(ref shadowRenderView.View, ref shadowRenderView.Projection, out shadowRenderView.ViewProjection);
 
                 // Create projection matrix with adjustment
                 var textureCoords = new Vector4(
@@ -159,10 +150,9 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
                 float centerX = 0.5f * (textureCoords.X + textureCoords.Z);
                 float centerY = 0.5f * (textureCoords.Y + textureCoords.W);
 
-                var viewProjection = shadowRenderView.ViewProjection;
                 var projectionToShadow = Matrix.Scaling(leftX, -leftY, 1.0f) * Matrix.Translation(centerX, centerY, 0.0f);
-                shaderData.WorldToShadow[i] = viewProjection * projectionToShadow;
-                
+                Matrix.Multiply(ref shadowRenderView.ViewProjection, ref projectionToShadow, out shaderData.WorldToShadow[i]);
+
                 shadowRenderView.VisiblityIgnoreDepthPlanes = false;
 
                 // Add the render view for the current frame
@@ -205,8 +195,6 @@ private class ShaderData : ILightShadowMapShaderData
 
         private class ShaderGroupData : LightShadowMapShaderGroupDataBase
         {
-            private const string ShaderName = "ShadowMapReceiverPointCubeMap";
-            
             private Texture shadowMapTexture;
             private Vector2 shadowMapTextureSize;
             private Vector2 shadowMapTextureTexelSize;
@@ -236,11 +224,22 @@ public override void UpdateLayout(string compositionName)
                 shadowMapTextureKey = ShadowMapKeys.ShadowMapTexture.ComposeWith(compositionName);
                 shadowMapTextureSizeKey = ShadowMapKeys.TextureSize.ComposeWith(compositionName);
                 shadowMapTextureTexelSizeKey = ShadowMapKeys.TextureTexelSize.ComposeWith(compositionName);
-                worldToShadowKey = ShadowMapReceiverPointCubeMapKeys.WorldToShadow.ComposeWith(compositionName);
-                inverseWorldToShadowKey = ShadowMapReceiverPointCubeMapKeys.InverseWorldToShadow.ComposeWith(compositionName);
-                depthBiasesKey = ShadowMapReceiverPointCubeMapKeys.DepthBiases.ComposeWith(compositionName);
-                depthParametersKey = ShadowMapReceiverPointCubeMapKeys.DepthParameters.ComposeWith(compositionName);
-                offsetScalesKey = ShadowMapReceiverPointCubeMapKeys.OffsetScales.ComposeWith(compositionName);
+                if (LightClusteredPointSpotGroupRenderer.UseLinearLighting)
+                {
+                    worldToShadowKey = ShadowMapReceiverPointCubeMapLinearKeys.WorldToShadow.ComposeWith(compositionName);
+                    inverseWorldToShadowKey = ShadowMapReceiverPointCubeMapLinearKeys.InverseWorldToShadow.ComposeWith(compositionName);
+                    depthBiasesKey = ShadowMapReceiverPointCubeMapLinearKeys.DepthBiases.ComposeWith(compositionName);
+                    depthParametersKey = ShadowMapReceiverPointCubeMapLinearKeys.DepthParameters.ComposeWith(compositionName);
+                    offsetScalesKey = ShadowMapReceiverPointCubeMapLinearKeys.OffsetScales.ComposeWith(compositionName);
+                }
+                else
+                {
+                    worldToShadowKey = ShadowMapReceiverPointCubeMapKeys.WorldToShadow.ComposeWith(compositionName);
+                    inverseWorldToShadowKey = ShadowMapReceiverPointCubeMapKeys.InverseWorldToShadow.ComposeWith(compositionName);
+                    depthBiasesKey = ShadowMapReceiverPointCubeMapKeys.DepthBiases.ComposeWith(compositionName);
+                    depthParametersKey = ShadowMapReceiverPointCubeMapKeys.DepthParameters.ComposeWith(compositionName);
+                    offsetScalesKey = ShadowMapReceiverPointCubeMapKeys.OffsetScales.ComposeWith(compositionName);
+                }
             }
 
             public override void UpdateLightCount(int lightLastCount, int lightCurrentCount)
@@ -256,57 +255,62 @@ public override void UpdateLightCount(int lightLastCount, int lightCurrentCount)
 
             public override ShaderClassSource CreateShaderSource(int lightCurrentCount)
             {
-                return new ShaderClassSource(ShaderName, lightCurrentCount);
+                return new ShaderClassSource(LightClusteredPointSpotGroupRenderer.UseLinearLighting ? "ShadowMapReceiverPointCubeMapLinear" : "ShadowMapReceiverPointCubeMap", lightCurrentCount);
             }
-            
+
+            private object locker = new object();
+
             public override void ApplyDrawParameters(RenderDrawContext context, ParameterCollection parameters, FastListStruct<LightDynamicEntry> currentLights, ref BoundingBoxExt boundingBox)
             {
                 var boundingBox2 = (BoundingBox)boundingBox;
                 bool shadowMapCreated = false;
                 int lightIndex = 0;
 
-                for (int i = 0; i < currentLights.Count; ++i)
+                lock (locker)
                 {
-                    var lightEntry = currentLights[i];
-                    if (lightEntry.Light.BoundingBox.Intersects(ref boundingBox2))
+                    for (int i = 0; i < currentLights.Count; ++i)
                     {
-                        var shaderData = (ShaderData)lightEntry.ShadowMapTexture.ShaderData;
-
-                        // Copy per-face data
-                        for (int j = 0; j < 6; j++)
+                        var lightEntry = currentLights[i];
+                        if (lightEntry.Light.BoundingBox.Intersects(ref boundingBox2))
                         {
-                            worldToShadow[lightIndex * 6 + j] = shaderData.WorldToShadow[j];
-                            inverseWorldToShadow[lightIndex * 6 + j] = Matrix.Invert(shaderData.WorldToShadow[j]);
-                        }
+                            var shaderData = (ShaderData)lightEntry.ShadowMapTexture.ShaderData;
 
-                        depthBiases[lightIndex] = shaderData.DepthBias;
-                        offsetScales[lightIndex] = shaderData.OffsetScale;
-                        depthParameters[lightIndex] = shaderData.DepthParameters;
-                        lightIndex++;
+                            // Copy per-face data
+                            for (int j = 0; j < 6; j++)
+                            {
+                                worldToShadow[lightIndex * 6 + j] = shaderData.WorldToShadow[j];
+                                inverseWorldToShadow[lightIndex * 6 + j] = Matrix.Invert(shaderData.WorldToShadow[j]);
+                            }
 
-                        // TODO: should be setup just once at creation time
-                        if (!shadowMapCreated)
-                        {
-                            shadowMapTexture = shaderData.Texture;
-                            if (shadowMapTexture != null)
+                            depthBiases[lightIndex] = shaderData.DepthBias;
+                            offsetScales[lightIndex] = shaderData.OffsetScale;
+                            depthParameters[lightIndex] = shaderData.DepthParameters;
+                            lightIndex++;
+
+                            // TODO: should be setup just once at creation time
+                            if (!shadowMapCreated)
                             {
-                                shadowMapTextureSize = new Vector2(shadowMapTexture.Width, shadowMapTexture.Height);
-                                shadowMapTextureTexelSize = 1.0f / shadowMapTextureSize;
+                                shadowMapTexture = shaderData.Texture;
+                                if (shadowMapTexture != null)
+                                {
+                                    shadowMapTextureSize = new Vector2(shadowMapTexture.Width, shadowMapTexture.Height);
+                                    shadowMapTextureTexelSize = 1.0f / shadowMapTextureSize;
+                                }
+                                shadowMapCreated = true;
                             }
-                            shadowMapCreated = true;
                         }
                     }
-                }
 
-                parameters.Set(shadowMapTextureKey, shadowMapTexture);
-                parameters.Set(shadowMapTextureSizeKey, shadowMapTextureSize);
-                parameters.Set(shadowMapTextureTexelSizeKey, shadowMapTextureTexelSize);
+                    parameters.Set(shadowMapTextureKey, shadowMapTexture);
+                    parameters.Set(shadowMapTextureSizeKey, shadowMapTextureSize);
+                    parameters.Set(shadowMapTextureTexelSizeKey, shadowMapTextureTexelSize);
 
-                parameters.Set(worldToShadowKey, worldToShadow);
-                parameters.Set(inverseWorldToShadowKey, inverseWorldToShadow);
-                parameters.Set(depthParametersKey, depthParameters);
-                parameters.Set(depthBiasesKey, depthBiases);
-                parameters.Set(offsetScalesKey, offsetScales);
+                    parameters.Set(worldToShadowKey, worldToShadow);
+                    parameters.Set(inverseWorldToShadowKey, inverseWorldToShadow);
+                    parameters.Set(depthParametersKey, depthParameters);
+                    parameters.Set(depthBiasesKey, depthBiases);
+                    parameters.Set(offsetScalesKey, offsetScales);
+                }
             }
         }
     }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererParaboloid.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererParaboloid.cs
index 9b76443b4a..256b27e528 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererParaboloid.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightPointShadowMapRendererParaboloid.cs
@@ -164,7 +164,7 @@ private void GetViewParameters(LightShadowMapTexture shadowMapTexture, int index
             // Apply light position
             view = Matrix.Translation(-shadowMapTexture.RenderLight.Position);
 
-            // Apply mapping plane rotatation
+            // Apply mapping plane rotation
             view *= pointShadowMapTexture.ForwardMatrix;
 
             if (index == 0)
@@ -277,51 +277,56 @@ public override void UpdateLightCount(int lightLastCount, int lightCurrentCount)
                 Array.Resize(ref depthBiases, lightCurrentCount);
             }
 
+            private object locker = new object();
+
             public override void ApplyDrawParameters(RenderDrawContext context, ParameterCollection parameters, FastListStruct<LightDynamicEntry> currentLights, ref BoundingBoxExt boundingBox)
             {
                 var boundingBox2 = (BoundingBox)boundingBox;
                 bool shadowMapCreated = false;
                 int lightIndex = 0;
 
-                for (int i = 0; i < currentLights.Count; ++i)
+                lock (locker)
                 {
-                    var lightEntry = currentLights[i];
-                    if (lightEntry.Light.BoundingBox.Intersects(ref boundingBox2))
+                    for (int i = 0; i < currentLights.Count; ++i)
                     {
-                        var shaderData = (ShaderData)lightEntry.ShadowMapTexture.ShaderData;
-                        offsets[lightIndex] = shaderData.Offset;
-                        backfaceOffsets[lightIndex] = shaderData.BackfaceOffset;
-                        faceSizes[lightIndex] = shaderData.FaceSize;
-                        depthParameters[lightIndex] = shaderData.DepthParameters;
-                        depthBiases[lightIndex] = shaderData.DepthBias;
-                        viewMatrices[lightIndex] = shaderData.View;
-                        lightIndex++;
-
-                        // TODO: should be setup just once at creation time
-                        if (!shadowMapCreated)
+                        var lightEntry = currentLights[i];
+                        if (lightEntry.Light.BoundingBox.Intersects(ref boundingBox2))
                         {
-                            shadowMapTexture = shaderData.Texture;
-                            if (shadowMapTexture != null)
+                            var shaderData = (ShaderData)lightEntry.ShadowMapTexture.ShaderData;
+                            offsets[lightIndex] = shaderData.Offset;
+                            backfaceOffsets[lightIndex] = shaderData.BackfaceOffset;
+                            faceSizes[lightIndex] = shaderData.FaceSize;
+                            depthParameters[lightIndex] = shaderData.DepthParameters;
+                            depthBiases[lightIndex] = shaderData.DepthBias;
+                            viewMatrices[lightIndex] = shaderData.View;
+                            lightIndex++;
+
+                            // TODO: should be setup just once at creation time
+                            if (!shadowMapCreated)
                             {
-                                shadowMapTextureSize = new Vector2(shadowMapTexture.Width, shadowMapTexture.Height);
-                                shadowMapTextureTexelSize = 1.0f / shadowMapTextureSize;
+                                shadowMapTexture = shaderData.Texture;
+                                if (shadowMapTexture != null)
+                                {
+                                    shadowMapTextureSize = new Vector2(shadowMapTexture.Width, shadowMapTexture.Height);
+                                    shadowMapTextureTexelSize = 1.0f / shadowMapTextureSize;
+                                }
+                                shadowMapCreated = true;
                             }
-                            shadowMapCreated = true;
                         }
                     }
-                }
 
-                parameters.Set(shadowMapTextureKey, shadowMapTexture);
-                parameters.Set(shadowMapTextureSizeKey, shadowMapTextureSize);
-                parameters.Set(shadowMapTextureTexelSizeKey, shadowMapTextureTexelSize);
+                    parameters.Set(shadowMapTextureKey, shadowMapTexture);
+                    parameters.Set(shadowMapTextureSizeKey, shadowMapTextureSize);
+                    parameters.Set(shadowMapTextureTexelSizeKey, shadowMapTextureTexelSize);
 
-                parameters.Set(viewKey, viewMatrices);
-                parameters.Set(offsetsKey, offsets);
-                parameters.Set(backfaceOffsetsKey, backfaceOffsets);
-                parameters.Set(faceSizesKey, faceSizes);
-                parameters.Set(depthParametersKey, depthParameters);
+                    parameters.Set(viewKey, viewMatrices);
+                    parameters.Set(offsetsKey, offsets);
+                    parameters.Set(backfaceOffsetsKey, backfaceOffsets);
+                    parameters.Set(faceSizesKey, faceSizes);
+                    parameters.Set(depthParametersKey, depthParameters);
 
-                parameters.Set(depthBiasesKey, depthBiases);
+                    parameters.Set(depthBiasesKey, depthBiases);
+                }
             }
         }
     }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightSpotShadowMapRenderer.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightSpotShadowMapRenderer.cs
index 9d193183b0..40b08ca647 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/LightSpotShadowMapRenderer.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/LightSpotShadowMapRenderer.cs
@@ -66,9 +66,8 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
             shaderData.DepthRange = new Vector2(nearClip, farClip); //////////////////////////////////////////
 
             // Update the shadow camera
-            var viewMatrix = renderLight.WorldMatrix;
-            viewMatrix.Invert();
-            var projectionMatrix = Matrix.PerspectiveFovRH(spotLight.AngleOuterInRadians, spotLight.AspectRatio, nearClip, farClip); // Perspective Projection for spotlights
+            Matrix.Invert(ref renderLight.WorldMatrix, out var viewMatrix);
+            Matrix.PerspectiveFovRH(spotLight.AngleOuterInRadians, spotLight.AspectRatio, nearClip, farClip, out var projectionMatrix); // Perspective Projection for spotlights
             Matrix.Multiply(ref viewMatrix, ref projectionMatrix, out var viewProjectionMatrix);
 
             var shadowMapRectangle = lightShadowMap.GetRectangle(0);
@@ -93,7 +92,9 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
             float centerY = 0.5f * (cascadeTextureCoords.Y + cascadeTextureCoords.W);
 
             // Compute receiver view proj matrix
-            Matrix adjustmentMatrix = Matrix.Scaling(leftX, -leftY, 1.0f) * Matrix.Translation(centerX, centerY, 0.0f);
+            Matrix.Scaling(leftX, -leftY, 1.0f, out var scaleMatrix);
+            Matrix.Translation(centerX, centerY, 0.0f, out var translationMatrix);
+            Matrix.Multiply(ref scaleMatrix, ref translationMatrix, out var adjustmentMatrix);
             // Calculate View Proj matrix from World space to Cascade space
             Matrix.Multiply(ref viewProjectionMatrix, ref adjustmentMatrix, out shaderData.WorldToShadowCascadeUV);
 
@@ -107,7 +108,7 @@ public override void Collect(RenderContext context, RenderView sourceView, Light
             var shadowRenderView = CreateRenderView();
             shadowRenderView.RenderView = sourceView;
             shadowRenderView.ShadowMapTexture = lightShadowMap;
-            shadowRenderView.Rectangle = lightShadowMap.GetRectangle(0);
+            shadowRenderView.Rectangle = shadowMapRectangle;
             // Compute view parameters
             shadowRenderView.View = shaderData.ViewMatrix;
             shadowRenderView.Projection = shaderData.ProjectionMatrix;
@@ -209,50 +210,62 @@ public override void UpdateLightCount(int lightLastCount, int lightCurrentCount)
                 Array.Resize(ref offsetScales, lightCurrentCount);
             }
 
+            private object locker = new object();
+
             public override void ApplyDrawParameters(RenderDrawContext context, ParameterCollection parameters, FastListStruct<LightDynamicEntry> currentLights, ref BoundingBoxExt boundingBox)
             {
                 var boundingBox2 = (BoundingBox)boundingBox;
                 bool shadowMapCreated = false;
                 int lightIndex = 0;
 
-                for (int i = 0; i < currentLights.Count; ++i)
+                lock (locker)
                 {
-                    var lightEntry = currentLights[i];
-                    var light = lightEntry.Light;
-
-                    if (light.BoundingBox.Intersects(ref boundingBox2))
+                    for (int i = 0; i < currentLights.Count; ++i)
                     {
+                        var lightEntry = currentLights[i];
+                        var light = lightEntry.Light;
+
                         var singleLightData = (LightSpotShadowMapShaderData)lightEntry.ShadowMapTexture.ShaderData;
                         worldToShadowCascadeUV[lightIndex] = singleLightData.WorldToShadowCascadeUV;
-                        inverseWorldToShadowCascadeUV[lightIndex] = Matrix.Invert(singleLightData.WorldToShadowCascadeUV);
+                        Matrix.Invert(ref singleLightData.WorldToShadowCascadeUV, out inverseWorldToShadowCascadeUV[lightIndex]);
 
                         depthBiases[lightIndex] = singleLightData.DepthBias;
                         offsetScales[lightIndex] = singleLightData.OffsetScale;
                         depthRanges[lightIndex] = singleLightData.DepthRange;
 
-                        if (!shadowMapCreated)
+                        if (light.BoundingBox.Intersects(ref boundingBox2))
                         {
-                            shadowMapTexture = singleLightData.Texture;
-                            if (shadowMapTexture != null)
+                            worldToShadowCascadeUV[lightIndex] = singleLightData.WorldToShadowCascadeUV;
+                            inverseWorldToShadowCascadeUV[lightIndex] = Matrix.Invert(singleLightData.WorldToShadowCascadeUV);
+
+                            depthBiases[lightIndex] = singleLightData.DepthBias;
+                            offsetScales[lightIndex] = singleLightData.OffsetScale;
+                            depthRanges[lightIndex] = singleLightData.DepthRange;
+
+                            if (!shadowMapCreated) 
                             {
-                                shadowMapTextureSize = new Vector2(shadowMapTexture.Width, shadowMapTexture.Height);
-                                shadowMapTextureTexelSize = 1.0f / shadowMapTextureSize;
+                                shadowMapTexture = singleLightData.Texture;
+                                if (shadowMapTexture != null)
+                                {
+                                    shadowMapTextureSize = new Vector2(shadowMapTexture.Width, shadowMapTexture.Height);
+                                    shadowMapTextureTexelSize = 1.0f / shadowMapTextureSize;
+                                }
+                                shadowMapCreated = true;
                             }
-                            shadowMapCreated = true;
-                        }
 
-                        lightIndex++;
+                            lightIndex++;
+                        }
                     }
-                }
 
-                parameters.Set(shadowMapTextureKey, shadowMapTexture);
-                parameters.Set(shadowMapTextureSizeKey, shadowMapTextureSize);
-                parameters.Set(shadowMapTextureTexelSizeKey, shadowMapTextureTexelSize);
-                parameters.Set(worldToShadowCascadeUVsKey, worldToShadowCascadeUV);
-                parameters.Set(inverseWorldToShadowCascadeUVsKey, inverseWorldToShadowCascadeUV);
-                parameters.Set(depthRangesKey, depthRanges);
-                parameters.Set(depthBiasesKey, depthBiases);
-                parameters.Set(offsetScalesKey, offsetScales);
+                    parameters.Set(shadowMapTextureKey, shadowMapTexture);
+                    parameters.Set(shadowMapTextureSizeKey, shadowMapTextureSize);
+                    parameters.Set(shadowMapTextureTexelSizeKey, shadowMapTextureTexelSize);
+                    parameters.Set(worldToShadowCascadeUVsKey, worldToShadowCascadeUV);
+                    parameters.Set(inverseWorldToShadowCascadeUVsKey, inverseWorldToShadowCascadeUV);
+                    parameters.Set(depthRangesKey, depthRanges);
+                    parameters.Set(depthBiasesKey, depthBiases);
+                    parameters.Set(offsetScalesKey, offsetScales);
+                }
             }
         }
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileSkin1.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Materials/SubsurfaceScattering/ScatteringProfileFunction/MaterialSubsurfaceScatteringScatteringProfileSkin1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx
index e0c9e85e0c..3fa647c06e 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx
@@ -9,8 +9,12 @@ namespace Xenko.Rendering.Shadows
     {
         using params MaterialKeys;
 
-        // For cut off materials we want to run pixel shader during rendering shadow maps
-        if(MaterialKeys.UsePixelShaderWithDepthPass)
+        // For cut off and blend materials we want to run pixel shader during rendering shadow maps
+        if(MaterialKeys.UseDitheredShadows)
+        {
+            mixin ShadowMapCasterAlphaDithered;
+        }
+        else if(MaterialKeys.UsePixelShaderWithDepthPass)
         {
             mixin ShadowMapCasterAlphaDiscard;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx.cs
similarity index 81%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx.cs
index 132a565777..19add147e4 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCaster.xkfx.cs
@@ -23,7 +23,11 @@ internal partial class ShadowMapCaster  : IShaderMixinBuilder
         {
             public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
             {
-                if (context.GetParam(MaterialKeys.UsePixelShaderWithDepthPass))
+                if (context.GetParam(MaterialKeys.UseDitheredShadows))
+                {
+                    context.Mixin(mixin, "ShadowMapCasterAlphaDithered");
+                }
+                else if (context.GetParam(MaterialKeys.UsePixelShaderWithDepthPass))
                 {
                     context.Mixin(mixin, "ShadowMapCasterAlphaDiscard");
                 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDiscard.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDiscard.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDithered.xksl b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDithered.xksl
new file mode 100644
index 0000000000..25e0e7a38c
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDithered.xksl
@@ -0,0 +1,39 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Shadows
+{
+    /// <summary>
+    /// Shadow map caster with pixel shader performing a dithered alpha discard test.
+    /// </summary>
+    shader ShadowMapCasterAlphaDithered : Transformation, ShaderBase, PositionStream, MaterialPixelStream
+    {
+        static const float BayerMatrix[16] = 
+        {
+            0,
+            0.53333336,
+            0.13333334,
+            0.6666667,
+            0.8,
+            0.26666668,
+            0.9333333,
+            0.4,
+            0.2,
+            0.73333335,
+            0.06666667,
+            0.6,
+            1,
+            0.4666667,
+            0.8666667,
+            0.33333334,
+        };
+
+        override stage void PSMain()
+        {
+            base.PSMain();
+
+            int2 coord = streams.ShadingPosition % 4;
+            float bayer = BayerMatrix[coord.x+coord.y*4];
+            clip( -1.01 + bayer + streams.ColorTarget.a * 1.01 );
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDithered.xksl.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDithered.xksl.cs
new file mode 100644
index 0000000000..a4e3ce20f9
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDithered.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Stride Shader Mixin Code Generator.
+// To generate it yourself, please install Stride.VisualStudio.Package .vsix
+// and re-save the associated .sdfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx
index a3f5a14b5d..f0e381ac6a 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx
@@ -9,8 +9,12 @@ namespace Xenko.Rendering.Shadows
     {
         using params MaterialKeys;
 
-        // For cut off materials we want to run pixel shader during rendering shadow maps
-        if(MaterialKeys.UsePixelShaderWithDepthPass)
+        // For cut off and blend materials we want to run pixel shader during rendering shadow maps
+        if(MaterialKeys.UseDitheredShadows)
+        {
+            mixin ShadowMapCasterAlphaDithered;
+        }
+        else if(MaterialKeys.UsePixelShaderWithDepthPass)
         {
             mixin ShadowMapCasterAlphaDiscard;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx.cs
similarity index 82%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx.cs
index f0855f41bc..0ada3e1437 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMap.xkfx.cs
@@ -23,7 +23,11 @@ internal partial class ShadowMapCasterCubeMap  : IShaderMixinBuilder
         {
             public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
             {
-                if (context.GetParam(MaterialKeys.UsePixelShaderWithDepthPass))
+                if (context.GetParam(MaterialKeys.UseDitheredShadows))
+                {
+                    context.Mixin(mixin, "ShadowMapCasterAlphaDithered");
+                }
+                else if (context.GetParam(MaterialKeys.UsePixelShaderWithDepthPass))
                 {
                     context.Mixin(mixin, "ShadowMapCasterAlphaDiscard");
                 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDiscard.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMapProjection.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterAlphaDiscard.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMapProjection.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMapProjection1.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterNoPixelShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterCubeMapProjection1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterNoPixelShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx
index 4cc9c2656c..0b09c2de13 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx
@@ -9,8 +9,12 @@ namespace Xenko.Rendering.Shadows
     {
         using params MaterialKeys;
 
-        // For cut off materials we want to run pixel shader during rendering shadow maps
-        if(MaterialKeys.UsePixelShaderWithDepthPass)
+        // For cut off and blend materials we want to run pixel shader during rendering shadow maps
+        if(MaterialKeys.UseDitheredShadows)
+        {
+            mixin ShadowMapCasterAlphaDithered;
+        }
+        else if(MaterialKeys.UsePixelShaderWithDepthPass)
         {
             mixin ShadowMapCasterAlphaDiscard;
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid1.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx.cs
similarity index 83%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx.cs
index ed8e062661..8ea17b9ef8 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid1.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloid.xkfx.cs
@@ -23,7 +23,11 @@ internal partial class ShadowMapCasterParaboloid  : IShaderMixinBuilder
         {
             public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
             {
-                if (context.GetParam(MaterialKeys.UsePixelShaderWithDepthPass))
+                if (context.GetParam(MaterialKeys.UseDitheredShadows))
+                {
+                    context.Mixin(mixin, "ShadowMapCasterAlphaDithered");
+                }
+                else if (context.GetParam(MaterialKeys.UsePixelShaderWithDepthPass))
                 {
                     context.Mixin(mixin, "ShadowMapCasterAlphaDiscard");
                 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloidProjection1.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloidProjection.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloidProjection1.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterParaboloidProjection.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterNoPixelShader.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterVsm.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterNoPixelShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterVsm.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterVsm.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCommon.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCasterVsm.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCommon.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCommon.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapCommon.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterBase.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterDefault.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterDefault.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterDefault.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterPcf.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterDefault.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterPcf.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterVsm.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterVsm.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterVsm.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterVsm.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterPcf.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapGroup.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapFilterPcf.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapGroup.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverBase.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverDirectional.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverDirectional.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverDirectional.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverDirectional.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMap.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMap.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMap.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMap.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMapLinear.xksl b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMapLinear.xksl
new file mode 100644
index 0000000000..cfe1ab119e
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMapLinear.xksl
@@ -0,0 +1,113 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Xenko.Rendering.Shadows
+{
+    /// <summary>
+    /// Selects the shadow map and computes the shadow factor.
+    /// </summary>
+    internal shader ShadowMapReceiverPointCubeMapLinear<int TLightCount> : ShadowMapGroup<PerDraw.Lighting>, ShadowMapFilterBase<PerDraw.Lighting>, PositionStream4, ShaderBaseStream, LightStream, Texturing, NormalStream
+    {
+        cbuffer PerDraw.Lighting
+        {
+            float4x4 WorldToShadow[TLightCount*6];
+            float4x4 InverseWorldToShadow[TLightCount*6];
+            float DepthBiases[TLightCount];
+            float OffsetScales[TLightCount];
+            float2 DepthParameters[TLightCount];
+        };
+
+        // TODO: Deduplicate
+        float3 GetShadowPositionOffset(float offsetScale, float nDotL, float3 normal)
+        {
+            float normalOffsetScale = saturate(1.0f - nDotL);
+            return 2.0f * ShadowMapTextureTexelSize.x * offsetScale * normalOffsetScale * normal;
+        }
+
+        float ComputeThickness(float3 positionWS, int cascadeIndex)
+        {
+            // Calculate thickness for SSS:
+            float tempThickness = 0.0;
+
+            const bool ComputeThickness = true; // TODO: This should be a mixin parameter or something!
+            if(ComputeThickness)
+            {
+                // TODO: I don't know if the shadow map filtering can be done for cube maps in the same way as for directional lights or spot lights.
+                tempThickness = FilterThickness(positionWS,
+                                                streams.meshNormalWS,
+                                                float2(0.0f, 1.0f), //DepthRanges[lightIndex*6+faceIndex],    // TODO: Currently not needed for perspective shadow maps.
+                                                WorldToShadow[cascadeIndex],
+                                                InverseWorldToShadow[cascadeIndex],
+                                                false);
+            }
+
+            return tempThickness;
+        }
+
+        override float3 ComputeShadow(float3 positionWS, int lightIndex)
+        {
+            // Calculate shadow:
+            float3 lightPosition = LightPointGroupLinear<TLightCount>.Lights[lightIndex].PositionWS.xyz;
+            float3 lightDelta = positionWS.xyz - lightPosition;
+            float distanceToLight = length(lightDelta);
+            float3 direction = lightDelta / distanceToLight;
+            float3 directionAbs = abs(direction);
+            
+            float longestAxis = max(directionAbs.x, max(directionAbs.y, directionAbs.z));
+
+            int faceIndex;
+            float lightSpaceZ;
+            
+            // Select the base face index for either X,Y or Z facing
+            [flatten]
+            if(directionAbs.x == longestAxis)
+            {
+                lightSpaceZ = lightDelta.x;
+                faceIndex = 2;
+            }
+            else if(directionAbs.y == longestAxis)
+            {
+                lightSpaceZ = lightDelta.y;
+                faceIndex = 4;
+            }
+            else // direction.z == longestAxis
+            {
+                lightSpaceZ = lightDelta.z;
+                faceIndex = 0;
+            }
+
+            // Apply offset for the negative side of a direction (+1)
+            float lightSpaceZDirection = sign(lightSpaceZ);
+            faceIndex += int(-min(0.0, lightSpaceZDirection));
+
+
+            int cascadeIndex = lightIndex * 6 + faceIndex;
+
+            // Compute the thickness before modifying "positionWS":
+            streams.thicknessWS = ComputeThickness(positionWS, cascadeIndex);
+
+
+            // Apply normal scaled bias
+            positionWS += GetShadowPositionOffset(OffsetScales[lightIndex], streams.NdotL, streams.normalWS);
+
+            // Map to texture space
+            float4 projectedPosition = mul(float4(positionWS,1), WorldToShadow[cascadeIndex]);
+            projectedPosition /= projectedPosition.w;
+
+            // Apply bias in view space
+            lightSpaceZ = abs(lightSpaceZ);
+            lightSpaceZ -= DepthBiases[lightIndex];
+
+            // Project view space depth into the same space as the shadow map
+            float depth = DepthParameters[lightIndex].x + (DepthParameters[lightIndex].y / lightSpaceZ);
+
+            if(depth < 0 || depth > 1)
+                return 1;
+
+            // Compare distance to light to value inside of the shadow map
+            float shadow = FilterShadow(projectedPosition.xy, depth);
+            
+            return(shadow);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMapLinear.xksl.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMapLinear.xksl.cs
new file mode 100644
index 0000000000..a294c4dc24
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointCubeMapLinear.xksl.cs
@@ -0,0 +1,27 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Shadows
+{
+    internal static partial class ShadowMapReceiverPointCubeMapLinearKeys
+    {
+        public static readonly ValueParameterKey<Matrix> WorldToShadow = ParameterKeys.NewValue<Matrix>();
+        public static readonly ValueParameterKey<Matrix> InverseWorldToShadow = ParameterKeys.NewValue<Matrix>();
+        public static readonly ValueParameterKey<float> DepthBiases = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<float> OffsetScales = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<Vector2> DepthParameters = ParameterKeys.NewValue<Vector2>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointParaboloid.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointParaboloid.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointParaboloid.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverPointParaboloid.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapGroup.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverSpot.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapGroup.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverSpot.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapRenderStageSelector.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapRenderStageSelector.cs
index c3f742b9d3..b8b2cc5b9f 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapRenderStageSelector.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapRenderStageSelector.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.ComponentModel;
 using Xenko.Engine;
@@ -19,11 +19,9 @@ public override void Process(RenderObject renderObject)
             {
                 var renderMesh = (RenderMesh)renderObject;
 
-                // Only handle non-transparent meshes
-                //if (!renderMesh.MaterialPass.HasTransparency)
+                if (renderMesh.IsShadowCaster)
                 {
-                    if (renderMesh.IsShadowCaster)
-                        renderMesh.ActiveRenderStages[ShadowMapRenderStage.Index] = new ActiveRenderStage(EffectName);
+                    renderMesh.ActiveRenderStages[ShadowMapRenderStage.Index] = new ActiveRenderStage(EffectName, true);
                 }
             }
         }
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverSpot.cs b/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowMapReceiverSpot.cs
rename to sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowStream.cs b/sources/engine/Xenko.Rendering/Rendering/Skinning/NormalMeshSkinning.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Shadows/ShadowStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skinning/NormalMeshSkinning.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skinning/NormalMeshSkinning.cs b/sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningFromMesh.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skinning/NormalMeshSkinning.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningFromMesh.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningFromMesh.cs b/sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningNormalMapping.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningFromMesh.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningNormalMapping.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningNormalMapping.cs b/sources/engine/Xenko.Rendering/Rendering/Skinning/TangentMeshSkinning.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skinning/NormalVSSkinningNormalMapping.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skinning/TangentMeshSkinning.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skinning/TransformationSkinning.cs b/sources/engine/Xenko.Rendering/Rendering/Skinning/TransformationSkinning.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skinning/TransformationSkinning.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skinning/TransformationSkinning.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/SkinningRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/SkinningRenderFeature.cs
index 75445d3dc3..37303453b9 100644
--- a/sources/engine/Xenko.Rendering/Rendering/SkinningRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/SkinningRenderFeature.cs
@@ -81,12 +81,12 @@ public override void PrepareEffectPermutations(RenderDrawContext context)
 
                     if (renderMesh.Mesh.Skinning != null)
                     {
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.HasSkinningPosition, skinningInfo.HasSkinningPosition);
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.HasSkinningNormal, skinningInfo.HasSkinningNormal);
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.HasSkinningTangent, skinningInfo.HasSkinningTangent);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.HasSkinningPosition, skinningInfo.HasSkinningPosition);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.HasSkinningNormal, skinningInfo.HasSkinningNormal);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.HasSkinningTangent, skinningInfo.HasSkinningTangent);
 
                         var skinningBones = Math.Max(MaxBones, renderMesh.Mesh.Skinning.Bones.Length);
-                        renderEffect.EffectValidator.ValidateParameter(MaterialKeys.SkinningMaxBones, skinningBones);
+                        renderEffect.EffectValidator.ValidateParameterThreaded(MaterialKeys.SkinningMaxBones, skinningBones);
                     }
                 }
             });
@@ -114,7 +114,7 @@ public override unsafe void Prepare(RenderDrawContext context)
 
             Dispatcher.ForEach(((RootEffectRenderFeature)RootRenderFeature).RenderNodes, (ref RenderNode renderNode) =>
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
                 if (perDrawLayout == null)
                     return;
 
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skinning/TangentMeshSkinning.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/CubemapUtils.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skinning/TangentMeshSkinning.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/CubemapUtils.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/CubemapUtils.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/IComputeEnvironmentColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/CubemapUtils.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/IComputeEnvironmentColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/LevelCubeMapEnvironmentColor.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/LevelCubeMapEnvironmentColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/LevelCubeMapEnvironmentColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/LevelCubeMapEnvironmentColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/RoughnessCubeMapEnvironmentColor.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/RoughnessCubeMapEnvironmentColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/RoughnessCubeMapEnvironmentColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/RoughnessCubeMapEnvironmentColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderBase.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderCubemap.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderCubemap.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderCubemap.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderCubemap.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTexture.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTexture.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTexture.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTexture.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTextureHorizon.xksl b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTextureHorizon.xksl
new file mode 100644
index 0000000000..2142d9a997
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTextureHorizon.xksl
@@ -0,0 +1,27 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Xenko.Rendering.Skyboxes
+{
+    shader SkyboxShaderTextureHorizon : SkyboxShaderBase, Math
+    {
+        stage Texture2D Texture;
+        stage float4 AlphaColor;
+        stage float4 ZeroColor;
+
+        override stage float4 Shading()
+        {
+            var samplingDir = normalize(streams.skyboxViewDirection);
+			var samplingDirSquare = float3(samplingDir.x*samplingDir.x, samplingDir.y*samplingDir.y, samplingDir.z*samplingDir.z);
+			var u = atan2(-samplingDir.z, -samplingDir.x)/(2*Math.PI) + 0.5;
+			var v = atan2(-samplingDir.y, length(samplingDir.xz))/Math.PI + 0.5;
+
+#if XENKO_GRAPHICS_PROFILE >= GRAPHICS_PROFILE_LEVEL_10_0
+            var color = Texture.SampleLevel(LinearSampler, float2(u, v), 0);
+#else
+            var color = Texture.Sample(LinearSampler, float2(u, v));
+#endif
+            return (Intensity * color) + (color.a * AlphaColor + (1.0 - color.a) * ZeroColor);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTextureHorizon.xksl.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTextureHorizon.xksl.cs
new file mode 100644
index 0000000000..10b4979851
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxShaderTextureHorizon.xksl.cs
@@ -0,0 +1,25 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Skyboxes
+{
+    public static partial class SkyboxShaderTextureHorizonKeys
+    {
+        public static readonly ObjectParameterKey<Texture> Texture = ParameterKeys.NewObject<Texture>();
+        public static readonly ValueParameterKey<Color4> AlphaColor = ParameterKeys.NewValue<Color4>();
+        public static readonly ValueParameterKey<Color4> ZeroColor = ParameterKeys.NewValue<Color4>();
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/IComputeEnvironmentColor.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/IComputeEnvironmentColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxStream.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SphericalHarmonicsEnvironmentColor.cs b/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SphericalHarmonicsEnvironmentColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/SphericalHarmonicsEnvironmentColor.cs
rename to sources/engine/Xenko.Rendering/Rendering/Skyboxes/SphericalHarmonicsEnvironmentColor.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/SortModeDistance.cs b/sources/engine/Xenko.Rendering/Rendering/SortModeDistance.cs
index 6dd8631107..5708c3bec4 100644
--- a/sources/engine/Xenko.Rendering/Rendering/SortModeDistance.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/SortModeDistance.cs
@@ -38,8 +38,7 @@ public static SortKey CreateSortKey(float distance)
 
         public override unsafe void GenerateSortKey(RenderView renderView, RenderViewStage renderViewStage, SortKey* sortKeys)
         {
-            Matrix viewInverse = renderView.View;
-            viewInverse.Invert();
+            Matrix.Invert(ref renderView.View, out var viewInverse);
             var plane = new Plane(viewInverse.Forward, Vector3.Dot(viewInverse.TranslationVector, viewInverse.Forward)); // TODO: Point-normal-constructor seems wrong. Check.
 
             var renderNodes = renderViewStage.RenderNodes;
@@ -52,7 +51,7 @@ public override unsafe void GenerateSortKey(RenderView renderView, RenderViewSta
                 var renderNode = renderNodes[i];
 
                 var renderObject = renderNode.RenderObject;
-                var distance = CollisionHelper.DistancePlanePoint(ref plane, ref renderObject.BoundingBox.Center);
+                var distance = renderObject.DistanceSortFudge + CollisionHelper.DistancePlanePoint(ref plane, ref renderObject.BoundingBox.Center);
                 var distanceI = ComputeDistance(distance);
                 if (reverseDistance)
                     distanceI = ~distanceI;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Sprites/RenderSprite.cs b/sources/engine/Xenko.Rendering/Rendering/Sprites/RenderSprite.cs
index 6eaaa7c97e..5cb90bb851 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Sprites/RenderSprite.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Sprites/RenderSprite.cs
@@ -47,6 +47,14 @@ public enum SpriteBlend
 
     public class RenderSprite : RenderObject
     {
+        public enum SpriteDepthMode
+        {
+            ReadWrite = 0,
+            ReadOnly = 1,
+            Ignore = 2,
+            WriteOnly = 3
+        }
+
         // Cached states
         private Matrix lastWorldMatrix;
         private Vector2 lastHalfSpriteSize;
@@ -57,7 +65,7 @@ public class RenderSprite : RenderObject
 
         public Sprite Sprite;
         public SpriteType SpriteType;
-        public bool IgnoreDepth;
+        public SpriteDepthMode DepthMode;
         public SpriteSampler Sampler;
         public SpriteBlend BlendMode;
         public SwizzleMode Swizzle;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteFromTexture.cs b/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteFromTexture.cs
index 9912edf335..839e4f03f1 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteFromTexture.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteFromTexture.cs
@@ -62,6 +62,8 @@ public Texture Texture
             get { return texture; }
             set
             {
+                if (texture == value) return;
+
                 texture = value;
                 isSpriteDirty = true;
                 UpdateSprite();
@@ -81,6 +83,8 @@ public float PixelsPerUnit
             get { return pixelsPerUnit; }
             set
             {
+                if (pixelsPerUnit == value) return;
+
                 pixelsPerUnit = value;
                 isSpriteDirty = true;
                 UpdateSprite();
@@ -119,6 +123,8 @@ public bool CenterFromMiddle
             get { return centerFromMiddle; }
             set
             {
+                if (centerFromMiddle == value) return;
+
                 centerFromMiddle = value;
                 isSpriteDirty = true;
                 UpdateSprite();
@@ -138,6 +144,8 @@ public bool IsTransparent
             get { return isTransparent; }
             set
             {
+                if (value == isTransparent) return;
+
                 isTransparent = value;
                 isSpriteDirty = true;
                 UpdateSprite();
diff --git a/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteRenderFeature.cs
index 3c5e11387a..324c43f5b5 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteRenderFeature.cs
@@ -125,7 +125,7 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                 // Check if the current blend state has changed in any way, if not
                 // Note! It doesn't really matter in what order we build the bitmask, the result is not preserved anywhere except in this method
                 var currentBatchState = (uint)blendMode;
-                currentBatchState = (currentBatchState << 1) + (renderSprite.IgnoreDepth ? 1U : 0U);
+                currentBatchState = (currentBatchState << 1) + ((uint)renderSprite.DepthMode);
                 currentBatchState = (currentBatchState << 1) + (renderSprite.IsAlphaCutoff ? 1U : 0U);
                 currentBatchState = (currentBatchState << 2) + ((uint)renderSprite.Sampler);
 
@@ -136,7 +136,23 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
                     if (renderSprite.IsAlphaCutoff)
                         currentEffect = batchContext.GetOrCreateAlphaCutoffSpriteEffect(RenderSystem.EffectSystem);
 
-                    var depthStencilState = renderSprite.IgnoreDepth ? DepthStencilStates.None : DepthStencilStates.Default;
+                    DepthStencilStateDescription depthStencilState;
+                    switch (renderSprite.DepthMode)
+                    {
+                        case RenderSprite.SpriteDepthMode.Ignore:
+                            depthStencilState = DepthStencilStates.None;
+                            break;
+                        case RenderSprite.SpriteDepthMode.ReadOnly:
+                            depthStencilState = DepthStencilStates.DepthRead;
+                            break;
+                        default:
+                            depthStencilState = DepthStencilStates.Default;
+                            break;
+                        case RenderSprite.SpriteDepthMode.WriteOnly:
+                            depthStencilState = DepthStencilStates.Default;
+                            depthStencilState.DepthBufferFunction = CompareFunction.Always;
+                            break;
+                    }
 
                     var samplerState = context.GraphicsDevice.SamplerStates.LinearClamp;
                     if (renderSprite.Sampler != SpriteSampler.LinearClamp)
@@ -154,7 +170,10 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
 
                     if (hasBegin)
                     {
-                        batchContext.SpriteBatch.End();
+                        lock (batchEndLocker)
+                        {
+                            batchContext.SpriteBatch.End();
+                        }
                     }
 
                     var rasterizerState = RasterizerStates.CullNone;
@@ -171,7 +190,7 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
 
                 var sourceRegion = sprite.Region;
                 var texture = sprite.Texture;
-                var color = renderSprite.Color;                
+                var color = renderSprite.Color;
                 if (isPicking) // TODO move this code corresponding to picking out of the runtime code.
                 {
                     var compId = RuntimeIdHelper.ToRuntimeId(renderSprite.Source);
@@ -184,25 +203,40 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
 
                 // determine the element world matrix depending on the type of sprite
                 var worldMatrix = renderSprite.WorldMatrix;
-                if (renderSprite.SpriteType == SpriteType.Billboard)
+                switch (renderSprite.SpriteType)
                 {
-                    worldMatrix = viewInverse;
-
-                    // remove scale of the camera
-                    worldMatrix.Row1 /= ((Vector3)viewInverse.Row1).Length();
-                    worldMatrix.Row2 /= ((Vector3)viewInverse.Row2).Length();
-
-                    // set the scale of the object
-                    worldMatrix.Row1 *= ((Vector3)renderSprite.WorldMatrix.Row1).Length();
-                    worldMatrix.Row2 *= ((Vector3)renderSprite.WorldMatrix.Row2).Length();
-
-                    // set the position
-                    worldMatrix.TranslationVector = renderSprite.WorldMatrix.TranslationVector;
-
-                    // set the rotation
-                    var localRotationZ = renderSprite.RotationEulerZ;
-                    if (localRotationZ != 0)
-                        worldMatrix = Matrix.RotationZ(localRotationZ) * worldMatrix;
+                    case SpriteType.Billboard:
+                        worldMatrix = viewInverse;
+
+                        var worldMatrixRow1 = worldMatrix.Row1;
+                        var worldMatrixRow2 = worldMatrix.Row2;
+
+                        // remove scale of the camera
+                        worldMatrixRow1 /= ((Vector3)viewInverse.Row1).Length();
+                        worldMatrixRow2 /= ((Vector3)viewInverse.Row2).Length();
+
+                        // set the scale of the object
+                        worldMatrixRow1 *= ((Vector3)renderSprite.WorldMatrix.Row1).Length();
+                        worldMatrixRow2 *= ((Vector3)renderSprite.WorldMatrix.Row2).Length();
+
+                        worldMatrix.Row1 = worldMatrixRow1;
+                        worldMatrix.Row2 = worldMatrixRow2;
+
+                        // set the position
+                        worldMatrix.TranslationVector = renderSprite.WorldMatrix.TranslationVector;
+
+                        // set the rotation
+                        var localRotationZ = renderSprite.RotationEulerZ;
+                        if (localRotationZ != 0)
+                            worldMatrix = Matrix.RotationZ(localRotationZ) * worldMatrix;
+                        break;
+                    case SpriteType.BillboardPosition:
+                        Vector3 diff = renderSprite.WorldMatrix.TranslationVector - viewInverse.TranslationVector;
+                        Quaternion look = new Quaternion();
+                        Quaternion.LookAt(ref look, diff);
+                        renderSprite.WorldMatrix.GetScale(out var scale);
+                        worldMatrix = Matrix.Transformation(scale, look, renderSprite.WorldMatrix.TranslationVector);
+                        break;
                 }
 
                 // calculate normalized position of the center of the sprite (takes into account the possible rotation of the image)
@@ -240,10 +274,15 @@ public override void Draw(RenderDrawContext context, RenderView renderView, Rend
 
             if (hasBegin)
             {
-                batchContext.SpriteBatch.End();
+                lock (batchEndLocker)
+                {
+                    batchContext.SpriteBatch.End();
+                }
             }
         }
 
+        private object batchEndLocker = new object();
+
         private class ThreadContext : IDisposable
         {
             private bool isSrgb;
diff --git a/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteType.cs b/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteType.cs
index 1efd4f7c25..b8aca05413 100644
--- a/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteType.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/Sprites/SpriteType.cs
@@ -16,5 +16,10 @@ public enum SpriteType
         /// A billboard sprite.
         /// </summary>
         Billboard,
+
+        /// <summary>
+        /// A billboard sprite that looks at position.
+        /// </summary>
+        BillboardPosition,
     }
 }
diff --git a/sources/engine/Xenko.Rendering/Rendering/StagedMeshDraw.cs b/sources/engine/Xenko.Rendering/Rendering/StagedMeshDraw.cs
new file mode 100644
index 0000000000..ca8fdc4a4e
--- /dev/null
+++ b/sources/engine/Xenko.Rendering/Rendering/StagedMeshDraw.cs
@@ -0,0 +1,125 @@
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using Xenko.Core;
+using Xenko.Games;
+using Xenko.Graphics;
+
+namespace Xenko.Rendering.Rendering {
+    public class StagedMeshDraw : MeshDraw, IDisposable {
+
+        public uint[] Indicies { get; private set; }
+        public object Verticies { get; private set; }
+
+        public static uint Created { get; private set; }
+        public static uint Disposed { get; private set; }
+
+        protected StagedMeshDraw() { }
+
+        protected Xenko.Graphics.Buffer _vertexBuffer, _indexBuffer;
+        protected static GraphicsDevice internalDevice;
+        protected static ConcurrentQueue<Graphics.Buffer> StagedBufferTrashBin = new ConcurrentQueue<Graphics.Buffer>();
+
+        internal override StagedMeshDraw getStagedMeshDraw => this;
+
+        ~StagedMeshDraw()
+        {
+            Dispose();
+        }
+
+        public void Dispose()
+        {
+            performStage = null;
+
+            if (_vertexBuffer != null)
+                StagedBufferTrashBin.Enqueue(_vertexBuffer);
+
+            if (_indexBuffer != null)
+                StagedBufferTrashBin.Enqueue(_indexBuffer);
+
+            _vertexBuffer = null;
+            _indexBuffer = null;
+        }
+
+        internal static void FlushTrash()
+        {
+            while (StagedBufferTrashBin.TryDequeue(out var buf))
+            {
+                buf.DestroyNow();
+                buf.Dispose();
+                Disposed++;
+            }
+        }
+
+        /// <summary>
+        /// Frees memory related to StagedMeshDraws in model
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns>number of StagedMeshDraws disposed</returns>
+        public static int Dispose(Model model)
+        {
+            int disposed = 0;
+            for (int i=0; i<model.Meshes.Count; i++)
+            {
+                Mesh m = model.Meshes[i];
+                if (m.Draw is StagedMeshDraw smd)
+                {
+                    smd.Dispose();
+                    m.Draw = null;
+                    disposed++;
+                }
+            }
+
+            return disposed;
+        }
+
+        /// <summary>
+        /// Gets a MeshDraw that will be prepared when needed with the given index buffer & vertex buffer.
+        /// </summary>
+        /// <typeparam name="T">Type of vertex buffer used</typeparam>
+        /// <param name="indexBuffer">Array of vertex indicies</param>
+        /// <param name="vertexBuffer">Vertex buffer</param>
+        /// <returns></returns>
+        public static StagedMeshDraw MakeStagedMeshDraw<T>(ref uint[] indexBuffer, ref T[] vertexBuffer, VertexDeclaration vertexBufferLayout) where T : struct {
+
+            // sanity checks
+            if (indexBuffer.Length == 0 || vertexBuffer.Length == 0)
+                throw new ArgumentException("Trying to make a StagedMeshDraw with empty index or vertex buffer!");
+
+            StagedMeshDraw smd = new StagedMeshDraw();
+            smd.PrimitiveType = PrimitiveType.TriangleList;
+            smd.DrawCount = indexBuffer.Length;
+            smd.Indicies = indexBuffer;
+            smd.Verticies = vertexBuffer;
+            smd.performStage = (GraphicsDevice graphicsDevice, StagedMeshDraw _smd) => {
+                lock (_smd)
+                {
+                    if (_smd.VertexBuffers == null)
+                    {
+                        _smd._vertexBuffer = Xenko.Graphics.Buffer.Vertex.New<T>(
+                            graphicsDevice,
+                            (T[])_smd.Verticies,
+                            GraphicsResourceUsage.Default
+                        );
+                        _smd._indexBuffer = Xenko.Graphics.Buffer.Index.New<uint>(
+                            graphicsDevice,
+                            _smd.Indicies,
+                            GraphicsResourceUsage.Default
+                        );
+                        Created++;
+                        VertexBufferBinding[] vbb = new[] {
+                            new VertexBufferBinding(_smd._vertexBuffer, vertexBufferLayout, _smd.DrawCount)
+                        };
+                        IndexBufferBinding ibb = new IndexBufferBinding(_smd._indexBuffer, true, _smd.DrawCount);
+                        _smd.VertexBuffers = vbb;
+                        _smd.IndexBuffer = ibb;
+                        _smd.performStage = null;
+                    }
+                }
+            };
+            return smd;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxStream.cs b/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Skyboxes/SkyboxStream.cs
rename to sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE2.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE2.cs b/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE3.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE2.cs
rename to sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE3.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE3.cs b/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE4.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE3.cs
rename to sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE4.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE4.cs b/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationAE4.cs
rename to sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationBase.cs b/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationFlat.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationFlat.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationFlat.cs b/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationPN.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationFlat.cs
rename to sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationPN.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/TransformRenderFeature.cs b/sources/engine/Xenko.Rendering/Rendering/TransformRenderFeature.cs
index 73b8b9d4cd..7f079592c3 100644
--- a/sources/engine/Xenko.Rendering/Rendering/TransformRenderFeature.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/TransformRenderFeature.cs
@@ -18,6 +18,7 @@ public class TransformRenderFeature : SubRenderFeature
         internal ObjectPropertyKey<RenderModelFrameInfo> RenderModelObjectInfoKey;
         internal ViewObjectPropertyKey<RenderModelViewInfo> RenderModelViewInfoKey;
 
+        private float scaledTimeAccumulator;
         private ConstantBufferOffsetReference time; // TODO: Move this at a more global level so that it applies on everything? (i.e. RootEffectRenderFeature)
         private ConstantBufferOffsetReference view;
         private ConstantBufferOffsetReference world;
@@ -77,6 +78,8 @@ public override unsafe void Prepare(RenderDrawContext context)
 
             // Update PerFrame (time)
             // TODO Move that to RootEffectRenderFeature?
+            float timeStep = (float)Context.Time.Elapsed.TotalSeconds * GlobalKeys.TimeScale;
+            scaledTimeAccumulator += timeStep;
             foreach (var frameLayout in ((RootEffectRenderFeature)RootRenderFeature).FrameLayouts)
             {
                 var timeOffset = frameLayout.GetConstantBufferOffset(time);
@@ -87,8 +90,8 @@ public override unsafe void Prepare(RenderDrawContext context)
                 var mappedCB = resourceGroup.ConstantBuffer.Data;
 
                 var perFrameTime = (PerFrameTime*)((byte*)mappedCB + timeOffset);
-                perFrameTime->Time = (float)Context.Time.Total.TotalSeconds;
-                perFrameTime->TimeStep = (float)Context.Time.Elapsed.TotalSeconds;
+                perFrameTime->TimeStep = timeStep;
+                perFrameTime->Time = scaledTimeAccumulator;
             }
 
             // Update PerView (View, Proj, etc...)
@@ -157,8 +160,8 @@ public override unsafe void Prepare(RenderDrawContext context)
             // TODO: Have a PerObject cbuffer?
             Dispatcher.ForEach(((RootEffectRenderFeature)RootRenderFeature).RenderNodes, (ref RenderNode renderNode) =>
             {
-                var perDrawLayout = renderNode.RenderEffect.Reflection.PerDrawLayout;
-                if (perDrawLayout == null)
+                var perDrawLayout = renderNode.RenderEffect?.Reflection?.PerDrawLayout;
+                if (perDrawLayout == null || renderNode.Resources == null)
                     return;
 
                 var worldOffset = perDrawLayout.GetConstantBufferOffset(this.world);
diff --git a/sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationPN.cs b/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Tessellation/TessellationPN.cs
rename to sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationBase.cs b/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationMatrix.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationMatrix.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationMatrix.cs b/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWAndVP.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationMatrix.cs
rename to sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWAndVP.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWAndVP.cs b/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWVP.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWAndVP.cs
rename to sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWVP.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWVP.cs b/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationZero.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationWVP.cs
rename to sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationZero.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationZero.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/BlendUtils.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Transformation/TransformationZero.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/BlendUtils.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/DepthBase.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/DepthBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/DepthBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/DepthBase.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/BlendUtils.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/FlattenLayers.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/BlendUtils.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/FlattenLayers.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/FlattenLayers.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/HSVUtils.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/FlattenLayers.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/HSVUtils.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/HighlightShader.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/HighlightShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/HighlightShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/HighlightShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/HSVUtils.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/Math.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/HSVUtils.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/Math.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingEffect.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingShader.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/ModelComponentPickingShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/NormalPack.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/NormalPack.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/NormalPack.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/NormalPack.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/Math.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/NormalUtil.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/Math.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/NormalUtil.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/Picking.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/Picking.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/Picking.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/Picking.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/PickingShader.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/PickingShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/PickingShader.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/PickingShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/NormalUtil.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/SwapUV.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/NormalUtil.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/SwapUV.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/SwapUV.cs b/sources/engine/Xenko.Rendering/Rendering/Utils/Utilities.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/SwapUV.cs
rename to sources/engine/Xenko.Rendering/Rendering/Utils/Utilities.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/VisibilityGroup.cs b/sources/engine/Xenko.Rendering/Rendering/VisibilityGroup.cs
index 399842e267..ecc9624161 100644
--- a/sources/engine/Xenko.Rendering/Rendering/VisibilityGroup.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/VisibilityGroup.cs
@@ -53,6 +53,16 @@ public class VisibilityGroup : IDisposable
         /// </summary>
         public RenderObjectCollection RenderObjects { get; }
 
+        /// <summary>
+        /// Increase this to cull smaller objects from rendering at all (due to distance from camera)
+        /// </summary>
+        public static float CullSmallFactor = 0f;
+
+        /// <summary>
+        /// Cull small shadows from being considered, even if it is a shadow caster
+        /// </summary>
+        public static float CullShadowsSmallFactor = 0f;
+
         public VisibilityGroup(RenderSystem renderSystem)
         {
             Tags = new PropertyContainer(this);
@@ -79,9 +89,9 @@ public void Dispose()
         public void Reset()
         {
             // Clear object data
-            foreach (var renderObject in RenderObjects)
+            for (int i=0; i<RenderObjects.Count; i++)
             {
-                renderObject.ObjectNode = ObjectNodeReference.Invalid;
+                RenderObjects[i].ObjectNode = ObjectNodeReference.Invalid;
             }
         }
 
@@ -92,7 +102,7 @@ public void Reset()
         public void TryCollect(RenderView view)
         {
             // Already colleted this frame?
-            if (view.LastFrameCollected >= RenderSystem.FrameCounter)
+            if (view.LastFrameCollected == RenderSystem.FrameCounter)
                 return;
 
             view.LastFrameCollected = RenderSystem.FrameCounter;
@@ -107,8 +117,7 @@ public void TryCollect(RenderView view)
             view.MinimumDistance = float.PositiveInfinity;
             view.MaximumDistance = float.NegativeInfinity;
 
-            Matrix viewInverse = view.View;
-            viewInverse.Invert();
+            Matrix.Invert(ref view.View, out var viewInverse);
             var planeNormal = viewInverse.Forward;
             var pointOnPlane = viewInverse.TranslationVector + viewInverse.Forward * view.NearClipPlane;
             var plane = new Plane(planeNormal, Vector3.Dot(pointOnPlane, planeNormal)); // TODO: Point-normal-constructor seems wrong. Check.
@@ -129,6 +138,8 @@ public void TryCollect(RenderView view)
             // Note sure this is really a good mechanism long term (it forces to recreate multiple time the same view, instead of using RenderStage + selectors or a similar mechanism)
             // This is still supported so that existing gizmo code kept working with new graphics refactor. Might be reconsidered at some point.
             var cullingMask = view.CullingMask;
+            var sqrtCameraFov = view.CameraFOV > 0f ? Math.Sqrt(view.CameraFOV) : 0f;
+            var doingSmallCulling = view.CameraFOV > 0f && (CullShadowsSmallFactor > 0f || CullSmallFactor > 0f);
 
             // Process objects
             //foreach (var renderObject in RenderObjects)
@@ -170,11 +181,42 @@ public void TryCollect(RenderView view)
 
                 // Fast AABB transform: http://zeuxcg.org/2010/10/17/aabb-from-obb-with-component-wise-abs/
                 // Compute transformed AABB (by world)
-                if (cullingMode == CameraCullingMode.Frustum
-                    && renderObject.BoundingBox.Extent != Vector3.Zero
-                    && !FrustumContainsBox(ref frustum, ref renderObject.BoundingBox, view.VisiblityIgnoreDepthPlanes))
+                if (renderObject.BoundingBox.Extent != Vector3.Zero && float.IsNaN(renderObject.BoundingBox.Center.X) == false)
                 {
-                    return;
+                    if (cullingMode == CameraCullingMode.Frustum
+                        && !FrustumContainsBox(ref frustum, ref renderObject.BoundingBox, view.VisiblityIgnoreDepthPlanes))
+                    {
+                        return;
+                    }
+
+                    // automatically cull really small stuff?
+                    if (doingSmallCulling && renderObject.SmallFactorMultiplier > 0f)
+                    {
+                        ref var bb = ref renderObject.BoundingBox;
+                        double dist = (bb.Center - pointOnPlane).Length() * sqrtCameraFov;
+                        // get max area squared
+                        float areaXY = bb.Extent.X * bb.Extent.Y;
+                        float areaZY = bb.Extent.Z * bb.Extent.Y;
+                        float areaXZ = bb.Extent.X * bb.Extent.Z;
+                        double maxArea;
+                        if (areaXY > areaZY && areaXY > areaXZ)
+                            maxArea = areaXY;
+                        else if (areaZY > areaXZ)
+                            maxArea = areaZY;
+                        else maxArea = areaXZ;
+                        // calculate factor (useful for shadows too), multiply by scale (12.909) to make easier numbers to work with
+                        double myFactor = renderObject.SmallFactorMultiplier * 12.909 * maxArea / dist;
+                        // do we need shadows removed?
+                        for (int i = 0; i < renderObject.ActiveRenderStages.Length; i++)
+                        {
+                            ref var ars = ref renderObject.ActiveRenderStages[i];
+
+                            if (ars.IsShadowStage)
+                                ars.TemporaryDisable = myFactor < CullShadowsSmallFactor || myFactor < CullSmallFactor;
+                        }
+                        // are we too small to render?
+                        if (myFactor < CullSmallFactor) return;
+                    }
                 }
 
                 // Add object to list of visible objects
@@ -237,7 +279,7 @@ private static void CalculateMinMaxDistance(ref Plane plane, ref BoundingBoxExt
         {
             var nearCorner = boundingBox.Minimum;
             var farCorner = boundingBox.Maximum;
-            
+
             if (plane.Normal.X < 0)
                 Utilities.Swap(ref nearCorner.X, ref farCorner.X);
 
@@ -257,7 +299,7 @@ private static void CalculateMinMaxDistance(ref Plane plane, ref BoundingBoxExt
             distance = CollisionHelper.DistancePlanePoint(ref plane, ref farCorner);
             while ((oldDistance = maxDistance) < distance && Interlocked.CompareExchange(ref maxDistance, distance, oldDistance) != oldDistance) { }
         }
-        
+
         internal void AddRenderObject(List<RenderObject> renderObjects, RenderObject renderObject)
         {
             if (renderObject.VisibilityObjectNode != StaticObjectNodeReference.Invalid)
@@ -306,7 +348,7 @@ internal bool RemoveRenderObject(List<RenderObject> renderObjects, [NotNull] Ren
             return true;
         }
 
-        private void ReevaluateActiveRenderStages(RenderObject renderObject)
+        internal void ReevaluateActiveRenderStages(RenderObject renderObject)
         {
             var renderFeature = renderObject.RenderFeature;
             if (renderFeature == null)
diff --git a/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx b/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx
index 4b0d108b43..3346863255 100644
--- a/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx
+++ b/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx
@@ -44,7 +44,14 @@ namespace Xenko.Rendering
         // -----------------------------------------------
         if (MaterialKeys.HasNormalMap)
         {
-            mixin NormalFromNormalMapping;
+            if (MaterialKeys.SkipTangents)
+            {
+                mixin NormalFromNormalMappingNoTangent;            
+            }
+            else
+            {
+                mixin NormalFromNormalMapping;
+            }
         }
         else
         {
diff --git a/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.cs b/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx.cs
similarity index 97%
rename from sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.cs
rename to sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx.cs
index 1a5d82a414..1723164bc3 100644
--- a/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.cs
+++ b/sources/engine/Xenko.Rendering/Rendering/XenkoEffectBase.xkfx.cs
@@ -1,4 +1,4 @@
-// <auto-generated>
+// <auto-generated>
 // Do not edit this file yourself!
 //
 // This code was generated by Xenko Shader Mixin Code Generator.
@@ -52,7 +52,7 @@ public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
                 context.Mixin(mixin, "TransformationWAndVP");
                 if (context.GetParam(MaterialKeys.HasNormalMap))
                 {
-                    context.Mixin(mixin, "NormalFromNormalMapping");
+                    context.Mixin(mixin, context.GetParam(MaterialKeys.SkipTangents) ? "NormalFromNormalMappingNoTangent" : "NormalFromNormalMapping");
                 }
                 else
                 {
diff --git a/sources/engine/Xenko.Rendering/Rendering/XenkoForwardShadingEffect.cs b/sources/engine/Xenko.Rendering/Rendering/XenkoForwardShadingEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/XenkoForwardShadingEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/XenkoForwardShadingEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/XenkoWireframeShadingEffect.cs b/sources/engine/Xenko.Rendering/Rendering/XenkoWireframeShadingEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/XenkoWireframeShadingEffect.cs
rename to sources/engine/Xenko.Rendering/Rendering/XenkoWireframeShadingEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Rendering/Streaming/StreamingManager.cs b/sources/engine/Xenko.Rendering/Streaming/StreamingManager.cs
index fd6bdbd0f9..d0797e126d 100644
--- a/sources/engine/Xenko.Rendering/Streaming/StreamingManager.cs
+++ b/sources/engine/Xenko.Rendering/Streaming/StreamingManager.cs
@@ -3,6 +3,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
@@ -12,6 +13,7 @@
 using Xenko.Core.Annotations;
 using Xenko.Core.IO;
 using Xenko.Core.Streaming;
+using Xenko.Core.Threading;
 using Xenko.Engine;
 using Xenko.Games;
 using Xenko.Graphics;
@@ -27,9 +29,12 @@ namespace Xenko.Streaming
     /// <seealso cref="Xenko.Graphics.Data.ITexturesStreamingProvider" />
     public class StreamingManager : GameSystemBase, IStreamingManager, ITexturesStreamingProvider
     {
+        private readonly ReaderWriterLockSlim resourceLocker = new ReaderWriterLockSlim();
         private readonly List<StreamableResource> resources = new List<StreamableResource>(512);
-        private readonly Dictionary<object, StreamableResource> resourcesLookup = new Dictionary<object, StreamableResource>(512);
         private readonly List<StreamableResource> activeStreaming = new List<StreamableResource>(8); // Important: alwasy use inside lock(resources)
+
+        private readonly ConcurrentDictionary<object, StreamableResource> resourcesLookup = new ConcurrentDictionary<object, StreamableResource>(Environment.ProcessorCount, 512);
+
         private int lastUpdateResourcesIndex;
         private bool isDisposing;
         private int frameIndex;
@@ -129,7 +134,7 @@ protected override void Destroy()
                 Services.RemoveService<ITexturesStreamingProvider>();
             }
 
-            lock (resources)
+            using (resourceLocker.WriteLock())
             {
                 resources.ForEach(x => x.Release());
                 resources.Clear();
@@ -154,11 +159,9 @@ protected override void Destroy()
         public T Get<T>(object obj) where T : StreamableResource
         {
             StreamableResource result;
-            lock (resources)
-            {
-                resourcesLookup.TryGetValue(obj, out result);
-            }
-            return result as T;
+            if (resourcesLookup.TryGetValue(obj, out result))
+                return result as T;
+            return null;
         }
 
         /// <summary>
@@ -286,22 +289,19 @@ private void SetResourceStreamingOptions(StreamingTexture resource, StreamingOpt
             var alreadyHasOptions = resource.StreamingOptions.HasValue;
             var newOptions = combineOptions && alreadyHasOptions ? options.CombineWith(resource.StreamingOptions.Value) : options;
 
-            lock (resources)
-            {
-                resource.StreamingOptions = newOptions;
+            resource.StreamingOptions = newOptions;
 
-                if (newOptions.LoadImmediately)
+            if (newOptions.LoadImmediately)
+            {
+                // ensure that the resource is not currently streaming
+                if (!resource.CanBeUpdated)
                 {
-                    // ensure that the resource is not currently streaming
-                    if (!resource.CanBeUpdated)
-                    {
-                        resource.StopStreaming();
-                        FlushSync();
-                    }
-
-                    // Stream resource to the maximum level
-                    FullyLoadResource(resource);
+                    resource.StopStreaming();
+                    FlushSync();
                 }
+
+                // Stream resource to the maximum level
+                FullyLoadResource(resource);
             }
         }
 
@@ -309,12 +309,13 @@ internal void RegisterResource(StreamableResource resource)
         {
             Debug.Assert(resource != null && isDisposing == false, $"resource[{resource}] != null && isDisposing[{isDisposing}] == false");
 
-            lock (resources)
+            resourcesLookup.TryAdd(resource.Resource, resource);
+
+            using (resourceLocker.WriteLock())
             {
                 Debug.Assert(!resources.Contains(resource), "!resources.Contains(resource)");
 
                 resources.Add(resource);
-                resourcesLookup.Add(resource.Resource, resource);
             }
         }
 
@@ -325,12 +326,12 @@ internal void UnregisterResource(StreamableResource resource)
 
             Debug.Assert(resource != null, "resource != null");
 
-            lock (resources)
+            using (resourceLocker.WriteLock())
             {
                 Debug.Assert(resources.Contains(resource), "resources.Contains(resource)");
 
                 resources.Remove(resource);
-                resourcesLookup.Remove(resource.Resource);
+                resourcesLookup.TryRemove(resource.Resource, out var _);
                 activeStreaming.Remove(resource);
             }
         }
@@ -365,14 +366,16 @@ private StreamingTexture CreateStreamingTexture(Texture obj, ref ImageDescriptio
         /// <inheritdoc />
         void ITexturesStreamingProvider.FullyLoadTexture(Texture obj, ref ImageDescription imageDescription, ref ContentStorageHeader storageHeader)
         {
-            lock (resources)
-            {
-                // Get streaming object
-                var resource = CreateStreamingTexture(obj, ref imageDescription, ref storageHeader);
+            StreamingTexture resource;
 
-                // Stream resource to the maximum level
-                FullyLoadResource(resource);
+            // Get streaming object
+            resource = CreateStreamingTexture(obj, ref imageDescription, ref storageHeader);
 
+            // Stream resource to the maximum level
+            FullyLoadResource(resource);
+
+            using (resourceLocker.UpgradableReadLock())
+            {
                 // Release streaming object
                 resource.Release();
             }
@@ -381,10 +384,7 @@ void ITexturesStreamingProvider.FullyLoadTexture(Texture obj, ref ImageDescripti
         /// <inheritdoc />
         void ITexturesStreamingProvider.RegisterTexture(Texture obj, ref ImageDescription imageDescription, ref ContentStorageHeader storageHeader)
         {
-            lock (resources)
-            {
-                CreateStreamingTexture(obj, ref imageDescription, ref storageHeader);
-            }
+            CreateStreamingTexture(obj, ref imageDescription, ref storageHeader);
         }
 
         /// <inheritdoc />
@@ -392,10 +392,14 @@ void ITexturesStreamingProvider.UnregisterTexture(Texture obj)
         {
             Debug.Assert(obj != null, "obj != null");
 
-            lock (resources)
+            var resource = Get(obj);
+
+            if (resource != null)
             {
-                var resource = Get(obj);
-                resource?.Release();
+                using (resourceLocker.ReadLock())
+                {
+                    resource.Release();
+                }
             }
         }
 
@@ -403,7 +407,7 @@ void ITexturesStreamingProvider.UnregisterTexture(Texture obj)
         void IStreamingManager.FullyLoadResource(object obj)
         {
             StreamableResource resource;
-            lock (resources)
+            using (resourceLocker.ReadLock())
             {
                 resource = Get<StreamableResource>(obj);
             }
@@ -438,51 +442,58 @@ public override void Update(GameTime gameTime)
                 return;
 
             // Update resources
-            lock (resources)
+            if (Enabled)
             {
-                if (Enabled)
-                {
-                    // Perform synchronization
-                    FlushSync();
+                // Perform synchronization
+                FlushSync();
 
 #if USE_TEST_MANUAL_QUALITY // Temporary testing code used for testing quality changing using K/L keys
-                    if (((Game)Game).Input.IsKeyPressed(Xenko.Input.Keys.K))
-                    {
-                        testQuality = Math.Min(testQuality + 5, 100);
-                    }
-                    if (((Game)Game).Input.IsKeyPressed(Xenko.Input.Keys.L))
+                if (((Game)Game).Input.IsKeyPressed(Xenko.Input.Keys.K))
+                {
+                    testQuality = Math.Min(testQuality + 5, 100);
+                }
+                if (((Game)Game).Input.IsKeyPressed(Xenko.Input.Keys.L))
+                {
+                    testQuality = Math.Max(testQuality - 5, 0);
+                }
+#endif
+                var now = DateTime.UtcNow;
+                int toUpdate = -1;
+
+                do
+                {
+                    if (HasActiveTaskSlotFree == false) goto skip;
+
+                    StreamableResource resource = null;
+
+                    using (resourceLocker.ReadLock())
                     {
-                        testQuality = Math.Max(testQuality - 5, 0);
+                        int cnt = Resources.Count;
+                        if (cnt == 0) goto skip;
+                        if (toUpdate == -1)
+                            toUpdate = cnt - 1;
+                        else
+                            toUpdate--;
+
+                        // Move forward
+                        // Note: we update resources like in a ring buffer
+                        lastUpdateResourcesIndex++;
+                        if (lastUpdateResourcesIndex >= cnt)
+                            lastUpdateResourcesIndex = 0;
+
+                        // Update resource
+                        resource = resources[lastUpdateResourcesIndex];
                     }
-#endif
-                    int resourcesCount = Resources.Count;
-                    if (resourcesCount > 0)
+
+                    var ignoreResource = resource.StreamingOptions?.IgnoreResource ?? false;
+                    if (resource.CanBeUpdated && !ignoreResource)
                     {
-                        var now = DateTime.UtcNow;
-                        var resourcesChecks = resourcesCount;
-
-                        while (resourcesChecks-- > 0 && HasActiveTaskSlotFree)
-                        {
-                            // Move forward
-                            // Note: we update resources like in a ring buffer
-                            lastUpdateResourcesIndex++;
-                            if (lastUpdateResourcesIndex >= resourcesCount)
-                                lastUpdateResourcesIndex = 0;
-
-                            // Update resource
-                            var resource = resources[lastUpdateResourcesIndex];
-                            var ignoreResource = resource.StreamingOptions?.IgnoreResource ?? false;
-                            if (resource.CanBeUpdated && !ignoreResource)
-                            {
-                                Update(resource, ref now);
-                            }
-                        }
-                        // TODO: add StreamingManager stats, update time per frame, updates per frame, etc.
+                        Update(resource, ref now);
                     }
-                }
+                } while (toUpdate > 0);
             }
 
-            ContentStreaming.Update();
+            skip: ContentStreaming.Update();
 
             frameIndex++;
 
@@ -549,7 +560,11 @@ private void Update(StreamableResource resource, ref DateTime now)
 
         private Task StreamAsync(StreamableResource resource, int residency)
         {
-            activeStreaming.Add(resource);
+            using (resourceLocker.WriteLock())
+            {
+                activeStreaming.Add(resource);
+            }
+
             var task = resource.StreamAsyncInternal(residency);
             task.Start();
 
@@ -558,15 +573,21 @@ private Task StreamAsync(StreamableResource resource, int residency)
 
         private void FlushSync()
         {
-            for (int i = 0; i < activeStreaming.Count; i++)
+            using (resourceLocker.UpgradableReadLock())
             {
-                var resource = activeStreaming[i];
-                if (resource.IsTaskActive)
-                    continue;
+                for (int i = 0; i < activeStreaming.Count; i++)
+                {
+                    var resource = activeStreaming[i];
+                    if (resource.IsTaskActive)
+                        continue;
 
-                resource.FlushSync();
-                activeStreaming.RemoveAt(i);
-                i--;
+                    resource.FlushSync();
+                    using (resourceLocker.WriteLock())
+                    {
+                        activeStreaming.RemoveAt(i);
+                    }
+                    i--;
+                }
             }
         }
 
@@ -574,13 +595,10 @@ private void OnEnabledChanged(object sender, EventArgs e)
         {
             if (!Enabled)
             {
-                lock (resources)
-                {
-                    activeStreaming.ForEach(stream => stream.StopStreaming());
-                    FlushSync();
+                activeStreaming.ForEach(stream => stream.StopStreaming());
+                FlushSync();
 
-                    resources.ForEach(FullyLoadResource);
-                }
+                resources.ForEach(FullyLoadResource);
             }
         }
     }
diff --git a/sources/engine/Xenko.Rendering/Xenko.Rendering.csproj b/sources/engine/Xenko.Rendering/Xenko.Rendering.csproj
index 1b4fd07931..43d104d015 100644
--- a/sources/engine/Xenko.Rendering/Xenko.Rendering.csproj
+++ b/sources/engine/Xenko.Rendering/Xenko.Rendering.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -11,4066 +10,51 @@
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoPackAssets>true</XenkoPackAssets>
+    <XenkoPublicApi>true</XenkoPublicApi>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Update="Rendering\Background\BackgroundShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BackgroundShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Background\BackgroundCubemapShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BackgroundCubemapShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Compositing\MSAADepthResolverShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MSAADepthResolverShader.xksl</DependentUpon>
-    </Compile>
-    <None Include="Rendering\Background\BackgroundCubemapShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BackgroundCubemapShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Compositing\MSAADepthResolverShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MSAADepthResolverShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Compositing\MSAAResolverEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MSAAResolverEffect.cs</LastGenOutput>
+    <None Include="Rendering\Properties.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>Properties.cs</LastGenOutput>
     </None>
-    <Compile Update="Rendering\Compositing\MSAAResolverEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MSAAResolverEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Compositing\MSAAResolverShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MSAAResolverShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXNoComputeEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>RadiancePrefilteringGGXNoComputeEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXNoComputeShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>RadiancePrefilteringGGXNoComputeShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHNoComputeEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LambertianPrefilteringSHNoComputeEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHNoComputePass1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LambertianPrefilteringSHNoComputePass1.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHNoComputePass2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LambertianPrefilteringSHNoComputePass2.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Editor\CompilationErrorShader.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CompilationErrorShader.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Editor\EffectCompiling.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>EffectCompiling.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Editor\LightConstantWhite.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightConstantWhite.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Editor\SelectedSpriteShader.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SelectedSpriteShader.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Editor\SharedTextureCoordinate.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SharedTextureCoordinate.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Editor\Sprite3DBase.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Sprite3DBase.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Editor\SpritePicking.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpritePicking.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\DiscardFunction\IMaterialHairDiscardFunction1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IMaterialHairDiscardFunction.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\DiscardFunction\MaterialHairDiscardFunctionOpaquePass1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairDiscardFunctionOpaquePass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\DiscardFunction\MaterialHairDiscardFunctionTransparentPass1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairDiscardFunctionTransparentPass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\SubsurfaceScattering\MaterialSurfaceSubsurfaceScatteringShading.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSurfaceSubsurfaceScatteringShading.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Core\NormalUpdate.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>NormalUpdate.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRDepthPass.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRDepthPass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRResolvePass.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRResolvePass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRTemporalPass.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRTemporalPass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSpotAttenuationDefault.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightSpotAttenuationDefault.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSpotAttenuationRectangular.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightSpotAttenuationRectangular.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\SpotLightDataInternalShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SpotLightDataInternalShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\TextureProjection\TextureProjectionCommon.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TextureProjectionCommon.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\TextureProjection\TextureProjectionFilterDefault.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TextureProjectionFilterDefault.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\TextureProjection\TextureProjectionGroup.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TextureProjectionGroup.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\TextureProjection\TextureProjectionReceiverBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TextureProjectionReceiverBase.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Lights\TextureProjection\TextureProjectionReceiverSpot.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TextureProjectionReceiverSpot.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\GBufferOutputNormals.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GBufferOutputNormals.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\GBufferOutputSpecularColorRoughness.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GBufferOutputSpecularColorRoughness.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.cs">
-      <DependentUpon>ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceDiffuseMetalFlakes.cs">
-      <DependentUpon>MaterialSurfaceDiffuseMetalFlakes.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceGlossinessMapMetalFlakes.cs">
-      <DependentUpon>MaterialSurfaceGlossinessMapMetalFlakes.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\BackgroundVelocity.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BackgroundVelocity.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Core\BackgroundVelocityEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BackgroundVelocityEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Core\MeshVelocity.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MeshVelocity.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Core\VelocityOutput.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>VelocityOutput.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Core\VelocityStream.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>VelocityStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\AntiAliasing\TemporalAntiAliasShader.cs">
-      <DependentUpon>TemporalAntiAliasShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRBlurPass.cs">
-      <AutoGen>True</AutoGen>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xenko.Native\Xenko.Native.csproj" />
+    <ProjectReference Include="..\Xenko.Games\Xenko.Games.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Rendering\Core\NormalFromNormalMappingNoTangent.xksl.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
       <DesignTime>True</DesignTime>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRBlurPass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightShafts\AdditiveLightEffect.cs">
       <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AdditiveLightEffect.xksl</DependentUpon>
     </Compile>
-    <Compile Update="Rendering\Images\LightShafts\LightShaftsEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightShaftsEffect.xkfx</DependentUpon>
+    <Compile Update="Rendering\Lights\LightPointGroupLinear.xksl.cs">
+      <DependentUpon>%(Filename)</DependentUpon>
     </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRCombinePass.cs">
-      <AutoGen>True</AutoGen>
+    <Compile Update="Rendering\Materials\Shaders\FogFeature.xksl.cs">
       <DesignTime>True</DesignTime>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRCombinePass.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRCommon.cs">
       <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRCommon.xksl</DependentUpon>
     </Compile>
-    <Compile Update="Rendering\Images\LocalReflections\SSLRRayTracePass.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SSLRRayTracePass.xksl</DependentUpon>
+    <Compile Update="Rendering\Skyboxes\SkyboxShaderTextureHorizon.xksl.cs">
+      <DependentUpon>SkyboxShaderTextureHorizon.xksl</DependentUpon>
     </Compile>
-    <None Include="Rendering\Core\NormalUpdate.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalUpdate.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRBlurPass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRBlurPass.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRCombinePass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRCombinePass.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRCommon.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRCommon.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRDepthPass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRDepthPass.cs</LastGenOutput>
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Rendering\Core\NormalFromNormalMappingNoTangent.xksl">
+      <LastGenOutput>NormalFromNormalMappingNoTangent.xksl.cs</LastGenOutput>
     </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRRayTracePass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRRayTracePass.cs</LastGenOutput>
+    <None Update="Rendering\Materials\Shaders\FogFeature.xksl">
+      <LastGenOutput>FogFeature.xksl.cs</LastGenOutput>
     </None>
-    <Compile Update="Rendering\Images\RangeConversion\RangeCompressorShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>RangeCompressorShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\RangeConversion\RangeDecompressorShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>RangeDecompressorShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightShafts\PostEffectBoundingRay.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>PostEffectBoundingRay.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightShafts\AdditiveLightShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AdditiveLightShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightShafts\LightShaftsShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightShaftsShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightShafts\VolumeMinMaxShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>VolumeMinMaxShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetEnvironmentFunction.cs">
-      <DependentUpon>IMaterialSpecularMicrofacetEnvironmentFunction.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetEnvironmentGGXLUT.cs">
-      <DependentUpon>MaterialSpecularMicrofacetEnvironmentGGXLUT.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetEnvironmentThinGlass.cs">
-      <DependentUpon>MaterialSpecularMicrofacetEnvironmentThinGlass.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetFresnelThinGlass.cs">
-      <DependentUpon>MaterialSpecularMicrofacetFresnelThinGlass.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetEnvironmentGGXPolynomial.cs">
-      <DependentUpon>MaterialSpecularMicrofacetEnvironmentGGXPolynomial.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialTransmittanceReflectanceStream.cs">
-      <DependentUpon>MaterialTransmittanceReflectanceStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceTransmittanceShading.cs">
-      <DependentUpon>MaterialSurfaceTransmittanceShading.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceNormalStreamShading.cs">
-      <DependentUpon>MaterialSurfaceNormalStreamShading.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\MaterialSurfaceShadingDiffuseHair.cs">
-      <DependentUpon>MaterialSurfaceShadingDiffuseHair.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="Rendering\Shaders\GlobalVR.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GlobalVR.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterAlphaDiscard.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapCasterAlphaDiscard.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\GBufferOutputSubsurfaceScatteringMaterialIndex.cs">
-      <DependentUpon>GBufferOutputSubsurfaceScatteringMaterialIndex.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterNoPixelShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>ShadowMapCasterNoPixelShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\IMaterialSubsurfaceScatteringScatteringProfile1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IMaterialSubsurfaceScatteringScatteringProfile.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\MaterialSubsurfaceScatteringScatteringProfileCustomUniform1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSubsurfaceScatteringScatteringProfileCustomUniform.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\MaterialSubsurfaceScatteringScatteringProfileCustomVarying1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSubsurfaceScatteringScatteringProfileCustomVarying.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\MaterialSubsurfaceScatteringScatteringProfileSkin1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSubsurfaceScatteringScatteringProfileSkin.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\LightAttenuationFunction\MaterialHairLightAttenuationFunctionDirectional2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairLightAttenuationFunctionDirectional.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\Dither\Dither2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Dither.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Deferred\GBuffer1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GBuffer.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\SphericalHarmonics\SphericalHarmonicsUtils.cs">
-      <DependentUpon>SphericalHarmonicsUtils.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\LightProbes\BakeLightProbeShader.cs">
-      <DependentUpon>BakeLightProbeShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\LightProbes\LightProbeShader.cs">
-      <DependentUpon>LightProbeShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\LightProbes\XenkoBakeLightProbeEffect.cs">
-      <DependentUpon>XenkoBakeLightProbeEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Rendering\Background\BackgroundShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BackgroundShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Compositing\MSAAResolverShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MSAAResolverShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\BackgroundVelocity.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BackgroundVelocity.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\BackgroundVelocityEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BackgroundVelocityEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\MeshVelocity.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MeshVelocity.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\VelocityOutput.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>VelocityOutput.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\VelocityStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>VelocityStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\AntiAliasing\TemporalAntiAliasShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TemporalAntiAliasShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightShafts\AdditiveLightEffect.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>AdditiveLightEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightShafts\LightShaftsEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightShaftsEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRResolvePass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRResolvePass.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LocalReflections\SSLRTemporalPass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SSLRTemporalPass.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\RangeConversion\RangeCompressorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RangeCompressorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\RangeConversion\RangeDecompressorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RangeDecompressorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Compositing\DefaultGraphicsCompositorLevel10.xkgfxcomp" />
-    <None Include="Rendering\Compositing\DefaultGraphicsCompositorLevel9.xkgfxcomp" />
-    <None Include="Rendering\Images\Dither\Dither.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Dither2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightShafts\AdditiveLightShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>AdditiveLightShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightShafts\LightShaftsShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightShaftsShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightShafts\PostEffectBoundingRay.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PostEffectBoundingRay.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightShafts\VolumeMinMaxShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>VolumeMinMaxShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSpotAttenuationDefault.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSpotAttenuationDefault.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSpotAttenuationRectangular.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSpotAttenuationRectangular.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\SpotLightDataInternalShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SpotLightDataInternalShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\TextureProjection\TextureProjectionCommon.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TextureProjectionCommon.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\TextureProjection\TextureProjectionFilterDefault.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TextureProjectionFilterDefault.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\TextureProjection\TextureProjectionGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TextureProjectionGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\TextureProjection\TextureProjectionReceiverBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TextureProjectionReceiverBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\TextureProjection\TextureProjectionReceiverSpot.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TextureProjectionReceiverSpot.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\CelShading\MaterialCelShadingLightDefault.xksl" />
-    <None Include="Rendering\Materials\CelShading\IMaterialCelShadingLightFunction.xksl" />
-    <None Include="Rendering\Materials\CelShading\MaterialCelShadingLightRamp.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialCelShadingLightRamp2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\CelShading\MaterialSurfaceShadingDiffuseCelShading.xksl" />
-    <Compile Update="Rendering\Materials\CelShading\MaterialCelShadingLightRamp2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialCelShadingLightRamp.xksl</DependentUpon>
-    </Compile>
-    <None Include="Rendering\Images\AmbientOcclusion\AmbientOcclusionBlurShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>AmbientOcclusionBlurShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\AmbientOcclusion\AmbientOcclusionRawAOEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>AmbientOcclusionRawAOEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\AmbientOcclusion\ApplyAmbientOcclusionShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ApplyAmbientOcclusionShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\AmbientOcclusion\AmbientOcclusionRawAOShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>AmbientOcclusionRawAOShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\AmbientOcclusion\AmbientOcclusionBlurEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>AmbientOcclusionBlurEffect1.cs</LastGenOutput>
-    </None>
-    <Compile Update="Rendering\Images\AmbientOcclusion\AmbientOcclusionBlurEffect1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AmbientOcclusionBlurEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\AmbientOcclusion\AmbientOcclusionBlurShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AmbientOcclusionBlurShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\AmbientOcclusion\AmbientOcclusionRawAOEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AmbientOcclusionRawAOEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\AmbientOcclusion\ApplyAmbientOcclusionShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ApplyAmbientOcclusionShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\AmbientOcclusion\AmbientOcclusionRawAOShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>AmbientOcclusionRawAOShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\DirectionFunction\IMaterialHairDirectionFunction1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IMaterialHairDirectionFunction.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\LightAttenuationFunction\IMaterialHairLightAttenuationFunction1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IMaterialHairLightAttenuationFunction.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\LightAttenuationFunction\MaterialHairLightAttenuationFunctionNone1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairLightAttenuationFunctionNone.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\ShadowingFunction\IMaterialHairShadowingFunction1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IMaterialHairShadowingFunction.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\DirectionFunction\MaterialHairDirectionFunctionBitangent1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairDirectionFunctionBitangent.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\DirectionFunction\MaterialHairDirectionFunctionTangent1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairDirectionFunctionTangent.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\ShadowingFunction\MaterialHairShadowingFunctionScattering1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairShadowingFunctionScattering.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\ShadowingFunction\MaterialHairShadowingFunctionShadowing1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairShadowingFunctionShadowing.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\MaterialHairShared1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialHairShared.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Hair\MaterialSurfaceShadingSpecularHair.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSurfaceShadingSpecularHair.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\AntiAliasing\FXAAShaderEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>FXAAShaderEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\LuminanceToChannelShader.cs">
-      <DependentUpon>LuminanceToChannelShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapHejl2OperatorShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ToneMapHejl2OperatorShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CombineFrontCoCShader.cs">
-      <DependentUpon>CombineFrontCoCShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="Rendering\Lights\DirectLightGroupPerDraw.cs">
-      <DependentUpon>DirectLightGroupPerDraw.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\DirectLightGroupPerView.cs">
-      <DependentUpon>DirectLightGroupPerView.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightClusteredSpotGroup.cs">
-      <DependentUpon>LightClusteredSpotGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightClustered.cs">
-      <DependentUpon>LightClustered.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightDirectional1.cs">
-      <DependentUpon>LightDirectional.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSpot1.cs">
-      <DependentUpon>LightSpot.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightPoint1.cs">
-      <DependentUpon>LightPoint.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightClusteredPointGroup.cs">
-      <DependentUpon>LightClusteredPointGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorThreshold.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorThreshold.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorFromStream.cs">
-      <DependentUpon>ComputeColorFromStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Properties.cs">
-      <DependentUpon>Properties.tt</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterCubeMap.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapCasterCubeMap.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterCubeMapProjection1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapCasterCubeMapProjection.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterParaboloid1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapCasterParaboloid.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterParaboloidProjection1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapCasterParaboloidProjection.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapReceiverPointCubeMap.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapReceiverPointCubeMap.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapReceiverPointParaboloid.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ShadowMapReceiverPointParaboloid.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\LightProbes\ComputeSphericalHarmonics.cs">
-      <DependentUpon>ComputeSphericalHarmonics.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\SkyboxShaderBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SkyboxShaderBase.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\SkyboxShaderCubemap.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SkyboxShaderCubemap.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\SkyboxShaderTexture.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SkyboxShaderTexture.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\SubsurfaceScattering\SubsurfaceScatteringBlurEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SubsurfaceScatteringBlurEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\SubsurfaceScattering\SubsurfaceScatteringBlurShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SubsurfaceScatteringBlurShader.xksl</DependentUpon>
-    </Compile>
-    <None Include="Rendering\Deferred\GBuffer.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GBuffer1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SphericalHarmonics\SphericalHarmonicsUtils.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SphericalHarmonicsUtils.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\LightProbes\BakeLightProbeShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BakeLightProbeShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\LightProbes\LightProbeShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightProbeShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\LightProbes\XenkoBakeLightProbeEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>XenkoBakeLightProbeEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\DirectLightGroupPerDraw.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DirectLightGroupPerDraw.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\DirectLightGroupPerView.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DirectLightGroupPerView.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightClustered.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightClustered.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightClusteredSpotGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightClusteredSpotGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightDirectional.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightDirectional1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSpot.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSpot1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightPoint.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightPoint1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\CelShading\MaterialSurfaceShadingSpecularCelShading.xksl" />
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScaledOffsetDynamicSamplerRandomUV.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorThreshold.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorThreshold.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightClusteredPointGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightClusteredPointGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\DirectionFunction\IMaterialHairDirectionFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialHairDirectionFunction1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\DiscardFunction\IMaterialHairDiscardFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialHairDiscardFunction1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\DiscardFunction\MaterialHairDiscardFunctionOpaquePass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairDiscardFunctionOpaquePass1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\DiscardFunction\MaterialHairDiscardFunctionTransparentPass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairDiscardFunctionTransparentPass1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\LightAttenuationFunction\IMaterialHairLightAttenuationFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialHairLightAttenuationFunction1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\LightAttenuationFunction\MaterialHairLightAttenuationFunctionDirectional.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairLightAttenuationFunctionDirectional2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\LightAttenuationFunction\MaterialHairLightAttenuationFunctionNone.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairLightAttenuationFunctionNone1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\ShadowingFunction\IMaterialHairShadowingFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialHairShadowingFunction1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\DirectionFunction\MaterialHairDirectionFunctionBitangent.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairDirectionFunctionBitangent1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\DirectionFunction\MaterialHairDirectionFunctionTangent.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairDirectionFunctionTangent1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\ShadowingFunction\MaterialHairShadowingFunctionScattering.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairShadowingFunctionScattering1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\ShadowingFunction\MaterialHairShadowingFunctionShadowing.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairShadowingFunctionShadowing1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\MaterialHairShared.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialHairShared1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\MaterialSurfaceShadingDiffuseHair.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceShadingDiffuseHair.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Hair\MaterialSurfaceShadingSpecularHair.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceShadingSpecularHair.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\SubsurfaceScattering\MaterialSurfaceSubsurfaceScatteringShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceSubsurfaceScatteringShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\GBufferOutputSubsurfaceScatteringMaterialIndex.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GBufferOutputSubsurfaceScatteringMaterialIndex.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\IMaterialSubsurfaceScatteringScatteringProfile.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSubsurfaceScatteringScatteringProfile1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\MaterialSubsurfaceScatteringScatteringProfileCustomUniform.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSubsurfaceScatteringScatteringProfileCustomUniform1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\MaterialSubsurfaceScatteringScatteringProfileCustomVarying.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSubsurfaceScatteringScatteringProfileCustomVarying1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\SubsurfaceScattering\ScatteringProfileFunction\MaterialSubsurfaceScatteringScatteringProfileSkin.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSubsurfaceScatteringScatteringProfileSkin1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SubsurfaceScattering\SubsurfaceScatteringBlurEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SubsurfaceScatteringBlurEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SubsurfaceScattering\SubsurfaceScatteringBlurShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SubsurfaceScatteringBlurShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\LightProbes\ComputeSphericalHarmonics.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeSphericalHarmonics.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\GBufferOutputNormals.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GBufferOutputNormals.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\GBufferOutputSpecularColorRoughness.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GBufferOutputSpecularColorRoughness.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetEnvironmentFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSpecularMicrofacetEnvironmentFunction.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetEnvironmentGGXLUT.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetEnvironmentGGXLUT.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetEnvironmentThinGlass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetEnvironmentThinGlass.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetFresnelThinGlass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetFresnelThinGlass.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetEnvironmentGGXPolynomial.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetEnvironmentGGXPolynomial.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceDiffuseMetalFlakes.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceDiffuseMetalFlakes.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceGlossinessMapMetalFlakes.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceGlossinessMapMetalFlakes.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialTransmittanceReflectanceStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialTransmittanceReflectanceStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceTransmittanceShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceTransmittanceShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceNormalStreamShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceNormalStreamShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shaders\GlobalVR.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GlobalVR.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterAlphaDiscard.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterAlphaDiscard.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterCubeMap.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterCubeMap.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterCubeMapProjection.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterCubeMapProjection1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterNoPixelShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterNoPixelShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterParaboloid.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterParaboloid1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterParaboloidProjection.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterParaboloidProjection1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapReceiverPointCubeMap.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapReceiverPointCubeMap.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapReceiverPointParaboloid.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapReceiverPointParaboloid.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\SkyboxShaderBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SkyboxShaderBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\SkyboxShaderCubemap.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SkyboxShaderCubemap.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\SkyboxShaderTexture.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SkyboxShaderTexture.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\HighlightShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>HighlightShader.cs</LastGenOutput>
-    </None>
-    <Compile Update="Rendering\Utils\HighlightShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>HighlightShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Utils\Picking.cs">
-      <DependentUpon>Picking.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\PickingShader.cs">
-      <DependentUpon>PickingShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthMinMax\DepthMinMaxShader.cs">
-      <DependentUpon>DepthMinMaxShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthMinMax\DepthMinMaxEffect.cs">
-      <DependentUpon>DepthMinMaxEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightPointGroup.cs">
-      <DependentUpon>LightPointGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightUtil.cs">
-      <DependentUpon>LightUtil.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSpotGroup.cs">
-      <DependentUpon>LightSpotGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSkyboxEffect.cs">
-      <DependentUpon>LightSkyboxEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialFrontBackBlendShader.cs">
-      <DependentUpon>MaterialFrontBackBlendShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceDiffuse.cs">
-      <DependentUpon>MaterialSurfaceDiffuse.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceDiffuseSpecularAlphaBlendColor.cs">
-      <DependentUpon>MaterialSurfaceDiffuseSpecularAlphaBlendColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\XenkoWireframeShadingEffect.cs">
-      <DependentUpon>XenkoWireframeShadingEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapReceiverBase.cs">
-      <DependentUpon>ShadowMapReceiverBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapReceiverSpot.cs">
-      <DependentUpon>ShadowMapReceiverSpot.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\DirectLightGroupFixed.cs">
-      <DependentUpon>DirectLightGroupFixed.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Update="Rendering\Images\Bloom\BloomAfterimageCombineShader.cs">
-      <DependentUpon>BloomAfterimageCombineShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\Bloom\BloomAfterimageShader.cs">
-      <DependentUpon>BloomAfterimageShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CombineFrontCoCEffect.cs">
-      <DependentUpon>CombineFrontCoCEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\PointDepth.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>PointDepth.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\ThresholdAlphaCoCFront.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ThresholdAlphaCoCFront.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSubtract1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ComputeColorSubtract.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\Noise\FilmGrainShader.cs">
-      <DependentUpon>FilmGrainShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\ThresholdAlphaCoC.cs">
-      <DependentUpon>ThresholdAlphaCoC.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\Vignetting\VignettingShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>VignettingShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\IMaterialSurfaceDomain.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IMaterialSurfaceDomain.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\IStreamInitializer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>IStreamInitializer.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\MaterialDisplacementStream.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialDisplacementStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\MaterialDomainStream.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialDomainStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\MaterialStreamAdditiveBlend.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialStreamAdditiveBlend.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\MaterialSurfaceDisplacement1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSurfaceDisplacement.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\MaterialSurfaceDomainStageCompositor1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialSurfaceDomainStageCompositor.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\MaterialTessellationStream1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MaterialTessellationStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\BRDF\BRDFMicrofacet.cs">
-      <DependentUpon>BRDFMicrofacet.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorAdd3ds.cs">
-      <DependentUpon>ComputeColorAdd3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorDarken3ds.cs">
-      <DependentUpon>ComputeColorDarken3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorDifference3ds.cs">
-      <DependentUpon>ComputeColorDifference3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorLighten3ds.cs">
-      <DependentUpon>ComputeColorLighten3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorMask3ds.cs">
-      <DependentUpon>ComputeColorMask3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorMultiply3ds.cs">
-      <DependentUpon>ComputeColorMultiply3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorOver3ds.cs">
-      <DependentUpon>ComputeColorOver3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorOverlay3ds.cs">
-      <DependentUpon>ComputeColorOverlay3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorSubtract3ds.cs">
-      <DependentUpon>ComputeColorSubtract3ds.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColor.cs">
-      <DependentUpon>ComputeColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColor3.cs">
-      <DependentUpon>ComputeColor3.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorAdd.cs">
-      <DependentUpon>ComputeColorAdd.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorAdd3.cs">
-      <DependentUpon>ComputeColorAdd3.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorAverage.cs">
-      <DependentUpon>ComputeColorAverage.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorCave.cs">
-      <DependentUpon>ComputeColorCave.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorColor.cs">
-      <DependentUpon>ComputeColorColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorColorBurn.cs">
-      <DependentUpon>ComputeColorColorBurn.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorColorDodge.cs">
-      <DependentUpon>ComputeColorColorDodge.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorConstantColorLink.cs">
-      <DependentUpon>ComputeColorConstantColorLink.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorConstantFloatLink.cs">
-      <DependentUpon>ComputeColorConstantFloatLink.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorConstantLink.cs">
-      <DependentUpon>ComputeColorConstantLink.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorDesaturate.cs">
-      <DependentUpon>ComputeColorDesaturate.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorDivide.cs">
-      <DependentUpon>ComputeColorDivide.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorExclusion.cs">
-      <DependentUpon>ComputeColorExclusion.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorFixed.cs">
-      <DependentUpon>ComputeColorFixed.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorHardLight.cs">
-      <DependentUpon>ComputeColorHardLight.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorHardMix.cs">
-      <DependentUpon>ComputeColorHardMix.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorHue.cs">
-      <DependentUpon>ComputeColorHue.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorIlluminate.cs">
-      <DependentUpon>ComputeColorIlluminate.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorIn.cs">
-      <DependentUpon>ComputeColorIn.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorLerpAlpha.cs">
-      <DependentUpon>ComputeColorLerpAlpha.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorLinearBurn.cs">
-      <DependentUpon>ComputeColorLinearBurn.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorLinearDodge.cs">
-      <DependentUpon>ComputeColorLinearDodge.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorMask.cs">
-      <DependentUpon>ComputeColorMask.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorMultiply.cs">
-      <DependentUpon>ComputeColorMultiply.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorOne.cs">
-      <DependentUpon>ComputeColorOne.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorOut.cs">
-      <DependentUpon>ComputeColorOut.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorOutdoor.cs">
-      <DependentUpon>ComputeColorOutdoor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorOverlay.cs">
-      <DependentUpon>ComputeColorOverlay.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorParameter.cs">
-      <DependentUpon>ComputeColorParameter.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorPinLight.cs">
-      <DependentUpon>ComputeColorPinLight.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSaturate.cs">
-      <DependentUpon>ComputeColorSaturate.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSaturation.cs">
-      <DependentUpon>ComputeColorSaturation.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorScaler.cs">
-      <DependentUpon>ComputeColorScaler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorScreen.cs">
-      <DependentUpon>ComputeColorScreen.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSoftLight.cs">
-      <DependentUpon>ComputeColorSoftLight.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorStream.cs">
-      <DependentUpon>ComputeColorStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSubstituteAlpha.cs">
-      <DependentUpon>ComputeColorSubstituteAlpha.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSubstituteAlphaWithColor.cs">
-      <DependentUpon>ComputeColorSubstituteAlphaWithColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorSynthetic.cs">
-      <DependentUpon>ComputeColorSynthetic.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTexture.cs">
-      <DependentUpon>ComputeColorTexture.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureDynamicScaledOffset.cs">
-      <DependentUpon>ComputeColorTextureDynamicScaledOffset.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodSampler.cs">
-      <DependentUpon>ComputeColorTextureLodSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodScaledOffsetDynamicSampler.cs">
-      <DependentUpon>ComputeColorTextureLodScaledOffsetDynamicSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodScaledOffsetSampler.cs">
-      <DependentUpon>ComputeColorTextureLodScaledOffsetSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodScaledSampler.cs">
-      <DependentUpon>ComputeColorTextureLodScaledSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureRepeat.cs">
-      <DependentUpon>ComputeColorTextureRepeat.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureSampler.cs">
-      <DependentUpon>ComputeColorTextureSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaled.cs">
-      <DependentUpon>ComputeColorTextureScaled.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffset.cs">
-      <DependentUpon>ComputeColorTextureScaledOffset.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffsetDynamicSampler.cs">
-      <DependentUpon>ComputeColorTextureScaledOffsetDynamicSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffsetSampler.cs">
-      <DependentUpon>ComputeColorTextureScaledOffsetSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledSampler.cs">
-      <DependentUpon>ComputeColorTextureScaledSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\ComputeColorValue.cs">
-      <DependentUpon>ComputeColorValue.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorAddMaya.cs">
-      <DependentUpon>ComputeColorAddMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorDarkenMaya.cs">
-      <DependentUpon>ComputeColorDarkenMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorDifferenceMaya.cs">
-      <DependentUpon>ComputeColorDifferenceMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorLightenMaya.cs">
-      <DependentUpon>ComputeColorLightenMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorMultiplyMaya.cs">
-      <DependentUpon>ComputeColorMultiplyMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorOverMaya.cs">
-      <DependentUpon>ComputeColorOverMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorSubtractMaya.cs">
-      <DependentUpon>ComputeColorSubtractMaya.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\ComputeEffectShader1.cs">
-      <DependentUpon>ComputeEffectShader.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\ComputeShaderBase.cs">
-      <DependentUpon>ComputeShaderBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\GGXPrefiltering\Hammersley.cs">
-      <DependentUpon>Hammersley.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\GGXPrefiltering\ImportanceSamplingGGX.cs">
-      <DependentUpon>ImportanceSamplingGGX.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXEffect.cs">
-      <DependentUpon>RadiancePrefilteringGGXEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXShader.cs">
-      <DependentUpon>RadiancePrefilteringGGXShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSH1.cs">
-      <DependentUpon>LambertianPrefilteringSH.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHPass1.cs">
-      <DependentUpon>LambertianPrefilteringSHPass1.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHPass2.cs">
-      <DependentUpon>LambertianPrefilteringSHPass2.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\ColorBase.cs">
-      <DependentUpon>ColorBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\DynamicSampler.cs">
-      <DependentUpon>DynamicSampler.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\DynamicTexture.cs">
-      <DependentUpon>DynamicTexture.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\DynamicTextureCube.cs">
-      <DependentUpon>DynamicTextureCube.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\DynamicTextureStream.cs">
-      <DependentUpon>DynamicTextureStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\NormalBase.cs">
-      <DependentUpon>NormalBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\NormalFromMesh.cs">
-      <DependentUpon>NormalFromMesh.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\NormalFromNormalMapping.cs">
-      <DependentUpon>NormalFromNormalMapping.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\NormalStream.cs">
-      <DependentUpon>NormalStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\PositionHStream4.cs">
-      <DependentUpon>PositionHStream4.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\PositionStream.cs">
-      <DependentUpon>PositionStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\PositionStream2.cs">
-      <DependentUpon>PositionStream2.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\PositionStream4.cs">
-      <DependentUpon>PositionStream4.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\PositionVertexTransform.cs">
-      <DependentUpon>PositionVertexTransform.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\ScreenPositionBase.cs">
-      <DependentUpon>ScreenPositionBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\ShadingBase.cs">
-      <DependentUpon>ShadingBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Core\ShadingColor.cs">
-      <DependentUpon>ShadingColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\LensFlare\FlareArtifactEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>FlareArtifactEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LensFlare\FlareArtifactShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>FlareArtifactShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LensFlare\FlareReplicate.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>FlareReplicate.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightStreak\LightStreakEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightStreakEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Images\LightStreak\LightStreakShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>LightStreakShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\ComputeColorMaterialAlphaBlend.cs">
-      <DependentUpon>ComputeColorMaterialAlphaBlend.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceTransparentAlphaDiscard.cs">
-      <DependentUpon>MaterialSurfaceTransparentAlphaDiscard.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\XenkoForwardShadingEffect.cs">
-      <DependentUpon>XenkoForwardShadingEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\XenkoEffectBase.cs">
-      <DependentUpon>XenkoEffectBase.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\ProceduralModels\CameraCube.cs">
-      <DependentUpon>CameraCube.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\AntiAliasing\FXAAShader.cs">
-      <DependentUpon>FXAAShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\BrightFilter\BrightFilterShader.cs">
-      <DependentUpon>BrightFilterShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorCombiner\ColorCombinerEffect.cs">
-      <DependentUpon>ColorCombinerEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorCombiner\ColorCombinerShader.cs">
-      <DependentUpon>ColorCombinerShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ColorTransformGroupEffect.cs">
-      <DependentUpon>ColorTransformGroupEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ColorTransformGroupShader.cs">
-      <DependentUpon>ColorTransformGroupShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ColorTransformShader.cs">
-      <DependentUpon>ColorTransformShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapCommonOperatorShader.cs">
-      <DependentUpon>ToneMapCommonOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapDragoOperatorShader.cs">
-      <DependentUpon>ToneMapDragoOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapEffect.cs">
-      <DependentUpon>ToneMapEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapExponentialOperatorShader.cs">
-      <DependentUpon>ToneMapExponentialOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapHejlDawsonOperatorShader.cs">
-      <DependentUpon>ToneMapHejlDawsonOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapLogarithmicOperatorShader.cs">
-      <DependentUpon>ToneMapLogarithmicOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapMikeDayOperatorShader.cs">
-      <DependentUpon>ToneMapMikeDayOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapOperatorShader.cs">
-      <DependentUpon>ToneMapOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapReinhardOperatorShader.cs">
-      <DependentUpon>ToneMapReinhardOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapShader.cs">
-      <DependentUpon>ToneMapShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ColorTransforms\ToneMap\ToneMapU2FilmicOperatorShader.cs">
-      <DependentUpon>ToneMapU2FilmicOperatorShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\McIntoshCombineShader.cs">
-      <DependentUpon>McIntoshCombineShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\McIntoshOptimizedEffect.cs">
-      <DependentUpon>McIntoshOptimizedEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\McIntoshOptimizedShader.cs">
-      <DependentUpon>McIntoshOptimizedShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\TripleRhombiCombineShader.cs">
-      <DependentUpon>TripleRhombiCombineShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CircleOfConfusion.cs">
-      <DependentUpon>CircleOfConfusion.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CoCLinearDepthShader.cs">
-      <DependentUpon>CoCLinearDepthShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CoCMapBlurEffect.cs">
-      <DependentUpon>CoCMapBlurEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CoCMapBlurShader.cs">
-      <DependentUpon>CoCMapBlurShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CombineLevelsFromCoCEffect.cs">
-      <DependentUpon>CombineLevelsFromCoCEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\CombineLevelsFromCoCShader.cs">
-      <DependentUpon>CombineLevelsFromCoCShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\DepthAwareDirectionalBlurEffect.cs">
-      <DependentUpon>DepthAwareDirectionalBlurEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\DepthAwareDirectionalBlurShader.cs">
-      <DependentUpon>DepthAwareDirectionalBlurShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\DepthOfField\DepthAwareDirectionalBlurUtil.cs">
-      <DependentUpon>DepthAwareDirectionalBlurUtil.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\GaussianBlur\GaussianBlurEffect.cs">
-      <DependentUpon>GaussianBlurEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\GaussianBlur\GaussianBlurShader.cs">
-      <DependentUpon>GaussianBlurShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ImageEffectShader1.cs">
-      <DependentUpon>ImageEffectShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ImageScaler\ImageScalerEffect.cs">
-      <DependentUpon>ImageScalerEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\ImageScaler\ImageScalerShader.cs">
-      <DependentUpon>ImageScalerShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\LuminanceEffect\LuminanceLogShader.cs">
-      <DependentUpon>LuminanceLogShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\LuminanceEffect\LuminanceUtils.cs">
-      <DependentUpon>LuminanceUtils.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\SphericalHarmonics\SphericalHarmonicsBase.cs">
-      <DependentUpon>SphericalHarmonicsBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\SphericalHarmonics\SphericalHarmonicsParameters.cs">
-      <DependentUpon>SphericalHarmonicsParameters.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\SphericalHarmonics\SphericalHarmonicsRenderer1.cs">
-      <DependentUpon>SphericalHarmonicsRenderer.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Images\SphericalHarmonics\SphericalHarmonicsRendererEffect1.cs">
-      <DependentUpon>SphericalHarmonicsRendererEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\DirectLightGroup.cs">
-      <DependentUpon>DirectLightGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\DirectLightGroupArray.cs">
-      <DependentUpon>DirectLightGroupArray.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\EnvironmentLight.cs">
-      <DependentUpon>EnvironmentLight.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\EnvironmentLightArray.cs">
-      <DependentUpon>EnvironmentLightArray.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightDirectionalGroup.cs">
-      <DependentUpon>LightDirectionalGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSimpleAmbient.cs">
-      <DependentUpon>LightSimpleAmbient.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightSkyboxShader.cs">
-      <DependentUpon>LightSkyboxShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Lights\LightStream.cs">
-      <DependentUpon>LightStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetFresnelFunction.cs">
-      <DependentUpon>IMaterialSpecularMicrofacetFresnelFunction.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetNormalDistributionFunction.cs">
-      <DependentUpon>IMaterialSpecularMicrofacetNormalDistributionFunction.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetVisibilityFunction.cs">
-      <DependentUpon>IMaterialSpecularMicrofacetVisibilityFunction.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialStreamBlend.cs">
-      <DependentUpon>IMaterialStreamBlend.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSurface.cs">
-      <DependentUpon>IMaterialSurface.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSurfacePixel.cs">
-      <DependentUpon>IMaterialSurfacePixel.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSurfaceShading.cs">
-      <DependentUpon>IMaterialSurfaceShading.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\IMaterialSurfaceVertex.cs">
-      <DependentUpon>IMaterialSurfaceVertex.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialPixelShadingStream.cs">
-      <DependentUpon>MaterialPixelShadingStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialPixelStream.cs">
-      <DependentUpon>MaterialPixelStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetFresnelNone.cs">
-      <DependentUpon>MaterialSpecularMicrofacetFresnelNone.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetFresnelSchlick.cs">
-      <DependentUpon>MaterialSpecularMicrofacetFresnelSchlick.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetNormalDistributionBeckmann.cs">
-      <DependentUpon>MaterialSpecularMicrofacetNormalDistributionBeckmann.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetNormalDistributionBlinnPhong.cs">
-      <DependentUpon>MaterialSpecularMicrofacetNormalDistributionBlinnPhong.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetNormalDistributionGGX.cs">
-      <DependentUpon>MaterialSpecularMicrofacetNormalDistributionGGX.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityCookTorrance.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilityCookTorrance.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityImplicit.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilityImplicit.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityKelemen.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilityKelemen.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityNeumann.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilityNeumann.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithBeckmann.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilitySmithBeckmann.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.cs">
-      <DependentUpon>MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialStream.cs">
-      <DependentUpon>MaterialStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialStreamLinearBlend.cs">
-      <DependentUpon>MaterialStreamLinearBlend.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialStreamNormalBlend.cs">
-      <DependentUpon>MaterialStreamNormalBlend.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceArray.cs">
-      <DependentUpon>MaterialSurfaceArray.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceShadingBlend.cs">
-      <DependentUpon>MaterialSurfaceShadingBlend.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceEmissiveShading.cs">
-      <DependentUpon>MaterialSurfaceEmissiveShading.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceGlossinessMap.cs">
-      <DependentUpon>MaterialSurfaceGlossinessMap.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceLightingAndShading.cs">
-      <DependentUpon>MaterialSurfaceLightingAndShading.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceMetalness.cs">
-      <DependentUpon>MaterialSurfaceMetalness.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceNormalMap.cs">
-      <DependentUpon>MaterialSurfaceNormalMap.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfacePixelStageCompositor.cs">
-      <DependentUpon>MaterialSurfacePixelStageCompositor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceSetStreamFromComputeColor.cs">
-      <DependentUpon>MaterialSurfaceSetStreamFromComputeColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceShadingDiffuseLambert.cs">
-      <DependentUpon>MaterialSurfaceShadingDiffuseLambert.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceShadingSpecularBlinnPhong.cs">
-      <DependentUpon>MaterialSurfaceShadingSpecularBlinnPhong.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceShadingSpecularMicrofacet.cs">
-      <DependentUpon>MaterialSurfaceShadingSpecularMicrofacet.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceStreamsBlend.cs">
-      <DependentUpon>MaterialSurfaceStreamsBlend.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceStreamShading.cs">
-      <DependentUpon>MaterialSurfaceStreamShading.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceVertexDisplacement.cs">
-      <DependentUpon>MaterialSurfaceVertexDisplacement.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialSurfaceVertexStageCompositor.cs">
-      <DependentUpon>MaterialSurfaceVertexStageCompositor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Materials\Shaders\MaterialVertexStream.cs">
-      <DependentUpon>MaterialVertexStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowGroup.cs">
-      <DependentUpon>ShadowGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapReceiverDirectional.cs">
-      <DependentUpon>ShadowMapReceiverDirectional.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCaster.cs">
-      <DependentUpon>ShadowMapCaster.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCasterVsm.cs">
-      <DependentUpon>ShadowMapCasterVsm.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapCommon.cs">
-      <DependentUpon>ShadowMapCommon.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapFilterBase.cs">
-      <DependentUpon>ShadowMapFilterBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapFilterDefault.cs">
-      <DependentUpon>ShadowMapFilterDefault.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapFilterPcf.cs">
-      <DependentUpon>ShadowMapFilterPcf.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapFilterVsm.cs">
-      <DependentUpon>ShadowMapFilterVsm.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowMapGroup.cs">
-      <DependentUpon>ShadowMapGroup.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shadows\ShadowStream.cs">
-      <DependentUpon>ShadowStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skinning\NormalMeshSkinning.cs">
-      <DependentUpon>NormalMeshSkinning.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skinning\NormalVSSkinningFromMesh.cs">
-      <DependentUpon>NormalVSSkinningFromMesh.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skinning\NormalVSSkinningNormalMapping.cs">
-      <DependentUpon>NormalVSSkinningNormalMapping.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skinning\TangentMeshSkinning.cs">
-      <DependentUpon>TangentMeshSkinning.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skinning\TransformationSkinning.cs">
-      <DependentUpon>TransformationSkinning.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\CubemapUtils.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CubemapUtils.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\IComputeEnvironmentColor.cs">
-      <DependentUpon>IComputeEnvironmentColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\LevelCubeMapEnvironmentColor.cs">
-      <DependentUpon>LevelCubeMapEnvironmentColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\RoughnessCubeMapEnvironmentColor.cs">
-      <DependentUpon>RoughnessCubeMapEnvironmentColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\SkyboxStream.cs">
-      <DependentUpon>SkyboxStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Skyboxes\SphericalHarmonicsEnvironmentColor.cs">
-      <DependentUpon>SphericalHarmonicsEnvironmentColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Tessellation\TessellationAE2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TessellationAE2.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Tessellation\TessellationAE3.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TessellationAE3.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Tessellation\TessellationAE4.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TessellationAE4.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Tessellation\TessellationBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TessellationBase.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Tessellation\TessellationFlat.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TessellationFlat.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Tessellation\TessellationPN.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TessellationPN.xksl</DependentUpon>
-    </Compile>
-    <Compile Update="Rendering\Transformation\TransformationBase.cs">
-      <DependentUpon>TransformationBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Transformation\TransformationMatrix.cs">
-      <DependentUpon>TransformationMatrix.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Transformation\TransformationWAndVP.cs">
-      <DependentUpon>TransformationWAndVP.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Transformation\TransformationWVP.cs">
-      <DependentUpon>TransformationWVP.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Transformation\TransformationZero.cs">
-      <DependentUpon>TransformationZero.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\BlendUtils.cs">
-      <DependentUpon>BlendUtils.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\ModelComponentPickingShader.cs">
-      <DependentUpon>ModelComponentPickingShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\DepthBase.cs">
-      <DependentUpon>DepthBase.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\FlattenLayers.cs">
-      <DependentUpon>FlattenLayers.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\HSVUtils.cs">
-      <DependentUpon>HSVUtils.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\Math.cs">
-      <DependentUpon>Math.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\NormalPack.cs">
-      <DependentUpon>NormalPack.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\NormalUtil.cs">
-      <DependentUpon>NormalUtil.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\ModelComponentPickingEffect.cs">
-      <DependentUpon>ModelComponentPickingEffect.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\SwapUV.cs">
-      <DependentUpon>SwapUV.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Utils\Utilities.cs">
-      <DependentUpon>Utilities.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shaders\Camera.cs">
-      <DependentUpon>Camera.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shaders\Global.cs">
-      <DependentUpon>Global.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Update="Rendering\Shaders\Transformation.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Transformation.xksl</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Rendering\BRDF\BRDFMicrofacet.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BRDFMicrofacet.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXNoComputeEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RadiancePrefilteringGGXNoComputeEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXNoComputeShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RadiancePrefilteringGGXNoComputeShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHNoComputeEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LambertianPrefilteringSHNoComputeEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHNoComputePass1.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LambertianPrefilteringSHNoComputePass1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHNoComputePass2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LambertianPrefilteringSHNoComputePass2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\LuminanceToChannelShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LuminanceToChannelShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapHejl2OperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapHejl2OperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorAdd3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorAdd3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorDarken3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorDarken3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorDifference3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorDifference3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorLighten3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorLighten3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorMask3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorMask3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorMultiply3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorMultiply3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorOver3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOver3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorOverlay3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOverlay3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\3dsMax\ComputeColorSubtract3ds.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSubtract3ds.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColor3.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColor3.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorAdd.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorAdd.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorAdd3.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorAdd3.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorAverage.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorAverage.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorCave.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorCave.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorColorBurn.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorColorBurn.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorColorDodge.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorColorDodge.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorConstantColorLink.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorConstantColorLink.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorConstantFloatLink.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorConstantFloatLink.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorConstantLink.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorConstantLink.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorDesaturate.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorDesaturate.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorDivide.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorDivide.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorExclusion.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorExclusion.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorFixed.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorFixed.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorHardLight.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorHardLight.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorHardMix.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorHardMix.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorHue.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorHue.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorIlluminate.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorIlluminate.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorIn.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorIn.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorLerpAlpha.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorLerpAlpha.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorLinearBurn.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorLinearBurn.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorLinearDodge.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorLinearDodge.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorMask.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorMask.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorMultiply.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorMultiply.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorOne.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOne.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorOut.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOut.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorOutdoor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOutdoor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorOverlay.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOverlay.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorParameter.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorParameter.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorPinLight.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorPinLight.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSaturate.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSaturate.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSaturation.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSaturation.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorScaler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorScaler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorScreen.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorScreen.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSoftLight.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSoftLight.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSubstituteAlpha.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSubstituteAlpha.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSubstituteAlphaWithColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSubstituteAlphaWithColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSubtract.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSubtract1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorSynthetic.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSynthetic.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTexture.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTexture.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureDynamicScaledOffset.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureDynamicScaledOffset.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureLodSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodScaledOffsetDynamicSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureLodScaledOffsetDynamicSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodScaledOffsetSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureLodScaledOffsetSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureLodScaledSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureLodScaledSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureRepeat.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureRepeat.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorFromStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorFromStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaled.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScaled.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffset.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScaledOffset.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffsetDynamicSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScaledOffsetDynamicSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledOffsetSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScaledOffsetSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorTextureScaledSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorTextureScaledSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\ComputeColorValue.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorValue.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorAddMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorAddMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorDarkenMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorDarkenMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorDifferenceMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorDifferenceMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorLightenMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorLightenMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorMultiplyMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorMultiplyMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorOverMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorOverMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\Shaders\Maya\ComputeColorSubtractMaya.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorSubtractMaya.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\ComputeEffectShader.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeEffectShader1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\ComputeShaderBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeShaderBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\GGXPrefiltering\Hammersley.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Hammersley.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\GGXPrefiltering\ImportanceSamplingGGX.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ImportanceSamplingGGX.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RadiancePrefilteringGGXEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\GGXPrefiltering\RadiancePrefilteringGGXShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RadiancePrefilteringGGXShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSH.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LambertianPrefilteringSH1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHPass1.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LambertianPrefilteringSHPass1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ComputeEffect\LambertianPrefiltering\LambertianPrefilteringSHPass2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LambertianPrefilteringSHPass2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\ColorBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\DynamicSampler.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DynamicSampler.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\DynamicTexture.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DynamicTexture.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\DynamicTextureCube.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DynamicTextureCube.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\DynamicTextureStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DynamicTextureStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\NormalBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\NormalFromMesh.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalFromMesh.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\NormalFromNormalMapping.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalFromNormalMapping.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\NormalStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\PositionHStream4.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PositionHStream4.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\PositionStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PositionStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\PositionStream2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PositionStream2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\PositionStream4.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PositionStream4.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\PositionVertexTransform.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PositionVertexTransform.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\ScreenPositionBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ScreenPositionBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\ShadingBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadingBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Core\ShadingColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadingColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\AntiAliasing\FXAAShaderEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FXAAShaderEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ImageEffects.cd" />
-    <None Include="Rendering\Images\AntiAliasing\FXAAShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FXAAShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\Bloom\BloomAfterimageCombineShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BloomAfterimageCombineShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\Bloom\BloomAfterimageShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BloomAfterimageShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\BrightFilter\BrightFilterShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BrightFilterShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorCombiner\ColorCombinerEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorCombinerEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorCombiner\ColorCombinerShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorCombinerShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ColorTransformGroupEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorTransformGroupEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ColorTransformGroupShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorTransformGroupShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ColorTransformShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ColorTransformShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\Noise\FilmGrainShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FilmGrainShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapCommonOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapCommonOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapDragoOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapDragoOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapExponentialOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapExponentialOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapHejlDawsonOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapHejlDawsonOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapLogarithmicOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapLogarithmicOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapMikeDayOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapMikeDayOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapReinhardOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapReinhardOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\ToneMap\ToneMapU2FilmicOperatorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToneMapU2FilmicOperatorShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\McIntoshCombineShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>McIntoshCombineShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\McIntoshOptimizedEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>McIntoshOptimizedEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\McIntoshOptimizedShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>McIntoshOptimizedShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\BokehTechnique\Hexagonal\TripleRhombiCombineShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TripleRhombiCombineShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CombineFrontCoCShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CombineFrontCoCShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CombineFrontCoCEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CombineFrontCoCEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\PointDepth.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PointDepth.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\ThresholdAlphaCoC.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ThresholdAlphaCoC.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CircleOfConfusion.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CircleOfConfusion.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CoCLinearDepthShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CoCLinearDepthShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CoCMapBlurEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CoCMapBlurEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CoCMapBlurShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CoCMapBlurShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CombineLevelsFromCoCEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CombineLevelsFromCoCEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\CombineLevelsFromCoCShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CombineLevelsFromCoCShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\DepthAwareDirectionalBlurEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DepthAwareDirectionalBlurEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\DepthAwareDirectionalBlurShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DepthAwareDirectionalBlurShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\DepthAwareDirectionalBlurUtil.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DepthAwareDirectionalBlurUtil.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthOfField\ThresholdAlphaCoCFront.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ThresholdAlphaCoCFront.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\GaussianBlur\GaussianBlurEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GaussianBlurEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\GaussianBlur\GaussianBlurShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GaussianBlurShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ImageEffectShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ImageEffectShader1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthMinMax\DepthMinMaxShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DepthMinMaxShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\DepthMinMax\DepthMinMaxEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DepthMinMaxEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ImageScaler\ImageScalerEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ImageScalerEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ImageScaler\ImageScalerShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ImageScalerShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LensFlare\FlareArtifactEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FlareArtifactEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LensFlare\FlareArtifactShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FlareArtifactShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LensFlare\FlareReplicate.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FlareReplicate.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightStreak\LightStreakEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightStreakEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LightStreak\LightStreakShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightStreakShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LuminanceEffect\LuminanceLogShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LuminanceLogShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\LuminanceEffect\LuminanceUtils.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LuminanceUtils.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SphericalHarmonics\SphericalHarmonicsBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SphericalHarmonicsBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SphericalHarmonics\SphericalHarmonicsParameters.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SphericalHarmonicsParameters.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SphericalHarmonics\SphericalHarmonicsRenderer.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SphericalHarmonicsRenderer1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\SphericalHarmonics\SphericalHarmonicsRendererEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SphericalHarmonicsRendererEffect1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Images\ColorTransforms\Vignetting\VignettingShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>VignettingShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\DirectLightGroupFixed.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DirectLightGroupFixed.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\DirectLightGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DirectLightGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\DirectLightGroupArray.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DirectLightGroupArray.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\EnvironmentLight.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>EnvironmentLight.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\EnvironmentLightArray.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>EnvironmentLightArray.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightPointGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightPointGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightUtil.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightUtil.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSpotGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSpotGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightDirectionalGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightDirectionalGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSimpleAmbient.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSimpleAmbient.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSkyboxShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSkyboxShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Lights\LightSkyboxEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LightSkyboxEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\ComputeColors\ComputeColors.cd" />
-    <None Include="Rendering\Materials\IMaterialSurfaceDomain.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSurfaceDomain.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\IStreamInitializer.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IStreamInitializer.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\MaterialDisplacementStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialDisplacementStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\MaterialDomainStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialDomainStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Materials.cd" />
-    <None Include="Rendering\Materials\MaterialStreamAdditiveBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialStreamAdditiveBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\MaterialSurfaceDisplacement.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceDisplacement1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\MaterialSurfaceDomainStageCompositor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceDomainStageCompositor1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\MaterialTessellationStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialTessellationStream1.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialFrontBackBlendShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialFrontBackBlendShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\ComputeColorMaterialAlphaBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorMaterialAlphaBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetFresnelFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSpecularMicrofacetFresnelFunction.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetNormalDistributionFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSpecularMicrofacetNormalDistributionFunction.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSpecularMicrofacetVisibilityFunction.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSpecularMicrofacetVisibilityFunction.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialStreamBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialStreamBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSurface.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSurface.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSurfacePixel.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSurfacePixel.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSurfaceShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSurfaceShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\IMaterialSurfaceVertex.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IMaterialSurfaceVertex.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialPixelShadingStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialPixelShadingStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialPixelStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialPixelStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetFresnelNone.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetFresnelNone.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetFresnelSchlick.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetFresnelSchlick.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetNormalDistributionBeckmann.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetNormalDistributionBeckmann.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetNormalDistributionBlinnPhong.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetNormalDistributionBlinnPhong.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetNormalDistributionGGX.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetNormalDistributionGGX.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityCookTorrance.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilityCookTorrance.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityImplicit.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilityImplicit.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityKelemen.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilityKelemen.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilityNeumann.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilityNeumann.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithBeckmann.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilitySmithBeckmann.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilitySmithGGXCorrelated.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilitySmithSchlickBeckmann.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSpecularMicrofacetVisibilitySmithSchlickGGX.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialStreamLinearBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialStreamLinearBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialStreamNormalBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialStreamNormalBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceDiffuse.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceDiffuse.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceDiffuseSpecularAlphaBlendColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceDiffuseSpecularAlphaBlendColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceTransparentAlphaDiscard.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceTransparentAlphaDiscard.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceArray.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceArray.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceShadingBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceShadingBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceEmissiveShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceEmissiveShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceGlossinessMap.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceGlossinessMap.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceLightingAndShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceLightingAndShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceMetalness.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceMetalness.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceNormalMap.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceNormalMap.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfacePixelStageCompositor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfacePixelStageCompositor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceSetStreamFromComputeColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceSetStreamFromComputeColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceShadingDiffuseLambert.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceShadingDiffuseLambert.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceShadingSpecularBlinnPhong.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceShadingSpecularBlinnPhong.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceShadingSpecularMicrofacet.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceShadingSpecularMicrofacet.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceStreamsBlend.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceStreamsBlend.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceStreamShading.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceStreamShading.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceVertexDisplacement.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceVertexDisplacement.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialSurfaceVertexStageCompositor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialSurfaceVertexStageCompositor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Materials\Shaders\MaterialVertexStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MaterialVertexStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\Picking.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Picking.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\PickingShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>PickingShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\XenkoWireframeShadingEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>XenkoWireframeShadingEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\XenkoForwardShadingEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>XenkoForwardShadingEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\XenkoEffectBase.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>XenkoEffectBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\ProceduralModels\CameraCube.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CameraCube.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Compositing\SceneGraphicsCompositor.cd" />
-    <None Include="Rendering\ProceduralModels\ProceduralModels.cd" />
-    <None Include="Rendering\Shadows\ShadowGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapReceiverBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapReceiverBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapReceiverSpot.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapReceiverSpot.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapReceiverDirectional.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapReceiverDirectional.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCaster.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCaster.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCasterVsm.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCasterVsm.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapCommon.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapCommon.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapFilterBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapFilterBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapFilterDefault.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapFilterDefault.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapFilterPcf.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapFilterPcf.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapFilterVsm.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapFilterVsm.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowMapGroup.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowMapGroup.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shadows\ShadowStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ShadowStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skinning\NormalMeshSkinning.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalMeshSkinning.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skinning\NormalVSSkinningFromMesh.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalVSSkinningFromMesh.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skinning\NormalVSSkinningNormalMapping.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalVSSkinningNormalMapping.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skinning\TangentMeshSkinning.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TangentMeshSkinning.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skinning\TransformationSkinning.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationSkinning.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\CubemapUtils.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CubemapUtils.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\IComputeEnvironmentColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>IComputeEnvironmentColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\LevelCubeMapEnvironmentColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>LevelCubeMapEnvironmentColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\RoughnessCubeMapEnvironmentColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>RoughnessCubeMapEnvironmentColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\SkyboxStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SkyboxStream.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Skyboxes\SphericalHarmonicsEnvironmentColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SphericalHarmonicsEnvironmentColor.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Tessellation\TessellationAE2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationAE2.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Tessellation\TessellationAE3.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationAE3.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Tessellation\TessellationAE4.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationAE4.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Tessellation\TessellationBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Tessellation\TessellationFlat.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationFlat.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Tessellation\TessellationPN.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationPN.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Transformation\TransformationBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Transformation\TransformationMatrix.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationMatrix.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Transformation\TransformationWAndVP.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationWAndVP.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Transformation\TransformationWVP.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationWVP.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Transformation\TransformationZero.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TransformationZero.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\BlendUtils.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BlendUtils.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\ModelComponentPickingShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ModelComponentPickingShader.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\DepthBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DepthBase.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\FlattenLayers.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>FlattenLayers.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\HSVUtils.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>HSVUtils.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\Math.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Math.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\NormalPack.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalPack.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\NormalUtil.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NormalUtil.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\ModelComponentPickingEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ModelComponentPickingEffect.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\SwapUV.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SwapUV.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Utils\Utilities.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Utilities.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shaders\Camera.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Camera.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shaders\Global.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Global.cs</LastGenOutput>
-    </None>
-    <None Include="Rendering\Shaders\Transformation.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Transformation.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Rendering\Properties.tt">
-      <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Properties.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Rendering\Editor\CompilationErrorShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-    <None Update="Rendering\Editor\EffectCompiling.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-    <None Update="Rendering\Editor\LightConstantWhite.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-    <None Update="Rendering\Editor\SelectedSpriteShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-    <None Update="Rendering\Editor\SharedTextureCoordinate.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-    <None Update="Rendering\Editor\Sprite3DBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-    <None Update="Rendering\Editor\SpritePicking.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xenko.Native\Xenko.Native.csproj" />
-    <ProjectReference Include="..\Xenko.Games\Xenko.Games.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/sources/engine/Xenko.Shaders.Compiler/Direct3D/ShaderCompiler.cs b/sources/engine/Xenko.Shaders.Compiler/Direct3D/ShaderCompiler.cs
index e29bce0155..04c419f8a0 100644
--- a/sources/engine/Xenko.Shaders.Compiler/Direct3D/ShaderCompiler.cs
+++ b/sources/engine/Xenko.Shaders.Compiler/Direct3D/ShaderCompiler.cs
@@ -104,9 +104,15 @@ private void UpdateReflection(ShaderBytecode shaderBytecode, EffectReflection ef
                 if (constantBufferRawDesc.Type == SharpDX.D3DCompiler.ConstantBufferType.ResourceBindInformation)
                     continue;
 
-                var linkBuffer = effectReflection.ConstantBuffers.First(buffer => buffer.Name == constantBufferRawDesc.Name);
-
-                ValidateConstantBufferReflection(constantBufferRaw, ref constantBufferRawDesc, linkBuffer, log);
+                try
+                {
+                    var linkBuffer = effectReflection.ConstantBuffers.First(buffer => buffer.Name == constantBufferRawDesc.Name);
+                    ValidateConstantBufferReflection(constantBufferRaw, ref constantBufferRawDesc, linkBuffer, log);
+                }
+                catch (Exception)
+                {
+                    // couldn't find a match for this resource, skip
+                }
             }
 
             // BoundResources
diff --git a/sources/engine/Xenko.Shaders.Compiler/EffectCompiler.cs b/sources/engine/Xenko.Shaders.Compiler/EffectCompiler.cs
index c2f74aa063..6776f3a51a 100644
--- a/sources/engine/Xenko.Shaders.Compiler/EffectCompiler.cs
+++ b/sources/engine/Xenko.Shaders.Compiler/EffectCompiler.cs
@@ -108,18 +108,6 @@ public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSo
                     shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_DIRECT3D", 1);
                     shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_DIRECT3D11", 1);
                     break;
-                case GraphicsPlatform.Direct3D12:
-                    shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_DIRECT3D", 1);
-                    shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_DIRECT3D12", 1);
-                    break;
-                case GraphicsPlatform.OpenGL:
-                    shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_OPENGL", 1);
-                    shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_OPENGLCORE", 1);
-                    break;
-                case GraphicsPlatform.OpenGLES:
-                    shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_OPENGL", 1);
-                    shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_OPENGLES", 1);
-                    break;
                 case GraphicsPlatform.Vulkan:
                     shaderMixinSource.AddMacro("XENKO_GRAPHICS_API_VULKAN", 1);
                     break;
@@ -199,12 +187,9 @@ public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSo
             {
 #if XENKO_PLATFORM_WINDOWS
                 case GraphicsPlatform.Direct3D11:
-                case GraphicsPlatform.Direct3D12:
                     compiler = new Direct3D.ShaderCompiler();
                     break;
 #endif
-                case GraphicsPlatform.OpenGL:
-                case GraphicsPlatform.OpenGLES:
                 case GraphicsPlatform.Vulkan:
                     // get the number of render target outputs
                     var rtOutputs = 0;
@@ -244,11 +229,6 @@ public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSo
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
             var stageStringBuilder = new StringBuilder();
 #endif
-            // if the shader (non-compute) does not have a pixel shader, we should add it for OpenGL and OpenGL ES.
-            if ((effectParameters.Platform == GraphicsPlatform.OpenGL || effectParameters.Platform == GraphicsPlatform.OpenGLES) && !parsingResult.EntryPoints.ContainsKey(ShaderStage.Pixel) && !parsingResult.EntryPoints.ContainsKey(ShaderStage.Compute))
-            {
-                parsingResult.EntryPoints.Add(ShaderStage.Pixel, null);
-            }
 
             foreach (var stageBinding in parsingResult.EntryPoints)
             {
@@ -282,6 +262,7 @@ public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSo
 
             // Remove unused reflection data, as it is entirely resolved at compile time.
             CleanupReflection(bytecode.Reflection);
+
             bytecode.Stages = shaderStageBytecodes.ToArray();
 
 #if XENKO_PLATFORM_WINDOWS_DESKTOP
diff --git a/sources/engine/Xenko.Shaders.Compiler/OpenGL/ShaderCompiler.cs b/sources/engine/Xenko.Shaders.Compiler/OpenGL/ShaderCompiler.cs
index 6e8b2afb70..084177d8cb 100644
--- a/sources/engine/Xenko.Shaders.Compiler/OpenGL/ShaderCompiler.cs
+++ b/sources/engine/Xenko.Shaders.Compiler/OpenGL/ShaderCompiler.cs
@@ -58,14 +58,6 @@ public ShaderBytecodeResult Compile(string shaderSource, string entryPoint, Shad
 
             switch (effectParameters.Platform)
             {
-                case GraphicsPlatform.OpenGL:
-                    shaderPlatform = GlslShaderPlatform.OpenGL;
-                    shaderVersion = 410;
-                    break;
-                case GraphicsPlatform.OpenGLES:
-                    shaderPlatform = GlslShaderPlatform.OpenGLES;
-                    shaderVersion = effectParameters.Profile >= GraphicsProfile.Level_10_0 ? 300 : 100;
-                    break;
                 case GraphicsPlatform.Vulkan:
                     shaderPlatform = GlslShaderPlatform.Vulkan;
                     shaderVersion = 450;
@@ -79,40 +71,7 @@ public ShaderBytecodeResult Compile(string shaderSource, string entryPoint, Shad
             if (shader == null)
                 return shaderBytecodeResult;
 
-            if (effectParameters.Platform == GraphicsPlatform.OpenGLES)      // TODO: Add check to run on android only. The current version breaks OpenGL ES on windows.
-            { 
-                //TODO: Remove this ugly hack!
-                if (shaderSource.Contains($"Texture2D XenkoInternal_TextureExt0") && shader.Contains("uniform sampler2D"))
-                {
-                    if (shaderPlatform != GlslShaderPlatform.OpenGLES || shaderVersion != 300)
-                        throw new Exception("Invalid GLES platform or version: require OpenGLES 300");
-
-                    shader = shader.Replace("uniform sampler2D", "uniform samplerExternalOES");
-                    shader = shader.Replace("#version 300 es", "#version 300 es\n#extension GL_OES_EGL_image_external_essl3 : require");
-                }
-            }
-
-            if (effectParameters.Platform == GraphicsPlatform.OpenGLES)
-            {
-                // store both ES 2 and ES 3 on OpenGL ES platforms
-                var shaderBytecodes = new ShaderLevelBytecode();
-                if (effectParameters.Profile >= GraphicsProfile.Level_10_0)
-                {
-                    shaderBytecodes.DataES3 = shader;
-                    shaderBytecodes.DataES2 = null;
-                }
-                else
-                {
-                    shaderBytecodes.DataES2 = shader;
-                    shaderBytecodes.DataES3 = Compile(shaderSource, entryPoint, stage, GlslShaderPlatform.OpenGLES, 300, shaderBytecodeResult, reflection, inputAttributeNames, resourceBindings, sourceFilename);
-                }
-                using (var stream = new MemoryStream())
-                {
-                    BinarySerialization.Write(stream, shaderBytecodes);
-                    rawData = stream.GetBuffer();
-                }
-            }
-            else if (effectParameters.Platform == GraphicsPlatform.Vulkan)
+            if (effectParameters.Platform == GraphicsPlatform.Vulkan)
             {
                 string inputFileExtension;
                 switch (stage)
@@ -299,13 +258,13 @@ private string Compile(string shaderSource, string entryPoint, ShaderStage stage
 
                 if (shaderPlatform == GlslShaderPlatform.Vulkan)
                 {
-                    // Defines the ordering of resource groups in Vulkan. This is mirrored in the PipelineState
-                    var resourceGroups = reflection.ResourceBindings.Select(x => x.ResourceGroup ?? "Globals").Distinct().ToList();
-
                     // Register "NoSampler", required by HLSL=>GLSL translation to support HLSL such as texture.Load().
                     var noSampler = new EffectResourceBindingDescription { KeyInfo = { KeyName = "NoSampler" }, RawName = "NoSampler", Class = EffectParameterClass.Sampler, SlotStart = -1, SlotCount = 1 };
                     reflection.ResourceBindings.Add(noSampler);
 
+                    // Defines the ordering of resource groups in Vulkan. This is mirrored in the PipelineState
+                    var resourceGroups = reflection.ResourceBindings.Select(x => x.ResourceGroup ?? "Globals").Distinct().ToList();
+
                     var bindings = resourceGroups.SelectMany(resourceGroup => reflection.ResourceBindings
                         .Where(x => x.ResourceGroup == resourceGroup || (x.ResourceGroup == null && resourceGroup == "Globals"))
                         .GroupBy(x => new { KeyName = x.KeyInfo.KeyName, RawName = x.RawName, Class = x.Class, Type = x.Type, SlotCount = x.SlotCount, LogicalGroup = x.LogicalGroup })
diff --git a/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs b/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs
index 65966bc5ce..f5dc44062e 100644
--- a/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs
+++ b/sources/engine/Xenko.Shaders.Compiler/ShaderSourceComparer.cs
@@ -28,10 +28,10 @@ public override bool Equals(ShaderSource x, ShaderSource y)
             if (x.GetType() != y.GetType())
                 return false;
 
-            if (x is ShaderClassSource)
+            if (x is ShaderClassCode)
             {
-                var x1 = (ShaderClassSource)x;
-                var y1 = (ShaderClassSource)y;
+                var x1 = (ShaderClassCode)x;
+                var y1 = (ShaderClassCode)y;
                 return x1.ClassName == y1.ClassName
                        && ArrayExtensions.ArraysEqual(x1.GenericArguments, y1.GenericArguments);
             }
@@ -59,9 +59,9 @@ public override int GetHashCode(ShaderSource obj)
 
             unchecked
             {
-                if (obj is ShaderClassSource)
+                if (obj is ShaderClassCode)
                 {
-                    var obj1 = (ShaderClassSource)obj;
+                    var obj1 = (ShaderClassCode)obj;
                     return obj1.ClassName.GetHashCode()
                            ^ ArrayExtensions.ComputeHash(obj1.GenericArguments);
                 }
diff --git a/sources/engine/Xenko.Shaders.Compiler/Xenko.Shaders.Compiler.csproj b/sources/engine/Xenko.Shaders.Compiler/Xenko.Shaders.Compiler.csproj
index 686d024b32..b66119e01e 100644
--- a/sources/engine/Xenko.Shaders.Compiler/Xenko.Shaders.Compiler.csproj
+++ b/sources/engine/Xenko.Shaders.Compiler/Xenko.Shaders.Compiler.csproj
@@ -1,11 +1,10 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -22,7 +21,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Shaders.Parser\Xenko.Shaders.Parser.csproj" />
-    <PackageReference Include="SharpDX.D3DCompiler" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
+    <PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
   </ItemGroup>
   <ItemGroup Condition="'$(XenkoPlatform)' == 'Windows'">
     <XenkoNativeLib Include="$(WindowsSdkDir_10)\Redist\D3D\**\d3dcompiler_47.dll">
@@ -45,5 +44,5 @@
   </ItemGroup>
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs
index 98b3094add..a428103476 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ModuleMixinInfo.cs
@@ -67,13 +67,13 @@ public ShaderClassType MixinAst
         }
 
         /// <summary>
-        /// Tests if this instance is a <see cref="ShaderClassSource"/> of the specified type name 
+        /// Tests if this instance is a <see cref="ShaderClassCode"/> of the specified type name 
         /// </summary>
         /// <param name="typeName">The type name to test</param>
         /// <returns><c>true</c> if same type name</returns>
         public bool IsShaderClass(string typeName)
         {
-            var classSource = ShaderSource as ShaderClassSource;
+            var classSource = ShaderSource as ShaderClassCode;
             if (classSource == null)
             {
                 return false;
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderCompilationContext.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderCompilationContext.cs
index 0689c88ce1..22978f9100 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderCompilationContext.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderCompilationContext.cs
@@ -107,6 +107,14 @@ private void BuildModuleMixins(HashSet<ModuleMixinInfo> mixinInfos)
 
             lock (AnalysisLock)
             {
+                // reset error status of mixins so we get the same error messages for each compilation
+                foreach (var mixinInfo in mixinInfos)
+                {
+                    var mixin = mixinInfo.Mixin;
+                    if (mixin.DependenciesStatus == AnalysisStatus.Error || mixin.DependenciesStatus == AnalysisStatus.Cyclic)
+                        mixin.DependenciesStatus = AnalysisStatus.None;
+                }
+
                 foreach (var mixinInfo in mixinInfos)
                     BuildMixinDependencies(mixinInfo);
 
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs
index a7b836decf..8309639820 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderLoader.cs
@@ -92,7 +92,7 @@ public class LoadedShaderClassType
         /// <param name="autoGenericInstances"></param>
         /// <returns>A ShaderClassType or null if there was some errors.</returns>
         /// <exception cref="System.ArgumentNullException">shaderClassSource</exception>
-        public LoadedShaderClassType LoadClassSource(ShaderClassSource shaderClassSource, Xenko.Core.Shaders.Parser.ShaderMacro[] shaderMacros, LoggerResult log, bool autoGenericInstances)
+        public LoadedShaderClassType LoadClassSource(ShaderClassCode shaderClassSource, Xenko.Core.Shaders.Parser.ShaderMacro[] shaderMacros, LoggerResult log, bool autoGenericInstances)
         {
             if (shaderClassSource == null) throw new ArgumentNullException("shaderClassSource");
 
@@ -103,7 +103,7 @@ public LoadedShaderClassType LoadClassSource(ShaderClassSource shaderClassSource
                 foreach (var gen in shaderClassSource.GenericArguments)
                     generics += "___" + gen;
             }
-            var shaderClassType = LoadShaderClass(shaderClassSource.ClassName, generics, log, shaderMacros);
+            var shaderClassType = LoadShaderClass(shaderClassSource, generics, log, shaderMacros);
 
             if (shaderClassType == null)
                 return null;
@@ -275,7 +275,7 @@ Expression CreateExpressionFromString(string name)
             return (Expression)result.Root.AstNode;
         }
 
-        private LoadedShaderClassType LoadShaderClass(ShaderClassSource classSource, string generics, LoggerResult log, Xenko.Core.Shaders.Parser.ShaderMacro[] macros = null)
+        private LoadedShaderClassType LoadShaderClass(ShaderClassCode classSource, string generics, LoggerResult log, Xenko.Core.Shaders.Parser.ShaderMacro[] macros = null)
         {
             var type = classSource.ClassName;
             if (type == null) throw new ArgumentNullException("type");
@@ -291,8 +291,14 @@ private LoadedShaderClassType LoadShaderClass(ShaderClassSource classSource, str
                     return shaderClass;
                 }
 
-                // Load file
-                var shaderSource = SourceManager.LoadShaderSource(type);
+                ShaderSourceManager.ShaderSourceWithHash shaderSource;
+
+                // Load shader source code
+                if (classSource is ShaderClassString shaderClassString)
+                    shaderSource = SourceManager.LoadShaderSource(type, shaderClassString.ShaderSourceCode);
+                else
+                    shaderSource = SourceManager.LoadShaderSource(type);
+
                 string preprocessedSource;
                 try
                 {
@@ -405,7 +411,7 @@ private static string GenerateGenericClassName(ShaderClassType shaderClassType)
             return shaderClassType.Name.Text + (shaderClassType.GenericParameters == null ? string.Empty : "_" + string.Join("_", shaderClassType.GenericParameters.Select(x => x.ToString().Replace('.', '_'))));
         }
 
-        private static string GenerateGenericClassName(ShaderClassSource source)
+        private static string GenerateGenericClassName(ShaderClassCode source)
         {
             // Generate class name
             if (source.GenericArguments != null && source.GenericArguments.Length > 0)
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs
index f7c922fc84..ef5825a03f 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/ShaderSourceManager.cs
@@ -112,16 +112,21 @@ public static ShaderSourceWithHash CreateShaderSourceWithHash(string type, strin
         /// Loads the shader source with the specified type name.
         /// </summary>
         /// <param name="type">The typeName.</param>
+        /// <param name="shaderSourceCode">Optional shader source code. Can be use for shaders that don't have a source file</param>
         /// <returns>ShaderSourceWithHash.</returns>
         /// <exception cref="System.IO.FileNotFoundException">If the file was not found</exception>
-        public ShaderSourceWithHash LoadShaderSource(string type)
+        public ShaderSourceWithHash LoadShaderSource(string type, string shaderSourceCode = null)
         {
             lock (locker)
             {
-                // Load file
                 ShaderSourceWithHash shaderSource;
                 if (!loadedShaderSources.TryGetValue(type, out shaderSource))
                 {
+                    // Load from string
+                    if (!string.IsNullOrWhiteSpace(shaderSourceCode))
+                        return CreateShaderSourceWithHash(type, shaderSourceCode);
+
+                    // Load file
                     var sourceUrl = FindFilePath(type);
                     if (sourceUrl != null)
                     {
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoClassInstantiator.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoClassInstantiator.cs
index b8d3e0ccf3..c715f14213 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoClassInstantiator.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoClassInstantiator.cs
@@ -92,7 +92,7 @@ public override void Visit(MemberReferenceExpression memberReferenceExpression)
             // Try to find usage of all MemberName 'yyy' in reference expressions like "xxx.yyy" and replace by their
             // generic instantiation
             var memberVariableName = memberReferenceExpression.Member.Text;
-            if (variableGenerics.ContainsKey(memberVariableName) && variableGenerics[memberVariableName].Type is MemberName)
+            if (variableGenerics.TryGetValue(memberVariableName, out var memberVariable) && memberVariable.Type is MemberName)
             {
                 string memberName;
                 if (stringGenerics.TryGetValue(memberVariableName, out memberName) && !autoGenericInstances)
@@ -101,7 +101,7 @@ public override void Visit(MemberReferenceExpression memberReferenceExpression)
                 }
                 else
                 {
-                    memberReferenceExpression.TypeInference.Declaration = variableGenerics[memberVariableName];
+                    memberReferenceExpression.TypeInference.Declaration = memberVariable;
                 }
             }
         }
@@ -126,7 +126,11 @@ public override void Visit(Variable variable)
                 return;
             }
 
+            if (variable.IsGroup)
+                return;
+
             // no call on base
+            // Semantic keyword: replace semantics
             foreach (var sem in variable.Qualifiers.Values.OfType<Semantic>())
             {
                 string replacementSemantic;
@@ -138,6 +142,16 @@ public override void Visit(Variable variable)
                 }
             }
 
+            // MemberName keyword: replace variable names
+            if (variableGenerics.TryGetValue(variable.Name, out var genVariable) && genVariable.Type is MemberName)
+            {
+                string memberName;
+                if (stringGenerics.TryGetValue(variable.Name, out memberName))
+                {
+                    variable.Name = new Identifier(memberName);
+                }
+            }
+
             foreach (var annotation in variable.Attributes.OfType<AttributeDeclaration>().Where(x => x.Name == "Link" && x.Parameters.Count > 0))
             {
                 var linkName = (string)annotation.Parameters[0].Value;
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs
index 99baf94d34..20beba5d89 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoShaderLibrary.cs
@@ -148,7 +148,7 @@ private void ExtendLibrary(ShaderSource shaderSource, Xenko.Core.Shaders.Parser.
                 foreach (var composition in ((ShaderMixinSource)shaderSource).Compositions)
                     ExtendLibrary(composition.Value, newMacros, mixinToAnalyze);
             }
-            else if (shaderSource is ShaderClassSource)
+            else if (shaderSource is ShaderClassCode)
                 mixinToAnalyze.Add(GetModuleMixinInfo(shaderSource, macros));
             else if (shaderSource is ShaderArraySource)
             {
@@ -185,19 +185,17 @@ private ModuleMixinInfo GetModuleMixinInfo(ShaderSource shaderSource, Xenko.Core
             if (mixinInfo == null)
             {
                 mixinInfo = BuildMixinInfo(shaderSource, macros);
+                mixinInfo.MinimalContext.Add(mixinInfo);
 
                 if (mixinInfo.Instanciated)
                 {
                     MixinInfos.Add(mixinInfo);
-                    mapMacrosToMixins[macrosString].Add(mixinInfo);
-
-                    mixinInfo.MinimalContext.Add(mixinInfo);
+                    context.Add(mixinInfo);
 
                     if (!mixinInfo.Log.HasErrors)
                     {
                         LoadNecessaryShaders(mixinInfo, macros, macrosString);
                     }
-                    mixinInfo.MinimalContext = new HashSet<ModuleMixinInfo>(mixinInfo.MinimalContext.Distinct());
                 }
             }
 
@@ -261,9 +259,9 @@ private ModuleMixinInfo BuildMixinInfo(ShaderSource shaderSource, Xenko.Core.Sha
         {
             ModuleMixinInfo mixinInfo = null;
             
-            if (shaderSource is ShaderClassSource)
+            if (shaderSource is ShaderClassCode)
             {
-                var shaderClassSource = shaderSource as ShaderClassSource;
+                var shaderClassSource = shaderSource as ShaderClassCode;
                 mixinInfo = new ModuleMixinInfo { ShaderSource = shaderClassSource, Macros = macros };
                 LoadMixinFromClassSource(mixinInfo);
             }
@@ -305,7 +303,7 @@ private ModuleMixinInfo BuildMixinInfo(ShaderSource shaderSource, Xenko.Core.Sha
         /// <param name="mixinInfo">the ModuleMixinInfo</param>
         private void LoadMixinFromClassSource(ModuleMixinInfo mixinInfo)
         {
-            var classSource = (ShaderClassSource)mixinInfo.ShaderSource;
+            var classSource = (ShaderClassCode)mixinInfo.ShaderSource;
 
             // If we allow to parse non instantiated generics, put empty generic arguments to let the ShaderLoader correctly expand the class
             var shaderClass = ShaderLoader.LoadClassSource(classSource, mixinInfo.Macros, mixinInfo.Log, AllowNonInstantiatedGenerics);
diff --git a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoStreamCreator.cs b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoStreamCreator.cs
index 5d4367e71e..58e542495c 100644
--- a/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoStreamCreator.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Mixins/XenkoStreamCreator.cs
@@ -463,7 +463,7 @@ private void BubbleUpStreamUsages(List<StreamStageUsage> streamStageUsages)
                     if (!prevStreamUsage.OutStreamList.Contains(variable))
                     {
                         var sem = ((Variable)variable).Qualifiers.OfType<Semantic>().FirstOrDefault();
-                        if (sem != null && (sem.Name.Text == "SV_IsFrontFace" || sem.Name.Text == "VFACE")) // PS input only
+                        if (sem != null && (sem.Name.Text == "SV_Coverage" || sem.Name.Text == "SV_IsFrontFace" || sem.Name.Text == "VFACE")) // PS input only
                         {
                             stageExclusiveInputStreams.Add(variable);
                             continue;
diff --git a/sources/engine/Xenko.Shaders.Parser/ShaderLinker.cs b/sources/engine/Xenko.Shaders.Parser/ShaderLinker.cs
index 45c09a0e2f..cc23f8e0c5 100644
--- a/sources/engine/Xenko.Shaders.Parser/ShaderLinker.cs
+++ b/sources/engine/Xenko.Shaders.Parser/ShaderLinker.cs
@@ -349,17 +349,26 @@ private static EffectTypeDescription CreateTypeInfo(TypeBase variableType, List<
 
             if (variableType is ScalarType)
             {
-                // Uint and int are collapsed to int
-                if (variableType == ScalarType.Int || variableType == ScalarType.UInt)
+                if (variableType == ScalarType.Int)
                 {
                     parameterTypeInfo.Class = EffectParameterClass.Scalar;
-                    parameterTypeInfo.Type = variableType == ScalarType.Int ? EffectParameterType.Int : EffectParameterType.UInt;
+                    parameterTypeInfo.Type = EffectParameterType.Int;
+                }
+                else if (variableType == ScalarType.UInt)
+                {
+                    parameterTypeInfo.Class = EffectParameterClass.Scalar;
+                    parameterTypeInfo.Type = EffectParameterType.UInt;
                 }
                 else if (variableType == ScalarType.Float)
                 {
                     parameterTypeInfo.Class = EffectParameterClass.Scalar;
                     parameterTypeInfo.Type = EffectParameterType.Float;
                 }
+                else if (variableType == ScalarType.Double)
+                {
+                    parameterTypeInfo.Class = EffectParameterClass.Scalar;
+                    parameterTypeInfo.Type = EffectParameterType.Double;
+                }
                 else if (variableType == ScalarType.Bool)
                 {
                     parameterTypeInfo.Class = EffectParameterClass.Scalar;
@@ -369,20 +378,25 @@ private static EffectTypeDescription CreateTypeInfo(TypeBase variableType, List<
                 parameterTypeInfo.RowCount = 1;
                 parameterTypeInfo.ColumnCount = 1;
             }
-            else if (variableType is VectorType)
+            else if (variableType is VectorType vectorType)
             {
-                if (variableType == VectorType.Float2 || variableType == VectorType.Float3 || variableType == VectorType.Float4)
+                if (vectorType.Type == ScalarType.Float)
                 {
                     bool isColor = attributes.OfType<AttributeDeclaration>().Any(x => x.Name == "Color");
                     parameterTypeInfo.Class = isColor ? EffectParameterClass.Color : EffectParameterClass.Vector;
                     parameterTypeInfo.Type = EffectParameterType.Float;
                 }
-                else if (variableType == VectorType.Int2 || variableType == VectorType.Int3 || variableType == VectorType.Int4)
+                else if (vectorType.Type == ScalarType.Double)
+                {
+                    parameterTypeInfo.Class = EffectParameterClass.Vector;
+                    parameterTypeInfo.Type = EffectParameterType.Double;
+                }
+                else if (vectorType.Type == ScalarType.Int)
                 {
                     parameterTypeInfo.Class = EffectParameterClass.Vector;
                     parameterTypeInfo.Type = EffectParameterType.Int;
                 }
-                else if (variableType == VectorType.UInt2 || variableType == VectorType.UInt3 || variableType == VectorType.UInt4)
+                else if (vectorType.Type == ScalarType.UInt)
                 {
                     parameterTypeInfo.Class = EffectParameterClass.Vector;
                     parameterTypeInfo.Type = EffectParameterType.UInt;
@@ -674,11 +688,72 @@ private void LinkConstant(string cbName, Variable variable, LocalParameterKey pa
                 LogicalGroup = (string)variable.GetTag(XenkoTags.LogicalGroup),
                 Type = parameterKey.Type,
                 RawName = variable.Name,
+                DefaultValue = ParseDefaultValue(variable),
             };
             
             members.Add(binding);
         }
 
+        private object ParseDefaultValue(Variable variable)
+        {
+            var initialValue = variable.InitialValue;
+            if (initialValue is null)
+                return default;
+
+            var parameterType = variable.Type.ResolveType();
+            if (parameterType is ScalarType scalarType)
+            {
+                if (scalarType == ScalarType.Bool)
+                    return ValueParsing.ToScalar<bool>(initialValue);
+                else if (scalarType == ScalarType.Float)
+                    return ValueParsing.ToScalar<float>(initialValue);
+                else if (scalarType == ScalarType.Double)
+                    return ValueParsing.ToScalar<double>(initialValue);
+                else if (scalarType == ScalarType.Half)
+                    return ValueParsing.ToScalar<Half>(initialValue);
+                else if (scalarType == ScalarType.Int)
+                    return ValueParsing.ToScalar<int>(initialValue);
+                else if (scalarType == ScalarType.UInt)
+                    return ValueParsing.ToScalar<uint>(initialValue);
+            }
+            else if (parameterType is VectorType vectorType)
+            {
+                var componentType = vectorType.Type;
+                if (componentType == ScalarType.Float)
+                {
+                    var isColor = variable.Attributes.OfType<AttributeDeclaration>().Any(x => x.Name == "Color");
+                    if (isColor)
+                        return ValueParsing.ToColor(initialValue, vectorType.Dimension);
+                    else
+                        return ValueParsing.ToFloatVector(initialValue, vectorType.Dimension);
+                }
+                else if (componentType == ScalarType.Double)
+                    return ValueParsing.ToDoubleVector(initialValue, vectorType.Dimension);
+                else if (componentType == ScalarType.Half)
+                    return ValueParsing.ToHalfVector(initialValue, vectorType.Dimension);
+                else if (componentType == ScalarType.Int)
+                    return ValueParsing.ToIntVector(initialValue, vectorType.Dimension);
+                else if (componentType == ScalarType.UInt)
+                    return ValueParsing.ToUIntVector(initialValue, vectorType.Dimension);
+            }
+            else if (parameterType is MatrixType matrixType)
+            {
+                var componentType = matrixType.Type;
+                if (componentType == ScalarType.Float)
+                {
+                    if (matrixType.RowCount == 4 && matrixType.ColumnCount == 4)
+                        return ValueParsing.ToVector(initialValue, (float[] args) => new Matrix(args));
+                }
+            }
+            else if (parameterType is ArrayType arrayType)
+            {
+                if (initialValue is ArrayInitializerExpression arrayInitializer)
+                    return ValueParsing.ToArray(arrayInitializer.Items, arrayType.Type);
+            }
+
+            return default;
+        }
+
         private class LocalParameterKey
         {
             public string Name;
@@ -702,5 +777,219 @@ private class LocalParameterKey
             public string TypeName;
             public EffectParameterTypeInfo[] Members;*/
         }
+
+        private static class ValueParsing
+        {
+            public static Array ToArray(List<Expression> v, TypeBase elementType)
+            {
+                if (elementType == ScalarType.Float)
+                    return ToArray<float>(v);
+                if (elementType == ScalarType.Double)
+                    return ToArray<double>(v);
+                if (elementType == ScalarType.Half)
+                    return ToArray<Half>(v);
+                if (elementType == ScalarType.Int)
+                    return ToArray<int>(v);
+                if (elementType == ScalarType.UInt)
+                    return ToArray<uint>(v);
+                if (elementType == ScalarType.Bool)
+                    return ToArray<bool>(v);
+                if (elementType == VectorType.Float2)
+                    return ToArray(v, ToVector2);
+                if (elementType == VectorType.Float3)
+                    return ToArray(v, ToVector3);
+                if (elementType == VectorType.Float4)
+                    return ToArray(v, ToVector4);
+                if (elementType == VectorType.Double2)
+                    return ToArray(v, ToDouble2);
+                if (elementType == VectorType.Double3)
+                    return ToArray(v, ToDouble3);
+                if (elementType == VectorType.Double4)
+                    return ToArray(v, ToDouble4);
+                if (elementType == VectorType.Half2)
+                    return ToArray(v, ToHalf2);
+                if (elementType == VectorType.Half3)
+                    return ToArray(v, ToHalf3);
+                if (elementType == VectorType.Half4)
+                    return ToArray(v, ToHalf4);
+                if (elementType == VectorType.Int2)
+                    return ToArray(v, ToInt2);
+                if (elementType == VectorType.Int3)
+                    return ToArray(v, ToInt3);
+                if (elementType == VectorType.Int4)
+                    return ToArray(v, ToInt4);
+                if (elementType == VectorType.UInt4)
+                    return ToArray(v, ToUInt4);
+                return default;
+            }
+
+            static T[] ToArray<T>(List<Expression> v)
+            {
+                var a = new T[v.Count];
+                for (int i = 0; i < a.Length; i++)
+                    a[i] = ToScalar<T>(v[i]);
+                return a;
+            }
+
+            static T[] ToArray<T>(List<Expression> v, Func<Expression, T> factory)
+            {
+                var a = new T[v.Count];
+                for (int i = 0; i < a.Length; i++)
+                    a[i] = factory(v[i]);
+                return a;
+            }
+
+            public static object ToColor(Expression e, int dimension)
+            {
+                switch (dimension)
+                {
+                    case 3:
+                        return new Color3(ToVector(e, (float[] args) => new Vector3(args)));
+                    case 4:
+                        return new Color4(ToVector(e, (float[] args) => new Vector4(args)));
+                }
+                return null;
+            }
+
+            public static object ToFloatVector(Expression e, int dimension)
+            {
+                switch (dimension)
+                {
+                    case 2:
+                        return ToVector2(e);
+                    case 3:
+                        return ToVector3(e);
+                    case 4:
+                        return ToVector4(e);
+                }
+                return null;
+            }
+
+            public static object ToDoubleVector(Expression e, int dimension)
+            {
+                switch (dimension)
+                {
+                    case 2:
+                        return ToDouble2(e);
+                    case 3:
+                        return ToDouble3(e);
+                    case 4:
+                        return ToDouble4(e);
+                }
+                return null;
+            }
+
+            public static object ToHalfVector(Expression e, int dimension)
+            {
+                switch (dimension)
+                {
+                    case 2:
+                        return ToHalf2(e);
+                    case 3:
+                        return ToHalf3(e);
+                    case 4:
+                        return ToHalf4(e);
+                }
+                return null;
+            }
+
+            public static object ToIntVector(Expression e, int dimension)
+            {
+                switch (dimension)
+                {
+                    case 2:
+                        return ToInt2(e);
+                    case 3:
+                        return ToInt3(e);
+                    case 4:
+                        return ToInt4(e);
+                }
+                return null;
+            }
+
+            public static object ToUIntVector(Expression e, int dimension)
+            {
+                switch (dimension)
+                {
+                    case 4:
+                        return ToUInt4(e);
+                }
+                return null;
+            }
+
+            static Vector2 ToVector2(Expression e) => ToVector(e, (float[] args) => new Vector2(args));
+
+            static Vector3 ToVector3(Expression e) => ToVector(e, (float[] args) => new Vector3(args));
+
+            static Vector4 ToVector4(Expression e) => ToVector(e, (float[] args) => new Vector4(args));
+
+            static Double2 ToDouble2(Expression e) => ToVector(e, (double[] args) => new Double2(args));
+
+            static Double3 ToDouble3(Expression e) => ToVector(e, (double[] args) => new Double3(args));
+
+            static Double4 ToDouble4(Expression e) => ToVector(e, (double[] args) => new Double4(args));
+
+            static Half2 ToHalf2(Expression e) => ToVector(e, (Half[] args) => new Half2(args));
+
+            static Half3 ToHalf3(Expression e) => ToVector(e, (Half[] args) => new Half3(args));
+
+            static Half4 ToHalf4(Expression e) => ToVector(e, (Half[] args) => new Half4(args));
+
+            static Int2 ToInt2(Expression e) => ToVector(e, (int[] args) => new Int2(args));
+
+            static Int3 ToInt3(Expression e) => ToVector(e, (int[] args) => new Int3(args));
+
+            static Int4 ToInt4(Expression e) => ToVector(e, (int[] args) => new Int4(args));
+
+            static UInt4 ToUInt4(Expression e) => ToVector(e, (uint[] args) => new UInt4(args));
+
+            public static TVector ToVector<TVector, TComponent>(Expression e, Func<TComponent[], TVector> factory)
+                where TVector : unmanaged
+                where TComponent : unmanaged
+            {
+                if (e is LiteralExpression l)
+                    return ToVector(new List<Expression>(1) { e }, factory);
+                else if (e is MethodInvocationExpression m)
+                    return ToVector(m.Arguments, factory);
+                else if (e is ArrayInitializerExpression a)
+                    return ToVector(a.Items, factory);
+                return default;
+            }
+
+            static unsafe TVector ToVector<TVector, TComponent>(List<Expression> args, Func<TComponent[], TVector> factory)
+                where TVector : unmanaged
+                where TComponent : unmanaged
+            {
+                var dimension = sizeof(TVector) / sizeof(TComponent);
+                if (args.Count == 1)
+                    return factory(Enumerable.Repeat(ToScalar<TComponent>(args[0]), dimension).ToArray());
+                else if (args.Count == dimension)
+                    return factory(ToArray<TComponent>(args));
+                return default;
+            }
+
+            public static T ToScalar<T>(Expression e)
+            {
+                if (e is LiteralExpression l)
+                    return ToScalar<T>(l.Literal);
+                else
+                    return default;
+            }
+
+            static T ToScalar<T>(Literal l)
+            {
+                if (l.Value is T t)
+                    return t;
+
+                try
+                {
+                    return (T)Convert.ChangeType(l.Value, typeof(T));
+                }
+                catch
+                {
+                    return default;
+                }
+            }
+        }
     }
 }
diff --git a/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs b/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs
index 775566779e..6dc3bca299 100644
--- a/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs
+++ b/sources/engine/Xenko.Shaders.Parser/ShaderMixinParser.cs
@@ -135,7 +135,7 @@ internal ShaderCompilationContext ParseAndAnalyze(ShaderMixinSource shaderMixinS
                 moduleMixinInfo.Log.CopyTo(parsingResult);
 
                 var ast = moduleMixinInfo.MixinAst;
-                var shaderClassSource = moduleMixinInfo.ShaderSource as ShaderClassSource;
+                var shaderClassSource = moduleMixinInfo.ShaderSource as ShaderClassCode;
                 // If we have a ShaderClassSource and it is not an inline one, then we can store the hash sources
                 if (ast != null && shaderClassSource != null)
                 {
@@ -180,6 +180,10 @@ internal ShaderCompilationContext ParseAndAnalyze(ShaderMixinSource shaderMixinS
         /// <returns>The combined shader in AST form.</returns>
         public ShaderMixinParsingResult Parse(ShaderMixinSource shaderMixinSource, Xenko.Shaders.ShaderMacro[] macros = null)
         {
+            // Make in-memory shader classes known to the source manager
+            foreach (var x in shaderMixinSource.Mixins.OfType<ShaderClassString>())
+                SourceManager.AddShaderSource(x.ClassName, x.ShaderSourceCode, x.ClassName);
+
             // Creates a parsing result
             HashSet<ModuleMixinInfo> mixinsToAnalyze;
             ShaderMixinParsingResult parsingResult;
@@ -362,7 +366,7 @@ private static List<ModuleMixin> BuildCompositionsDictionary(ShaderSource shader
             }
 
 
-            if (shaderSource is ShaderClassSource)
+            if (shaderSource is ShaderClassCode)
             {
                 var finalModule = compilationContext.GetModuleMixinFromShaderSource(shaderSource);
 
diff --git a/sources/engine/Xenko.Shaders.Parser/Utility/XenkoMessageCode.cs b/sources/engine/Xenko.Shaders.Parser/Utility/XenkoMessageCode.cs
index f256b83a8e..f4908344b7 100644
--- a/sources/engine/Xenko.Shaders.Parser/Utility/XenkoMessageCode.cs
+++ b/sources/engine/Xenko.Shaders.Parser/Utility/XenkoMessageCode.cs
@@ -40,7 +40,7 @@ static public class XenkoMessageCode
         public static readonly MessageCode ErrorExternMemberNotFound                = new MessageCode("E0226", "There is no member [{0}] for the type [{1}] in class [{2}]");
         public static readonly MessageCode ErrorStreamNotFound                      = new MessageCode("E0227", "Unable to find stream variable [{0}] in class [{1}]");
         public static readonly MessageCode ErrorStreamUsage                         = new MessageCode("E0228", "the stream [{0}] was read first THEN written in class [{1}]");
-        public static readonly MessageCode ErrorVariableNameAmbiguity               = new MessageCode("E0229", "The name [{0}] is ambiguous within variables in class [{2}]");
+        public static readonly MessageCode ErrorVariableNameAmbiguity               = new MessageCode("E0229", "The name [{0}] is ambiguous within variables in class [{1}]");
         public static readonly MessageCode ErrorMethodNameAmbiguity                 = new MessageCode("E0230", "The name [{0}] is ambiguous within methods in class [{1}]");
         public static readonly MessageCode ErrorMissingMethod                       = new MessageCode("E0231", "The method [{0}] in class [{1}] is not defined");
         public static readonly MessageCode ErrorCyclicMethod                        = new MessageCode("E0232", "Method [{0}] performs a cyclic call, which is not allowed in class [{1}]");
diff --git a/sources/engine/Xenko.Shaders.Parser/Xenko.Shaders.Parser.csproj b/sources/engine/Xenko.Shaders.Parser/Xenko.Shaders.Parser.csproj
index a6084a9b4a..3cdc9bcad4 100644
--- a/sources/engine/Xenko.Shaders.Parser/Xenko.Shaders.Parser.csproj
+++ b/sources/engine/Xenko.Shaders.Parser/Xenko.Shaders.Parser.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -14,10 +13,6 @@
     <XenkoAssemblyProcessorOptions>--auto-module-initializer --serialization</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleEffect.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleEffect.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleShader.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleShader.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/SimpleShader.xksl.cs
diff --git a/sources/engine/Xenko.Rendering/Rendering/Utils/Utilities.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/TestStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Rendering/Rendering/Utils/Utilities.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/TestStream.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslEffect.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslEffect.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslEffect.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslEffect.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslShader.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslShader.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/ToGlslShader.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/TestStream.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/A.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Compiler/TestStream.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/A.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/A.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/B.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/A.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/B.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/B.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/B.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C1.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C1.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/C1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor2.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor2.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor2.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColorRedirect.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColor.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColorRedirect.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_complex_params.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_complex_params.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_complex_params.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_complex_params.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_compose_keys.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_compose_keys.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_compose_keys.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_compose_keys.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child_params.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child_params.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child_params.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_child_params.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_clone.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_clone.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_clone.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_clone.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_compose.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_compose.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_compose.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_compose.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_params.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_params.xkfx.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_params.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/test_mixin_simple_params.xkfx.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColorRedirect.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestChild.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Mixins/ComputeColorRedirect.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestChild.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestChild.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestInter.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestChild.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestInter.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestInter.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestParent.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestInter.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestParent.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin2.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin2.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BasicMixin2.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Child.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Child.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Child.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Child.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestParent.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ChildError.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/BaseTestParent.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ChildError.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ChildError.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ChildError.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestBase.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestBase.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestExtern.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestBase.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestExtern.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestExtern.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestRoot.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestExtern.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestRoot.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ConstantBufferTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ConstantBufferTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ConstantBufferTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ConstantBufferTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestRoot.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CyclicTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CloneTestRoot.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CyclicTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CyclicTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExtern.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/CyclicTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExtern.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExtern.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExternTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExtern.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExternTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExternTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternClone.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/DeepExternTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternClone.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternClone.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternCloneTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternClone.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternCloneTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternMixin.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternMixin.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternMixin.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternMixin.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternCloneTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternCloneTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericCall.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ExternTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericCall.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericCall.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericCall.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass2.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass2.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass2.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericExtern.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericClass.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericExtern.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericTexcoord.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericTexcoord.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericTexcoord.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericTexcoord.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericExtern.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GeometryShaderTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GenericExtern.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GeometryShaderTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GeometryShaderTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InterfaceTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/GeometryShaderTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InterfaceTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InternalReferenceMixin.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InternalReferenceMixin.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InternalReferenceMixin.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InternalReferenceMixin.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InterfaceTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/InterfaceTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestBase.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestBase.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestChild.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestBase.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestChild.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestChild.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinFunctionParamaterTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestChild.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinFunctionParamaterTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestChild1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNameClash.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTestChild1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNameClash.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinFunctionParamaterTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNoNameClash.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinFunctionParamaterTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNoNameClash.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNameClash.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/NonStageStreamTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNameClash.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/NonStageStreamTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Parent.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Parent.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Parent.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Parent.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest.cs
deleted file mode 100644
index bbaaacdfdd..0000000000
--- a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// <auto-generated>
-// Do not edit this file yourself!
-//
-// This code was generated by Xenko Shader Mixin Code Generator.
-// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
-// and re-save the associated .xkfx.
-// </auto-generated>
-
-using System;
-using Xenko.Core;
-using Xenko.Effects;
-using Xenko.Graphics;
-using Xenko.Shaders;
-using Xenko.Core.Mathematics;
-using Buffer = Xenko.Graphics.Buffer;
-
-namespace Xenko.Effects
-{
-    public static partial class SemanticTestKeys
-    {
-        public static readonly ParameterKey<float> sem0 = ParameterKeys.New<float>();
-        public static readonly ParameterKey<float> sem1 = ParameterKeys.New<float>();
-    }
-}
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/SemanticTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Simple.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Simple.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Simple.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/Simple.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageBase.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageBase.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageBase.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageBase.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNoNameClash.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageCallExtern.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MixinNoNameClash.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageCallExtern.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageDecl.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageDecl.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageDecl.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageDecl.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/NonStageStreamTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueReference.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/NonStageStreamTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueReference.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageCallExtern.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticCallMixin.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageCallExtern.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticCallMixin.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticMixin.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticMixin.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticMixin.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticMixin.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueReference.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticStageCallTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StageValueReference.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticStageCallTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticCallMixin.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamChild.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticCallMixin.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamChild.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticStageCallTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamError.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StaticStageCallTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamError.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamChild.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent0.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamChild.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent0.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamError.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent1.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamError.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent1.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent0.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent2.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent0.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent2.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamSolverExternTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamSolverExternTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent2.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent2.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StructuredBufferTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StructuredBufferTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StructuredBufferTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StructuredBufferTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent21.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TessellationTest.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamParent21.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TessellationTest.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader.cs
deleted file mode 100644
index 9063cbb6a9..0000000000
--- a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// <auto-generated>
-// Do not edit this file yourself!
-//
-// This code was generated by Xenko Shader Mixin Code Generator.
-// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
-// and re-save the associated .xkfx.
-// </auto-generated>
-
-using System;
-using Xenko.Core;
-using Xenko.Effects;
-using Xenko.Graphics;
-using Xenko.Shaders;
-using Xenko.Core.Mathematics;
-using Buffer = Xenko.Graphics.Buffer;
-
-namespace Xenko.Effects
-{
-    public static partial class TestComputeShaderKeys
-    {
-        public static readonly ParameterKey<Vector3> ThreadGroupCountGlobal = ParameterKeys.New<Vector3>();
-        public static readonly ParameterKey<uint> ParticleCount = ParameterKeys.New<uint>();
-        public static readonly ParameterKey<uint> ParticleStartIndex = ParameterKeys.New<uint>();
-        public static readonly ParameterKey<Buffer> ParticleSortBuffer = ParameterKeys.New<Buffer>();
-        public static readonly ParameterKey<Buffer> ParticleSortBufferRO = ParticleSortBuffer;
-    }
-}
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestComputeShader.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestErrors.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestErrors.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestErrors.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestErrors.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamSolverExternTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestExternArray.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamSolverExternTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestExternArray.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericComplex.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/StreamTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericComplex.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TessellationTest.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericMacro.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TessellationTest.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericMacro.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenerics.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenerics.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenerics.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenerics.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestExternArray.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacros.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestExternArray.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacros.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericComplex.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacrosArray.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericComplex.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacrosArray.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericMacro.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMultipleStatic.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestGenericMacro.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMultipleStatic.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacros.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestPixelStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacros.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestPixelStream.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacrosArray.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestScreenPosition.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacrosArray.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestScreenPosition.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacrosArray1.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStreams.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMacrosArray1.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStreams.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructInheritance.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructInheritance.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructInheritance.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructInheritance.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMultipleStatic.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructure.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestMultipleStatic.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructure.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestPixelStream.cs b/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestVertexStream.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestPixelStream.cs
rename to sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestVertexStream.xksl.cs
diff --git a/sources/engine/Xenko.Shaders.Tests/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Shaders.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 09b9806b0b..0000000000
--- a/sources/engine/Xenko.Shaders.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System.Reflection;
-using System.Resources;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Xenko.Shaders.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyProduct("Xenko.Shaders.Tests")]
-[assembly: AssemblyCopyright("Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs b/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs
index 89b7befad6..e565b1dbab 100644
--- a/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs
+++ b/sources/engine/Xenko.Shaders.Tests/TestMixinGenerator.Extensions.cs
@@ -39,7 +39,7 @@ public static void CheckComposition(this ShaderMixinSource mixin, string key, st
 
             Assert.True(source != null, $"Source composition for key [{key}] cannot be null");
 
-            var classSource = source as ShaderClassSource;
+            var classSource = source as ShaderClassCode;
             if (classSource != null)
             {
                 var sourceString = classSource.ToClassName();
diff --git a/sources/engine/Xenko.Shaders.Tests/TestShaderLoadingString.cs b/sources/engine/Xenko.Shaders.Tests/TestShaderLoadingString.cs
new file mode 100644
index 0000000000..d1dea31165
--- /dev/null
+++ b/sources/engine/Xenko.Shaders.Tests/TestShaderLoadingString.cs
@@ -0,0 +1,81 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.IO;
+
+using Xunit;
+
+using Xenko.Core.Diagnostics;
+using Xenko.Core.IO;
+using Xenko.Core.Serialization.Contents;
+using Xenko.Core.Storage;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Shaders.Parser.Mixins;
+
+using LoggerResult = Xenko.Core.Shaders.Utility.LoggerResult;
+
+namespace Xenko.Shaders.Tests
+{
+    public class TestShaderLoadingString
+    {
+        private ShaderSourceManager sourceManager;
+        private ShaderLoader shaderLoader;
+
+
+        const string ShaderSourceName = "ConstantCol";
+        const string ShaderSourceCode =
+@"shader ConstantCol<float4 Value> : ComputeColor
+{
+    override float4 Compute()
+    {
+        return Value;
+    }
+};";
+
+        public TestShaderLoadingString()
+        {
+            // Create and mount database file system
+            var objDatabase = ObjectDatabase.CreateDefaultDatabase();
+            var databaseFileProvider = new DatabaseFileProvider(objDatabase);
+
+            sourceManager = new ShaderSourceManager(databaseFileProvider);
+            sourceManager.LookupDirectoryList.Add(@"shaders");
+            shaderLoader = new ShaderLoader(sourceManager);
+        }
+
+        [Fact]
+        public void TestSimple()
+        {
+            var simple = sourceManager.LoadShaderSource(ShaderSourceName, ShaderSourceCode);
+
+            // Make sure that SourceManager will fail if type is not found
+            Assert.Throws<FileNotFoundException>(() => sourceManager.LoadShaderSource("BiduleNotFound"));
+
+            // Reload it and check that it is not loaded twice
+            var simple2 = sourceManager.LoadShaderSource(ShaderSourceName, ShaderSourceCode);
+
+            //TODO: cannot compare structure references
+            //Assert.That(ReferenceEquals(simple, simple2), Is.True);
+            Assert.Equal(simple, simple2);
+        }
+
+        [Fact]
+        public void TestLoadAst()
+        {
+            var log = new LoggerResult();
+
+            var shaderClassString = new ShaderClassString(ShaderSourceName, ShaderSourceCode, new Vector4(1, 1, 1, 1));
+
+            var simple = shaderLoader.LoadClassSource(shaderClassString, new Xenko.Core.Shaders.Parser.ShaderMacro[0], log, false)?.Type;
+
+            Assert.Single(simple.Members);
+
+            var shaderClassString2 = new ShaderClassString(ShaderSourceName, ShaderSourceCode, new Vector4(1, 1, 1, 1));
+
+            var simple2 = shaderLoader.LoadClassSource(shaderClassString2, new Xenko.Core.Shaders.Parser.ShaderMacro[0], log, false)?.Type;
+
+            // Make sure that a class is not duplicated in memory
+            Assert.True(ReferenceEquals(simple, simple2));
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Shaders.Tests/Xenko.Shaders.Tests.Windows.csproj b/sources/engine/Xenko.Shaders.Tests/Xenko.Shaders.Tests.Windows.csproj
index 6807d658ee..743435ea8d 100644
--- a/sources/engine/Xenko.Shaders.Tests/Xenko.Shaders.Tests.Windows.csproj
+++ b/sources/engine/Xenko.Shaders.Tests/Xenko.Shaders.Tests.Windows.csproj
@@ -1,13 +1,12 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.Shaders.Tests</RootNamespace>
     <AssemblyName>Xenko.Shaders.Tests</AssemblyName>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <EnableDefaultItems>false</EnableDefaultItems>
     <XenkoPlatform>Windows</XenkoPlatform>
     <XenkoBuildProfile>Windows</XenkoBuildProfile>
     <XenkoPackageGuid>{3fb96652-1efa-47e5-8a78-acbf06d50f24}</XenkoPackageGuid>
@@ -25,6 +24,10 @@
     <OutputPath>..\..\..\Bin\$(XenkoPlatformFullName)\$(XenkoOutputFolder)</OutputPath>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(XenkoPlatformFullName)-$(XenkoGraphicsApi)\$(Configuration)</IntermediateOutputPath>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="TestCodeGen.cs" />
+    <Compile Remove="TestShaderParsing.cs" />
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
@@ -33,940 +36,9 @@
     <ProjectReference Include="..\Xenko.Assets\Xenko.Assets.csproj" />
     <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="GameAssets\Compiler\SimpleEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SimpleEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Compiler\SimpleShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SimpleShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Compiler\ToGlslEffect.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ToGlslEffect.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Compiler\TestStream.cs">
-      <DependentUpon>TestStream.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Compiler\ToGlslShader.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ToGlslShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\ComputeColorRedirect.cs">
-      <DependentUpon>ComputeColorRedirect.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_compose_keys.cs">
-      <DependentUpon>test_mixin_compose_keys.xkfx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\ComputeColor2.cs">
-      <DependentUpon>ComputeColor2.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\ComputeColor.cs">
-      <DependentUpon>ComputeColor.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\C1.cs">
-      <DependentUpon>C1.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\C.cs">
-      <DependentUpon>C.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\B.cs">
-      <DependentUpon>B.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\A.cs">
-      <DependentUpon>A.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_complex_params.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_complex_params.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_simple.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_simple.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_simple_child.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_simple_child.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_simple_child_params.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_simple_child_params.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_simple_clone.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_simple_clone.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_simple_compose.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_simple_compose.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Mixins\test_mixin_simple_params.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>test_mixin_simple_params.xkfx</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\GenericClass2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GenericClass2.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\MacroTestBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MacroTestBase.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestMacrosArray1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestMacrosArray.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestStructInheritanceExtensions.cs" />
-    <Compile Include="GameAssets\Shaders\GenericClass.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GenericClass.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\MacroTest1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MacroTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\MacroTestChild1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MacroTestChild.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\Simple.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Simple.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestComputeShader1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestComputeShader.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestMacros.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestMacros.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="TestCodeGen.cs" />
-    <Compile Include="GameAssets\Shaders\CloneTestBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CloneTestBase.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\BaseTestChild.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BaseTestChild.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\BaseTestInter.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BaseTestInter.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\BaseTestParent.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BaseTestParent.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\BasicMixin.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BasicMixin.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\BasicMixin2.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>BasicMixin2.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\Child.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Child.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ChildError.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ChildError.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\CloneTestExtern.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CloneTestExtern.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ConstantBufferTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ConstantBufferTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\CyclicTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CyclicTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\DeepExtern.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>DeepExtern.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\DeepExternTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>DeepExternTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ExternClone.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ExternClone.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ExternCloneTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ExternCloneTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ExternMixin.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ExternMixin.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ExternTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ExternTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\ForEachTest1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>ForEachTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\GenericCall.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GenericCall.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\GenericExtern.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GenericExtern.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\GenericTexcoord.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>GenericTexcoord.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\GeometryShaderTest.cs">
-      <DependentUpon>GeometryShaderTest.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\InterfaceTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>InterfaceTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\InternalReferenceMixin.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>InternalReferenceMixin.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\MixinFunctionParamaterTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MixinFunctionParamaterTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\MixinNameClash.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MixinNameClash.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\MixinNoNameClash.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>MixinNoNameClash.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\NonStageStreamTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>NonStageStreamTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\Parent.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>Parent.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\CloneTestRoot.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>CloneTestRoot.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\SemanticTest1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>SemanticTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StageBase.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StageBase.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StageCallExtern.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StageCallExtern.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StageDecl.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StageDecl.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StageValueReference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StageValueReference.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StageValueTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StageValueTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StaticCallMixin.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StaticCallMixin.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StaticMixin.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StaticMixin.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StaticStageCallTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StaticStageCallTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamChild.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamChild.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamParent0.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamParent0.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamParent1.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamParent1.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamError.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamError.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamParent21.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamParent2.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StreamSolverExternTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StreamSolverExternTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\StructuredBufferTest.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>StructuredBufferTest.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TessellationTest.cs">
-      <DependentUpon>TessellationTest.xksl</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestErrors.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestErrors.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestExternArray.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestExternArray.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestMultipleStatic.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestMultipleStatic.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestPixelStream.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestPixelStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestScreenPosition.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestScreenPosition.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestStreams.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestStreams.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestGenerics.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestGenerics.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestStructInheritance.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestStructInheritance.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestStructure.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestStructure.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestGenericComplex.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestGenericComplex.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestGenericMacro.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestGenericMacro.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="GameAssets\Shaders\TestVertexStream.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DependentUpon>TestVertexStream.xksl</DependentUpon>
-    </Compile>
-    <Compile Include="TestGenericClass.cs" />
-    <Compile Include="TestHelper.cs" />
-    <Compile Include="TestMixinCompiler.cs" />
-    <Compile Include="TestMixinGenerator.cs" />
-    <Compile Include="TestMixinGenerator.Extensions.cs" />
-    <Compile Include="TestMixinGenerator.Helpers.cs" />
-    <Compile Include="TestMixinMacros.cs" />
-    <Compile Include="TestParallelShaderMixer.cs" />
-    <Compile Include="TestRealMix.cs" />
-    <Compile Include="TestShaderLoading.cs" />
-    <Compile Include="TestShaderMixer.cs" />
-    <Compile Include="TestShaderMixer2.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="GameAssets\Compiler\SimpleEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleEffect.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Compiler\SimpleShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SimpleShader.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Compiler\ToGlslEffect.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslEffect.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Compiler\TestStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestStream.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Compiler\ToGlslShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ToGlslShader.cs</LastGenOutput>
-    </None>
-    <Content Include="GameAssets\Mixins\A.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>A.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Mixins\B.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>B.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Mixins\C.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>C.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Mixins\C1.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>C1.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Mixins\ComputeColor.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColor.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Mixins\ComputeColor2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColor2.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Mixins\ComputeColorRedirect.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ComputeColorRedirect.cs</LastGenOutput>
-    </Content>
-    <None Include="GameAssets\Mixins\test_mixin_compose_keys.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_compose_keys.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_complex_params.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_complex_params.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_simple.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_simple.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_simple_child.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_simple_child.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_simple_child_params.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_simple_child_params.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_simple_clone.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_simple_clone.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_simple_compose.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_simple_compose.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Mixins\test_mixin_simple_params.xkfx">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>test_mixin_simple_params.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\TestMacrosArray.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestMacrosArray1.cs</LastGenOutput>
-    </None>
-    <Content Include="GameAssets\Shaders\BaseTestChild.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BaseTestChild.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\BaseTestInter.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BaseTestInter.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\BaseTestParent.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BaseTestParent.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\BasicMixin.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BasicMixin.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\BasicMixin2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>BasicMixin2.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\Child.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Child.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\ChildError.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ChildError.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\CyclicTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CyclicTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\DeepExtern.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DeepExtern.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\DeepExternTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>DeepExternTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\ExternMixin.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ExternMixin.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\ExternTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ExternTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\GenericCall.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GenericCall.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\GenericExtern.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GenericExtern.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\GenericTexcoord.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GenericTexcoord.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\GeometryShaderTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GeometryShaderTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\InternalReferenceMixin.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>InternalReferenceMixin.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\MixinNameClash.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MixinNameClash.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\MixinNoNameClash.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MixinNoNameClash.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\Parent.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Parent.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\StaticCallMixin.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StaticCallMixin.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\StaticMixin.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StaticMixin.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\TessellationTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TessellationTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\TestGenerics.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestGenerics.cs</LastGenOutput>
-    </Content>
-    <None Include="GameAssets\Shaders\GenericClass2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GenericClass2.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\MacroTestBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MacroTestBase.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\ConstantBufferTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ConstantBufferTest.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\ForEachTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ForEachTest1.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\GenericClass.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>GenericClass.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\MacroTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MacroTest1.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\MacroTestChild.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MacroTestChild1.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\NonStageStreamTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>NonStageStreamTest.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\Simple.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>Simple.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StageBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StageBase.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamChild.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamChild.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamParent0.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamParent0.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\CloneTestBase.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CloneTestBase.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\CloneTestExtern.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CloneTestExtern.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\ExternClone.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ExternClone.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\CloneTestRoot.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>CloneTestRoot.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\SemanticTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>SemanticTest1.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\StageDecl.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StageDecl.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\StageValueReference.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StageValueReference.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\ExternCloneTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>ExternCloneTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\MixinFunctionParamaterTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>MixinFunctionParamaterTest.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\TestPixelStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestPixelStream.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\TestScreenPosition.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestScreenPosition.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\TestStreams.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestStreams.cs</LastGenOutput>
-    </Content>
-    <Content Include="GameAssets\Shaders\TestVertexStream.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestVertexStream.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\InterfaceTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>InterfaceTest.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\TestGenericComplex.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestGenericComplex.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\TestStructure.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestStructure.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\TestStructInheritance.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestStructInheritance.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\TestGenericMacro.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestGenericMacro.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="GameAssets\Shaders\StructuredBufferTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StructuredBufferTest.cs</LastGenOutput>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="GameAssets\Shaders\StageCallExtern.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StageCallExtern.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StageValueTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StageValueTest.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StaticStageCallTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StaticStageCallTest.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamParent1.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamParent1.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamError.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamError.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamParent2.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamParent21.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamSolverExternTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamSolverExternTest.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\StreamTest.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>StreamTest.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\TestComputeShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestComputeShader1.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\TestErrors.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestErrors.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\TestExternArray.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestExternArray.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\TestMacros.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestMacros.cs</LastGenOutput>
-    </None>
-    <None Include="GameAssets\Shaders\TestMultipleStatic.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>TestMultipleStatic.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs
index d2de78f0c5..d5abe84b72 100644
--- a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs
+++ b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerBase.cs
@@ -47,7 +47,7 @@ public CompilerResults Compile(ShaderSource shaderSource, CompilerParameters com
             else
             {
                 mixinToCompile = shaderSource as ShaderMixinSource;
-                var shaderClassSource = shaderSource as ShaderClassSource;
+                var shaderClassSource = shaderSource as ShaderClassCode;
 
                 if (shaderClassSource != null)
                 {
diff --git a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerCache.cs b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerCache.cs
index eb4cd75e9d..104b6d2dec 100644
--- a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerCache.cs
+++ b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerCache.cs
@@ -81,15 +81,6 @@ public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSo
                     bytecode = LoadEffectBytecode(database, bytecodeId);
                 }
 
-                // On non Windows platform, we are expecting to have the bytecode stored directly
-                if (Compiler is NullEffectCompiler && bytecode.Key == null)
-                {
-                    var stringBuilder = new StringBuilder();
-                    stringBuilder.AppendFormat("Unable to find compiled shaders [{0}] for mixin [{1}] with parameters [{2}]", compiledUrl, mixin, usedParameters.ToStringPermutationsDetailed());
-                    Log.Error(stringBuilder.ToString());
-                    throw new InvalidOperationException(stringBuilder.ToString());
-                }
-
                 // ------------------------------------------------------------------------------------------------------------
                 // 2) Try to load from database cache
                 // ------------------------------------------------------------------------------------------------------------
@@ -117,6 +108,14 @@ public override TaskOrResult<EffectBytecodeCompilerResult> Compile(ShaderMixinSo
             if (bytecode.Key != null)
             {
                 return new EffectBytecodeCompilerResult(bytecode.Key, bytecode.Value);
+            } 
+            else if (Platform.IsWindowsDesktop == false || Compiler is NullEffectCompiler)
+            {
+                // On non Windows platform, we are expecting to have the bytecode stored directly or in database cache
+                var stringBuilder = new StringBuilder();
+                stringBuilder.AppendFormat("Unable to find compiled shaders [{0}] for mixin [{1}] with parameters [{2}]", compiledUrl, mixin, usedParameters.ToStringPermutationsDetailed());
+                Log.Error(stringBuilder.ToString());
+                throw new InvalidOperationException(stringBuilder.ToString());
             }
 
             // ------------------------------------------------------------------------------------------------------------
diff --git a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerParameters.cs b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerParameters.cs
index bffe970e24..f5c82a84db 100644
--- a/sources/engine/Xenko.Shaders/Compiler/EffectCompilerParameters.cs
+++ b/sources/engine/Xenko.Shaders/Compiler/EffectCompilerParameters.cs
@@ -26,9 +26,6 @@ public void ApplyCompilationMode(CompilationMode compilationMode)
                     OptimizationLevel = 0;
                     break;
                 case CompilationMode.Release:
-                    Debug = true;
-                    OptimizationLevel = 1;
-                    break;
                 case CompilationMode.AppStore:
                     Debug = false;
                     OptimizationLevel = 2;
diff --git a/sources/engine/Xenko.Shaders/EffectValueDescription.cs b/sources/engine/Xenko.Shaders/EffectValueDescription.cs
index ab187ebe1d..7ed0eac3e6 100644
--- a/sources/engine/Xenko.Shaders/EffectValueDescription.cs
+++ b/sources/engine/Xenko.Shaders/EffectValueDescription.cs
@@ -41,7 +41,7 @@ public struct EffectValueDescription
         /// <summary>
         /// The default value.
         /// </summary>
-        public byte[] DefaultValue;
+        public object DefaultValue;
 
         /// <summary>
         /// Logical group, used to group related descriptors and variables together.
diff --git a/sources/engine/Xenko.Shaders/ShaderClassCode.cs b/sources/engine/Xenko.Shaders/ShaderClassCode.cs
new file mode 100644
index 0000000000..02c99528b4
--- /dev/null
+++ b/sources/engine/Xenko.Shaders/ShaderClassCode.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Serialization;
+
+namespace Xenko.Shaders
+{
+    /// <summary>
+    /// A common base class for shader classes with source code.
+    /// </summary>
+    [DataContract("ShaderClassCode")]
+    public abstract class ShaderClassCode : ShaderSource
+    {
+        /// <summary>
+        /// Gets the name of the class.
+        /// </summary>
+        /// <value>The name of the class.</value>
+        [DataMember(10)]
+        public string ClassName { get; set; }
+
+        /// <summary>
+        /// Gets the generic parameters.
+        /// </summary>
+        /// <value>The generic parameters.</value>
+        [DefaultValue(null), DataStyle(DataStyle.Compact)]
+        [DataMember(20)]
+        public string[] GenericArguments { get; set; }
+
+        [DefaultValue(null)]
+        [DataMember(30)]
+        public Dictionary<string, string> GenericParametersArguments { get; set; }
+
+        /// <summary>
+        /// Returns a class name as a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <returns>A class name as a <see cref="System.String" /> that represents this instance.</returns>
+        public string ToClassName()
+        {
+            if (GenericArguments == null)
+                return ClassName;
+
+            var result = new StringBuilder();
+            result.Append(ClassName);
+            if (GenericArguments != null && GenericArguments.Length > 0)
+            {
+                result.Append('<');
+                result.Append(string.Join(",", GenericArguments));
+                result.Append('>');
+            }
+
+            return result.ToString();
+        }
+        
+        public override string ToString()
+        {
+            return ToClassName();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Shaders/ShaderClassSource.cs b/sources/engine/Xenko.Shaders/ShaderClassSource.cs
index 2a514b6861..a8ce1f5182 100644
--- a/sources/engine/Xenko.Shaders/ShaderClassSource.cs
+++ b/sources/engine/Xenko.Shaders/ShaderClassSource.cs
@@ -13,29 +13,11 @@
 namespace Xenko.Shaders
 {
     /// <summary>
-    /// A shader class used for mixin.
+    /// A shader class based on .xksl file, used for mixin.
     /// </summary>
     [DataContract("ShaderClassSource")]
-    public sealed class ShaderClassSource : ShaderSource, IEquatable<ShaderClassSource>
+    public sealed class ShaderClassSource : ShaderClassCode, IEquatable<ShaderClassSource>
     {
-        /// <summary>
-        /// Gets the name of the class.
-        /// </summary>
-        /// <value>The name of the class.</value>
-        [DataMember(10)]
-        public string ClassName { get; set; }
-
-        /// <summary>
-        /// Gets the generic parameters.
-        /// </summary>
-        /// <value>The generic parameters.</value>
-        [DefaultValue(null), DataStyle(DataStyle.Compact)]
-        [DataMember(20)]
-        public string[] GenericArguments { get; set; }
-
-        [DefaultValue(null)]
-        [DataMember(30)]
-        public Dictionary<string, string> GenericParametersArguments { get; set; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ShaderClassSource"/> class.
@@ -86,27 +68,6 @@ public ShaderClassSource(string className, params object[] genericArguments)
             }
         }
 
-        /// <summary>
-        /// Returns a class name as a <see cref="System.String" /> that represents this instance.
-        /// </summary>
-        /// <returns>A class name as a <see cref="System.String" /> that represents this instance.</returns>
-        public string ToClassName()
-        {
-            if (GenericArguments == null)
-                return ClassName;
-
-            var result = new StringBuilder();
-            result.Append(ClassName);
-            if (GenericArguments != null && GenericArguments.Length > 0)
-            {
-                result.Append('<');
-                result.Append(string.Join(",", GenericArguments));
-                result.Append('>');
-            }
-
-            return result.ToString();
-        }
-
         public bool Equals(ShaderClassSource shaderClassSource)
         {
             if (ReferenceEquals(null, shaderClassSource)) return false;
diff --git a/sources/engine/Xenko.Shaders/ShaderClassString.cs b/sources/engine/Xenko.Shaders/ShaderClassString.cs
new file mode 100644
index 0000000000..68c52dc341
--- /dev/null
+++ b/sources/engine/Xenko.Shaders/ShaderClassString.cs
@@ -0,0 +1,119 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Serialization;
+
+namespace Xenko.Shaders
+{
+    /// <summary>
+    /// A shader class based on source code string, used for mixin.
+    /// </summary>
+    [DataContract("ShaderClassString")]
+    public sealed class ShaderClassString : ShaderClassCode, IEquatable<ShaderClassString>
+    {
+        /// <summary>
+        /// Gets the source code of this shader class as string, XKSL syntax.
+        /// </summary>
+        /// <value>The source code of the shader class.</value>
+        public string ShaderSourceCode { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        public ShaderClassString()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        /// <param name="className">Name of the class.</param>
+        public ShaderClassString(string className, string shaderSourceCode)
+            : this(className, shaderSourceCode, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        /// <param name="className">Name of the class.</param>
+        /// <param name="genericArguments">The generic parameters.</param>
+        public ShaderClassString(string className, string shaderSourceCode, params string[] genericArguments)
+        {
+            ClassName = className;
+            ShaderSourceCode = shaderSourceCode;
+            GenericArguments = genericArguments;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ShaderClassString"/> class.
+        /// </summary>
+        /// <param name="className">Name of the class.</param>
+        /// <param name="genericArguments">The generic parameters.</param>
+        public ShaderClassString(string className, string shaderSourceCode, params object[] genericArguments)
+        {
+            ClassName = className;
+            ShaderSourceCode = shaderSourceCode;
+
+            if (genericArguments != null)
+            {
+                GenericArguments = new string[genericArguments.Length];
+                for (int i = 0; i < genericArguments.Length; ++i)
+                {
+                    var genArg = genericArguments[i];
+                    if (genArg is bool boolArg)
+                        GenericArguments[i] = boolArg ? "true" : "false";
+                    else
+                        GenericArguments[i] = genArg == null ? "null" : Convert.ToString(genArg, CultureInfo.InvariantCulture);
+                }
+            }
+        }
+
+        public bool Equals(ShaderClassString shaderClassString)
+        {
+            if (ReferenceEquals(null, shaderClassString)) return false;
+            if (ReferenceEquals(this, shaderClassString)) return true;
+            return string.Equals(ClassName, shaderClassString.ClassName) && Utilities.Compare(GenericArguments, shaderClassString.GenericArguments);
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(null, obj)) return false;
+            if (ReferenceEquals(this, obj)) return true;
+            if (obj.GetType() != GetType()) return false;
+            return Equals((ShaderClassString)obj);
+        }
+
+        public override int GetHashCode()
+        {
+            unchecked
+            {
+                int hashCode = ClassName?.GetHashCode() ?? 0;
+                if (GenericArguments != null)
+                {
+                    foreach (var current in GenericArguments)
+                        hashCode = (hashCode * 397) ^ (current?.GetHashCode() ?? 0);
+                }
+
+                return hashCode;
+            }
+        }
+
+        public override object Clone()
+        {
+            return new ShaderClassString(ClassName, ShaderSourceCode, GenericArguments = GenericArguments != null ? GenericArguments.ToArray() : null);
+        }
+        
+        public override string ToString()
+        {
+            return ToClassName();
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Shaders/ShaderMixinContext.cs b/sources/engine/Xenko.Shaders/ShaderMixinContext.cs
index ab2ac8956a..5417e0d4e0 100644
--- a/sources/engine/Xenko.Shaders/ShaderMixinContext.cs
+++ b/sources/engine/Xenko.Shaders/ShaderMixinContext.cs
@@ -288,18 +288,17 @@ public void Mixin(ShaderMixinSource mixinTree, ShaderSource shaderSource)
                 return;
             }
 
-            var shaderMixinSource = shaderSource as ShaderMixinSource;
-            if (shaderMixinSource != null)
+            if (shaderSource is ShaderMixinSource shaderMixinSource)
             {
                 mixinTree.CloneFrom(shaderMixinSource);
             }
-            else if (shaderSource is ShaderClassSource)
+            else if (shaderSource is ShaderClassCode shaderClassCode)
             {
-                mixinTree.Mixins.Add((ShaderClassSource)shaderSource);
+                mixinTree.Mixins.Add(shaderClassCode);
             }
-            else if (shaderSource is ShaderMixinGeneratorSource)
+            else if (shaderSource is ShaderMixinGeneratorSource mixinGeneratorSource)
             {
-                Mixin(mixinTree, ((ShaderMixinGeneratorSource)shaderSource).Name);
+                Mixin(mixinTree, mixinGeneratorSource.Name);
             }
             else
             {
diff --git a/sources/engine/Xenko.Shaders/ShaderMixinParameters.cs b/sources/engine/Xenko.Shaders/ShaderMixinParameters.cs
index 94959d598d..b396c20bc6 100644
--- a/sources/engine/Xenko.Shaders/ShaderMixinParameters.cs
+++ b/sources/engine/Xenko.Shaders/ShaderMixinParameters.cs
@@ -36,7 +36,7 @@ public void Add(ParameterKey key, object value)
 
         public bool Contains(KeyValuePair<ParameterKey, object> item)
         {
-            var accessor = GetObjectParameterHelper(item.Key);
+            var accessor = GetObjectParameterHelper(item.Key, true);
             if (accessor.Offset == -1)
                 return false;
 
diff --git a/sources/engine/Xenko.Shaders/ShaderMixinSource.cs b/sources/engine/Xenko.Shaders/ShaderMixinSource.cs
index caa6da3470..0a95c1d71e 100644
--- a/sources/engine/Xenko.Shaders/ShaderMixinSource.cs
+++ b/sources/engine/Xenko.Shaders/ShaderMixinSource.cs
@@ -12,7 +12,7 @@
 namespace Xenko.Shaders
 {
     /// <summary>
-    /// A mixin performing a combination of <see cref="ShaderClassSource"/> and other mixins.
+    /// A mixin performing a combination of <see cref="ShaderClassCode"/> and other mixins.
     /// </summary>
     [DataContract("ShaderMixinSource")]
     [NonIdentifiableCollectionItems]
@@ -23,7 +23,7 @@ public sealed class ShaderMixinSource : ShaderSource, IEquatable<ShaderMixinSour
         /// </summary>
         public ShaderMixinSource()
         {
-            Mixins = new List<ShaderClassSource>();
+            Mixins = new List<ShaderClassCode>();
             Compositions = new Core.Collections.SortedList<string, ShaderSource>();
             Macros = new List<ShaderMacro>();
         }
@@ -51,7 +51,7 @@ public ShaderMixinSource()
         /// </summary>
         /// <value>The mixins.</value>
         [DataMember(10)]
-        public List<ShaderClassSource> Mixins { get; set; }
+        public List<ShaderClassCode> Mixins { get; set; }
 
         /// <summary>
         /// Gets or sets the compositions.
@@ -133,7 +133,7 @@ public void DeepCloneFrom(ShaderMixinSource parent)
                 throw new ArgumentNullException("parent", $"Cannot deep clone mixin [{Name}] from a null parent");
 
             foreach (var mixin in parent.Mixins)
-                Mixins.Add((ShaderClassSource)mixin.Clone());
+                Mixins.Add((ShaderClassCode)mixin.Clone());
             Macros.AddRange(parent.Macros);
             foreach (var shaderBasic in parent.Compositions)
             {
@@ -162,12 +162,11 @@ public override int GetHashCode()
             unchecked
             {
                 int hashCode = 0;
-                foreach (var current in Mixins)
-                    hashCode = (hashCode * 397) ^ (current?.GetHashCode() ?? 0);
-                foreach (var current in Macros)
-                    hashCode = (hashCode * 397) ^ current.GetHashCode();
-                foreach (var current in Compositions)
-                    hashCode = (hashCode * 397) ^ current.GetHashCode();
+                for (int i=0; i<Mixins.Count; i++)
+                    hashCode = (hashCode * 397) ^ (Mixins[i]?.GetHashCode() ?? 0);
+                for (int i=0; i<Macros.Count; i++)
+                    hashCode = (hashCode * 397) ^ Macros[i].GetHashCode();
+                hashCode = (hashCode * 397) ^ Compositions.GetHashCode();
                 return hashCode;
             }
         }
@@ -176,7 +175,7 @@ public override object Clone()
         {
             var newMixin = (ShaderMixinSource)MemberwiseClone();
             newMixin.Compositions = Compositions == null ? null : ToSortedList(Compositions.Select(x => new KeyValuePair<string, ShaderSource>(x.Key, (ShaderSource)x.Value.Clone())));
-            newMixin.Mixins = Mixins == null ? null : Mixins.Select(x => (ShaderClassSource)x.Clone()).ToList();
+            newMixin.Mixins = Mixins == null ? null : Mixins.Select(x => (ShaderClassCode)x.Clone()).ToList();
             newMixin.Macros = Macros == null ? null : new List<ShaderMacro>(Macros.ToArray());
             return newMixin;
         }
diff --git a/sources/engine/Xenko.Shaders/Xenko.Shaders.csproj b/sources/engine/Xenko.Shaders/Xenko.Shaders.csproj
index 4df527ad8f..0ef85a6ee8 100644
--- a/sources/engine/Xenko.Shaders/Xenko.Shaders.csproj
+++ b/sources/engine/Xenko.Shaders/Xenko.Shaders.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -14,10 +13,6 @@
     <XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/sources/engine/Xenko.SpriteStudio.Offline/Xenko.SpriteStudio.Offline.csproj b/sources/engine/Xenko.SpriteStudio.Offline/Xenko.SpriteStudio.Offline.csproj
index 1cdb0ddf99..9477346645 100644
--- a/sources/engine/Xenko.SpriteStudio.Offline/Xenko.SpriteStudio.Offline.csproj
+++ b/sources/engine/Xenko.SpriteStudio.Offline/Xenko.SpriteStudio.Offline.csproj
@@ -1,9 +1,6 @@
 <Project>
-  <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-  </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -29,5 +26,5 @@
     <None Include="Templates\Assets\.xktpl\SpriteStudioModel.png" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioNodeLinkProcessor.cs b/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioNodeLinkProcessor.cs
index fdbae87c3e..d5e0843591 100644
--- a/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioNodeLinkProcessor.cs
+++ b/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioNodeLinkProcessor.cs
@@ -23,10 +23,10 @@ protected override void OnEntityComponentRemoved(Entity entity, SpriteStudioNode
 
         public override void Draw(RenderContext context)
         {
-            foreach (var item in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var modelNodeLink = item.Value;
-                var transformComponent = item.Key.Entity.Transform;
+                var modelNodeLink = ComponentDataValues[i];
+                var transformComponent = ComponentDataKeys[i].Entity.Transform;
                 var transformLink = transformComponent.TransformLink as SpriteStudioNodeTransformLink;
 
                 // Try to use Target, otherwise Parent
diff --git a/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioProcessor.cs b/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioProcessor.cs
index 64f64641bd..8c028e3f41 100644
--- a/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioProcessor.cs
+++ b/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioProcessor.cs
@@ -24,9 +24,9 @@ protected override void OnEntityComponentRemoved(Entity entity, SpriteStudioComp
 
         public override void Update(GameTime time)
         {
-            foreach (var data in ComponentDatas)
+            for (int i=0; i<ComponentDataValues.Count; i++)
             {
-                var spriteStudioComponent = data.Value;
+                var spriteStudioComponent = ComponentDataValues[i];
                 if (!spriteStudioComponent.Enabled) continue;
 
                 spriteStudioComponent.ValidState = PrepareNodes(spriteStudioComponent);
@@ -35,9 +35,9 @@ public override void Update(GameTime time)
 
         public override void Draw(RenderContext context)
         {
-            foreach (var componentData in ComponentDatas)
+            for (int i = 0; i<ComponentDataValues.Count; i++)
             {
-                var component = componentData.Value;
+                var component = ComponentDataValues[i];
                 if (!component.ValidState) continue;
                 component.RootNode.UpdateTransformation();
             }
diff --git a/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioRendererProcessor.cs b/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioRendererProcessor.cs
index 8a8407bad9..f6829ae68a 100644
--- a/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioRendererProcessor.cs
+++ b/sources/engine/Xenko.SpriteStudio.Runtime/SpriteStudioRendererProcessor.cs
@@ -39,10 +39,10 @@ protected override void OnEntityComponentRemoved(Entity entity, SpriteStudioComp
 
         public override void Draw(RenderContext context)
         {
-            foreach (var spriteStateKeyPair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var spriteStudioComponent = spriteStateKeyPair.Key;
-                var renderSpriteStudio = spriteStateKeyPair.Value;
+                var spriteStudioComponent = ComponentDataKeys[i];
+                var renderSpriteStudio = ComponentDataValues[i];
                 renderSpriteStudio.Enabled = spriteStudioComponent.Enabled && spriteStudioComponent.ValidState;
 
                 if (!renderSpriteStudio.Enabled)
diff --git a/sources/engine/Xenko.SpriteStudio.Runtime/Xenko.SpriteStudio.Runtime.csproj b/sources/engine/Xenko.SpriteStudio.Runtime/Xenko.SpriteStudio.Runtime.csproj
index 5c0d89e3cb..248c4e5b61 100644
--- a/sources/engine/Xenko.SpriteStudio.Runtime/Xenko.SpriteStudio.Runtime.csproj
+++ b/sources/engine/Xenko.SpriteStudio.Runtime/Xenko.SpriteStudio.Runtime.csproj
@@ -1,6 +1,5 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -14,10 +13,6 @@
     <XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/sources/engine/Xenko.UI.Tests/Properties/AndroidManifest.xml b/sources/engine/Xenko.UI.Tests/Properties/AndroidManifest.xml
index 2a58f28092..843637bd6b 100644
--- a/sources/engine/Xenko.UI.Tests/Properties/AndroidManifest.xml
+++ b/sources/engine/Xenko.UI.Tests/Properties/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="Xenko.UI.Tests" android:versionCode="1" android:versionName="1.0">
-	<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+	<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
 	<application android:icon="@drawable/icon" android:label="Xenko UI" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
 	<uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff --git a/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.Windows.csproj b/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.Windows.csproj
index df6ff3c15f..930c28448d 100644
--- a/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.Windows.csproj
+++ b/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.Windows.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <RootNamespace>Xenko.UI.Tests</RootNamespace>
@@ -154,6 +154,6 @@
   <ItemGroup>
     <None Include="Resources\UIDesigns.dds" />
   </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="..\..\targets\Xenko.UnitTests.targets" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.iOS.csproj b/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.iOS.csproj
index 3a49e7e23e..8006feac04 100644
--- a/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.iOS.csproj
+++ b/sources/engine/Xenko.UI.Tests/Xenko.UI.Tests.iOS.csproj
@@ -18,7 +18,6 @@
     <XenkoPackageGuid>{b18707e8-1d26-49fc-9911-3834506d8149}</XenkoPackageGuid>
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
     <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
   </PropertyGroup>
   <PropertyGroup>
     <XenkoCurrentPackagePath>$(MSBuildThisFileDirectory)Xenko.UI.Tests.xkpkg</XenkoCurrentPackagePath>
diff --git a/sources/engine/Xenko.UI/Attributes/DefaultThicknessValueAttribute.cs b/sources/engine/Xenko.UI/Attributes/DefaultThicknessValueAttribute.cs
new file mode 100644
index 0000000000..54b2ffc334
--- /dev/null
+++ b/sources/engine/Xenko.UI/Attributes/DefaultThicknessValueAttribute.cs
@@ -0,0 +1,70 @@
+using System.ComponentModel;
+
+namespace Xenko.UI.Attributes
+{
+    public class DefaultThicknessValueAttribute : DefaultValueAttribute
+    {
+        public DefaultThicknessValueAttribute(float left, float top, float right, float bottom)
+           : base(null)
+        {
+            Bottom = bottom;
+            Left = left;
+            Right = right;
+            Top = top;
+            Front = 0;
+            Back = 0;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the Thickness structure that has specific lengths applied to each side of the cuboid.
+        /// </summary>
+        /// <param name="bottom">The thickness for the lower side of the cuboid.</param>
+        /// <param name="left">The thickness for the left side of the cuboid.</param>
+        /// <param name="right">The thickness for the right side of the cuboid</param>
+        /// <param name="top">The thickness for the upper side of the cuboid.</param>
+        /// <param name="front">The thickness for the front side of the cuboid.</param>
+        /// <param name="back">The thickness for the Back side of the cuboid.</param>
+        public DefaultThicknessValueAttribute(float left, float top, float back, float right, float bottom, float front)
+             : base(null)
+        {
+            Bottom = bottom;
+            Left = left;
+            Right = right;
+            Top = top;
+            Front = front;
+            Back = back;
+        }
+
+        /// <summary>
+        /// The Back side of the bounding cuboid.
+        /// </summary>
+        public float Back { get; }
+
+        /// <summary>
+        /// The bottom side of the bounding rectangle or cuboid.
+        /// </summary>
+        public float Bottom;
+
+        /// <summary>
+        /// The front side of the bounding cuboid.
+        /// </summary>
+        public float Front { get; }
+
+        /// <summary>
+        /// The left side of the bounding rectangle or cuboid.
+        /// </summary>
+        public float Left { get; }
+
+        /// <summary>
+        /// The right side of the bounding rectangle or cuboid.
+        /// </summary>
+        public float Right { get; }
+
+        /// <summary>
+        /// The upper side of the bounding rectangle or cuboid.
+        /// </summary>
+        public float Top { get; }
+
+        public override object Value => new Thickness(Left, Top, Back, Right, Bottom, Front);
+    }
+}
diff --git a/sources/engine/Xenko.UI/Controls/Button.cs b/sources/engine/Xenko.UI/Controls/Button.cs
index dd07db9da4..fd6cab12a2 100644
--- a/sources/engine/Xenko.UI/Controls/Button.cs
+++ b/sources/engine/Xenko.UI/Controls/Button.cs
@@ -8,6 +8,7 @@
 using Xenko.Core.Mathematics;
 using Xenko.Engine;
 using Xenko.Graphics;
+using Xenko.UI.Attributes;
 
 namespace Xenko.UI.Controls
 {
@@ -15,6 +16,7 @@ namespace Xenko.UI.Controls
     /// Represents a Windows button control, which reacts to the Click event.
     /// </summary>
     [DataContract(nameof(Button))]
+    [DataContractMetadataType(typeof(ButtonMetadata))]
     [DebuggerDisplay("Button - Name={Name}")]
     public class Button : ButtonBase
     {
@@ -28,7 +30,7 @@ public class Button : ButtonBase
         public Button()
         {
             DrawLayerNumber += 1; // (button design image)
-            Padding = new Thickness(10, 5, 10, 7);
+            Padding = new Thickness(10, 5, 10, 7);  // Warning: this must also match in ButtonMetadata
 
             MouseOverStateChanged += (sender, args) => InvalidateButtonImage();
         }
@@ -107,6 +109,13 @@ public ISpriteProvider MouseOverImage
             }
         }
 
+        /// <summary>
+        /// Tints the button a certain color. Use Opacity to set alpha value
+        /// </summary>
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        public Color3 ButtonTint { get; set; } = Color3.White;
+
         /// <summary>
         /// Gets or sets a value that describes how the button image should be stretched to fill the destination rectangle.
         /// </summary>
@@ -191,11 +200,17 @@ protected virtual void OnAspectImageInvalidated()
         {
             InvalidateButtonImage();
         }
-        
+
         private void InvalidateButtonImage()
         {
             if (!sizeToContent)
                 InvalidateMeasure();
         }
+
+        private class ButtonMetadata
+        {
+            [DefaultThicknessValue(10, 5, 10, 7)]
+            public Thickness Padding { get; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Controls/ButtonBase.cs b/sources/engine/Xenko.UI/Controls/ButtonBase.cs
index 31c5d7d4c0..8e64b2ca58 100644
--- a/sources/engine/Xenko.UI/Controls/ButtonBase.cs
+++ b/sources/engine/Xenko.UI/Controls/ButtonBase.cs
@@ -13,6 +13,7 @@ namespace Xenko.UI.Controls
     /// Represents the base primitive for all the button-like controls
     /// </summary>
     [DataContract(nameof(ButtonBase))]
+    [DataContractMetadataType(typeof(ButtonBaseMetadata))]
     [DebuggerDisplay("ButtonBase - Name={Name}")]
     [Display(category: InputCategory)]
     public abstract class ButtonBase : ContentControl
@@ -27,7 +28,7 @@ static ButtonBase()
         /// </summary>
         protected ButtonBase()
         {
-            CanBeHitByUser = true;
+            CanBeHitByUser = true;  // Warning: this must also match in ButtonBaseMetadata
         }
 
         /// <summary>
@@ -66,6 +67,9 @@ public event EventHandler<RoutedEventArgs> Click
 
         protected override void OnTouchDown(TouchEventArgs args)
         {
+            // only respond to left clicks
+            if (args.ButtonId != 0) return;
+
             base.OnTouchDown(args);
 
             IsPressed = true;
@@ -73,9 +77,12 @@ protected override void OnTouchDown(TouchEventArgs args)
             if (ClickMode == ClickMode.Press)
                 RaiseEvent(new RoutedEventArgs(ClickEvent));
         }
-        
+
         protected override void OnTouchUp(TouchEventArgs args)
         {
+            // only respond to left clicks
+            if (args.ButtonId != 0) return;
+
             base.OnTouchUp(args);
 
             if (IsPressed && ClickMode == ClickMode.Release)
@@ -100,12 +107,46 @@ protected virtual void OnClick(RoutedEventArgs args)
         {
 
         }
-        
+
         private static void ClickClassHandler(object sender, RoutedEventArgs args)
         {
+            // only accept left clicks
+            if (args is TouchEventArgs tea && tea.ButtonId != 0) return;
+
             var buttonBase = (ButtonBase)sender;
 
             buttonBase.OnClick(args);
         }
+
+        /// <summary>
+        /// Shortcut function to resize this UIElement to fit internal content (like resizing a button to fit its text)
+        /// </summary>
+        /// <param name="XMargin">How much X padding?</param>
+        /// <param name="YMargin">How much Y padding?</param>
+        public void ResizeToChild(float XMargin = 10f, float YMargin = 10f)
+        {
+            float maxX = 0f, maxY = 0f;
+            foreach (UIElement bbc in VisualChildren)
+            {
+                var size = bbc is TextBlock tb ? tb.CalculateTextSize() : bbc.GetNoBullshitSize();
+
+                if (size.X > maxX)
+                    maxX = size.X;
+                if (size.Y > maxY)
+                    maxY = size.Y;
+            }
+
+            if (maxX > 0f && maxY > 0f)
+            {
+                Width = maxX + XMargin;
+                Height = maxY + YMargin;
+            }
+        }
+
+        private class ButtonBaseMetadata
+        {
+            [DefaultValue(true)]
+            public bool CanBeHitByUser { get; set; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Controls/EditText.Direct.Default.cs b/sources/engine/Xenko.UI/Controls/EditText.Direct.Default.cs
index 89fedffd39..c93bda71ea 100644
--- a/sources/engine/Xenko.UI/Controls/EditText.Direct.Default.cs
+++ b/sources/engine/Xenko.UI/Controls/EditText.Direct.Default.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 #if XENKO_PLATFORM_WINDOWS_DESKTOP || XENKO_PLATFORM_UNIX
@@ -20,7 +20,11 @@ private int GetLineCountImpl()
             if (Font == null)
                 return 1;
 
-            return text.Split('\n').Length;
+            int cnt = text.Length > 0 ? 1 : 0;
+            for (int i = 0; i < text.Length; i++)
+                if (text[i] == '\n') cnt++;
+
+            return cnt;
         }
 
         private void OnMaxLinesChangedImpl()
diff --git a/sources/engine/Xenko.UI/Controls/EditText.Direct.cs b/sources/engine/Xenko.UI/Controls/EditText.Direct.cs
index d007c97f07..e975cb9723 100644
--- a/sources/engine/Xenko.UI/Controls/EditText.Direct.cs
+++ b/sources/engine/Xenko.UI/Controls/EditText.Direct.cs
@@ -51,31 +51,31 @@ protected virtual int FindNearestCharacterIndex(Vector2 position)
 
             var textRegionSize = (ActualWidth - Padding.Left - Padding.Right);
             var fontScale = LayoutingContext.RealVirtualResolutionRatio;
-            var fontSize = new Vector2(fontScale.Y * ActualTextSize); // we don't want letters non-uniform ratio
+            var fontSize = new Vector2(fontScale.X * ActualTextSize); // we don't want letters non-uniform ratio
 
             // calculate the offset of the beginning of the text due to text alignment
             var alignmentOffset = -textRegionSize / 2f;
             if (TextAlignment != TextAlignment.Left)
             {
                 var textWidth = Font.MeasureString(TextToDisplay, ref fontSize).X;
-                if (Font.FontType == SpriteFontType.Dynamic)
-                    textWidth /= fontScale.X;
+                textWidth /= fontScale.X;
+                if (Font.FontType != SpriteFontType.Dynamic) textWidth *= fontSize.X / Font.Size;
 
                 alignmentOffset = TextAlignment == TextAlignment.Center ? -textWidth / 2 : -textRegionSize / 2f + (textRegionSize - textWidth);
             }
-            var touchInText = position.X - alignmentOffset;
+            var touchInText = position.X - alignmentOffset - TextOffset.X;
 
             // Find the first character starting after the click
-            var characterIndex = 1;
+            var characterIndex = 0;
             var previousCharacterOffset = 0f;
-            var currentCharacterOffset = Font.MeasureString(TextToDisplay, ref fontSize, characterIndex).X;
+            var currentCharacterOffset = 0f;
             while (currentCharacterOffset < touchInText && characterIndex < textToDisplay.Length)
             {
                 ++characterIndex;
                 previousCharacterOffset = currentCharacterOffset;
                 currentCharacterOffset = Font.MeasureString(TextToDisplay, ref fontSize, characterIndex).X;
-                if (Font.FontType == SpriteFontType.Dynamic)
-                    currentCharacterOffset /= fontScale.X;
+                currentCharacterOffset /= fontScale.X;
+                if (Font.FontType != SpriteFontType.Dynamic) currentCharacterOffset *= fontSize.X / Font.Size;
             }
 
             // determine the caret position.
@@ -233,7 +233,13 @@ private void InterpretKey(Keys key, InputManager input)
             }
 
             // validate the text with "enter" or "escape"
-            if (key == Keys.Enter || key == Keys.Escape || key == Keys.NumPadEnter)
+            if (key == Keys.Enter || key == Keys.NumPadEnter)
+            {
+                IsSelectionActive = false;
+                if (EnterAction != null) EnterAction(text);
+                return;
+            }
+            else if (key == Keys.Escape)
             {
                 IsSelectionActive = false;
                 return;
diff --git a/sources/engine/Xenko.UI/Controls/EditText.cs b/sources/engine/Xenko.UI/Controls/EditText.cs
index bc90bff986..06d03f1cbd 100644
--- a/sources/engine/Xenko.UI/Controls/EditText.cs
+++ b/sources/engine/Xenko.UI/Controls/EditText.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
@@ -120,7 +120,7 @@ public EditText()
             IsSelectionActive = false;
             Padding = new Thickness(8, 4, 0, 8, 8, 0);
             DrawLayerNumber += 4; // ( 1: image, 2: selection, 3: Text, 4:Cursor) 
-            CaretWidth = 1f;
+            CaretScale = Vector2.One;
             CaretFrequency = 1f;
         }
 
@@ -133,6 +133,8 @@ public EditText()
         private SpriteFont font;
         private bool isReadOnly;
 
+        public Action<string> EnterAction;
+
         /// <summary>
         /// Gets a value that indicates whether the text box has focus and selected text.
         /// </summary>
@@ -243,6 +245,13 @@ public float TextSize
             }
         }
 
+        /// <summary>
+        /// Offset the text inside the edit area by this much
+        /// </summary>
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        public Vector2 TextOffset { get; set; } = Vector2.Zero;
+
         /// <summary>
         /// Gets or sets the color of the text.
         /// </summary>
@@ -296,24 +305,11 @@ public float TextSize
         public Color CaretColor { get; set; } = Color.FromAbgr(0xF0F0F0FF);
 
         /// <summary>
-        /// Gets or sets the width of the edit text's cursor (in virtual pixels).
+        /// Gets or sets the size of the edit text's cursor (in virtual pixels).
         /// </summary>
-        /// <remarks>The value is coerced in the range [0, <see cref="float.MaxValue"/>].</remarks>
-        /// <userdoc>The width of the edit text's cursor (in virtual pixels).</userdoc>
         [DataMember]
-        [DataMemberRange(0, 2)]
         [Display(category: AppearanceCategory)]
-        [DefaultValue(0)]
-        public float CaretWidth
-        {
-            get { return caretWith; }
-            set
-            {
-                if (float.IsNaN(value))
-                    return;
-                caretWith = MathUtil.Clamp(value, 0.0f, float.MaxValue);
-            }
-        }
+        public Vector2 CaretScale { get; set; } = Vector2.One;
 
         /// <summary>
         /// Gets or sets the color of the selection.
@@ -770,7 +766,7 @@ protected Vector2 CalculateTextSize(string textToMeasure)
             if (textToMeasure == null || Font == null)
                 return Vector2.Zero;
 
-            var sizeRatio = LayoutingContext.RealVirtualResolutionRatio;
+            var sizeRatio = LayoutingContext?.RealVirtualResolutionRatio ?? Vector2.One;
             var measureFontSize = new Vector2(ActualTextSize * sizeRatio.Y); // we don't want letters non-uniform ratio
             var realSize = Font.MeasureString(textToMeasure, measureFontSize);
 
@@ -784,8 +780,7 @@ protected Vector2 CalculateTextSize(string textToMeasure)
                 realSize.X /= sizeRatio.X;
                 realSize.Y /= sizeRatio.Y;
             }
-
-            if (Font.FontType == SpriteFontType.SDF)
+            else
             {
                 var scaleRatio = ActualTextSize / Font.Size;
                 realSize.X *= scaleRatio;
@@ -802,7 +797,7 @@ protected override Vector3 MeasureOverride(Vector3 availableSizeWithoutMargins)
             {
                 // take the maximum between the text size and the minimum visible line size as text desired size
                 var fontLineSpacing = Font.GetTotalLineSpacing(ActualTextSize);
-                if (Font.FontType == SpriteFontType.SDF)
+                if (Font.FontType != SpriteFontType.Dynamic)
                     fontLineSpacing *= ActualTextSize / Font.Size;
                 var currentTextSize = new Vector3(CalculateTextSize(), 0);
                 desiredSize = new Vector3(currentTextSize.X, Math.Min(Math.Max(currentTextSize.Y, fontLineSpacing * MinLines), fontLineSpacing * MaxLines), currentTextSize.Z);
@@ -897,4 +892,4 @@ protected override void OnTouchMove(TouchEventArgs args)
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.UI/Controls/ImageButton.cs b/sources/engine/Xenko.UI/Controls/ImageButton.cs
index d5c96d1fd9..3843545d83 100644
--- a/sources/engine/Xenko.UI/Controls/ImageButton.cs
+++ b/sources/engine/Xenko.UI/Controls/ImageButton.cs
@@ -2,12 +2,15 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Diagnostics;
+using Xenko.Core;
+using Xenko.UI.Attributes;
 
 namespace Xenko.UI.Controls
 {
     /// <summary>
     /// A <see cref="Button"/> whose <see cref="ContentControl.Content"/> are the <see cref="Button.PressedImage"/> and <see cref="Button.NotPressedImage"/>.
     /// </summary>
+    [DataContractMetadataType(typeof(ImageButtonMetadata))]
     [DebuggerDisplay("ImageButton - Name={Name}")]
     [Obsolete("Use Button with SizeToContent set to false.")]
     public class ImageButton : Button
@@ -16,7 +19,7 @@ public class ImageButton : Button
 
         public ImageButton()
         {
-            Padding = Thickness.UniformCuboid(0);
+            Padding = Thickness.UniformCuboid(0);  // Warning: this must also match in ImageButtonMetadata
             base.Content = contentImageElement;
 
             MouseOverStateChanged += (sender, args) => UpdateContentImage();
@@ -57,5 +60,11 @@ protected set
                 UpdateContentImage();
             }
         }
+
+        private class ImageButtonMetadata
+        {
+            [DefaultThicknessValue(0, 0, 0, 0)]
+            public Thickness Padding { get; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Controls/ImageElement.cs b/sources/engine/Xenko.UI/Controls/ImageElement.cs
index 836002d9a5..7ab6702aae 100644
--- a/sources/engine/Xenko.UI/Controls/ImageElement.cs
+++ b/sources/engine/Xenko.UI/Controls/ImageElement.cs
@@ -50,7 +50,23 @@ public ISpriteProvider Source
         /// <userdoc>The color used to tint the image. The default value is white.</userdoc>
         [DataMember]
         [Display(category: AppearanceCategory)]
-        public Color Color { get; set; } = Color.White;
+        public Color4 Tint { get; set; } = Color4.White;
+
+        /// <summary>
+        /// For backwards compatibility
+        /// </summary>
+        [DataMemberIgnore]
+        public Color Color
+        {
+            get
+            {
+                return Tint.ToColor();
+            }
+            set
+            {
+                Tint = value.ToColor4();
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value that describes how the image should be stretched to fill the destination rectangle.
diff --git a/sources/engine/Xenko.UI/Controls/ModalElement.cs b/sources/engine/Xenko.UI/Controls/ModalElement.cs
index 0f6c02aa3d..d4eeb057fc 100644
--- a/sources/engine/Xenko.UI/Controls/ModalElement.cs
+++ b/sources/engine/Xenko.UI/Controls/ModalElement.cs
@@ -14,6 +14,7 @@ namespace Xenko.UI.Controls
     /// Represents a modal element that puts an overlay upon the underneath elements and freeze their input.
     /// </summary>
     [DataContract(nameof(ModalElement))]
+    [DataContractMetadataType(typeof(ModalElementMetadata))]
     [DebuggerDisplay("ModalElement - Name={Name}")]
     [Display(category: null)]
     public class ModalElement : ButtonBase
@@ -42,8 +43,8 @@ public ModalElement()
         {
             OverlayColorInternal = new Color(0, 0, 0, 0.6f);
             DrawLayerNumber += 1; // (overlay)
-            VerticalAlignment = VerticalAlignment.Center;
-            HorizontalAlignment = HorizontalAlignment.Center;
+            VerticalAlignment = VerticalAlignment.Center;       // Warning: this must also match in ModalElementMetadata
+            HorizontalAlignment = HorizontalAlignment.Center;   // Warning: this must also match in ModalElementMetadata
         }
 
         /// <summary>
@@ -84,10 +85,10 @@ protected override void OnTouchUp(TouchEventArgs args)
             }
         }
 
-        protected internal override bool Intersects(ref Ray ray, out Vector3 intersectionPoint)
+        protected internal override bool Intersects(ref Ray ray, out Vector3 intersectionPoint, bool nonUISpace, Vector2? canvasScale = null)
         {
             if (!IsModal)
-                return base.Intersects(ref ray, out intersectionPoint);
+                return base.Intersects(ref ray, out intersectionPoint, false);
 
             if (LayoutingContext == null)
             {
@@ -97,8 +98,17 @@ protected internal override bool Intersects(ref Ray ray, out Vector3 intersectio
 
             var virtualResolution = LayoutingContext.VirtualResolution;
             var worldmatrix = Matrix.Identity;
-            
+
             return CollisionHelper.RayIntersectsRectangle(ref ray, ref worldmatrix, ref virtualResolution, 2, out intersectionPoint);
         }
+
+        private class ModalElementMetadata
+        {
+            [DefaultValue(HorizontalAlignment.Center)]
+            public HorizontalAlignment HorizontalAlignment { get; }
+
+            [DefaultValue(VerticalAlignment.Center)]
+            public VerticalAlignment VerticalAlignment { get; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Controls/ScrollBar.cs b/sources/engine/Xenko.UI/Controls/ScrollBar.cs
index ca736cab7d..10778e42c9 100644
--- a/sources/engine/Xenko.UI/Controls/ScrollBar.cs
+++ b/sources/engine/Xenko.UI/Controls/ScrollBar.cs
@@ -8,7 +8,7 @@
 namespace Xenko.UI.Controls
 {
     /// <summary>
-    /// Represents a scroll bar. 
+    /// Represents a scroll bar.
     /// </summary>
     [DataContract(nameof(ScrollBar))]
     [DebuggerDisplay("ScrollBar - Name={Name}")]
@@ -16,7 +16,7 @@ public class ScrollBar : UIElement
     {
         public ScrollBar()
         {
-            BarColorInternal = new Color(0, 0, 0, 0);
+            BarColorInternal = Color.Transparent;
         }
 
         internal Color BarColorInternal;
diff --git a/sources/engine/Xenko.UI/Controls/ScrollViewer.cs b/sources/engine/Xenko.UI/Controls/ScrollViewer.cs
index 6c3b5bc4a7..0afb7084a6 100644
--- a/sources/engine/Xenko.UI/Controls/ScrollViewer.cs
+++ b/sources/engine/Xenko.UI/Controls/ScrollViewer.cs
@@ -5,6 +5,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 
+using Xenko.Input;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
 using Xenko.Games;
@@ -12,11 +13,12 @@
 namespace Xenko.UI.Controls
 {
     /// <summary>
-    /// Represents a scroll viewer. 
+    /// Represents a scroll viewer.
     /// A scroll viewer element has an infinite virtual size defined by its <see cref="ScrollingMode"/>.
     /// The user can move in that virtual size by touching and panning on the screen.
     /// </summary>
     [DataContract(nameof(ScrollViewer))]
+    [DataContractMetadataType(typeof(ScrollViewerMetadata))]
     [DebuggerDisplay("ScrollViewer - Name={Name}")]
     public class ScrollViewer : ContentControl
     {
@@ -38,7 +40,7 @@ public class ScrollViewer : ContentControl
             new HashSet<ScrollingMode> { ScrollingMode.VerticalInDepth, ScrollingMode.InDepthHorizontal, ScrollingMode.InDepth }
         };
 
-        private static Color transparent = new Color(0, 0, 0, 0);
+        private static Color transparent = Color.Transparent;
 
         private const float ScrollBarHidingSpeed = 1f;
 
@@ -70,6 +72,14 @@ public class ScrollViewer : ContentControl
         [Display(category: AppearanceCategory)]
         public Color ScrollBarColor { get; set; } = new Color(0.1f, 0.1f, 0.1f, 1f);
 
+        /// <summary>
+        /// Gets or sets how transparent the bar will go when not used
+        /// </summary>
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(0.0f)]
+        public float ScrollBarFadeAlpha { get; set; } = 0.0f;
+
         /// <summary>
         /// Gets or sets the scrolling bar thickness in virtual pixels.
         /// </summary>
@@ -146,6 +156,22 @@ public bool TouchScrollingEnabled
             }
         }
 
+        /// <summary>
+        /// Scroll speed multiplier. Can be negative to reverse scrolling.
+        /// </summary>
+        [DataMember]
+        [Display(category: BehaviorCategory)]
+        [DefaultValue(1.0f)]
+        public float ScrollSensitivity { get; set; } = 1.0f;
+
+        /// <summary>
+        /// Scroll speed multiplier with mouse wheel. Can be negative to reverse scrolling.
+        /// </summary>
+        [DataMember]
+        [Display(category: BehaviorCategory)]
+        [DefaultValue(20.0f)]
+        public float MouseWheelScrollSensitivity { get; set; } = 20.0f;
+
         /// <summary>
         /// Gets or sets the value indicating if the element should snap its scrolling to anchors.
         /// </summary>
@@ -175,14 +201,14 @@ public bool TouchScrollingEnabled
         protected IScrollAnchorInfo ContentAsAnchorInfo { get; private set; }
 
         /// <summary>
-        /// The current scroll position (in virtual pixels) of the <see cref="ScrollViewer"/>. 
+        /// The current scroll position (in virtual pixels) of the <see cref="ScrollViewer"/>.
         /// That is, the position of the left-top-front corner of the <see cref="ScrollViewer"/> in its <see cref="Content"/>.
         /// </summary>
         /// <remarks>
         /// <para>If the <see cref="Content"/> of the scroll viewer implements the <see cref="IScrollInfo"/> interface,
         /// the <see cref="ScrollPosition"/> will be <value>0</value> in all directions where <see cref="IScrollInfo.CanScroll"/> is true.</para>
-        /// <para>Note that <see cref="ScrollPosition"/> is valid only when <see cref="UIElement.IsArrangeValid"/> is <value>true</value>. 
-        /// If <see cref="UIElement.IsArrangeValid"/> is <value>false</value>, <see cref="ScrollPosition"/> contains the position of the scrolling 
+        /// <para>Note that <see cref="ScrollPosition"/> is valid only when <see cref="UIElement.IsArrangeValid"/> is <value>true</value>.
+        /// If <see cref="UIElement.IsArrangeValid"/> is <value>false</value>, <see cref="ScrollPosition"/> contains the position of the scrolling
         /// before the action that actually invalidated the layout.</para>
         /// </remarks>
         public Vector3 ScrollPosition => -ScrollOffsets;
@@ -216,8 +242,8 @@ public ScrollViewer()
                 SetVisualParent(bar, this);
             }
 
-            CanBeHitByUser = TouchScrollingEnabled;
-            ClipToBounds = true;
+            CanBeHitByUser = TouchScrollingEnabled;     // Warning: this must also match in ScrollViewerMetadata
+            ClipToBounds = true;                        // Warning: this must also match in ScrollViewerMetadata
         }
 
         /// <summary>
@@ -359,6 +385,19 @@ protected override void Update(GameTime time)
             if (elapsedSeconds < MathUtil.ZeroTolerance)
                 return;
 
+            if (MouseOverState != MouseOverState.MouseOverNone && MouseWheelScrollSensitivity != 0f && InputManager.instance != null)
+            {
+                // other methods to scroll this
+                var VRD = VirtualReality.VRDeviceSystem.GetSystem;
+                if (VRD != null && VRD.Enabled && VRD.Device != null)
+                {
+                    var scrollVector = (VRD.GetController(VirtualReality.TouchControllerHand.Left)?.ThumbstickAxis ?? Vector2.Zero) +
+                                       (VRD.GetController(VirtualReality.TouchControllerHand.Right)?.ThumbstickAxis ?? Vector2.Zero);
+                    scrollVector *= (float)time.Elapsed.TotalSeconds * 10f;
+                    WheelScroll(ScrollMode == ScrollingMode.Vertical ? scrollVector.Y : scrollVector.X);
+                } else WheelScroll(InputManager.instance.MouseWheelDelta);
+            }
+
             if (IsUserScrollingViewer || userManuallyScrolled) // scrolling is controlled by the user.
             {
                 userManuallyScrolled = false;
@@ -432,7 +471,7 @@ protected override void Update(GameTime time)
                 var shouldFadeOutScrollingBar = Math.Abs(CurrentScrollingSpeed[dim]) < MathUtil.ZeroTolerance && (!TouchScrollingEnabled || !IsUserScrollingViewer);
                 if (shouldFadeOutScrollingBar)
                     for (var i = 0; i < 4; i++)
-                        scrollBars[dim].BarColorInternal[i] = (byte)Math.Max(0, scrollBars[dim].BarColorInternal[i] - ScrollBarColor[i] * ScrollBarHidingSpeed * elapsedSeconds);
+                        scrollBars[dim].BarColorInternal[i] = (byte)Math.Max(ScrollBarFadeAlpha * ScrollBarColor[i], scrollBars[dim].BarColorInternal[i] - ScrollBarColor[i] * ScrollBarHidingSpeed * elapsedSeconds);
                 else
                     scrollBars[dim].BarColor = ScrollBarColor;
             }
@@ -490,10 +529,10 @@ private void ScrollToExtremity(Orientation direction, bool stopScrolling, bool i
         }
 
         /// <summary>
-        /// Try to scroll to the provided position (in virtual pixels). 
+        /// Try to scroll to the provided position (in virtual pixels).
         /// If the provided translation is too important, it is clamped.
         /// </summary>
-        /// <remarks>Note that the computational cost of <see cref="ScrollTo"/> can be greatly higher than <see cref="ScrollOf"/> 
+        /// <remarks>Note that the computational cost of <see cref="ScrollTo"/> can be greatly higher than <see cref="ScrollOf"/>
         /// when scrolling is delegated to a <see cref="Content"/> virtualizing its items. When possible, prefer call to <see cref="ScrollOf"/></remarks>
         /// <param name="scrollAbsolutePosition">The scroll offsets to apply</param>
         /// <param name="stopScrolling">Indicate if the scrolling should be stopped after the scroll action.</param>
@@ -539,7 +578,7 @@ public void ScrollTo(Vector3 scrollAbsolutePosition, bool stopScrolling = true)
         }
 
         /// <summary>
-        /// Try to scroll of the provided scrolling translation value from the current position. 
+        /// Try to scroll of the provided scrolling translation value from the current position.
         /// If the provided translation is too important, it is clamped.
         /// </summary>
         /// <param name="scrollTranslation">The scroll translation to perform (in virtual pixels)</param>
@@ -585,9 +624,10 @@ public void ScrollOfInternal(ref Vector3 scrollTranslation, bool stopScrolling)
         private void UpdateScrollOffsets(Vector3 desiredScrollPosition)
         {
             // the space desired by the child + the padding of the viewer
-            var childRenderSize = VisualContent.RenderSize;
-            var childRenderSizeWithMargins = CalculateSizeWithoutThickness(ref childRenderSize, ref MarginInternal);
-            var childRenderSizeWithPadding = CalculateSizeWithoutThickness(ref childRenderSizeWithMargins, ref padding);
+            Vector3 childRenderSize = VisualContent.RenderSize;
+            childRenderSize.X += padding.Left + padding.Right;
+            childRenderSize.Y += padding.Top + padding.Bottom;
+            childRenderSize.Z += padding.Front + padding.Back;
 
             // update scroll viewer scroll offsets
             foreach (var index in ScrollModeToDirectionIndices[ScrollMode])
@@ -603,7 +643,7 @@ private void UpdateScrollOffsets(Vector3 desiredScrollPosition)
                 ScrollOffsets[index] = desiredScrollPosition[index];
 
                 // no blank on the other extremity (reached the offset "right" limit)
-                var minimumOffset = ViewPort[index] - childRenderSizeWithPadding[index];
+                var minimumOffset = ViewPort[index] - childRenderSize[index];
                 if (ScrollOffsets[index] < minimumOffset)
                 {
                     ScrollOffsets[index] = minimumOffset;
@@ -677,7 +717,7 @@ protected override Vector3 ArrangeOverride(Vector3 finalSizeWithoutMargins)
                 // arrange the child
                 VisualContent.Arrange(childSizeWithoutPadding, IsCollapsed);
 
-                // update the scrolling bars 
+                // update the scrolling bars
                 UpdateScrollingBarsSize();
 
                 // update the scrolling
@@ -743,6 +783,15 @@ private void UpdateVisualContentArrangeMatrix()
             // set the arrange matrix of the child.
             VisualContent.DependencyProperties.Set(ContentArrangeMatrixPropertyKey, Matrix.Translation(childOffsets));
 
+            // update Hidden status for all VisualChildren
+            foreach (UIElement child in VisualContent.VisualChildren)
+            {
+                Vector3 topLeft = child.RenderOffsets + offsets;
+                Vector3 bottomRight = topLeft + child.RenderSize;
+                child.Hidden = !(topLeft.Y <= RenderSize.Y && bottomRight.Y >= 0f &&
+                                 topLeft.X <= RenderSize.X && bottomRight.X >= 0f);
+            }
+
             // force re-calculation of main element and scroll bars world matrices
             ArrangeChanged = true;
         }
@@ -823,6 +872,16 @@ protected override void OnTouchLeave(TouchEventArgs args)
             IsTouchedDown = false;
         }
 
+        protected void WheelScroll(float amount)
+        {
+            if (amount == 0f) return;
+
+            accumulatedTranslation.Y = -amount * MouseWheelScrollSensitivity;
+            CurrentScrollingSpeed.Y = accumulatedTranslation.Y;
+            lastFrameTranslation = accumulatedTranslation;
+            userManuallyScrolled = true;
+        }
+
         protected override void OnPreviewTouchMove(TouchEventArgs args)
         {
             base.OnPreviewTouchMove(args);
@@ -831,12 +890,12 @@ protected override void OnPreviewTouchMove(TouchEventArgs args)
                 return;
 
             // accumulate all the touch moves of the frame
-            var translation = args.WorldTranslation;
+            var translation = args.WorldTranslation * ScrollSensitivity;
             foreach (var index in ScrollModeToDirectionIndices[ScrollMode])
                 lastFrameTranslation[index] -= translation[index];
 
             accumulatedTranslation += lastFrameTranslation;
-            if (!IsUserScrollingViewer && accumulatedTranslation.Length() > ScrollStartThreshold)
+            if (!IsUserScrollingViewer && CheckScrollThreshold())
             {
                 IsUserScrollingViewer = true;
                 lastFrameTranslation = accumulatedTranslation;
@@ -846,6 +905,19 @@ protected override void OnPreviewTouchMove(TouchEventArgs args)
                 args.Handled = true;
         }
 
+        private bool CheckScrollThreshold()
+        {
+            switch (ScrollMode)
+            {
+                case ScrollingMode.Horizontal:
+                    return accumulatedTranslation.X > ScrollStartThreshold;
+                case ScrollingMode.Vertical:
+                    return accumulatedTranslation.Y > ScrollStartThreshold;
+                default:
+                    return accumulatedTranslation.Length() > ScrollStartThreshold;
+            }
+        }
+
         private static void RaiseLeaveTouchEventToHierarchyChildren(UIElement parent, TouchEventArgs args)
         {
             if (parent == null)
@@ -856,7 +928,8 @@ private static void RaiseLeaveTouchEventToHierarchyChildren(UIElement parent, To
                 Action = args.Action,
                 ScreenPosition = args.ScreenPosition,
                 ScreenTranslation = args.ScreenTranslation,
-                Timestamp = args.Timestamp
+                Timestamp = args.Timestamp,
+                ButtonId = args.ButtonId
             };
 
             foreach (var child in parent.VisualChildrenCollection)
@@ -870,7 +943,7 @@ private static void RaiseLeaveTouchEventToHierarchyChildren(UIElement parent, To
         }
 
         /// <summary>
-        /// Called by an <see cref="IScrollInfo"/> interface that is attached to a <see cref="ScrollViewer"/> when the value of any scrolling property size changes. 
+        /// Called by an <see cref="IScrollInfo"/> interface that is attached to a <see cref="ScrollViewer"/> when the value of any scrolling property size changes.
         /// Scrolling properties include offset, extent, or viewport.
         /// </summary>
         public void InvalidateScrollInfo()
@@ -896,5 +969,14 @@ public void InvalidateAnchorInfo()
         {
             // currently nothing to do here.
         }
+
+        private class ScrollViewerMetadata
+        {
+            [DefaultValue(true)]
+            public bool CanBeHitByUser { get; }
+
+            [DefaultValue(true)]
+            public bool ClipToBounds { get; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Controls/ScrollingText.cs b/sources/engine/Xenko.UI/Controls/ScrollingText.cs
index 44ae53bb68..869211d1b9 100644
--- a/sources/engine/Xenko.UI/Controls/ScrollingText.cs
+++ b/sources/engine/Xenko.UI/Controls/ScrollingText.cs
@@ -166,7 +166,7 @@ protected override void Update(GameTime time)
 
         private void UpdateAndAdjustDisplayText(GameTime time = null)
         {
-            if (string.IsNullOrEmpty(Text))
+            if (string.IsNullOrEmpty(Text) || Font is null || CalculateTextSize(Text).X <= float.Epsilon)
                 return;
 
             var elapsedSeconds = time != null ? (float)time.Elapsed.TotalSeconds : 0f;
diff --git a/sources/engine/Xenko.UI/Controls/Slider.cs b/sources/engine/Xenko.UI/Controls/Slider.cs
index 07835b9336..1ccb08a731 100644
--- a/sources/engine/Xenko.UI/Controls/Slider.cs
+++ b/sources/engine/Xenko.UI/Controls/Slider.cs
@@ -10,6 +10,7 @@
 using Xenko.Games;
 using Xenko.Graphics;
 using Xenko.Input;
+using Xenko.Rendering.UI;
 using Xenko.UI.Events;
 
 namespace Xenko.UI.Controls
@@ -18,6 +19,7 @@ namespace Xenko.UI.Controls
     /// Represents a slider element.
     /// </summary>
     [DataContract(nameof(Slider))]
+    [DataContractMetadataType(typeof(SliderMetadata))]
     [Display(category: InputCategory)]
     public class Slider : UIElement
     {
@@ -131,6 +133,47 @@ public float Step
             }
         }
 
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        public Color TrackBackgroundTint { get; set; } = Color.White;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(1.3f)]
+        public float TrackForegroundHeightScale { get; set; } = 1.3f;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        public Color TrackForegroundTint { get; set; } = Color.White;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        public Color TickTint { get; set; } = Color.White;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(0.4f)]
+        public float TickHeightScale { get; set; } = 0.4f;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(0.01f)]
+        public float TickWidthScale { get; set; } = 0.01f;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(1.3f)]
+        public float ThumbHeightScale { get; set; } = 1.3f;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(1.3f)]
+        public float ThumbWidthScale { get; set; } = 0.1f;
+
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        public Color ThumbTint { get; set; } = Color.White;
+
         /// <summary>
         /// Gets or sets the image to display as Track background.
         /// </summary>
@@ -255,8 +298,8 @@ public float TickOffset
         public bool ShouldSnapToTicks
         {
             get { return shouldSnapToTicks; }
-            set 
-            { 
+            set
+            {
                 shouldSnapToTicks = value;
                 Value = Value; // snap if enabled
             }
@@ -287,7 +330,7 @@ public Orientation Orientation
                 InvalidateMeasure();
             }
         }
-        
+
         /// <summary>
         /// Gets a value that indicates whether the is currently touched down.
         /// </summary>
@@ -335,7 +378,7 @@ public void Decrease()
 
         private float CalculateIncreamentValue()
         {
-            return shouldSnapToTicks ? Math.Max(Step, (Maximum - Minimum)/TickFrequency) : Step;
+            return shouldSnapToTicks ? Math.Max(Step, (Maximum - Minimum) / TickFrequency) : Step;
         }
 
         protected override Vector3 MeasureOverride(Vector3 availableSizeWithoutMargins)
@@ -369,7 +412,7 @@ public event EventHandler<RoutedEventArgs> ValueChanged
             nameof(ValueChanged),
             RoutingStrategy.Bubble,
             typeof(Slider));
-        
+
         /// <summary>
         /// The class handler of the event <see cref="ValueChanged"/>.
         /// This method can be overridden in inherited classes to perform actions common to all instances of a class.
@@ -390,9 +433,11 @@ private static void ValueChangedClassHandler(object sender, RoutedEventArgs args
         protected override void OnTouchDown(TouchEventArgs args)
         {
             base.OnTouchDown(args);
-            
+
             SetValueFromTouchPosition(args.WorldPosition);
             IsTouchedDown = true;
+
+            UIRenderFeature.ForceMouseOver = this;
         }
 
         protected override void OnTouchUp(TouchEventArgs args)
@@ -406,6 +451,20 @@ protected override void OnTouchLeave(TouchEventArgs args)
         {
             base.OnTouchLeave(args);
 
+            // check and see if we were dragging off the edge
+            Vector2 leaveDir = Vector2.Normalize(args.ScreenTranslation);
+
+            if (leaveDir.X > 0.7f && Orientation == Orientation.Horizontal ||
+                leaveDir.Y > 0.7f && Orientation == Orientation.Vertical)
+            {
+                if (Value > Maximum * 0.85f) Value = Maximum;
+            }
+            else if (leaveDir.X < -0.7f && Orientation == Orientation.Horizontal ||
+                     leaveDir.Y < -0.7f && Orientation == Orientation.Vertical)
+            {
+                if (Value < Maximum * 0.15f) Value = Minimum;
+            }
+
             IsTouchedDown = false;
         }
 
@@ -438,7 +497,7 @@ protected void SetValueFromTouchPosition(Vector3 touchPostionWorld)
             var axis = (int)Orientation;
             var offsets = TrackStartingOffsets;
             var elementSize = RenderSize[axis];
-            var touchPosition = touchPostionWorld[axis] - WorldMatrixInternal[12 + axis] + elementSize/2;
+            var touchPosition = touchPostionWorld[axis] - WorldMatrixInternal[12 + axis] + elementSize / 2;
             var ratio = (touchPosition - offsets.X) / (elementSize - offsets.X - offsets.Y);
             Value = MathUtil.Lerp(Minimum, Maximum, Orientation == Orientation.Vertical ^ IsDirectionReversed ? 1 - ratio : ratio);
         }
@@ -477,5 +536,17 @@ private void OnTrackBackgroundSpriteChanged(Sprite currentSprite)
                 trackBackgroundSprite.BorderChanged += InvalidateMeasure;
             }
         }
+
+        private class SliderMetadata
+        {
+            [DefaultValue(true)]
+            public bool CanBeHitByUser { get; }
+
+            [DefaultValue(HorizontalAlignment.Center)]
+            public HorizontalAlignment HorizontalAlignment { get; }
+
+            [DefaultValue(VerticalAlignment.Center)]
+            public VerticalAlignment VerticalAlignment { get; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Controls/TextBlock.cs b/sources/engine/Xenko.UI/Controls/TextBlock.cs
index 58632113c6..e01ccb0093 100644
--- a/sources/engine/Xenko.UI/Controls/TextBlock.cs
+++ b/sources/engine/Xenko.UI/Controls/TextBlock.cs
@@ -51,7 +51,9 @@ public string Text
             get { return text; }
             set
             {
+                if (text == value) return;
                 text = value;
+                wrappedTextDirty = true;
                 OnTextChanged();
             }
         }
@@ -72,6 +74,7 @@ public SpriteFont Font
                     return;
 
                 font = value;
+                wrappedTextDirty = true;
                 InvalidateMeasure();
             }
         }
@@ -92,7 +95,10 @@ public float TextSize
             get { return textSize; }
             set
             {
-                textSize = MathUtil.Clamp(value, 0.0f, float.MaxValue);
+                float clamped = MathUtil.Clamp(value, 0.0f, float.MaxValue);
+                if (textSize == clamped) return;
+                textSize = clamped;
+                wrappedTextDirty = true;
                 InvalidateMeasure();
             }
         }
@@ -114,6 +120,24 @@ public float TextSize
         [DefaultValue(default(TextAlignment))]
         public TextAlignment TextAlignment { get; set; }
 
+        /// <summary>
+        /// Gets or sets the vertical alignment of the text to display.
+        /// </summary>
+        /// <userdoc>Vertical alignment of the text.</userdoc>
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(default(TextVerticalAlignment))]
+        public TextVerticalAlignment TextVerticalAlignment { get; set; }
+
+        /// <summary>
+        /// Line spacing adjustment
+        /// </summary>
+        /// <userdoc>Line spacing adjustment</userdoc>
+        [DataMember]
+        [Display(category: AppearanceCategory)]
+        [DefaultValue(0.0f)]
+        public float LineSpacingAdjustment { get; set; }
+
         /// <summary>
         /// Gets or sets the value indicating if the <see cref="Text"/> of the <see cref="TextBlock"/> 
         /// should automatically return to the beginning of the line when it is too long for the line width.
@@ -131,6 +155,7 @@ public bool WrapText
                     return;
 
                 wrapText = value;
+                wrappedTextDirty = true;
                 InvalidateMeasure();
             }
         }
@@ -233,7 +258,7 @@ private Vector2 CalculateTextSize(SpriteFont.StringProxy textToMeasure)
             if (Font == null)
                 return Vector2.Zero;
 
-            var sizeRatio = LayoutingContext.RealVirtualResolutionRatio;
+            var sizeRatio = LayoutingContext?.RealVirtualResolutionRatio ?? Vector2.One;
             var measureFontSize = new Vector2(sizeRatio.Y * ActualTextSize); // we don't want letters non-uniform ratio
             var realSize = Font.MeasureString(ref textToMeasure, ref measureFontSize);
 
@@ -247,8 +272,7 @@ private Vector2 CalculateTextSize(SpriteFont.StringProxy textToMeasure)
                 realSize.X /= sizeRatio.X;
                 realSize.Y /= sizeRatio.Y;
             }
-
-            if (Font.FontType == SpriteFontType.SDF)
+            else if (Font.Size > 0f)
             {
                 var scaleRatio = ActualTextSize / Font.Size;
                 realSize.X *= scaleRatio;
@@ -258,8 +282,25 @@ private Vector2 CalculateTextSize(SpriteFont.StringProxy textToMeasure)
             return realSize;
         }
 
-        private void UpdateWrappedText(Vector3 availableSpace)
+        // store this to determine if we need to UpdateWrappedText at all
+        private bool wrappedTextDirty = true;
+        private Vector3 lastWrappedText;
+
+        public void UpdateWrappedText(Vector3? overrideAvailableSpace = null)
         {
+            var availableSpace = overrideAvailableSpace ?? availableSizeWithoutMargins;
+
+            // skip this costly procedure if nothing changed with the text
+            if (wrappedTextDirty == false && availableSpace == lastWrappedText) return;
+            wrappedTextDirty = false;
+            lastWrappedText = availableSpace;
+
+            if (availableSpace.X <= 0f)
+            {
+                CalculateWithoutMargins(ref previousProvidedMeasureSize, out _);
+                availableSpace = availableSizeWithoutMargins;
+            }
+
             if (string.IsNullOrEmpty(text))
             {
                 wrappedText = string.Empty;
@@ -267,9 +308,11 @@ private void UpdateWrappedText(Vector3 availableSpace)
                 return;
             }
 
+            string newlinedText = text.Replace("<br>", "\n");
+
             var availableWidth = availableSpace.X;
-            var currentLine = new StringBuilder(text.Length);
-            var currentText = new StringBuilder(2 * text.Length);
+            var currentLine = new StringBuilder(newlinedText.Length);
+            var currentText = new StringBuilder(2 * newlinedText.Length);
 
             var indexOfNewLine = 0;
             while (true)
@@ -282,10 +325,10 @@ private void UpdateWrappedText(Vector3 availableSpace)
                 {
                     lineCurrentSize = CalculateTextSize(currentLine).X;
 
-                    if (lineCurrentSize > availableWidth || indexOfNewLine + indexNextCharacter >= text.Length)
+                    if (lineCurrentSize > availableWidth || indexOfNewLine + indexNextCharacter >= newlinedText.Length)
                         break;
 
-                    var currentCharacter = text[indexOfNewLine + indexNextCharacter];
+                    var currentCharacter = newlinedText[indexOfNewLine + indexNextCharacter];
 
                     if (currentCharacter == '\n')
                     {
diff --git a/sources/engine/Xenko.UI/Controls/ToggleButton.cs b/sources/engine/Xenko.UI/Controls/ToggleButton.cs
index cb65c767fc..b5f513dbfd 100644
--- a/sources/engine/Xenko.UI/Controls/ToggleButton.cs
+++ b/sources/engine/Xenko.UI/Controls/ToggleButton.cs
@@ -6,6 +6,7 @@
 
 using Xenko.Core;
 using Xenko.Engine;
+using Xenko.UI.Attributes;
 using Xenko.UI.Events;
 
 namespace Xenko.UI.Controls
@@ -14,6 +15,7 @@ namespace Xenko.UI.Controls
     /// Represent a UI toggle button. A toggle but can have two or three states depending on the <see cref="IsThreeState"/> property.
     /// </summary>
     [DataContract(nameof(ToggleButton))]
+    [DataContractMetadataType(typeof(ToggleButtonMetadata))]
     [DebuggerDisplay("ToggleButton - Name={Name}")]
     public class ToggleButton : ButtonBase
     {
@@ -35,7 +37,7 @@ protected virtual void OnToggleImageInvalidated()
         public ToggleButton()
         {
             DrawLayerNumber += 1; // (toggle design image)
-            Padding = new Thickness(10, 5, 10, 7);
+            Padding = new Thickness(10, 5, 10, 7);  // Warning: this must also match in ToggleButtonMetadata
         }
 
         /// <summary>
@@ -128,7 +130,7 @@ public bool IsThreeState
         [DefaultValue(ToggleState.UnChecked)]
         public ToggleState State
         {
-            get { return state; } 
+            get { return state; }
             set
             {
                 if (state == value)
@@ -231,9 +233,18 @@ protected void GoToNextState()
 
         protected override void OnClick(RoutedEventArgs args)
         {
+            // only accept left clicks
+            if (args is TouchEventArgs tea && tea.ButtonId != 0) return;
+
             base.OnClick(args);
 
             GoToNextState();
         }
+
+        private class ToggleButtonMetadata
+        {
+            [DefaultThicknessValue(10, 5, 10, 7)]
+            public Thickness Padding { get; }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Engine/Processors/UIElementLinkProcessor.cs b/sources/engine/Xenko.UI/Engine/Processors/UIElementLinkProcessor.cs
index c27f486682..2222507984 100644
--- a/sources/engine/Xenko.UI/Engine/Processors/UIElementLinkProcessor.cs
+++ b/sources/engine/Xenko.UI/Engine/Processors/UIElementLinkProcessor.cs
@@ -21,10 +21,10 @@ protected override void OnEntityComponentRemoved(Entity entity, UIElementLinkCom
 
         public override void Draw(RenderContext context)
         {
-            foreach (var item in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var entity = item.Key.Entity;
-                var modelNodeLink = item.Value;
+                var entity = ComponentDataKeys[i].Entity;
+                var modelNodeLink = ComponentDataValues[i];
                 var transformComponent = entity.Transform;
                 var transformLink = transformComponent.TransformLink as UIElementTransformLink;
 
diff --git a/sources/engine/Xenko.UI/Engine/UIComponent.cs b/sources/engine/Xenko.UI/Engine/UIComponent.cs
index 066f484255..a0631e7cd2 100644
--- a/sources/engine/Xenko.UI/Engine/UIComponent.cs
+++ b/sources/engine/Xenko.UI/Engine/UIComponent.cs
@@ -1,11 +1,14 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
 using Xenko.Engine.Design;
 using Xenko.Rendering;
+using Xenko.Rendering.Sprites;
 using Xenko.Rendering.UI;
 
 namespace Xenko.Engine
@@ -20,14 +23,19 @@ namespace Xenko.Engine
     [ComponentCategory("UI")]
     public sealed class UIComponent : ActivableEntityComponent
     {
-        public static readonly float DefaultDepth = 1000;
-        public static readonly float DefaultHeight = 720;
-        public static readonly float DefaultWidth = 1280;
+        public enum BILLBOARD_TYPE
+        {
+            VIEW,
+            POSITION
+        }
+
+        public static readonly float DefaultDepth = 128f;
+        public static readonly float DefaultHeight = 720f;
+        public static readonly float DefaultWidth = 1280f;
 
         public UIComponent()
         {
             Resolution = new Vector3(DefaultWidth, DefaultHeight, DefaultDepth);
-            Size = new Vector3(1, 1, 1);
         }
 
         /// <summary>
@@ -47,21 +55,30 @@ public UIComponent()
         [DefaultValue(true)]
         public bool IsFullScreen { get; set; } = true;
 
+        private Vector3 internalResolution;
+
         /// <summary>
         /// Gets or sets the virtual resolution of the UI in virtual pixels.
         /// </summary>
         /// <userdoc>The value in pixels of the resolution of the UI</userdoc>
         [DataMember(30)]
         [Display("Resolution")]
-        public Vector3 Resolution { get; set; }
+        public Vector3 Resolution
+        {
+            get => internalResolution;
+            set
+            {
+                internalResolution.Z = 128f;
+                internalResolution.X = value.X;
+                internalResolution.Y = value.Y;
+            }
+        }
 
         /// <summary>
-        /// Gets or sets the actual size of the UI component in world units. This value is ignored in fullscreen mode.
+        /// Gets the virtual resolution used after any resizing due to resolution.
         /// </summary>
-        /// <userdoc>The actual size of the UI component in world units. This value is ignored in fullscreen mode.</userdoc>
-        [DataMember(35)]
-        [Display("Size")]
-        public Vector3 Size { get; set; }
+        [DataMemberIgnore]
+        public Vector3 RenderedResolution { get; internal set; }
 
         /// <summary>
         /// Gets or sets the camera.
@@ -70,8 +87,8 @@ public UIComponent()
         /// <userdoc>Indicate how the virtual resolution value should be interpreted</userdoc>
         [DataMember(40)]
         [Display("Resolution Stretch")]
-        [DefaultValue(ResolutionStretch.FixedWidthAdaptableHeight)]
-        public ResolutionStretch ResolutionStretch { get; set; } = ResolutionStretch.FixedWidthAdaptableHeight;
+        [DefaultValue(ResolutionStretch.AutoFit)]
+        public ResolutionStretch ResolutionStretch { get; set; } = ResolutionStretch.AutoFit;
 
         /// <summary>
         /// Gets or sets the value indicating whether the UI should be displayed as billboard.
@@ -82,6 +99,13 @@ public UIComponent()
         [DefaultValue(true)]
         public bool IsBillboard { get; set; } = true;
 
+        /// <summary>
+        /// How do we calculate the billboard? Position works better for VR, but perhaps not for non-VR.
+        /// </summary>
+        [DataMember(55)]
+        [DefaultValue(BILLBOARD_TYPE.VIEW)]
+        public BILLBOARD_TYPE BillboardType { get; set; } = BILLBOARD_TYPE.VIEW; 
+
         /// <summary>
         /// Gets or sets the value indicating of the UI texts should be snapped to closest pixel.
         /// </summary>
@@ -112,9 +136,102 @@ public UIComponent()
         public RenderGroup RenderGroup { get; set; }
 
         /// <summary>
-        /// A fixed size UI component with height of 1 will be this much of the vertical resolution on screen
+        /// Specifies the sampling method to be used for this component
+        /// </summary>
+        /// <userdoc>Specifies the sampling method to be used for this component</userdoc>
+        [DataMember(15)]
+        [DefaultValue(UIElementSampler.LinearClamp)]
+        [Display("Sampler")]
+        public UIElementSampler Sampler { get; set; } = UIElementSampler.LinearClamp;
+
+        /// <summary>
+        /// Tweak the sorting distance. Can help with transparent sorting.
+        /// </summary>
+        [DataMember(90)]
+        [Display("Distance Sort Fudge")]
+        [DefaultValue(0f)]
+        public float DistanceSortFudge { get; set; }
+
+        [DataMember(100)]
+        [DefaultValue(RenderSprite.SpriteDepthMode.ReadOnly)]
+        public RenderSprite.SpriteDepthMode DepthMode { get; set; } = RenderSprite.SpriteDepthMode.ReadOnly;
+
+        [DataMember(110)]
+        [DefaultValue(1f)]
+        public float SmallFactorMultiplier { get; set; } = 1f;
+
+        /// <summary>
+        /// Track where the cursor is on this component? Works for mouse and VR pointer
+        /// </summary>
+        [DataMember(120)]
+        [DefaultValue(false)]
+        public bool AlwaysTrackPointer
+        {
+            get
+            {
+                return AveragedPositions != null;
+            }
+            set
+            {
+                if (!value)
+                    AveragedPositions = null;
+                else if (AveragedPositions == null)
+                    AveragedPositions = new Vector2[1];
+            }
+        }
+
+        /// <summary>
+        /// How many frames to smooth out pointer tracking? Can be useful in VR to handle pointer shake
+        /// </summary>
+        [DataMember(130)]
+        [DefaultValue(1)]
+        public int FramesPointerSmoothing
+        {
+            get
+            {
+                return AveragedPositions?.Length ?? 1;
+            }
+            set
+            {
+                int minSize = value < 1 ? 1 : value;
+                
+                if (minSize != FramesPointerSmoothing && AveragedPositions != null)
+                    Array.Resize<Vector2>(ref AveragedPositions, minSize);
+            }
+        }
+
+        /// <summary>
+        /// If we are always tracking the pointer on this canvas, how much area should we expand the tracked space?
+        /// </summary>
+        [DataMember(140)]
+        public Vector2 TrackedCanvasScale { get; set; } = Vector2.One;
+
+        /// <summary>
+        /// Where is the cursor relative to this UI component?
         /// </summary>
         [DataMemberIgnore]
-        public const float FixedSizeVerticalUnit = 1;   // 100% of the vertical resolution
+        public Vector2 TrackedPointerPosition
+        {
+            get
+            {
+                if (AveragedPositions == null || AveragedPositions.Length == 0)
+                    return Vector2.Zero;
+
+                if (AveragedPositions.Length == 1)
+                    return AveragedPositions[0];
+
+                Vector2 result = Vector2.Zero;
+                for (int i=0; i<AveragedPositions.Length; i++)
+                {
+                    result += AveragedPositions[i];
+                }
+
+                return result / AveragedPositions.Length;
+            }
+        }
+
+        internal Vector2[] AveragedPositions;
+        internal int AveragePositionIndex;
+        internal ulong VRPoseUpdate;
     }
 }
diff --git a/sources/engine/Xenko.UI/Engine/UIElementTransformLink.cs b/sources/engine/Xenko.UI/Engine/UIElementTransformLink.cs
index 1ea6ad22de..a81b3487c9 100644
--- a/sources/engine/Xenko.UI/Engine/UIElementTransformLink.cs
+++ b/sources/engine/Xenko.UI/Engine/UIElementTransformLink.cs
@@ -35,7 +35,7 @@ private UIElement FindElementByName(string name, UIElement element)
             if (name.Equals(element.Name))
                 return element;
 
-            foreach (var child in element.VisualChildren)
+            foreach (var child in element.VisualChildrenCollection)
             {
                 var childElement = FindElementByName(name, child);
                 if (childElement != null)
@@ -115,28 +115,31 @@ public override void ComputeMatrix(bool recursive, out Matrix matrix)
                         Matrix viewInverse;
                         Matrix.Invert(ref camera.ViewMatrix, out viewInverse);
 
+                        var viewInverseRow1 = viewInverse.Row1;
+                        var viewInverseRow2 = viewInverse.Row2;
+
                         // remove scale of the camera
-                        viewInverse.Row1 /= viewInverse.Row1.XYZ().Length();
-                        viewInverse.Row2 /= viewInverse.Row2.XYZ().Length();
+                        viewInverseRow1 /= viewInverseRow1.XYZ().Length();
+                        viewInverseRow2 /= viewInverseRow2.XYZ().Length();
 
                         // set the scale of the object
-                        viewInverse.Row1 *= worldMatrix.Row1.XYZ().Length();
-                        viewInverse.Row2 *= worldMatrix.Row2.XYZ().Length();
+                        viewInverseRow1 *= worldMatrix.Row1.XYZ().Length();
+                        viewInverseRow2 *= worldMatrix.Row2.XYZ().Length();
 
                         // set the adjusted world matrix
-                        worldMatrix.Row1 = viewInverse.Row1;
-                        worldMatrix.Row2 = viewInverse.Row2;
+                        worldMatrix.Row1 = viewInverseRow1;
+                        worldMatrix.Row2 = viewInverseRow2;
                         worldMatrix.Row3 = viewInverse.Row3;
                     }
 
                     // The resulting matrix should be in world units
                     parentWorldMatrix.Row2 = -parentWorldMatrix.Row2;
                     parentWorldMatrix.Row3 = -parentWorldMatrix.Row3;
-                    parentWorldMatrix = Matrix.Scaling(parentUIComponent.Resolution / parentUIComponent.Size) * parentWorldMatrix;
+                    parentWorldMatrix = Matrix.Scaling(parentUIComponent.Resolution) * parentWorldMatrix;
 
                     parentInverseMatrix.Row2 = -parentInverseMatrix.Row2;
                     parentInverseMatrix.Row3 = -parentInverseMatrix.Row3;
-                    parentInverseMatrix = Matrix.Scaling(parentUIComponent.Size / parentUIComponent.Resolution) * parentInverseMatrix;
+                    parentInverseMatrix = Matrix.Scaling(1f / parentUIComponent.Resolution) * parentInverseMatrix;
                    // Matrix.Invert(ref parentWorldMatrix, out parentInverseMatrix);
 
                     matrix = parentWorldMatrix * followedElement.WorldMatrix * parentInverseMatrix;
diff --git a/sources/engine/Xenko.UI/Engine/UILibrary.cs b/sources/engine/Xenko.UI/Engine/UILibrary.cs
index 5193994791..be0a55c835 100644
--- a/sources/engine/Xenko.UI/Engine/UILibrary.cs
+++ b/sources/engine/Xenko.UI/Engine/UILibrary.cs
@@ -1,10 +1,12 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Serialization;
 using Xenko.Core.Serialization.Contents;
+using Xenko.Engine.Design;
 using Xenko.UI;
 
 namespace Xenko.Engine
@@ -23,5 +25,77 @@ public UILibrary()
         /// Gets the UI elements.
         /// </summary>
         public Dictionary<string, UIElement> UIElements { get; }
+
+        /// <summary>
+        /// Instantiates a copy of the element of the library identified by <paramref name="name"/>.
+        /// </summary>
+        /// <typeparam name="TElement">The type of the element.</typeparam>
+        /// <param name="library">The library.</param>
+        /// <param name="name">The name of the element in the library.</param>
+        /// <returns></returns>
+        public TElement InstantiateElement<TElement>(string name)
+            where TElement : UIElement
+        {
+            UIElement source;
+            if (UIElements.TryGetValue(name, out source))
+            {
+                return UICloner.Clone(source) as TElement;
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Instantiates an element without knowing its type explicitly
+        /// </summary>
+        public UIElement InstantiateElement(string name)
+        {
+            UIElement source;
+            if (UIElements.TryGetValue(name, out source))
+            {
+                return UICloner.Clone(source);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Instantiates this library by cloning the first root element
+        /// </summary>
+        public UIElement InstantiateFirstRoot()
+        {
+            foreach (UIElement uie in UIElements.Values)
+            {
+                if (uie.Parent == null)
+                    return UICloner.Clone(uie);
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Instantiates this library by cloning all root elements
+        /// </summary>
+        public List<UIElement> InstantiateAllRoots()
+        {
+            List<UIElement> elements = new List<UIElement>();
+            foreach (UIElement uie in UIElements.Values)
+            {
+                if (uie.Parent == null)
+                    elements.Add(UICloner.Clone(uie));
+            }
+            return elements;
+        }
+
+        /// <summary>
+        /// Instantiates this library by cloning the first element of a given type
+        /// </summary>
+        public TElement InstantiateFirst<TElement>()
+            where TElement : UIElement
+        {
+            foreach (UIElement uie in UIElements.Values)
+            {
+                if (uie is TElement)
+                    return UICloner.Clone(uie) as TElement;
+            }
+            return null;
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Engine/UILibraryExtensions.cs b/sources/engine/Xenko.UI/Engine/UILibraryExtensions.cs
deleted file mode 100644
index d52a935114..0000000000
--- a/sources/engine/Xenko.UI/Engine/UILibraryExtensions.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using Xenko.Engine.Design;
-using Xenko.UI;
-
-namespace Xenko.Engine
-{
-    public static class UILibraryExtensions
-    {
-        /// <summary>
-        /// Instantiates a copy of the element of the library identified by <paramref name="name"/>.
-        /// </summary>
-        /// <typeparam name="TElement">The type of the element.</typeparam>
-        /// <param name="library">The library.</param>
-        /// <param name="name">The name of the element in the library.</param>
-        /// <returns></returns>
-        public static TElement InstantiateElement<TElement>(this UILibrary library, string name)
-            where TElement : UIElement
-        {
-            if (library == null) throw new ArgumentNullException(nameof(library));
-
-            UIElement source;
-            if (library.UIElements.TryGetValue(name, out source))
-            {
-                return UICloner.Clone(source) as TElement;
-            }
-            return null;
-        }
-    }
-}
diff --git a/sources/engine/Xenko.UI/Engine/UIPage.cs b/sources/engine/Xenko.UI/Engine/UIPage.cs
index 73ce8ee33a..7b1d3e7c41 100644
--- a/sources/engine/Xenko.UI/Engine/UIPage.cs
+++ b/sources/engine/Xenko.UI/Engine/UIPage.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Serialization;
 using Xenko.Core.Serialization.Contents;
@@ -22,5 +23,36 @@ public sealed class UIPage : ComponentBase
         /// <userdoc>The root element of the page.</userdoc>
         [DataMember]
         public UIElement RootElement { get; set; }
+
+        /// <summary>
+        /// Shortcut to gathering a dictionary of UIElements (keyed by name) from page of type T
+        /// </summary>
+        /// <typeparam name="T">Type of UIElements to gather, can be UIElement too for all</typeparam>
+        /// <param name="dictionary">Dictionary to populate</param>
+        /// <param name="childrenOnly">Include the root, or just the children?</param>
+        public void GatherUIDictionary<T>(ref Dictionary<string, T> dictionary, bool childrenOnly = false) where T : UIElement
+        {
+            RootElement.GatherUIDictionary<T>(ref dictionary, childrenOnly);
+        }
+
+        /// <summary>
+        /// Shortcut to finding a UIElement based on name from this page
+        /// </summary>
+        /// <param name="name">Name of UIElement to find</param>
+        public UIElement FindName(string name)
+        {
+            return RootElement.FindName(name);
+        }
+
+        /// <summary>
+        /// Shortcut to gathering a dictionary of UIElements from page of type T
+        /// </summary>
+        /// <typeparam name="T">Type of UIElements to gather, can be UIElement too for all</typeparam>
+        /// <param name="childrenOnly">Include the root, or just the children?</param>
+        /// <returns>Populated dictionary, keyed by name of UIElement</returns>
+        public Dictionary<string, T> GatherUIDictionary<T>(bool childrenOnly = false) where T : UIElement
+        {
+            return RootElement.GatherUIDictionary<T>(childrenOnly);
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Events/EventManager.cs b/sources/engine/Xenko.UI/Events/EventManager.cs
index 421a29c2bd..14b07c3535 100644
--- a/sources/engine/Xenko.UI/Events/EventManager.cs
+++ b/sources/engine/Xenko.UI/Events/EventManager.cs
@@ -25,8 +25,9 @@ public static RoutedEvent GetRoutedEvent(Type ownerType, string eventName)
             var currentType = ownerType;
             while (currentType != null)
             {
-                if (OwnerToEvents.ContainsKey(currentType) && OwnerToEvents[currentType].ContainsKey(eventName))
-                    return OwnerToEvents[currentType][eventName];
+                if (OwnerToEvents.TryGetValue(currentType, out var eventsMap)
+                    && eventsMap.TryGetValue(eventName, out var routedEvent))
+                    return routedEvent;
 
                 currentType = currentType.GetTypeInfo().BaseType;
             }
@@ -101,8 +102,9 @@ internal static RoutedEventHandlerInfo GetClassHandler(Type classType, RoutedEve
             var currentType = classType;
             while (currentType != null)
             {
-                if (ClassesToClassHandlers.ContainsKey(currentType) && ClassesToClassHandlers[currentType].ContainsKey(routedEvent))
-                    return ClassesToClassHandlers[currentType][routedEvent];
+                if (ClassesToClassHandlers.TryGetValue(currentType, out var classHandlersMap)
+                    && classHandlersMap.TryGetValue(routedEvent, out var handler))
+                    return handler;
 
                 currentType = currentType.GetTypeInfo().BaseType;
             }
diff --git a/sources/engine/Xenko.UI/GridList.cs b/sources/engine/Xenko.UI/GridList.cs
new file mode 100644
index 0000000000..a90697ea5d
--- /dev/null
+++ b/sources/engine/Xenko.UI/GridList.cs
@@ -0,0 +1,424 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Xenko.Engine;
+using Xenko.UI.Controls;
+using Xenko.UI.Events;
+using Xenko.UI.Panels;
+
+namespace Xenko.UI
+{
+    /// <summary>
+    /// Helper class to generate clickable lists within a Grid, given a UILibrary to use for each entry 
+    /// </summary>
+    public class GridList
+    {
+        private UILibrary template;
+
+        protected string templateName;
+        protected Dictionary<object, Dictionary<string, UIElement>> entryElements = new Dictionary<object, Dictionary<string, UIElement>>();
+        protected float entryHeight, entryWidth;
+        protected Grid myGrid;
+
+        /// <summary>
+        /// Sort alphabetically?
+        /// </summary>
+        public bool AlphabeticalSort = false;
+
+        /// <summary>
+        /// When adding entries, adjust their width to the grid?
+        /// </summary>
+        public bool FitEntriesToWidth = true;
+
+        /// <summary>
+        /// Maximum number of ToggleButtons that can be checked
+        /// </summary>
+        virtual public int MaxCheckedAllowed { get; set; } = 1;
+
+        /// <summary>
+        /// Action to take when a button is clicked or ToggleButton is checked, argument is the value of the entry
+        /// </summary>
+        public Action<object> EntrySelectedAction = (value) => { };
+
+        /// <summary>
+        /// Action to take when anything is selected, clicked or deselected.
+        /// </summary>
+        public Action AnyChangeAction = null;
+
+        protected bool UpdateEntryWidth()
+        {
+            float newWidth = myGrid.Width;
+            if (float.IsNaN(newWidth)) newWidth = myGrid.ActualWidth;
+            if (!float.IsNaN(newWidth) &&
+                entryWidth != newWidth)
+            {
+                entryWidth = newWidth;
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Make a GridList for the given Grid
+        /// </summary>
+        /// <param name="grid">What grid will the list be in?</param>
+        /// <param name="entryTemplate">What template to use for entries? Needs to include either a Button or Toggle</param>
+        /// <param name="templateRootName">Optional specified name for the root UIElement in the entryTemplate</param>
+        public GridList(Grid grid, UILibrary entryTemplate, string templateRootName = null)
+        {
+            myGrid = grid;
+            template = entryTemplate;
+            if (templateRootName == null)
+            {
+                foreach (string name in entryTemplate.UIElements.Keys)
+                {
+                    // just grab the first name
+                    templateName = name;
+                    break;
+                }
+            }
+            else templateName = templateRootName;
+            entryHeight = entryTemplate.UIElements[templateName].Height;
+            UpdateEntryWidth();
+        }
+
+        /// <summary>
+        /// What is selected right now? Only supports lists with 1 possible selection. Use GetEntries if more than 1 can be selected.
+        /// </summary>
+        /// <returns>Selected item on list of ToggleButtons, null otherwise</returns>
+        /// <exception cref="InvalidOperationException">Exception raised if this list can support multiple selections</exception>
+        virtual public object GetSelection()
+        {
+            if (MaxCheckedAllowed > 1)
+                throw new InvalidOperationException(myGrid.Name + " GridList can have multiple selections. Use GetEntries instead.");
+
+            var selected = GetEntries(true);
+            if (selected.Count == 1) return selected[0];
+
+            return null;
+        }
+
+        /// <summary>
+        /// How many toggle buttons are checked?
+        /// </summary>
+        virtual public int GetSelectedCount()
+        {
+            int cc = 0;
+            foreach (Dictionary<string, UIElement> elements in entryElements.Values)
+            {
+                foreach (UIElement uie in elements.Values)
+                {
+                    if (uie is ToggleButton tb && tb.State == ToggleState.Checked) cc++;
+                }
+            }
+            return cc;
+        }
+
+        /// <summary>
+        /// How many entries are in this list in total?
+        /// </summary>
+        virtual public int GetCount()
+        {
+            return entryElements.Count;
+        }
+
+        /// <summary>
+        /// Clear all checked ToggleButtons and clears last button pressed, if any
+        /// </summary>
+        virtual public void ResetSelected(object ignoreValue = null)
+        {
+            foreach (var pair in entryElements)
+            {
+                if (pair.Key.Equals(ignoreValue)) continue;
+                foreach (UIElement uie in pair.Value.Values)
+                {
+                    if (uie is ToggleButton tb) tb.State = ToggleState.UnChecked;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the entry display name for a value
+        /// </summary>
+        /// <param name="value">value of entry to look for</param>
+        /// <returns>null if it couldn't be found</returns>
+        public string GetDisplayName(object value)
+        {
+            if (entryElements.TryGetValue(value, out var uied))
+            {
+                foreach (UIElement uie in uied.Values)
+                {
+                    if (uie is TextBlock tb) return tb.Text;
+                }
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Gets whether an entry is toggled
+        /// </summary>
+        /// <param name="value">Value of entry</param>
+        /// <returns>togglestate of toggle button</returns>
+        virtual public ToggleState GetSelectedState(object value)
+        {
+            if (entryElements.TryGetValue(value, out var uied))
+            {
+                foreach (UIElement uie in uied.Values)
+                {
+                    if (uie is ToggleButton tb)
+                        return tb.State;
+                }
+            }
+            return ToggleState.Indeterminate;
+        }
+
+        /// <summary>
+        /// Add a list of entries to the list
+        /// </summary>
+        /// <param name="entries">The list, values will be the same as the display value</param>
+        /// <param name="rebuildVisualListAfter">If you intend to add more lists and want to defer visually updating, set to false</param>
+        public void AddEntries(List<string> entries, bool rebuildVisualListAfter = true)
+        {
+            for (int i = 0; i < entries.Count; i++) AddEntry(entries[i], null, false);
+            if (rebuildVisualListAfter) RebuildVisualList();
+        }
+
+        protected void RepairWidth()
+        {
+            foreach (var uie in entryElements)
+            {
+                foreach (UIElement uiec in uie.Value.Values)
+                {
+                    if (uiec is ToggleButton ||
+                        uiec is Button ||
+                        uiec is Grid)
+                    {
+                        uiec.Width = entryWidth;
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Toggle an option on the list
+        /// </summary>
+        /// <param name="value">What option to select</param>
+        /// <param name="toggleState">How to set the Toggle if it is found</param>
+        /// <param name="deselectOthers">if true, deselect others</param>
+        /// <param name="forceEntrySelectionAction">if true, call EntrySelectedAction with the value selected if found</param>
+        virtual public void Select(object value, ToggleState toggleState = ToggleState.Checked, bool deselectOthers = false, bool forceEntrySelectionAction = false)
+        {
+            foreach (var uie in entryElements)
+            {
+                foreach (UIElement uiec in uie.Value.Values)
+                {
+                    if (uiec is ToggleButton tb)
+                    {
+                        if (uie.Key.Equals(value))
+                        {
+                            tb.State = toggleState;
+                            if (forceEntrySelectionAction)
+                                EntrySelectedAction?.Invoke(value);
+                        }
+                        else if (deselectOthers)
+                        {
+                            tb.State = ToggleState.UnChecked;
+                        }
+                    } 
+                    else if (uie.Key.Equals(value))
+                    {
+                        if (forceEntrySelectionAction)
+                            EntrySelectedAction?.Invoke(value);
+                    }
+                }
+            }
+            AnyChangeAction?.Invoke();
+        }
+
+        virtual protected void SetInternalClickAction(ButtonBase uie, object value)
+        {
+            if (uie is ToggleButton tbn)
+            {
+                tbn.Click += delegate {
+                    if (tbn.State == ToggleState.UnChecked)
+                    {
+                        AnyChangeAction?.Invoke();
+                        return;
+                    }
+                    int alreadyChecked = GetSelectedCount();
+                    if (alreadyChecked == 2 && MaxCheckedAllowed == 1)
+                    {
+                        // effectively just change our choice
+                        ResetSelected(value);
+                        EntrySelectedAction?.Invoke(value);
+                    }
+                    else if (alreadyChecked > MaxCheckedAllowed)
+                    {
+                        // too many checked
+                        tbn.State = ToggleState.UnChecked;
+                    }
+                    else
+                    {
+                        // check made
+                        EntrySelectedAction?.Invoke(value);
+                    }
+                    AnyChangeAction?.Invoke();
+                };
+            }
+            else if (uie is Button bn)
+            {
+                bn.Click += delegate {
+                    EntrySelectedAction?.Invoke(value);
+                    AnyChangeAction?.Invoke();
+                };
+            }
+        }
+
+        /// <summary>
+        /// Add a specific entry to the list
+        /// </summary>
+        /// <param name="displayName">What string to display for the entry</param>
+        /// <param name="value">What is the underlying value of this entry, can't be duplicates</param>
+        /// <param name="rebuildVisualListAfter">If you intend to add more items and want to defer visually updating, set to false</param>
+        /// <returns></returns>
+        virtual public UIElement AddEntry(string displayName, object value = null, bool rebuildVisualListAfter = true)
+        {
+            if (value == null) value = displayName;
+            UIElement newEntry = template.InstantiateElement<UIElement>(templateName);
+            Dictionary<string, UIElement> allElements = newEntry.GatherUIDictionary<UIElement>();
+            foreach (UIElement uie in allElements.Values)
+            {
+                if (uie is TextBlock tb)
+                {
+                    tb.Text = displayName;
+                }
+                else if (uie is ButtonBase bb)
+                {
+                    if (FitEntriesToWidth) uie.Width = entryWidth;
+                    SetInternalClickAction(bb, value);
+                }
+                else if (uie is Grid g)
+                {
+                    if (FitEntriesToWidth) g.Width = entryWidth;
+                }
+            }
+            entryElements[value] = allElements;
+            if (rebuildVisualListAfter) RebuildVisualList();
+            return newEntry;
+        }
+
+        /// <summary>
+        /// Get a dictionary of all UIElements for an entry, keys will be names of UIElements
+        /// </summary>
+        public Dictionary<string, UIElement> GetEntry(object value)
+        {
+            if (entryElements.TryGetValue(value, out var uie)) return uie;
+            return null;
+        }
+
+        /// <summary>
+        /// Get the UIElement of type T in the entry of value.
+        /// </summary>
+        /// <typeparam name="T">Type of UIElement to look for (e.g. TextBlock)</typeparam>
+        /// <param name="value">Value of the entry to get the UIElement from</param>
+        /// <returns>UIElement of type T if found, null otherwise</returns>
+        public T GetEntryElement<T>(object value) where T : UIElement
+        {
+            if (entryElements.TryGetValue(value, out var uie))
+            {
+                foreach (var e in uie.Values)
+                    if (e is T eT) return eT;
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Removes an entry from the list
+        /// </summary>
+        /// <param name="value">value of entry to remove</param>
+        /// <param name="rebuildVisualList">If you intend to remove more items and want to defer visually updating, set to false</param>
+        /// <returns>true if successfully removed</returns>
+        virtual public bool RemoveEntry(object value, bool rebuildVisualList = true)
+        {
+            if (entryElements.Remove(value))
+            {
+                if (rebuildVisualList)
+                    RebuildVisualList();
+
+                return true;
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Clears the list
+        /// </summary>
+        virtual public void RemoveAllEntries(bool rebuildVisualList = true)
+        {
+            entryElements.Clear();
+            if (rebuildVisualList)
+                RebuildVisualList();
+        }
+
+        /// <summary>
+        /// Get list of entries added
+        /// </summary>
+        /// <param name="onlySelected">if true, only return ToggleButtons checked (or last button selected)</param>
+        /// <returns></returns>
+        virtual public List<object> GetEntries(bool onlySelected = false)
+        {
+            List<object> retList = new List<object>();
+            foreach (var uie in entryElements)
+            {
+                if (!onlySelected)
+                {
+                    retList.Add(uie.Key);
+                }
+                else
+                {
+                    foreach (UIElement uiec in uie.Value.Values)
+                    {
+                        if (uiec is ToggleButton tb && tb.State == ToggleState.Checked)
+                        {
+                            retList.Add(uie.Key);
+                            break;
+                        }
+                    }
+                }
+            }
+            return retList;
+        }
+
+        protected void AddToList(UIElement uie)
+        {
+            uie.Margin = new Thickness(0f, uie.Height * myGrid.Children.Count, 0f, 0f);
+            uie.SetPanelZIndex(myGrid.GetPanelZIndex() + 1);
+            myGrid.Children.Add(uie);
+        }
+
+        /// <summary>
+        /// Update the list visually with options
+        /// </summary>
+        virtual public void RebuildVisualList()
+        {
+            if (UpdateEntryWidth()) RepairWidth();
+            myGrid.Children.Clear();
+            if (AlphabeticalSort)
+            {
+                foreach (var uie in entryElements.OrderBy(i => GetDisplayName(i.Key)))
+                {
+                    AddToList(uie.Value[templateName]);
+                }
+            }
+            else
+            {
+                foreach (var uie in entryElements)
+                {
+                    AddToList(uie.Value[templateName]);
+                }
+            }
+            myGrid.Height = entryHeight * entryElements.Count;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.UI/LayoutingContext.cs b/sources/engine/Xenko.UI/LayoutingContext.cs
index 07d6438b17..19a156fb77 100644
--- a/sources/engine/Xenko.UI/LayoutingContext.cs
+++ b/sources/engine/Xenko.UI/LayoutingContext.cs
@@ -34,7 +34,7 @@ public class LayoutingContext : IEquatable<LayoutingContext>
         /// <returns><value>True</value> if the two contexts are equals</returns>
         public bool Equals(LayoutingContext other)
         {
-            return RealResolution.Equals(other.RealResolution) && VirtualResolution.Equals(other.VirtualResolution);
+            return RealResolution == other.RealResolution && RealVirtualResolutionRatio == other.RealVirtualResolutionRatio;
         }
     }
 }
diff --git a/sources/engine/Xenko.UI/Panels/Canvas.cs b/sources/engine/Xenko.UI/Panels/Canvas.cs
index 01c1561a2b..ac52e5463f 100644
--- a/sources/engine/Xenko.UI/Panels/Canvas.cs
+++ b/sources/engine/Xenko.UI/Panels/Canvas.cs
@@ -137,8 +137,9 @@ protected Vector3 ComputeAbsolutePinPosition(UIElement child, ref Vector3 parent
 
             for (var dim = 0; dim < 3; ++dim)
             {
-                if (float.IsNaN(absolutePosition[dim]) || !useAbsolutePosition && !float.IsNaN(relativePosition[dim]))
-                    absolutePosition[dim] = relativePosition[dim] == 0f ? 0f : relativePosition[dim] * parentSize[dim];
+                var relPos = relativePosition[dim];
+                if (float.IsNaN(absolutePosition[dim]) || !useAbsolutePosition && !float.IsNaN(relPos))
+                    absolutePosition[dim] = relPos == 0f ? 0f : relPos * parentSize[dim];
             }
 
             return absolutePosition;
diff --git a/sources/engine/Xenko.UI/Panels/Grid.cs b/sources/engine/Xenko.UI/Panels/Grid.cs
index da3dd3eb52..5300697c2d 100644
--- a/sources/engine/Xenko.UI/Panels/Grid.cs
+++ b/sources/engine/Xenko.UI/Panels/Grid.cs
@@ -284,9 +284,9 @@ protected override Vector3 MeasureOverride(Vector3 availableSizeWithoutMargins)
                 // reset the estimated size of the auto-sized strip calculated before.
                 InitializeStripDefinitionActualSize(definitions);
 
-                for (var index = 0; index < stripDefinitions[dim].Count; index++)
+                for (var index = 0; index < definitions.Count; index++)
                 {
-                    var currentDefinition = stripDefinitions[dim][index];
+                    var currentDefinition = definitions[index];
                     if (currentDefinition.Type != StripType.Auto) // we are interested only in auto-sized strip here
                         continue;
 
@@ -294,14 +294,15 @@ protected override Vector3 MeasureOverride(Vector3 availableSizeWithoutMargins)
                     foreach (var element in stripIndexToNoStarElements[dim][index])
                     {
                         var currentDefinitionIndex = 0; // the index of 'currentDefinition' in 'elementToStripDefinitions[dim][element]'
+                        var elementStripDefinitions = elementToStripDefinitions[dim][element];
 
                         // first determine the total space still needed for the element
                         var spaceAvailable = 0f;
-                        for (var i = 0; i < elementToStripDefinitions[dim][element].Count; i++)
+                        for (var i = 0; i < elementStripDefinitions.Count; i++)
                         {
-                            spaceAvailable += elementToStripDefinitions[dim][element][i].ActualSize;
+                            spaceAvailable += elementStripDefinitions[i].ActualSize;
 
-                            if (elementToStripDefinitions[dim][element][i] == currentDefinition)
+                            if (elementStripDefinitions[i] == currentDefinition)
                                 currentDefinitionIndex = i;
                         }
                         var spaceNeeded = Math.Max(0, element.DesiredSizeWithMargins[dim] - spaceAvailable);
@@ -311,9 +312,9 @@ protected override Vector3 MeasureOverride(Vector3 availableSizeWithoutMargins)
                             continue;
 
                         // look if the space needed can be found in next strip definitions
-                        for (var i = currentDefinitionIndex + 1; i < elementToStripDefinitions[dim][element].Count; i++)
+                        for (var i = currentDefinitionIndex + 1; i < elementStripDefinitions.Count; i++)
                         {
-                            var def = elementToStripDefinitions[dim][element][i];
+                            var def = elementStripDefinitions[i];
 
                             if (def.Type == StripType.Auto)
                                 spaceNeeded = Math.Max(0, spaceNeeded - (def.MaximumSize - def.ActualSize));
@@ -747,9 +748,16 @@ private static float SumStripAutoAndFixedSize(StripDefinitionCollection definiti
         {
             var sum = 0f;
             // ReSharper disable once LoopCanBeConvertedToQuery
-            foreach (var def in definitions) // do not use linq to avoid allocations
-                if (def.Type != StripType.Star)
-                    sum += def.ActualSize;
+            try
+            {
+                foreach (var def in definitions) // do not use linq to avoid allocations
+                    if (def.Type != StripType.Star)
+                        sum += def.ActualSize;
+            } 
+            catch(Exception e)
+            {
+                throw new InvalidOperationException("Grid measuring problem. Are you trying to render the same UIElement or Page 2+ times? More info: " + e.ToString());
+            }
 
             return sum;
         }
diff --git a/sources/engine/Xenko.UI/Panels/Panel.cs b/sources/engine/Xenko.UI/Panels/Panel.cs
index 1c8e238d64..1bf2007ed4 100644
--- a/sources/engine/Xenko.UI/Panels/Panel.cs
+++ b/sources/engine/Xenko.UI/Panels/Panel.cs
@@ -9,6 +9,8 @@
 using Xenko.Core.Annotations;
 using Xenko.Core.Collections;
 using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Rendering.UI;
 using Xenko.UI.Controls;
 
 namespace Xenko.UI.Panels
@@ -109,6 +111,50 @@ protected Panel()
             Children.CollectionChanged += LogicalChildrenChanged;
         }
 
+        /// <summary>
+        /// Safe and fast way to add a child UIElement
+        /// </summary>
+        /// <returns>true if child is already set or added</returns>
+        public bool AddChild(UIElement child)
+        {
+            if (child == null)
+                return false;
+
+            if (child.Parent != null)
+            {
+                if (child.Parent == this)
+                    return true;
+
+                if (child.Parent is Panel p)
+                    p.Children.Remove(child);
+                else
+                    throw new Exception(child.Name + " UIElement has non-Panel parent " + child.Parent.Name + " already. Can't move!");
+            }
+
+            Children.Add(child);
+
+            return true;
+        }
+
+        /// <summary>
+        /// Safe and quick removal of child
+        /// </summary>
+        /// <param name="child"></param>
+        /// <returns></returns>
+        public bool RemoveChild(UIElement child)
+        {
+            if (child == null)
+                return false;
+
+            if (child.Parent == this)
+            {
+                Children.Remove(child);
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Action to take when the Children collection is modified.
         /// </summary>
@@ -143,6 +189,9 @@ protected virtual void OnLogicalChildRemoved(UIElement oldElement, int index)
                 throw new UIInternalException("The parent of the removed children UIElement not null");
             SetParent(oldElement, null);
             SetVisualParent(oldElement, null);
+
+            if (oldElement.MouseOverState != MouseOverState.MouseOverNone)
+                MouseOverState = MouseOverState.MouseOverNone;
         }
 
         /// <summary>
@@ -208,5 +257,196 @@ public virtual Vector2 GetSurroudingAnchorDistances(Orientation direction, float
 
         [DataMemberIgnore]
         public ScrollViewer ScrollOwner { get; set; }
+
+        /// <summary>
+        /// Resizes ButtonBases in Grid/Panel to fit their interior contents
+        /// Uses ButtonBase.TrimToContent to do this
+        /// </summary>
+        /// <typeparam name="T">What type of UIElements do you want to resize?</typeparam>
+        /// <param name="XMargin">How much padding should the UIElements have left/right?</param>
+        /// <param name="YMargin">How much padding should the UIElements have up/down?</param>
+        public void ResizeButtons(float XMargin = 10f, float YMargin = 10f)
+        {
+            foreach (UIElement uie in Children)
+            {
+                if (uie is ButtonBase bb)
+                    bb.ResizeToChild(XMargin, YMargin);
+            }
+        }
+
+        /// <summary>
+        /// Sorting options used for OrganizeChildren
+        /// </summary>
+        public enum ORGANIZE_SORT_OPTIONS
+        {
+            NORMAL_SORT = 0,
+            REVERSE_SORT = 1,
+            NO_SORTING = 2
+        };
+
+        /// <summary>
+        /// Easy class for passing options to OrganizeChildren
+        /// </summary>
+        public class OrganizePanelSettings
+        {
+            public float XMargin = 10f, YMargin = 10f;
+            public List<Type> typesToCenter;
+            public ORGANIZE_SORT_OPTIONS sort_options = ORGANIZE_SORT_OPTIONS.NO_SORTING;
+            public Comparison<UIElement> sorter;
+            public HashSet<UIElement> newlineForThese, skipThese;
+            public bool resizeVertically, centerEverything;
+            public List<string> newlineForNames;
+        }
+
+        /// <summary>
+        /// An organization function that takes in a OrganizePanelSettings object. Handles easily organizing a menu system automatically based on provided options.
+        /// </summary>
+        /// <param name="settings">Settings to provide</param>
+        /// <param name="uiComponent">UIElement that this grid is on (can be helpful in resizing based on unusual resolutions/sizes of UIComponents)</param>
+        /// <returns></returns>
+        public Vector2 OrganizeChildren(OrganizePanelSettings settings, UIComponent uiComponent = null)
+        {
+            HashSet<UIElement> finalnewlines = settings.newlineForNames == null ? settings.newlineForThese : new HashSet<UIElement>();
+            if (settings.newlineForNames != null)
+            {
+                if (settings.newlineForThese != null)
+                    finalnewlines.UnionWith(settings.newlineForThese);
+
+                foreach(string s in settings.newlineForNames)
+                    if (FindName(s) is UIElement uie)
+                        finalnewlines.Add(uie);
+            }
+
+            return OrganizeChildren(settings.XMargin, settings.YMargin, settings.centerEverything ? new List<Type>() { typeof(UIElement) } : settings.typesToCenter,
+                                    settings.sort_options, settings.sorter, finalnewlines, uiComponent, settings.skipThese, settings.resizeVertically);
+        }
+
+        /// <summary>
+        /// Neatly and automatically organizes all UIElements within this Grid/Panel
+        /// </summary>
+        /// <param name="XMargin">How much left/right space to put between UIElements?</param>
+        /// <param name="YMargin">How much up/down space to put between UIElements?</param>
+        /// <param name="typesToCenter">What types should we center? Provide list with UIElement type included to center everything, null to center nothing</param>
+        /// <param name="sort_options">How should sorting UIElements work?</param>
+        /// <param name="sorter">Function to sort UIElements. Use null to default to sorting by UIElement's area</param>
+        /// <param name="newlineForThese">If the organizer comes across a UIelement in this list, start a newline for placing it</param>
+        /// <param name="uiComponent">Provide the uiComponent for better default resolution sizing/fitting, not required for default 1280x720 UI components</param>
+        /// <param name="skipThese">Don't organize these elements.</param>
+        /// <param name="resizeVertically">Resize the panel to fit all items? Defaults to false</param>
+        /// <returns>Returns a Vector2 of the TopLeft position after all UIElements have been placed</returns>
+        public Vector2 OrganizeChildren(float XMargin = 10f, float YMargin = 10f, List<Type> typesToCenter = null,
+                                        ORGANIZE_SORT_OPTIONS sort_options = ORGANIZE_SORT_OPTIONS.NORMAL_SORT,
+                                        Comparison<UIElement> sorter = null, HashSet<UIElement> newlineForThese = null, UIComponent uiComponent = null,
+                                        HashSet<UIElement> skipThese = null, bool resizeVertically = false)
+        {
+            var allChildren = new List<UIElement>(Children);
+
+            // clean children
+            for (int i = 0; i < allChildren.Count; i++)
+            {
+                var c = allChildren[i];
+                if (c.Visibility == Visibility.Collapsed ||
+                    skipThese != null && skipThese.Contains(c))
+                {
+                    allChildren.RemoveAt(i);
+                    i--;
+                    continue;
+                }
+            }
+
+            if (sort_options != ORGANIZE_SORT_OPTIONS.NO_SORTING)
+            {
+                // sort children by size
+                if (sorter == null)
+                {
+                    allChildren.Sort((a, b) =>
+                    {
+                        var asize = a.GetNoBullshitSize(uiComponent);
+                        var bsize = b.GetNoBullshitSize(uiComponent);
+
+                        float aarea = asize.X * asize.Y;
+                        float barea = bsize.X * bsize.Y;
+
+                        return aarea.CompareTo(barea);
+                    });
+                }
+                else
+                {
+                    allChildren.Sort(sorter);
+                }
+            }
+
+            int startPosition = sort_options == ORGANIZE_SORT_OPTIONS.REVERSE_SORT ? allChildren.Count - 1 : 0;
+            int dir = sort_options == ORGANIZE_SORT_OPTIONS.REVERSE_SORT ? -1 : 1;
+
+            float px = 0f, py = 0f;
+            float biggestY = 0f;
+
+            List<UIElement> elementsInLine = typesToCenter != null ? new List<UIElement>() : null;
+            bool centerThisLine = true, centerEverything = typesToCenter?.Contains(typeof(UIElement)) ?? false;
+
+            var mySize = GetNoBullshitSize(uiComponent);
+            for (int i = startPosition; i < allChildren.Count && i >= 0; i += dir)
+            {
+                var child = allChildren[i];
+                var csize = child.GetNoBullshitSize(uiComponent);
+
+                // go to next line?
+                if (px + csize.X > mySize.X || (newlineForThese?.Contains(child) ?? false))
+                {
+                    if (elementsInLine != null)
+                    {
+                        // center all of the last line?
+                        if (centerThisLine && elementsInLine.Count > 0)
+                            centerUIElements(elementsInLine, mySize.X, XMargin);
+
+                        elementsInLine.Clear();
+                        centerThisLine = true;
+                    }
+
+                    // reset
+                    px = 0f;
+                    py += biggestY + YMargin;
+                    biggestY = 0f;
+                }
+                
+                // should this be considered for centering?
+                if (elementsInLine != null)
+                {
+                    if (centerEverything || typesToCenter.Contains(child.GetType()))
+                        elementsInLine.Add(child);
+                    else
+                        centerThisLine = false;
+                }
+
+                child.LeftTopPosition = new Vector2(px, py);
+                if (csize.Y > biggestY) biggestY = csize.Y;
+                px += csize.X + XMargin;
+            }
+
+            // finalize any centering remaining
+            if (centerThisLine && (elementsInLine?.Count ?? 0) > 0)
+                centerUIElements(elementsInLine, mySize.X, XMargin);
+
+            float endY = py + biggestY;
+
+            if (resizeVertically) Height = endY;
+
+            return new Vector2(px, endY);
+        }
+
+        private void centerUIElements(List<UIElement> elements, float width, float XPadding)
+        {
+            // we know this list is coming in left to right already
+            float elements_width = (elements[elements.Count - 1].LeftTopPosition.X + elements[elements.Count - 1].GetNoBullshitSize().X) - elements[0].LeftTopPosition.X + (XPadding * (elements.Count - 1));
+            float place_x = width * 0.5f - elements_width * 0.5f;
+
+            for (int i = 0; i < elements.Count; i++)
+            {
+                UIElement element = elements[i];
+                element.LeftTopPosition = new Vector2(place_x, element.LeftTopPosition.Y);
+                place_x += XPadding + element.GetNoBullshitSize().X;
+            }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/Panels/StackPanel.cs b/sources/engine/Xenko.UI/Panels/StackPanel.cs
index e2efbb06fc..c4d8a8e3f6 100644
--- a/sources/engine/Xenko.UI/Panels/StackPanel.cs
+++ b/sources/engine/Xenko.UI/Panels/StackPanel.cs
@@ -677,8 +677,9 @@ private void UpdateAndArrangeVisibleChildren()
             {
                 currentSize += GetSafeChildSize(elementIndex, axis);
 
-                visibleChildren.Add(Children[elementIndex]);
-                SetVisualParent(Children[elementIndex], this);
+                var child = Children[elementIndex];
+                visibleChildren.Add(child);
+                SetVisualParent(child, this);
                 ++elementIndex;
             }
 
diff --git a/sources/engine/Xenko.UI/PulldownList.cs b/sources/engine/Xenko.UI/PulldownList.cs
new file mode 100644
index 0000000000..7ee020fb97
--- /dev/null
+++ b/sources/engine/Xenko.UI/PulldownList.cs
@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Input;
+using Xenko.UI.Controls;
+using Xenko.UI.Panels;
+
+namespace Xenko.UI
+{
+    public class PulldownList : GridList
+    {
+        /// <summary>
+        /// Is this pulldown list expanded and showing options?
+        /// </summary>
+        public bool CurrentlyExpanded
+        {
+            get
+            {
+                return _currentlyExpanded;
+            }
+            set
+            {
+                if (value != _currentlyExpanded)
+                {
+                    _currentlyExpanded = value;
+                    RebuildVisualList();
+                }
+            }
+        }
+
+        /// <summary>
+        /// How many options to display when expanded?
+        /// </summary>
+        public int OptionsToShow
+        {
+            get
+            {
+                return _optionsToShow;
+            }
+            set
+            {
+                _optionsToShow = value;
+                if (_optionsToShow < 1) _optionsToShow = 1;
+            }
+        }
+
+        /// <summary>
+        /// This can only be one
+        /// </summary>
+        public override int MaxCheckedAllowed
+        {
+            get => base.MaxCheckedAllowed;
+            set
+            {
+                base.MaxCheckedAllowed = 1;
+            }
+        }
+
+        private int _optionsToShow = 4;
+        private bool _currentlyExpanded = false;
+        private ScrollViewer scroll;
+        private System.EventHandler<Events.RoutedEventArgs> toggleChanger;
+        private Dictionary<object, string> storedOptions = new Dictionary<object, string>();
+        private UIElement pulldownIndicator;
+        private object currentSelection;
+
+        /// <summary>
+        /// Toggle an option on the list
+        /// </summary>
+        /// <param name="value">What option to select</param>
+        /// <param name="toggleState"></param>
+        /// <param name="deselectOthers">if true, deselect others</param>
+        /// <param name="triggerSelectedAction">if true, trigger the EntrySelectedAction for this value if found</param>
+        public override void Select(object value, ToggleState toggleState = ToggleState.Checked, bool deselectOthers = false, bool triggerSelectedAction = false)
+        {
+            if (toggleState == ToggleState.Checked) currentSelection = value;
+            base.Select(value, toggleState, deselectOthers, triggerSelectedAction);
+            RebuildVisualList();
+        }
+
+        /// <summary>
+        /// What is selected right now?
+        /// </summary>
+        /// <returns>Selected option, null otherwise</returns>
+        public override object GetSelection()
+        {
+            return currentSelection;
+        }
+
+        /// <summary>
+        /// Constructor for a pulldown list
+        /// </summary>
+        /// <param name="grid">Grid, which needs to be inside of a scrollviewer</param>
+        /// <param name="entryTemplate">What to use for entries in the list?</param>
+        /// <param name="pulldownIndicator">Optional UIElement that will be shown when not expanded, like a down arrow</param>
+        /// <param name="templateRootName">Name of the UIElement to clone when making list entries, can be null to determine automatically</param>
+        public PulldownList(Grid grid, UILibrary entryTemplate, UIElement pulldownIndicator = null, string templateRootName = null) : base(grid, entryTemplate, templateRootName)
+        {
+            toggleChanger = delegate
+            {
+                _currentlyExpanded = !_currentlyExpanded;
+                RebuildVisualList();
+            };
+            scroll = grid.Parent as ScrollViewer;
+            if (scroll == null) throw new ArgumentException("Grid needs a ScrollViewer as Parent");
+            scroll.ScrollMode = ScrollingMode.Vertical;
+            
+            myGrid.Height = entryHeight;
+            this.pulldownIndicator = pulldownIndicator;
+
+            listener = new ClickHandler();
+            listener.mouseOverCheck = this;
+
+            inputManager = ServiceRegistry.instance.GetService<InputManager>();
+        }
+
+        /// <summary>
+        /// Add an entry to the pulldown list
+        /// </summary>
+        /// <param name="displayName">What should be displayed for this entry?</param>
+        /// <param name="value">Is there an object to assign to this entry? If null, the name as a string will be used</param>
+        /// <param name="rebuildVisualListAfter">Rebuild the list visually now, or not?</param>
+        /// <returns>Returns the UIElement for the added entry</returns>
+        public override UIElement AddEntry(string displayName, object value = null, bool rebuildVisualListAfter = true)
+        {
+            if (currentSelection == null) currentSelection = value ?? displayName;
+            ButtonBase added = base.AddEntry(displayName, value, rebuildVisualListAfter) as ButtonBase;
+            added.Click -= toggleChanger;
+            added.Click += toggleChanger;
+            return added;
+        }
+
+        /// <summary>
+        /// Get all entries of the pulldown
+        /// </summary>
+        /// <param name="onlySelected">If true, returns a list of just the current selection</param>
+        /// <returns>List of entries</returns>
+        public override List<object> GetEntries(bool onlySelected = false)
+        {
+            if (onlySelected == false)
+                return base.GetEntries(onlySelected);
+
+            if (currentSelection == null)
+                return new List<object>();
+
+            return new List<object>() { currentSelection };
+        }
+
+        /// <summary>
+        /// How many are currently selected? Usually 1 with a pulldown
+        /// </summary>
+        public override int GetSelectedCount()
+        {
+            return currentSelection != null ? 1 : 0;
+        }
+
+        /// <summary>
+        /// Is the value currently selected?
+        /// </summary>
+        /// <param name="value">Value to check</param>
+        /// <returns>If it is the current selection, ToggleState.Checked is returned</returns>
+        public override ToggleState GetSelectedState(object value)
+        {
+            if (value == null) return ToggleState.Indeterminate;
+            return value.Equals(currentSelection) ? ToggleState.Checked : ToggleState.UnChecked;
+        }
+
+        /// <summary>
+        /// Clear the pulldown list
+        /// </summary>
+        /// <param name="rebuildVisualList">Visually rebuild it empty?</param>
+        public override void RemoveAllEntries(bool rebuildVisualList = true)
+        {
+            currentSelection = null;
+            base.RemoveAllEntries(rebuildVisualList);
+        }
+
+        /// <summary>
+        /// Remove a specific entry
+        /// </summary>
+        public override bool RemoveEntry(object value, bool rebuildVisualList = true)
+        {
+            if (value?.Equals(currentSelection) ?? false) ResetSelected();
+            return base.RemoveEntry(value, rebuildVisualList);
+        }
+
+        /// <summary>
+        /// Untoggle and toggle buttons and set default selection
+        /// </summary>
+        /// <param name="ignoreValue">Ignore the state of a certain value?</param>
+        public override void ResetSelected(object ignoreValue = null)
+        {
+            base.ResetSelected(ignoreValue);
+            currentSelection = null;
+            // just pick any selection
+            foreach (var pair in entryElements)
+            {
+                currentSelection = pair.Key;
+                break;
+            }
+        }
+
+        protected override void SetInternalClickAction(ButtonBase uie, object value)
+        {            
+            uie.Click += delegate {
+                if (_currentlyExpanded == false) return;
+                base.ResetSelected(value);
+                currentSelection = value;
+                EntrySelectedAction?.Invoke(value);
+                AnyChangeAction?.Invoke();
+            };
+        }
+
+        /// <summary>
+        /// Update the pulldown list visually with options
+        /// </summary>
+        override public void RebuildVisualList()
+        {
+            if (UpdateEntryWidth()) RepairWidth();
+            myGrid.Children.Clear();
+            foreach (var uie in entryElements.OrderBy(i => GetSelectedState(i.Key)))
+            {
+                AddToList(uie.Value[templateName]);
+            }
+            if (pulldownIndicator != null) pulldownIndicator.Visibility = _currentlyExpanded ? Visibility.Hidden : Visibility.Visible;
+            scroll.Height = _currentlyExpanded ? entryHeight * Math.Min(entryElements.Count, _optionsToShow + 0.5f) : entryHeight;
+            myGrid.Height = _currentlyExpanded ? entryHeight * entryElements.Count : entryHeight;
+
+            if (_currentlyExpanded)
+            {
+                inputManager.AddListener(listener);
+            }
+            else
+            {
+                inputManager.RemoveListener(listener);
+            }
+
+            // get a jumpstart on its rendersize, which is useful for determining what is now visible
+            scroll.RenderSize = new Vector3(scroll.RenderSize.X, scroll.Height, 1f);
+        }
+
+        private InputManager inputManager;
+        private ClickHandler listener;
+
+        private class ClickHandler : IInputEventListener<PointerEvent>
+        {
+            public PulldownList mouseOverCheck;
+
+            public void ProcessEvent(PointerEvent inputEvent)
+            {
+                if (inputEvent.EventType == PointerEventType.Pressed &&
+                    mouseOverCheck.scroll.MouseOverState == MouseOverState.MouseOverNone)
+                {
+                    mouseOverCheck.CurrentlyExpanded = false;
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultBorderRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultBorderRenderer.cs
index f32790466d..e8b4183fa9 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultBorderRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultBorderRenderer.cs
@@ -4,6 +4,7 @@
 
 using Xenko.Core;
 using Xenko.Core.Mathematics;
+using Xenko.Graphics;
 using Xenko.UI.Controls;
 
 namespace Xenko.UI.Renderers
@@ -18,9 +19,9 @@ public DefaultBorderRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             Vector3 offsets;
             Vector3 borderSize;
@@ -40,22 +41,22 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
             // left/front
             offsets = new Vector3(-elementHalfSize.X + elementHalfBorders.Left, 0, -elementHalfSize.Z + elementHalfBorders.Front);
             borderSize = new Vector3(borderThickness.Left, elementSize.Y, borderThickness.Front);
-            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
             
             // right/front
             offsets = new Vector3(elementHalfSize.X - elementHalfBorders.Right, 0, -elementHalfSize.Z + elementHalfBorders.Front);
             borderSize = new Vector3(borderThickness.Right, elementSize.Y, borderThickness.Front);
-            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
             
             // top/front
             offsets = new Vector3(0, -elementHalfSize.Y + elementHalfBorders.Top, -elementHalfSize.Z + elementHalfBorders.Front);
             borderSize = new Vector3(elementSize.X, borderThickness.Top, borderThickness.Front);
-            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
             
             // bottom/front
             offsets = new Vector3(0, elementHalfSize.Y - elementHalfBorders.Bottom, -elementHalfSize.Z + elementHalfBorders.Front);
             borderSize = new Vector3(elementSize.X, borderThickness.Bottom, borderThickness.Back);
-            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+            DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
 
             // if the element is 3D draw the extra borders
             if (element.ActualDepth > MathUtil.ZeroTolerance)
@@ -63,46 +64,46 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 // left/back
                 offsets = new Vector3(-elementHalfSize.X + elementHalfBorders.Left, 0, elementHalfSize.Z - elementHalfBorders.Back);
                 borderSize = new Vector3(borderThickness.Left, elementSize.Y, borderThickness.Back);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // right/back
                 offsets = new Vector3(elementHalfSize.X - elementHalfBorders.Right, 0, elementHalfSize.Z - elementHalfBorders.Back);
                 borderSize = new Vector3(borderThickness.Right, elementSize.Y, borderThickness.Back);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // top/back
                 offsets = new Vector3(0, -elementHalfSize.Y + elementHalfBorders.Top, elementHalfSize.Z - elementHalfBorders.Back);
                 borderSize = new Vector3(elementSize.X, borderThickness.Top, borderThickness.Back);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // bottom/back
                 offsets = new Vector3(0, elementHalfSize.Y - elementHalfBorders.Bottom, elementHalfSize.Z - elementHalfBorders.Back);
                 borderSize = new Vector3(elementSize.X, borderThickness.Bottom, borderThickness.Back);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // left/top
                 offsets = new Vector3(-elementHalfSize.X + elementHalfBorders.Left, -elementHalfSize.Y + elementHalfBorders.Top, 0);
                 borderSize = new Vector3(borderThickness.Left, borderThickness.Top, elementSize.Z);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // right/top
                 offsets = new Vector3(elementHalfSize.X - elementHalfBorders.Right, -elementHalfSize.Y + elementHalfBorders.Top, 0);
                 borderSize = new Vector3(borderThickness.Right, borderThickness.Top, elementSize.Z);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // left/bottom
                 offsets = new Vector3(-elementHalfSize.X + elementHalfBorders.Left, elementHalfSize.Y - elementHalfBorders.Bottom, 0);
                 borderSize = new Vector3(borderThickness.Left, borderThickness.Bottom, elementSize.Z);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
                 
                 // right/bottom
                 offsets = new Vector3(elementHalfSize.X - elementHalfBorders.Right, elementHalfSize.Y - elementHalfBorders.Bottom, 0);
                 borderSize = new Vector3(borderThickness.Right, borderThickness.Bottom, elementSize.Z);
-                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context);
+                DrawBorder(border, ref offsets, ref borderSize, ref borderColor, context, Batch);
             }
         }
 
-        private void DrawBorder(Border border, ref Vector3 offsets, ref Vector3 borderSize, ref Color borderColor, UIRenderingContext context)
+        private void DrawBorder(Border border, ref Vector3 offsets, ref Vector3 borderSize, ref Color borderColor, UIRenderingContext context, UIBatch Batch)
         {
             var worldMatrix = border.WorldMatrixInternal;
             worldMatrix.M41 += worldMatrix.M11 * offsets.X + worldMatrix.M21 * offsets.Y + worldMatrix.M31 * offsets.Z;
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultButtonRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultButtonRenderer.cs
index 76c402ee1f..0429196da7 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultButtonRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultButtonRenderer.cs
@@ -3,6 +3,7 @@
 
 using Xenko.Core;
 using Xenko.Core.Mathematics;
+using Xenko.Graphics;
 using Xenko.UI.Controls;
 
 namespace Xenko.UI.Renderers
@@ -17,16 +18,16 @@ public DefaultButtonRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var button = (Button)element;
             var sprite = button.ButtonImage;
             if (sprite?.Texture == null)
                 return;
 
-            var color = element.RenderOpacity * Color.White;
+            var color = new Color4(button.ButtonTint.R, button.ButtonTint.G, button.ButtonTint.B, button.RenderOpacity);
             Batch.DrawImage(sprite.Texture, ref element.WorldMatrixInternal, ref sprite.RegionInternal, ref element.RenderSizeInternal, ref sprite.BordersInternal, ref color, context.DepthBias, sprite.Orientation);
         }
     }
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultContentDecoratorRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultContentDecoratorRenderer.cs
index 1c9c274624..83750ccf1b 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultContentDecoratorRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultContentDecoratorRenderer.cs
@@ -3,6 +3,7 @@
 
 using Xenko.Core;
 using Xenko.Core.Mathematics;
+using Xenko.Graphics;
 using Xenko.UI.Controls;
 
 namespace Xenko.UI.Renderers
@@ -17,16 +18,16 @@ public DefaultContentDecoratorRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var decorator = (ContentDecorator)element;
             var sprite = decorator.BackgroundImage?.GetSprite();
             if (sprite?.Texture == null)
                 return;
 
-            var color = element.RenderOpacity * Color.White;
+            var color = new Color4(element.RenderOpacity);
             Batch.DrawImage(sprite.Texture, ref element.WorldMatrixInternal, ref sprite.RegionInternal, ref element.RenderSizeInternal, ref sprite.BordersInternal, ref color, context.DepthBias, sprite.Orientation);
         }
     }
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultEditTextRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultEditTextRenderer.cs
index 6fbd4dfac3..64eeab9e3f 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultEditTextRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultEditTextRenderer.cs
@@ -20,7 +20,7 @@ public DefaultEditTextRenderer(IServiceRegistry services)
         {
         }
 
-        private void RenderSelection(EditText editText, UIRenderingContext context, int start, int length, Color color, out float offsetTextStart, out float offsetAlignment, out float selectionSize)
+        private void RenderSelection(EditText editText, UIRenderingContext context, int start, int length, Color color, out float offsetTextStart, out float offsetAlignment, out float selectionSize, UIBatch Batch)
         {
             // calculate the size of the text region by removing padding
             var textRegionSize = new Vector2(editText.ActualWidth - editText.Padding.Left - editText.Padding.Right,
@@ -44,7 +44,7 @@ private void RenderSelection(EditText editText, UIRenderingContext context, int
             }
 
             var scaleRatio = editText.ActualTextSize / font.Size;
-            if (font.FontType == SpriteFontType.SDF)
+            if (font.FontType != SpriteFontType.Dynamic)
             {
                 offsetTextStart *= scaleRatio;
                 selectionSize *= scaleRatio;
@@ -58,21 +58,21 @@ private void RenderSelection(EditText editText, UIRenderingContext context, int
                 var textWidth = font.MeasureString(editText.TextToDisplay, ref fontSize).X;
                 if (font.FontType == SpriteFontType.Dynamic)
                     textWidth /= fontScale.X;
-                if (font.FontType == SpriteFontType.SDF)
-                    textWidth *= scaleRatio;
+                else textWidth *= scaleRatio;
 
                 offsetAlignment = editText.TextAlignment == TextAlignment.Center ? -textWidth / 2 : -textRegionSize.X / 2f + (textRegionSize.X - textWidth);
             }
 
             var selectionWorldMatrix = editText.WorldMatrixInternal;
-            selectionWorldMatrix.M41 += offsetTextStart + selectionSize / 2 + offsetAlignment;
+            selectionWorldMatrix.M42 += editText.TextOffset.Y;
+            selectionWorldMatrix.M41 += offsetTextStart + selectionSize / 2 + offsetAlignment + editText.TextOffset.X;
             var selectionScaleVector = new Vector3(selectionSize, editText.LineCount * lineSpacing, 0);
             Batch.DrawRectangle(ref selectionWorldMatrix, ref selectionScaleVector, ref color, context.DepthBias + 1);
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var editText = (EditText)element;
 
@@ -81,7 +81,7 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
             
             // determine the image to draw in background of the edit text
             var fontScale = element.LayoutingContext.RealVirtualResolutionRatio;
-            var color = editText.RenderOpacity * Color.White;
+            var color = new Color4(editText.RenderOpacity);
             var provider = editText.IsSelectionActive ? editText.ActiveImage : editText.MouseOverState == MouseOverState.MouseOverElement ? editText.MouseOverImage : editText.InactiveImage;
             var image = provider?.GetSprite();
 
@@ -105,13 +105,13 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
             if (editText.Composition.Length > 0)
             {
                 var imeSelectionColor = editText.RenderOpacity * editText.IMESelectionColor;
-                RenderSelection(editText, context, editText.SelectionStart, editText.Composition.Length, imeSelectionColor, out offsetTextStart, out offsetAlignment, out selectionSize);
+                RenderSelection(editText, context, editText.SelectionStart, editText.Composition.Length, imeSelectionColor, out offsetTextStart, out offsetAlignment, out selectionSize, Batch);
             }
             // Draw the regular selection
             else if (editText.IsSelectionActive)
             {
                 var selectionColor = editText.RenderOpacity * editText.SelectionColor;
-                RenderSelection(editText, context, editText.SelectionStart, editText.SelectionLength, selectionColor, out offsetTextStart, out offsetAlignment, out selectionSize);
+                RenderSelection(editText, context, editText.SelectionStart, editText.SelectionLength, selectionColor, out offsetTextStart, out offsetAlignment, out selectionSize, Batch);
             }
 
             // create the text draw command
@@ -134,6 +134,9 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 Batch.BeginCustom(context.GraphicsContext, 1);
             }
 
+            drawCommand.Matrix.M42 += editText.TextOffset.Y;
+            drawCommand.Matrix.M41 += editText.TextOffset.X;
+
             // Draw the text
             Batch.DrawString(font, editText.TextToDisplay, ref drawCommand);
 
@@ -147,13 +150,14 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
             if (editText.IsCaretVisible)
             {
                 var lineSpacing = editText.Font.GetTotalLineSpacing(editText.ActualTextSize);
-                if (editText.Font.FontType == SpriteFontType.SDF)
+                if (editText.Font.FontType != SpriteFontType.Dynamic)
                     lineSpacing *= editText.ActualTextSize / font.Size;
 
-                var sizeCaret = editText.CaretWidth / fontScale.X;
                 var caretWorldMatrix = element.WorldMatrixInternal;
-                caretWorldMatrix.M41 += offsetTextStart + offsetAlignment + (editText.CaretPosition > editText.SelectionStart? selectionSize: 0);
-                var caretScaleVector = new Vector3(sizeCaret, editText.LineCount * lineSpacing, 0);
+                var linespace = editText.LineCount * lineSpacing;
+                caretWorldMatrix.M42 += editText.TextOffset.Y + (1f - editText.CaretScale.Y) * linespace * 0.5f;
+                caretWorldMatrix.M41 += offsetTextStart + offsetAlignment + (editText.CaretPosition > editText.SelectionStart? selectionSize: 0) + editText.TextOffset.X;
+                var caretScaleVector = new Vector3(editText.CaretScale.X, editText.CaretScale.Y * linespace, 0f);
                 Batch.DrawRectangle(ref caretWorldMatrix, ref caretScaleVector, ref caretColor, context.DepthBias + 3);
             }
         }
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultImageRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultImageRenderer.cs
index d333f265db..024edfb2f7 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultImageRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultImageRenderer.cs
@@ -2,6 +2,8 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
 using Xenko.UI.Controls;
 
 namespace Xenko.UI.Renderers
@@ -16,16 +18,17 @@ public DefaultImageRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var image = (ImageElement)element;
             var sprite = image.Source?.GetSprite();
             if (sprite?.Texture == null)
                 return;
 
-            var color = element.RenderOpacity * image.Color;
+            float finalOpacity = element.RenderOpacity * image.Tint.A;
+            var color = new Color4(image.Tint.R * finalOpacity, image.Tint.G * finalOpacity, image.Tint.B * finalOpacity, finalOpacity);
             Batch.DrawImage(sprite.Texture, ref element.WorldMatrixInternal, ref sprite.RegionInternal, ref element.RenderSizeInternal, ref sprite.BordersInternal, ref color, context.DepthBias, sprite.Orientation);
         }
     }
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultModalElementRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultModalElementRenderer.cs
index da3a371110..0bd39c49b5 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultModalElementRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultModalElementRenderer.cs
@@ -22,7 +22,7 @@ public DefaultModalElementRenderer(IServiceRegistry services)
             noStencilNoDepth = new DepthStencilStateDescription(false, false);
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
             var modalElement = (ModalElement)element;
 
@@ -39,7 +39,7 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
 
             context.DepthBias += 1;
 
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
         }
 
         protected override void Destroy()
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultRenderersFactory.cs b/sources/engine/Xenko.UI/Renderers/DefaultRenderersFactory.cs
index 9a91a364e3..5e8fb3e0bf 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultRenderersFactory.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultRenderersFactory.cs
@@ -17,7 +17,7 @@ internal class DefaultRenderersFactory : IElementRendererFactory
         private readonly ElementRenderer defaultRenderer;
 
         private readonly Dictionary<Type, ElementRenderer> typeToRenderers = new Dictionary<Type, ElementRenderer>();
-        
+
         public DefaultRenderersFactory(IServiceRegistry services)
         {
             defaultRenderer = new ElementRenderer(services);
@@ -40,8 +40,8 @@ public ElementRenderer TryCreateRenderer(UIElement element)
             var currentType = element.GetType();
             while (currentType != null)
             {
-                if (typeToRenderers.ContainsKey(currentType))
-                    return typeToRenderers[currentType];
+                if (typeToRenderers.TryGetValue(currentType, out var renderer))
+                    return renderer;
 
                 currentType = currentType.GetTypeInfo().BaseType;
             }
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultScrollBarRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultScrollBarRenderer.cs
index c9a1ccd331..beee3e986c 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultScrollBarRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultScrollBarRenderer.cs
@@ -3,6 +3,7 @@
 using System;
 
 using Xenko.Core;
+using Xenko.Graphics;
 using Xenko.UI.Controls;
 
 namespace Xenko.UI.Renderers
@@ -17,9 +18,9 @@ public DefaultScrollBarRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
             
             var bar = (ScrollBar)element;
 
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultScrollingTextRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultScrollingTextRenderer.cs
index 390f2d3b3b..5ae3937f09 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultScrollingTextRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultScrollingTextRenderer.cs
@@ -20,9 +20,9 @@ public DefaultScrollingTextRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var scrollingText = (ScrollingText)element;
 
@@ -40,6 +40,8 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
             var drawCommand = new SpriteFont.InternalUIDrawCommand
             {
                 Color = scrollingText.RenderOpacity * scrollingText.TextColor,
+                VertAlignment = scrollingText.TextVerticalAlignment,
+                LineSpacingAdjustment = scrollingText.LineSpacingAdjustment,
                 DepthBias = context.DepthBias + 1,
                 RealVirtualResolutionRatio = element.LayoutingContext.RealVirtualResolutionRatio,
                 RequestedFontSize = scrollingText.ActualTextSize,
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultSliderRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultSliderRenderer.cs
index 4ac3041f92..5d7df655c7 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultSliderRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultSliderRenderer.cs
@@ -19,9 +19,9 @@ public DefaultSliderRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var slider = (Slider)element;
             if (slider.Orientation == Orientation.InDepth)
@@ -29,14 +29,12 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
 
             var axis = (int)slider.Orientation;
             var axisPrime = (axis + 1) % 2;
-            var color = slider.RenderOpacity * Color.White;
             var isGaugeReverted = axis == 1 ? !slider.IsDirectionReversed : slider.IsDirectionReversed; // we want the track going up from the bottom in vertical mode by default
             var sliderRatio = MathUtil.InverseLerp(slider.Minimum, slider.Maximum, slider.Value);
             var trackOffsets = new Vector2(slider.TrackStartingOffsets[axis], slider.TrackStartingOffsets[axisPrime]);
             var fullGaugeSize = slider.RenderSizeInternal[axis] - trackOffsets.X - trackOffsets.Y;
 
             var image = slider.TrackBackgroundImage?.GetSprite();
-            var trackIdealSize = image != null ? new Vector2?(image.SizeInPixels) : null;
             // draws the track background
             if (image?.Texture != null)
             {
@@ -44,7 +42,8 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 var imageOrientation = (ImageOrientation)(axis ^ imageAxis);
                 var worldMatrix = GetAdjustedWorldMatrix(ref slider.WorldMatrixInternal, (axis & imageAxis) == 1);
 
-                Batch.DrawImage(image.Texture, ref worldMatrix, ref image.RegionInternal, ref slider.RenderSizeInternal, ref image.BordersInternal, ref color, context.DepthBias, imageOrientation);
+                Color4 tbt = slider.TrackBackgroundTint.ToColor4() * slider.RenderOpacity;
+                Batch.DrawImage(image.Texture, ref worldMatrix, ref image.RegionInternal, ref slider.RenderSizeInternal, ref image.BordersInternal, ref tbt, context.DepthBias, imageOrientation);
                 context.DepthBias += 1;
             }
             
@@ -58,9 +57,7 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
 
                 var size = new Vector3();
                 size[axis] = sliderRatio * fullGaugeSize;
-                size[axisPrime] = image.SizeInPixels.Y;
-                if (trackIdealSize.HasValue)
-                    size[axisPrime] *= slider.RenderSizeInternal[axisPrime] / trackIdealSize.Value.Y;
+                size[axisPrime] = slider.TrackForegroundHeightScale * slider.RenderSizeInternal[axisPrime];
 
                 var worldMatrix = GetAdjustedWorldMatrix(ref slider.WorldMatrixInternal, shouldRotate180Degrees);
                 var halfSizeLeft = (slider.RenderSizeInternal[axis] - size[axis]) / 2;
@@ -87,7 +84,8 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 }
                 var region = new RectangleF(position.X, position.Y, newRegionSize.X, newRegionSize.Y);
 
-                Batch.DrawImage(image.Texture, ref worldMatrix, ref region, ref size, ref borders, ref color, context.DepthBias, imageOrientation);
+                Color4 tft = slider.TrackForegroundTint.ToColor4() * slider.RenderOpacity;
+                Batch.DrawImage(image.Texture, ref worldMatrix, ref region, ref size, ref borders, ref tft, context.DepthBias, imageOrientation);
                 context.DepthBias += 1;
             }
 
@@ -100,15 +98,11 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 var shouldRotate180Degrees = (axis & imageAxis) == 1;
 
                 var size = new Vector3();
-                size[axis] = image.SizeInPixels.X;
-                size[axisPrime] = image.SizeInPixels.Y;
-                if (trackIdealSize.HasValue)
-                    size[axisPrime] *= slider.RenderSizeInternal[axisPrime] / trackIdealSize.Value.Y;
+                size[axis] = slider.RenderSizeInternal[axis] * slider.TickWidthScale;
+                size[axisPrime] = slider.RenderSizeInternal[axisPrime] * slider.TickHeightScale;
 
                 var startOffset = new Vector2(GetAdjustedTranslation(slider.TickOffset, shouldRotate180Degrees));
                 startOffset[axis] = GetAdjustedTranslation(- fullGaugeSize / 2, shouldRotate180Degrees);
-                if (trackIdealSize.HasValue)
-                    startOffset[axisPrime] *= slider.RenderSizeInternal[axisPrime] / trackIdealSize.Value.Y;
                 
                 var stepOffset = GetAdjustedTranslation(fullGaugeSize / slider.TickFrequency, shouldRotate180Degrees);
 
@@ -116,10 +110,11 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 worldMatrix.M41 += startOffset[axis] * worldMatrix[(axis << 2) + 0] + startOffset[axisPrime] * worldMatrix[(axisPrime << 2) + 0];
                 worldMatrix.M42 += startOffset[axis] * worldMatrix[(axis << 2) + 1] + startOffset[axisPrime] * worldMatrix[(axisPrime << 2) + 1];
                 worldMatrix.M43 += startOffset[axis] * worldMatrix[(axis << 2) + 2] + startOffset[axisPrime] * worldMatrix[(axisPrime << 2) + 2];
-                
+
+                Color4 tclr = slider.TickTint.ToColor4() * slider.RenderOpacity;
                 for (var i = 0; i < slider.TickFrequency + 1; i++)
                 {
-                    Batch.DrawImage(image.Texture, ref worldMatrix, ref image.RegionInternal, ref size, ref image.BordersInternal, ref color, context.DepthBias, imageOrientation, SwizzleMode.None, true);
+                    Batch.DrawImage(image.Texture, ref worldMatrix, ref image.RegionInternal, ref size, ref image.BordersInternal, ref tclr, context.DepthBias, imageOrientation, SwizzleMode.None, true);
 
                     worldMatrix.M41 += stepOffset * worldMatrix[(axis << 2) + 0];
                     worldMatrix.M42 += stepOffset * worldMatrix[(axis << 2) + 1];
@@ -137,10 +132,8 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 var shouldRotate180Degrees = (axis & imageAxis) == 1;
                 
                 var size = new Vector3();
-                size[axis] = image.SizeInPixels.X;
-                size[axisPrime] = image.SizeInPixels.Y;
-                if (trackIdealSize.HasValue)
-                    size[axisPrime] *= slider.RenderSizeInternal[axisPrime] / trackIdealSize.Value.Y;
+                size[axis] = slider.RenderSizeInternal[axis] * slider.ThumbWidthScale;
+                size[axisPrime] = slider.RenderSizeInternal[axisPrime] * slider.ThumbHeightScale;
 
                 var revertedRatio = isGaugeReverted ? 1 - sliderRatio : sliderRatio;
                 var offset = GetAdjustedTranslation((revertedRatio - 0.5f) * fullGaugeSize, shouldRotate180Degrees);
@@ -149,7 +142,8 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 worldMatrix.M42 += offset * worldMatrix[(axis << 2) + 1];
                 worldMatrix.M43 += offset * worldMatrix[(axis << 2) + 2];
 
-                Batch.DrawImage(image.Texture, ref worldMatrix, ref image.RegionInternal, ref size, ref image.BordersInternal, ref color, context.DepthBias, imageOrientation);
+                Color4 tc = slider.ThumbTint.ToColor4() * slider.RenderOpacity;
+                Batch.DrawImage(image.Texture, ref worldMatrix, ref image.RegionInternal, ref size, ref image.BordersInternal, ref tc, context.DepthBias, imageOrientation);
 
                 context.DepthBias += 1;
             }
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultTextBlockRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultTextBlockRenderer.cs
index 1c88b8d55d..391291e11a 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultTextBlockRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultTextBlockRenderer.cs
@@ -18,17 +18,16 @@ public DefaultTextBlockRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var textBlock = (TextBlock)element;
 
-            if (textBlock.Font == null || textBlock.TextToDisplay == null)
+            if (textBlock.Font == null || (textBlock.TextToDisplay?.Length ?? 0) == 0)
                 return;
-            
-            var drawCommand = new SpriteFont.InternalUIDrawCommand
-            {
+
+            var drawCommand = new SpriteFont.InternalUIDrawCommand {
                 Color = textBlock.RenderOpacity * textBlock.TextColor,
                 DepthBias = context.DepthBias,
                 RealVirtualResolutionRatio = element.LayoutingContext.RealVirtualResolutionRatio,
@@ -37,7 +36,9 @@ public override void RenderColor(UIElement element, UIRenderingContext context)
                 SnapText = context.ShouldSnapText && !textBlock.DoNotSnapText,
                 Matrix = textBlock.WorldMatrixInternal,
                 Alignment = textBlock.TextAlignment,
-                TextBoxSize = new Vector2(textBlock.ActualWidth, textBlock.ActualHeight)
+                VertAlignment = textBlock.TextVerticalAlignment,
+                LineSpacingAdjustment = textBlock.LineSpacingAdjustment,
+                TextBoxSize = new Vector2(textBlock.ActualWidth, textBlock.ActualHeight),
             };
 
             if (textBlock.Font.FontType == SpriteFontType.SDF)
diff --git a/sources/engine/Xenko.UI/Renderers/DefaultToggleButtonRenderer.cs b/sources/engine/Xenko.UI/Renderers/DefaultToggleButtonRenderer.cs
index 303e721285..6257befa94 100644
--- a/sources/engine/Xenko.UI/Renderers/DefaultToggleButtonRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/DefaultToggleButtonRenderer.cs
@@ -20,16 +20,16 @@ public DefaultToggleButtonRenderer(IServiceRegistry services)
         {
         }
 
-        public override void RenderColor(UIElement element, UIRenderingContext context)
+        public override void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
-            base.RenderColor(element, context);
+            base.RenderColor(element, context, Batch);
 
             var toggleButton = (ToggleButton)element;
             var sprite = GetToggleStateImage(toggleButton);
             if (sprite?.Texture == null)
                 return;
             
-            var color = toggleButton.RenderOpacity * Color.White;
+            var color = new Color4(toggleButton.RenderOpacity);
             Batch.DrawImage(sprite.Texture, ref element.WorldMatrixInternal, ref sprite.RegionInternal, ref element.RenderSizeInternal, ref sprite.BordersInternal, ref color, context.DepthBias, sprite.Orientation);
         }
 
diff --git a/sources/engine/Xenko.UI/Renderers/ElementRenderer.cs b/sources/engine/Xenko.UI/Renderers/ElementRenderer.cs
index 1d40f00571..885599b702 100644
--- a/sources/engine/Xenko.UI/Renderers/ElementRenderer.cs
+++ b/sources/engine/Xenko.UI/Renderers/ElementRenderer.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System;
 using Xenko.Core;
 using Xenko.Core.Mathematics;
 using Xenko.Core.Serialization.Contents;
@@ -30,11 +31,6 @@ public class ElementRenderer : ComponentBase
         /// </summary>
         public GraphicsDevice GraphicsDevice => GraphicsDeviceService?.GraphicsDevice;
 
-        /// <summary>
-        /// Gets a reference to the UI image drawer.
-        /// </summary>
-        public UIBatch Batch => UI.Batch;
-
         /// <summary>
         /// A depth stencil state that keep the stencil value in any cases.
         /// </summary>
@@ -76,12 +72,15 @@ public ElementRenderer(IServiceRegistry services)
         /// <param name="context">The rendering context containing information how to draw the element.</param>
         /// <remarks>The render target, the depth stencil buffer and the depth stencil state are already correctly set when entering this function. 
         /// If the user wants to perform some intermediate rendering, it is his responsibility to bind them back correctly before the final rendering.</remarks>
-        public virtual void RenderColor(UIElement element, UIRenderingContext context)
+        public virtual void RenderColor(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
             var backgroundColor = element.RenderOpacity * element.BackgroundColor;
 
+            // pass the 3D matrix onto the element for picking
+            element.WorldMatrix3D = context.WorldMatrix3D;
+
             // optimization: don't draw the background if transparent
-            if (backgroundColor == new Color())
+            if (backgroundColor.A == (byte)0)
                 return;
 
             // Default implementation: render an back-face cube with background color
@@ -98,7 +97,7 @@ public virtual void RenderColor(UIElement element, UIRenderingContext context)
         /// <param name="context">The rendering context containing information how to draw the element.</param>
         /// <remarks>The render target, the depth stencil buffer and the depth stencil state are already correctly set when entering this function. 
         /// If the user wants to perform some intermediate rendering, it is his responsibility to bind them back correctly before the final rendering.</remarks>
-        public virtual void RenderClipping(UIElement element, UIRenderingContext context)
+        public virtual void RenderClipping(UIElement element, UIRenderingContext context, UIBatch Batch)
         {
             // Default implementation: render an back-face cube
             Batch.DrawBackground(ref element.WorldMatrixInternal, ref element.RenderSizeInternal, ref blackColor, context.DepthBias);
diff --git a/sources/engine/Xenko.UI/Renderers/RendererManager.cs b/sources/engine/Xenko.UI/Renderers/RendererManager.cs
index 2a5e614209..ad9b15bf78 100644
--- a/sources/engine/Xenko.UI/Renderers/RendererManager.cs
+++ b/sources/engine/Xenko.UI/Renderers/RendererManager.cs
@@ -20,7 +20,7 @@ public class RendererManager: IRendererManager, IDisposable
         // Note: use Id instead of element instance in order to avoid to keep dead UIelement alive.
         private readonly Dictionary<Guid, ElementRenderer> elementIdToRenderer = new Dictionary<Guid, ElementRenderer>();
 
-        /// <summary> 
+        /// <summary>
         /// Create a new instance of <see cref="RendererManager"/> with provided DefaultFactory
         /// </summary>
         /// <param name="defaultFactory"></param>
@@ -39,8 +39,8 @@ public ElementRenderer GetRenderer(UIElement element)
                 var currentType = element.GetType();
                 while (elementRenderer == null && currentType != null)
                 {
-                    if (typesToUserFactories.ContainsKey(currentType))
-                        elementRenderer = typesToUserFactories[currentType].TryCreateRenderer(element);
+                    if (typesToUserFactories.TryGetValue(currentType, out var rendererFactory))
+                        elementRenderer = rendererFactory.TryCreateRenderer(element);
 
                     currentType = currentType.GetTypeInfo().BaseType;
                 }
diff --git a/sources/engine/Xenko.UI/Renderers/UIRenderingContext.cs b/sources/engine/Xenko.UI/Renderers/UIRenderingContext.cs
index f3dcef8ad0..68d2933c69 100644
--- a/sources/engine/Xenko.UI/Renderers/UIRenderingContext.cs
+++ b/sources/engine/Xenko.UI/Renderers/UIRenderingContext.cs
@@ -5,6 +5,7 @@
 using Xenko.Core.Mathematics;
 using Xenko.Games;
 using Xenko.Graphics;
+using Xenko.Rendering.UI;
 
 namespace Xenko.UI.Renderers
 {
@@ -25,14 +26,9 @@ public class UIRenderingContext
         public GameTime Time { get; internal set; }
 
         /// <summary>
-        /// The final render target to draw to.
+        /// Set to use other values easily
         /// </summary>
-        public Texture RenderTarget { get; set; }
-
-        /// <summary>
-        /// The final depth stencil buffer to draw to.
-        /// </summary>
-        public Texture DepthStencilBuffer { get; set; }
+        public RenderUIElement RenderObject;
 
         /// <summary>
         /// The current reference value for the stencil test.
@@ -44,15 +40,10 @@ public class UIRenderingContext
         /// </summary>
         public int DepthBias { get; set; }
 
-        /// <summary>
-        /// Gets or sets the value indicating if UI text should be snapped.
-        /// </summary>
-        public bool ShouldSnapText { get; set; }
-
-        /// <summary>
-        /// Gets the  virtual resolution of the UI.
-        /// </summary>
-        public Vector3 Resolution;
+        public bool ShouldSnapText => RenderObject.SnapText;
+        public Vector3 Resolution => RenderObject.Resolution;
+        public Matrix WorldMatrix3D => RenderObject.WorldMatrix3D;
+        public bool IsFullscreen => RenderObject.IsFullScreen;
 
         /// <summary>
         /// Gets the view projection matrix of the UI.
diff --git a/sources/engine/Xenko.UI/Rendering/UI/RenderUIElement.cs b/sources/engine/Xenko.UI/Rendering/UI/RenderUIElement.cs
index cbdac1e908..4a46ada5a8 100644
--- a/sources/engine/Xenko.UI/Rendering/UI/RenderUIElement.cs
+++ b/sources/engine/Xenko.UI/Rendering/UI/RenderUIElement.cs
@@ -1,28 +1,46 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
 using Xenko.Core.Mathematics;
 using Xenko.Engine;
+using Xenko.Rendering.Sprites;
 using Xenko.UI;
 
 namespace Xenko.Rendering.UI
 {
+    public enum UIElementSampler
+    {
+        [Display("Point (Nearest)")]
+        PointClamp,
+
+        [Display("Linear")]
+        LinearClamp,
+
+        [Display("Anisotropic")]
+        AnisotropicClamp,
+    }
+
     public class RenderUIElement : RenderObject
     {
         public RenderUIElement()
         {
         }
 
-        public Matrix WorldMatrix;
+        public Matrix WorldMatrix, WorldMatrix3D;
 
         // UIComponent values
-        public UIPage Page;
-        public bool IsFullScreen;
-        public Vector3 Resolution;
-        public Vector3 Size;
-        public ResolutionStretch ResolutionStretch;
-        public bool IsBillboard;
-        public bool SnapText;
-        public bool IsFixedSize;
+        public UIComponent Component;
+
+        // stuff to get from the UIComponent
+        public UIPage Page => Component.Page;
+        public bool IsFullScreen => Component.IsFullScreen;
+        public Vector3 Resolution => Component.Resolution;
+        public ResolutionStretch ResolutionStretch => Component.ResolutionStretch;
+        public bool IsBillboard => Component.IsBillboard;
+        public bool SnapText => Component.SnapText;
+        public bool IsFixedSize => Component.IsFixedSize;
+        public RenderSprite.SpriteDepthMode depthMode => Component.DepthMode;
+        public UIElementSampler Sampler => Component.Sampler;
 
         /// <summary>
         /// Last registered position of teh mouse
diff --git a/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.Picking.cs b/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.Picking.cs
index c59f8b77ae..893ce64f95 100644
--- a/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.Picking.cs
+++ b/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.Picking.cs
@@ -15,11 +15,12 @@ namespace Xenko.Rendering.UI
     public partial class UIRenderFeature 
     {
         // object to avoid allocation at each element leave event
-        private readonly HashSet<UIElement> newlySelectedElementParents = new HashSet<UIElement>();
+        [ThreadStatic]
+        private static HashSet<UIElement> newlySelectedElementParents = new HashSet<UIElement>();
 
-        private readonly List<PointerEvent> compactedPointerEvents = new List<PointerEvent>();
+        internal static UIElement ForceMouseOver;
 
-        partial void PickingUpdate(RenderUIElement renderUIElement, Viewport viewport, ref Matrix worldViewProj, GameTime drawTime)
+        partial void PickingUpdate(RenderUIElement renderUIElement, Viewport viewport, ref Matrix worldViewProj, GameTime drawTime, List<PointerEvent> events)
         {
             if (renderUIElement.Page?.RootElement == null)
                 return;
@@ -27,24 +28,15 @@ partial void PickingUpdate(RenderUIElement renderUIElement, Viewport viewport, r
             var inverseZViewProj = worldViewProj;
             inverseZViewProj.Row3 = -inverseZViewProj.Row3;
 
-            UpdateMouseOver(ref viewport, ref inverseZViewProj, renderUIElement);
-            UpdateTouchEvents(ref viewport, ref inverseZViewProj, renderUIElement, drawTime);
-        }
-
-        partial void PickingClear()
-        {
-            // clear the list of compacted pointer events of time frame
-            ClearPointerEvents();
+            if (UpdateMouseOver(ref viewport, ref inverseZViewProj, renderUIElement, drawTime))
+            {
+                UpdateTouchEvents(ref viewport, ref inverseZViewProj, renderUIElement, drawTime, events);
+            }
         }
 
-        partial void PickingPrepare()
+        partial void PickingPrepare(List<PointerEvent> compactedPointerEvents)
         {
             // compact all the pointer events that happened since last frame to avoid performing useless hit tests.
-            CompactPointerEvents();
-        }
-
-        private void CompactPointerEvents()
-        {
             if (input == null) // no input for thumbnails
                 return;
 
@@ -70,11 +62,8 @@ private void CompactPointerEvents()
                     compactedPointerEvents.Add(compactedMoveEvent);
                 }
             }
-        }
 
-        private void ClearPointerEvents()
-        {
-            compactedPointerEvents.Clear();
+            return;
         }
 
         /// <summary>
@@ -84,7 +73,7 @@ private void ClearPointerEvents()
         /// <param name="screenPos">The click position on screen in normalized (0..1, 0..1) range</param>
         /// <param name="worldViewProj">The WorldViewProjection matrix with which the object was last rendered in the view</param>
         /// <returns></returns>
-        private Ray GetWorldRay(ref Viewport viewport, Vector2 screenPos, ref Matrix worldViewProj)
+        private Ray GetWorldRay(ref Vector3 resolution, ref Viewport viewport, Vector2 screenPos, ref Matrix worldViewProj)
         {
             var graphicsDevice = graphicsDeviceService?.GraphicsDevice;
             if (graphicsDevice == null)
@@ -114,39 +103,101 @@ private Ray GetWorldRay(ref Viewport viewport, Vector2 screenPos, ref Matrix wor
         /// <returns></returns>
         private bool GetTouchPosition(Vector3 resolution, ref Viewport viewport, ref Matrix worldViewProj, Vector2 screenPosition, out Ray uiRay)
         {
-            uiRay = new Ray(new Vector3(float.NegativeInfinity), new Vector3(0, 1, 0));
-
-            // TODO XK-3367 This only works for a single view
-
             // Get a touch ray in object (UI component) space
-            var touchRay = GetWorldRay(ref viewport, screenPosition, ref worldViewProj);
+            uiRay = GetWorldRay(ref resolution, ref viewport, screenPosition, ref worldViewProj);
 
             // If the click point is outside the canvas ignore any further testing
-            var dist = -touchRay.Position.Z / touchRay.Direction.Z;
-            if (Math.Abs(touchRay.Position.X + touchRay.Direction.X * dist) > resolution.X * 0.5f ||
-                Math.Abs(touchRay.Position.Y + touchRay.Direction.Y * dist) > resolution.Y * 0.5f)
+            var dist = -uiRay.Position.Z / uiRay.Direction.Z;
+            if (Math.Abs(uiRay.Position.X + uiRay.Direction.X * dist) > resolution.X * 0.5f ||
+                Math.Abs(uiRay.Position.Y + uiRay.Direction.Y * dist) > resolution.Y * 0.5f)
+            {
+                ForceMouseOver = null;
                 return false;
+            }
 
-            uiRay = touchRay;
             return true;
         }
 
-        private void UpdateTouchEvents(ref Viewport viewport, ref Matrix worldViewProj, RenderUIElement state, GameTime gameTime)
+        private void MakeTouchEvent(UIElement currentTouchedElement, UIElement lastTouchedElement, PointerEventType type, int ButtonId,
+                                    Vector2 screenPos, Vector2 screenTranslation, Vector3 worldPos, Vector3 worldTranslation, GameTime time)
+        {
+            var touchEvent = new TouchEventArgs
+            {
+                Action = TouchAction.Down,
+                Timestamp = time.Total,
+                ScreenPosition = screenPos,
+                ScreenTranslation = screenTranslation,
+                WorldPosition = worldPos,
+                WorldTranslation = worldTranslation,
+                ButtonId = ButtonId
+            };
+
+            switch (type)
+            {
+                case PointerEventType.Pressed:
+                    touchEvent.Action = TouchAction.Down;
+                    currentTouchedElement?.RaiseTouchDownEvent(touchEvent);
+                    break;
+
+                case PointerEventType.Released:
+                    touchEvent.Action = TouchAction.Up;
+
+                    // generate enter/leave events if we passed from an element to another without move events
+                    if (currentTouchedElement != lastTouchedElement)
+                        ThrowEnterAndLeaveTouchEvents(currentTouchedElement, lastTouchedElement, touchEvent);
+
+                    // trigger the up event
+                    currentTouchedElement?.RaiseTouchUpEvent(touchEvent);
+                    break;
+
+                case PointerEventType.Moved:
+                    touchEvent.Action = TouchAction.Move;
+
+                    // first notify the move event (even if the touched element changed in between it is still coherent in one of its parents)
+                    currentTouchedElement?.RaiseTouchMoveEvent(touchEvent);
+
+                    // then generate enter/leave events if we passed from an element to another
+                    if (currentTouchedElement != lastTouchedElement)
+                        ThrowEnterAndLeaveTouchEvents(currentTouchedElement, lastTouchedElement, touchEvent);
+                    break;
+
+                case PointerEventType.Canceled:
+                    touchEvent.Action = TouchAction.Move;
+
+                    // generate enter/leave events if we passed from an element to another without move events
+                    if (currentTouchedElement != lastTouchedElement)
+                        ThrowEnterAndLeaveTouchEvents(currentTouchedElement, lastTouchedElement, touchEvent);
+
+                    // then raise leave event to all the hierarchy of the previously selected element.
+                    var element = currentTouchedElement;
+                    while (element != null)
+                    {
+                        if (element.IsTouched)
+                            element.RaiseTouchLeaveEvent(touchEvent);
+                        element = element.VisualParent;
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
+            }
+        }
+
+        private void UpdateTouchEvents(ref Viewport viewport, ref Matrix worldViewProj, RenderUIElement state, GameTime gameTime, List<PointerEvent> compactedPointerEvents)
         {
             var rootElement = state.Page.RootElement;
             var intersectionPoint = Vector3.Zero;
             var lastTouchPosition = new Vector2(float.NegativeInfinity);
 
             // analyze pointer event input and trigger UI touch events depending on hit Tests
-            foreach (var pointerEvent in compactedPointerEvents)
+            for (int i=0; i<compactedPointerEvents.Count; i++)
             {
+                var pointerEvent = compactedPointerEvents[i];
+
                 // performance optimization: skip all the events that started outside of the UI
                 var lastTouchedElement = state.LastTouchedElement;
                 if (lastTouchedElement == null && pointerEvent.EventType != PointerEventType.Pressed)
                     continue;
 
-                var time = gameTime.Total;
-
                 var currentTouchPosition = pointerEvent.Position;
                 var currentTouchedElement = lastTouchedElement;
 
@@ -163,95 +214,160 @@ private void UpdateTouchEvents(ref Viewport viewport, ref Matrix worldViewProj,
                 if (pointerEvent.EventType == PointerEventType.Pressed || pointerEvent.EventType == PointerEventType.Released)
                     state.LastIntersectionPoint = intersectionPoint;
 
-                // TODO: add the pointer type to the event args?
-                var touchEvent = new TouchEventArgs
-                {
-                    Action = TouchAction.Down,
-                    Timestamp = time,
-                    ScreenPosition = currentTouchPosition,
-                    ScreenTranslation = pointerEvent.DeltaPosition,
-                    WorldPosition = intersectionPoint,
-                    WorldTranslation = intersectionPoint - state.LastIntersectionPoint
-                };
-
-                switch (pointerEvent.EventType)
-                {
-                    case PointerEventType.Pressed:
-                        touchEvent.Action = TouchAction.Down;
-                        currentTouchedElement?.RaiseTouchDownEvent(touchEvent);
-                        break;
-
-                    case PointerEventType.Released:
-                        touchEvent.Action = TouchAction.Up;
-
-                        // generate enter/leave events if we passed from an element to another without move events
-                        if (currentTouchedElement != lastTouchedElement)
-                            ThrowEnterAndLeaveTouchEvents(currentTouchedElement, lastTouchedElement, touchEvent);
+                MakeTouchEvent(currentTouchedElement, lastTouchedElement, pointerEvent.EventType, pointerEvent.PointerId,
+                               currentTouchPosition, pointerEvent.DeltaPosition, intersectionPoint,
+                               intersectionPoint - state.LastIntersectionPoint, gameTime);
 
-                        // trigger the up event
-                        currentTouchedElement?.RaiseTouchUpEvent(touchEvent);
-                        break;
+                lastTouchPosition = currentTouchPosition;
+                state.LastTouchedElement = currentTouchedElement;
+                state.LastIntersectionPoint = intersectionPoint;
+            }
+        }
 
-                    case PointerEventType.Moved:
-                        touchEvent.Action = TouchAction.Move;
+        /// <summary>
+        /// If a pointer is pointed at an UIElement, it will be set here
+        /// </summary>
+        [ThreadStatic]
+        private static UIElement UIElementUnderMouseCursor;
 
-                        // first notify the move event (even if the touched element changed in between it is still coherent in one of its parents)
-                        currentTouchedElement?.RaiseTouchMoveEvent(touchEvent);
+        private void copyLastUiComponentAverage(RenderUIElement root)
+        {
+            if ((root.Component.AveragedPositions?.Length ?? 0) > 1)
+            {
+                // copy last entry
+                Vector2 lastEntry = root.Component.AveragedPositions[root.Component.AveragePositionIndex];
+                root.Component.AveragePositionIndex = (root.Component.AveragePositionIndex + 1) % root.Component.AveragedPositions.Length;
+                root.Component.AveragedPositions[root.Component.AveragePositionIndex] = lastEntry;
+            }
+        }
 
-                        // then generate enter/leave events if we passed from an element to another
-                        if (currentTouchedElement != lastTouchedElement)
-                            ThrowEnterAndLeaveTouchEvents(currentTouchedElement, lastTouchedElement, touchEvent);
-                        break;
+        private void TrackUIPointer(ref Ray r, RenderUIElement root, bool nonui)
+        {
+            if (root.Component.AlwaysTrackPointer == false)
+                return;
 
-                    case PointerEventType.Canceled:
-                        touchEvent.Action = TouchAction.Move;
+            UIElement rootElement = root.Page.RootElement;
 
-                        // generate enter/leave events if we passed from an element to another without move events
-                        if (currentTouchedElement != lastTouchedElement)
-                            ThrowEnterAndLeaveTouchEvents(currentTouchedElement, lastTouchedElement, touchEvent);
+            if (rootElement.Intersects(ref r, out var intersectionPoint, nonui, root.Component.TrackedCanvasScale))
+            {
+                Vector2 pos;
 
-                        // then raise leave event to all the hierarchy of the previously selected element.
-                        var element = currentTouchedElement;
-                        while (element != null)
-                        {
-                            if (element.IsTouched)
-                                element.RaiseTouchLeaveEvent(touchEvent);
-                            element = element.VisualParent;
-                        }
-                        break;
-                    default:
-                        throw new ArgumentOutOfRangeException();
+                if (nonui)
+                {
+                    root.WorldMatrix3D.Decompose(out Vector3 scale, out Matrix rotation, out Vector3 translation);
+                    Vector3 pos3d = intersectionPoint - translation;
+                    rotation.Invert();
+                    pos = Vector3.Transform(pos3d, rotation).XY() / scale.XY();
+                    pos.Y = root.Resolution.Y * 0.5f - pos.Y;
+                } 
+                else
+                {
+                    pos = intersectionPoint.XY();
+                    pos.Y += root.Resolution.Y * 0.5f;
                 }
+                pos.X += root.Resolution.X * 0.5f;
+                pos.X -= rootElement.RenderOffsets.X;
+                pos.Y -= rootElement.RenderOffsets.Y;
 
-                lastTouchPosition = currentTouchPosition;
-                state.LastTouchedElement = currentTouchedElement;
-                state.LastIntersectionPoint = intersectionPoint;
+                root.Component.AveragePositionIndex = (root.Component.AveragePositionIndex + 1) % root.Component.AveragedPositions.Length;
+                root.Component.AveragedPositions[root.Component.AveragePositionIndex] = pos;
             }
+            else copyLastUiComponentAverage(root);
         }
 
-        private void UpdateMouseOver(ref Viewport viewport, ref Matrix worldViewProj, RenderUIElement state)
+        private bool UpdateMouseOver(ref Viewport viewport, ref Matrix worldViewProj, RenderUIElement state, GameTime time)
         {
-            if (input == null || !input.HasMouse)
-                return;
+            bool VRcontrollerUsed = VirtualReality.VRDeviceSystem.VRActive && (TransformComponent.LastLeftHandTracked != null || TransformComponent.LastRightHandTracked != null);
+
+            if (input == null || !input.HasMouse && VRcontrollerUsed == false || VRcontrollerUsed && state.Source is UIComponent uicomp && uicomp.IsFullScreen)
+                return false;
 
             var intersectionPoint = Vector3.Zero;
-            var mousePosition = input.MousePosition;
             var rootElement = state.Page.RootElement;
             var lastMouseOverElement = state.LastMouseOverElement;
-            var mouseOverElement = lastMouseOverElement;
+            UIElementUnderMouseCursor = lastMouseOverElement;
 
-            // determine currently overred element.
-            if (mousePosition != state.LastMousePosition)
+            if (VRcontrollerUsed)
             {
-                Ray uiRay;
-                if (!GetTouchPosition(state.Resolution, ref viewport, ref worldViewProj, mousePosition, out uiRay))
-                    return;
+                for (int i=0; i<2; i++)
+                {
+                    int swappedIndex = VirtualReality.VRDeviceSystem.GetSystem.SwapControllerHands ? (i ^ 1) : i;
+                    TransformComponent useHand = swappedIndex == 0 ?
+                                                    (TransformComponent.OverrideRightHandUIPointer ?? TransformComponent.LastRightHandTracked) :
+                                                    (TransformComponent.OverrideLeftHandUIPointer ?? TransformComponent.LastLeftHandTracked);
+
+                    if (useHand != null)
+                    {
+                        Ray uiRay = new Ray(useHand.WorldPosition(), useHand.Forward(true));
+                        
+                        if ((swappedIndex ^ 1) == (int)VirtualReality.VRDeviceSystem.UITrackingHand)
+                            TrackUIPointer(ref uiRay, state, true);
+                        
+                        UIElementUnderMouseCursor = GetElementAtWorldPosition(rootElement, ref uiRay, ref worldViewProj, ref intersectionPoint);
+                        if (UIElementUnderMouseCursor != null)
+                        {
+                            // is this a forced element from another uicomponent?
+                            if (ForceMouseOver == UIElementUnderMouseCursor && state.Source is UIComponent uic &&
+                                uic.Page?.RootElement?.VisualChildren is UIElementCollection coll &&
+                                coll.Contains(ForceMouseOver) == false) continue;
+
+                            // wait, are we selecting this element?
+                            VirtualReality.TouchController tc = VirtualReality.VRDeviceSystem.GetSystem.GetController(swappedIndex == 0 ? VirtualReality.TouchControllerHand.Right : VirtualReality.TouchControllerHand.Left);
+
+                            if (tc != null)
+                            {
+                                // adjust intersection point into local UI space from world space
+                                intersectionPoint = (intersectionPoint - UIElementUnderMouseCursor.WorldMatrix3D.TranslationVector) / state.WorldMatrix3D.ScaleVector;
+
+                                // check the first button
+                                if (tc.IsTouchedDown(VirtualReality.VRDeviceSystem.UIActivationButton) || tc.IsPressedDown(VirtualReality.VRDeviceSystem.UIActivationButton))
+                                    MakeTouchEvent(UIElementUnderMouseCursor, lastMouseOverElement, PointerEventType.Pressed, 0, Vector2.Zero, Vector2.Zero, intersectionPoint, Vector3.Zero, time);
+                                else if (tc.IsTouchReleased(VirtualReality.VRDeviceSystem.UIActivationButton) || tc.IsPressReleased(VirtualReality.VRDeviceSystem.UIActivationButton))
+                                    MakeTouchEvent(UIElementUnderMouseCursor, lastMouseOverElement, PointerEventType.Released, 0, Vector2.Zero, Vector2.Zero, intersectionPoint, Vector3.Zero, time);
+                                else if (tc.IsTouched(VirtualReality.VRDeviceSystem.UIActivationButton) || tc.IsPressed(VirtualReality.VRDeviceSystem.UIActivationButton))
+                                    MakeTouchEvent(UIElementUnderMouseCursor, lastMouseOverElement, PointerEventType.Moved, 0, Vector2.Zero, Vector2.Zero, intersectionPoint, state.LastIntersectionPoint - intersectionPoint, time);
+
+                                // check the second button
+                                else if (VirtualReality.VRDeviceSystem.UIActivationButton2.HasValue)
+                                {
+                                    var button = VirtualReality.VRDeviceSystem.UIActivationButton2.Value;
+
+                                    if (tc.IsTouchedDown(button) || tc.IsPressedDown(button))
+                                        MakeTouchEvent(UIElementUnderMouseCursor, lastMouseOverElement, PointerEventType.Pressed, 2, Vector2.Zero, Vector2.Zero, intersectionPoint, Vector3.Zero, time);
+                                    else if (tc.IsTouchReleased(button) || tc.IsPressReleased(button))
+                                        MakeTouchEvent(UIElementUnderMouseCursor, lastMouseOverElement, PointerEventType.Released, 2, Vector2.Zero, Vector2.Zero, intersectionPoint, Vector3.Zero, time);
+                                    else if (tc.IsTouched(button) || tc.IsPressed(button))
+                                        MakeTouchEvent(UIElementUnderMouseCursor, lastMouseOverElement, PointerEventType.Moved, 2, Vector2.Zero, Vector2.Zero, intersectionPoint, state.LastIntersectionPoint - intersectionPoint, time);
+                                }
+
+                                state.LastIntersectionPoint = intersectionPoint;
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            else 
+            {
+                var mousePosition = input.MousePosition;
 
-                mouseOverElement = GetElementAtScreenPosition(rootElement, ref uiRay, ref worldViewProj, ref intersectionPoint);
+                // determine currently overred element.
+                if (mousePosition != state.LastMousePosition)
+                {
+                    state.LastMousePosition = mousePosition;
+                    // check if we touch anything of importance
+                    bool hitElement = GetTouchPosition(state.Resolution, ref viewport, ref worldViewProj, mousePosition, out Ray uiRay);
+                    // update tracked position on canvas, if this is enabled
+                    TrackUIPointer(ref uiRay, state, false);
+                    // bail out early if we didn't touch anything
+                    if (!hitElement) return true;
+                    UIElementUnderMouseCursor = GetElementAtScreenPosition(rootElement, ref uiRay, ref worldViewProj, ref intersectionPoint);
+                }
+                else copyLastUiComponentAverage(state);
             }
 
             // find the common parent between current and last overred elements
-            var commonElement = FindCommonParent(mouseOverElement, lastMouseOverElement);
+            var commonElement = FindCommonParent(UIElementUnderMouseCursor, lastMouseOverElement);
 
             // disable mouse over state to previously overred hierarchy
             var parent = lastMouseOverElement;
@@ -262,13 +378,12 @@ private void UpdateMouseOver(ref Viewport viewport, ref Matrix worldViewProj, Re
             }
 
             // enable mouse over state to currently overred hierarchy
-            if (mouseOverElement != null)
+            if (UIElementUnderMouseCursor != null)
             {
                 // the element itself
-                mouseOverElement.MouseOverState = MouseOverState.MouseOverElement;
-
+                UIElementUnderMouseCursor.MouseOverState = MouseOverState.MouseOverElement;
                 // its hierarchy
-                parent = mouseOverElement.VisualParent;
+                parent = UIElementUnderMouseCursor.VisualParent;
                 while (parent != null)
                 {
                     if (parent.IsHierarchyEnabled)
@@ -277,16 +392,19 @@ private void UpdateMouseOver(ref Viewport viewport, ref Matrix worldViewProj, Re
                     parent = parent.VisualParent;
                 }
             }
-
             // update cached values
-            state.LastMouseOverElement = mouseOverElement;
-            state.LastMousePosition = mousePosition;
+            state.LastMouseOverElement = UIElementUnderMouseCursor;
+            return !VRcontrollerUsed;
         }
 
         private UIElement FindCommonParent(UIElement element1, UIElement element2)
         {
             // build the list of the parents of the newly selected element
-            newlySelectedElementParents.Clear();
+            if (newlySelectedElementParents == null)
+                newlySelectedElementParents = new HashSet<UIElement>();
+            else 
+                newlySelectedElementParents.Clear();
+            
             var newElementParent = element1;
             while (newElementParent != null)
             {
@@ -344,9 +462,27 @@ public static UIElement GetElementAtScreenPosition(UIElement rootElement, ref Ra
             UIElement clickedElement = null;
             var smallestDepth = float.PositiveInfinity;
             var highestDepthBias = -1.0f;
-            PerformRecursiveHitTest(rootElement, ref clickRay, ref worldViewProj, ref clickedElement, ref intersectionPoint, ref smallestDepth, ref highestDepthBias);
+            PerformRecursiveHitTest(rootElement, ref clickRay, ref worldViewProj, ref clickedElement, ref intersectionPoint, ref smallestDepth, ref highestDepthBias, false);
+
+            return ForceMouseOver ?? clickedElement;
+        }
+
+        /// <summary>
+        /// Gets the element with which the world Ray intersects, or null if none is found
+        /// </summary>
+        /// <param name="rootElement">The root <see cref="UIElement"/> from which it should test</param>
+        /// <param name="clickRay"><see cref="Ray"/> from the click in world space of the ui component</param>
+        /// <param name="worldViewProj"></param>
+        /// <param name="intersectionPoint">Intersection point between the ray and the element</param>
+        /// <returns>The <see cref="UIElement"/> with which the ray intersects</returns>
+        public static UIElement GetElementAtWorldPosition(UIElement rootElement, ref Ray clickRay, ref Matrix worldViewProj, ref Vector3 intersectionPoint)
+        {
+            UIElement clickedElement = null;
+            var smallestDepth = float.PositiveInfinity;
+            var highestDepthBias = -1.0f;
+            PerformRecursiveHitTest(rootElement, ref clickRay, ref worldViewProj, ref clickedElement, ref intersectionPoint, ref smallestDepth, ref highestDepthBias, true);
 
-            return clickedElement;
+            return ForceMouseOver ?? clickedElement;
         }
 
         /// <summary>
@@ -363,32 +499,32 @@ public static ICollection<HitTestResult> GetElementsAtPosition(UIElement rootEle
             return results;
         }
         
-        private static void PerformRecursiveHitTest(UIElement element, ref Ray ray, ref Matrix worldViewProj, ref UIElement hitElement, ref Vector3 intersectionPoint, ref float smallestDepth, ref float highestDepthBias)
+        private static void PerformRecursiveHitTest(UIElement element, ref Ray ray, ref Matrix worldViewProj, ref UIElement hitElement, ref Vector3 intersectionPoint, ref float smallestDepth, ref float highestDepthBias, bool nonUISpace)
         {
             // if the element is not visible, we also remove all its children
             if (!element.IsVisible)
                 return;
 
-            var canBeHit = element.CanBeHitByUser;
+            var canBeHit = element.CanBeHitByUser || ForceMouseOver != null;
             if (canBeHit || element.ClipToBounds)
             {
                 Vector3 intersection;
-                var intersect = element.Intersects(ref ray, out intersection);
+                var intersect = element.Intersects(ref ray, out intersection, nonUISpace);
 
                 // don't perform the hit test on children if clipped and parent no hit
                 if (element.ClipToBounds && !intersect)
                     return;
 
-                // Calculate the depth of the element with the depth bias so that hit test corresponds to visuals.
-                Vector4 projectedIntersection;
-                var intersection4 = new Vector4(intersection, 1);
-                Vector4.Transform(ref intersection4, ref worldViewProj, out projectedIntersection);
-                var depth = projectedIntersection.Z/projectedIntersection.W;
-
-                // update the closest element hit
                 if (canBeHit && intersect)
                 {
-                    if (depth < smallestDepth || (depth == smallestDepth && element.DepthBias > highestDepthBias))
+                    // Calculate the depth of the element with the depth bias so that hit test corresponds to visuals.
+                    Vector4 projectedIntersection;
+                    var intersection4 = new Vector4(intersection, 1);
+                    Vector4.Transform(ref intersection4, ref worldViewProj, out projectedIntersection);
+                    var depth = projectedIntersection.Z / projectedIntersection.W;
+
+                    // update the closest element hit
+                    if (depth < smallestDepth || (element.DepthBias > highestDepthBias && Math.Abs(depth - smallestDepth) < 0.00001f))
                     {
                         smallestDepth = depth;
                         highestDepthBias = element.DepthBias;
@@ -396,11 +532,19 @@ private static void PerformRecursiveHitTest(UIElement element, ref Ray ray, ref
                         hitElement = element;
                     }
                 }
+
+                if (ForceMouseOver != null)
+                {
+                    // clear if we didn't hit anything at all
+                    if (!intersect) ForceMouseOver = null;
+                    // return as we only check against root when forcing a uielement (e.g. slider we are moving)
+                    return;
+                }
             }
 
             // test the children
             foreach (var child in element.HitableChildren)
-                PerformRecursiveHitTest(child, ref ray, ref worldViewProj, ref hitElement, ref intersectionPoint, ref smallestDepth, ref highestDepthBias);
+                PerformRecursiveHitTest(child, ref ray, ref worldViewProj, ref hitElement, ref intersectionPoint, ref smallestDepth, ref highestDepthBias, nonUISpace);
         }
 
         private static void PerformRecursiveHitTest(UIElement element, ref Ray ray, ref Matrix worldViewProj, ICollection<HitTestResult> results)
@@ -413,7 +557,7 @@ private static void PerformRecursiveHitTest(UIElement element, ref Ray ray, ref
             if (canBeHit || element.ClipToBounds)
             {
                 Vector3 intersection;
-                var intersect = element.Intersects(ref ray, out intersection);
+                var intersect = element.Intersects(ref ray, out intersection, false);
 
                 // don't perform the hit test on children if clipped and parent no hit
                 if (element.ClipToBounds && !intersect)
diff --git a/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.cs b/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.cs
index 7aeaef59b3..2ace2bba30 100644
--- a/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.cs
+++ b/sources/engine/Xenko.UI/Rendering/UI/UIRenderFeature.cs
@@ -2,10 +2,12 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using Xenko.Core;
 using Xenko.Core.Diagnostics;
 using Xenko.Core.Mathematics;
+using Xenko.Core.Threading;
 using Xenko.Engine;
 using Xenko.Games;
 using Xenko.Graphics;
@@ -24,15 +26,7 @@ public partial class UIRenderFeature : RootRenderFeature
 
         private RendererManager rendererManager;
 
-        private readonly UIRenderingContext renderingContext = new UIRenderingContext();
-
-        private UIBatch batch;
-
-        private readonly object drawLock = new object();
-
-        private readonly LayoutingContext layoutingContext = new LayoutingContext();
-
-        private readonly List<UIElementState> uiElementStates = new List<UIElementState>();
+        private static ConcurrentQueue<UIBatch> batches = new ConcurrentQueue<UIBatch>();
 
         public override Type SupportedRenderObjectType => typeof(RenderUIElement);
 
@@ -56,124 +50,47 @@ protected override void InitializeCore()
 
             rendererManager = new RendererManager(new DefaultRenderersFactory(RenderSystem.Services));
 
-            batch = uiSystem.Batch;
-        }
 
-        partial void PickingPrepare();
+        }
 
-        partial void PickingUpdate(RenderUIElement renderUIElement, Viewport viewport, ref Matrix worldViewProj, GameTime drawTime);
+        partial void PickingPrepare(List<PointerEvent> compactedPointerEvents);
 
-        partial void PickingClear();
+        partial void PickingUpdate(RenderUIElement renderUIElement, Viewport viewport, ref Matrix worldViewProj, GameTime drawTime, List<PointerEvent> compactedPointerEvents);
 
         public override void Draw(RenderDrawContext context, RenderView renderView, RenderViewStage renderViewStage, int startIndex, int endIndex)
         {
-            lock (drawLock)
+            using (context.PushRenderTargetsAndRestore())
             {
-                using (context.PushRenderTargetsAndRestore())
-                {
-                    DrawInternal(context, renderView, renderViewStage, startIndex, endIndex);
-                }
+                DrawInternal(context, renderView, renderViewStage, startIndex, endIndex);
             }
         }
 
-        private void DrawInternal(RenderDrawContext context, RenderView renderView, RenderViewStage renderViewStage, int startIndex, int endIndex)
-        {
-            base.Draw(context, renderView, renderViewStage, startIndex, endIndex);
-
-            var uiProcessor = SceneInstance.GetCurrent(context.RenderContext).GetProcessor<UIRenderProcessor>();
-            if (uiProcessor == null)
-                return;
-
-
-            // build the list of the UI elements to render
-            uiElementStates.Clear();
-            for (var index = startIndex; index < endIndex; index++)
-            {
-                var renderNodeReference = renderViewStage.SortedRenderNodes[index].RenderNode;
-                var renderNode = GetRenderNode(renderNodeReference);
-                var renderElement = (RenderUIElement)renderNode.RenderObject;
+        private object drawLocker = new object(), pickingLocker = new object();
 
-                uiElementStates.Add(new UIElementState(renderElement));
-            }
-
-            // evaluate the current draw time (game instance is null for thumbnails)
-            var drawTime = game != null ? game.DrawTime : new GameTime();
-
-            // update the rendering context
-            renderingContext.GraphicsContext = context.GraphicsContext;
-            renderingContext.Time = drawTime;
-            renderingContext.RenderTarget = context.CommandList.RenderTargets[0]; // TODO: avoid hardcoded index 0
+        private void initUIElementStates(RenderDrawContext context, RenderView renderView,
+                                         RenderViewStage renderViewStage, ref UIElementState[] uiElementStates,
+                                         int index, int storeIndex, GameTime drawTime, List<PointerEvent> events, ulong posecount)
+        {
+            var renderNodeReference = renderViewStage.SortedRenderNodes[index].RenderNode;
+            var renderNode = GetRenderNode(renderNodeReference);
+            var renderElement = (RenderUIElement)renderNode.RenderObject;
 
-            // Prepare content required for Picking and MouseOver events
-            PickingPrepare();
+            var uiElementState = new UIElementState(renderElement);
+            uiElementStates[storeIndex] = uiElementState;
 
-            // allocate temporary graphics resources if needed
-            Texture scopedDepthBuffer = null;
-            foreach (var uiElement in uiElementStates)
-            {
-                if (uiElement.RenderObject.IsFullScreen)
-                {
-                    var renderTarget = renderingContext.RenderTarget;
-                    var description = TextureDescription.New2D(renderTarget.Width, renderTarget.Height, PixelFormat.D24_UNorm_S8_UInt, TextureFlags.DepthStencil);
-                    scopedDepthBuffer = context.RenderContext.Allocator.GetTemporaryTexture(description);
-                    break;
-                }
-            }
+            var renderObject = uiElementState.RenderObject;
+            var rootElement = renderObject.Page?.RootElement;
 
-            // update view parameters and perform UI picking
-            foreach (var uiElementState in uiElementStates)
+            if (rootElement != null)
             {
-                var renderObject = uiElementState.RenderObject;
-                var rootElement = renderObject.Page?.RootElement;
-                if (rootElement == null)
-                    continue;
+                UIBatch batch = getFreeBatch(context);
 
-                // calculate the size of the virtual resolution depending on target size (UI canvas)
                 var virtualResolution = renderObject.Resolution;
-
-                if (renderObject.IsFullScreen)
-                {
-                    //var targetSize = viewportSize;
-                    var targetSize = new Vector2(renderingContext.RenderTarget.Width, renderingContext.RenderTarget.Height);
-
-                    // update the virtual resolution of the renderer
-                    if (renderObject.ResolutionStretch == ResolutionStretch.FixedWidthAdaptableHeight)
-                        virtualResolution.Y = virtualResolution.X * targetSize.Y / targetSize.X;
-                    if (renderObject.ResolutionStretch == ResolutionStretch.FixedHeightAdaptableWidth)
-                        virtualResolution.X = virtualResolution.Y * targetSize.X / targetSize.Y;
-
-                    uiElementState.Update(renderObject, virtualResolution);
-                }
-                else
-                {
-                    var cameraComponent = context.RenderContext.Tags.Get(CameraComponentRendererExtensions.Current);
-                    if (cameraComponent != null)
-                        uiElementState.Update(renderObject, cameraComponent);
-                }
-
-                // Check if the current UI component is being picked based on the current ViewParameters (used to draw this element)
-                using (Profiler.Begin(UIProfilerKeys.TouchEventsUpdate))
-                {
-                    PickingUpdate(uiElementState.RenderObject, context.CommandList.Viewport, ref uiElementState.WorldViewProjectionMatrix, drawTime);
-                }
-            }
-
-            // render the UI elements of all the entities
-            foreach (var uiElementState in uiElementStates)
-            {
-                var renderObject = uiElementState.RenderObject;
-                var rootElement = renderObject.Page?.RootElement;
-                if (rootElement == null)
-                    continue;
-
                 var updatableRootElement = (IUIElementUpdate)rootElement;
-                var virtualResolution = renderObject.Resolution;
 
-                // update the rendering context values specific to this element
-                renderingContext.Resolution = virtualResolution;
-                renderingContext.ViewProjectionMatrix = uiElementState.WorldViewProjectionMatrix;
-                renderingContext.DepthStencilBuffer = renderObject.IsFullScreen ? scopedDepthBuffer : context.CommandList.DepthStencilBuffer;
-                renderingContext.ShouldSnapText = renderObject.SnapText;
+                // update the UI element disposition
+                rootElement.Measure(virtualResolution);
+                rootElement.Arrange(virtualResolution, false);
 
                 // calculate an estimate of the UI real size by projecting the element virtual resolution on the screen
                 var virtualOrigin = uiElementState.WorldViewProjectionMatrix.Row4;
@@ -195,63 +112,219 @@ private void DrawInternal(RenderDrawContext context, RenderView renderView, Rend
                 // Set default services
                 rootElement.UIElementServices = new UIElementServices { Services = RenderSystem.Services };
 
+                // perform the time-based updates of the UI element
+                updatableRootElement.Update(drawTime);
+
+                // update the UI element hierarchical properties
+                var rootMatrix = Matrix.Translation(-virtualResolution / 2); // UI world is translated by a half resolution compared to its quad, which is centered around the origin
+                updatableRootElement.UpdateWorldMatrix(ref rootMatrix, rootMatrix != uiElementState.RenderObject.LastRootMatrix);
+                updatableRootElement.UpdateElementState(0);
+                uiElementState.RenderObject.LastRootMatrix = rootMatrix;
                 // set default resource dictionary
 
                 // update layouting context.
+                var layoutingContext = batch.layoutingContext as LayoutingContext;
                 layoutingContext.VirtualResolution = virtualResolution;
                 layoutingContext.RealResolution = viewportSize;
                 layoutingContext.RealVirtualResolutionRatio = new Vector2(projectedVirtualWidth.Length() / virtualResolution.X, projectedVirtualHeight.Length() / virtualResolution.Y);
                 rootElement.LayoutingContext = layoutingContext;
 
-                // perform the time-based updates of the UI element
-                updatableRootElement.Update(drawTime);
+                if (renderObject.IsFullScreen)
+                {
+                    //var targetSize = viewportSize;
+                    var targetSize = new Vector2(context.CommandList.RenderTargets[0].Width, context.CommandList.RenderTargets[0].Height);
 
-                // update the UI element disposition
-                rootElement.Measure(virtualResolution);
-                rootElement.Arrange(virtualResolution, false);
+                    // update the virtual resolution of the renderer
+                    switch (renderObject.ResolutionStretch)
+                    {
+                        case ResolutionStretch.FixedWidthAdaptableHeight:
+                            virtualResolution.Y = virtualResolution.X * targetSize.Y / targetSize.X;
+                            break;
+                        case ResolutionStretch.FixedHeightAdaptableWidth:
+                            virtualResolution.X = virtualResolution.Y * targetSize.X / targetSize.Y;
+                            break;
+                        case ResolutionStretch.AutoFit:
+                            float aspect = targetSize.X / targetSize.Y;
+                            float virtAspect = virtualResolution.X / virtualResolution.Y;
+                            if (aspect >= virtAspect)
+                                goto case ResolutionStretch.FixedHeightAdaptableWidth;
+                            goto case ResolutionStretch.FixedWidthAdaptableHeight;
+                        case ResolutionStretch.AutoShrink:
+                            if (targetSize.X < virtualResolution.X ||
+                                targetSize.Y < virtualResolution.Y)
+                                goto case ResolutionStretch.AutoFit;
+                            else
+                            {
+                                virtualResolution.X = targetSize.X * targetSize.X / virtualResolution.X;
+                                virtualResolution.Y = targetSize.Y * targetSize.Y / virtualResolution.Y;
+                            }
+                            break;
+                    }
 
-                // update the UI element hierarchical properties
-                var rootMatrix = Matrix.Translation(-virtualResolution / 2); // UI world is translated by a half resolution compared to its quad, which is centered around the origin
-                updatableRootElement.UpdateWorldMatrix(ref rootMatrix, rootMatrix != uiElementState.RenderObject.LastRootMatrix);
-                updatableRootElement.UpdateElementState(0);
-                uiElementState.RenderObject.LastRootMatrix = rootMatrix;
+                    uiElementState.Update(renderObject, virtualResolution);
+                }
+                else
+                {
+                    CameraComponent cameraComponent = renderView.Camera as CameraComponent;
+                    if (cameraComponent != null)
+                        uiElementState.Update(renderObject, cameraComponent.VerticalFieldOfView,
+                                              ref renderView.View, ref renderView.Projection);
+                }
 
-                // clear and set the Depth buffer as required
-                if (renderObject.IsFullScreen)
+                if (renderObject.Source is UIComponent uic)
                 {
-                    context.CommandList.Clear(renderingContext.DepthStencilBuffer, DepthStencilClearOptions.DepthBuffer | DepthStencilClearOptions.Stencil);
+                    uic.RenderedResolution = virtualResolution;
+                    if (posecount == 0 || posecount != uic.VRPoseUpdate)
+                    {
+                        PickingUpdate(uiElementState.RenderObject, context.CommandList.Viewport, ref uiElementState.WorldViewProjectionMatrix, drawTime, events);
+                        uic.VRPoseUpdate = posecount;
+                    }
                 }
-                context.CommandList.SetRenderTarget(renderingContext.DepthStencilBuffer, renderingContext.RenderTarget);
 
-                // start the image draw session
-                renderingContext.StencilTestReferenceValue = 0;
-                batch.Begin(context.GraphicsContext, ref uiElementState.WorldViewProjectionMatrix, BlendStates.AlphaBlend, uiSystem.KeepStencilValueState, renderingContext.StencilTestReferenceValue);
+                ReturnBatch(batch);
+            }
+        }
 
-                // Render the UI elements in the final render target
-                RecursiveDrawWithClipping(context, rootElement, ref uiElementState.WorldViewProjectionMatrix);
+        private void DrawInternal(RenderDrawContext context, RenderView renderView, RenderViewStage renderViewStage, int startIndex, int endIndex)
+        {
+            base.Draw(context, renderView, renderViewStage, startIndex, endIndex);
 
-                // end the image draw session
-                batch.End();
+            var uiProcessor = SceneInstance.GetCurrent(context.RenderContext).GetProcessor<UIRenderProcessor>();
+            if (uiProcessor == null)
+                return;
+
+            // evaluate the current draw time (game instance is null for thumbnails)
+            var drawTime = game != null ? game.DrawTime : new GameTime();
+
+            // Prepare content required for Picking and MouseOver events
+            var events = new List<PointerEvent>();
+            PickingPrepare(events);
+
+            ulong poseCount = VirtualReality.VRDeviceSystem.GetSystem?.Device?.PoseCount ?? 0;
+
+            // build the list of the UI elements to render
+            UIElementState[] uiElementStates = new UIElementState[endIndex - startIndex];
+            if (uiElementStates.Length > 1 && GraphicsDevice.Platform == GraphicsPlatform.Vulkan)
+            {
+                Xenko.Core.Threading.Dispatcher.For(startIndex, endIndex, (index) =>
+                {
+                    initUIElementStates(context, renderView, renderViewStage, ref uiElementStates, index, index - startIndex, drawTime, events, poseCount);
+                });
+            } 
+            else
+            {
+                for(int i=startIndex; i<endIndex; i++)
+                {
+                    initUIElementStates(context, renderView, renderViewStage, ref uiElementStates, i, i - startIndex, drawTime, events, poseCount);
+                }
             }
 
-            PickingClear();
+            events?.Clear();
+
+            lock (drawLocker)
+            {
+                UIBatch batch = getFreeBatch(context);
 
-            // revert the depth stencil buffer to the default value
-            context.CommandList.SetRenderTargets(context.CommandList.DepthStencilBuffer, context.CommandList.RenderTargetCount, context.CommandList.RenderTargets);
+                var renderingContext = batch.renderingContext as UIRenderingContext;
 
-            // Release scroped texture
-            if (scopedDepthBuffer != null)
+                // update the rendering context
+                renderingContext.GraphicsContext = context.GraphicsContext;
+                renderingContext.Time = drawTime;
+
+                DepthStencilStateDescription stencilState = uiSystem.KeepStencilValueState;
+
+                // actually draw stuff
+                for (int j = 0; j < uiElementStates.Length; j++)
+                {
+                    var uiElementState = uiElementStates[j];
+
+                    renderingContext.RenderObject = uiElementState.RenderObject;
+                    var rootElement = renderingContext.RenderObject.Page?.RootElement;
+                    if (rootElement == null || rootElement.IsVisible == false) continue;
+
+                    // update the rendering context values specific to this element
+                    renderingContext.ViewProjectionMatrix = uiElementState.WorldViewProjectionMatrix;
+                    
+                    switch (renderingContext.RenderObject.depthMode)
+                    {
+                        case Sprites.RenderSprite.SpriteDepthMode.Ignore:
+                            stencilState.DepthBufferWriteEnable = false;
+                            stencilState.DepthBufferEnable = false;
+                            break;
+                        case Sprites.RenderSprite.SpriteDepthMode.ReadOnly:
+                            stencilState.DepthBufferWriteEnable = false;
+                            stencilState.DepthBufferEnable = true;
+                            break;
+                        default:
+                            stencilState.DepthBufferWriteEnable = true;
+                            stencilState.DepthBufferEnable = true;
+                            break;
+                        case Sprites.RenderSprite.SpriteDepthMode.WriteOnly:
+                            stencilState.DepthBufferWriteEnable = true;
+                            stencilState.DepthBufferEnable = true;
+                            stencilState.DepthBufferFunction = CompareFunction.Always;
+                            break;
+                    }
+
+                    SamplerState samplerState;
+                    switch (renderingContext.RenderObject.Sampler)
+                    {
+                        default:
+                            samplerState = context.GraphicsDevice.SamplerStates.LinearClamp;
+                            break;
+                        case UIElementSampler.PointClamp:
+                            samplerState = context.GraphicsDevice.SamplerStates.PointClamp;
+                            break;
+                        case UIElementSampler.AnisotropicClamp:
+                            samplerState = context.GraphicsDevice.SamplerStates.AnisotropicClamp;
+                            break;
+                    }
+
+                    // start the image draw session
+                    renderingContext.StencilTestReferenceValue = 0;
+                    batch.Begin(context.GraphicsContext, ref uiElementState.WorldViewProjectionMatrix, BlendStates.AlphaBlend, samplerState, null, stencilState, renderingContext.StencilTestReferenceValue);
+
+                    // Render the UI elements in the final render target
+                    RecursiveDrawWithClipping(context, rootElement, ref uiElementState.WorldViewProjectionMatrix, batch, ref stencilState, samplerState);
+
+                    batch.End();
+                }
+
+                ReturnBatch(batch);
+            }
+        }
+
+        private UIBatch directXBatch;
+        private UIBatch getFreeBatch(RenderDrawContext context)
+        {
+            if (GraphicsDevice.Platform == GraphicsPlatform.Vulkan)
+            {
+                if (batches.TryDequeue(out UIBatch batch) == false)
+                    return new UIBatch(context.GraphicsDevice, new UIRenderingContext(), new LayoutingContext());
+                return batch;
+            }
+            else
             {
-                context.RenderContext.Allocator.ReleaseReference(scopedDepthBuffer);
+                if (directXBatch == null) directXBatch = new UIBatch(context.GraphicsDevice, new UIRenderingContext(), new LayoutingContext());
+                return directXBatch;
             }
         }
 
-        private void RecursiveDrawWithClipping(RenderDrawContext context, UIElement element, ref Matrix worldViewProj)
+        private void ReturnBatch(UIBatch batch)
         {
-            // if the element is not visible, we also remove all its children
+            if (batch != directXBatch)
+                batches.Enqueue(batch);
+        }
+
+        private void RecursiveDrawWithClipping(RenderDrawContext context, UIElement element, ref Matrix worldViewProj, UIBatch batch, ref DepthStencilStateDescription dstate, SamplerState samplerState)
+        {
+            // not visible, remove children too
             if (!element.IsVisible)
                 return;
 
+            var renderingContext = batch.renderingContext as UIRenderingContext;
+            var layoutingContext = batch.layoutingContext as LayoutingContext;
+
             var renderer = rendererManager.GetRenderer(element);
             renderingContext.DepthBias = element.DepthBias;
 
@@ -262,21 +335,21 @@ private void RecursiveDrawWithClipping(RenderDrawContext context, UIElement elem
                 batch.End();
 
                 // render the clipping region
-                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.ColorDisabled, uiSystem.IncreaseStencilValueState, renderingContext.StencilTestReferenceValue);
-                renderer.RenderClipping(element, renderingContext);
+                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.ColorDisabled, samplerState, null, uiSystem.IncreaseStencilValueState, renderingContext.StencilTestReferenceValue);
+                renderer.RenderClipping(element, renderingContext, batch);
                 batch.End();
 
                 // update context and restart the batch
                 renderingContext.StencilTestReferenceValue += 1;
-                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.AlphaBlend, uiSystem.KeepStencilValueState, renderingContext.StencilTestReferenceValue);
+                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.AlphaBlend, samplerState, null, dstate, renderingContext.StencilTestReferenceValue);
             }
 
             // render the design of the element
-            renderer.RenderColor(element, renderingContext);
+            renderer.RenderColor(element, renderingContext, batch);
 
             // render the children
             foreach (var child in element.VisualChildrenCollection)
-                RecursiveDrawWithClipping(context, child, ref worldViewProj);
+                RecursiveDrawWithClipping(context, child, ref worldViewProj, batch, ref dstate, samplerState);
 
             // clear the element clipping region from the stencil buffer
             if (element.ClipToBounds)
@@ -287,13 +360,13 @@ private void RecursiveDrawWithClipping(RenderDrawContext context, UIElement elem
                 renderingContext.DepthBias = element.MaxChildrenDepthBias;
 
                 // render the clipping region
-                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.ColorDisabled, uiSystem.DecreaseStencilValueState, renderingContext.StencilTestReferenceValue);
-                renderer.RenderClipping(element, renderingContext);
+                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.ColorDisabled, samplerState, null, uiSystem.DecreaseStencilValueState, renderingContext.StencilTestReferenceValue);
+                renderer.RenderClipping(element, renderingContext, batch);
                 batch.End();
 
                 // update context and restart the batch
                 renderingContext.StencilTestReferenceValue -= 1;
-                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.AlphaBlend, uiSystem.KeepStencilValueState, renderingContext.StencilTestReferenceValue);
+                batch.Begin(context.GraphicsContext, ref worldViewProj, BlendStates.AlphaBlend, samplerState, null, dstate, renderingContext.StencilTestReferenceValue);
             }
         }
 
@@ -312,6 +385,8 @@ public void RegisterRenderer(UIElement element, ElementRenderer renderer)
             rendererManager.RegisterRenderer(element, renderer);
         }
 
+        private static Matrix ReallyCloseUI = Matrix.Transformation(new Vector3(0.505f), Quaternion.Identity, new Vector3(0f, 0f, 63.5f));
+
         private class UIElementState
         {
             public readonly RenderUIElement RenderObject;
@@ -323,65 +398,78 @@ public UIElementState(RenderUIElement renderObject)
                 WorldViewProjectionMatrix = Matrix.Identity;
             }
 
-            public void Update(RenderUIElement renderObject, CameraComponent camera)
+            public void Update(RenderUIElement renderObject, float vFoV, ref Matrix viewMatrix, ref Matrix projMatrix)
             {
-                var frustumHeight = 2 * (float)Math.Tan(MathUtil.DegreesToRadians(camera.VerticalFieldOfView) / 2);
-
                 var worldMatrix = renderObject.WorldMatrix;
 
                 // rotate the UI element perpendicular to the camera view vector, if billboard is activated
                 if (renderObject.IsFullScreen)
                 {
-                    worldMatrix = Matrix.Identity;
+                    Matrix.Scaling(ref renderObject.Component.Entity.Transform.Scale, out Matrix scalar);
+                    worldMatrix = ReallyCloseUI * scalar;
+                    worldMatrix.TranslationVector += renderObject.Component.Entity.Transform.Position;
                 }
                 else
                 {
-                    Matrix viewInverse;
-                    Matrix.Invert(ref camera.ViewMatrix, out viewInverse);
-                    var forwardVector = viewInverse.Forward;
-
                     if (renderObject.IsBillboard)
                     {
-                        // remove scale of the camera
-                        viewInverse.Row1 /= viewInverse.Row1.XYZ().Length();
-                        viewInverse.Row2 /= viewInverse.Row2.XYZ().Length();
-
-                        // set the scale of the object
-                        viewInverse.Row1 *= worldMatrix.Row1.XYZ().Length();
-                        viewInverse.Row2 *= worldMatrix.Row2.XYZ().Length();
-
-                        // set the adjusted world matrix
-                        worldMatrix.Row1 = viewInverse.Row1;
-                        worldMatrix.Row2 = viewInverse.Row2;
-                        worldMatrix.Row3 = viewInverse.Row3;
-                    }
-
-                    if (renderObject.IsFixedSize)
-                    {
-                        forwardVector.Normalize();
-                        var distVec = (worldMatrix.TranslationVector - camera.Entity.Transform.Position);
-                        float distScalar;
-                        Vector3.Dot(ref forwardVector, ref distVec, out distScalar);
-                        distScalar = Math.Abs(distScalar);
-
-                        var worldScale = frustumHeight * distScalar * UIComponent.FixedSizeVerticalUnit; // FrustumHeight already is 2*Tan(FOV/2)
-
-                        worldMatrix.Row1 *= worldScale;
-                        worldMatrix.Row2 *= worldScale;
-                        worldMatrix.Row3 *= worldScale;
+                        Matrix viewInverse;
+                        Matrix.Invert(ref viewMatrix, out viewInverse);
+                        var diff = worldMatrix.TranslationVector - viewInverse.TranslationVector;
+
+                        switch (renderObject.Component.BillboardType)
+                        {
+                            case UIComponent.BILLBOARD_TYPE.VIEW:
+                                var viewInverseRow1 = viewInverse.Row1;
+                                var viewInverseRow2 = viewInverse.Row2;
+
+                                // remove scale of the camera
+                                viewInverseRow1 /= viewInverseRow1.XYZ().Length();
+                                viewInverseRow2 /= viewInverseRow2.XYZ().Length();
+
+                                // set the scale of the object
+                                viewInverseRow1 *= worldMatrix.Row1.XYZ().Length();
+                                viewInverseRow2 *= worldMatrix.Row2.XYZ().Length();
+
+                                // set the adjusted world matrix
+                                worldMatrix.Row1 = viewInverseRow1;
+                                worldMatrix.Row2 = viewInverseRow2;
+                                worldMatrix.Row3 = viewInverse.Row3;
+                                break;
+                            case UIComponent.BILLBOARD_TYPE.POSITION:
+                                // generate a new matrix that looks at the camera's position
+                                Quaternion look = new Quaternion();
+                                Quaternion.LookAt(ref look, diff);
+                                TransformComponent original = renderObject.Component.Entity.Transform;
+                                worldMatrix = Matrix.Transformation(original.WorldScale(), look, original.WorldPosition());
+                                break;
+                        }
+
+                        if (renderObject.IsFixedSize)
+                        {
+                            // 0.02222222 is 1/45, as 45 is usually the default camera vFoV
+                            var distVec = diff.Length() * vFoV * 0.02222222f;
+
+                            worldMatrix.Row1 *= distVec;
+                            worldMatrix.Row2 *= distVec;
+                            worldMatrix.Row3 *= distVec;
+                        }
                     }
 
                     // If the UI component is not drawn fullscreen it should be drawn as a quad with world sizes corresponding to its actual size
-                    worldMatrix = Matrix.Scaling(renderObject.Size / renderObject.Resolution) * worldMatrix;
+                    worldMatrix = Matrix.Scaling(1f / renderObject.Resolution) * worldMatrix;
                 }
 
+                // capture 3D world matrix for picking against things in 3D space
+                renderObject.WorldMatrix3D = worldMatrix;
+
                 // Rotation of Pi along 0x to go from UI space to world space
                 worldMatrix.Row2 = -worldMatrix.Row2;
                 worldMatrix.Row3 = -worldMatrix.Row3;
 
                 Matrix worldViewMatrix;
-                Matrix.Multiply(ref worldMatrix, ref camera.ViewMatrix, out worldViewMatrix);
-                Matrix.Multiply(ref worldViewMatrix, ref camera.ProjectionMatrix, out WorldViewProjectionMatrix);
+                Matrix.Multiply(ref worldMatrix, ref viewMatrix, out worldViewMatrix);
+                Matrix.Multiply(ref worldViewMatrix, ref projMatrix, out WorldViewProjectionMatrix);
             }
 
             public void Update(RenderUIElement renderObject, Vector3 virtualResolution)
@@ -392,16 +480,10 @@ public void Update(RenderUIElement renderObject, Vector3 virtualResolution)
                 var aspectRatio = virtualResolution.X / virtualResolution.Y;
                 var verticalFov = (float)Math.Atan2(virtualResolution.Y / 2, zOffset) * 2;
 
-                var cameraComponent = new CameraComponent(nearPlane, farPlane)
-                {
-                    UseCustomAspectRatio = true,
-                    AspectRatio = aspectRatio,
-                    VerticalFieldOfView = MathUtil.RadiansToDegrees(verticalFov),
-                    ViewMatrix = Matrix.LookAtRH(new Vector3(0, 0, zOffset), Vector3.Zero, Vector3.UnitY),
-                    ProjectionMatrix = Matrix.PerspectiveFovRH(verticalFov, aspectRatio, nearPlane, farPlane),
-                };
-
-                Update(renderObject, cameraComponent);
+                Matrix vm = Matrix.LookAtRH(new Vector3(0, 0, zOffset), Vector3.Zero, Vector3.UnitY);
+                Matrix pm = Matrix.PerspectiveFovRH(verticalFov, aspectRatio, nearPlane, farPlane);
+
+                Update(renderObject, MathUtil.RadiansToDegrees(verticalFov), ref vm, ref pm);
             }
         }
     }
diff --git a/sources/engine/Xenko.UI/Rendering/UI/UIRenderProcessor.cs b/sources/engine/Xenko.UI/Rendering/UI/UIRenderProcessor.cs
index 885c14374f..dcfbc7ee1e 100644
--- a/sources/engine/Xenko.UI/Rendering/UI/UIRenderProcessor.cs
+++ b/sources/engine/Xenko.UI/Rendering/UI/UIRenderProcessor.cs
@@ -1,19 +1,19 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using System;
 using System.Collections.Generic;
+using Xenko.Core.Mathematics;
 using Xenko.Engine;
 using Xenko.Rendering;
 
 namespace Xenko.Rendering.UI
 {
     /// <summary>
-    /// The processor in charge of updating and drawing the entities having sprite components.
+    /// The processor in charge of updating and drawing the entities having UI components.
     /// </summary>
     public class UIRenderProcessor : EntityProcessor<UIComponent, RenderUIElement>, IEntityComponentRenderProcessor
     {
-        public List<RenderUIElement> UIRoots { get; private set; }
-
         public VisibilityGroup VisibilityGroup { get; set; }
 
         /// <summary>
@@ -22,44 +22,45 @@ public class UIRenderProcessor : EntityProcessor<UIComponent, RenderUIElement>,
         public UIRenderProcessor()
             : base(typeof(TransformComponent))
         {
-            UIRoots = new List<RenderUIElement>();
         }
         
         public override void Draw(RenderContext gameTime)
         {
-            UIRoots.Clear();
-            foreach (var spriteStateKeyPair in ComponentDatas)
+            for (int i=0; i<ComponentDataKeys.Count; i++)
             {
-                var uiComponent = spriteStateKeyPair.Key;
-                var renderUIElement = spriteStateKeyPair.Value;
+                var uiComponent = ComponentDataKeys[i];
+                var renderUIElement = ComponentDataValues[i];
                 renderUIElement.Enabled = uiComponent.Enabled;
 
                 if (renderUIElement.Enabled)
                 {
-                    // TODO GRAPHICS REFACTOR: Proper bounding box.
-                    //renderSprite.BoundingBox = new BoundingBoxExt(new Vector3(float.NegativeInfinity), new Vector3(float.PositiveInfinity));
-
                     // Copy values from ECS to render object
+                    renderUIElement.Component = uiComponent;
                     renderUIElement.WorldMatrix = uiComponent.Entity.Transform.WorldMatrix;
-
                     renderUIElement.RenderGroup = uiComponent.RenderGroup;
+                    renderUIElement.DistanceSortFudge = uiComponent.IsFullScreen ? -10000f : uiComponent.DistanceSortFudge;
+                    renderUIElement.SmallFactorMultiplier = renderUIElement.IsFixedSize || uiComponent.IsFullScreen ? 0f : uiComponent.SmallFactorMultiplier;
 
-                    renderUIElement.Page = uiComponent.Page;
-                    renderUIElement.IsFullScreen = uiComponent.IsFullScreen;
-                    renderUIElement.Resolution = uiComponent.Resolution;
-                    renderUIElement.Size = uiComponent.Size;
-                    renderUIElement.ResolutionStretch = uiComponent.ResolutionStretch;
-                    renderUIElement.IsBillboard = uiComponent.IsBillboard;
-                    renderUIElement.SnapText = uiComponent.SnapText;
-                    renderUIElement.IsFixedSize = uiComponent.IsFixedSize;
-
-                    UIRoots.Add(renderUIElement);
+                    if (uiComponent.IsFullScreen == false) {
+                        renderUIElement.BoundingBox.Center = renderUIElement.WorldMatrix.TranslationVector;
+                        renderUIElement.WorldMatrix.GetScale(out renderUIElement.BoundingBox.Extent);
+                        float max = uiComponent.Resolution.X > uiComponent.Resolution.Y ? uiComponent.Resolution.X : uiComponent.Resolution.Y;
+                        renderUIElement.BoundingBox.Extent *= max * 0.5f;
+                    }
+                    else {
+                        renderUIElement.BoundingBox.Extent = Vector3.Zero; // always draw this
+                    }
                 }
             }
         }
 
         protected override void OnEntityComponentAdding(Entity entity, UIComponent uiComponent, RenderUIElement renderUIElement)
         {
+            if (uiComponent.IsFullScreen == false &&
+                uiComponent.Page?.RootElement != null &&
+                uiComponent.Page.RootElement.previousProvidedMeasureSize.X == -1f)
+                uiComponent.Page.RootElement.previousProvidedMeasureSize = uiComponent.Resolution;
+
             VisibilityGroup.RenderObjects.Add(renderUIElement);
         }
 
diff --git a/sources/engine/Xenko.UI/TouchEventArgs.cs b/sources/engine/Xenko.UI/TouchEventArgs.cs
index 2a1c385210..8264de9b19 100644
--- a/sources/engine/Xenko.UI/TouchEventArgs.cs
+++ b/sources/engine/Xenko.UI/TouchEventArgs.cs
@@ -41,5 +41,10 @@ public class TouchEventArgs : RoutedEventArgs
         /// Gets the translation of the touch in the UI virtual world space.
         /// </summary>
         public Vector3 WorldTranslation { get; internal set; }
+
+        /// <summary>
+        /// What kind of touch is it? 0 for left click, 2 for right click etc. for mouse pointers.
+        /// </summary>
+        public int ButtonId { get; internal set; }
     }
 }
diff --git a/sources/engine/Xenko.UI/UIElement.Events.cs b/sources/engine/Xenko.UI/UIElement.Events.cs
index 61458e2543..7333aa1ce1 100644
--- a/sources/engine/Xenko.UI/UIElement.Events.cs
+++ b/sources/engine/Xenko.UI/UIElement.Events.cs
@@ -2,10 +2,13 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Reflection;
 using Xenko.Core;
+using Xenko.Engine;
 using Xenko.Input;
+using Xenko.Rendering.UI;
 using Xenko.UI.Events;
 
 namespace Xenko.UI
@@ -52,7 +55,7 @@ public abstract partial class UIElement
 
         #endregion
 
-        private static readonly Queue<List<RoutedEventHandlerInfo>> RoutedEventHandlerInfoListPool = new Queue<List<RoutedEventHandlerInfo>>();
+        private static readonly ConcurrentQueue<List<RoutedEventHandlerInfo>> RoutedEventHandlerInfoListPool = new ConcurrentQueue<List<RoutedEventHandlerInfo>>();
 
         static UIElement()
         {
@@ -112,15 +115,15 @@ internal void PropagateRoutedEvent(RoutedEventArgs e)
                 classHandler.Invoke(this, e);
 
             // Trigger instance handlers
-            if (eventsToHandlers.ContainsKey(routedEvent))
+            if (eventsToHandlers.TryGetValue(routedEvent, out var handlers))
             {
                 // get a list of handler from the pool where we can copy the handler to trigger
-                if (RoutedEventHandlerInfoListPool.Count == 0)
-                    RoutedEventHandlerInfoListPool.Enqueue(new List<RoutedEventHandlerInfo>());
-                var pooledList = RoutedEventHandlerInfoListPool.Dequeue();
+                List<RoutedEventHandlerInfo> pooledList;
+                if (RoutedEventHandlerInfoListPool.TryDequeue(out pooledList) == false)
+                    pooledList = new List<RoutedEventHandlerInfo>();
 
                 // copy the RoutedEventHandlerEventInfo list into a list of the pool in order to be able to modify the handler list in the handler itself
-                pooledList.AddRange(eventsToHandlers[routedEvent]);
+                pooledList.AddRange(handlers);
 
                 // iterate on the pooled list to invoke handlers
                 foreach (var handlerInfo in pooledList)
@@ -158,6 +161,10 @@ public void RaiseEvent(RoutedEventArgs e)
                 throw new InvalidOperationException("The type of second parameter of the handler (" + e.RoutedEvent.HandlerSecondArgumentType
                                                     + ") is not assignable from the parameter 'e' type (" + e.GetType() + ").");
 
+            // temporarily disable errors from add/removes of entities during events in other threads, as it is always safe to do it now
+            bool previousEnforce = EntityManager.EnforceThreads;
+            EntityManager.EnforceThreads = false;
+
             var sourceWasNull = e.Source == null;
             if (sourceWasNull) // set the source to default if needed
                 e.Source = this;
@@ -168,6 +175,9 @@ public void RaiseEvent(RoutedEventArgs e)
 
             e.EndEventRouting();
 
+            // return to enforcing thread add/removes, if we were before
+            EntityManager.EnforceThreads = previousEnforce;
+
             if (sourceWasNull) // reset the source if it was not explicitly set (event might be reused again for other sources)
                 e.Source = null;
         }
@@ -511,6 +521,7 @@ private static void TouchLeaveClassHandler(object sender, TouchEventArgs args)
         protected virtual void OnTouchLeave(TouchEventArgs args)
         {
             IsTouched = false;
+            UIRenderFeature.ForceMouseOver = null;
         }
 
         private static void TouchMoveClassHandler(object sender, TouchEventArgs args)
@@ -543,6 +554,7 @@ private static void TouchUpClassHandler(object sender, TouchEventArgs args)
         /// <param name="args">The arguments of the event</param>
         protected virtual void OnTouchUp(TouchEventArgs args)
         {
+            UIRenderFeature.ForceMouseOver = null;
         }
 
         private static void KeyPressedClassHandler(object sender, KeyEventArgs args)
@@ -611,4 +623,4 @@ internal virtual void OnKeyReleased(KeyEventArgs args)
 
         #endregion
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.UI/UIElement.cs b/sources/engine/Xenko.UI/UIElement.cs
index 7262a3f422..868ffbb571 100644
--- a/sources/engine/Xenko.UI/UIElement.cs
+++ b/sources/engine/Xenko.UI/UIElement.cs
@@ -10,7 +10,10 @@
 using Xenko.Core.Annotations;
 using Xenko.Core.Collections;
 using Xenko.Core.Mathematics;
+using Xenko.Engine;
 using Xenko.Games;
+using Xenko.UI.Controls;
+using Xenko.UI.Panels;
 
 namespace Xenko.UI
 {
@@ -18,10 +21,10 @@ namespace Xenko.UI
     /// Provides a base class for all the User Interface elements in Xenko applications.
     /// </summary>
     [DataContract(Inherited = true)]
-    [CategoryOrder(10, AppearanceCategory, Expand = ExpandRule.Auto)]
+    [CategoryOrder(10, AppearanceCategory, Expand = ExpandRule.Once)]
     [CategoryOrder(20, BehaviorCategory, Expand = ExpandRule.Auto)]
     [CategoryOrder(30, LayoutCategory, Expand = ExpandRule.Auto)]
-    [CategoryOrder(100, MiscCategory, Expand = ExpandRule.Auto)]
+    [CategoryOrder(100, MiscCategory, Expand = ExpandRule.Once)]
     [DebuggerDisplay("UIElement: {Name}")]
     public abstract partial class UIElement : IUIElementUpdate, IUIElementChildren, IIdentifiable
     {
@@ -37,9 +40,10 @@ public abstract partial class UIElement : IUIElementUpdate, IUIElementChildren,
         internal Vector3 RenderSizeInternal;
         internal Matrix WorldMatrixInternal;
         internal Matrix WorldMatrixPickingInternal;
+        internal Matrix WorldMatrix3D;
         protected internal Thickness MarginInternal = Thickness.UniformCuboid(0f);
 
-        private string name;
+        private string name, emptyDefaultName;
         private Visibility visibility = Visibility.Visible;
         private float opacity = 1.0f;
         private bool isEnabled = true;
@@ -47,6 +51,7 @@ public abstract partial class UIElement : IUIElementUpdate, IUIElementChildren,
         private float defaultWidth;
         private float defaultHeight;
         private float defaultDepth;
+        private float rotation;
         private float width = float.NaN;
         private float height = float.NaN;
         private float depth = float.NaN;
@@ -66,7 +71,8 @@ public abstract partial class UIElement : IUIElementUpdate, IUIElementChildren,
         protected bool ArrangeChanged;
         protected bool LocalMatrixChanged;
 
-        private Vector3 previousProvidedMeasureSize = new Vector3(-1,-1,-1);
+        protected Vector3 availableSizeWithoutMargins = new Vector3(-1, -1, -1);
+        internal Vector3 previousProvidedMeasureSize = new Vector3(-1,-1,-1);
         private Vector3 previousProvidedArrangeSize = new Vector3(-1,-1,-1);
         private bool previousIsParentCollapsed;
 
@@ -229,11 +235,31 @@ public float Width
             get => width;
             set
             {
+                if (width == value) return;
+
                 width = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
         }
 
+        /// <summary>
+        /// how is this UI element rotated?
+        /// </summary>
+        [DataMember]
+        [Display(category: LayoutCategory)]
+        [DefaultValue(0f)]
+        public float Rotation 
+        { 
+            get => rotation;
+            set
+            {
+                if (rotation == value) return;
+
+                rotation = value;
+                InvalidateMeasure();
+            }
+        }
+
         /// <summary>
         /// Gets or sets the user suggested height of this element.
         /// </summary>
@@ -248,6 +274,8 @@ public float Height
             get => height;
             set
             {
+                if (height == value) return;
+
                 height = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -267,6 +295,8 @@ public float Depth
             get => depth;
             set
             {
+                if (depth == value) return;
+
                 depth = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -299,6 +329,8 @@ public HorizontalAlignment HorizontalAlignment
             get => horizontalAlignment;
             set
             {
+                if (horizontalAlignment == value) return;
+
                 horizontalAlignment = value;
                 InvalidateArrange();
             }
@@ -316,6 +348,8 @@ public VerticalAlignment VerticalAlignment
             get => verticalAlignment;
             set
             {
+                if (verticalAlignment == value) return;
+
                 verticalAlignment = value;
                 InvalidateArrange();
             }
@@ -333,6 +367,8 @@ public DepthAlignment DepthAlignment
             get => depthAlignment;
             set
             {
+                if (depthAlignment == value) return;
+
                 depthAlignment = value;
                 InvalidateArrange();
             }
@@ -349,11 +385,41 @@ public Thickness Margin
             get => MarginInternal;
             set
             {
+                if (MarginInternal == value) return;
+
                 MarginInternal = value;
                 InvalidateMeasure();
             }
         }
 
+        /// <summary>
+        /// Used for getting and setting the top left positon of this UIElement
+        /// </summary>
+        [DataMemberIgnore]
+        public Vector2 LeftTopPosition
+        {
+            get
+            {
+                return new Vector2(MarginInternal.Left, MarginInternal.Top);
+            }
+            set
+            {
+                // make sure we are using top left positioning
+                if (HorizontalAlignment != HorizontalAlignment.Left)
+                    HorizontalAlignment = HorizontalAlignment.Left;
+
+                if (VerticalAlignment != VerticalAlignment.Top)
+                    VerticalAlignment = VerticalAlignment.Top;
+
+                if (MarginInternal.Left == value.X && MarginInternal.Top == value.Y)
+                    return; // didn't move
+
+                MarginInternal.Left = value.X;
+                MarginInternal.Top = value.Y;
+                InvalidateArrange();
+            }
+        }
+
         /// <summary>
         /// Gets or sets the minimum width of this element.
         /// </summary>
@@ -370,6 +436,9 @@ public float MinimumWidth
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (minimumWidth == value) return;
+
                 minimumWidth = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -391,6 +460,9 @@ public float MinimumHeight
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (minimumHeight == value) return;
+
                 minimumHeight = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -412,6 +484,9 @@ public float MinimumDepth
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (minimumDepth == value) return;
+
                 minimumDepth = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -433,6 +508,9 @@ public float MaximumWidth
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (maximumWidth == value) return;
+
                 maximumWidth = MathUtil.Clamp(value, 0.0f, float.PositiveInfinity);
                 InvalidateMeasure();
             }
@@ -454,6 +532,9 @@ public float MaximumHeight
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (maximumHeight == value) return;
+
                 maximumHeight = MathUtil.Clamp(value, 0.0f, float.PositiveInfinity);
                 InvalidateMeasure();
             }
@@ -475,6 +556,9 @@ public float MaximumDepth
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (maximumDepth == value) return;
+
                 maximumDepth = MathUtil.Clamp(value, 0.0f, float.PositiveInfinity);
                 InvalidateMeasure();
             }
@@ -496,6 +580,9 @@ public float DefaultWidth
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (defaultWidth == value) return;
+
                 defaultWidth = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -517,6 +604,9 @@ public float DefaultHeight
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (defaultHeight == value) return;
+
                 defaultHeight = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -538,6 +628,9 @@ public float DefaultDepth
             {
                 if (float.IsNaN(value))
                     return;
+
+                if (defaultDepth == value) return;
+
                 defaultDepth = MathUtil.Clamp(value, 0.0f, float.MaxValue);
                 InvalidateMeasure();
             }
@@ -552,13 +645,21 @@ public float DefaultDepth
         [DefaultValue(null)]
         public string Name
         {
-            get => name;
+            get {
+                if (name != null && name != "") return name;
+
+                if (emptyDefaultName == null)
+                    emptyDefaultName = "UIElement-" + Id.ToString().Substring(0, 6);
+
+                return emptyDefaultName;
+            }
             set
             {
                 if (name == value)
                     return;
 
                 name = value;
+
                 OnNameChanged();
             }
         }
@@ -626,11 +727,16 @@ protected internal LayoutingContext LayoutingContext
                     return;
 
                 if (layoutingContext != null && layoutingContext.Equals(value))
+                {
+                    // make sure virtual resolution is the same, as it might have been different
+                    // but this doesn't require remeasuring everything (virt res used for ray intersecting)
+                    layoutingContext.VirtualResolution = value.VirtualResolution;
                     return;
+                }
 
                 ForceMeasure();
                 layoutingContext = value;
-                foreach (var child in VisualChildren)
+                foreach (var child in VisualChildrenCollection)
                     child.LayoutingContext = value;
             }
         }
@@ -745,10 +851,34 @@ protected virtual void OnNameChanged()
         /// </summary>
         public bool IsHierarchyEnabled => isHierarchyEnabled;
 
+        /// <summary>
+        /// Is this UIElement hidden and shouldn't be drawn?
+        /// </summary>
+        [DataMemberIgnore]
+        public bool Hidden;
+
         /// <summary>
         /// Gets a value indicating whether this element is visible in the user interface (UI).
         /// </summary>
-        public bool IsVisible => Visibility == Visibility.Visible;
+        public bool IsVisible => Visibility == Visibility.Visible && !Hidden;
+
+        /// <summary>
+        /// This checks the whole UIElement parent tree for visibility
+        /// </summary>
+        public bool IsVisibleInTree
+        {
+            get
+            {
+                if (!IsVisible) return false;
+                UIElement checkToRoot = this;
+                while (checkToRoot?.Parent != null)
+                {
+                    checkToRoot = checkToRoot.Parent;
+                    if (!checkToRoot.IsVisible) return false;
+                }
+                return true;
+            }
+        }
 
         /// <summary>
         /// Gets a value indicating whether this element takes some place in the user interface.
@@ -809,7 +939,7 @@ internal void SetSize(int dimensionIndex, float value)
         public Vector3 RenderSize
         {
             get => RenderSizeInternal;
-            private set => RenderSizeInternal = value;
+            internal set => RenderSizeInternal = value;
         }
 
         /// <summary>
@@ -833,6 +963,40 @@ public Vector3 RenderSize
         /// </summary>
         public float ActualDepth => RenderSize.Z;
 
+        /// <summary>
+        /// Lots of size/width/height functions return 0 or NaN. This returns something useful more reliably! Provide a uiComponent for better default resolution/sizing
+        /// </summary>
+        public Vector2 GetNoBullshitSize(UIComponent uiComponent = null)
+        {
+            bool badX = float.IsNaN(Width);
+            bool badY = float.IsNaN(Height);
+
+            if (badX || badY)
+            {
+                Vector2 fixedSize;
+
+                if (Parent != null)
+                    fixedSize = Parent.GetNoBullshitSize(uiComponent);
+                else if (uiComponent != null)
+                    fixedSize = uiComponent.Resolution.XY();
+                else
+                {
+                    // wait, is the size invalid?
+                    if (IsMeasureValid == false)
+                    {
+                        Measure(previousProvidedMeasureSize);
+                        Arrange(DesiredSizeWithMargins, false);
+                    }
+
+                    fixedSize = RenderSize.XY();
+                }
+
+                return new Vector2(badX ? fixedSize.X : Width, badY ? fixedSize.Y : Height);
+            }
+            
+            return new Vector2(Width, Height);
+        }
+
         /// <inheritdoc/>
         IEnumerable<IUIElementChildren> IUIElementChildren.Children => EnumerateChildren();
 
@@ -859,6 +1023,21 @@ private unsafe bool Vector3BinaryEqual(ref Vector3 left, ref Vector3 right)
             }
         }
 
+        internal void CalculateWithoutMargins(ref Vector3 availableSizeWithMargins, out Vector3 desiredSize)
+        {
+            // variable containing the temporary desired size
+            desiredSize = new Vector3(Width, Height, Depth);
+
+            // removes the size required for the margins in the available size
+            availableSizeWithoutMargins = CalculateSizeWithoutThickness(ref availableSizeWithMargins, ref MarginInternal);
+
+            // clamp the available size for the element between the maximum and minimum width/height of the UIElement
+            availableSizeWithoutMargins = new Vector3(
+                Math.Max(MinimumWidth, Math.Min(MaximumWidth, !float.IsNaN(desiredSize.X) ? desiredSize.X : availableSizeWithoutMargins.X)),
+                Math.Max(MinimumHeight, Math.Min(MaximumHeight, !float.IsNaN(desiredSize.Y) ? desiredSize.Y : availableSizeWithoutMargins.Y)),
+                Math.Max(MinimumDepth, Math.Min(MaximumDepth, !float.IsNaN(desiredSize.Z) ? desiredSize.Z : availableSizeWithoutMargins.Z)));
+        }
+
         /// <summary>
         /// Updates the <see cref="DesiredSize"/> of a <see cref="UIElement"/>.
         /// Parent elements call this method from their own implementations to form a recursive layout update.
@@ -887,20 +1066,9 @@ public void Measure(Vector3 availableSizeWithMargins)
                 return;
             }
 
-            // variable containing the temporary desired size
-            var desiredSize = new Vector3(Width, Height, Depth);
-
             // width, height or the depth of the UIElement might be undetermined
             // -> compute the desired size of the children to determine it
-
-            // removes the size required for the margins in the available size
-            var availableSizeWithoutMargins = CalculateSizeWithoutThickness(ref availableSizeWithMargins, ref MarginInternal);
-
-            // clamp the available size for the element between the maximum and minimum width/height of the UIElement
-            availableSizeWithoutMargins = new Vector3(
-                Math.Max(MinimumWidth, Math.Min(MaximumWidth, !float.IsNaN(desiredSize.X) ? desiredSize.X : availableSizeWithoutMargins.X)),
-                Math.Max(MinimumHeight, Math.Min(MaximumHeight, !float.IsNaN(desiredSize.Y) ? desiredSize.Y : availableSizeWithoutMargins.Y)),
-                Math.Max(MinimumDepth, Math.Min(MaximumDepth, !float.IsNaN(desiredSize.Z) ? desiredSize.Z : availableSizeWithoutMargins.Z)));
+            CalculateWithoutMargins(ref availableSizeWithMargins, out var desiredSize);
 
             // compute the desired size for the children
             var childrenDesiredSize = MeasureOverride(availableSizeWithoutMargins);
@@ -958,6 +1126,21 @@ protected virtual Vector3 MeasureOverride(Vector3 availableSizeWithoutMargins)
             return Vector3.Zero;
         }
 
+        /// <summary>
+        /// Easy method for detaching this UIElement from its parent
+        /// </summary>
+        /// <returns>true if it was detached</returns>
+        public bool RemoveFromParent()
+        {
+            if (Parent is Panel p)
+            {
+                p.Children.Remove(this);
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Positions child elements and determines the size of the UIElement.
         /// This method constitutes the second pass of a layout update.
@@ -1122,16 +1305,80 @@ protected static void SetVisualParent([NotNull] UIElement child, [CanBeNull] UIE
             }
         }
 
+        //                                                 R1                      S1                        s2                           S3
+        /// <summary>
+        /// Variation on Ray vs Rectangle
+        /// </summary>
+        internal bool RayIntersectsRectangle(ref Ray ray, ref Vector3 topLeftCorner, ref Vector3 topRightCorner, ref Vector3 bottomLeftCorner, out Vector3 intersectionPoint)
+        {
+            // from https://stackoverflow.com/questions/21114796/3d-ray-quad-intersection-test-in-java
+
+            // 1.
+            Vector3 dS21 = topRightCorner - topLeftCorner;
+            Vector3 dS31 = bottomLeftCorner - topLeftCorner;
+            Vector3.Cross(ref dS21, ref dS31, out Vector3 n);
+
+            // 2.
+            Vector3 dR = ray.Direction;
+
+            Vector3.Dot(ref n, ref dR, out float ndotdR);
+
+            if (ndotdR < 1e-6f)
+            {
+                intersectionPoint = Vector3.Zero;
+                return false;
+            }
+
+            Vector3 posDiff = ray.Position - topLeftCorner;
+
+            float t = Vector3.Dot(-n, posDiff) / ndotdR;
+            intersectionPoint = ray.Position + dR * t;
+
+            // 3.
+            Vector3 dMS1 = intersectionPoint - topLeftCorner;
+            Vector3.Dot(ref dMS1, ref dS21, out float u);
+            Vector3.Dot(ref dMS1, ref dS31, out float v);
+
+            // 4.
+            return (u >= 0.0f && u <= Vector3.Dot(dS21, dS21)
+                    && v >= 0.0f && v <= Vector3.Dot(dS31, dS31));
+        }
+
         /// <summary>
         /// Calculate the intersection of the UI element and the ray.
         /// </summary>
         /// <param name="ray">The ray in world space coordinate</param>
         /// <param name="intersectionPoint">The intersection point in world space coordinate</param>
         /// <returns><value>true</value> if the two elements intersects, <value>false</value> otherwise</returns>
-        protected internal virtual bool Intersects(ref Ray ray, out Vector3 intersectionPoint)
+        protected internal virtual bool Intersects(ref Ray ray, out Vector3 intersectionPoint, bool nonUISpace, Vector2? canvasScale = null)
         {
             // does ray intersect element Oxy face?
-            var intersects = CollisionHelper.RayIntersectsRectangle(ref ray, ref WorldMatrixPickingInternal, ref RenderSizeInternal, 2, out intersectionPoint);
+            bool intersects;
+
+            // resize canvas?
+            Vector3 scaledRenderSize = RenderSizeInternal;
+            if (canvasScale.HasValue)
+            {
+                scaledRenderSize.X *= canvasScale.Value.X;
+                scaledRenderSize.Y *= canvasScale.Value.Y;
+            }
+            
+            if (nonUISpace)
+            {
+                Matrix worldMatrix = WorldMatrixPickingInternal;
+                worldMatrix.M42 = -worldMatrix.M42; // for some reason Y translation needs to be flipped
+                worldMatrix *= WorldMatrix3D;
+                float rsx = scaledRenderSize.X * 0.5f;
+                float rsy = scaledRenderSize.Y * 0.5f;
+                Vector3 topLeft = Vector3.Transform(new Vector3(-rsx, rsy, 0f), worldMatrix).XYZ();
+                Vector3 topRight = Vector3.Transform(new Vector3(rsx, rsy, 0f), worldMatrix).XYZ();
+                Vector3 bottomLeft = Vector3.Transform(new Vector3(-rsx, -rsy, 0f), worldMatrix).XYZ();
+                intersects = RayIntersectsRectangle(ref ray, ref topLeft, ref topRight, ref bottomLeft, out intersectionPoint);
+            }
+            else
+            {
+                intersects = CollisionHelper.RayIntersectsRectangle(ref ray, ref WorldMatrixPickingInternal, ref scaledRenderSize, 2, out intersectionPoint);
+            }
 
             // if element has depth also test other faces
             if (ActualDepth > MathUtil.ZeroTolerance)
@@ -1219,6 +1466,10 @@ protected virtual void UpdateWorldMatrix(ref Matrix parentWorldMatrix, bool pare
             {
                 var localMatrixCopy = localMatrix;
 
+                // apply rotation?
+                if (Rotation != 0f)
+                    localMatrixCopy *= Matrix.RotationZ(Rotation);
+
                 // include rendering offsets into the local matrix.
                 localMatrixCopy.TranslationVector += RenderOffsets + RenderSize / 2;
 
@@ -1320,5 +1571,25 @@ protected Vector3 CalculateAdjustmentOffsets(ref Thickness thickness, ref Vector
 
             return offsets;
         }
+
+        /// <summary>
+        /// Shortcut function to set first TextBlock child of this to a certain text (can easily update button text, for example)
+        /// </summary>
+        /// <param name="text">What text to set?</param>
+        /// <param name="resize">Resize this after changing the text if this was a button?</param>
+        public void SetChildText(string text, bool resize = false)
+        {
+            for(int i=0; i<VisualChildren.Count; i++)
+            {
+                var child = VisualChildren[i];
+
+                if (child is TextBlock tb)
+                {
+                    tb.Text = text;
+                    if (resize && this is ButtonBase b) b.ResizeToChild();
+                    break;
+                }
+            }
+        }
     }
 }
diff --git a/sources/engine/Xenko.UI/UISystem.cs b/sources/engine/Xenko.UI/UISystem.cs
index 05f9fad777..37c40d3610 100644
--- a/sources/engine/Xenko.UI/UISystem.cs
+++ b/sources/engine/Xenko.UI/UISystem.cs
@@ -16,8 +16,6 @@ namespace Xenko.UI
     /// </summary>
     public class UISystem : GameSystemBase
     {
-        internal UIBatch Batch { get; private set; }
-
         internal DepthStencilStateDescription KeepStencilValueState { get; private set; }
 
         internal DepthStencilStateDescription IncreaseStencilValueState { get; private set; }
@@ -65,11 +63,8 @@ protected override void LoadContent()
         {
             base.LoadContent();
 
-            // create effect and geometric primitives
-            Batch = new UIBatch(GraphicsDevice);
-
             // create depth stencil states
-            var depthStencilDescription = new DepthStencilStateDescription(true, true)
+            var depthStencilDescription = new DepthStencilStateDescription(true, false)
             {
                 StencilEnable = true,
                 FrontFace = new DepthStencilStencilOpDescription
@@ -167,4 +162,4 @@ private void UpdateKeyEvents()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/sources/engine/Xenko.UI/VisualTreeHelper.cs b/sources/engine/Xenko.UI/VisualTreeHelper.cs
index ced684d0bc..c22a30c52d 100644
--- a/sources/engine/Xenko.UI/VisualTreeHelper.cs
+++ b/sources/engine/Xenko.UI/VisualTreeHelper.cs
@@ -40,6 +40,34 @@ public static IEnumerable<T> FindVisualChildrenOfType<T>(this UIElement source)
             return FindChildrenOfType<T>(source, e => e.VisualChildrenCollection.Count, (e, i) => e.VisualChildrenCollection[i]);
         }
 
+        /// <summary>
+        /// Generates a Dictionary with all UIElements of given type. Keys set to names of the UIElements.
+        /// </summary>
+        /// <typeparam name="T">Type of child to find.</typeparam>
+        /// <param name="ChildrenOnly">Only add children, not myself. Defaults to false.</param>
+        /// <param name="source">Base node from where to start looking for children.</param>
+        /// <returns>Returns a dictionary of UIElements with names as keys.</returns>
+        public static Dictionary<string, T> GatherUIDictionary<T>(this UIElement source, bool ChildrenOnly = false) where T : UIElement {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            Dictionary<string, T> dict = new Dictionary<string, T>();
+            GatherUIDictionary<T>(source, ref dict, ChildrenOnly);
+            return dict;
+        }
+
+        /// <summary>
+        /// Adds to a Dictionary with all UIElements of given type. Keys set to names of the UIElements.
+        /// </summary>
+        /// <typeparam name="T">Type of child to find.</typeparam>
+        /// <param name="ChildrenOnly">Only add children, not myself. Defaults to false.</param>
+        /// <param name="source">Base node from where to start looking for children.</param>
+        public static void GatherUIDictionary<T>(this UIElement source, ref Dictionary<string, T> dictionary, bool ChildrenOnly = false) where T : UIElement {
+            if (source == null) throw new ArgumentNullException(nameof(source));
+            if (ChildrenOnly == false && source is T) dictionary[source.Name] = (T)source;
+            foreach (T e in FindChildrenOfType<T>(source, e => e.VisualChildrenCollection.Count, (e, i) => e.VisualChildrenCollection[i])) {
+                dictionary[e.Name] = e;
+            }
+        }
+
         /// <summary>
         /// Find the first parent that match the given type, along the visual tree.
         /// </summary>
diff --git a/sources/engine/Xenko.UI/Xenko.UI.csproj b/sources/engine/Xenko.UI/Xenko.UI.csproj
index a188d68184..5a8ddcb65f 100644
--- a/sources/engine/Xenko.UI/Xenko.UI.csproj
+++ b/sources/engine/Xenko.UI/Xenko.UI.csproj
@@ -1,15 +1,15 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
     <XenkoProjectPlatformDependentWindows>true</XenkoProjectPlatformDependentWindows>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
@@ -27,5 +27,5 @@
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Video/FFmpeg/FFmpegMedia.cs b/sources/engine/Xenko.Video/FFmpeg/FFmpegMedia.cs
index 92ef235e10..6f73c77d5f 100644
--- a/sources/engine/Xenko.Video/FFmpeg/FFmpegMedia.cs
+++ b/sources/engine/Xenko.Video/FFmpeg/FFmpegMedia.cs
@@ -107,7 +107,7 @@ public void Dispose()
         }
 
         [CanBeNull]
-        public StreamInfo GetStreamInfo(VideoStream stream) => currentStreams.ContainsKey(stream) ? currentStreams[stream] : null;
+        public StreamInfo GetStreamInfo(VideoStream stream) => currentStreams.TryGetValue(stream, out var streamInfo) ? streamInfo : null;
 
         /// <summary>
         /// Opens this media.
@@ -357,7 +357,7 @@ private FrameExtractionStatus ExtractNextImage(StreamInfo streamInfo, AVPacket*
                     {
                         if (ret == ffmpeg.AVERROR_EOF)
                             return FrameExtractionStatus.ReachEOF;
-                        
+
                         Logger.Error($"Could not read frame. Error code={ret.ToString("X8")}.");
                         Logger.Error(GetErrorMessage(ret));
                         return FrameExtractionStatus.Failed;
@@ -418,7 +418,7 @@ private FrameExtractionStatus ExtractNextImage(StreamInfo streamInfo, AVPacket*
                         ffmpeg.sws_scale(pConvertContext, pFrame->data, pFrame->linesize, 0, outputImage.Height, dstData, dstLinesize);
                         outputImage.Timestamp = pDecodedFrame->pts;
                     }
-                    
+
                     return FrameExtractionStatus.Succeeded;
                 }
                 finally
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestScreenPosition.cs b/sources/engine/Xenko.Video/Shaders/VideoShader.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestScreenPosition.cs
rename to sources/engine/Xenko.Video/Shaders/VideoShader.xksl.cs
diff --git a/sources/engine/Xenko.Video/Video.cs b/sources/engine/Xenko.Video/Video.cs
index e50899a2c4..db9cc26848 100644
--- a/sources/engine/Xenko.Video/Video.cs
+++ b/sources/engine/Xenko.Video/Video.cs
@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using Xenko.Core;
+using Xenko.Core.IO;
 using Xenko.Core.Serialization;
 using Xenko.Core.Serialization.Contents;
 
@@ -14,9 +15,12 @@ namespace Xenko.Video
     [DebuggerDisplay("{" + nameof(Name) + "}")]
     [ContentSerializer(typeof(DataContentSerializer<Video>))]
     [ReferenceSerializer, DataSerializerGlobal(typeof(ReferenceSerializer<Video>), Profile = "Content")]
-    [DataContract]
+    [DataSerializer(typeof(VideoSerializer))]
+
     public sealed class Video : ComponentBase
     {
+        internal DatabaseFileProvider FileProvider;
+
         public string CompressedDataUrl { get; set; }
     }
 }
diff --git a/sources/engine/Xenko.Video/VideoComponent.cs b/sources/engine/Xenko.Video/VideoComponent.cs
index 540f0fe130..ac7eca8ee5 100644
--- a/sources/engine/Xenko.Video/VideoComponent.cs
+++ b/sources/engine/Xenko.Video/VideoComponent.cs
@@ -75,12 +75,6 @@ public class VideoComponent : EntityComponent
         /// </userdoc>
         [DataMember(50)]
         public bool PlayAudio { get; set; } = true;
-
-        /// <summary>
-        /// The list of audioEmitteur components.
-        /// </summary>
-        [DataMember(60)]
-        public FastCollection<AudioEmitterComponent> AudioEmitters { get; } = new FastCollection<AudioEmitterComponent>();
         
         internal void AttachInstance([NotNull] VideoInstance instance)
         {
diff --git a/sources/engine/Xenko.Video/VideoInstance.Direct3D.cs b/sources/engine/Xenko.Video/VideoInstance.Direct3D.cs
index 930ae8a953..ade3cd8025 100644
--- a/sources/engine/Xenko.Video/VideoInstance.Direct3D.cs
+++ b/sources/engine/Xenko.Video/VideoInstance.Direct3D.cs
@@ -9,6 +9,7 @@
 using SharpDX.MediaFoundation;
 using Xenko.Core;
 using Xenko.Core.IO;
+using Xenko.Core.Serialization;
 using Xenko.Graphics;
 using Xenko.Media;
 
@@ -177,13 +178,7 @@ partial void InitializeMediaImpl(string url, long startPosition, long length, re
                 // set the video source 
                 var mediaEngineEx = mediaEngine.QueryInterface<MediaEngineEx>();
                 
-                var databaseUrl = videoComponent.Source?.CompressedDataUrl;
-                if (databaseUrl == null)
-                {
-                    Logger.Info("The video source is null. The video won't play.");
-                    throw new Exception();
-                }
-                videoFileStream = contentManager.OpenAsStream(databaseUrl, StreamFlags.Seekable);
+                videoFileStream = new VirtualFileStream(File.OpenRead(url), startPosition, startPosition + length);
                 videoDataStream = new ByteStream(videoFileStream);
 
                 // Creates an URL to the file
@@ -211,8 +206,7 @@ private void CompleteMediaInitialization()
 
             AllocateVideoTexture(videoWidth, videoHeight);
 
-            if (videoComponent.PlayAudio != true || videoComponent.AudioEmitters.Any(e => e != null))
-                mediaEngine.Muted = true;
+            mediaEngine.Muted = true;
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko.Video/VideoInstance.cs b/sources/engine/Xenko.Video/VideoInstance.cs
index 6d2dc57e5c..a42bc7fd72 100644
--- a/sources/engine/Xenko.Video/VideoInstance.cs
+++ b/sources/engine/Xenko.Video/VideoInstance.cs
@@ -463,26 +463,28 @@ public void InitializeFromDataSource()
             long startPosition = 0;
             long end = 0;
 
-            var dataUrl = videoComponent.Source?.CompressedDataUrl;
-            if (dataUrl != null)
+            var source = videoComponent.Source;
+            if (source != null)
             {
-                var fileProvider = services.GetSafeServiceAs<IDatabaseFileProviderService>().FileProvider;
+                var dataUrl = source.CompressedDataUrl;
+
+                var fileProvider = source.FileProvider;
 
                 if (!fileProvider.ContentIndexMap.TryGetValue(dataUrl, out ObjectId objectId) ||
-                    !fileProvider.ObjectDatabase.BundleBackend.TryGetObjectLocation(objectId, out url, out startPosition, out end))
+                    !fileProvider.ObjectDatabase.TryGetObjectLocation(objectId, out url, out startPosition, out end))
                 {
                     throw new InvalidOperationException("Video files needs to be stored on the virtual file system in a non-compressed form.");
                 }
-            }
 
-            // Initialize media
-            InitializeMedia(url, startPosition, end - startPosition);
+                // Initialize media
+                InitializeMedia(url, startPosition, end - startPosition);
 
-            // Set playback properties
-            UpdateAudioVolume();
-            UpdateLoopingSettings();
-            UpdatePlayRangeSettings();
-            UpdateSpeedSettings();
+                // Set playback properties
+                UpdateAudioVolume();
+                UpdateLoopingSettings();
+                UpdatePlayRangeSettings();
+                UpdateSpeedSettings();
+            }
 
             // Do not play and pause the new video. The new video always starts in the 'Stopped' state
             // It is responsibility of the user the revert play state after changing the source video.
diff --git a/sources/engine/Xenko.Video/VideoProcessor.cs b/sources/engine/Xenko.Video/VideoProcessor.cs
index 30097f1356..25902f86c3 100644
--- a/sources/engine/Xenko.Video/VideoProcessor.cs
+++ b/sources/engine/Xenko.Video/VideoProcessor.cs
@@ -69,9 +69,9 @@ public void Initialize()
         /// <inheritdoc />
         public override void Draw(RenderContext context)
         {
-            foreach (var kv in ComponentDatas)
+            for (int i=0; i<ComponentDataValues.Count; i++)
             {
-                var associatedData = kv.Value;
+                var associatedData = ComponentDataValues[i];
                 associatedData.Draw(context.Time.Elapsed);
             }
         }
diff --git a/sources/engine/Xenko.Video/VideoSerializer.cs b/sources/engine/Xenko.Video/VideoSerializer.cs
new file mode 100644
index 0000000000..7fcaea7f09
--- /dev/null
+++ b/sources/engine/Xenko.Video/VideoSerializer.cs
@@ -0,0 +1,30 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core;
+using Xenko.Core.IO;
+using Xenko.Core.Serialization;
+using Xenko.Core.Serialization.Contents;
+
+namespace Xenko.Video
+{
+    /// <summary>
+    /// Used internally to serialize Video
+    /// </summary>
+    internal sealed class VideoSerializer : DataSerializer<Video>
+    {
+        public override void Serialize(ref Video video, ArchiveMode mode, SerializationStream stream)
+        {
+            if (mode == ArchiveMode.Deserialize)
+            {
+                var services = stream.Context.Tags.Get(ServiceRegistry.ServiceRegistryKey);
+
+                video.FileProvider = services.GetService<IDatabaseFileProviderService>()?.FileProvider;
+                video.CompressedDataUrl = stream.ReadString();
+            }
+            else
+            {
+                stream.Write(video.CompressedDataUrl);
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Video/Xenko.Video.csproj b/sources/engine/Xenko.Video/Xenko.Video.csproj
index 341ed9425d..734ceba078 100644
--- a/sources/engine/Xenko.Video/Xenko.Video.csproj
+++ b/sources/engine/Xenko.Video/Xenko.Video.csproj
@@ -1,11 +1,10 @@
-<Project>
+<Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoPlatformDependent>true</XenkoPlatformDependent>
@@ -14,9 +13,6 @@
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
     <XenkoPackAssets>true</XenkoPackAssets>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(XenkoPlatform)' == 'Android'">
-    <DefineConstants>XENKO_VIDEO_MEDIACODEC;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition="('$(XenkoPlatform)' == 'Windows') and ('$(XenkoNETRuntime)' != 'CoreCLR')">
     <DefineConstants>XENKO_VIDEO_FFMPEG;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
@@ -24,46 +20,26 @@
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
-    <Compile Update="Shaders\VideoShader.cs">
-      <DependentUpon>VideoShader.xksl</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <DesignTime>True</DesignTime>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
-    <PackageReference Include="SharpDX.MediaFoundation" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
-    <PackageReference Include="SharpDX.Direct3D12" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="SharpDX.MediaFoundation" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="SharpDX.Direct3D12" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows'" />
   </ItemGroup>
-  <Choose>
-    <When Condition="$(DefineConstants.Contains(XENKO_VIDEO_FFMPEG))">
-      <ItemGroup Condition="'$(XenkoPlatform)' == 'Android'">
-        <XenkoNativeLib Include="$(XenkoDependenciesDir)\FFmpeg\$(XenkoPlatform)\**\*.so">
-          <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-          <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </XenkoNativeLib>
-      </ItemGroup>
-      <ItemGroup Condition="'$(XenkoPlatform)' == 'Windows'">
-        <XenkoNativeLib Include="$(XenkoDependenciesDir)\FFmpeg\$(XenkoPlatform)\**\*.dll">
-          <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-          <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </XenkoNativeLib>
-      </ItemGroup>
-    </When>
-  </Choose>
-  <ItemGroup>
-    <None Include="Shaders\VideoShader.xksl">
-      <Generator>XenkoShaderKeyGenerator</Generator>
-      <LastGenOutput>VideoShader.cs</LastGenOutput>
-    </None>
+  <ItemGroup Condition="$(DefineConstants.Contains(XENKO_VIDEO_FFMPEG)) and '$(XenkoPlatform)' == 'Windows'">
+    <XenkoNativeLib Include="$(XenkoDependenciesDir)\FFmpeg\$(XenkoPlatform)\**\*.dll">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </XenkoNativeLib>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.2" Condition="'$(XenkoPlatform)' == 'Windows'" />
+    <PackageReference Include="FFmpeg.AutoGen" Version="3.4.0.6" Condition="'$(XenkoPlatform)' == 'Windows'" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.VirtualReality/DummyDevice.cs b/sources/engine/Xenko.VirtualReality/DummyDevice.cs
deleted file mode 100644
index d006d2f706..0000000000
--- a/sources/engine/Xenko.VirtualReality/DummyDevice.cs
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Linq;
-using Xenko.Core;
-using Xenko.Core.Diagnostics;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-using Xenko.Graphics;
-using Xenko.Input;
-
-namespace Xenko.VirtualReality
-{
-    public class DummyDevice : VRDevice
-    {
-        private const float HalfIpd = 0.06f;
-
-        /// <summary>
-        /// Use the gyroscope of the device to simulate device orientation changes.
-        /// </summary>
-        public bool UseGyroscope = true;
-
-        public override Size2 OptimalRenderFrameSize => optimalRenderFrameSize;
-
-        public override Size2 ActualRenderFrameSize { get; protected set; }
-
-        public override Texture MirrorTexture { get; protected set; }
-
-        public override float RenderFrameScaling { get; set; }
-
-        public override DeviceState State => DeviceState.Valid;
-
-        public override Vector3 HeadPosition => Vector3.Zero;
-
-        public override Quaternion HeadRotation => headRotation;
-
-        public override Vector3 HeadLinearVelocity => Vector3.Zero;
-
-        public override Vector3 HeadAngularVelocity => angularVelocity;
-
-        public override TouchController LeftHand => null;
-
-        public override TouchController RightHand => null;
-
-        public override TrackedItem[] TrackedItems => new TrackedItem[0];
-
-        public override bool CanInitialize => true;
-
-        /// <summary>
-        /// If true, build the mirror view.
-        /// </summary>
-        public bool BuildMirror = true;
-
-        private Quaternion headRotation = Quaternion.Identity;
-
-        private Vector3 angularVelocity = Vector3.Zero;
-
-        private IOrientationSensor orientationSensor;
-        private IGyroscopeSensor gyroscopeSensor;
-
-        private bool orientationInitialized;
-        private Quaternion orientationOffset = Quaternion.Identity;
-        
-        private static readonly Quaternion LandscapeLeftSpaceChange = Quaternion.RotationMatrix(new Matrix(0, 0, 1, 0,
-                                                                                                           1, 0, 0, 0,
-                                                                                                           0, 1, 0, 0,
-                                                                                                           0, 0, 0, 1));
-
-        private static readonly Quaternion LandscapeRightSpaceChange = Quaternion.RotationMatrix(new Matrix(+0, 0, -1, 0,
-                                                                                                            -1, 0,  0, 0,
-                                                                                                            +0, 1,  0, 0,
-                                                                                                            +0, 0,  0, 1));
-
-        private static readonly Quaternion PortraitSpaceChange = Quaternion.RotationMatrix(new Matrix(1, 0,  0, 0,
-                                                                                                      0, 0, -1, 0,
-                                                                                                      0, 1,  0, 0,
-                                                                                                      0, 0,  0, 1));
-
-        private Size2 optimalRenderFrameSize;
-
-        private GameWindow window;
-
-        public static Logger Logger = GlobalLogger.GetLogger("DummyVRDevice");
-
-        public DummyDevice(IServiceRegistry services)
-        {
-            VRApi = VRApi.Dummy;
-
-            var input = services.GetService<InputManager>();
-            if (input != null)
-            {
-                orientationSensor = input.Sensors.OfType<IOrientationSensor>().FirstOrDefault();
-                gyroscopeSensor = input.Sensors.OfType<IGyroscopeSensor>().FirstOrDefault();
-            }
-
-            window = services.GetService<IGame>().Window;
-        }
-
-        public override void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, bool requireMirror, int mirrorWidth, int mirrorHeight)
-        {
-            ActualRenderFrameSize = optimalRenderFrameSize = new Size2(mirrorWidth, mirrorHeight);
-            MirrorTexture = Texture.New2D(device, ActualRenderFrameSize.Width, ActualRenderFrameSize.Height, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-        }
-
-        public override void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Matrix cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection)
-        {
-            // As generated by Occulus VR
-            projection = new Matrix(1.19034183f, 0, 0, 0, 0, 0.999788344f, 0, 0, (eye == Eyes.Left ? -1.0f : 1.0f) * 0.148591548f, -0.110690169f, -1.0001f, -1, 0, 0, -0.10001f, 0);
-
-            // Adjust position from camera to eye
-            var eyeLocal = new Vector3((eye == Eyes.Left ? -HalfIpd : HalfIpd) * 0.5f, 0.0f, 0.0f) * ViewScaling;
-            Vector3 eyeWorld;
-            Matrix fullRotation;
-            var headRotationMatrix = ignoreHeadRotation ? Matrix.Identity : Matrix.RotationQuaternion(headRotation);
-            Matrix.MultiplyTo(ref headRotationMatrix, ref cameraRotation, out fullRotation);
-            Vector3.TransformCoordinate(ref eyeLocal, ref fullRotation, out eyeWorld);
-            var pos = cameraPosition + eyeWorld;
-
-            // Transpose ViewMatrix (rotation only, so equivalent to inversing it)
-            Matrix.Transpose(ref fullRotation, out view);
-
-            // Rotate our translation so that we can inject it in the view matrix directly
-            Vector3.TransformCoordinate(ref pos, ref view, out pos);
-
-            // Apply inverse of translation (equivalent to opposite)
-            view.TranslationVector = -pos;
-        }
-
-        public override void Commit(CommandList commandList, Texture renderFrame)
-        {
-            if (BuildMirror)
-                commandList.Copy(renderFrame, MirrorTexture);
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            //nothing needed
-        }
-
-        public override void Draw(GameTime gameTime)
-        {
-            if (UseGyroscope && gyroscopeSensor != null && orientationSensor != null)
-            {
-                gyroscopeSensor.IsEnabled = true;
-                orientationSensor.IsEnabled = true;
-
-                if (!orientationInitialized)
-                {
-                    orientationInitialized = true;
-                    Recenter();
-                }
-
-                UpdateHeadRotation();
-
-                var ratePhone = gyroscopeSensor.RotationRate;
-                angularVelocity = new Vector3(ratePhone.Z, ratePhone.X, ratePhone.Y);
-            }
-            else
-            {
-                orientationInitialized = false;
-                headRotation = Quaternion.Identity;
-                angularVelocity = Vector3.Zero;
-            }
-        }
-        private void UpdateHeadRotation()
-        {
-            var spaceChangeRotation = GetSpaceChangeRotation();
-            var sensorOrientation = orientationSensor.Quaternion;
-            Quaternion.Multiply(ref spaceChangeRotation, ref sensorOrientation, out headRotation);
-            Quaternion.Multiply(ref headRotation, ref orientationOffset, out headRotation);
-        }
-
-        public override void Recenter()
-        {
-            if (orientationSensor == null || !UseGyroscope)
-            {
-                headRotation = Quaternion.Identity;
-                return;
-            }
-            
-            var unitZTransform = Vector3.Transform(Vector3.UnitZ, GetSpaceChangeRotation() * orientationSensor.Quaternion);
-            var unitZProjected = new Vector3(unitZTransform.X, 0, unitZTransform.Z);
-            var directionAdjustmentAngle = unitZProjected.Length() > MathUtil.ZeroTolerance ? -Math.Sign(unitZProjected.X) * (float)Math.Acos(unitZProjected.Z / unitZProjected.Length()) : 0;
-            orientationOffset = Quaternion.RotationY(directionAdjustmentAngle);
-
-            // update the head rotation immediately so that it is updated from the current of the frame.
-            UpdateHeadRotation();
-        }
-
-        public Quaternion GetSpaceChangeRotation()
-        {
-            if (window == null)
-                return Quaternion.Identity;
-
-            switch (window.CurrentOrientation)
-            {
-                case DisplayOrientation.LandscapeLeft:
-                    return LandscapeLeftSpaceChange;
-                case DisplayOrientation.LandscapeRight:
-                    return LandscapeRightSpaceChange;
-                case DisplayOrientation.Default:
-                case DisplayOrientation.Portrait:
-                    return PortraitSpaceChange;
-                default:
-                    Logger.Error($"Unknown screen orientation type [{window.CurrentOrientation}].");
-                    return Quaternion.Identity;
-            }
-        }
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/Fove/Fove.cpp b/sources/engine/Xenko.VirtualReality/Fove/Fove.cpp
deleted file mode 100644
index 95cfed200f..0000000000
--- a/sources/engine/Xenko.VirtualReality/Fove/Fove.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#include "../../../deps/NativePath/NativePath.h"
-#include "../../Xenko.Native/XenkoNative.h"
-
-#if defined(WINDOWS_DESKTOP) || !defined(__clang__)
-
-#include "../../../deps/NativePath/NativeDynamicLinking.h"
-#include "../../../../deps/Fove/IFVRCompositor.h"
-#include "../../../../deps/Fove/IFVRHeadset.h"
-
-extern "C" 
-{
-	void* __libFove = NULL;
-
-	static bool sFoveInitialized = false;
-
-	static Fove::IFVRHeadset* sHeadSet = NULL;
-	static Fove::IFVRCompositor* sCompositor = NULL;
-
-	typedef Fove::IFVRHeadset* (*GetFVRHeadsetPtr)();
-	typedef Fove::IFVRCompositor* (*CGetFVRCompositorPtr)();
-
-	DLL_EXPORT_API npBool xnFoveStartup()
-	{
-		if (!__libFove)
-		{
-			__libFove = LoadDynamicLibrary("FoveClient");
-			if (!__libFove) __libFove = LoadDynamicLibrary("x86\\FoveClient");
-			if (!__libFove) __libFove = LoadDynamicLibrary("x64\\FoveClient");
-			if (!__libFove) __libFove = LoadDynamicLibrary("x64/FoveClient");
-			if (!__libFove) __libFove = LoadDynamicLibrary("x64/FoveClient");
-			if (!__libFove)
-			{
-				return false;
-			}
-
-			GetFVRHeadsetPtr get_fvr_headset_ptr = (GetFVRHeadsetPtr)GetSymbolAddress(__libFove, "CGetFVRHeadset");
-			if (!get_fvr_headset_ptr) return false;
-			sHeadSet = get_fvr_headset_ptr();
-
-			CGetFVRCompositorPtr get_fvr_compositor_ptr = (CGetFVRCompositorPtr)GetSymbolAddress(__libFove, "CGetFVRCompositor");
-			if (!get_fvr_compositor_ptr) return false;
-			sCompositor = get_fvr_compositor_ptr();
-		}
-
-		if(sHeadSet && !sFoveInitialized)
-		{
-			sFoveInitialized = sHeadSet->Initialise();
-		}
-
-		return sFoveInitialized;
-	}
-
-	DLL_EXPORT_API void xnFoveShutdown()
-	{
-		if (sCompositor) sCompositor->Shutdown();
-		if (sHeadSet) sHeadSet->Destroy();
-		if(__libFove)
-		{
-			FreeDynamicLibrary(__libFove);
-			__libFove = NULL;
-		}
-	}
-
-	DLL_EXPORT_API npBool xnFoveSubmit(void* texture, float* bounds, int eyeIndex)
-	{
-		if (!sCompositor) return false;
-
-		Fove::SFVR_TextureBounds fbounds;
-		fbounds.left = bounds[0];
-		fbounds.bottom = bounds[1];
-		fbounds.right = bounds[2];
-		fbounds.top = bounds[3];
-
-		return sCompositor->Submit(texture, 
-			Fove::EFVR_GraphicsAPI::DirectX, 
-				eyeIndex == 0 ? Fove::EFVR_Eye::Left : Fove::EFVR_Eye::Right, 
-				fbounds)
-		== Fove::EFVR_CompositorError::None;
-	}
-
-	DLL_EXPORT_API void xnFoveCommit()
-	{
-		if (sCompositor)
-		{
-			sCompositor->WaitForRenderPose();
-			//sCompositor->SignalFrameComplete();
-		}
-	}
-
-	DLL_EXPORT_API npBool xnFoveGetLeftEyePoint(float* point)
-	{
-		if(sHeadSet)
-		{
-			auto eyePoint = sHeadSet->GetGazePoint();
-			point[0] = eyePoint.coord.x;
-			point[1] = eyePoint.coord.y;
-
-			return eyePoint.error == Fove::EFVR_ErrorCode::None;
-		}
-
-		return false;
-	}
-
-#pragma pack(push, 4)
-	struct xnOvrFrameProperties
-	{
-		//Camera properties
-		float Near;
-		float Far;
-		float ProjLeft[16];
-		float ProjRight[16];
-		float Pos[3];
-		float Rot[4];
-	};
-#pragma pack(pop)
-
-	DLL_EXPORT_API void xnFovePrepareRender(xnOvrFrameProperties* properties)
-	{
-		auto matrixL = sHeadSet->GetProjectionMatrixRH(Fove::EFVR_Eye::Left, properties->Near, properties->Far);
-		auto matrixR = sHeadSet->GetProjectionMatrixRH(Fove::EFVR_Eye::Right, properties->Near, properties->Far);
-		memcpy(properties->ProjLeft, &matrixL, sizeof(float) * 16);
-		memcpy(properties->ProjRight, &matrixR, sizeof(float) * 16);
-
-		auto pose = sHeadSet->GetHMDPose();
-		memcpy(properties->Pos, &pose.position, sizeof(float) * 3);
-		memcpy(properties->Rot, &pose.orientation, sizeof(float) * 4);
-		properties->Pos[2] = -properties->Pos[2]; //flip Z
-	}
-
-	DLL_EXPORT_API void xnFoveRecenter()
-	{
-		if(sHeadSet)
-		{
-			sHeadSet->TareOrientationSensor();
-			sHeadSet->TarePositionSensors();
-		}
-	}
-
-	DLL_EXPORT_API npBool xnFoveIsHardwareReady()
-	{
-		if(sHeadSet)
-		{
-			return sHeadSet->IsHardwareConnected() && sHeadSet->IsHardwareReady();
-		}
-
-		return false;
-	}
-}
-
-#else
-
-extern "C"
-{
-	DLL_EXPORT_API npBool xnFoveStartup()
-	{
-		return false;
-	}
-
-	DLL_EXPORT_API void xnFoveShutdown()
-	{
-	}
-
-	DLL_EXPORT_API npBool xnFoveSubmit(void* texture, float* bounds, int eyeIndex)
-	{
-		return false;
-	}
-
-	DLL_EXPORT_API void xnFoveCommit()
-	{
-	}
-
-	DLL_EXPORT_API void xnFovePrepareRender(void* properties)
-	{
-	}
-
-	DLL_EXPORT_API npBool xnFoveGetLeftEyePoint(float* point)
-	{
-		return false;
-	}
-
-	DLL_EXPORT_API void xnFoveRecenter()
-	{
-	}
-
-	DLL_EXPORT_API bool xnFoveIsHardwareReady()
-	{
-		return false;
-	}
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/Fove/Fove.cs b/sources/engine/Xenko.VirtualReality/Fove/Fove.cs
deleted file mode 100644
index e1b5eda02f..0000000000
--- a/sources/engine/Xenko.VirtualReality/Fove/Fove.cs
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Security;
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.VirtualReality
-{
-    public static class Fove
-    {
-        static Fove()
-        {
-#if XENKO_PLATFORM_WINDOWS
-            NativeLibrary.PreloadLibrary(NativeInvoke.Library + ".dll", typeof(Fove));
-#endif
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveStartup", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool Startup();
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveShutdown", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Shutdown();
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveSubmit", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool Submit(IntPtr texture, ref Vector4 bounds, int eyeIndex);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveCommit", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Commit();
-
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        public struct FrameProperties
-        {
-            public float Near;
-            public float Far;
-            public Matrix ProjLeft;
-            public Matrix ProjRight;
-            public Vector3 Pos;
-            public Quaternion Rot;
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFovePrepareRender", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void PrepareRender(ref FrameProperties properties);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveGetLeftEyePoint", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool GetLeftEyePoint(ref Vector2 point);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveRecenter", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Recenter();
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnFoveIsHardwareReady", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool IsHardwareReady();
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/Fove/FoveHmd.cs b/sources/engine/Xenko.VirtualReality/Fove/FoveHmd.cs
deleted file mode 100644
index 60589ffeda..0000000000
--- a/sources/engine/Xenko.VirtualReality/Fove/FoveHmd.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-using Xenko.Graphics;
-
-//TODO
-
-namespace Xenko.VirtualReality
-{
-    internal class FoveHmd : VRDevice
-    {
-        //private Texture nonSrgbFrame;
-        private readonly Matrix referenceMatrix = Matrix.RotationZ(MathUtil.Pi);
-        private Matrix referenceMatrixInv;
-
-        private const float HalfIpd = 0.06f;
-        private const float EyeHeight = 0.08f;
-        private const float EyeForward = -0.04f;
-
-        internal FoveHmd()
-        {
-            referenceMatrixInv = Matrix.RotationZ(MathUtil.Pi);
-            referenceMatrixInv.Invert();
-        }
-
-        public override void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, bool requireMirror, int mirrorWidth, int mirrorHeight)
-        {
-//            RenderFrame = Texture.New2D(device, RenderFrameSize.Width, RenderFrameSize.Height, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-//            nonSrgbFrame = Texture.New2D(device, RenderFrameSize.Width, RenderFrameSize.Height, PixelFormat.R8G8B8A8_UNorm, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-//            if (requireMirror)
-//            {
-//                MirrorTexture = RenderFrame; //assign the surface we submit as mirror if needed
-//            }
-
-//            var compositor = (SceneGraphicsCompositorLayers)Game.SceneSystem.SceneInstance.RootScene.Settings.GraphicsCompositor;
-//            compositor.Master.Add(new SceneDelegateRenderer((x, y) =>
-//            {
-//                x.CommandList.Copy(RenderFrameProvider.RenderFrame.RenderTargets[0], nonSrgbFrame);
-//                //send to hmd
-//                var bounds0 = new Vector4(0.0f, 1.0f, 0.5f, 0.0f);
-//                var bounds1 = new Vector4(0.5f, 1.0f, 1.0f, 0.0f);
-//                if (!Fove.Submit(nonSrgbFrame.NativeResource.NativePointer, ref bounds0, 0) ||
-//                    !Fove.Submit(nonSrgbFrame.NativeResource.NativePointer, ref bounds1, 1))
-//                {
-//                    //failed...
-//                }
-//
-//                Fove.Commit();
-//            }));
-        }
-
-        public override void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Matrix cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public override void Commit(CommandList commandList, Texture renderFrame)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public override void Draw(GameTime gameTime)
-        {
-            throw new System.NotImplementedException();
-        }
-
-//        public override void Draw(GameTime gameTime)
-//        {
-//            var properties = new Fove.FrameProperties
-//            {
-//                Near = LeftCameraComponent.NearClipPlane,
-//                Far = LeftCameraComponent.FarClipPlane
-//            };
-//            Fove.PrepareRender(ref properties);
-//
-//            properties.ProjLeft.Transpose();
-//            properties.ProjRight.Transpose();
-//
-//            Vector3 scale, camPos;
-//            Quaternion camRot;
-//
-//            //have to make sure it's updated now
-//            CameraRootEntity.Transform.UpdateWorldMatrix();
-//            CameraRootEntity.Transform.WorldMatrix.Decompose(out scale, out camRot, out camPos);
-//
-//            LeftCameraComponent.ProjectionMatrix = properties.ProjLeft;
-//
-//            var pos = camPos + (new Vector3(-HalfIpd * 0.5f, EyeHeight, EyeForward) * ViewScaling);
-//            var posV = pos + Vector3.Transform(properties.Pos * ViewScaling, camRot);
-//            var rotV = referenceMatrix * Matrix.RotationQuaternion(properties.Rot) * referenceMatrixInv * Matrix.Scaling(ViewScaling) * Matrix.RotationQuaternion(camRot);
-//            var finalUp = Vector3.TransformCoordinate(new Vector3(0, 1, 0), rotV);
-//            var finalForward = Vector3.TransformCoordinate(new Vector3(0, 0, -1), rotV);
-//            var view = Matrix.LookAtRH(posV, posV + finalForward, finalUp);
-//            LeftCameraComponent.ViewMatrix = view;
-//
-//            RightCameraComponent.ProjectionMatrix = properties.ProjRight;
-//
-//            pos = camPos + (new Vector3(HalfIpd * 0.5f, EyeHeight, EyeForward) * ViewScaling);
-//            posV = pos + Vector3.Transform(properties.Pos * ViewScaling, camRot);
-//            rotV = referenceMatrix * Matrix.RotationQuaternion(properties.Rot) * referenceMatrixInv * Matrix.Scaling(ViewScaling) * Matrix.RotationQuaternion(camRot);
-//            finalUp = Vector3.TransformCoordinate(new Vector3(0, 1, 0), rotV);
-//            finalForward = Vector3.TransformCoordinate(new Vector3(0, 0, -1), rotV);
-//            view = Matrix.LookAtRH(posV, posV + finalForward, finalUp);
-//            RightCameraComponent.ViewMatrix = view;
-//
-//            base.Draw(gameTime);
-//        }
-
-        public override Size2 OptimalRenderFrameSize => new Size2(2560, 1440);
-        public override Size2 ActualRenderFrameSize { get; protected set; }
-
-        public override Texture MirrorTexture { get; protected set; }
-
-        public override float RenderFrameScaling { get; set; } = 1.2f;
-
-        public override DeviceState State => DeviceState.Valid;
-
-        public override Vector3 HeadPosition { get; }
-
-        public override Quaternion HeadRotation { get; }
-
-        public override Vector3 HeadLinearVelocity { get; }
-
-        public override Vector3 HeadAngularVelocity { get; }
-
-        public override TouchController LeftHand => null;
-
-        public override TouchController RightHand => null;
-
-        public override TrackedItem[] TrackedItems => new TrackedItem[0];
-
-        public override bool CanInitialize => Fove.Startup() && Fove.IsHardwareReady();
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVR.cpp b/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVR.cpp
deleted file mode 100644
index a84305fbe8..0000000000
--- a/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVR.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if defined(DONT_BUILD_FOR_NOW) && (defined(ANDROID) || defined(IOS)) || !defined(__clang__)
-
-#if !defined(__clang__)
-#define size_t unsigned long //shutup a error on resharper
-#endif
-
-#if defined(IOS)
-#define NP_STATIC_LINKING
-#endif
-
-#include "../../../common/core/Xenko.Core.Native/CoreNative.h"
-#include "../../../deps/NativePath/NativeDynamicLinking.h"
-#include "../../../deps/NativePath/NativePath.h"
-
-#define GVR_NO_CPP_WRAPPER
-#include "../../../../deps/GoogleVR/vr/gvr/capi/include/gvr_types.h"
-#include "../../../../deps/GoogleVR/vr/gvr/capi/include/gvr.h"
-
-extern "C" {
-	void* gGvrLibrary = NULL;
-	void* gGvrGLESv2 = NULL;
-	gvr_context* gGvrContext = NULL;
-
-#define GL_COLOR_WRITEMASK 0x0C23
-#define GL_SCISSOR_TEST 0x0C11
-#define GL_BLEND 0x0BE2
-#define GL_CULL_FACE 0x0B44
-#define GL_DEPTH_TEST 0x0B71
-#define GL_BLEND_EQUATION_RGB 0x8009
-#define GL_BLEND_EQUATION_ALPHA 0x883D
-#define GL_BLEND_DST_RGB 0x80C8
-#define GL_BLEND_SRC_RGB 0x80C9
-#define GL_BLEND_DST_ALPHA 0x80CA
-#define GL_BLEND_SRC_ALPHA 0x80CB
-#define GL_VIEWPORT 0x0BA2
-#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622
-#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623
-#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624
-#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625
-#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A
-#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645
-#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F
-#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895
-#define GL_ELEMENT_ARRAY_BUFFER 0x8893
-
-#define M_PI 3.14159265358979323846
-
-	typedef unsigned char GLboolean;
-	typedef unsigned int GLenum;
-	typedef unsigned int GLuint;
-	typedef int GLint;
-	typedef int GLsizei;
-	typedef void GLvoid;
-
-	NP_IMPORT(void, glColorMask, GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha);
-	NP_IMPORT(void, glDisable, GLenum cap);
-	NP_IMPORT(void, glEnable, GLenum cap);
-	NP_IMPORT(void, glGetBooleanv, GLenum pname, GLboolean* data);
-	NP_IMPORT(void, glGetIntegerv, GLenum pname, GLint* data);
-	NP_IMPORT(void, glBlendEquationSeparate, GLenum modeRGB, GLenum modeAlpha);
-	NP_IMPORT(void, glBlendFuncSeparate, GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
-	NP_IMPORT(void, glViewport, GLint x, GLint y, GLsizei width, GLsizei height);
-	NP_IMPORT(void, glDisableVertexAttribArray, GLuint index);
-	NP_IMPORT(void, glGetVertexAttribiv, GLuint index, GLenum pname, GLint *params);
-	NP_IMPORT(void, glVertexAttribPointer, GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid* pointer);
-	NP_IMPORT(void, glGetVertexAttribPointerv, GLuint index, GLenum pname, GLvoid** pointer);
-	NP_IMPORT(void, glBindBuffer, GLenum target, GLuint buffer);
-
-	NP_IMPORT(void, gvr_initialize_gl, gvr_context* gvr);
-	NP_IMPORT(int32_t, gvr_clear_error, gvr_context* gvr);
-	NP_IMPORT(int32_t, gvr_get_error, gvr_context* gvr);
-	NP_IMPORT(gvr_buffer_viewport_list*, gvr_buffer_viewport_list_create, const gvr_context* gvr);
-	NP_IMPORT(void, gvr_get_recommended_buffer_viewports, const gvr_context* gvr, gvr_buffer_viewport_list* viewport_list);
-	NP_IMPORT(void, gvr_buffer_viewport_list_get_item, const gvr_buffer_viewport_list* viewport_list, size_t index, gvr_buffer_viewport* viewport);
-	NP_IMPORT(gvr_buffer_viewport*, gvr_buffer_viewport_create, gvr_context* gvr);
-	NP_IMPORT(gvr_sizei, gvr_get_maximum_effective_render_target_size, const gvr_context* gvr);
-	NP_IMPORT(gvr_buffer_spec*, gvr_buffer_spec_create, gvr_context* gvr);
-	NP_IMPORT(void, gvr_buffer_spec_destroy, gvr_buffer_spec** spec);
-	NP_IMPORT(void, gvr_buffer_spec_set_size, gvr_buffer_spec* spec, gvr_sizei size);
-	NP_IMPORT(void, gvr_buffer_spec_set_samples, gvr_buffer_spec* spec, int32_t num_samples);
-	NP_IMPORT(gvr_frame*, gvr_swap_chain_acquire_frame, gvr_swap_chain* swap_chain);
-	NP_IMPORT(int32_t, gvr_frame_get_framebuffer_object, const gvr_frame* frame, int32_t index);
-	NP_IMPORT(void, gvr_swap_chain_resize_buffer, gvr_swap_chain* swap_chain, int32_t index, gvr_sizei size);
-	NP_IMPORT(void, gvr_frame_submit, gvr_frame** frame, const gvr_buffer_viewport_list* list, gvr_mat4f head_space_from_start_space);
-	NP_IMPORT(gvr_mat4f, gvr_get_head_space_from_start_space_rotation ,const gvr_context* gvr, const gvr_clock_time_point time);
-	NP_IMPORT(gvr_clock_time_point, gvr_get_time_point_now);
-	NP_IMPORT(gvr_rectf, gvr_buffer_viewport_get_source_uv, const gvr_buffer_viewport* viewport);
-	NP_IMPORT(void, gvr_refresh_viewer_profile, gvr_context* gvr);
-	NP_IMPORT(void, gvr_frame_bind_buffer, gvr_frame* frame, int32_t index);
-	NP_IMPORT(void, gvr_frame_unbind, gvr_frame* frame);
-	NP_IMPORT(gvr_context*, gvr_create);
-	NP_IMPORT(void, gvr_set_surface_size, gvr_context* gvr, gvr_sizei surface_size_pixels);
-	NP_IMPORT(void, gvr_buffer_spec_set_color_format, gvr_buffer_spec* spec, int32_t color_format);
-	NP_IMPORT(void, gvr_buffer_spec_set_depth_stencil_format, gvr_buffer_spec* spec, int32_t depth_stencil_format);
-	NP_IMPORT(gvr_swap_chain*, gvr_swap_chain_create, gvr_context* gvr, const gvr_buffer_spec** buffers, int32_t count);
-	NP_IMPORT(gvr_mat4f, gvr_get_eye_from_head_matrix, const gvr_context* gvr, const int32_t eye);
-	NP_IMPORT(gvr_rectf, gvr_buffer_viewport_get_source_fov, const gvr_buffer_viewport* viewport);
-
-	gvr_buffer_viewport_list* xnGvr_ViewportsList = NULL;
-	gvr_buffer_viewport* xnGvr_LeftVieport = NULL;
-	gvr_buffer_viewport* xnGvr_RightVieport = NULL;
-
-	gvr_swap_chain* xnGvr_swap_chain = NULL;
-
-	gvr_sizei xnGvr_size;
-
-	uint64_t kPredictionTimeWithoutVsyncNanos = 50000000;
-
-	int xnGvrStartup(gvr_context* context)
-	{
-		//cnDebugPrintLine("xnGvrStartup");
-
-		if (!gGvrLibrary)
-		{
-#if defined(ANDROID)
-			gGvrLibrary = LoadDynamicLibrary("libgvr");
-			gGvrGLESv2 = LoadDynamicLibrary("libGLESv2");
-			auto core = LoadDynamicLibrary("libcore");
-			cnDebugPrintLine = (CnPrintDebugFunc)GetSymbolAddress(core, "cnDebugPrintLine");
-#else
-			gGvrLibrary = LoadDynamicLibrary(NULL);
-			gGvrGLESv2 = LoadDynamicLibrary(NULL);
-#endif
-
-			if (!gGvrLibrary) return 1;
-
-			NP_LOAD(gGvrGLESv2, glColorMask);
-			NP_CHECK(glColorMask, return false);
-			NP_LOAD(gGvrGLESv2, glDisable);
-			NP_CHECK(glDisable, return false);
-			NP_LOAD(gGvrGLESv2, glEnable);
-			NP_CHECK(glEnable, return false);
-			NP_LOAD(gGvrGLESv2, glGetBooleanv);
-			NP_CHECK(glGetBooleanv, return false);
-			NP_LOAD(gGvrGLESv2, glGetIntegerv);
-			NP_CHECK(glGetIntegerv, return false);
-			NP_LOAD(gGvrGLESv2, glBlendEquationSeparate);
-			NP_CHECK(glBlendEquationSeparate, return false);
-			NP_LOAD(gGvrGLESv2, glBlendFuncSeparate);
-			NP_CHECK(glBlendFuncSeparate, return false);
-			NP_LOAD(gGvrGLESv2, glViewport);
-			NP_CHECK(glViewport, return false);
-			NP_LOAD(gGvrGLESv2, glDisableVertexAttribArray);
-			NP_CHECK(glDisableVertexAttribArray, return false);
-			NP_LOAD(gGvrGLESv2, glGetVertexAttribiv);
-			NP_CHECK(glGetVertexAttribiv, return false);
-			NP_LOAD(gGvrGLESv2, glVertexAttribPointer);
-			NP_CHECK(glVertexAttribPointer, return false);
-			NP_LOAD(gGvrGLESv2, glGetVertexAttribPointerv);
-			NP_CHECK(glGetVertexAttribPointerv, return false);
-			NP_LOAD(gGvrGLESv2, glBindBuffer);
-			NP_CHECK(glBindBuffer, return false);
-
-			NP_LOAD(gGvrLibrary, gvr_refresh_viewer_profile);
-			NP_CHECK(gvr_refresh_viewer_profile, return 2);
-		}
-
-		if(context)
-		{
-			gGvrContext = context;
-		}
-		else
-		{
-			NP_LOAD(gGvrLibrary, gvr_create);
-			NP_CHECK(gvr_create, return 3);
-			gGvrContext = NP_CALL(gvr_create);
-
-			if (gGvrContext == NULL) return 4;
-		}
-		
-		NP_LOAD(gGvrLibrary, gvr_get_maximum_effective_render_target_size);
-		NP_CHECK(gvr_get_maximum_effective_render_target_size, return 5);
-
-		NP_CALL(gvr_refresh_viewer_profile, gGvrContext);
-
-		NP_LOAD(gGvrLibrary, gvr_set_surface_size);
-		NP_CHECK(gvr_set_surface_size, return 6);
-
-		return 0;
-	}
-
-	void xnGvrGetMaxRenderSize(int* outWidth, int* outHeight)
-	{
-		auto maxSize = NP_CALL(gvr_get_maximum_effective_render_target_size, gGvrContext);
-		*outHeight = maxSize.height;
-		*outWidth = maxSize.width;
-	}
-
-	npBool xnGvrInit(int width, int height)
-	{
-		xnGvr_size.width = width;
-		xnGvr_size.height = height;
-
-		NP_CALL(gvr_set_surface_size, gGvrContext, xnGvr_size);
-
-		NP_LOAD(gGvrLibrary, gvr_initialize_gl);
-		NP_CHECK(gvr_initialize_gl, return false);
-		NP_LOAD(gGvrLibrary, gvr_clear_error);
-		NP_CHECK(gvr_clear_error, return false);
-		NP_LOAD(gGvrLibrary, gvr_get_error);
-		NP_CHECK(gvr_get_error, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_viewport_list_create);
-		NP_CHECK(gvr_buffer_viewport_list_create, return false);
-		NP_LOAD(gGvrLibrary, gvr_get_recommended_buffer_viewports);
-		NP_CHECK(gvr_get_recommended_buffer_viewports, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_viewport_list_get_item);
-		NP_CHECK(gvr_buffer_viewport_list_get_item, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_viewport_create);
-		NP_CHECK(gvr_buffer_viewport_create, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_spec_create);
-		NP_CHECK(gvr_buffer_spec_create, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_spec_destroy);
-		NP_CHECK(gvr_buffer_spec_destroy, return false);
-		NP_LOAD(gGvrLibrary, gvr_swap_chain_acquire_frame);
-		NP_CHECK(gvr_swap_chain_acquire_frame, return false);
-		NP_LOAD(gGvrLibrary, gvr_frame_get_framebuffer_object);
-		NP_CHECK(gvr_frame_get_framebuffer_object, return false);
-		NP_LOAD(gGvrLibrary, gvr_swap_chain_resize_buffer);
-		NP_CHECK(gvr_swap_chain_resize_buffer, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_spec_set_color_format);
-		NP_CHECK(gvr_buffer_spec_set_color_format, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_spec_set_depth_stencil_format);
-		NP_CHECK(gvr_buffer_spec_set_depth_stencil_format, return false);
-		NP_LOAD(gGvrLibrary, gvr_swap_chain_create);
-		NP_CHECK(gvr_swap_chain_create, return false);
-		NP_LOAD(gGvrLibrary, gvr_frame_submit);
-		NP_CHECK(gvr_frame_submit, return false);
-		NP_LOAD(gGvrLibrary, gvr_get_head_space_from_start_space_rotation);
-		NP_CHECK(gvr_get_head_space_from_start_space_rotation, return false);
-		NP_LOAD(gGvrLibrary, gvr_get_time_point_now);
-		NP_CHECK(gvr_get_time_point_now, return false);
-		NP_LOAD(gGvrLibrary, gvr_frame_bind_buffer);
-		NP_CHECK(gvr_frame_bind_buffer, return false);
-		NP_LOAD(gGvrLibrary, gvr_frame_unbind);
-		NP_CHECK(gvr_frame_unbind, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_viewport_get_source_uv);
-		NP_CHECK(gvr_buffer_viewport_get_source_uv, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_spec_set_size);
-		NP_CHECK(gvr_buffer_spec_set_size, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_spec_set_samples);
-		NP_CHECK(gvr_buffer_spec_set_samples, return false);
-		NP_LOAD(gGvrLibrary, gvr_get_eye_from_head_matrix);
-		NP_CHECK(gvr_get_eye_from_head_matrix, return false);
-		NP_LOAD(gGvrLibrary, gvr_buffer_viewport_get_source_fov);
-		NP_CHECK(gvr_buffer_viewport_get_source_fov, return false);
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_initialize_gl, gGvrContext);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		xnGvr_ViewportsList = NP_CALL(gvr_buffer_viewport_list_create, gGvrContext);
-		NP_CALL(gvr_get_recommended_buffer_viewports, gGvrContext, xnGvr_ViewportsList);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		xnGvr_LeftVieport = NP_CALL(gvr_buffer_viewport_create, gGvrContext);
-		xnGvr_RightVieport = NP_CALL(gvr_buffer_viewport_create, gGvrContext);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_buffer_viewport_list_get_item, xnGvr_ViewportsList, 0, xnGvr_LeftVieport);
-		NP_CALL(gvr_buffer_viewport_list_get_item, xnGvr_ViewportsList, 1, xnGvr_RightVieport);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		auto bufferSpec = NP_CALL(gvr_buffer_spec_create, gGvrContext);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_buffer_spec_set_size, bufferSpec, xnGvr_size);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_buffer_spec_set_samples, bufferSpec, 1);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_buffer_spec_set_color_format, bufferSpec, GVR_COLOR_FORMAT_RGBA_8888);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_buffer_spec_set_depth_stencil_format, bufferSpec, GVR_DEPTH_STENCIL_FORMAT_NONE);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE) return false;
-	
-		NP_CALL(gvr_clear_error, gGvrContext);
-		const gvr_buffer_spec* specs[] = { bufferSpec };
-		xnGvr_swap_chain = NP_CALL(gvr_swap_chain_create, gGvrContext, specs, 1);
-		if (NP_CALL(gvr_get_error, gGvrContext) != GVR_ERROR_NONE || xnGvr_swap_chain == NULL) return false;
-
-		NP_CALL(gvr_buffer_spec_destroy, &bufferSpec);
-
-		NP_CALL(gvr_clear_error, gGvrContext);
-		NP_CALL(gvr_swap_chain_resize_buffer, xnGvr_swap_chain, 0, xnGvr_size);
-		if (NP_CALL(gvr_get_error, gGvrContext)) return false;
-
-		return true;
-	}
-
-	void xnGvrGetPerspectiveMatrix(int eyeIndex, float near_clip, float far_clip, gvr_mat4f* outResult)
-	{
-#ifdef IOS
-		//eyeIndex = eyeIndex == 0 ? 1 : 0;
-#endif
-
-		auto fov = NP_CALL(gvr_buffer_viewport_get_source_fov, eyeIndex == 0 ? xnGvr_LeftVieport : xnGvr_RightVieport);
-		float x_left = -tan(fov.left * M_PI / 180.0f) * near_clip;
-		float x_right = tan(fov.right * M_PI / 180.0f) * near_clip;
-		float y_bottom = -tan(fov.bottom * M_PI / 180.0f) * near_clip;
-		float y_top = tan(fov.top * M_PI / 180.0f) * near_clip;
-
-		const auto X = (2 * near_clip) / (x_right - x_left);
-		const auto Y = (2 * near_clip) / (y_top - y_bottom);
-		const auto A = (x_right + x_left) / (x_right - x_left);
-		const auto B = (y_top + y_bottom) / (y_top - y_bottom);
-		const auto C = (near_clip + far_clip) / (near_clip - far_clip);
-		const auto D = (2 * near_clip * far_clip) / (near_clip - far_clip);
-
-		for (auto i = 0; i < 4; ++i) 
-		{
-			for (auto j = 0; j < 4; ++j) 
-			{
-				outResult->m[i][j] = 0.0f;
-			}
-		}
-
-		outResult->m[0][0] = X;
-		outResult->m[0][2] = A;
-		outResult->m[1][1] = Y;
-		outResult->m[1][2] = B;
-		outResult->m[2][2] = C;
-		outResult->m[2][3] = D;
-		outResult->m[3][2] = -1;
-	}
-
-	void xnGvrGetHeadMatrix(float* outMatrix)
-	{
-		auto time = NP_CALL(gvr_get_time_point_now);
-		time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
-		auto gvrMat4 = reinterpret_cast<gvr_mat4f*>(outMatrix);
-		*gvrMat4 = NP_CALL(gvr_get_head_space_from_start_space_rotation, gGvrContext, time);
-	}
-
-	void xnGvrGetEyeMatrix(int eyeIndex, float* outMatrix)
-	{
-#ifdef IOS
-		//eyeIndex = eyeIndex == 0 ? 1 : 0;
-#endif
-
-		auto gvrMat4 = reinterpret_cast<gvr_mat4f*>(outMatrix);
-		*gvrMat4 = NP_CALL(gvr_get_eye_from_head_matrix, gGvrContext, eyeIndex);
-	}
-
-	void* xnGvrGetNextFrame()
-	{
-		NP_CALL(gvr_clear_error, gGvrContext);
-		auto frame = NP_CALL(gvr_swap_chain_acquire_frame, xnGvr_swap_chain);
-		auto err = NP_CALL(gvr_get_error, gGvrContext);
-		return err == GVR_ERROR_NONE ? frame : NULL;
-	}
-
-	int xnGvrGetFBOIndex(gvr_frame* frame, int index)
-	{
-		return NP_CALL(gvr_frame_get_framebuffer_object, frame, index);
-	}
-
-	npBool xnGvrSubmitFrame(gvr_frame* frame, float* headMatrix)
-	{
-		GLboolean masks[4];
-		NP_CALL(glGetBooleanv, GL_COLOR_WRITEMASK, masks);
-		NP_CALL(glColorMask, true, true, true, true); // This was the super major headache and it's needed
-
-		GLboolean scissor;
-		NP_CALL(glGetBooleanv, GL_SCISSOR_TEST, &scissor);
-
-		GLboolean blend;
-		NP_CALL(glGetBooleanv, GL_BLEND, &blend);
-
-		GLboolean cullFace;
-		NP_CALL(glGetBooleanv, GL_CULL_FACE, &cullFace);
-
-		GLboolean depthTest;
-		NP_CALL(glGetBooleanv, GL_DEPTH_TEST, &depthTest);
-
-		GLint eqRgb;
-		NP_CALL(glGetIntegerv, GL_BLEND_EQUATION_RGB, &eqRgb);
-		GLint eqAlpha;
-		NP_CALL(glGetIntegerv, GL_BLEND_EQUATION_ALPHA, &eqAlpha);
-
-		GLint dstRgb;
-		NP_CALL(glGetIntegerv, GL_BLEND_DST_RGB, &dstRgb);
-		GLint dstAlpha;
-		NP_CALL(glGetIntegerv, GL_BLEND_DST_ALPHA, &dstAlpha);
-		GLint srcRgb;
-		NP_CALL(glGetIntegerv, GL_BLEND_SRC_RGB, &srcRgb);
-		GLint srcAlpha;
-		NP_CALL(glGetIntegerv, GL_BLEND_SRC_ALPHA, &srcAlpha);
-
-		GLint viewport[4];
-		NP_CALL(glGetIntegerv, GL_VIEWPORT, viewport);
-
-		GLint index0Vert, index1Vert;
-		NP_CALL(glGetVertexAttribiv, 0, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &index0Vert);
-		NP_CALL(glGetVertexAttribiv, 1, GL_VERTEX_ATTRIB_ARRAY_ENABLED, &index1Vert);
-
-		GLint index0Size, index1Size;
-		NP_CALL(glGetVertexAttribiv, 0, GL_VERTEX_ATTRIB_ARRAY_SIZE, &index0Size);
-		NP_CALL(glGetVertexAttribiv, 1, GL_VERTEX_ATTRIB_ARRAY_SIZE, &index1Size);
-
-		GLint index0Type, index1Type;
-		NP_CALL(glGetVertexAttribiv, 0, GL_VERTEX_ATTRIB_ARRAY_TYPE, &index0Type);
-		NP_CALL(glGetVertexAttribiv, 1, GL_VERTEX_ATTRIB_ARRAY_TYPE, &index1Type);
-
-		GLint index0Normalized, index1Normalized;
-		NP_CALL(glGetVertexAttribiv, 0, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &index0Normalized);
-		NP_CALL(glGetVertexAttribiv, 1, GL_VERTEX_ATTRIB_ARRAY_NORMALIZED, &index1Normalized);
-
-		GLint index0Stride, index1Stride;
-		NP_CALL(glGetVertexAttribiv, 0, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &index0Stride);
-		NP_CALL(glGetVertexAttribiv, 1, GL_VERTEX_ATTRIB_ARRAY_STRIDE, &index1Stride);
-
-		GLvoid* index0Ptr;
-		GLvoid* index1Ptr;
-		NP_CALL(glGetVertexAttribPointerv, 0, GL_VERTEX_ATTRIB_ARRAY_POINTER, &index0Ptr);
-		NP_CALL(glGetVertexAttribPointerv, 1, GL_VERTEX_ATTRIB_ARRAY_POINTER, &index1Ptr);
-
-		GLint indexBuffer;
-		NP_CALL(glGetIntegerv, GL_ELEMENT_ARRAY_BUFFER_BINDING, &indexBuffer);
-
-		NP_CALL(gvr_clear_error, gGvrContext);		
-		gvr_mat4f* gvrMat4 = reinterpret_cast<gvr_mat4f*>(headMatrix);
-		NP_CALL(gvr_frame_submit, &frame, xnGvr_ViewportsList, *gvrMat4);
-		auto err = NP_CALL(gvr_get_error, gGvrContext);
-
-		NP_CALL(glViewport, viewport[0], viewport[1], viewport[2], viewport[3]);
-
-		NP_CALL(glColorMask, masks[0], masks[1], masks[2], masks[3]);
-		
-		if (scissor)
-		{
-			NP_CALL(glEnable, GL_SCISSOR_TEST);
-		}
-
-		if(!blend)
-		{
-			NP_CALL(glDisable, GL_BLEND);
-		}
-
-		if(cullFace)
-		{
-			NP_CALL(glEnable, GL_CULL_FACE);
-		}
-
-		if(depthTest)
-		{
-			NP_CALL(glEnable, GL_DEPTH_TEST);
-		}
-
-		NP_CALL(glBlendEquationSeparate, eqRgb, eqAlpha);
-
-		NP_CALL(glBlendFuncSeparate, srcRgb, dstRgb, srcAlpha, dstAlpha);
-
-		NP_CALL(glVertexAttribPointer, 0, index0Size, index0Type, index0Normalized, index0Stride, index0Ptr);
-		NP_CALL(glVertexAttribPointer, 1, index1Size, index1Type, index1Normalized, index1Stride, index1Ptr);
-
-		if(!index0Vert)
-		{
-			NP_CALL(glDisableVertexAttribArray, 0);
-		}
-
-		if (!index1Vert)
-		{
-			NP_CALL(glDisableVertexAttribArray, 1);
-		}
-
-		NP_CALL(glBindBuffer, GL_ELEMENT_ARRAY_BUFFER, indexBuffer);
-
-		return err == GVR_ERROR_NONE;
-	}
-}
-
-#else
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVR.cs b/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVR.cs
deleted file mode 100644
index 485c7d0a90..0000000000
--- a/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVR.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if DONT_BUILD_FOR_NOW && (XENKO_PLATFORM_IOS || XENKO_PLATFORM_ANDROID)
-
-using System;
-using System.Runtime.InteropServices;
-using System.Security;
-using OpenTK.Graphics.ES20;
-using Xenko.Core.Mathematics;
-using Xenko.Graphics;
-
-#if XENKO_PLATFORM_ANDROID
-using Java.Lang;
-using Android.App;
-using Android.Views;
-using Com.Google.VR.Ndk.Base;
-using Xenko.Games;
-#endif
-
-namespace Xenko.VirtualReality
-{
-    public static class GoogleVr
-    {
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrStartup", CallingConvention = CallingConvention.Cdecl)]
-        private static extern int InternalStartup(IntPtr ctx);
-
-#if XENKO_PLATFORM_ANDROID
-
-        public static void Startup(Game game, Activity androidActivity)
-        {
-            game.WindowCreated += (sender1, args1) =>
-            {
-                var androidWindow = (GameWindowAndroid)game.Window;
-
-                // Setup VR layout
-                var layout = new GvrLayout(androidActivity);
-                if (layout.SetAsyncReprojectionEnabled(true))
-                {
-                    AndroidCompat.SetSustainedPerformanceMode(androidActivity, true);
-                }
-                AndroidCompat.SetVrModeEnabled(androidActivity, true);
-
-                ((ViewGroup)androidWindow.XenkoGameForm.Parent).RemoveView(androidWindow.XenkoGameForm);
-                layout.SetPresentationView(androidWindow.XenkoGameForm);
-                androidActivity.SetContentView(layout);
-
-                // Init native, we need to reflect some methods that xamarin failed to wrap
-                var classGvrLayout = Class.ForName("com.google.vr.ndk.base.GvrLayout");
-                var getGvrApiMethod = classGvrLayout.GetMethod("getGvrApi");
-                var gvrApi = getGvrApiMethod.Invoke(layout);
-                var classGvrApi = Class.ForName("com.google.vr.ndk.base.GvrApi");
-                var getNativeGvrContextMethod = classGvrApi.GetMethod("getNativeGvrContext");
-                var nativeContextLong = (long)getNativeGvrContextMethod.Invoke(gvrApi);
-                var nativeCtx = new IntPtr(nativeContextLong);
-
-                if (InternalStartup(nativeCtx) != 0)
-                {
-                    throw new System.Exception("Failed to Startup Google VR SDK");
-                }
-            };
-        }
-
-#elif XENKO_PLATFORM_IOS
-
-        public static void Startup(Game game)
-        {
-            game.WindowCreated += (sender1, args1) =>
-            {
-                var res = InternalStartup(IntPtr.Zero);
-                if (res != 0)
-                {
-                    throw new Exception("Failed to init Google cardboad SDK.");
-                }
-            };
-        }
-
-#endif
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrGetMaxRenderSize", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetMaxRenderSize(out int width, out int height);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrInit", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool Init(int width, int height);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrGetPerspectiveMatrix", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetPerspectiveMatrix(int eyeIndex, float near, float far, out Matrix headMatrix);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrGetHeadMatrix", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetHeadMatrix(out Matrix headMatrix);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrGetEyeMatrix", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetEyeMatrix(int eyeIndex, out Matrix headMatrix);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrGetNextFrame", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr GetNextFrame();
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrGetFBOIndex", CallingConvention = CallingConvention.Cdecl)]
-        private static extern int GetFBOIndex(IntPtr frame, int index);
-
-        public static void SubmitRenderTarget(GraphicsContext context, Texture renderTarget, IntPtr vrFrame, int index)
-        {
-            int currentFrameBuffer;
-            GL.GetInteger(GetPName.FramebufferBinding, out currentFrameBuffer);
-
-            //TODO add proper destination values
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, GetFBOIndex(vrFrame, index));
-            // The next call will write straight to the previously bound buffer
-            context.CommandList.CopyScaler2D(renderTarget,
-                new Rectangle(0, 0, renderTarget.Width, renderTarget.Height),
-                new Rectangle(0, 0, renderTarget.Width, renderTarget.Height)
-            );
-
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, currentFrameBuffer);
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnGvrSubmitFrame", CallingConvention = CallingConvention.Cdecl)]
-        private static extern bool InternalSubmitFrame(IntPtr frame, ref Matrix headMatrix);
-
-        public static bool SubmitFrame(GraphicsDevice graphicsDevice, IntPtr frame, ref Matrix headMatrix)
-        {
-            int currentFrameBuffer;
-            GL.GetInteger(GetPName.FramebufferBinding, out currentFrameBuffer);
-
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, graphicsDevice.FindOrCreateFBO(graphicsDevice.Presenter.BackBuffer));
-
-            var res = InternalSubmitFrame(frame, ref headMatrix);;
-
-            GL.BindFramebuffer(FramebufferTarget.Framebuffer, currentFrameBuffer);
-
-            return res;
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVrHmd.cs b/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVrHmd.cs
deleted file mode 100644
index 06e2c3bcd5..0000000000
--- a/sources/engine/Xenko.VirtualReality/GoogleVR/GoogleVrHmd.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if DONT_BUILD_FOR_NOW && (XENKO_PLATFORM_IOS || XENKO_PLATFORM_ANDROID)
-
-using System;
-#if XENKO_PLATFORM_ANDROID
-using Android.App;
-#endif
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-using Xenko.Engine;
-using Xenko.Games;
-using Xenko.Graphics;
-using Xenko.Rendering;
-using Xenko.Rendering.Composers;
-
-namespace Xenko.VirtualReality
-{
-    internal class GoogleVrHmd : Hmd
-    {
-        private Matrix headMatrix;
-
-        public GoogleVrHmd(IServiceRegistry registry) : base(registry)
-        {
-#if XENKO_PLATFORM_ANDROID
-            GoogleVr.Startup(Game, (Activity)PlatformAndroid.Context);
-#else
-            GoogleVr.Startup(Game);
-#endif
-        }
-
-        public override void Initialize(Entity cameraRoot, CameraComponent leftCamera, CameraComponent rightCamera, bool requireMirror = false)
-        {
-            var size = RenderFrameSize;
-            if (!GoogleVr.Init(size.Width, size.Height))
-            {
-                throw new Exception("Failed to Init Google VR SDK");
-            }
-
-            RenderFrameProvider = new DirectRenderFrameProvider(RenderFrame.FromTexture(
-                Texture.New2D(GraphicsDevice, size.Width, size.Height, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.RenderTarget | TextureFlags.ShaderResource)
-            ));
-
-            var compositor = (SceneGraphicsCompositorLayers)Game.SceneSystem.SceneInstance.RootScene.Settings.GraphicsCompositor;
-            compositor.Master.Add(new SceneDelegateRenderer((x, y) =>
-            {
-                var frame = GoogleVr.GetNextFrame();
-                GoogleVr.SubmitRenderTarget(x.GraphicsContext, RenderFrameProvider.RenderFrame.RenderTargets[0], frame, 0);
-                if (!GoogleVr.SubmitFrame(GraphicsDevice, frame, ref headMatrix))
-                {
-                    throw new Exception("Failed to SubmitFrame to Google VR SDK");
-                }
-            }));
-
-            leftCamera.UseCustomProjectionMatrix = true;
-            rightCamera.UseCustomProjectionMatrix = true;
-            leftCamera.UseCustomViewMatrix = true;
-            rightCamera.UseCustomViewMatrix = true;
-            leftCamera.NearClipPlane *= ViewScaling;
-            rightCamera.NearClipPlane *= ViewScaling;
-
-            if (requireMirror)
-            {
-                MirrorTexture = RenderFrameProvider.RenderFrame.RenderTargets[0]; //we don't really have a mirror in this case but avoid crashes
-            }
-
-            base.Initialize(cameraRoot, leftCamera, rightCamera, requireMirror);
-        }
-
-        public override void Draw(GameTime gameTime)
-        {
-            GoogleVr.GetHeadMatrix(out headMatrix);
-            var headMatrixTr = headMatrix;
-            headMatrixTr.Transpose();
-
-            Matrix leftEyeMatrix, rightEyeMatrix;
-            GoogleVr.GetEyeMatrix(0, out leftEyeMatrix);
-            GoogleVr.GetEyeMatrix(1, out rightEyeMatrix);
-
-            Matrix projLeft, projRight;
-            GoogleVr.GetPerspectiveMatrix(0, LeftCameraComponent.NearClipPlane, LeftCameraComponent.FarClipPlane, out projLeft);
-            GoogleVr.GetPerspectiveMatrix(1, LeftCameraComponent.NearClipPlane, LeftCameraComponent.FarClipPlane, out projRight);
-
-//            var iosRotL = Matrix.RotationYawPitchRoll(0, 0, MathUtil.Pi);
-//            var iosRotR = Matrix.RotationYawPitchRoll(0, 0, MathUtil.Pi);
-//            projLeft *= iosRotL;
-//            projRight *= iosRotR;
-
-            Vector3 scale, camPos;
-            Quaternion camRot;
-
-            //have to make sure it's updated now
-            CameraRootEntity.Transform.UpdateWorldMatrix();
-            CameraRootEntity.Transform.WorldMatrix.Decompose(out scale, out camRot, out camPos);
-
-            LeftCameraComponent.ProjectionMatrix = projLeft;
-
-            var pos = camPos + leftEyeMatrix.TranslationVector * ViewScaling;
-            var rotV = headMatrixTr * Matrix.Scaling(ViewScaling) * Matrix.RotationQuaternion(camRot);
-            var finalUp = Vector3.TransformCoordinate(new Vector3(0, 1, 0), rotV);
-            var finalForward = Vector3.TransformCoordinate(new Vector3(0, 0, -1), rotV);
-            var view = Matrix.LookAtRH(pos, pos + finalForward, finalUp);
-            LeftCameraComponent.ViewMatrix = view;
-
-            RightCameraComponent.ProjectionMatrix = projRight;
-
-            pos = camPos + rightEyeMatrix.TranslationVector * ViewScaling;
-            rotV = headMatrixTr * Matrix.Scaling(ViewScaling) * Matrix.RotationQuaternion(camRot);
-            finalUp = Vector3.TransformCoordinate(new Vector3(0, 1, 0), rotV);
-            finalForward = Vector3.TransformCoordinate(new Vector3(0, 0, -1), rotV);
-            view = Matrix.LookAtRH(pos, pos + finalForward, finalUp);
-            RightCameraComponent.ViewMatrix = view;
-
-            base.Draw(gameTime);
-        }
-
-        public override Size2 OptimalRenderFrameSize
-        {
-            get
-            {
-                int width, height;
-                GoogleVr.GetMaxRenderSize(out width, out height);
-                return new Size2(width, height);
-            }
-        }
-
-        public override DirectRenderFrameProvider RenderFrameProvider { get; protected set; }
-
-        public override Texture MirrorTexture { get; protected set; }
-
-        public override float RenderFrameScaling { get; set; } = 0.5f;
-
-        public override DeviceState State => DeviceState.Valid;
-
-        public override bool CanInitialize => true;
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/NativeInvoke.cs b/sources/engine/Xenko.VirtualReality/NativeInvoke.cs
deleted file mode 100644
index 0b0ea9e194..0000000000
--- a/sources/engine/Xenko.VirtualReality/NativeInvoke.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using Xenko.Core;
-
-namespace Xenko.VirtualReality
-{
-    internal static class NativeInvoke
-    {
-#if XENKO_PLATFORM_IOS
-        internal const string Library = "__Internal";
-#else
-        internal const string Library = "libxenkovr";
-#endif
-
-        internal static void PreLoad()
-        {
-#if XENKO_PLATFORM_WINDOWS
-            NativeLibrary.PreloadLibrary(Library + ".dll", typeof(NativeInvoke));
-#else
-            NativeLibrary.PreloadLibrary(Library + ".so", typeof(NativeInvoke));
-#endif
-        }
-
-        static NativeInvoke()
-        {
-            PreLoad();
-        }
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOVR.cpp b/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOVR.cpp
deleted file mode 100644
index 6c886ec99f..0000000000
--- a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOVR.cpp
+++ /dev/null
@@ -1,592 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#include "../../../deps/NativePath/NativePath.h"
-#include "../../Xenko.Native/XenkoNative.h"
-
-#if defined(WINDOWS_DESKTOP) || !defined(__clang__)
-
-#ifndef __clang__
-//Make resharper work!
-#define OVR_ALIGNAS(n)
-#error "The compiler must be clang!"
-#endif
-
-#include "../../../../deps/OculusOVR/Include/OVR_CAPI.h"
-
-typedef struct _GUID {
-	unsigned long  Data1;
-	unsigned short Data2;
-	unsigned short Data3;
-	unsigned char  Data4[8];
-} GUID;
-
-#define OVR_AUDIO_MAX_DEVICE_STR_SIZE 128
-
-extern "C" {
-	//DX specific stuff
-	extern ovrResult ovr_CreateTextureSwapChainDX(ovrSession session, void* d3dPtr, const ovrTextureSwapChainDesc* desc, ovrTextureSwapChain* out_TextureSwapChain);
-	extern ovrResult ovr_CreateMirrorTextureDX(ovrSession session, void* d3dPtr, const ovrMirrorTextureDesc* desc, ovrMirrorTexture* out_MirrorTexture);
-	extern ovrResult ovr_GetTextureSwapChainBufferDX(ovrSession session, ovrTextureSwapChain chain, int index, GUID iid, void** out_Buffer);
-	extern ovrResult ovr_GetMirrorTextureBufferDX(ovrSession session, ovrMirrorTexture mirrorTexture, GUID iid, void** out_Buffer);
-	extern ovrResult ovr_GetAudioDeviceOutGuidStr(wchar_t deviceOutStrBuffer[OVR_AUDIO_MAX_DEVICE_STR_SIZE]);
-
-	DLL_EXPORT_API npBool xnOvrStartup()
-	{
-		ovrResult result = ovr_Initialize(NULL);
-		return OVR_SUCCESS(result);
-	}
-
-	DLL_EXPORT_API void xnOvrShutdown()
-	{
-		ovr_Shutdown();
-	}
-
-	DLL_EXPORT_API int xnOvrGetError(char* errorString)
-	{
-		ovrErrorInfo errInfo;
-		ovr_GetLastErrorInfo(&errInfo);
-		strcpy(errorString, errInfo.ErrorString);
-		return errInfo.Result;
-	}
-
-	struct xnOvrSession
-	{
-		ovrSession Session;
-		ovrMirrorTexture Mirror;
-		ovrHmdDesc HmdDesc;
-		ovrEyeRenderDesc EyeRenderDesc[2];
-		ovrVector3f HmdToEyeViewOffset[2];
-
-		ovrTextureSwapChain SwapChain;
-		ovrLayerEyeFov Layer;
-		ovrTrackingState CurrentState;
-	};
-
-	DLL_EXPORT_API xnOvrSession* xnOvrCreateSessionDx(int64_t* luidOut)
-	{
-		ovrSession session;
-		ovrGraphicsLuid luid;
-		ovrResult result = ovr_Create(&session, &luid);
-
-		bool success = OVR_SUCCESS(result);
-		if(success)
-		{
-			auto sessionOut = new xnOvrSession();
-			sessionOut->Session = session;
-			sessionOut->SwapChain = NULL;
-
-			*luidOut = *((int64_t*)luid.Reserved);
-			return sessionOut;
-		}
-
-		return NULL;
-	}
-
-	DLL_EXPORT_API void xnOvrDestroySession(xnOvrSession* session)
-	{
-		ovr_Destroy(session->Session);
-	}
-
-	DLL_EXPORT_API npBool xnOvrCreateTexturesDx(xnOvrSession* session, void* dxDevice, int* outTextureCount, float pixelPerDisplayPixel, int mirrorBufferWidth, int mirrorBufferHeight)
-	{
-		session->HmdDesc = ovr_GetHmdDesc(session->Session);
-		ovrSizei sizel = ovr_GetFovTextureSize(session->Session, ovrEye_Left, session->HmdDesc.DefaultEyeFov[0], pixelPerDisplayPixel);
-		ovrSizei sizer = ovr_GetFovTextureSize(session->Session, ovrEye_Right, session->HmdDesc.DefaultEyeFov[1], pixelPerDisplayPixel);
-		ovrSizei bufferSize;
-		bufferSize.w = sizel.w + sizer.w;
-		bufferSize.h = fmax(sizel.h, sizer.h);
-
-		ovrTextureSwapChainDesc texDesc = {};
-		texDesc.Type = ovrTexture_2D;
-		texDesc.Format = OVR_FORMAT_R8G8B8A8_UNORM_SRGB;
-		texDesc.ArraySize = 1;
-		texDesc.Width = bufferSize.w;
-		texDesc.Height = bufferSize.h;
-		texDesc.MipLevels = 1;
-		texDesc.SampleCount = 1;
-		texDesc.StaticImage = ovrFalse;
-		texDesc.MiscFlags = ovrTextureMisc_None;
-		texDesc.BindFlags = ovrTextureBind_DX_RenderTarget;
-
-		if(!OVR_SUCCESS(ovr_CreateTextureSwapChainDX(session->Session, dxDevice, &texDesc, &session->SwapChain)))
-		{
-			return false;
-		}
-
-		auto count = 0;
-		ovr_GetTextureSwapChainLength(session->Session, session->SwapChain, &count);
-		*outTextureCount = count;
-		
-		//init structures
-		session->EyeRenderDesc[0] = ovr_GetRenderDesc(session->Session, ovrEye_Left, session->HmdDesc.DefaultEyeFov[0]);
-		session->EyeRenderDesc[1] = ovr_GetRenderDesc(session->Session, ovrEye_Right, session->HmdDesc.DefaultEyeFov[1]);
-		session->HmdToEyeViewOffset[0] = session->EyeRenderDesc[0].HmdToEyeOffset;
-		session->HmdToEyeViewOffset[1] = session->EyeRenderDesc[1].HmdToEyeOffset;
-
-		session->Layer.Header.Type = ovrLayerType_EyeFov;
-		session->Layer.Header.Flags = 0;
-		session->Layer.ColorTexture[0] = session->SwapChain;
-		session->Layer.ColorTexture[1] = session->SwapChain;
-		session->Layer.Fov[0] = session->EyeRenderDesc[0].Fov;
-		session->Layer.Fov[1] = session->EyeRenderDesc[1].Fov;
-		session->Layer.Viewport[0].Pos.x = 0;
-		session->Layer.Viewport[0].Pos.y = 0;
-		session->Layer.Viewport[0].Size.w = bufferSize.w / 2;
-		session->Layer.Viewport[0].Size.h = bufferSize.h;
-		session->Layer.Viewport[1].Pos.x = bufferSize.w / 2;
-		session->Layer.Viewport[1].Pos.y = 0;
-		session->Layer.Viewport[1].Size.w = bufferSize.w / 2;
-		session->Layer.Viewport[1].Size.h = bufferSize.h;
-
-		//create mirror as well
-		if (mirrorBufferHeight != 0 && mirrorBufferWidth != 0)
-		{
-			ovrMirrorTextureDesc mirrorDesc = {};
-			mirrorDesc.Format = OVR_FORMAT_R8G8B8A8_UNORM_SRGB;
-			mirrorDesc.Width = mirrorBufferWidth;
-			mirrorDesc.Height = mirrorBufferHeight;
-			if (!OVR_SUCCESS(ovr_CreateMirrorTextureDX(session->Session, dxDevice, &mirrorDesc, &session->Mirror)))
-			{
-				return false;
-			}
-		}
-		
-		return true;
-	}
-
-	struct xnOvrQuadLayer
-	{
-		ovrTextureSwapChain SwapChain;
-		ovrLayerQuad Layer;
-	};
-
-	DLL_EXPORT_API xnOvrQuadLayer* xnOvrCreateQuadLayerTexturesDx(xnOvrSession* session, void* dxDevice, int* outTextureCount, int width, int height, int mipLevels, int sampleCount)
-	{
-		auto layer = new xnOvrQuadLayer;
-
-		ovrTextureSwapChainDesc texDesc = {};
-		texDesc.Type = ovrTexture_2D;
-		texDesc.Format = OVR_FORMAT_R8G8B8A8_UNORM_SRGB;
-		texDesc.ArraySize = 1;
-		texDesc.Width = width;
-		texDesc.Height = height;
-		texDesc.MipLevels = mipLevels;
-		texDesc.SampleCount = sampleCount;
-		texDesc.StaticImage = ovrFalse;
-		texDesc.MiscFlags = ovrTextureMisc_None;
-		texDesc.BindFlags = ovrTextureBind_DX_RenderTarget;
-
-		if (!OVR_SUCCESS(ovr_CreateTextureSwapChainDX(session->Session, dxDevice, &texDesc, &layer->SwapChain)))
-		{
-			delete layer;
-			return NULL;
-		}
-
-		auto count = 0;
-		ovr_GetTextureSwapChainLength(session->Session, layer->SwapChain, &count);
-		*outTextureCount = count;
-
-		layer->Layer.Header.Type = ovrLayerType_Quad;
-		layer->Layer.Header.Flags = ovrLayerFlag_HighQuality;
-		layer->Layer.ColorTexture = layer->SwapChain;
-		layer->Layer.Viewport.Pos.x = 0;
-		layer->Layer.Viewport.Pos.y = 0;
-		layer->Layer.Viewport.Size.w = width;
-		layer->Layer.Viewport.Size.h = height;
-		layer->Layer.QuadPoseCenter.Orientation.x = 0;
-		layer->Layer.QuadPoseCenter.Orientation.y = 0;
-		layer->Layer.QuadPoseCenter.Orientation.z = 0;
-		layer->Layer.QuadPoseCenter.Orientation.w = 1;
-		layer->Layer.QuadPoseCenter.Position.x = 0;
-		layer->Layer.QuadPoseCenter.Position.y = 0;
-		layer->Layer.QuadPoseCenter.Position.z = -1;
-		layer->Layer.QuadSize.x = 2;
-		layer->Layer.QuadSize.y = 2;
-
-		return layer;
-	}
-
-	DLL_EXPORT_API void xnOvrSetQuadLayerParams(xnOvrQuadLayer* layer, float* position, float* orientation, float* size, npBool headLocked)
-	{
-		memcpy(&layer->Layer.QuadPoseCenter.Orientation, orientation, sizeof(float) * 4);
-		memcpy(&layer->Layer.QuadPoseCenter.Position, position, sizeof(float) * 3);
-		memcpy(&layer->Layer.QuadSize, size, sizeof(float) * 2);
-		layer->Layer.Header.Flags = headLocked ? ovrLayerFlag_HeadLocked | ovrLayerFlag_HighQuality : ovrLayerFlag_HighQuality;
-	}
-
-	DLL_EXPORT_API void* xnOvrGetTextureAtIndexDx(xnOvrSession* session, GUID textureGuid, int index)
-	{
-		void* texture = NULL;
-		if (!OVR_SUCCESS(ovr_GetTextureSwapChainBufferDX(session->Session, session->SwapChain, index, textureGuid, &texture)))
-		{
-			return NULL;
-		}
-		return texture;
-	}
-
-	DLL_EXPORT_API void* xnOvrGetQuadLayerTextureAtIndexDx(xnOvrSession* session, xnOvrQuadLayer* layer, GUID textureGuid, int index)
-	{
-		void* texture = NULL;
-		if (!OVR_SUCCESS(ovr_GetTextureSwapChainBufferDX(session->Session, layer->SwapChain, index, textureGuid, &texture)))
-		{
-			return NULL;
-		}
-		return texture;
-	}
-
-	DLL_EXPORT_API void* xnOvrGetMirrorTextureDx(xnOvrSession* session, GUID textureGuid)
-	{
-		void* texture = NULL;
-		if (!OVR_SUCCESS(ovr_GetMirrorTextureBufferDX(session->Session, session->Mirror, textureGuid, &texture)))
-		{
-			return NULL;
-		}
-		return texture;
-	}
-
-	DLL_EXPORT_API int xnOvrGetCurrentTargetIndex(xnOvrSession* session)
-	{
-		int index;
-		ovr_GetTextureSwapChainCurrentIndex(session->Session, session->SwapChain, &index);
-		return index;
-	}
-
-	DLL_EXPORT_API int xnOvrGetCurrentQuadLayerTargetIndex(xnOvrSession* session, xnOvrQuadLayer* layer)
-	{
-		int index;
-		ovr_GetTextureSwapChainCurrentIndex(session->Session, layer->SwapChain, &index);
-		return index;
-	}
-
-#pragma pack(push, 4)
-	struct xnOvrFrameProperties
-	{
-		//Camera properties
-		float Near;
-		float Far;
-		float ProjLeft[16];
-		float ProjRight[16];
-		float PosLeft[3];
-		float PosRight[3];
-		float RotLeft[4];
-		float RotRight[4];
-	};
-
-	struct xnOvrPosesProperties
-	{
-		//Head
-		float PosHead[3];
-		float RotHead[4];
-		float AngularVelocityHead[3];
-		float AngularAccelerationHead[3];
-		float LinearVelocityHead[3];
-		float LinearAccelerationHead[3];
-
-		//Left hand
-		float PosLeftHand[3];
-		float RotLeftHand[4];
-		float AngularVelocityLeftHand[3];
-		float AngularAccelerationLeftHand[3];
-		float LinearVelocityLeftHand[3];
-		float LinearAccelerationLeftHand[3];
-		int StateLeftHand;
-
-		//Right hand
-		float PosRightHand[3];
-		float RotRightHand[4];
-		float AngularVelocityRightHand[3];
-		float AngularAccelerationRightHand[3];
-		float LinearVelocityRightHand[3];
-		float LinearAccelerationRightHand[3];
-		int StateRightHand;
-	};
-
-	struct xnOvrInputProperties
-	{
-		unsigned int Buttons;
-		unsigned int Touches;
-		float IndexTriggerLeft;
-		float IndexTriggerRight;
-		float HandTriggerLeft;
-		float HandTriggerRight;
-		float ThumbstickLeft[2];
-		float ThumbstickRight[2];
-		npBool Valid;
-	};
-#pragma pack(pop)
-
-	DLL_EXPORT_API void xnOvrUpdate(xnOvrSession* session)
-	{
-		session->EyeRenderDesc[0] = ovr_GetRenderDesc(session->Session, ovrEye_Left, session->HmdDesc.DefaultEyeFov[0]);
-		session->EyeRenderDesc[1] = ovr_GetRenderDesc(session->Session, ovrEye_Right, session->HmdDesc.DefaultEyeFov[1]);
-		session->HmdToEyeViewOffset[0] = session->EyeRenderDesc[0].HmdToEyeOffset;
-		session->HmdToEyeViewOffset[1] = session->EyeRenderDesc[1].HmdToEyeOffset;
-
-		session->Layer.SensorSampleTime = ovr_GetPredictedDisplayTime(session->Session, 0);
-		session->CurrentState = ovr_GetTrackingState(session->Session, session->Layer.SensorSampleTime, ovrTrue);
-		ovr_CalcEyePoses(session->CurrentState.HeadPose.ThePose, session->HmdToEyeViewOffset, session->Layer.RenderPose);
-	}
-
-	DLL_EXPORT_API void xnOvrGetFrameProperties(xnOvrSession* session, xnOvrFrameProperties* properties)
-	{
-		auto leftProj = ovrMatrix4f_Projection(session->Layer.Fov[0], properties->Near, properties->Far, 0);
-		auto rightProj = ovrMatrix4f_Projection(session->Layer.Fov[1], properties->Near, properties->Far, 0);
-
-		memcpy(properties->ProjLeft, &leftProj, sizeof(float) * 16);
-		memcpy(properties->PosLeft, &session->Layer.RenderPose[0].Position, sizeof(float) * 3);
-		memcpy(properties->RotLeft, &session->Layer.RenderPose[0].Orientation, sizeof(float) * 4);
-		
-		memcpy(properties->ProjRight, &rightProj, sizeof(float) * 16);
-		memcpy(properties->PosRight, &session->Layer.RenderPose[1].Position, sizeof(float) * 3);
-		memcpy(properties->RotRight, &session->Layer.RenderPose[1].Orientation, sizeof(float) * 4);
-	}
-
-	DLL_EXPORT_API void xnOvrGetPosesProperties(xnOvrSession* session, xnOvrPosesProperties* properties)
-	{
-		memcpy(properties->PosHead, &session->CurrentState.HeadPose.ThePose.Position, sizeof(float) * 3);
-		memcpy(properties->RotHead, &session->CurrentState.HeadPose.ThePose.Orientation, sizeof(float) * 4);
-		memcpy(properties->AngularVelocityHead, &session->CurrentState.HeadPose.AngularVelocity, sizeof(float) * 3);
-		memcpy(properties->AngularAccelerationHead, &session->CurrentState.HeadPose.AngularAcceleration, sizeof(float) * 3);
-		memcpy(properties->LinearVelocityHead, &session->CurrentState.HeadPose.LinearVelocity, sizeof(float) * 3);
-		memcpy(properties->LinearAccelerationHead, &session->CurrentState.HeadPose.LinearAcceleration, sizeof(float) * 3);
-
-		memcpy(properties->PosLeftHand, &session->CurrentState.HandPoses[0].ThePose.Position, sizeof(float) * 3);
-		memcpy(properties->RotLeftHand, &session->CurrentState.HandPoses[0].ThePose.Orientation, sizeof(float) * 4);
-		memcpy(properties->AngularVelocityLeftHand, &session->CurrentState.HandPoses[0].AngularVelocity, sizeof(float) * 3);
-		memcpy(properties->AngularAccelerationLeftHand, &session->CurrentState.HandPoses[0].AngularAcceleration, sizeof(float) * 3);
-		memcpy(properties->LinearVelocityLeftHand, &session->CurrentState.HandPoses[0].LinearVelocity, sizeof(float) * 3);
-		memcpy(properties->LinearAccelerationLeftHand, &session->CurrentState.HandPoses[0].LinearAcceleration, sizeof(float) * 3);
-		properties->StateLeftHand = session->CurrentState.HandStatusFlags[0];
-
-		memcpy(properties->PosRightHand, &session->CurrentState.HandPoses[1].ThePose.Position, sizeof(float) * 3);
-		memcpy(properties->RotRightHand, &session->CurrentState.HandPoses[1].ThePose.Orientation, sizeof(float) * 4);
-		memcpy(properties->AngularVelocityRightHand, &session->CurrentState.HandPoses[1].AngularVelocity, sizeof(float) * 3);
-		memcpy(properties->AngularAccelerationRightHand, &session->CurrentState.HandPoses[1].AngularAcceleration, sizeof(float) * 3);
-		memcpy(properties->LinearVelocityRightHand, &session->CurrentState.HandPoses[1].LinearVelocity, sizeof(float) * 3);
-		memcpy(properties->LinearAccelerationRightHand, &session->CurrentState.HandPoses[1].LinearAcceleration, sizeof(float) * 3);
-		properties->StateRightHand = session->CurrentState.HandStatusFlags[1];
-	}
-
-	DLL_EXPORT_API void xnOvrGetInputProperties(xnOvrSession* session, xnOvrInputProperties* properties)
-	{
-		ovrInputState state;
-		auto res = ovr_GetInputState(session->Session, ovrControllerType_Touch, &state);
-		if(OVR_SUCCESS(res))
-		{
-			properties->Valid = true;
-			properties->Buttons = state.Buttons;
-			properties->Touches = state.Touches;
-			properties->HandTriggerLeft = state.HandTrigger[0];
-			properties->HandTriggerRight = state.HandTrigger[1];
-			properties->IndexTriggerLeft = state.IndexTrigger[0];
-			properties->IndexTriggerRight = state.IndexTrigger[1];
-			properties->ThumbstickLeft[0] = state.Thumbstick[0].x;
-			properties->ThumbstickLeft[1] = state.Thumbstick[0].y;
-			properties->ThumbstickRight[0] = state.Thumbstick[1].x;
-			properties->ThumbstickRight[1] = state.Thumbstick[1].y;
-		}
-		else
-		{
-			properties->Valid = false;
-		}
-	}
-
-	DLL_EXPORT_API npBool xnOvrCommitFrame(xnOvrSession* session, int numberOfExtraLayers, xnOvrQuadLayer** extraLayers)
-	{
-		ovrLayerHeader* layers[1 + numberOfExtraLayers];
-		//add the default layer first
-		layers[0] = &session->Layer.Header;
-		//commit the default fov layer
-		ovr_CommitTextureSwapChain(session->Session, session->SwapChain);
-		for (auto i = 0; i < numberOfExtraLayers; i++)
-		{
-			//add further quad layers
-			layers[i + 1] = &extraLayers[i]->Layer.Header;
-			//also commit the quad layer
-			ovr_CommitTextureSwapChain(session->Session, extraLayers[i]->SwapChain);
-		}
-
-		if(!OVR_SUCCESS(ovr_SubmitFrame(session->Session, 0, NULL, layers, 1 + numberOfExtraLayers)))
-		{
-			return false;
-		}
-
-		ovrSessionStatus status;
-		if (!OVR_SUCCESS(ovr_GetSessionStatus(session->Session, &status)))
-		{
-			return false;
-		}
-
-		if(status.ShouldRecenter)
-		{
-			ovr_RecenterTrackingOrigin(session->Session);
-		}
-
-		return true;
-	}
-
-#pragma pack(push, 4)
-	struct xnOvrSessionStatus
-	{
-		npBool IsVisible;    ///< True if the process has VR focus and thus is visible in the HMD.
-		npBool HmdPresent;   ///< True if an HMD is present.
-		npBool HmdMounted;   ///< True if the HMD is on the user's head.
-		npBool DisplayLost;  ///< True if the session is in a display-lost state. See ovr_SubmitFrame.
-		npBool ShouldQuit;   ///< True if the application should initiate shutdown.    
-		npBool ShouldRecenter;  ///< True if UX has requested re-centering. Must call ovr_ClearShouldRecenterFlag or ovr_RecenterTrackingOrigin. 
-	};
-#pragma pack(pop)
-
-	DLL_EXPORT_API void xnOvrGetStatus(xnOvrSession* session, xnOvrSessionStatus* statusOut)
-	{
-		ovrSessionStatus status;
-		if (!OVR_SUCCESS(ovr_GetSessionStatus(session->Session, &status)))
-		{
-			return;
-		}
-
-		statusOut->IsVisible = status.IsVisible;
-		statusOut->HmdPresent = status.HmdPresent;
-		statusOut->HmdMounted = status.HmdMounted;
-		statusOut->DisplayLost = status.DisplayLost;
-		statusOut->ShouldQuit = status.ShouldQuit;
-		statusOut->ShouldRecenter = status.ShouldRecenter;
-	}
-
-	DLL_EXPORT_API void xnOvrRecenter(xnOvrSession* session)
-	{
-		ovr_RecenterTrackingOrigin(session->Session);
-	}
-
-	DLL_EXPORT_API void xnOvrGetAudioDeviceID(wchar_t* deviceString)
-	{
-		ovr_GetAudioDeviceOutGuidStr(deviceString);
-	}
-}
-
-#else
-
-extern "C" {
-	typedef struct _GUID {
-		unsigned long  Data1;
-		unsigned short Data2;
-		unsigned short Data3;
-		unsigned char  Data4[8];
-	} GUID;
-
-	DLL_EXPORT_API npBool xnOvrStartup()
-	{
-		return true;
-	}
-
-	DLL_EXPORT_API void xnOvrShutdown()
-	{
-		
-	}
-
-	DLL_EXPORT_API int xnOvrGetError(char* errorString)
-	{
-		return 0;
-	}
-
-	DLL_EXPORT_API void* xnOvrCreateSessionDx(void* luidOut)
-	{
-		return 0;
-	}
-
-	DLL_EXPORT_API void xnOvrDestroySession(void* session)
-	{
-		
-	}
-
-	DLL_EXPORT_API npBool xnOvrCreateTexturesDx(void* session, void* dxDevice, int* outTextureCount)
-	{
-		return true;
-	}
-
-	DLL_EXPORT_API void* xnOvrGetTextureAtIndexDx(void* session, GUID textureGuid, int index)
-	{
-		return 0;
-	}
-
-	DLL_EXPORT_API void* xnOvrGetMirrorTextureDx(void* session, GUID textureGuid)
-	{
-		return 0;
-	}
-
-	DLL_EXPORT_API int xnOvrGetCurrentTargetIndex(void* session)
-	{
-		return 0;
-	}
-
-	DLL_EXPORT_API void xnOvrUpdate(void* session)
-	{
-		
-	}
-
-	DLL_EXPORT_API void xnOvrGetFrameProperties(void* session, void* params)
-	{
-		
-	}
-
-	DLL_EXPORT_API void xnOvrGetPosesProperties(void* session, void* params)
-	{
-
-	}
-
-	DLL_EXPORT_API void xnOvrGetInputProperties(void* session, void* properties)
-	{
-		
-	}
-
-	DLL_EXPORT_API npBool xnOvrCommitFrame(void* session, int numberOfExtraLayers, void** extraLayers)
-	{
-		return true;
-	}
-
-#pragma pack(push, 4)
-	DLL_EXPORT_API struct xnOvrSessionStatus
-	{
-		npBool IsVisible;    ///< True if the process has VR focus and thus is visible in the HMD.
-		npBool HmdPresent;   ///< True if an HMD is present.
-		npBool HmdMounted;   ///< True if the HMD is on the user's head.
-		npBool DisplayLost;  ///< True if the session is in a display-lost state. See ovr_SubmitFrame.
-		npBool ShouldQuit;   ///< True if the application should initiate shutdown.    
-		npBool ShouldRecenter;  ///< True if UX has requested re-centering. Must call ovr_ClearShouldRecenterFlag or ovr_RecenterTrackingOrigin. 
-	};
-#pragma pack(pop)
-
-	DLL_EXPORT_API void xnOvrGetStatus(void* session, void* statusOut)
-	{
-	}
-
-	DLL_EXPORT_API void xnOvrRecenter(void* session)
-	{
-	}
-
-	DLL_EXPORT_API void xnOvrGetAudioDeviceID(wchar_t* deviceString)
-	{
-	}
-
-	DLL_EXPORT_API void* xnOvrCreateQuadLayerTexturesDx(void* session, void* dxDevice, int* outTextureCount, int width, int height, int mipLevels, int sampleCount)
-	{
-		return NULL;
-	}
-
-	DLL_EXPORT_API int xnOvrGetCurrentQuadLayerTargetIndex(void* session, void* layer)
-	{
-		return 0;
-	}
-
-	DLL_EXPORT_API void* xnOvrGetQuadLayerTextureAtIndexDx(void* session, void* layer, GUID textureGuid, int index)
-	{
-		return NULL;
-	}
-
-	DLL_EXPORT_API void xnOvrSetQuadLayerParams(void* layer, float* position, float* orientation, float* size, npBool headLocked)
-	{
-	}
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOVR.cs b/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOVR.cs
deleted file mode 100644
index a4ca10dedb..0000000000
--- a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOVR.cs
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.VirtualReality
-{
-    internal static class OculusOvr
-    {
-        static OculusOvr()
-        {
-#if XENKO_PLATFORM_WINDOWS
-            NativeLibrary.PreloadLibrary(NativeInvoke.Library + ".dll", typeof(OculusOvr));
-#endif
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrStartup", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool Startup();
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrShutdown", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Shutdown();
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrCreateSessionDx", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr CreateSessionDx(out long adapterLuidStr);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrDestroySession", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void DestroySession(IntPtr outSessionPtr);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrCreateTexturesDx", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool CreateTexturesDx(IntPtr session, IntPtr dxDevice, out int outTextureCount, float pixelPerScreenPixel, int mirrorBufferWidth = 0, int mirrorBufferHeight = 0);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrCreateQuadLayerTexturesDx", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr CreateQuadLayerTexturesDx(IntPtr session, IntPtr dxDevice, out int outTextureCount, int width, int height, int mipLevels, int sampleCount);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrSetQuadLayerParams", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void SetQuadLayerParams(IntPtr layer, ref Vector3 position, ref Quaternion rotation, ref Vector2 size, bool headLocked);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetTextureAtIndexDx", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr GetTextureDx(IntPtr session, Guid textureGuid, int index);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetQuadLayerTextureAtIndexDx", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr GetQuadLayerTextureDx(IntPtr session, IntPtr layer, Guid textureGuid, int index);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetMirrorTextureDx", CallingConvention = CallingConvention.Cdecl)]
-        public static extern IntPtr GetMirrorTexture(IntPtr session, Guid textureGuid);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetCurrentTargetIndex", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GetCurrentTargetIndex(IntPtr session);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetCurrentQuadLayerTargetIndex", CallingConvention = CallingConvention.Cdecl)]
-        public static extern int GetCurrentQuadLayerTargetIndex(IntPtr session, IntPtr layer);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrCommitFrame", CallingConvention = CallingConvention.Cdecl)]
-        public static extern bool CommitFrame(IntPtr session, int numberOfExtraLayers, [MarshalAs(UnmanagedType.LPArray)] IntPtr[] extraLayer);
-
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        public struct FrameProperties
-        {
-            public float Near;
-            public float Far;
-            public Matrix ProjLeft;
-            public Matrix ProjRight;
-            public Vector3 PosLeft;
-            public Vector3 PosRight;
-            public Quaternion RotLeft;
-            public Quaternion RotRight;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        public struct PosesProperties
-        {
-            public Vector3 PosHead;
-            public Quaternion RotHead;
-            public Vector3 AngularVelocityHead;
-            public Vector3 AngularAccelerationHead;
-            public Vector3 LinearVelocityHead;
-            public Vector3 LinearAccelerationHead;
-
-            public Vector3 PosLeftHand;
-            public Quaternion RotLeftHand;
-            public Vector3 AngularVelocityLeftHand;
-            public Vector3 AngularAccelerationLeftHand;
-            public Vector3 LinearVelocityLeftHand;
-            public Vector3 LinearAccelerationLeftHand;
-            public int StateLeftHand;
-
-            public Vector3 PosRightHand;
-            public Quaternion RotRightHand;
-            public Vector3 AngularVelocityRightHand;
-            public Vector3 AngularAccelerationRightHand;
-            public Vector3 LinearVelocityRightHand;
-            public Vector3 LinearAccelerationRightHand;
-            public int StateRightHand;
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        public struct InputProperties
-        {
-            public uint Buttons;
-            public uint Touches;
-            public float IndexTriggerLeft;
-            public float IndexTriggerRight;
-            public float HandTriggerLeft;
-            public float HandTriggerRight;
-            public Vector2 ThumbstickLeft;
-            public Vector2 ThumbstickRight;
-            public bool Valid;
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrUpdate", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Update(IntPtr session);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetFrameProperties", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetFrameProperties(IntPtr session, ref FrameProperties properties);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetPosesProperties", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetPosesProperties(IntPtr session, out PosesProperties properties);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetInputProperties", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void GetInputProperties(IntPtr session, out InputProperties properties);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetError", CallingConvention = CallingConvention.Cdecl)]
-        private static extern int GetError(IntPtr errorString);
-
-        public static unsafe string GetError()
-        {
-            var buffer = stackalloc char[256];
-            var errorCStr = new IntPtr(buffer);
-            var error = GetError(errorCStr);
-            var errorStr = Marshal.PtrToStringAnsi(errorCStr);
-            return $"OculusOVR-Error({error}): {errorStr}";
-        }
-
-        [StructLayout(LayoutKind.Sequential, Pack = 4)]
-        private struct SessionStatusInternal
-        {
-            public int IsVisible;
-            public int HmdPresent;
-            public int HmdMounted;
-            public int DisplayLost;
-            public int ShouldQuit;
-            public int ShouldRecenter;
-        }
-
-        public struct SessionStatus
-        {
-            /// <summary>
-            /// True if the process has VR focus and thus is visible in the HMD.
-            /// </summary>
-            public bool IsVisible;
-            /// <summary>
-            /// True if an HMD is present.
-            /// </summary>
-            public bool HmdPresent;
-            /// <summary>
-            /// True if the HMD is on the user's head.
-            /// </summary>
-            public bool HmdMounted;
-            /// <summary>
-            /// True if the session is in a display-lost state. See ovr_SubmitFrame.
-            /// </summary>
-            public bool DisplayLost;
-            /// <summary>
-            /// True if the application should initiate shutdown.    
-            /// </summary>
-            public bool ShouldQuit;
-            /// <summary>
-            /// True if UX has requested re-centering. 
-            /// </summary>
-            public bool ShouldRecenter;
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetStatus", CallingConvention = CallingConvention.Cdecl)]
-        private static extern void GetStatus(IntPtr session, ref SessionStatusInternal status);
-
-        public static SessionStatus GetStatus(IntPtr session)
-        {
-            var statusInternal = new SessionStatusInternal { DisplayLost = 0, IsVisible = 0, ShouldQuit = 0, HmdMounted = 0, HmdPresent = 0, ShouldRecenter = 0 };
-            GetStatus(session, ref statusInternal);
-            return new SessionStatus
-            {
-                DisplayLost = statusInternal.DisplayLost == 1,
-                HmdMounted = statusInternal.HmdMounted == 1,
-                HmdPresent = statusInternal.HmdPresent == 1,
-                IsVisible = statusInternal.IsVisible == 1,
-                ShouldQuit = statusInternal.ShouldQuit == 1,
-                ShouldRecenter = statusInternal.ShouldRecenter == 1,
-            };
-        }
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrRecenter", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void Recenter(IntPtr session);
-
-        [SuppressUnmanagedCodeSecurity]
-        [DllImport(NativeInvoke.Library, EntryPoint = "xnOvrGetAudioDeviceID", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
-        public static extern void GetAudioDeviceID(StringBuilder deviceName);
-
-        public static string GetAudioDeviceFullName()
-        {
-            var deviceName = new StringBuilder(128);
-            GetAudioDeviceID(deviceName);
-            return $"\\\\?\\SWD#MMDEVAPI#{deviceName}#{{e6327cad-dcec-4949-ae8a-991e976a79d2}}"; //this should not change the guid is related to audio device type
-        }
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOverlay.cs b/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOverlay.cs
deleted file mode 100644
index 995718477a..0000000000
--- a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOverlay.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using System;
-using SharpDX.Direct3D11;
-using Xenko.Graphics;
-using CommandList = Xenko.Graphics.CommandList;
-
-namespace Xenko.VirtualReality
-{
-    internal class OculusOverlay : VROverlay, IDisposable
-    {
-        private readonly IntPtr ovrSession;
-        internal IntPtr OverlayPtr;
-        private readonly Texture[] textures;
-
-        public OculusOverlay(IntPtr ovrSession, GraphicsDevice device, int width, int height, int mipLevels, int sampleCount)
-        {
-            int textureCount;
-            this.ovrSession = ovrSession;
-
-            OverlayPtr = OculusOvr.CreateQuadLayerTexturesDx(ovrSession, device.NativeDevice.NativePointer, out textureCount, width, height, mipLevels, sampleCount);
-            if (OverlayPtr == null)
-            {
-                throw new Exception(OculusOvr.GetError());
-            }
-
-            textures = new Texture[textureCount];
-            for (var i = 0; i < textureCount; i++)
-            {
-                var ptr = OculusOvr.GetQuadLayerTextureDx(ovrSession, OverlayPtr, OculusOvrHmd.Dx11Texture2DGuid, i);
-                if (ptr == IntPtr.Zero)
-                {
-                    throw new Exception(OculusOvr.GetError());
-                }
-
-                textures[i] = new Texture(device);
-                textures[i].InitializeFromImpl(new Texture2D(ptr), false);
-            }
-        }
-
-        public override void Dispose()
-        {
-        }
-
-        public override void UpdateSurface(CommandList commandList, Texture texture)
-        {
-            OculusOvr.SetQuadLayerParams(OverlayPtr, ref Position, ref Rotation, ref SurfaceSize, FollowHeadRotation);
-            var index = OculusOvr.GetCurrentQuadLayerTargetIndex(ovrSession, OverlayPtr);
-            commandList.Copy(texture, textures[index]);
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOvrHmd.cs b/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOvrHmd.cs
deleted file mode 100644
index dc3724b703..0000000000
--- a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusOvrHmd.cs
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using SharpDX.Direct3D11;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-using Xenko.Graphics;
-using CommandList = Xenko.Graphics.CommandList;
-
-namespace Xenko.VirtualReality
-{
-    internal class OculusOvrHmd : VRDevice
-    {
-        private static bool initDone;
-
-        //private static readonly Guid dx12ResourceGuid = new Guid("696442be-a72e-4059-bc79-5b5c98040fad");
-        internal static readonly Guid Dx11Texture2DGuid = new Guid("6f15aaf2-d208-4e89-9ab4-489535d34f9c");
-
-        private IntPtr ovrSession;
-        private Texture[] textures;
-
-        private OculusTouchController leftHandController;
-        private OculusTouchController rightHandController;
-        private readonly List<OculusOverlay> overlays = new List<OculusOverlay>();
-        private IntPtr[] overlayPtrs = new IntPtr[0];
-
-        internal OculusOvrHmd()
-        {
-            SupportsOverlays = true;
-            VRApi = VRApi.Oculus;
-        }
-
-        public override void Dispose()
-        {
-            foreach (var oculusOverlay in overlays)
-            {
-                oculusOverlay.Dispose();
-            }
-
-            if (ovrSession != IntPtr.Zero)
-            {
-                OculusOvr.DestroySession(ovrSession);
-                ovrSession = IntPtr.Zero;
-            }
-        }
-
-        public override void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, bool requireMirror, int mirrorWidth, int mirrorHeight)
-        {
-            graphicsDevice = device;
-            long adapterId;
-            ovrSession = OculusOvr.CreateSessionDx(out adapterId);
-            //Game.GraphicsDeviceManager.RequiredAdapterUid = adapterId.ToString(); //should not be needed
-
-            int texturesCount;
-            if (!OculusOvr.CreateTexturesDx(ovrSession, device.NativeDevice.NativePointer, out texturesCount, RenderFrameScaling, requireMirror ? mirrorWidth : 0, requireMirror ? mirrorHeight : 0))
-            {
-                throw new Exception(OculusOvr.GetError());
-            }
-
-            if (requireMirror)
-            {
-                var mirrorTex = OculusOvr.GetMirrorTexture(ovrSession, Dx11Texture2DGuid);
-                MirrorTexture = new Texture(device);
-                MirrorTexture.InitializeFromImpl(new Texture2D(mirrorTex), false);
-            }
-
-            textures = new Texture[texturesCount];
-            for (var i = 0; i < texturesCount; i++)
-            {
-                var ptr = OculusOvr.GetTextureDx(ovrSession, Dx11Texture2DGuid, i);
-                if (ptr == IntPtr.Zero)
-                {
-                    throw new Exception(OculusOvr.GetError());
-                }
-
-                textures[i] = new Texture(device);
-                textures[i].InitializeFromImpl(new Texture2D(ptr), false);
-            }
-
-            ActualRenderFrameSize = new Size2(textures[0].Width, textures[0].Height);
-
-            leftHandController = new OculusTouchController(TouchControllerHand.Left);
-            rightHandController = new OculusTouchController(TouchControllerHand.Right);
-        }
-
-        private OculusOvr.PosesProperties currentPoses;
-        private GraphicsDevice graphicsDevice;
-
-        public override void Update(GameTime gameTime)
-        {
-            OculusOvr.InputProperties properties;
-            OculusOvr.GetInputProperties(ovrSession, out properties);
-            leftHandController.UpdateInputs(ref properties);
-            rightHandController.UpdateInputs(ref properties);
-        }
-
-        public override void Draw(GameTime gameTime)
-        {
-            OculusOvr.Update(ovrSession);
-            OculusOvr.GetPosesProperties(ovrSession, out currentPoses);
-            leftHandController.UpdatePoses(ref currentPoses);
-            rightHandController.UpdatePoses(ref currentPoses);
-        }
-
-        public override Size2 OptimalRenderFrameSize => new Size2(2160, 1200);
-
-        public override Size2 ActualRenderFrameSize { get; protected set; }
-
-        public override Texture MirrorTexture { get; protected set; }
-
-        public override float RenderFrameScaling { get; set; } = 1.2f;
-
-        public override DeviceState State
-        {
-            get
-            {
-                var deviceStatus = OculusOvr.GetStatus(ovrSession);
-                if (deviceStatus.DisplayLost || !deviceStatus.HmdPresent) return DeviceState.Invalid;
-                if (deviceStatus.HmdMounted && deviceStatus.IsVisible) return DeviceState.Valid;
-                return DeviceState.OutOfRange;
-            }
-        }
-
-        public override Vector3 HeadPosition => currentPoses.PosHead;
-
-        public override Quaternion HeadRotation => currentPoses.RotHead;
-
-        public override Vector3 HeadLinearVelocity => currentPoses.LinearVelocityHead;
-
-        public override Vector3 HeadAngularVelocity => currentPoses.AngularVelocityHead;
-
-        public override TouchController LeftHand => leftHandController;
-
-        public override TouchController RightHand => rightHandController;
-
-        public override TrackedItem[] TrackedItems => new TrackedItem[0];
-
-        public override bool CanInitialize
-        {
-            get
-            {
-                if (initDone) return true;
-                initDone = OculusOvr.Startup();
-                if (initDone)
-                {
-                    long deviceId;
-                    var tempSession = OculusOvr.CreateSessionDx(out deviceId);
-                    if (tempSession != IntPtr.Zero)
-                    {
-                        OculusOvr.DestroySession(tempSession);
-                        initDone = true;
-                    }
-                    else
-                    {
-                        initDone = false;
-                    }
-                }
-                return initDone;
-            }
-        }
-        
-        public override void Recenter()
-        {
-            OculusOvr.Recenter(ovrSession);
-        }
-
-        public override void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Matrix cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection)
-        {
-            var frameProperties = new OculusOvr.FrameProperties
-            {
-                Near = near,
-                Far = far,
-            };
-            OculusOvr.GetFrameProperties(ovrSession, ref frameProperties);
-
-            var isLeftEye = eye == Eyes.Left;
-            var camRot = Quaternion.RotationMatrix(cameraRotation);
-            projection = isLeftEye ? frameProperties.ProjLeft : frameProperties.ProjRight;
-
-            var eyePosition = isLeftEye ? frameProperties.PosLeft : frameProperties.PosRight;
-            if (ignoreHeadPosition)
-                eyePosition -= (frameProperties.PosLeft + frameProperties.PosRight) / 2f;
-
-            var eyeRotation = isLeftEye ? frameProperties.RotLeft : frameProperties.RotRight;
-            if (ignoreHeadRotation)
-                eyeRotation = Quaternion.Identity;
-
-            var position = cameraPosition + Vector3.Transform(eyePosition * ViewScaling, camRot);
-            var rotation = Matrix.RotationQuaternion(eyeRotation) * Matrix.Scaling(ViewScaling) * Matrix.RotationQuaternion(camRot);
-            var finalUp = Vector3.TransformCoordinate(new Vector3(0, 1, 0), rotation);
-            var finalForward = Vector3.TransformCoordinate(new Vector3(0, 0, -1), rotation);
-            view = Matrix.LookAtRH(position, position + finalForward, finalUp);
-        }
-
-        public override void Commit(CommandList commandList, Texture renderFrame)
-        {
-            var index = OculusOvr.GetCurrentTargetIndex(ovrSession);
-            commandList.Copy(renderFrame, textures[index]);
-            overlayPtrs = overlays.Where(x => x.Enabled).Select(x => x.OverlayPtr).ToArray();
-            OculusOvr.CommitFrame(ovrSession, overlayPtrs.Length, overlayPtrs);
-        }
-
-        public override VROverlay CreateOverlay(int width, int height, int mipLevels, int sampleCount)
-        {
-            var overlay = new OculusOverlay(ovrSession, graphicsDevice, width, height, mipLevels, sampleCount);
-            overlays.Add(overlay);
-            return overlay;
-        }
-
-        public override void ReleaseOverlay(VROverlay overlay)
-        {
-            var oculusOverlay = (OculusOverlay)overlay;
-            oculusOverlay.Dispose();
-            overlays.Remove(oculusOverlay);
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusTouchController.cs b/sources/engine/Xenko.VirtualReality/OculusOVR/OculusTouchController.cs
deleted file mode 100644
index 7b20572081..0000000000
--- a/sources/engine/Xenko.VirtualReality/OculusOVR/OculusTouchController.cs
+++ /dev/null
@@ -1,403 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.VirtualReality
-{
-    internal class OculusTouchController : TouchController
-    {
-        private readonly TouchControllerHand hand;
-        private Vector3 currentPos;
-        private Vector3 currentLinearVelocity;
-        private Vector3 currentAngularVelocity;
-        private Quaternion currentRot;
-        private DeviceState currentState;
-        private float currentTrigger;
-        private float currentGrip;
-        private float previousTrigger;
-        private float previousGrip;
-        private uint currentTouchesState;
-        private uint previousTouchesState;
-        private uint currentButtonsState;
-        private uint previousButtonsState;
-        private Vector2 currentThumbstick;
-        private const float TriggerAndGripDeadzone = 0.00001f;
-
-        public override Vector3 Position => currentPos;
-
-        public override Quaternion Rotation => currentRot;
-
-        public override Vector3 LinearVelocity => currentLinearVelocity;
-
-        public override Vector3 AngularVelocity => currentAngularVelocity;
-
-        public override DeviceState State => currentState;
-
-        public override float Trigger => currentTrigger;
-
-        public override float Grip => currentGrip;
-
-        public override bool IndexPointing
-        {
-            get
-            {
-                if (hand == TouchControllerHand.Left)
-                {
-                    //ovrTouch_LIndexPointing
-                    if ((currentTouchesState & 0x00002000) == 0x00002000)
-                    {
-                        return true;
-                    }
-                }
-                else if (hand == TouchControllerHand.Right)
-                {
-                    //ovrTouch_RIndexPointing
-                    if ((currentTouchesState & 0x00000020) == 0x00000020)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-
-        public override bool IndexResting
-        {
-            get
-            {
-                if (hand == TouchControllerHand.Left)
-                {
-                    //ovrTouch_LIndexTrigger
-                    if ((currentTouchesState & 0x00001000) == 0x00001000)
-                    {
-                        return true;
-                    }
-                }
-                else if (hand == TouchControllerHand.Right)
-                {
-                    //ovrTouch_RIndexTrigger
-                    if ((currentTouchesState & 0x00000010) == 0x00000010)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-
-        public override bool ThumbUp
-        {
-            get
-            {
-                if (hand == TouchControllerHand.Left)
-                {
-                    //ovrTouch_LThumbUp
-                    if ((currentTouchesState & 0x00004000) == 0x00004000)
-                    {
-                        return true;
-                    }
-                }
-                else if (hand == TouchControllerHand.Right)
-                {
-                    //ovrTouch_RThumbUp
-                    if ((currentTouchesState & 0x00000040) == 0x00000040)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-
-        public override bool ThumbResting
-        {
-            get
-            {
-                if (hand == TouchControllerHand.Left)
-                {
-                    //ovrTouch_LThumbRest
-                    if ((currentTouchesState & 0x00000800) == 0x00000800)
-                    {
-                        return true;
-                    }
-                }
-                else if (hand == TouchControllerHand.Right)
-                {
-                    //ovrTouch_RThumbRest
-                    if ((currentTouchesState & 0x00000008) == 0x00000008)
-                    {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-
-        public override Vector2 ThumbAxis => currentThumbstick;
-
-        public override Vector2 ThumbstickAxis => currentThumbstick;
-
-        public OculusTouchController(TouchControllerHand hand)
-        {
-            this.hand = hand;
-            currentState = DeviceState.Invalid;
-        }
-
-        internal void UpdateInputs(ref OculusOvr.InputProperties properties)
-        {
-            previousTouchesState = currentTouchesState;
-            previousButtonsState = currentButtonsState;
-            previousTrigger = currentTrigger;
-            previousGrip = currentGrip;
-
-            if (!properties.Valid)
-            {
-                currentTrigger = 0.0f;
-                currentGrip = 0.0f;
-                currentTouchesState = 0;
-                currentButtonsState = 0;
-                currentThumbstick = Vector2.Zero;
-                currentTrigger = 0.0f;
-                currentGrip = 0.0f;
-                return;
-            }
-
-            currentTrigger = hand == TouchControllerHand.Left ? properties.IndexTriggerLeft : properties.IndexTriggerRight;
-            currentGrip = hand == TouchControllerHand.Left ? properties.HandTriggerLeft : properties.HandTriggerRight;
-            currentTouchesState = properties.Touches;
-            currentButtonsState = properties.Buttons;
-            currentThumbstick = hand == TouchControllerHand.Left ? properties.ThumbstickLeft : properties.ThumbstickRight;
-        }
-
-        internal void UpdatePoses(ref OculusOvr.PosesProperties properties)
-        {
-            if (hand == TouchControllerHand.Left)
-            {
-                currentPos = properties.PosLeftHand;
-                currentRot = properties.RotLeftHand;
-                currentLinearVelocity = properties.LinearVelocityLeftHand;
-                currentAngularVelocity = new Vector3(MathUtil.DegreesToRadians(properties.AngularVelocityLeftHand.X), MathUtil.DegreesToRadians(properties.AngularVelocityLeftHand.Y), MathUtil.DegreesToRadians(properties.AngularVelocityLeftHand.Z));
-                if ((properties.StateLeftHand & 0x0001) == 0x0001)
-                {
-                    currentState = DeviceState.OutOfRange;
-
-                    if ((properties.StateLeftHand & 0x0002) == 0x0002)
-                    {
-                        currentState = DeviceState.Valid;
-                    }
-                }
-                else
-                {
-                    currentState = DeviceState.Invalid;
-                }
-            }
-            else
-            {
-                currentPos = properties.PosRightHand;
-                currentRot = properties.RotRightHand;
-                currentLinearVelocity = properties.LinearVelocityRightHand;
-                currentAngularVelocity = new Vector3(MathUtil.DegreesToRadians(properties.AngularVelocityRightHand.X), MathUtil.DegreesToRadians(properties.AngularVelocityRightHand.Y), MathUtil.DegreesToRadians(properties.AngularVelocityRightHand.Z));
-                if ((properties.StateRightHand & 0x0001) == 0x0001)
-                {
-                    currentState = DeviceState.OutOfRange;
-
-                    if ((properties.StateRightHand & 0x0002) == 0x0002)
-                    {
-                        currentState = DeviceState.Valid;
-                    }
-                }
-                else
-                {
-                    currentState = DeviceState.Invalid;
-                }
-            }
-        }
-
-        public override bool IsPressedDown(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    var thumbFlag = hand == TouchControllerHand.Left ? 0x00000400 : 0x00000004;
-                    //ovrButton_RThumb
-                    return (previousButtonsState & thumbFlag) != thumbFlag && (currentButtonsState & thumbFlag) == thumbFlag;
-                case TouchControllerButton.A:
-                    //ovrButton_A
-                    return (previousButtonsState & 0x00000001) != 0x00000001 && (currentButtonsState & 0x00000001) == 0x00000001;
-                case TouchControllerButton.B:
-                    //ovrButton_B
-                    return (previousButtonsState & 0x00000002) != 0x00000002 && (currentButtonsState & 0x00000002) == 0x00000002;
-                case TouchControllerButton.X:
-                    //ovrButton_X
-                    return (previousButtonsState & 0x00000100) != 0x00000100 && (currentButtonsState & 0x00000100) == 0x00000100;
-                case TouchControllerButton.Y:
-                    //ovrButton_Y
-                    return (previousButtonsState & 0x00000200) != 0x00000200 && (currentButtonsState & 0x00000200) == 0x00000200;
-                case TouchControllerButton.Trigger:
-                    return previousTrigger <= TriggerAndGripDeadzone && currentTrigger > TriggerAndGripDeadzone;
-                case TouchControllerButton.Grip:
-                    return previousGrip <= TriggerAndGripDeadzone && currentGrip > TriggerAndGripDeadzone;
-                case TouchControllerButton.Menu:
-                    return (previousButtonsState & 0x00100000) != 0x00100000 && (currentButtonsState & 0x00100000) == 0x00100000;
-                default:
-                    return false;
-            }
-        }
-
-        public override bool IsTouchedDown(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    var thumbFlag = hand == TouchControllerHand.Left ? 0x00000400 : 0x00000004;
-                    //ovrButton_RThumb
-                    return (previousTouchesState & thumbFlag) != thumbFlag && (currentTouchesState & thumbFlag) == thumbFlag;
-                case TouchControllerButton.A:
-                    //ovrButton_A
-                    return (previousTouchesState & 0x00000001) != 0x00000001 && (currentTouchesState & 0x00000001) == 0x00000001;
-                case TouchControllerButton.B:
-                    //ovrButton_B
-                    return (previousTouchesState & 0x00000002) != 0x00000002 && (currentTouchesState & 0x00000002) == 0x00000002;
-                case TouchControllerButton.X:
-                    //ovrButton_X
-                    return (previousTouchesState & 0x00000100) != 0x00000100 && (currentTouchesState & 0x00000100) == 0x00000100;
-                case TouchControllerButton.Y:
-                    //ovrButton_Y
-                    return (previousTouchesState & 0x00000200) != 0x00000200 && (currentTouchesState & 0x00000200) == 0x00000200;
-                case TouchControllerButton.Trigger:
-                    return previousTrigger <= TriggerAndGripDeadzone && currentTrigger > TriggerAndGripDeadzone;
-                case TouchControllerButton.Grip:
-                    return previousGrip <= TriggerAndGripDeadzone && currentGrip > TriggerAndGripDeadzone;
-                case TouchControllerButton.Menu:
-                    return (previousTouchesState & 0x00100000) != 0x00100000 && (currentTouchesState & 0x00100000) == 0x00100000;
-                default:
-                    return false;
-            }
-        }
-
-        public override bool IsPressed(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    var thumbFlag = hand == TouchControllerHand.Left ? 0x00000400 : 0x00000004;
-                    //ovrButton_RThumb
-                    return (currentButtonsState & thumbFlag) == thumbFlag;
-                case TouchControllerButton.A:
-                    //ovrButton_A
-                    return (currentButtonsState & 0x00000001) == 0x00000001;
-                case TouchControllerButton.B:
-                    //ovrButton_B
-                    return (currentButtonsState & 0x00000002) == 0x00000002;
-                case TouchControllerButton.X:
-                    //ovrButton_X
-                    return (currentButtonsState & 0x00000100) == 0x00000100;
-                case TouchControllerButton.Y:
-                    //ovrButton_Y
-                    return (currentButtonsState & 0x00000200) == 0x00000200;
-                case TouchControllerButton.Trigger:
-                    return currentTrigger > TriggerAndGripDeadzone;
-                case TouchControllerButton.Grip:
-                    return currentGrip > TriggerAndGripDeadzone;
-                case TouchControllerButton.Menu:
-                    return (currentButtonsState & 0x00100000) == 0x00100000;
-                default:
-                    return false;
-            }
-        }
-
-        public override bool IsTouched(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    var thumbFlag = hand == TouchControllerHand.Left ? 0x00000400 : 0x00000004;
-                    //ovrButton_RThumb
-                    return (currentTouchesState & thumbFlag) == thumbFlag;
-                case TouchControllerButton.A:
-                    //ovrButton_A
-                    return (currentTouchesState & 0x00000001) == 0x00000001;
-                case TouchControllerButton.B:
-                    //ovrButton_B
-                    return (currentTouchesState & 0x00000002) == 0x00000002;
-                case TouchControllerButton.X:
-                    //ovrButton_X
-                    return (currentTouchesState & 0x00000100) == 0x00000100;
-                case TouchControllerButton.Y:
-                    //ovrButton_Y
-                    return (currentTouchesState & 0x00000200) == 0x00000200;
-                case TouchControllerButton.Trigger:
-                    return currentTrigger > TriggerAndGripDeadzone;
-                case TouchControllerButton.Grip:
-                    return currentGrip > TriggerAndGripDeadzone;
-                case TouchControllerButton.Menu:
-                    return (currentTouchesState & 0x00100000) == 0x00100000;
-                default:
-                    return false;
-            }
-        }
-
-        public override bool IsPressReleased(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    var thumbFlag = hand == TouchControllerHand.Left ? 0x00000400 : 0x00000004;
-                    //ovrButton_RThumb
-                    return (previousButtonsState & thumbFlag) == thumbFlag && (currentButtonsState & thumbFlag) != thumbFlag;
-                case TouchControllerButton.A:
-                    //ovrButton_A
-                    return (previousButtonsState & 0x00000001) == 0x00000001 && (currentButtonsState & 0x00000001) != 0x00000001;
-                case TouchControllerButton.B:
-                    //ovrButton_B
-                    return (previousButtonsState & 0x00000002) == 0x00000002 && (currentButtonsState & 0x00000002) != 0x00000002;
-                case TouchControllerButton.X:
-                    //ovrButton_X
-                    return (previousButtonsState & 0x00000100) == 0x00000100 && (currentButtonsState & 0x00000100) != 0x00000100;
-                case TouchControllerButton.Y:
-                    //ovrButton_Y
-                    return (previousButtonsState & 0x00000200) == 0x00000200 && (currentButtonsState & 0x00000200) != 0x00000200;
-                case TouchControllerButton.Trigger:
-                    return previousTrigger > TriggerAndGripDeadzone && currentTrigger <= TriggerAndGripDeadzone;
-                case TouchControllerButton.Grip:
-                    return previousGrip > TriggerAndGripDeadzone && currentGrip <= TriggerAndGripDeadzone;
-                case TouchControllerButton.Menu:
-                    return (previousButtonsState & 0x00100000) == 0x00100000 && (currentButtonsState & 0x00100000) != 0x00100000;
-                default:
-                    return false;
-            }
-        }
-
-        public override bool IsTouchReleased(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    var thumbFlag = hand == TouchControllerHand.Left ? 0x00000400 : 0x00000004;
-                    //ovrButton_RThumb
-                    return (previousTouchesState & thumbFlag) == thumbFlag && (currentTouchesState & thumbFlag) != thumbFlag;
-                case TouchControllerButton.A:
-                    //ovrButton_A
-                    return (previousTouchesState & 0x00000001) == 0x00000001 && (currentTouchesState & 0x00000001) != 0x00000001;
-                case TouchControllerButton.B:
-                    //ovrButton_B
-                    return (previousTouchesState & 0x00000002) == 0x00000002 && (currentTouchesState & 0x00000002) != 0x00000002;
-                case TouchControllerButton.X:
-                    //ovrButton_X
-                    return (previousTouchesState & 0x00000100) == 0x00000100 && (currentTouchesState & 0x00000100) != 0x00000100;
-                case TouchControllerButton.Y:
-                    //ovrButton_Y
-                    return (previousTouchesState & 0x00000200) == 0x00000200 && (currentTouchesState & 0x00000200) != 0x00000200;
-                case TouchControllerButton.Trigger:
-                    return previousTrigger > TriggerAndGripDeadzone && currentTrigger <= TriggerAndGripDeadzone;
-                case TouchControllerButton.Grip:
-                    return previousGrip > TriggerAndGripDeadzone && currentGrip <= TriggerAndGripDeadzone;
-                case TouchControllerButton.Menu:
-                    return (previousTouchesState & 0x00100000) == 0x00100000 && (currentTouchesState & 0x00100000) != 0x00100000;
-                default:
-                    return false;
-            }
-        }
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVR.cs b/sources/engine/Xenko.VirtualReality/OpenVR/OpenVR.cs
deleted file mode 100644
index d08110b364..0000000000
--- a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVR.cs
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using System;
-using System.Text;
-using SharpDX.Direct3D11;
-using Valve.VR;
-using Xenko.Core;
-using Xenko.Core.Mathematics;
-using Xenko.Graphics;
-
-namespace Xenko.VirtualReality
-{
-    internal static class OpenVR
-    {
-        public class Controller
-        {
-            // This helper can be used in a variety of ways.  Beware that indices may change
-            // as new devices are dynamically added or removed, controllers are physically
-            // swapped between hands, arms crossed, etc.
-            public enum Hand
-            {
-                Left,
-                Right,
-            }
-
-            public static int GetDeviceIndex(Hand hand)
-            {
-                var currentIndex = 0;
-                for (uint index = 0; index < DevicePoses.Length; index++)
-                {
-                    if (Valve.VR.OpenVR.System.GetTrackedDeviceClass(index) == ETrackedDeviceClass.Controller)
-                    {
-                        if (hand == Hand.Left && Valve.VR.OpenVR.System.GetControllerRoleForTrackedDeviceIndex(index) == ETrackedControllerRole.LeftHand)
-                        {
-                            return currentIndex;
-                        }
-
-                        if (hand == Hand.Right && Valve.VR.OpenVR.System.GetControllerRoleForTrackedDeviceIndex(index) == ETrackedControllerRole.RightHand)
-                        {
-                            return currentIndex;
-                        }
-
-                        currentIndex++;
-                    }
-                }
-
-                return -1;
-            }
-
-            public class ButtonMask
-            {
-                public const ulong System = (1ul << (int)EVRButtonId.k_EButton_System); // reserved
-                public const ulong ApplicationMenu = (1ul << (int)EVRButtonId.k_EButton_ApplicationMenu);
-                public const ulong Grip = (1ul << (int)EVRButtonId.k_EButton_Grip);
-                public const ulong Axis0 = (1ul << (int)EVRButtonId.k_EButton_Axis0);
-                public const ulong Axis1 = (1ul << (int)EVRButtonId.k_EButton_Axis1);
-                public const ulong Axis2 = (1ul << (int)EVRButtonId.k_EButton_Axis2);
-                public const ulong Axis3 = (1ul << (int)EVRButtonId.k_EButton_Axis3);
-                public const ulong Axis4 = (1ul << (int)EVRButtonId.k_EButton_Axis4);
-                public const ulong Touchpad = (1ul << (int)EVRButtonId.k_EButton_SteamVR_Touchpad);
-                public const ulong Trigger = (1ul << (int)EVRButtonId.k_EButton_SteamVR_Trigger);
-            }
-
-            public enum ButtonId
-            {
-                ButtonSystem = 0,
-                ButtonApplicationMenu = 1,
-                ButtonGrip = 2,
-                ButtonDPadLeft = 3,
-                ButtonDPadUp = 4,
-                ButtonDPadRight = 5,
-                ButtonDPadDown = 6,
-                ButtonA = 7,
-                ButtonProximitySensor = 31,
-                ButtonAxis0 = 32,
-                ButtonAxis1 = 33,
-                ButtonAxis2 = 34,
-                ButtonAxis3 = 35,
-                ButtonAxis4 = 36,
-                ButtonSteamVrTouchpad = 32,
-                ButtonSteamVrTrigger = 33,
-                ButtonDashboardBack = 2,
-                ButtonMax = 64,
-            }
-
-            public Controller(int controllerIndex)
-            {
-                var currentIndex = 0;
-                for (uint index = 0; index < DevicePoses.Length; index++)
-                {
-                    if (Valve.VR.OpenVR.System.GetTrackedDeviceClass(index) == ETrackedDeviceClass.Controller)
-                    {
-                        if (currentIndex == controllerIndex)
-                        {
-                            ControllerIndex = index;
-                            break;
-                        }
-                        currentIndex++;
-                    }
-                }
-            }
-
-            internal uint ControllerIndex;
-            internal VRControllerState_t State;
-            internal VRControllerState_t PreviousState;
-
-            public bool GetPress(ulong buttonMask) { return (State.ulButtonPressed & buttonMask) != 0; }
-
-            public bool GetPressDown(ulong buttonMask) { return (State.ulButtonPressed & buttonMask) != 0 && (PreviousState.ulButtonPressed & buttonMask) == 0; }
-
-            public bool GetPressUp(ulong buttonMask) { return (State.ulButtonPressed & buttonMask) == 0 && (PreviousState.ulButtonPressed & buttonMask) != 0; }
-
-            public bool GetPress(ButtonId buttonId) { return GetPress(1ul << (int)buttonId); }
-
-            public bool GetPressDown(ButtonId buttonId) { return GetPressDown(1ul << (int)buttonId); }
-
-            public bool GetPressUp(ButtonId buttonId) { return GetPressUp(1ul << (int)buttonId); }
-
-            public bool GetTouch(ulong buttonMask) { return (State.ulButtonTouched & buttonMask) != 0; }
-
-            public bool GetTouchDown(ulong buttonMask) { return (State.ulButtonTouched & buttonMask) != 0 && (PreviousState.ulButtonTouched & buttonMask) == 0; }
-
-            public bool GetTouchUp(ulong buttonMask) { return (State.ulButtonTouched & buttonMask) == 0 && (PreviousState.ulButtonTouched & buttonMask) != 0; }
-
-            public bool GetTouch(ButtonId buttonId) { return GetTouch(1ul << (int)buttonId); }
-
-            public bool GetTouchDown(ButtonId buttonId) { return GetTouchDown(1ul << (int)buttonId); }
-
-            public bool GetTouchUp(ButtonId buttonId) { return GetTouchUp(1ul << (int)buttonId); }
-
-            public Vector2 GetAxis(ButtonId buttonId = ButtonId.ButtonSteamVrTouchpad)
-            {               
-                var axisId = (uint)buttonId - (uint)EVRButtonId.k_EButton_Axis0;
-                switch (axisId)
-                {
-                    case 0: return new Vector2(State.rAxis0.x, State.rAxis0.y);
-                    case 1: return new Vector2(State.rAxis1.x, State.rAxis1.y);
-                    case 2: return new Vector2(State.rAxis2.x, State.rAxis2.y);
-                    case 3: return new Vector2(State.rAxis3.x, State.rAxis3.y);
-                    case 4: return new Vector2(State.rAxis4.x, State.rAxis4.y);
-                }
-                return Vector2.Zero;
-            }
-
-            public void Update()
-            {
-                PreviousState = State;
-                Valve.VR.OpenVR.System.GetControllerState(ControllerIndex, ref State, (uint)Utilities.SizeOf<VRControllerState_t>());
-            }
-        }
-
-        public class TrackedDevice
-        {
-            public TrackedDevice(int trackerIndex)
-            {
-                TrackerIndex = trackerIndex;
-            }
-
-            const int StringBuilderSize = 64;
-            StringBuilder serialNumberStringBuilder = new StringBuilder(StringBuilderSize);
-            internal string SerialNumber
-            {
-                get
-                {
-                    var error = ETrackedPropertyError.TrackedProp_Success;
-                    serialNumberStringBuilder.Clear();
-                    Valve.VR.OpenVR.System.GetStringTrackedDeviceProperty((uint)TrackerIndex, ETrackedDeviceProperty.Prop_SerialNumber_String, serialNumberStringBuilder, StringBuilderSize, ref error);
-                    if (error == ETrackedPropertyError.TrackedProp_Success)
-                        return serialNumberStringBuilder.ToString();
-                    else
-                        return "";
-                }
-            }
-
-            internal float BatteryPercentage
-            {
-                get
-                {
-                    var error = ETrackedPropertyError.TrackedProp_Success;
-                    var value = Valve.VR.OpenVR.System.GetFloatTrackedDeviceProperty((uint)TrackerIndex, ETrackedDeviceProperty.Prop_DeviceBatteryPercentage_Float, ref error);
-                    if (error == ETrackedPropertyError.TrackedProp_Success)
-                        return value;
-                    else
-                        return 0;
-                }
-            }
-
-            internal int TrackerIndex;
-            internal ETrackedDeviceClass DeviceClass => Valve.VR.OpenVR.System.GetTrackedDeviceClass((uint)TrackerIndex);
-        }
-
-        private static readonly TrackedDevicePose_t[] DevicePoses = new TrackedDevicePose_t[Valve.VR.OpenVR.k_unMaxTrackedDeviceCount];
-        private static readonly TrackedDevicePose_t[] GamePoses = new TrackedDevicePose_t[Valve.VR.OpenVR.k_unMaxTrackedDeviceCount];
-
-        static OpenVR()
-        {
-            NativeLibrary.PreloadLibrary("openvr_api.dll", typeof(OpenVR));
-        }
-
-        public static bool InitDone = false;
-
-        public static bool Init()
-        {
-            var err = EVRInitError.None;
-            Valve.VR.OpenVR.Init(ref err);
-            if (err != EVRInitError.None)
-            {
-                return false;
-            }
-
-            InitDone = true;
-
-            //this makes the camera behave like oculus rift default!
-            Valve.VR.OpenVR.Compositor.SetTrackingSpace(ETrackingUniverseOrigin.TrackingUniverseSeated);
-
-            return true;
-        }
-
-        public static void Shutdown()
-        {
-            if (!InitDone) return;
-            Valve.VR.OpenVR.Shutdown();
-            InitDone = false;
-        }
-
-        public static bool Submit(int eyeIndex, Texture texture, ref RectangleF viewport)
-        {
-            var tex = new Texture_t
-            {
-                eType = EGraphicsAPIConvention.API_DirectX,
-                eColorSpace = EColorSpace.Auto,
-                handle = texture.NativeResource.NativePointer,
-            };
-            var bounds = new VRTextureBounds_t
-            {
-                uMin = viewport.X,
-                uMax = viewport.Width,
-                vMin = viewport.Y,
-                vMax = viewport.Height,
-            };
-
-            return Valve.VR.OpenVR.Compositor.Submit(eyeIndex == 0 ? EVREye.Eye_Left : EVREye.Eye_Right, ref tex, ref bounds, EVRSubmitFlags.Submit_Default) == EVRCompositorError.None;
-        }
-
-        public static void GetEyeToHead(int eyeIndex, out Matrix pose)
-        {
-            GetEyeToHeadUnsafe(eyeIndex, out pose);
-        }
-
-        private static unsafe void GetEyeToHeadUnsafe(int eyeIndex, out Matrix pose)
-        {
-            pose = Matrix.Identity;
-            var eye = eyeIndex == 0 ? EVREye.Eye_Left : EVREye.Eye_Right;
-            var eyeToHead = Valve.VR.OpenVR.System.GetEyeToHeadTransform(eye);
-            Utilities.CopyMemory((IntPtr)Interop.Fixed(ref pose), (IntPtr)Interop.Fixed(ref eyeToHead), Utilities.SizeOf<HmdMatrix34_t>());
-        }
-
-        public static void UpdatePoses()
-        {
-            Valve.VR.OpenVR.Compositor.WaitGetPoses(DevicePoses, GamePoses);
-        }
-
-        public static void Recenter()
-        {
-            Valve.VR.OpenVR.System.ResetSeatedZeroPose();
-        }
-
-        public static void SetTrackingSpace(ETrackingUniverseOrigin space)
-        {
-            Valve.VR.OpenVR.Compositor.SetTrackingSpace(space);
-        }
-
-        public static DeviceState GetControllerPose(int controllerIndex, out Matrix pose, out Vector3 velocity, out Vector3 angVelocity)
-        {
-            return GetControllerPoseUnsafe(controllerIndex, out pose, out velocity, out angVelocity);
-        }
-
-        private static unsafe DeviceState GetControllerPoseUnsafe(int controllerIndex, out Matrix pose, out Vector3 velocity, out Vector3 angVelocity)
-        {
-            var currentIndex = 0;
-
-            pose = Matrix.Identity;
-            velocity = Vector3.Zero;
-            angVelocity = Vector3.Zero;
-
-            for (uint index = 0; index < DevicePoses.Length; index++)
-            {
-                if (Valve.VR.OpenVR.System.GetTrackedDeviceClass(index) == ETrackedDeviceClass.Controller)
-                {
-                    if (currentIndex == controllerIndex)
-                    {
-                        Utilities.CopyMemory((IntPtr)Interop.Fixed(ref pose), (IntPtr)Interop.Fixed(ref DevicePoses[index].mDeviceToAbsoluteTracking), Utilities.SizeOf<HmdMatrix34_t>());
-                        Utilities.CopyMemory((IntPtr)Interop.Fixed(ref velocity), (IntPtr)Interop.Fixed(ref DevicePoses[index].vVelocity), Utilities.SizeOf<HmdVector3_t>());
-                        Utilities.CopyMemory((IntPtr)Interop.Fixed(ref angVelocity), (IntPtr)Interop.Fixed(ref DevicePoses[index].vAngularVelocity), Utilities.SizeOf<HmdVector3_t>());
-
-                        var state = DeviceState.Invalid;
-                        if (DevicePoses[index].bDeviceIsConnected && DevicePoses[index].bPoseIsValid)
-                        {
-                            state = DeviceState.Valid;
-                        }
-                        else if (DevicePoses[index].bDeviceIsConnected && !DevicePoses[index].bPoseIsValid && DevicePoses[index].eTrackingResult == ETrackingResult.Running_OutOfRange)
-                        {
-                            state = DeviceState.OutOfRange;
-                        }
-
-                        return state;
-                    }
-                    currentIndex++;
-                }
-            }
-
-            return DeviceState.Invalid;
-        }
-
-        public static DeviceState GetTrackerPose(int trackerIndex, out Matrix pose, out Vector3 velocity, out Vector3 angVelocity)
-        {
-            return GetTrackerPoseUnsafe(trackerIndex, out pose, out velocity, out angVelocity);
-        }
-
-        private static unsafe DeviceState GetTrackerPoseUnsafe(int trackerIndex, out Matrix pose, out Vector3 velocity, out Vector3 angVelocity)
-        {
-            pose = Matrix.Identity;
-            velocity = Vector3.Zero;
-            angVelocity = Vector3.Zero;
-            var index = trackerIndex;
-
-            Utilities.CopyMemory((IntPtr)Interop.Fixed(ref pose), (IntPtr)Interop.Fixed(ref DevicePoses[index].mDeviceToAbsoluteTracking), Utilities.SizeOf<HmdMatrix34_t>());
-            Utilities.CopyMemory((IntPtr)Interop.Fixed(ref velocity), (IntPtr)Interop.Fixed(ref DevicePoses[index].vVelocity), Utilities.SizeOf<HmdVector3_t>());
-            Utilities.CopyMemory((IntPtr)Interop.Fixed(ref angVelocity), (IntPtr)Interop.Fixed(ref DevicePoses[index].vAngularVelocity), Utilities.SizeOf<HmdVector3_t>());
-
-            var state = DeviceState.Invalid;
-            if (DevicePoses[index].bDeviceIsConnected && DevicePoses[index].bPoseIsValid)
-            {
-                state = DeviceState.Valid;
-            }
-            else if (DevicePoses[index].bDeviceIsConnected && !DevicePoses[index].bPoseIsValid && DevicePoses[index].eTrackingResult == ETrackingResult.Running_OutOfRange)
-            {
-                state = DeviceState.OutOfRange;
-            }
-
-            return state;
-        }
-
-        public static DeviceState GetHeadPose(out Matrix pose, out Vector3 linearVelocity, out Vector3 angularVelocity)
-        {
-            return GetHeadPoseUnsafe(out pose, out linearVelocity, out angularVelocity);
-        }
-
-        private static unsafe DeviceState GetHeadPoseUnsafe(out Matrix pose, out Vector3 linearVelocity, out Vector3 angularVelocity)
-        {
-            pose = Matrix.Identity;
-            linearVelocity = Vector3.Zero;
-            angularVelocity = Vector3.Zero;
-            for (uint index = 0; index < DevicePoses.Length; index++)
-            {
-                if (Valve.VR.OpenVR.System.GetTrackedDeviceClass(index) == ETrackedDeviceClass.HMD)
-                {
-                    Utilities.CopyMemory((IntPtr)Interop.Fixed(ref pose), (IntPtr)Interop.Fixed(ref DevicePoses[index].mDeviceToAbsoluteTracking), Utilities.SizeOf<HmdMatrix34_t>());
-                    Utilities.CopyMemory((IntPtr)Interop.Fixed(ref linearVelocity), (IntPtr)Interop.Fixed(ref DevicePoses[index].vVelocity), Utilities.SizeOf<HmdVector3_t>());
-                    Utilities.CopyMemory((IntPtr)Interop.Fixed(ref angularVelocity), (IntPtr)Interop.Fixed(ref DevicePoses[index].vAngularVelocity), Utilities.SizeOf<HmdVector3_t>());
-
-                    var state = DeviceState.Invalid;
-                    if (DevicePoses[index].bDeviceIsConnected && DevicePoses[index].bPoseIsValid)
-                    {
-                        state = DeviceState.Valid;
-                    }
-                    else if (DevicePoses[index].bDeviceIsConnected && !DevicePoses[index].bPoseIsValid && DevicePoses[index].eTrackingResult == ETrackingResult.Running_OutOfRange)
-                    {
-                        state = DeviceState.OutOfRange;
-                    }
-
-                    return state;
-                }
-            }
-
-            return DeviceState.Invalid;
-        }
-
-        public static void GetProjection(int eyeIndex, float near, float far, out Matrix projection)
-        {
-            GetProjectionUnsafe(eyeIndex, near, far, out projection);
-        }
-
-        private static unsafe void GetProjectionUnsafe(int eyeIndex, float near, float far, out Matrix projection)
-        {
-            projection = Matrix.Identity;
-            var eye = eyeIndex == 0 ? EVREye.Eye_Left : EVREye.Eye_Right;
-            var proj = Valve.VR.OpenVR.System.GetProjectionMatrix(eye, near, far, EGraphicsAPIConvention.API_DirectX);
-            Utilities.CopyMemory((IntPtr)Interop.Fixed(ref projection), (IntPtr)Interop.Fixed(ref proj), Utilities.SizeOf<Matrix>());
-        }
-
-        public static void ShowMirror()
-        {
-            Valve.VR.OpenVR.Compositor.ShowMirrorWindow();
-        }
-
-        public static void HideMirror()
-        {
-            Valve.VR.OpenVR.Compositor.HideMirrorWindow();
-        }
-
-        public static Texture GetMirrorTexture(GraphicsDevice device, int eyeIndex)
-        {
-            var nativeDevice = device.NativeDevice.NativePointer;
-            var eyeTexSrv = IntPtr.Zero;
-            Valve.VR.OpenVR.Compositor.GetMirrorTextureD3D11(eyeIndex == 0 ? EVREye.Eye_Left : EVREye.Eye_Right, nativeDevice, ref eyeTexSrv);
-            var tex = new Texture(device);
-            tex.InitializeFromImpl(new ShaderResourceView(eyeTexSrv));
-            return tex;
-        }
-
-        public static ulong CreateOverlay()
-        {
-            var layerKeyName = Guid.NewGuid().ToString();
-            ulong handle = 0;
-            return Valve.VR.OpenVR.Overlay.CreateOverlay(layerKeyName, layerKeyName, ref handle) == EVROverlayError.None ? handle : 0;
-        }
-
-        public static void InitOverlay(ulong overlayId)
-        {
-            Valve.VR.OpenVR.Overlay.SetOverlayInputMethod(overlayId, VROverlayInputMethod.None);
-            Valve.VR.OpenVR.Overlay.SetOverlayFlag(overlayId, VROverlayFlags.SortWithNonSceneOverlays, true);
-        }
-
-        public static bool SubmitOverlay(ulong overlayId, Texture texture)
-        {
-            var tex = new Texture_t
-            {
-                eType = EGraphicsAPIConvention.API_DirectX,
-                eColorSpace = EColorSpace.Auto,
-                handle = texture.NativeResource.NativePointer,
-            };
-           
-            return Valve.VR.OpenVR.Overlay.SetOverlayTexture(overlayId, ref tex) == EVROverlayError.None;
-        }
-
-        public static unsafe void SetOverlayParams(ulong overlayId, Matrix transform, bool followsHead, Vector2 surfaceSize)
-        {
-            Valve.VR.OpenVR.Overlay.SetOverlayWidthInMeters(overlayId, 1.0f);
-
-            transform = Matrix.Scaling(new Vector3(surfaceSize.X, surfaceSize.Y, 1.0f)) * transform;
-
-            if (followsHead)
-            {
-                HmdMatrix34_t pose = new HmdMatrix34_t();
-                Utilities.CopyMemory((IntPtr)Interop.Fixed(ref pose), (IntPtr)Interop.Fixed(ref transform), Utilities.SizeOf<HmdMatrix34_t>());
-                Valve.VR.OpenVR.Overlay.SetOverlayTransformTrackedDeviceRelative(overlayId, 0, ref pose);
-            }
-            else
-            {
-                HmdMatrix34_t pose = new HmdMatrix34_t();
-                Utilities.CopyMemory((IntPtr)Interop.Fixed(ref pose), (IntPtr)Interop.Fixed(ref transform), Utilities.SizeOf<HmdMatrix34_t>());
-                Valve.VR.OpenVR.Overlay.SetOverlayTransformAbsolute(overlayId, ETrackingUniverseOrigin.TrackingUniverseSeated, ref pose);
-            }
-        }
-
-        public static void SetOverlayEnabled(ulong overlayId, bool enabled)
-        {
-            if (enabled)
-                Valve.VR.OpenVR.Overlay.ShowOverlay(overlayId);
-            else
-                Valve.VR.OpenVR.Overlay.HideOverlay(overlayId);
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVROverlay.cs b/sources/engine/Xenko.VirtualReality/OpenVR/OpenVROverlay.cs
deleted file mode 100644
index 1dea5ffb85..0000000000
--- a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVROverlay.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using Xenko.Core.Mathematics;
-using Xenko.Graphics;
-
-namespace Xenko.VirtualReality
-{
-    internal class OpenVROverlay : VROverlay
-    {
-        private ulong overlayId;
-
-        public OpenVROverlay()
-        {
-            overlayId = OpenVR.CreateOverlay();
-            if (overlayId == 0)
-            {
-                throw new System.Exception("Failed to create OpenVR overlay.");
-            }
-
-            OpenVR.InitOverlay(overlayId);
-            OpenVR.SetOverlayEnabled(overlayId, true);
-        }
-
-        public override void Dispose()
-        {           
-        }
-
-        private bool enabled = true;
-
-        public override bool Enabled
-        {
-            get
-            {
-                return enabled;
-            }
-            set
-            {
-                enabled = value;
-                OpenVR.SetOverlayEnabled(overlayId, enabled);
-            }
-        }
-
-        public override void UpdateSurface(CommandList commandList, Texture texture)
-        {
-            var pose = Matrix.Translation(Position) * Matrix.RotationQuaternion(Rotation);
-            OpenVR.SetOverlayParams(overlayId, pose, FollowHeadRotation, SurfaceSize);
-            OpenVR.SubmitOverlay(overlayId, texture);
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrHmd.cs b/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrHmd.cs
deleted file mode 100644
index f4af4949c6..0000000000
--- a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrHmd.cs
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-using Xenko.Graphics;
-
-namespace Xenko.VirtualReality
-{
-    internal class OpenVRHmd : VRDevice
-    {
-        private RectangleF leftView = new RectangleF(0.0f, 0.0f, 0.5f, 1.0f);
-        private RectangleF rightView = new RectangleF(0.5f, 0.0f, 1.0f, 1.0f);
-        private Texture bothEyesMirror;
-        private Texture leftEyeMirror;
-        private Texture rightEyeMirror;
-        private DeviceState state;
-        private OpenVRTouchController leftHandController;
-        private OpenVRTouchController rightHandController;
-        private OpenVRTrackedDevice[] trackedDevices;
-        private bool needsMirror;
-        private Matrix currentHead;
-        private Vector3 currentHeadPos;
-        private Vector3 currentHeadLinearVelocity;
-        private Vector3 currentHeadAngularVelocity;
-        private Quaternion currentHeadRot;
-
-        public override bool CanInitialize => OpenVR.InitDone || OpenVR.Init();
-
-        public OpenVRHmd()
-        {
-            VRApi = VRApi.OpenVR;
-            SupportsOverlays = true;
-        }
-
-        public override void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, bool requireMirror, int mirrorWidth, int mirrorHeight)
-        {
-            var width = (int)(OptimalRenderFrameSize.Width * RenderFrameScaling);
-            width += width % 2;
-            var height = (int)(OptimalRenderFrameSize.Height * RenderFrameScaling);
-            height += height % 2;
-
-            ActualRenderFrameSize = new Size2(width, height);
-
-            needsMirror = requireMirror;
-
-            if (needsMirror)
-            {
-                bothEyesMirror = Texture.New2D(device, width, height, PixelFormat.R8G8B8A8_UNorm_SRgb, TextureFlags.RenderTarget | TextureFlags.ShaderResource);
-            }
-
-            leftEyeMirror = OpenVR.GetMirrorTexture(device, 0);
-            rightEyeMirror = OpenVR.GetMirrorTexture(device, 1);
-            MirrorTexture = bothEyesMirror;
-
-            leftHandController = new OpenVRTouchController(TouchControllerHand.Left);
-            rightHandController = new OpenVRTouchController(TouchControllerHand.Right);
-
-            trackedDevices = new OpenVRTrackedDevice[Valve.VR.OpenVR.k_unMaxTrackedDeviceCount];
-            for (int i=0; i<trackedDevices.Length; i++) 
-                trackedDevices[i] = new OpenVRTrackedDevice(i);
-        }
-
-        public override VROverlay CreateOverlay(int width, int height, int mipLevels, int sampleCount)
-        {
-            var overlay = new OpenVROverlay();
-            return overlay;
-        }
-
-        public override void Draw(GameTime gameTime)
-        {
-            OpenVR.UpdatePoses();
-            state = OpenVR.GetHeadPose(out currentHead, out currentHeadLinearVelocity, out currentHeadAngularVelocity);
-            Vector3 scale;
-            currentHead.Decompose(out scale, out currentHeadRot, out currentHeadPos);
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            LeftHand.Update(gameTime);
-            RightHand.Update(gameTime);
-            foreach (var tracker in trackedDevices)
-                tracker.Update(gameTime);
-        }
-
-        public override void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Matrix cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection)
-        {
-            Matrix eyeMat, rot;
-            Vector3 pos, scale;
-
-            OpenVR.GetEyeToHead(eye == Eyes.Left ? 0 : 1, out eyeMat);
-            OpenVR.GetProjection(eye == Eyes.Left ? 0 : 1, near, far, out projection);
-
-            var adjustedHeadMatrix = currentHead;
-            if (ignoreHeadPosition)
-            {
-                adjustedHeadMatrix.TranslationVector = Vector3.Zero;
-            }
-            if (ignoreHeadRotation)
-            {
-                // keep the scale just in case
-                adjustedHeadMatrix.Row1 = new Vector4(adjustedHeadMatrix.Row1.Length(), 0, 0, 0);
-                adjustedHeadMatrix.Row2 = new Vector4(0, adjustedHeadMatrix.Row2.Length(), 0, 0);
-                adjustedHeadMatrix.Row3 = new Vector4(0, 0, adjustedHeadMatrix.Row3.Length(), 0);
-            }
-
-            eyeMat = eyeMat * adjustedHeadMatrix * Matrix.Scaling(ViewScaling) * cameraRotation * Matrix.Translation(cameraPosition);
-            eyeMat.Decompose(out scale, out rot, out pos);
-            var finalUp = Vector3.TransformCoordinate(new Vector3(0, 1, 0), rot);
-            var finalForward = Vector3.TransformCoordinate(new Vector3(0, 0, -1), rot);
-            view = Matrix.LookAtRH(pos, pos + finalForward, finalUp);
-        }
-
-        public override void Commit(CommandList commandList, Texture renderFrame)
-        {
-            OpenVR.Submit(0, renderFrame, ref leftView);
-            OpenVR.Submit(1, renderFrame, ref rightView);
-
-            if (needsMirror)
-            {
-                var wholeRegion = new ResourceRegion(0, 0, 0, ActualRenderFrameSize.Width, ActualRenderFrameSize.Height, 1);
-                commandList.CopyRegion(leftEyeMirror, 0, wholeRegion, bothEyesMirror, 0);
-                commandList.CopyRegion(rightEyeMirror, 0, wholeRegion, bothEyesMirror, 0, ActualRenderFrameSize.Width / 2);
-            }
-        }
-        public override void Recenter()
-        {
-            OpenVR.Recenter();
-        }
-
-        public override void SetTrackingSpace(TrackingSpace space)
-        {
-            OpenVR.SetTrackingSpace((Valve.VR.ETrackingUniverseOrigin)space);
-        }
-
-        public override DeviceState State => state;
-
-        public override Vector3 HeadPosition => currentHeadPos;
-
-        public override Quaternion HeadRotation => currentHeadRot;
-
-        public override Vector3 HeadLinearVelocity => currentHeadLinearVelocity;
-
-        public override Vector3 HeadAngularVelocity => currentHeadAngularVelocity;
-
-        public override TouchController LeftHand => leftHandController;
-
-        public override TouchController RightHand => rightHandController;
-
-        public override TrackedItem[] TrackedItems => trackedDevices;
-
-        public override Texture MirrorTexture { get; protected set; }
-
-        public override float RenderFrameScaling { get; set; } = 1.4f;
-
-        public override Size2 ActualRenderFrameSize { get; protected set; }
-
-        public override Size2 OptimalRenderFrameSize => new Size2(2160, 1200);
-
-        public override void Dispose()
-        {
-            OpenVR.Shutdown();
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrTouchController.cs b/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrTouchController.cs
deleted file mode 100644
index 701d375f27..0000000000
--- a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrTouchController.cs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using System;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-
-namespace Xenko.VirtualReality
-{
-    internal class OpenVRTouchController : TouchController
-    {
-        private readonly OpenVR.Controller.Hand hand;
-        private int controllerIndex = -1;
-        private OpenVR.Controller controller;
-        private DeviceState internalState;
-        private Vector3 currentPos;
-        private Vector3 currentLinearVelocity;
-        private Vector3 currentAngularVelocity;
-        private Quaternion currentRot;
-
-        internal OpenVRTouchController(TouchControllerHand hand)
-        {
-            this.hand = (OpenVR.Controller.Hand)hand;
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            var index = OpenVR.Controller.GetDeviceIndex(hand);
-
-            if (controllerIndex != index)
-            {
-                if (index != -1)
-                {
-                    controller = new OpenVR.Controller(index);
-                    controllerIndex = index;
-                }
-                else
-                {
-                    controller = null;
-                }
-            }
-
-            if (controller != null)
-            {
-                controller.Update();
-
-                Matrix mat;
-                Vector3 vel, angVel;
-                internalState = OpenVR.GetControllerPose(controllerIndex, out mat, out vel, out angVel);
-                if (internalState != DeviceState.Invalid)
-                {
-                    Vector3 scale;
-                    mat.Decompose(out scale, out currentRot, out currentPos);
-                    currentLinearVelocity = vel;
-                    currentAngularVelocity = new Vector3(MathUtil.DegreesToRadians(angVel.X), MathUtil.DegreesToRadians(angVel.Y), MathUtil.DegreesToRadians(angVel.Z));
-                }
-            }
-
-            base.Update(gameTime);
-        }
-
-        public override float Trigger => controller?.GetAxis(OpenVR.Controller.ButtonId.ButtonSteamVrTrigger).X ?? 0.0f;
-
-        public override float Grip => controller?.GetPress(OpenVR.Controller.ButtonId.ButtonGrip) ?? false ? 1.0f : 0.0f;
-
-        public override bool IndexPointing => !controller?.GetTouch(OpenVR.Controller.ButtonId.ButtonSteamVrTrigger) ?? false; //not so accurate
-
-        public override bool IndexResting => controller?.GetTouch(OpenVR.Controller.ButtonId.ButtonSteamVrTrigger) ?? false;
-
-        public override bool ThumbUp => !controller?.GetTouch(OpenVR.Controller.ButtonId.ButtonSteamVrTouchpad) ?? false;
-
-        public override bool ThumbResting => controller?.GetTouch(OpenVR.Controller.ButtonId.ButtonSteamVrTouchpad) ?? false;
-
-        public override Vector2 ThumbAxis => controller?.GetAxis() ?? Vector2.Zero;
-
-        public override Vector2 ThumbstickAxis => controller?.GetAxis() ?? Vector2.Zero;
-
-        private OpenVR.Controller.ButtonId ToOpenVrButton(TouchControllerButton button)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    return OpenVR.Controller.ButtonId.ButtonSteamVrTouchpad;              
-                case TouchControllerButton.Trigger:
-                    return OpenVR.Controller.ButtonId.ButtonSteamVrTrigger;
-                case TouchControllerButton.Grip:
-                    return OpenVR.Controller.ButtonId.ButtonGrip;
-                case TouchControllerButton.Menu:
-                    return OpenVR.Controller.ButtonId.ButtonApplicationMenu;
-                default:
-                    return OpenVR.Controller.ButtonId.ButtonMax;
-            }
-        }
-
-        public override bool IsPressedDown(TouchControllerButton button)
-        {
-            return controller?.GetPressDown(ToOpenVrButton(button)) ?? false;
-        }
-
-        public override bool IsTouchedDown(TouchControllerButton button)
-        {
-            return controller?.GetTouchDown(ToOpenVrButton(button)) ?? false;
-        }
-
-        public override bool IsPressed(TouchControllerButton button)
-        {
-            return controller?.GetPress(ToOpenVrButton(button)) ?? false;
-        }
-
-        public override bool IsTouched(TouchControllerButton button)
-        {
-            return controller?.GetTouch(ToOpenVrButton(button)) ?? false;
-        }
-
-        public override bool IsPressReleased(TouchControllerButton button)
-        {
-            return controller?.GetPressUp(ToOpenVrButton(button)) ?? false;
-        }
-
-        public override bool IsTouchReleased(TouchControllerButton button)
-        {
-            return controller?.GetTouchUp(ToOpenVrButton(button)) ?? false;
-        }
-
-        public override Vector3 Position => currentPos;
-
-        public override Quaternion Rotation => currentRot;
-
-        public override Vector3 LinearVelocity => currentLinearVelocity;
-
-        public override Vector3 AngularVelocity => currentAngularVelocity;
-
-        public override DeviceState State => internalState;
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrTrackedDevice.cs b/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrTrackedDevice.cs
deleted file mode 100644
index 972c4ef18f..0000000000
--- a/sources/engine/Xenko.VirtualReality/OpenVR/OpenVrTrackedDevice.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#if XENKO_GRAPHICS_API_DIRECT3D11
-
-using System;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-
-namespace Xenko.VirtualReality
-{
-    internal class OpenVRTrackedDevice : TrackedItem
-    {
-        private readonly int id;
-        private OpenVR.TrackedDevice trackedDevice;
-        private DeviceState internalState;
-        private Vector3 currentPos;
-        private Vector3 currentLinearVelocity;
-        private Vector3 currentAngularVelocity;
-        private Quaternion currentRot;
-
-        internal OpenVRTrackedDevice(int index)
-        {
-            trackedDevice = new OpenVR.TrackedDevice(index);
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            if (trackedDevice != null)
-            {
-                Matrix mat;
-                Vector3 vel, angVel;
-                internalState = OpenVR.GetTrackerPose(trackedDevice.TrackerIndex, out mat, out vel, out angVel);
-                if (internalState != DeviceState.Invalid)
-                {
-                    Vector3 scale;
-                    mat.Decompose(out scale, out currentRot, out currentPos);
-                    currentLinearVelocity = vel;
-                    currentAngularVelocity = new Vector3(MathUtil.DegreesToRadians(angVel.X), MathUtil.DegreesToRadians(angVel.Y), MathUtil.DegreesToRadians(angVel.Z));
-                }
-            }
-
-            base.Update(gameTime);
-        }
-
-        public override Vector3 Position => currentPos;
-
-        public override Quaternion Rotation => currentRot;
-
-        public override Vector3 LinearVelocity => currentLinearVelocity;
-
-        public override Vector3 AngularVelocity => currentAngularVelocity;
-
-        public override DeviceState State => internalState;
-
-        public override DeviceClass Class => (DeviceClass)trackedDevice.DeviceClass;
-
-        public override string SerialNumber => trackedDevice.SerialNumber;
-
-        public override float BatteryPercentage => trackedDevice.BatteryPercentage;
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/OpenVR/openvr_api.cs b/sources/engine/Xenko.VirtualReality/OpenVR/openvr_api.cs
deleted file mode 100644
index e52622f0c5..0000000000
--- a/sources/engine/Xenko.VirtualReality/OpenVR/openvr_api.cs
+++ /dev/null
@@ -1,4531 +0,0 @@
-//======= Copyright (c) Valve Corporation, All rights reserved. ===============
-//
-// Purpose: This file contains C#/managed code bindings for the OpenVR interfaces
-// This file is auto-generated, do not edit it.
-//
-//=============================================================================
-/// <auto-generated/>
-using System;
-using System.Runtime.InteropServices;
-using Valve.VR;
-
-namespace Valve.VR
-{
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRSystem
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetRecommendedRenderTargetSize(ref uint pnWidth, ref uint pnHeight);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRecommendedRenderTargetSize GetRecommendedRenderTargetSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HmdMatrix44_t _GetProjectionMatrix(EVREye eEye, float fNearZ, float fFarZ, EGraphicsAPIConvention eProjType);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetProjectionMatrix GetProjectionMatrix;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetProjectionRaw(EVREye eEye, ref float pfLeft, ref float pfRight, ref float pfTop, ref float pfBottom);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetProjectionRaw GetProjectionRaw;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _ComputeDistortion(EVREye eEye, float fU, float fV, ref DistortionCoordinates_t pDistortionCoordinates);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ComputeDistortion ComputeDistortion;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HmdMatrix34_t _GetEyeToHeadTransform(EVREye eEye);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetEyeToHeadTransform GetEyeToHeadTransform;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetTimeSinceLastVsync(ref float pfSecondsSinceLastVsync, ref ulong pulFrameCounter);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTimeSinceLastVsync GetTimeSinceLastVsync;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate int _GetD3D9AdapterIndex();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetD3D9AdapterIndex GetD3D9AdapterIndex;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetDXGIOutputInfo(ref int pnAdapterIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetDXGIOutputInfo GetDXGIOutputInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsDisplayOnDesktop();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsDisplayOnDesktop IsDisplayOnDesktop;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _SetDisplayVisibility(bool bIsVisibleOnDesktop);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetDisplayVisibility SetDisplayVisibility;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetDeviceToAbsoluteTrackingPose(ETrackingUniverseOrigin eOrigin, float fPredictedSecondsToPhotonsFromNow, [In, Out] TrackedDevicePose_t[] pTrackedDevicePoseArray, uint unTrackedDevicePoseArrayCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetDeviceToAbsoluteTrackingPose GetDeviceToAbsoluteTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ResetSeatedZeroPose();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ResetSeatedZeroPose ResetSeatedZeroPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HmdMatrix34_t _GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetSeatedZeroPoseToStandingAbsoluteTrackingPose GetSeatedZeroPoseToStandingAbsoluteTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HmdMatrix34_t _GetRawZeroPoseToStandingAbsoluteTrackingPose();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRawZeroPoseToStandingAbsoluteTrackingPose GetRawZeroPoseToStandingAbsoluteTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetSortedTrackedDeviceIndicesOfClass(ETrackedDeviceClass eTrackedDeviceClass, [In, Out] uint[] punTrackedDeviceIndexArray, uint unTrackedDeviceIndexArrayCount, uint unRelativeToTrackedDeviceIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetSortedTrackedDeviceIndicesOfClass GetSortedTrackedDeviceIndicesOfClass;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EDeviceActivityLevel _GetTrackedDeviceActivityLevel(uint unDeviceId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTrackedDeviceActivityLevel GetTrackedDeviceActivityLevel;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ApplyTransform(ref TrackedDevicePose_t pOutputPose, ref TrackedDevicePose_t pTrackedDevicePose, ref HmdMatrix34_t pTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ApplyTransform ApplyTransform;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetTrackedDeviceIndexForControllerRole(ETrackedControllerRole unDeviceType);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTrackedDeviceIndexForControllerRole GetTrackedDeviceIndexForControllerRole;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ETrackedControllerRole _GetControllerRoleForTrackedDeviceIndex(uint unDeviceIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetControllerRoleForTrackedDeviceIndex GetControllerRoleForTrackedDeviceIndex;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ETrackedDeviceClass _GetTrackedDeviceClass(uint unDeviceIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTrackedDeviceClass GetTrackedDeviceClass;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsTrackedDeviceConnected(uint unDeviceIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsTrackedDeviceConnected IsTrackedDeviceConnected;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetBoolTrackedDeviceProperty(uint unDeviceIndex, ETrackedDeviceProperty prop, ref ETrackedPropertyError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetBoolTrackedDeviceProperty GetBoolTrackedDeviceProperty;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate float _GetFloatTrackedDeviceProperty(uint unDeviceIndex, ETrackedDeviceProperty prop, ref ETrackedPropertyError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetFloatTrackedDeviceProperty GetFloatTrackedDeviceProperty;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate int _GetInt32TrackedDeviceProperty(uint unDeviceIndex, ETrackedDeviceProperty prop, ref ETrackedPropertyError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetInt32TrackedDeviceProperty GetInt32TrackedDeviceProperty;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetUint64TrackedDeviceProperty(uint unDeviceIndex, ETrackedDeviceProperty prop, ref ETrackedPropertyError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetUint64TrackedDeviceProperty GetUint64TrackedDeviceProperty;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HmdMatrix34_t _GetMatrix34TrackedDeviceProperty(uint unDeviceIndex, ETrackedDeviceProperty prop, ref ETrackedPropertyError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetMatrix34TrackedDeviceProperty GetMatrix34TrackedDeviceProperty;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetStringTrackedDeviceProperty(uint unDeviceIndex, ETrackedDeviceProperty prop, System.Text.StringBuilder pchValue, uint unBufferSize, ref ETrackedPropertyError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetStringTrackedDeviceProperty GetStringTrackedDeviceProperty;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetPropErrorNameFromEnum(ETrackedPropertyError error);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetPropErrorNameFromEnum GetPropErrorNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _PollNextEvent(ref VREvent_t pEvent, uint uncbVREvent);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _PollNextEvent PollNextEvent;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _PollNextEventWithPose(ETrackingUniverseOrigin eOrigin, ref VREvent_t pEvent, uint uncbVREvent, ref TrackedDevicePose_t pTrackedDevicePose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _PollNextEventWithPose PollNextEventWithPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetEventTypeNameFromEnum(EVREventType eType);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetEventTypeNameFromEnum GetEventTypeNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HiddenAreaMesh_t _GetHiddenAreaMesh(EVREye eEye, EHiddenAreaMeshType type);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetHiddenAreaMesh GetHiddenAreaMesh;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetControllerState(uint unControllerDeviceIndex, ref VRControllerState_t pControllerState, uint unControllerStateSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetControllerState GetControllerState;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetControllerStateWithPose(ETrackingUniverseOrigin eOrigin, uint unControllerDeviceIndex, ref VRControllerState_t pControllerState, uint unControllerStateSize, ref TrackedDevicePose_t pTrackedDevicePose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetControllerStateWithPose GetControllerStateWithPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _TriggerHapticPulse(uint unControllerDeviceIndex, uint unAxisId, char usDurationMicroSec);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _TriggerHapticPulse TriggerHapticPulse;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetButtonIdNameFromEnum(EVRButtonId eButtonId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetButtonIdNameFromEnum GetButtonIdNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetControllerAxisTypeNameFromEnum(EVRControllerAxisType eAxisType);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetControllerAxisTypeNameFromEnum GetControllerAxisTypeNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _CaptureInputFocus();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CaptureInputFocus CaptureInputFocus;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ReleaseInputFocus();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReleaseInputFocus ReleaseInputFocus;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsInputFocusCapturedByAnotherProcess();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsInputFocusCapturedByAnotherProcess IsInputFocusCapturedByAnotherProcess;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _DriverDebugRequest(uint unDeviceIndex, string pchRequest, string pchResponseBuffer, uint unResponseBufferSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _DriverDebugRequest DriverDebugRequest;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRFirmwareError _PerformFirmwareUpdate(uint unDeviceIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _PerformFirmwareUpdate PerformFirmwareUpdate;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _AcknowledgeQuit_Exiting();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _AcknowledgeQuit_Exiting AcknowledgeQuit_Exiting;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _AcknowledgeQuit_UserPrompt();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _AcknowledgeQuit_UserPrompt AcknowledgeQuit_UserPrompt;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRExtendedDisplay
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetWindowBounds(ref int pnX, ref int pnY, ref uint pnWidth, ref uint pnHeight);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetWindowBounds GetWindowBounds;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetEyeOutputViewport(EVREye eEye, ref uint pnX, ref uint pnY, ref uint pnWidth, ref uint pnHeight);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetEyeOutputViewport GetEyeOutputViewport;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetDXGIOutputInfo(ref int pnAdapterIndex, ref int pnAdapterOutputIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetDXGIOutputInfo GetDXGIOutputInfo;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRTrackedCamera
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetCameraErrorNameFromEnum(EVRTrackedCameraError eCameraError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCameraErrorNameFromEnum GetCameraErrorNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _HasCamera(uint nDeviceIndex, ref bool pHasCamera);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _HasCamera HasCamera;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetCameraFrameSize(uint nDeviceIndex, EVRTrackedCameraFrameType eFrameType, ref uint pnWidth, ref uint pnHeight, ref uint pnFrameBufferSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCameraFrameSize GetCameraFrameSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetCameraIntrinisics(uint nDeviceIndex, EVRTrackedCameraFrameType eFrameType, ref HmdVector2_t pFocalLength, ref HmdVector2_t pCenter);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCameraIntrinisics GetCameraIntrinisics;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetCameraProjection(uint nDeviceIndex, EVRTrackedCameraFrameType eFrameType, float flZNear, float flZFar, ref HmdMatrix44_t pProjection);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCameraProjection GetCameraProjection;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _AcquireVideoStreamingService(uint nDeviceIndex, ref ulong pHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _AcquireVideoStreamingService AcquireVideoStreamingService;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _ReleaseVideoStreamingService(ulong hTrackedCamera);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReleaseVideoStreamingService ReleaseVideoStreamingService;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetVideoStreamFrameBuffer(ulong hTrackedCamera, EVRTrackedCameraFrameType eFrameType, IntPtr pFrameBuffer, uint nFrameBufferSize, ref CameraVideoStreamFrameHeader_t pFrameHeader, uint nFrameHeaderSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetVideoStreamFrameBuffer GetVideoStreamFrameBuffer;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetVideoStreamTextureSize(uint nDeviceIndex, EVRTrackedCameraFrameType eFrameType, ref VRTextureBounds_t pTextureBounds, ref uint pnWidth, ref uint pnHeight);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetVideoStreamTextureSize GetVideoStreamTextureSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetVideoStreamTextureD3D11(ulong hTrackedCamera, EVRTrackedCameraFrameType eFrameType, IntPtr pD3D11DeviceOrResource, ref IntPtr ppD3D11ShaderResourceView, ref CameraVideoStreamFrameHeader_t pFrameHeader, uint nFrameHeaderSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetVideoStreamTextureD3D11 GetVideoStreamTextureD3D11;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _GetVideoStreamTextureGL(ulong hTrackedCamera, EVRTrackedCameraFrameType eFrameType, ref uint pglTextureId, ref CameraVideoStreamFrameHeader_t pFrameHeader, uint nFrameHeaderSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetVideoStreamTextureGL GetVideoStreamTextureGL;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRTrackedCameraError _ReleaseVideoStreamTextureGL(ulong hTrackedCamera, uint glTextureId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReleaseVideoStreamTextureGL ReleaseVideoStreamTextureGL;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRApplications
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _AddApplicationManifest(string pchApplicationManifestFullPath, bool bTemporary);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _AddApplicationManifest AddApplicationManifest;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _RemoveApplicationManifest(string pchApplicationManifestFullPath);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RemoveApplicationManifest RemoveApplicationManifest;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsApplicationInstalled(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsApplicationInstalled IsApplicationInstalled;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetApplicationCount();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationCount GetApplicationCount;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _GetApplicationKeyByIndex(uint unApplicationIndex, System.Text.StringBuilder pchAppKeyBuffer, uint unAppKeyBufferLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationKeyByIndex GetApplicationKeyByIndex;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _GetApplicationKeyByProcessId(uint unProcessId, string pchAppKeyBuffer, uint unAppKeyBufferLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationKeyByProcessId GetApplicationKeyByProcessId;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _LaunchApplication(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LaunchApplication LaunchApplication;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _LaunchTemplateApplication(string pchTemplateAppKey, string pchNewAppKey, [In, Out] AppOverrideKeys_t[] pKeys, uint unKeys);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LaunchTemplateApplication LaunchTemplateApplication;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _LaunchApplicationFromMimeType(string pchMimeType, string pchArgs);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LaunchApplicationFromMimeType LaunchApplicationFromMimeType;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _LaunchDashboardOverlay(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LaunchDashboardOverlay LaunchDashboardOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _CancelApplicationLaunch(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CancelApplicationLaunch CancelApplicationLaunch;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _IdentifyApplication(uint unProcessId, string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IdentifyApplication IdentifyApplication;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetApplicationProcessId(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationProcessId GetApplicationProcessId;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetApplicationsErrorNameFromEnum(EVRApplicationError error);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationsErrorNameFromEnum GetApplicationsErrorNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetApplicationPropertyString(string pchAppKey, EVRApplicationProperty eProperty, System.Text.StringBuilder pchPropertyValueBuffer, uint unPropertyValueBufferLen, ref EVRApplicationError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationPropertyString GetApplicationPropertyString;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetApplicationPropertyBool(string pchAppKey, EVRApplicationProperty eProperty, ref EVRApplicationError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationPropertyBool GetApplicationPropertyBool;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetApplicationPropertyUint64(string pchAppKey, EVRApplicationProperty eProperty, ref EVRApplicationError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationPropertyUint64 GetApplicationPropertyUint64;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _SetApplicationAutoLaunch(string pchAppKey, bool bAutoLaunch);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetApplicationAutoLaunch SetApplicationAutoLaunch;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetApplicationAutoLaunch(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationAutoLaunch GetApplicationAutoLaunch;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _SetDefaultApplicationForMimeType(string pchAppKey, string pchMimeType);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetDefaultApplicationForMimeType SetDefaultApplicationForMimeType;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetDefaultApplicationForMimeType(string pchMimeType, string pchAppKeyBuffer, uint unAppKeyBufferLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetDefaultApplicationForMimeType GetDefaultApplicationForMimeType;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetApplicationSupportedMimeTypes(string pchAppKey, string pchMimeTypesBuffer, uint unMimeTypesBuffer);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationSupportedMimeTypes GetApplicationSupportedMimeTypes;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetApplicationsThatSupportMimeType(string pchMimeType, string pchAppKeysThatSupportBuffer, uint unAppKeysThatSupportBuffer);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationsThatSupportMimeType GetApplicationsThatSupportMimeType;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetApplicationLaunchArguments(uint unHandle, string pchArgs, uint unArgs);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationLaunchArguments GetApplicationLaunchArguments;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _GetStartingApplication(string pchAppKeyBuffer, uint unAppKeyBufferLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetStartingApplication GetStartingApplication;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationTransitionState _GetTransitionState();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTransitionState GetTransitionState;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _PerformApplicationPrelaunchCheck(string pchAppKey);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _PerformApplicationPrelaunchCheck PerformApplicationPrelaunchCheck;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetApplicationsTransitionStateNameFromEnum(EVRApplicationTransitionState state);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetApplicationsTransitionStateNameFromEnum GetApplicationsTransitionStateNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsQuitUserPromptRequested();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsQuitUserPromptRequested IsQuitUserPromptRequested;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRApplicationError _LaunchInternalProcess(string pchBinaryPath, string pchArguments, string pchWorkingDirectory);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LaunchInternalProcess LaunchInternalProcess;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRChaperone
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ChaperoneCalibrationState _GetCalibrationState();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCalibrationState GetCalibrationState;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetPlayAreaSize(ref float pSizeX, ref float pSizeZ);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetPlayAreaSize GetPlayAreaSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetPlayAreaRect(ref HmdQuad_t rect);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetPlayAreaRect GetPlayAreaRect;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ReloadInfo();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReloadInfo ReloadInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetSceneColor(HmdColor_t color);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetSceneColor SetSceneColor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetBoundsColor(ref HmdColor_t pOutputColorArray, int nNumOutputColors, float flCollisionBoundsFadeDistance, ref HmdColor_t pOutputCameraColor);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetBoundsColor GetBoundsColor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _AreBoundsVisible();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _AreBoundsVisible AreBoundsVisible;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ForceBoundsVisible(bool bForce);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ForceBoundsVisible ForceBoundsVisible;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRChaperoneSetup
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _CommitWorkingCopy(EChaperoneConfigFile configFile);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CommitWorkingCopy CommitWorkingCopy;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _RevertWorkingCopy();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RevertWorkingCopy RevertWorkingCopy;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetWorkingPlayAreaSize(ref float pSizeX, ref float pSizeZ);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetWorkingPlayAreaSize GetWorkingPlayAreaSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetWorkingPlayAreaRect(ref HmdQuad_t rect);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetWorkingPlayAreaRect GetWorkingPlayAreaRect;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetWorkingCollisionBoundsInfo([In, Out] HmdQuad_t[] pQuadsBuffer, ref uint punQuadsCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetWorkingCollisionBoundsInfo GetWorkingCollisionBoundsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetLiveCollisionBoundsInfo([In, Out] HmdQuad_t[] pQuadsBuffer, ref uint punQuadsCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLiveCollisionBoundsInfo GetLiveCollisionBoundsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetWorkingSeatedZeroPoseToRawTrackingPose(ref HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetWorkingSeatedZeroPoseToRawTrackingPose GetWorkingSeatedZeroPoseToRawTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetWorkingStandingZeroPoseToRawTrackingPose(ref HmdMatrix34_t pmatStandingZeroPoseToRawTrackingPose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetWorkingStandingZeroPoseToRawTrackingPose GetWorkingStandingZeroPoseToRawTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetWorkingPlayAreaSize(float sizeX, float sizeZ);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetWorkingPlayAreaSize SetWorkingPlayAreaSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetWorkingCollisionBoundsInfo([In, Out] HmdQuad_t[] pQuadsBuffer, uint unQuadsCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetWorkingCollisionBoundsInfo SetWorkingCollisionBoundsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetWorkingSeatedZeroPoseToRawTrackingPose(ref HmdMatrix34_t pMatSeatedZeroPoseToRawTrackingPose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetWorkingSeatedZeroPoseToRawTrackingPose SetWorkingSeatedZeroPoseToRawTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetWorkingStandingZeroPoseToRawTrackingPose(ref HmdMatrix34_t pMatStandingZeroPoseToRawTrackingPose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetWorkingStandingZeroPoseToRawTrackingPose SetWorkingStandingZeroPoseToRawTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ReloadFromDisk(EChaperoneConfigFile configFile);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReloadFromDisk ReloadFromDisk;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetLiveSeatedZeroPoseToRawTrackingPose(ref HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLiveSeatedZeroPoseToRawTrackingPose GetLiveSeatedZeroPoseToRawTrackingPose;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetWorkingCollisionBoundsTagsInfo([In, Out] byte[] pTagsBuffer, uint unTagCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetWorkingCollisionBoundsTagsInfo SetWorkingCollisionBoundsTagsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetLiveCollisionBoundsTagsInfo([In, Out] byte[] pTagsBuffer, ref uint punTagCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLiveCollisionBoundsTagsInfo GetLiveCollisionBoundsTagsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _SetWorkingPhysicalBoundsInfo([In, Out] HmdQuad_t[] pQuadsBuffer, uint unQuadsCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetWorkingPhysicalBoundsInfo SetWorkingPhysicalBoundsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetLivePhysicalBoundsInfo([In, Out] HmdQuad_t[] pQuadsBuffer, ref uint punQuadsCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLivePhysicalBoundsInfo GetLivePhysicalBoundsInfo;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _ExportLiveToBuffer(System.Text.StringBuilder pBuffer, ref uint pnBufferLength);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ExportLiveToBuffer ExportLiveToBuffer;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _ImportFromBufferToWorking(string pBuffer, uint nImportFlags);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ImportFromBufferToWorking ImportFromBufferToWorking;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRCompositor
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetTrackingSpace(ETrackingUniverseOrigin eOrigin);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetTrackingSpace SetTrackingSpace;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ETrackingUniverseOrigin _GetTrackingSpace();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTrackingSpace GetTrackingSpace;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _WaitGetPoses([In, Out] TrackedDevicePose_t[] pRenderPoseArray, uint unRenderPoseArrayCount, [In, Out] TrackedDevicePose_t[] pGamePoseArray, uint unGamePoseArrayCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _WaitGetPoses WaitGetPoses;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _GetLastPoses([In, Out] TrackedDevicePose_t[] pRenderPoseArray, uint unRenderPoseArrayCount, [In, Out] TrackedDevicePose_t[] pGamePoseArray, uint unGamePoseArrayCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLastPoses GetLastPoses;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _GetLastPoseForTrackedDeviceIndex(uint unDeviceIndex, ref TrackedDevicePose_t pOutputPose, ref TrackedDevicePose_t pOutputGamePose);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLastPoseForTrackedDeviceIndex GetLastPoseForTrackedDeviceIndex;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _Submit(EVREye eEye, ref Texture_t pTexture, ref VRTextureBounds_t pBounds, EVRSubmitFlags nSubmitFlags);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _Submit Submit;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ClearLastSubmittedFrame();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ClearLastSubmittedFrame ClearLastSubmittedFrame;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _PostPresentHandoff();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _PostPresentHandoff PostPresentHandoff;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetFrameTiming(ref Compositor_FrameTiming pTiming, uint unFramesAgo);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetFrameTiming GetFrameTiming;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetFrameTimings(ref Compositor_FrameTiming pTiming, uint nFrames);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetFrameTimings GetFrameTimings;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate float _GetFrameTimeRemaining();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetFrameTimeRemaining GetFrameTimeRemaining;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetCumulativeStats(ref Compositor_CumulativeStats pStats, uint nStatsSizeInBytes);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCumulativeStats GetCumulativeStats;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _FadeToColor(float fSeconds, float fRed, float fGreen, float fBlue, float fAlpha, bool bBackground);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _FadeToColor FadeToColor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate HmdColor_t _GetCurrentFadeColor(bool bBackground);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCurrentFadeColor GetCurrentFadeColor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _FadeGrid(float fSeconds, bool bFadeIn);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _FadeGrid FadeGrid;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate float _GetCurrentGridAlpha();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCurrentGridAlpha GetCurrentGridAlpha;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _SetSkyboxOverride([In, Out] Texture_t[] pTextures, uint unTextureCount);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetSkyboxOverride SetSkyboxOverride;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ClearSkyboxOverride();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ClearSkyboxOverride ClearSkyboxOverride;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _CompositorBringToFront();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CompositorBringToFront CompositorBringToFront;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _CompositorGoToBack();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CompositorGoToBack CompositorGoToBack;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _CompositorQuit();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CompositorQuit CompositorQuit;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsFullscreen();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsFullscreen IsFullscreen;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetCurrentSceneFocusProcess();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetCurrentSceneFocusProcess GetCurrentSceneFocusProcess;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetLastFrameRenderer();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetLastFrameRenderer GetLastFrameRenderer;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _CanRenderScene();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CanRenderScene CanRenderScene;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ShowMirrorWindow();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ShowMirrorWindow ShowMirrorWindow;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _HideMirrorWindow();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _HideMirrorWindow HideMirrorWindow;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsMirrorWindowVisible();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsMirrorWindowVisible IsMirrorWindowVisible;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _CompositorDumpImages();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CompositorDumpImages CompositorDumpImages;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _ShouldAppRenderWithLowResources();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ShouldAppRenderWithLowResources ShouldAppRenderWithLowResources;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ForceInterleavedReprojectionOn(bool bOverride);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ForceInterleavedReprojectionOn ForceInterleavedReprojectionOn;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ForceReconnectProcess();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ForceReconnectProcess ForceReconnectProcess;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SuspendRendering(bool bSuspend);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SuspendRendering SuspendRendering;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _GetMirrorTextureD3D11(EVREye eEye, IntPtr pD3D11DeviceOrResource, ref IntPtr ppD3D11ShaderResourceView);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetMirrorTextureD3D11 GetMirrorTextureD3D11;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRCompositorError _GetMirrorTextureGL(EVREye eEye, ref uint pglTextureId, IntPtr pglSharedTextureHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetMirrorTextureGL GetMirrorTextureGL;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _ReleaseSharedGLTexture(uint glTextureId, IntPtr glSharedTextureHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReleaseSharedGLTexture ReleaseSharedGLTexture;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _LockGLSharedTextureForAccess(IntPtr glSharedTextureHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LockGLSharedTextureForAccess LockGLSharedTextureForAccess;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _UnlockGLSharedTextureForAccess(IntPtr glSharedTextureHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _UnlockGLSharedTextureForAccess UnlockGLSharedTextureForAccess;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVROverlay
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _FindOverlay(string pchOverlayKey, ref ulong pOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _FindOverlay FindOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _CreateOverlay(string pchOverlayKey, string pchOverlayFriendlyName, ref ulong pOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CreateOverlay CreateOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _DestroyOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _DestroyOverlay DestroyOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetHighQualityOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetHighQualityOverlay SetHighQualityOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetHighQualityOverlay();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetHighQualityOverlay GetHighQualityOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetOverlayKey(ulong ulOverlayHandle, System.Text.StringBuilder pchValue, uint unBufferSize, ref EVROverlayError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayKey GetOverlayKey;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetOverlayName(ulong ulOverlayHandle, System.Text.StringBuilder pchValue, uint unBufferSize, ref EVROverlayError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayName GetOverlayName;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayImageData(ulong ulOverlayHandle, IntPtr pvBuffer, uint unBufferSize, ref uint punWidth, ref uint punHeight);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayImageData GetOverlayImageData;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetOverlayErrorNameFromEnum(EVROverlayError error);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayErrorNameFromEnum GetOverlayErrorNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayRenderingPid(ulong ulOverlayHandle, uint unPID);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayRenderingPid SetOverlayRenderingPid;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetOverlayRenderingPid(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayRenderingPid GetOverlayRenderingPid;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayFlag(ulong ulOverlayHandle, VROverlayFlags eOverlayFlag, bool bEnabled);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayFlag SetOverlayFlag;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayFlag(ulong ulOverlayHandle, VROverlayFlags eOverlayFlag, ref bool pbEnabled);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayFlag GetOverlayFlag;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayColor(ulong ulOverlayHandle, float fRed, float fGreen, float fBlue);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayColor SetOverlayColor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayColor(ulong ulOverlayHandle, ref float pfRed, ref float pfGreen, ref float pfBlue);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayColor GetOverlayColor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayAlpha(ulong ulOverlayHandle, float fAlpha);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayAlpha SetOverlayAlpha;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayAlpha(ulong ulOverlayHandle, ref float pfAlpha);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayAlpha GetOverlayAlpha;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTexelAspect(ulong ulOverlayHandle, float fTexelAspect);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTexelAspect SetOverlayTexelAspect;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTexelAspect(ulong ulOverlayHandle, ref float pfTexelAspect);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTexelAspect GetOverlayTexelAspect;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlaySortOrder(ulong ulOverlayHandle, uint unSortOrder);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlaySortOrder SetOverlaySortOrder;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlaySortOrder(ulong ulOverlayHandle, ref uint punSortOrder);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlaySortOrder GetOverlaySortOrder;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayWidthInMeters(ulong ulOverlayHandle, float fWidthInMeters);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayWidthInMeters SetOverlayWidthInMeters;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayWidthInMeters(ulong ulOverlayHandle, ref float pfWidthInMeters);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayWidthInMeters GetOverlayWidthInMeters;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle, float fMinDistanceInMeters, float fMaxDistanceInMeters);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayAutoCurveDistanceRangeInMeters SetOverlayAutoCurveDistanceRangeInMeters;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle, ref float pfMinDistanceInMeters, ref float pfMaxDistanceInMeters);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayAutoCurveDistanceRangeInMeters GetOverlayAutoCurveDistanceRangeInMeters;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTextureColorSpace(ulong ulOverlayHandle, EColorSpace eTextureColorSpace);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTextureColorSpace SetOverlayTextureColorSpace;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTextureColorSpace(ulong ulOverlayHandle, ref EColorSpace peTextureColorSpace);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTextureColorSpace GetOverlayTextureColorSpace;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTextureBounds(ulong ulOverlayHandle, ref VRTextureBounds_t pOverlayTextureBounds);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTextureBounds SetOverlayTextureBounds;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTextureBounds(ulong ulOverlayHandle, ref VRTextureBounds_t pOverlayTextureBounds);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTextureBounds GetOverlayTextureBounds;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTransformType(ulong ulOverlayHandle, ref VROverlayTransformType peTransformType);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTransformType GetOverlayTransformType;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTransformAbsolute(ulong ulOverlayHandle, ETrackingUniverseOrigin eTrackingOrigin, ref HmdMatrix34_t pmatTrackingOriginToOverlayTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTransformAbsolute SetOverlayTransformAbsolute;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTransformAbsolute(ulong ulOverlayHandle, ref ETrackingUniverseOrigin peTrackingOrigin, ref HmdMatrix34_t pmatTrackingOriginToOverlayTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTransformAbsolute GetOverlayTransformAbsolute;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTransformTrackedDeviceRelative(ulong ulOverlayHandle, uint unTrackedDevice, ref HmdMatrix34_t pmatTrackedDeviceToOverlayTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTransformTrackedDeviceRelative SetOverlayTransformTrackedDeviceRelative;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTransformTrackedDeviceRelative(ulong ulOverlayHandle, ref uint punTrackedDevice, ref HmdMatrix34_t pmatTrackedDeviceToOverlayTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTransformTrackedDeviceRelative GetOverlayTransformTrackedDeviceRelative;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTransformTrackedDeviceComponent(ulong ulOverlayHandle, uint unDeviceIndex, string pchComponentName);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTransformTrackedDeviceComponent SetOverlayTransformTrackedDeviceComponent;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTransformTrackedDeviceComponent(ulong ulOverlayHandle, ref uint punDeviceIndex, string pchComponentName, uint unComponentNameSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTransformTrackedDeviceComponent GetOverlayTransformTrackedDeviceComponent;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _ShowOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ShowOverlay ShowOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _HideOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _HideOverlay HideOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsOverlayVisible(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsOverlayVisible IsOverlayVisible;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetTransformForOverlayCoordinates(ulong ulOverlayHandle, ETrackingUniverseOrigin eTrackingOrigin, HmdVector2_t coordinatesInOverlay, ref HmdMatrix34_t pmatTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetTransformForOverlayCoordinates GetTransformForOverlayCoordinates;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _PollNextOverlayEvent(ulong ulOverlayHandle, ref VREvent_t pEvent, uint uncbVREvent);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _PollNextOverlayEvent PollNextOverlayEvent;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayInputMethod(ulong ulOverlayHandle, ref VROverlayInputMethod peInputMethod);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayInputMethod GetOverlayInputMethod;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayInputMethod(ulong ulOverlayHandle, VROverlayInputMethod eInputMethod);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayInputMethod SetOverlayInputMethod;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayMouseScale(ulong ulOverlayHandle, ref HmdVector2_t pvecMouseScale);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayMouseScale GetOverlayMouseScale;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayMouseScale(ulong ulOverlayHandle, ref HmdVector2_t pvecMouseScale);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayMouseScale SetOverlayMouseScale;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _ComputeOverlayIntersection(ulong ulOverlayHandle, ref VROverlayIntersectionParams_t pParams, ref VROverlayIntersectionResults_t pResults);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ComputeOverlayIntersection ComputeOverlayIntersection;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _HandleControllerOverlayInteractionAsMouse(ulong ulOverlayHandle, uint unControllerDeviceIndex);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _HandleControllerOverlayInteractionAsMouse HandleControllerOverlayInteractionAsMouse;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsHoverTargetOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsHoverTargetOverlay IsHoverTargetOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetGamepadFocusOverlay();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetGamepadFocusOverlay GetGamepadFocusOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetGamepadFocusOverlay(ulong ulNewFocusOverlay);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetGamepadFocusOverlay SetGamepadFocusOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayNeighbor(EOverlayDirection eDirection, ulong ulFrom, ulong ulTo);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayNeighbor SetOverlayNeighbor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _MoveGamepadFocusToNeighbor(EOverlayDirection eDirection, ulong ulFrom);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _MoveGamepadFocusToNeighbor MoveGamepadFocusToNeighbor;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayTexture(ulong ulOverlayHandle, ref Texture_t pTexture);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayTexture SetOverlayTexture;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _ClearOverlayTexture(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ClearOverlayTexture ClearOverlayTexture;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayRaw(ulong ulOverlayHandle, IntPtr pvBuffer, uint unWidth, uint unHeight, uint unDepth);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayRaw SetOverlayRaw;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayFromFile(ulong ulOverlayHandle, string pchFilePath);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayFromFile SetOverlayFromFile;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTexture(ulong ulOverlayHandle, ref IntPtr pNativeTextureHandle, IntPtr pNativeTextureRef, ref uint pWidth, ref uint pHeight, ref uint pNativeFormat, ref EGraphicsAPIConvention pAPI, ref EColorSpace pColorSpace);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTexture GetOverlayTexture;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _ReleaseNativeOverlayHandle(ulong ulOverlayHandle, IntPtr pNativeTextureHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ReleaseNativeOverlayHandle ReleaseNativeOverlayHandle;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetOverlayTextureSize(ulong ulOverlayHandle, ref uint pWidth, ref uint pHeight);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetOverlayTextureSize GetOverlayTextureSize;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _CreateDashboardOverlay(string pchOverlayKey, string pchOverlayFriendlyName, ref ulong pMainHandle, ref ulong pThumbnailHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CreateDashboardOverlay CreateDashboardOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsDashboardVisible();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsDashboardVisible IsDashboardVisible;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _IsActiveDashboardOverlay(ulong ulOverlayHandle);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _IsActiveDashboardOverlay IsActiveDashboardOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetDashboardOverlaySceneProcess(ulong ulOverlayHandle, uint unProcessId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetDashboardOverlaySceneProcess SetDashboardOverlaySceneProcess;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _GetDashboardOverlaySceneProcess(ulong ulOverlayHandle, ref uint punProcessId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetDashboardOverlaySceneProcess GetDashboardOverlaySceneProcess;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _ShowDashboard(string pchOverlayToShow);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ShowDashboard ShowDashboard;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetPrimaryDashboardDevice();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetPrimaryDashboardDevice GetPrimaryDashboardDevice;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _ShowKeyboard(int eInputMode, int eLineInputMode, string pchDescription, uint unCharMax, string pchExistingText, bool bUseMinimalMode, ulong uUserValue);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ShowKeyboard ShowKeyboard;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _ShowKeyboardForOverlay(ulong ulOverlayHandle, int eInputMode, int eLineInputMode, string pchDescription, uint unCharMax, string pchExistingText, bool bUseMinimalMode, ulong uUserValue);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _ShowKeyboardForOverlay ShowKeyboardForOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetKeyboardText(System.Text.StringBuilder pchText, uint cchText);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetKeyboardText GetKeyboardText;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _HideKeyboard();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _HideKeyboard HideKeyboard;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetKeyboardTransformAbsolute(ETrackingUniverseOrigin eTrackingOrigin, ref HmdMatrix34_t pmatTrackingOriginToKeyboardTransform);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetKeyboardTransformAbsolute SetKeyboardTransformAbsolute;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetKeyboardPositionForOverlay(ulong ulOverlayHandle, HmdRect2_t avoidRect);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetKeyboardPositionForOverlay SetKeyboardPositionForOverlay;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVROverlayError _SetOverlayIntersectionMask(ulong ulOverlayHandle, ref VROverlayIntersectionMaskPrimitive_t pMaskPrimitives, uint unNumMaskPrimitives, uint unPrimitiveSize);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetOverlayIntersectionMask SetOverlayIntersectionMask;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRRenderModels
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRRenderModelError _LoadRenderModel_Async(string pchRenderModelName, ref IntPtr ppRenderModel);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LoadRenderModel_Async LoadRenderModel_Async;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _FreeRenderModel(IntPtr pRenderModel);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _FreeRenderModel FreeRenderModel;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRRenderModelError _LoadTexture_Async(int textureId, ref IntPtr ppTexture);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LoadTexture_Async LoadTexture_Async;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _FreeTexture(IntPtr pTexture);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _FreeTexture FreeTexture;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRRenderModelError _LoadTextureD3D11_Async(int textureId, IntPtr pD3D11Device, ref IntPtr ppD3D11Texture2D);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LoadTextureD3D11_Async LoadTextureD3D11_Async;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRRenderModelError _LoadIntoTextureD3D11_Async(int textureId, IntPtr pDstTexture);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LoadIntoTextureD3D11_Async LoadIntoTextureD3D11_Async;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _FreeTextureD3D11(IntPtr pD3D11Texture2D);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _FreeTextureD3D11 FreeTextureD3D11;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetRenderModelName(uint unRenderModelIndex, System.Text.StringBuilder pchRenderModelName, uint unRenderModelNameLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRenderModelName GetRenderModelName;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetRenderModelCount();
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRenderModelCount GetRenderModelCount;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetComponentCount(string pchRenderModelName);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetComponentCount GetComponentCount;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetComponentName(string pchRenderModelName, uint unComponentIndex, System.Text.StringBuilder pchComponentName, uint unComponentNameLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetComponentName GetComponentName;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate ulong _GetComponentButtonMask(string pchRenderModelName, string pchComponentName);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetComponentButtonMask GetComponentButtonMask;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetComponentRenderModelName(string pchRenderModelName, string pchComponentName, System.Text.StringBuilder pchComponentRenderModelName, uint unComponentRenderModelNameLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetComponentRenderModelName GetComponentRenderModelName;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetComponentState(string pchRenderModelName, string pchComponentName, ref VRControllerState_t pControllerState, ref RenderModel_ControllerMode_State_t pState, ref RenderModel_ComponentState_t pComponentState);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetComponentState GetComponentState;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _RenderModelHasComponent(string pchRenderModelName, string pchComponentName);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RenderModelHasComponent RenderModelHasComponent;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetRenderModelThumbnailURL(string pchRenderModelName, System.Text.StringBuilder pchThumbnailURL, uint unThumbnailURLLen, ref EVRRenderModelError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRenderModelThumbnailURL GetRenderModelThumbnailURL;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetRenderModelOriginalPath(string pchRenderModelName, System.Text.StringBuilder pchOriginalPath, uint unOriginalPathLen, ref EVRRenderModelError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRenderModelOriginalPath GetRenderModelOriginalPath;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetRenderModelErrorNameFromEnum(EVRRenderModelError error);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetRenderModelErrorNameFromEnum GetRenderModelErrorNameFromEnum;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRNotifications
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRNotificationError _CreateNotification(ulong ulOverlayHandle, ulong ulUserValue, EVRNotificationType type, string pchText, EVRNotificationStyle style, ref NotificationBitmap_t pImage, ref uint pNotificationId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _CreateNotification CreateNotification;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRNotificationError _RemoveNotification(uint notificationId);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RemoveNotification RemoveNotification;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRSettings
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate IntPtr _GetSettingsErrorNameFromEnum(EVRSettingsError eError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetSettingsErrorNameFromEnum GetSettingsErrorNameFromEnum;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _Sync(bool bForce, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _Sync Sync;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetBool(string pchSection, string pchSettingsKey, bool bValue, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetBool SetBool;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetInt32(string pchSection, string pchSettingsKey, int nValue, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetInt32 SetInt32;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetFloat(string pchSection, string pchSettingsKey, float flValue, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetFloat SetFloat;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _SetString(string pchSection, string pchSettingsKey, string pchValue, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SetString SetString;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate bool _GetBool(string pchSection, string pchSettingsKey, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetBool GetBool;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate int _GetInt32(string pchSection, string pchSettingsKey, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetInt32 GetInt32;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate float _GetFloat(string pchSection, string pchSettingsKey, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetFloat GetFloat;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _GetString(string pchSection, string pchSettingsKey, System.Text.StringBuilder pchValue, uint unValueLen, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetString GetString;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _RemoveSection(string pchSection, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RemoveSection RemoveSection;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate void _RemoveKeyInSection(string pchSection, string pchSettingsKey, ref EVRSettingsError peError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RemoveKeyInSection RemoveKeyInSection;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRScreenshots
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRScreenshotError _RequestScreenshot(ref uint pOutScreenshotHandle, EVRScreenshotType type, string pchPreviewFilename, string pchVRFilename);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _RequestScreenshot RequestScreenshot;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRScreenshotError _HookScreenshot([In, Out] EVRScreenshotType[] pSupportedTypes, int numTypes);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _HookScreenshot HookScreenshot;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRScreenshotType _GetScreenshotPropertyType(uint screenshotHandle, ref EVRScreenshotError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetScreenshotPropertyType GetScreenshotPropertyType;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetScreenshotPropertyFilename(uint screenshotHandle, EVRScreenshotPropertyFilenames filenameType, System.Text.StringBuilder pchFilename, uint cchFilename, ref EVRScreenshotError pError);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetScreenshotPropertyFilename GetScreenshotPropertyFilename;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRScreenshotError _UpdateScreenshotProgress(uint screenshotHandle, float flProgress);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _UpdateScreenshotProgress UpdateScreenshotProgress;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRScreenshotError _TakeStereoScreenshot(ref uint pOutScreenshotHandle, string pchPreviewFilename, string pchVRFilename);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _TakeStereoScreenshot TakeStereoScreenshot;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate EVRScreenshotError _SubmitScreenshot(uint screenshotHandle, EVRScreenshotType type, string pchSourcePreviewFilename, string pchSourceVRFilename);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _SubmitScreenshot SubmitScreenshot;
-
-}
-
-[StructLayout(LayoutKind.Sequential)]
-internal struct IVRResources
-{
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _LoadSharedResource(string pchResourceName, string pchBuffer, uint unBufferLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _LoadSharedResource LoadSharedResource;
-
-	[UnmanagedFunctionPointer(CallingConvention.StdCall)]
-	internal delegate uint _GetResourceFullPath(string pchResourceName, string pchResourceTypeDirectory, string pchPathBuffer, uint unBufferLen);
-	[MarshalAs(UnmanagedType.FunctionPtr)]
-	internal _GetResourceFullPath GetResourceFullPath;
-
-}
-
-
-internal class CVRSystem
-{
-	IVRSystem FnTable;
-	internal CVRSystem(IntPtr pInterface)
-	{
-		FnTable = (IVRSystem)Marshal.PtrToStructure(pInterface, typeof(IVRSystem));
-	}
-	internal void GetRecommendedRenderTargetSize(ref uint pnWidth,ref uint pnHeight)
-	{
-		pnWidth = 0;
-		pnHeight = 0;
-		FnTable.GetRecommendedRenderTargetSize(ref pnWidth,ref pnHeight);
-	}
-	internal HmdMatrix44_t GetProjectionMatrix(EVREye eEye,float fNearZ,float fFarZ,EGraphicsAPIConvention eProjType)
-	{
-		HmdMatrix44_t result = FnTable.GetProjectionMatrix(eEye,fNearZ,fFarZ,eProjType);
-		return result;
-	}
-	internal void GetProjectionRaw(EVREye eEye,ref float pfLeft,ref float pfRight,ref float pfTop,ref float pfBottom)
-	{
-		pfLeft = 0;
-		pfRight = 0;
-		pfTop = 0;
-		pfBottom = 0;
-		FnTable.GetProjectionRaw(eEye,ref pfLeft,ref pfRight,ref pfTop,ref pfBottom);
-	}
-	internal bool ComputeDistortion(EVREye eEye,float fU,float fV,ref DistortionCoordinates_t pDistortionCoordinates)
-	{
-		bool result = FnTable.ComputeDistortion(eEye,fU,fV,ref pDistortionCoordinates);
-		return result;
-	}
-	internal HmdMatrix34_t GetEyeToHeadTransform(EVREye eEye)
-	{
-		HmdMatrix34_t result = FnTable.GetEyeToHeadTransform(eEye);
-		return result;
-	}
-	internal bool GetTimeSinceLastVsync(ref float pfSecondsSinceLastVsync,ref ulong pulFrameCounter)
-	{
-		pfSecondsSinceLastVsync = 0;
-		pulFrameCounter = 0;
-		bool result = FnTable.GetTimeSinceLastVsync(ref pfSecondsSinceLastVsync,ref pulFrameCounter);
-		return result;
-	}
-	internal int GetD3D9AdapterIndex()
-	{
-		int result = FnTable.GetD3D9AdapterIndex();
-		return result;
-	}
-	internal void GetDXGIOutputInfo(ref int pnAdapterIndex)
-	{
-		pnAdapterIndex = 0;
-		FnTable.GetDXGIOutputInfo(ref pnAdapterIndex);
-	}
-	internal bool IsDisplayOnDesktop()
-	{
-		bool result = FnTable.IsDisplayOnDesktop();
-		return result;
-	}
-	internal bool SetDisplayVisibility(bool bIsVisibleOnDesktop)
-	{
-		bool result = FnTable.SetDisplayVisibility(bIsVisibleOnDesktop);
-		return result;
-	}
-	internal void GetDeviceToAbsoluteTrackingPose(ETrackingUniverseOrigin eOrigin,float fPredictedSecondsToPhotonsFromNow,TrackedDevicePose_t [] pTrackedDevicePoseArray)
-	{
-		FnTable.GetDeviceToAbsoluteTrackingPose(eOrigin,fPredictedSecondsToPhotonsFromNow,pTrackedDevicePoseArray,(uint) pTrackedDevicePoseArray.Length);
-	}
-	internal void ResetSeatedZeroPose()
-	{
-		FnTable.ResetSeatedZeroPose();
-	}
-	internal HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose()
-	{
-		HmdMatrix34_t result = FnTable.GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
-		return result;
-	}
-	internal HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose()
-	{
-		HmdMatrix34_t result = FnTable.GetRawZeroPoseToStandingAbsoluteTrackingPose();
-		return result;
-	}
-	internal uint GetSortedTrackedDeviceIndicesOfClass(ETrackedDeviceClass eTrackedDeviceClass,uint [] punTrackedDeviceIndexArray,uint unRelativeToTrackedDeviceIndex)
-	{
-		uint result = FnTable.GetSortedTrackedDeviceIndicesOfClass(eTrackedDeviceClass,punTrackedDeviceIndexArray,(uint) punTrackedDeviceIndexArray.Length,unRelativeToTrackedDeviceIndex);
-		return result;
-	}
-	internal EDeviceActivityLevel GetTrackedDeviceActivityLevel(uint unDeviceId)
-	{
-		EDeviceActivityLevel result = FnTable.GetTrackedDeviceActivityLevel(unDeviceId);
-		return result;
-	}
-	internal void ApplyTransform(ref TrackedDevicePose_t pOutputPose,ref TrackedDevicePose_t pTrackedDevicePose,ref HmdMatrix34_t pTransform)
-	{
-		FnTable.ApplyTransform(ref pOutputPose,ref pTrackedDevicePose,ref pTransform);
-	}
-	internal uint GetTrackedDeviceIndexForControllerRole(ETrackedControllerRole unDeviceType)
-	{
-		uint result = FnTable.GetTrackedDeviceIndexForControllerRole(unDeviceType);
-		return result;
-	}
-	internal ETrackedControllerRole GetControllerRoleForTrackedDeviceIndex(uint unDeviceIndex)
-	{
-		ETrackedControllerRole result = FnTable.GetControllerRoleForTrackedDeviceIndex(unDeviceIndex);
-		return result;
-	}
-	internal ETrackedDeviceClass GetTrackedDeviceClass(uint unDeviceIndex)
-	{
-		ETrackedDeviceClass result = FnTable.GetTrackedDeviceClass(unDeviceIndex);
-		return result;
-	}
-	internal bool IsTrackedDeviceConnected(uint unDeviceIndex)
-	{
-		bool result = FnTable.IsTrackedDeviceConnected(unDeviceIndex);
-		return result;
-	}
-	internal bool GetBoolTrackedDeviceProperty(uint unDeviceIndex,ETrackedDeviceProperty prop,ref ETrackedPropertyError pError)
-	{
-		bool result = FnTable.GetBoolTrackedDeviceProperty(unDeviceIndex,prop,ref pError);
-		return result;
-	}
-	internal float GetFloatTrackedDeviceProperty(uint unDeviceIndex,ETrackedDeviceProperty prop,ref ETrackedPropertyError pError)
-	{
-		float result = FnTable.GetFloatTrackedDeviceProperty(unDeviceIndex,prop,ref pError);
-		return result;
-	}
-	internal int GetInt32TrackedDeviceProperty(uint unDeviceIndex,ETrackedDeviceProperty prop,ref ETrackedPropertyError pError)
-	{
-		int result = FnTable.GetInt32TrackedDeviceProperty(unDeviceIndex,prop,ref pError);
-		return result;
-	}
-	internal ulong GetUint64TrackedDeviceProperty(uint unDeviceIndex,ETrackedDeviceProperty prop,ref ETrackedPropertyError pError)
-	{
-		ulong result = FnTable.GetUint64TrackedDeviceProperty(unDeviceIndex,prop,ref pError);
-		return result;
-	}
-	internal HmdMatrix34_t GetMatrix34TrackedDeviceProperty(uint unDeviceIndex,ETrackedDeviceProperty prop,ref ETrackedPropertyError pError)
-	{
-		HmdMatrix34_t result = FnTable.GetMatrix34TrackedDeviceProperty(unDeviceIndex,prop,ref pError);
-		return result;
-	}
-	internal uint GetStringTrackedDeviceProperty(uint unDeviceIndex,ETrackedDeviceProperty prop,System.Text.StringBuilder pchValue,uint unBufferSize,ref ETrackedPropertyError pError)
-	{
-		uint result = FnTable.GetStringTrackedDeviceProperty(unDeviceIndex,prop,pchValue,unBufferSize,ref pError);
-		return result;
-	}
-	internal string GetPropErrorNameFromEnum(ETrackedPropertyError error)
-	{
-		IntPtr result = FnTable.GetPropErrorNameFromEnum(error);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal bool PollNextEvent(ref VREvent_t pEvent,uint uncbVREvent)
-	{
-		bool result = FnTable.PollNextEvent(ref pEvent,uncbVREvent);
-		return result;
-	}
-	internal bool PollNextEventWithPose(ETrackingUniverseOrigin eOrigin,ref VREvent_t pEvent,uint uncbVREvent,ref TrackedDevicePose_t pTrackedDevicePose)
-	{
-		bool result = FnTable.PollNextEventWithPose(eOrigin,ref pEvent,uncbVREvent,ref pTrackedDevicePose);
-		return result;
-	}
-	internal string GetEventTypeNameFromEnum(EVREventType eType)
-	{
-		IntPtr result = FnTable.GetEventTypeNameFromEnum(eType);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal HiddenAreaMesh_t GetHiddenAreaMesh(EVREye eEye,EHiddenAreaMeshType type)
-	{
-		HiddenAreaMesh_t result = FnTable.GetHiddenAreaMesh(eEye,type);
-		return result;
-	}
-	internal bool GetControllerState(uint unControllerDeviceIndex,ref VRControllerState_t pControllerState,uint unControllerStateSize)
-	{
-		bool result = FnTable.GetControllerState(unControllerDeviceIndex,ref pControllerState,unControllerStateSize);
-		return result;
-	}
-	internal bool GetControllerStateWithPose(ETrackingUniverseOrigin eOrigin,uint unControllerDeviceIndex,ref VRControllerState_t pControllerState,uint unControllerStateSize,ref TrackedDevicePose_t pTrackedDevicePose)
-	{
-		bool result = FnTable.GetControllerStateWithPose(eOrigin,unControllerDeviceIndex,ref pControllerState,unControllerStateSize,ref pTrackedDevicePose);
-		return result;
-	}
-	internal void TriggerHapticPulse(uint unControllerDeviceIndex,uint unAxisId,char usDurationMicroSec)
-	{
-		FnTable.TriggerHapticPulse(unControllerDeviceIndex,unAxisId,usDurationMicroSec);
-	}
-	internal string GetButtonIdNameFromEnum(EVRButtonId eButtonId)
-	{
-		IntPtr result = FnTable.GetButtonIdNameFromEnum(eButtonId);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal string GetControllerAxisTypeNameFromEnum(EVRControllerAxisType eAxisType)
-	{
-		IntPtr result = FnTable.GetControllerAxisTypeNameFromEnum(eAxisType);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal bool CaptureInputFocus()
-	{
-		bool result = FnTable.CaptureInputFocus();
-		return result;
-	}
-	internal void ReleaseInputFocus()
-	{
-		FnTable.ReleaseInputFocus();
-	}
-	internal bool IsInputFocusCapturedByAnotherProcess()
-	{
-		bool result = FnTable.IsInputFocusCapturedByAnotherProcess();
-		return result;
-	}
-	internal uint DriverDebugRequest(uint unDeviceIndex,string pchRequest,string pchResponseBuffer,uint unResponseBufferSize)
-	{
-		uint result = FnTable.DriverDebugRequest(unDeviceIndex,pchRequest,pchResponseBuffer,unResponseBufferSize);
-		return result;
-	}
-	internal EVRFirmwareError PerformFirmwareUpdate(uint unDeviceIndex)
-	{
-		EVRFirmwareError result = FnTable.PerformFirmwareUpdate(unDeviceIndex);
-		return result;
-	}
-	internal void AcknowledgeQuit_Exiting()
-	{
-		FnTable.AcknowledgeQuit_Exiting();
-	}
-	internal void AcknowledgeQuit_UserPrompt()
-	{
-		FnTable.AcknowledgeQuit_UserPrompt();
-	}
-}
-
-
-internal class CVRExtendedDisplay
-{
-	IVRExtendedDisplay FnTable;
-	internal CVRExtendedDisplay(IntPtr pInterface)
-	{
-		FnTable = (IVRExtendedDisplay)Marshal.PtrToStructure(pInterface, typeof(IVRExtendedDisplay));
-	}
-	internal void GetWindowBounds(ref int pnX,ref int pnY,ref uint pnWidth,ref uint pnHeight)
-	{
-		pnX = 0;
-		pnY = 0;
-		pnWidth = 0;
-		pnHeight = 0;
-		FnTable.GetWindowBounds(ref pnX,ref pnY,ref pnWidth,ref pnHeight);
-	}
-	internal void GetEyeOutputViewport(EVREye eEye,ref uint pnX,ref uint pnY,ref uint pnWidth,ref uint pnHeight)
-	{
-		pnX = 0;
-		pnY = 0;
-		pnWidth = 0;
-		pnHeight = 0;
-		FnTable.GetEyeOutputViewport(eEye,ref pnX,ref pnY,ref pnWidth,ref pnHeight);
-	}
-	internal void GetDXGIOutputInfo(ref int pnAdapterIndex,ref int pnAdapterOutputIndex)
-	{
-		pnAdapterIndex = 0;
-		pnAdapterOutputIndex = 0;
-		FnTable.GetDXGIOutputInfo(ref pnAdapterIndex,ref pnAdapterOutputIndex);
-	}
-}
-
-
-internal class CVRTrackedCamera
-{
-	IVRTrackedCamera FnTable;
-	internal CVRTrackedCamera(IntPtr pInterface)
-	{
-		FnTable = (IVRTrackedCamera)Marshal.PtrToStructure(pInterface, typeof(IVRTrackedCamera));
-	}
-	internal string GetCameraErrorNameFromEnum(EVRTrackedCameraError eCameraError)
-	{
-		IntPtr result = FnTable.GetCameraErrorNameFromEnum(eCameraError);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal EVRTrackedCameraError HasCamera(uint nDeviceIndex,ref bool pHasCamera)
-	{
-		pHasCamera = false;
-		EVRTrackedCameraError result = FnTable.HasCamera(nDeviceIndex,ref pHasCamera);
-		return result;
-	}
-	internal EVRTrackedCameraError GetCameraFrameSize(uint nDeviceIndex,EVRTrackedCameraFrameType eFrameType,ref uint pnWidth,ref uint pnHeight,ref uint pnFrameBufferSize)
-	{
-		pnWidth = 0;
-		pnHeight = 0;
-		pnFrameBufferSize = 0;
-		EVRTrackedCameraError result = FnTable.GetCameraFrameSize(nDeviceIndex,eFrameType,ref pnWidth,ref pnHeight,ref pnFrameBufferSize);
-		return result;
-	}
-	internal EVRTrackedCameraError GetCameraIntrinisics(uint nDeviceIndex,EVRTrackedCameraFrameType eFrameType,ref HmdVector2_t pFocalLength,ref HmdVector2_t pCenter)
-	{
-		EVRTrackedCameraError result = FnTable.GetCameraIntrinisics(nDeviceIndex,eFrameType,ref pFocalLength,ref pCenter);
-		return result;
-	}
-	internal EVRTrackedCameraError GetCameraProjection(uint nDeviceIndex,EVRTrackedCameraFrameType eFrameType,float flZNear,float flZFar,ref HmdMatrix44_t pProjection)
-	{
-		EVRTrackedCameraError result = FnTable.GetCameraProjection(nDeviceIndex,eFrameType,flZNear,flZFar,ref pProjection);
-		return result;
-	}
-	internal EVRTrackedCameraError AcquireVideoStreamingService(uint nDeviceIndex,ref ulong pHandle)
-	{
-		pHandle = 0;
-		EVRTrackedCameraError result = FnTable.AcquireVideoStreamingService(nDeviceIndex,ref pHandle);
-		return result;
-	}
-	internal EVRTrackedCameraError ReleaseVideoStreamingService(ulong hTrackedCamera)
-	{
-		EVRTrackedCameraError result = FnTable.ReleaseVideoStreamingService(hTrackedCamera);
-		return result;
-	}
-	internal EVRTrackedCameraError GetVideoStreamFrameBuffer(ulong hTrackedCamera,EVRTrackedCameraFrameType eFrameType,IntPtr pFrameBuffer,uint nFrameBufferSize,ref CameraVideoStreamFrameHeader_t pFrameHeader,uint nFrameHeaderSize)
-	{
-		EVRTrackedCameraError result = FnTable.GetVideoStreamFrameBuffer(hTrackedCamera,eFrameType,pFrameBuffer,nFrameBufferSize,ref pFrameHeader,nFrameHeaderSize);
-		return result;
-	}
-	internal EVRTrackedCameraError GetVideoStreamTextureSize(uint nDeviceIndex,EVRTrackedCameraFrameType eFrameType,ref VRTextureBounds_t pTextureBounds,ref uint pnWidth,ref uint pnHeight)
-	{
-		pnWidth = 0;
-		pnHeight = 0;
-		EVRTrackedCameraError result = FnTable.GetVideoStreamTextureSize(nDeviceIndex,eFrameType,ref pTextureBounds,ref pnWidth,ref pnHeight);
-		return result;
-	}
-	internal EVRTrackedCameraError GetVideoStreamTextureD3D11(ulong hTrackedCamera,EVRTrackedCameraFrameType eFrameType,IntPtr pD3D11DeviceOrResource,ref IntPtr ppD3D11ShaderResourceView,ref CameraVideoStreamFrameHeader_t pFrameHeader,uint nFrameHeaderSize)
-	{
-		EVRTrackedCameraError result = FnTable.GetVideoStreamTextureD3D11(hTrackedCamera,eFrameType,pD3D11DeviceOrResource,ref ppD3D11ShaderResourceView,ref pFrameHeader,nFrameHeaderSize);
-		return result;
-	}
-	internal EVRTrackedCameraError GetVideoStreamTextureGL(ulong hTrackedCamera,EVRTrackedCameraFrameType eFrameType,ref uint pglTextureId,ref CameraVideoStreamFrameHeader_t pFrameHeader,uint nFrameHeaderSize)
-	{
-		pglTextureId = 0;
-		EVRTrackedCameraError result = FnTable.GetVideoStreamTextureGL(hTrackedCamera,eFrameType,ref pglTextureId,ref pFrameHeader,nFrameHeaderSize);
-		return result;
-	}
-	internal EVRTrackedCameraError ReleaseVideoStreamTextureGL(ulong hTrackedCamera,uint glTextureId)
-	{
-		EVRTrackedCameraError result = FnTable.ReleaseVideoStreamTextureGL(hTrackedCamera,glTextureId);
-		return result;
-	}
-}
-
-
-internal class CVRApplications
-{
-	IVRApplications FnTable;
-	internal CVRApplications(IntPtr pInterface)
-	{
-		FnTable = (IVRApplications)Marshal.PtrToStructure(pInterface, typeof(IVRApplications));
-	}
-	internal EVRApplicationError AddApplicationManifest(string pchApplicationManifestFullPath,bool bTemporary)
-	{
-		EVRApplicationError result = FnTable.AddApplicationManifest(pchApplicationManifestFullPath,bTemporary);
-		return result;
-	}
-	internal EVRApplicationError RemoveApplicationManifest(string pchApplicationManifestFullPath)
-	{
-		EVRApplicationError result = FnTable.RemoveApplicationManifest(pchApplicationManifestFullPath);
-		return result;
-	}
-	internal bool IsApplicationInstalled(string pchAppKey)
-	{
-		bool result = FnTable.IsApplicationInstalled(pchAppKey);
-		return result;
-	}
-	internal uint GetApplicationCount()
-	{
-		uint result = FnTable.GetApplicationCount();
-		return result;
-	}
-	internal EVRApplicationError GetApplicationKeyByIndex(uint unApplicationIndex,System.Text.StringBuilder pchAppKeyBuffer,uint unAppKeyBufferLen)
-	{
-		EVRApplicationError result = FnTable.GetApplicationKeyByIndex(unApplicationIndex,pchAppKeyBuffer,unAppKeyBufferLen);
-		return result;
-	}
-	internal EVRApplicationError GetApplicationKeyByProcessId(uint unProcessId,string pchAppKeyBuffer,uint unAppKeyBufferLen)
-	{
-		EVRApplicationError result = FnTable.GetApplicationKeyByProcessId(unProcessId,pchAppKeyBuffer,unAppKeyBufferLen);
-		return result;
-	}
-	internal EVRApplicationError LaunchApplication(string pchAppKey)
-	{
-		EVRApplicationError result = FnTable.LaunchApplication(pchAppKey);
-		return result;
-	}
-	internal EVRApplicationError LaunchTemplateApplication(string pchTemplateAppKey,string pchNewAppKey,AppOverrideKeys_t [] pKeys)
-	{
-		EVRApplicationError result = FnTable.LaunchTemplateApplication(pchTemplateAppKey,pchNewAppKey,pKeys,(uint) pKeys.Length);
-		return result;
-	}
-	internal EVRApplicationError LaunchApplicationFromMimeType(string pchMimeType,string pchArgs)
-	{
-		EVRApplicationError result = FnTable.LaunchApplicationFromMimeType(pchMimeType,pchArgs);
-		return result;
-	}
-	internal EVRApplicationError LaunchDashboardOverlay(string pchAppKey)
-	{
-		EVRApplicationError result = FnTable.LaunchDashboardOverlay(pchAppKey);
-		return result;
-	}
-	internal bool CancelApplicationLaunch(string pchAppKey)
-	{
-		bool result = FnTable.CancelApplicationLaunch(pchAppKey);
-		return result;
-	}
-	internal EVRApplicationError IdentifyApplication(uint unProcessId,string pchAppKey)
-	{
-		EVRApplicationError result = FnTable.IdentifyApplication(unProcessId,pchAppKey);
-		return result;
-	}
-	internal uint GetApplicationProcessId(string pchAppKey)
-	{
-		uint result = FnTable.GetApplicationProcessId(pchAppKey);
-		return result;
-	}
-	internal string GetApplicationsErrorNameFromEnum(EVRApplicationError error)
-	{
-		IntPtr result = FnTable.GetApplicationsErrorNameFromEnum(error);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal uint GetApplicationPropertyString(string pchAppKey,EVRApplicationProperty eProperty,System.Text.StringBuilder pchPropertyValueBuffer,uint unPropertyValueBufferLen,ref EVRApplicationError peError)
-	{
-		uint result = FnTable.GetApplicationPropertyString(pchAppKey,eProperty,pchPropertyValueBuffer,unPropertyValueBufferLen,ref peError);
-		return result;
-	}
-	internal bool GetApplicationPropertyBool(string pchAppKey,EVRApplicationProperty eProperty,ref EVRApplicationError peError)
-	{
-		bool result = FnTable.GetApplicationPropertyBool(pchAppKey,eProperty,ref peError);
-		return result;
-	}
-	internal ulong GetApplicationPropertyUint64(string pchAppKey,EVRApplicationProperty eProperty,ref EVRApplicationError peError)
-	{
-		ulong result = FnTable.GetApplicationPropertyUint64(pchAppKey,eProperty,ref peError);
-		return result;
-	}
-	internal EVRApplicationError SetApplicationAutoLaunch(string pchAppKey,bool bAutoLaunch)
-	{
-		EVRApplicationError result = FnTable.SetApplicationAutoLaunch(pchAppKey,bAutoLaunch);
-		return result;
-	}
-	internal bool GetApplicationAutoLaunch(string pchAppKey)
-	{
-		bool result = FnTable.GetApplicationAutoLaunch(pchAppKey);
-		return result;
-	}
-	internal EVRApplicationError SetDefaultApplicationForMimeType(string pchAppKey,string pchMimeType)
-	{
-		EVRApplicationError result = FnTable.SetDefaultApplicationForMimeType(pchAppKey,pchMimeType);
-		return result;
-	}
-	internal bool GetDefaultApplicationForMimeType(string pchMimeType,string pchAppKeyBuffer,uint unAppKeyBufferLen)
-	{
-		bool result = FnTable.GetDefaultApplicationForMimeType(pchMimeType,pchAppKeyBuffer,unAppKeyBufferLen);
-		return result;
-	}
-	internal bool GetApplicationSupportedMimeTypes(string pchAppKey,string pchMimeTypesBuffer,uint unMimeTypesBuffer)
-	{
-		bool result = FnTable.GetApplicationSupportedMimeTypes(pchAppKey,pchMimeTypesBuffer,unMimeTypesBuffer);
-		return result;
-	}
-	internal uint GetApplicationsThatSupportMimeType(string pchMimeType,string pchAppKeysThatSupportBuffer,uint unAppKeysThatSupportBuffer)
-	{
-		uint result = FnTable.GetApplicationsThatSupportMimeType(pchMimeType,pchAppKeysThatSupportBuffer,unAppKeysThatSupportBuffer);
-		return result;
-	}
-	internal uint GetApplicationLaunchArguments(uint unHandle,string pchArgs,uint unArgs)
-	{
-		uint result = FnTable.GetApplicationLaunchArguments(unHandle,pchArgs,unArgs);
-		return result;
-	}
-	internal EVRApplicationError GetStartingApplication(string pchAppKeyBuffer,uint unAppKeyBufferLen)
-	{
-		EVRApplicationError result = FnTable.GetStartingApplication(pchAppKeyBuffer,unAppKeyBufferLen);
-		return result;
-	}
-	internal EVRApplicationTransitionState GetTransitionState()
-	{
-		EVRApplicationTransitionState result = FnTable.GetTransitionState();
-		return result;
-	}
-	internal EVRApplicationError PerformApplicationPrelaunchCheck(string pchAppKey)
-	{
-		EVRApplicationError result = FnTable.PerformApplicationPrelaunchCheck(pchAppKey);
-		return result;
-	}
-	internal string GetApplicationsTransitionStateNameFromEnum(EVRApplicationTransitionState state)
-	{
-		IntPtr result = FnTable.GetApplicationsTransitionStateNameFromEnum(state);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal bool IsQuitUserPromptRequested()
-	{
-		bool result = FnTable.IsQuitUserPromptRequested();
-		return result;
-	}
-	internal EVRApplicationError LaunchInternalProcess(string pchBinaryPath,string pchArguments,string pchWorkingDirectory)
-	{
-		EVRApplicationError result = FnTable.LaunchInternalProcess(pchBinaryPath,pchArguments,pchWorkingDirectory);
-		return result;
-	}
-}
-
-
-internal class CVRChaperone
-{
-	IVRChaperone FnTable;
-	internal CVRChaperone(IntPtr pInterface)
-	{
-		FnTable = (IVRChaperone)Marshal.PtrToStructure(pInterface, typeof(IVRChaperone));
-	}
-	internal ChaperoneCalibrationState GetCalibrationState()
-	{
-		ChaperoneCalibrationState result = FnTable.GetCalibrationState();
-		return result;
-	}
-	internal bool GetPlayAreaSize(ref float pSizeX,ref float pSizeZ)
-	{
-		pSizeX = 0;
-		pSizeZ = 0;
-		bool result = FnTable.GetPlayAreaSize(ref pSizeX,ref pSizeZ);
-		return result;
-	}
-	internal bool GetPlayAreaRect(ref HmdQuad_t rect)
-	{
-		bool result = FnTable.GetPlayAreaRect(ref rect);
-		return result;
-	}
-	internal void ReloadInfo()
-	{
-		FnTable.ReloadInfo();
-	}
-	internal void SetSceneColor(HmdColor_t color)
-	{
-		FnTable.SetSceneColor(color);
-	}
-	internal void GetBoundsColor(ref HmdColor_t pOutputColorArray,int nNumOutputColors,float flCollisionBoundsFadeDistance,ref HmdColor_t pOutputCameraColor)
-	{
-		FnTable.GetBoundsColor(ref pOutputColorArray,nNumOutputColors,flCollisionBoundsFadeDistance,ref pOutputCameraColor);
-	}
-	internal bool AreBoundsVisible()
-	{
-		bool result = FnTable.AreBoundsVisible();
-		return result;
-	}
-	internal void ForceBoundsVisible(bool bForce)
-	{
-		FnTable.ForceBoundsVisible(bForce);
-	}
-}
-
-
-internal class CVRChaperoneSetup
-{
-	IVRChaperoneSetup FnTable;
-	internal CVRChaperoneSetup(IntPtr pInterface)
-	{
-		FnTable = (IVRChaperoneSetup)Marshal.PtrToStructure(pInterface, typeof(IVRChaperoneSetup));
-	}
-	internal bool CommitWorkingCopy(EChaperoneConfigFile configFile)
-	{
-		bool result = FnTable.CommitWorkingCopy(configFile);
-		return result;
-	}
-	internal void RevertWorkingCopy()
-	{
-		FnTable.RevertWorkingCopy();
-	}
-	internal bool GetWorkingPlayAreaSize(ref float pSizeX,ref float pSizeZ)
-	{
-		pSizeX = 0;
-		pSizeZ = 0;
-		bool result = FnTable.GetWorkingPlayAreaSize(ref pSizeX,ref pSizeZ);
-		return result;
-	}
-	internal bool GetWorkingPlayAreaRect(ref HmdQuad_t rect)
-	{
-		bool result = FnTable.GetWorkingPlayAreaRect(ref rect);
-		return result;
-	}
-	internal bool GetWorkingCollisionBoundsInfo(out HmdQuad_t [] pQuadsBuffer)
-	{
-		uint punQuadsCount = 0;
-		bool result = FnTable.GetWorkingCollisionBoundsInfo(null,ref punQuadsCount);
-		pQuadsBuffer= new HmdQuad_t[punQuadsCount];
-		result = FnTable.GetWorkingCollisionBoundsInfo(pQuadsBuffer,ref punQuadsCount);
-		return result;
-	}
-	internal bool GetLiveCollisionBoundsInfo(out HmdQuad_t [] pQuadsBuffer)
-	{
-		uint punQuadsCount = 0;
-		bool result = FnTable.GetLiveCollisionBoundsInfo(null,ref punQuadsCount);
-		pQuadsBuffer= new HmdQuad_t[punQuadsCount];
-		result = FnTable.GetLiveCollisionBoundsInfo(pQuadsBuffer,ref punQuadsCount);
-		return result;
-	}
-	internal bool GetWorkingSeatedZeroPoseToRawTrackingPose(ref HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose)
-	{
-		bool result = FnTable.GetWorkingSeatedZeroPoseToRawTrackingPose(ref pmatSeatedZeroPoseToRawTrackingPose);
-		return result;
-	}
-	internal bool GetWorkingStandingZeroPoseToRawTrackingPose(ref HmdMatrix34_t pmatStandingZeroPoseToRawTrackingPose)
-	{
-		bool result = FnTable.GetWorkingStandingZeroPoseToRawTrackingPose(ref pmatStandingZeroPoseToRawTrackingPose);
-		return result;
-	}
-	internal void SetWorkingPlayAreaSize(float sizeX,float sizeZ)
-	{
-		FnTable.SetWorkingPlayAreaSize(sizeX,sizeZ);
-	}
-	internal void SetWorkingCollisionBoundsInfo(HmdQuad_t [] pQuadsBuffer)
-	{
-		FnTable.SetWorkingCollisionBoundsInfo(pQuadsBuffer,(uint) pQuadsBuffer.Length);
-	}
-	internal void SetWorkingSeatedZeroPoseToRawTrackingPose(ref HmdMatrix34_t pMatSeatedZeroPoseToRawTrackingPose)
-	{
-		FnTable.SetWorkingSeatedZeroPoseToRawTrackingPose(ref pMatSeatedZeroPoseToRawTrackingPose);
-	}
-	internal void SetWorkingStandingZeroPoseToRawTrackingPose(ref HmdMatrix34_t pMatStandingZeroPoseToRawTrackingPose)
-	{
-		FnTable.SetWorkingStandingZeroPoseToRawTrackingPose(ref pMatStandingZeroPoseToRawTrackingPose);
-	}
-	internal void ReloadFromDisk(EChaperoneConfigFile configFile)
-	{
-		FnTable.ReloadFromDisk(configFile);
-	}
-	internal bool GetLiveSeatedZeroPoseToRawTrackingPose(ref HmdMatrix34_t pmatSeatedZeroPoseToRawTrackingPose)
-	{
-		bool result = FnTable.GetLiveSeatedZeroPoseToRawTrackingPose(ref pmatSeatedZeroPoseToRawTrackingPose);
-		return result;
-	}
-	internal void SetWorkingCollisionBoundsTagsInfo(byte [] pTagsBuffer)
-	{
-		FnTable.SetWorkingCollisionBoundsTagsInfo(pTagsBuffer,(uint) pTagsBuffer.Length);
-	}
-	internal bool GetLiveCollisionBoundsTagsInfo(out byte [] pTagsBuffer)
-	{
-		uint punTagCount = 0;
-		bool result = FnTable.GetLiveCollisionBoundsTagsInfo(null,ref punTagCount);
-		pTagsBuffer= new byte[punTagCount];
-		result = FnTable.GetLiveCollisionBoundsTagsInfo(pTagsBuffer,ref punTagCount);
-		return result;
-	}
-	internal bool SetWorkingPhysicalBoundsInfo(HmdQuad_t [] pQuadsBuffer)
-	{
-		bool result = FnTable.SetWorkingPhysicalBoundsInfo(pQuadsBuffer,(uint) pQuadsBuffer.Length);
-		return result;
-	}
-	internal bool GetLivePhysicalBoundsInfo(out HmdQuad_t [] pQuadsBuffer)
-	{
-		uint punQuadsCount = 0;
-		bool result = FnTable.GetLivePhysicalBoundsInfo(null,ref punQuadsCount);
-		pQuadsBuffer= new HmdQuad_t[punQuadsCount];
-		result = FnTable.GetLivePhysicalBoundsInfo(pQuadsBuffer,ref punQuadsCount);
-		return result;
-	}
-	internal bool ExportLiveToBuffer(System.Text.StringBuilder pBuffer,ref uint pnBufferLength)
-	{
-		pnBufferLength = 0;
-		bool result = FnTable.ExportLiveToBuffer(pBuffer,ref pnBufferLength);
-		return result;
-	}
-	internal bool ImportFromBufferToWorking(string pBuffer,uint nImportFlags)
-	{
-		bool result = FnTable.ImportFromBufferToWorking(pBuffer,nImportFlags);
-		return result;
-	}
-}
-
-
-internal class CVRCompositor
-{
-	IVRCompositor FnTable;
-	internal CVRCompositor(IntPtr pInterface)
-	{
-		FnTable = (IVRCompositor)Marshal.PtrToStructure(pInterface, typeof(IVRCompositor));
-	}
-	internal void SetTrackingSpace(ETrackingUniverseOrigin eOrigin)
-	{
-		FnTable.SetTrackingSpace(eOrigin);
-	}
-	internal ETrackingUniverseOrigin GetTrackingSpace()
-	{
-		ETrackingUniverseOrigin result = FnTable.GetTrackingSpace();
-		return result;
-	}
-	internal EVRCompositorError WaitGetPoses(TrackedDevicePose_t [] pRenderPoseArray,TrackedDevicePose_t [] pGamePoseArray)
-	{
-		EVRCompositorError result = FnTable.WaitGetPoses(pRenderPoseArray,(uint) pRenderPoseArray.Length,pGamePoseArray,(uint) pGamePoseArray.Length);
-		return result;
-	}
-	internal EVRCompositorError GetLastPoses(TrackedDevicePose_t [] pRenderPoseArray,TrackedDevicePose_t [] pGamePoseArray)
-	{
-		EVRCompositorError result = FnTable.GetLastPoses(pRenderPoseArray,(uint) pRenderPoseArray.Length,pGamePoseArray,(uint) pGamePoseArray.Length);
-		return result;
-	}
-	internal EVRCompositorError GetLastPoseForTrackedDeviceIndex(uint unDeviceIndex,ref TrackedDevicePose_t pOutputPose,ref TrackedDevicePose_t pOutputGamePose)
-	{
-		EVRCompositorError result = FnTable.GetLastPoseForTrackedDeviceIndex(unDeviceIndex,ref pOutputPose,ref pOutputGamePose);
-		return result;
-	}
-	internal EVRCompositorError Submit(EVREye eEye,ref Texture_t pTexture,ref VRTextureBounds_t pBounds,EVRSubmitFlags nSubmitFlags)
-	{
-		EVRCompositorError result = FnTable.Submit(eEye,ref pTexture,ref pBounds,nSubmitFlags);
-		return result;
-	}
-	internal void ClearLastSubmittedFrame()
-	{
-		FnTable.ClearLastSubmittedFrame();
-	}
-	internal void PostPresentHandoff()
-	{
-		FnTable.PostPresentHandoff();
-	}
-	internal bool GetFrameTiming(ref Compositor_FrameTiming pTiming,uint unFramesAgo)
-	{
-		bool result = FnTable.GetFrameTiming(ref pTiming,unFramesAgo);
-		return result;
-	}
-	internal uint GetFrameTimings(ref Compositor_FrameTiming pTiming,uint nFrames)
-	{
-		uint result = FnTable.GetFrameTimings(ref pTiming,nFrames);
-		return result;
-	}
-	internal float GetFrameTimeRemaining()
-	{
-		float result = FnTable.GetFrameTimeRemaining();
-		return result;
-	}
-	internal void GetCumulativeStats(ref Compositor_CumulativeStats pStats,uint nStatsSizeInBytes)
-	{
-		FnTable.GetCumulativeStats(ref pStats,nStatsSizeInBytes);
-	}
-	internal void FadeToColor(float fSeconds,float fRed,float fGreen,float fBlue,float fAlpha,bool bBackground)
-	{
-		FnTable.FadeToColor(fSeconds,fRed,fGreen,fBlue,fAlpha,bBackground);
-	}
-	internal HmdColor_t GetCurrentFadeColor(bool bBackground)
-	{
-		HmdColor_t result = FnTable.GetCurrentFadeColor(bBackground);
-		return result;
-	}
-	internal void FadeGrid(float fSeconds,bool bFadeIn)
-	{
-		FnTable.FadeGrid(fSeconds,bFadeIn);
-	}
-	internal float GetCurrentGridAlpha()
-	{
-		float result = FnTable.GetCurrentGridAlpha();
-		return result;
-	}
-	internal EVRCompositorError SetSkyboxOverride(Texture_t [] pTextures)
-	{
-		EVRCompositorError result = FnTable.SetSkyboxOverride(pTextures,(uint) pTextures.Length);
-		return result;
-	}
-	internal void ClearSkyboxOverride()
-	{
-		FnTable.ClearSkyboxOverride();
-	}
-	internal void CompositorBringToFront()
-	{
-		FnTable.CompositorBringToFront();
-	}
-	internal void CompositorGoToBack()
-	{
-		FnTable.CompositorGoToBack();
-	}
-	internal void CompositorQuit()
-	{
-		FnTable.CompositorQuit();
-	}
-	internal bool IsFullscreen()
-	{
-		bool result = FnTable.IsFullscreen();
-		return result;
-	}
-	internal uint GetCurrentSceneFocusProcess()
-	{
-		uint result = FnTable.GetCurrentSceneFocusProcess();
-		return result;
-	}
-	internal uint GetLastFrameRenderer()
-	{
-		uint result = FnTable.GetLastFrameRenderer();
-		return result;
-	}
-	internal bool CanRenderScene()
-	{
-		bool result = FnTable.CanRenderScene();
-		return result;
-	}
-	internal void ShowMirrorWindow()
-	{
-		FnTable.ShowMirrorWindow();
-	}
-	internal void HideMirrorWindow()
-	{
-		FnTable.HideMirrorWindow();
-	}
-	internal bool IsMirrorWindowVisible()
-	{
-		bool result = FnTable.IsMirrorWindowVisible();
-		return result;
-	}
-	internal void CompositorDumpImages()
-	{
-		FnTable.CompositorDumpImages();
-	}
-	internal bool ShouldAppRenderWithLowResources()
-	{
-		bool result = FnTable.ShouldAppRenderWithLowResources();
-		return result;
-	}
-	internal void ForceInterleavedReprojectionOn(bool bOverride)
-	{
-		FnTable.ForceInterleavedReprojectionOn(bOverride);
-	}
-	internal void ForceReconnectProcess()
-	{
-		FnTable.ForceReconnectProcess();
-	}
-	internal void SuspendRendering(bool bSuspend)
-	{
-		FnTable.SuspendRendering(bSuspend);
-	}
-	internal EVRCompositorError GetMirrorTextureD3D11(EVREye eEye,IntPtr pD3D11DeviceOrResource,ref IntPtr ppD3D11ShaderResourceView)
-	{
-		EVRCompositorError result = FnTable.GetMirrorTextureD3D11(eEye,pD3D11DeviceOrResource,ref ppD3D11ShaderResourceView);
-		return result;
-	}
-	internal EVRCompositorError GetMirrorTextureGL(EVREye eEye,ref uint pglTextureId,IntPtr pglSharedTextureHandle)
-	{
-		pglTextureId = 0;
-		EVRCompositorError result = FnTable.GetMirrorTextureGL(eEye,ref pglTextureId,pglSharedTextureHandle);
-		return result;
-	}
-	internal bool ReleaseSharedGLTexture(uint glTextureId,IntPtr glSharedTextureHandle)
-	{
-		bool result = FnTable.ReleaseSharedGLTexture(glTextureId,glSharedTextureHandle);
-		return result;
-	}
-	internal void LockGLSharedTextureForAccess(IntPtr glSharedTextureHandle)
-	{
-		FnTable.LockGLSharedTextureForAccess(glSharedTextureHandle);
-	}
-	internal void UnlockGLSharedTextureForAccess(IntPtr glSharedTextureHandle)
-	{
-		FnTable.UnlockGLSharedTextureForAccess(glSharedTextureHandle);
-	}
-}
-
-
-internal class CVROverlay
-{
-	IVROverlay FnTable;
-	internal CVROverlay(IntPtr pInterface)
-	{
-		FnTable = (IVROverlay)Marshal.PtrToStructure(pInterface, typeof(IVROverlay));
-	}
-	internal EVROverlayError FindOverlay(string pchOverlayKey,ref ulong pOverlayHandle)
-	{
-		pOverlayHandle = 0;
-		EVROverlayError result = FnTable.FindOverlay(pchOverlayKey,ref pOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError CreateOverlay(string pchOverlayKey,string pchOverlayFriendlyName,ref ulong pOverlayHandle)
-	{
-		pOverlayHandle = 0;
-		EVROverlayError result = FnTable.CreateOverlay(pchOverlayKey,pchOverlayFriendlyName,ref pOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError DestroyOverlay(ulong ulOverlayHandle)
-	{
-		EVROverlayError result = FnTable.DestroyOverlay(ulOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError SetHighQualityOverlay(ulong ulOverlayHandle)
-	{
-		EVROverlayError result = FnTable.SetHighQualityOverlay(ulOverlayHandle);
-		return result;
-	}
-	internal ulong GetHighQualityOverlay()
-	{
-		ulong result = FnTable.GetHighQualityOverlay();
-		return result;
-	}
-	internal uint GetOverlayKey(ulong ulOverlayHandle,System.Text.StringBuilder pchValue,uint unBufferSize,ref EVROverlayError pError)
-	{
-		uint result = FnTable.GetOverlayKey(ulOverlayHandle,pchValue,unBufferSize,ref pError);
-		return result;
-	}
-	internal uint GetOverlayName(ulong ulOverlayHandle,System.Text.StringBuilder pchValue,uint unBufferSize,ref EVROverlayError pError)
-	{
-		uint result = FnTable.GetOverlayName(ulOverlayHandle,pchValue,unBufferSize,ref pError);
-		return result;
-	}
-	internal EVROverlayError GetOverlayImageData(ulong ulOverlayHandle,IntPtr pvBuffer,uint unBufferSize,ref uint punWidth,ref uint punHeight)
-	{
-		punWidth = 0;
-		punHeight = 0;
-		EVROverlayError result = FnTable.GetOverlayImageData(ulOverlayHandle,pvBuffer,unBufferSize,ref punWidth,ref punHeight);
-		return result;
-	}
-	internal string GetOverlayErrorNameFromEnum(EVROverlayError error)
-	{
-		IntPtr result = FnTable.GetOverlayErrorNameFromEnum(error);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal EVROverlayError SetOverlayRenderingPid(ulong ulOverlayHandle,uint unPID)
-	{
-		EVROverlayError result = FnTable.SetOverlayRenderingPid(ulOverlayHandle,unPID);
-		return result;
-	}
-	internal uint GetOverlayRenderingPid(ulong ulOverlayHandle)
-	{
-		uint result = FnTable.GetOverlayRenderingPid(ulOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError SetOverlayFlag(ulong ulOverlayHandle,VROverlayFlags eOverlayFlag,bool bEnabled)
-	{
-		EVROverlayError result = FnTable.SetOverlayFlag(ulOverlayHandle,eOverlayFlag,bEnabled);
-		return result;
-	}
-	internal EVROverlayError GetOverlayFlag(ulong ulOverlayHandle,VROverlayFlags eOverlayFlag,ref bool pbEnabled)
-	{
-		pbEnabled = false;
-		EVROverlayError result = FnTable.GetOverlayFlag(ulOverlayHandle,eOverlayFlag,ref pbEnabled);
-		return result;
-	}
-	internal EVROverlayError SetOverlayColor(ulong ulOverlayHandle,float fRed,float fGreen,float fBlue)
-	{
-		EVROverlayError result = FnTable.SetOverlayColor(ulOverlayHandle,fRed,fGreen,fBlue);
-		return result;
-	}
-	internal EVROverlayError GetOverlayColor(ulong ulOverlayHandle,ref float pfRed,ref float pfGreen,ref float pfBlue)
-	{
-		pfRed = 0;
-		pfGreen = 0;
-		pfBlue = 0;
-		EVROverlayError result = FnTable.GetOverlayColor(ulOverlayHandle,ref pfRed,ref pfGreen,ref pfBlue);
-		return result;
-	}
-	internal EVROverlayError SetOverlayAlpha(ulong ulOverlayHandle,float fAlpha)
-	{
-		EVROverlayError result = FnTable.SetOverlayAlpha(ulOverlayHandle,fAlpha);
-		return result;
-	}
-	internal EVROverlayError GetOverlayAlpha(ulong ulOverlayHandle,ref float pfAlpha)
-	{
-		pfAlpha = 0;
-		EVROverlayError result = FnTable.GetOverlayAlpha(ulOverlayHandle,ref pfAlpha);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTexelAspect(ulong ulOverlayHandle,float fTexelAspect)
-	{
-		EVROverlayError result = FnTable.SetOverlayTexelAspect(ulOverlayHandle,fTexelAspect);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTexelAspect(ulong ulOverlayHandle,ref float pfTexelAspect)
-	{
-		pfTexelAspect = 0;
-		EVROverlayError result = FnTable.GetOverlayTexelAspect(ulOverlayHandle,ref pfTexelAspect);
-		return result;
-	}
-	internal EVROverlayError SetOverlaySortOrder(ulong ulOverlayHandle,uint unSortOrder)
-	{
-		EVROverlayError result = FnTable.SetOverlaySortOrder(ulOverlayHandle,unSortOrder);
-		return result;
-	}
-	internal EVROverlayError GetOverlaySortOrder(ulong ulOverlayHandle,ref uint punSortOrder)
-	{
-		punSortOrder = 0;
-		EVROverlayError result = FnTable.GetOverlaySortOrder(ulOverlayHandle,ref punSortOrder);
-		return result;
-	}
-	internal EVROverlayError SetOverlayWidthInMeters(ulong ulOverlayHandle,float fWidthInMeters)
-	{
-		EVROverlayError result = FnTable.SetOverlayWidthInMeters(ulOverlayHandle,fWidthInMeters);
-		return result;
-	}
-	internal EVROverlayError GetOverlayWidthInMeters(ulong ulOverlayHandle,ref float pfWidthInMeters)
-	{
-		pfWidthInMeters = 0;
-		EVROverlayError result = FnTable.GetOverlayWidthInMeters(ulOverlayHandle,ref pfWidthInMeters);
-		return result;
-	}
-	internal EVROverlayError SetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle,float fMinDistanceInMeters,float fMaxDistanceInMeters)
-	{
-		EVROverlayError result = FnTable.SetOverlayAutoCurveDistanceRangeInMeters(ulOverlayHandle,fMinDistanceInMeters,fMaxDistanceInMeters);
-		return result;
-	}
-	internal EVROverlayError GetOverlayAutoCurveDistanceRangeInMeters(ulong ulOverlayHandle,ref float pfMinDistanceInMeters,ref float pfMaxDistanceInMeters)
-	{
-		pfMinDistanceInMeters = 0;
-		pfMaxDistanceInMeters = 0;
-		EVROverlayError result = FnTable.GetOverlayAutoCurveDistanceRangeInMeters(ulOverlayHandle,ref pfMinDistanceInMeters,ref pfMaxDistanceInMeters);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTextureColorSpace(ulong ulOverlayHandle,EColorSpace eTextureColorSpace)
-	{
-		EVROverlayError result = FnTable.SetOverlayTextureColorSpace(ulOverlayHandle,eTextureColorSpace);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTextureColorSpace(ulong ulOverlayHandle,ref EColorSpace peTextureColorSpace)
-	{
-		EVROverlayError result = FnTable.GetOverlayTextureColorSpace(ulOverlayHandle,ref peTextureColorSpace);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTextureBounds(ulong ulOverlayHandle,ref VRTextureBounds_t pOverlayTextureBounds)
-	{
-		EVROverlayError result = FnTable.SetOverlayTextureBounds(ulOverlayHandle,ref pOverlayTextureBounds);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTextureBounds(ulong ulOverlayHandle,ref VRTextureBounds_t pOverlayTextureBounds)
-	{
-		EVROverlayError result = FnTable.GetOverlayTextureBounds(ulOverlayHandle,ref pOverlayTextureBounds);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTransformType(ulong ulOverlayHandle,ref VROverlayTransformType peTransformType)
-	{
-		EVROverlayError result = FnTable.GetOverlayTransformType(ulOverlayHandle,ref peTransformType);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTransformAbsolute(ulong ulOverlayHandle,ETrackingUniverseOrigin eTrackingOrigin,ref HmdMatrix34_t pmatTrackingOriginToOverlayTransform)
-	{
-		EVROverlayError result = FnTable.SetOverlayTransformAbsolute(ulOverlayHandle,eTrackingOrigin,ref pmatTrackingOriginToOverlayTransform);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTransformAbsolute(ulong ulOverlayHandle,ref ETrackingUniverseOrigin peTrackingOrigin,ref HmdMatrix34_t pmatTrackingOriginToOverlayTransform)
-	{
-		EVROverlayError result = FnTable.GetOverlayTransformAbsolute(ulOverlayHandle,ref peTrackingOrigin,ref pmatTrackingOriginToOverlayTransform);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTransformTrackedDeviceRelative(ulong ulOverlayHandle,uint unTrackedDevice,ref HmdMatrix34_t pmatTrackedDeviceToOverlayTransform)
-	{
-		EVROverlayError result = FnTable.SetOverlayTransformTrackedDeviceRelative(ulOverlayHandle,unTrackedDevice,ref pmatTrackedDeviceToOverlayTransform);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTransformTrackedDeviceRelative(ulong ulOverlayHandle,ref uint punTrackedDevice,ref HmdMatrix34_t pmatTrackedDeviceToOverlayTransform)
-	{
-		punTrackedDevice = 0;
-		EVROverlayError result = FnTable.GetOverlayTransformTrackedDeviceRelative(ulOverlayHandle,ref punTrackedDevice,ref pmatTrackedDeviceToOverlayTransform);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTransformTrackedDeviceComponent(ulong ulOverlayHandle,uint unDeviceIndex,string pchComponentName)
-	{
-		EVROverlayError result = FnTable.SetOverlayTransformTrackedDeviceComponent(ulOverlayHandle,unDeviceIndex,pchComponentName);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTransformTrackedDeviceComponent(ulong ulOverlayHandle,ref uint punDeviceIndex,string pchComponentName,uint unComponentNameSize)
-	{
-		punDeviceIndex = 0;
-		EVROverlayError result = FnTable.GetOverlayTransformTrackedDeviceComponent(ulOverlayHandle,ref punDeviceIndex,pchComponentName,unComponentNameSize);
-		return result;
-	}
-	internal EVROverlayError ShowOverlay(ulong ulOverlayHandle)
-	{
-		EVROverlayError result = FnTable.ShowOverlay(ulOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError HideOverlay(ulong ulOverlayHandle)
-	{
-		EVROverlayError result = FnTable.HideOverlay(ulOverlayHandle);
-		return result;
-	}
-	internal bool IsOverlayVisible(ulong ulOverlayHandle)
-	{
-		bool result = FnTable.IsOverlayVisible(ulOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError GetTransformForOverlayCoordinates(ulong ulOverlayHandle,ETrackingUniverseOrigin eTrackingOrigin,HmdVector2_t coordinatesInOverlay,ref HmdMatrix34_t pmatTransform)
-	{
-		EVROverlayError result = FnTable.GetTransformForOverlayCoordinates(ulOverlayHandle,eTrackingOrigin,coordinatesInOverlay,ref pmatTransform);
-		return result;
-	}
-	internal bool PollNextOverlayEvent(ulong ulOverlayHandle,ref VREvent_t pEvent,uint uncbVREvent)
-	{
-		bool result = FnTable.PollNextOverlayEvent(ulOverlayHandle,ref pEvent,uncbVREvent);
-		return result;
-	}
-	internal EVROverlayError GetOverlayInputMethod(ulong ulOverlayHandle,ref VROverlayInputMethod peInputMethod)
-	{
-		EVROverlayError result = FnTable.GetOverlayInputMethod(ulOverlayHandle,ref peInputMethod);
-		return result;
-	}
-	internal EVROverlayError SetOverlayInputMethod(ulong ulOverlayHandle,VROverlayInputMethod eInputMethod)
-	{
-		EVROverlayError result = FnTable.SetOverlayInputMethod(ulOverlayHandle,eInputMethod);
-		return result;
-	}
-	internal EVROverlayError GetOverlayMouseScale(ulong ulOverlayHandle,ref HmdVector2_t pvecMouseScale)
-	{
-		EVROverlayError result = FnTable.GetOverlayMouseScale(ulOverlayHandle,ref pvecMouseScale);
-		return result;
-	}
-	internal EVROverlayError SetOverlayMouseScale(ulong ulOverlayHandle,ref HmdVector2_t pvecMouseScale)
-	{
-		EVROverlayError result = FnTable.SetOverlayMouseScale(ulOverlayHandle,ref pvecMouseScale);
-		return result;
-	}
-	internal bool ComputeOverlayIntersection(ulong ulOverlayHandle,ref VROverlayIntersectionParams_t pParams,ref VROverlayIntersectionResults_t pResults)
-	{
-		bool result = FnTable.ComputeOverlayIntersection(ulOverlayHandle,ref pParams,ref pResults);
-		return result;
-	}
-	internal bool HandleControllerOverlayInteractionAsMouse(ulong ulOverlayHandle,uint unControllerDeviceIndex)
-	{
-		bool result = FnTable.HandleControllerOverlayInteractionAsMouse(ulOverlayHandle,unControllerDeviceIndex);
-		return result;
-	}
-	internal bool IsHoverTargetOverlay(ulong ulOverlayHandle)
-	{
-		bool result = FnTable.IsHoverTargetOverlay(ulOverlayHandle);
-		return result;
-	}
-	internal ulong GetGamepadFocusOverlay()
-	{
-		ulong result = FnTable.GetGamepadFocusOverlay();
-		return result;
-	}
-	internal EVROverlayError SetGamepadFocusOverlay(ulong ulNewFocusOverlay)
-	{
-		EVROverlayError result = FnTable.SetGamepadFocusOverlay(ulNewFocusOverlay);
-		return result;
-	}
-	internal EVROverlayError SetOverlayNeighbor(EOverlayDirection eDirection,ulong ulFrom,ulong ulTo)
-	{
-		EVROverlayError result = FnTable.SetOverlayNeighbor(eDirection,ulFrom,ulTo);
-		return result;
-	}
-	internal EVROverlayError MoveGamepadFocusToNeighbor(EOverlayDirection eDirection,ulong ulFrom)
-	{
-		EVROverlayError result = FnTable.MoveGamepadFocusToNeighbor(eDirection,ulFrom);
-		return result;
-	}
-	internal EVROverlayError SetOverlayTexture(ulong ulOverlayHandle,ref Texture_t pTexture)
-	{
-		EVROverlayError result = FnTable.SetOverlayTexture(ulOverlayHandle,ref pTexture);
-		return result;
-	}
-	internal EVROverlayError ClearOverlayTexture(ulong ulOverlayHandle)
-	{
-		EVROverlayError result = FnTable.ClearOverlayTexture(ulOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError SetOverlayRaw(ulong ulOverlayHandle,IntPtr pvBuffer,uint unWidth,uint unHeight,uint unDepth)
-	{
-		EVROverlayError result = FnTable.SetOverlayRaw(ulOverlayHandle,pvBuffer,unWidth,unHeight,unDepth);
-		return result;
-	}
-	internal EVROverlayError SetOverlayFromFile(ulong ulOverlayHandle,string pchFilePath)
-	{
-		EVROverlayError result = FnTable.SetOverlayFromFile(ulOverlayHandle,pchFilePath);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTexture(ulong ulOverlayHandle,ref IntPtr pNativeTextureHandle,IntPtr pNativeTextureRef,ref uint pWidth,ref uint pHeight,ref uint pNativeFormat,ref EGraphicsAPIConvention pAPI,ref EColorSpace pColorSpace)
-	{
-		pWidth = 0;
-		pHeight = 0;
-		pNativeFormat = 0;
-		EVROverlayError result = FnTable.GetOverlayTexture(ulOverlayHandle,ref pNativeTextureHandle,pNativeTextureRef,ref pWidth,ref pHeight,ref pNativeFormat,ref pAPI,ref pColorSpace);
-		return result;
-	}
-	internal EVROverlayError ReleaseNativeOverlayHandle(ulong ulOverlayHandle,IntPtr pNativeTextureHandle)
-	{
-		EVROverlayError result = FnTable.ReleaseNativeOverlayHandle(ulOverlayHandle,pNativeTextureHandle);
-		return result;
-	}
-	internal EVROverlayError GetOverlayTextureSize(ulong ulOverlayHandle,ref uint pWidth,ref uint pHeight)
-	{
-		pWidth = 0;
-		pHeight = 0;
-		EVROverlayError result = FnTable.GetOverlayTextureSize(ulOverlayHandle,ref pWidth,ref pHeight);
-		return result;
-	}
-	internal EVROverlayError CreateDashboardOverlay(string pchOverlayKey,string pchOverlayFriendlyName,ref ulong pMainHandle,ref ulong pThumbnailHandle)
-	{
-		pMainHandle = 0;
-		pThumbnailHandle = 0;
-		EVROverlayError result = FnTable.CreateDashboardOverlay(pchOverlayKey,pchOverlayFriendlyName,ref pMainHandle,ref pThumbnailHandle);
-		return result;
-	}
-	internal bool IsDashboardVisible()
-	{
-		bool result = FnTable.IsDashboardVisible();
-		return result;
-	}
-	internal bool IsActiveDashboardOverlay(ulong ulOverlayHandle)
-	{
-		bool result = FnTable.IsActiveDashboardOverlay(ulOverlayHandle);
-		return result;
-	}
-	internal EVROverlayError SetDashboardOverlaySceneProcess(ulong ulOverlayHandle,uint unProcessId)
-	{
-		EVROverlayError result = FnTable.SetDashboardOverlaySceneProcess(ulOverlayHandle,unProcessId);
-		return result;
-	}
-	internal EVROverlayError GetDashboardOverlaySceneProcess(ulong ulOverlayHandle,ref uint punProcessId)
-	{
-		punProcessId = 0;
-		EVROverlayError result = FnTable.GetDashboardOverlaySceneProcess(ulOverlayHandle,ref punProcessId);
-		return result;
-	}
-	internal void ShowDashboard(string pchOverlayToShow)
-	{
-		FnTable.ShowDashboard(pchOverlayToShow);
-	}
-	internal uint GetPrimaryDashboardDevice()
-	{
-		uint result = FnTable.GetPrimaryDashboardDevice();
-		return result;
-	}
-	internal EVROverlayError ShowKeyboard(int eInputMode,int eLineInputMode,string pchDescription,uint unCharMax,string pchExistingText,bool bUseMinimalMode,ulong uUserValue)
-	{
-		EVROverlayError result = FnTable.ShowKeyboard(eInputMode,eLineInputMode,pchDescription,unCharMax,pchExistingText,bUseMinimalMode,uUserValue);
-		return result;
-	}
-	internal EVROverlayError ShowKeyboardForOverlay(ulong ulOverlayHandle,int eInputMode,int eLineInputMode,string pchDescription,uint unCharMax,string pchExistingText,bool bUseMinimalMode,ulong uUserValue)
-	{
-		EVROverlayError result = FnTable.ShowKeyboardForOverlay(ulOverlayHandle,eInputMode,eLineInputMode,pchDescription,unCharMax,pchExistingText,bUseMinimalMode,uUserValue);
-		return result;
-	}
-	internal uint GetKeyboardText(System.Text.StringBuilder pchText,uint cchText)
-	{
-		uint result = FnTable.GetKeyboardText(pchText,cchText);
-		return result;
-	}
-	internal void HideKeyboard()
-	{
-		FnTable.HideKeyboard();
-	}
-	internal void SetKeyboardTransformAbsolute(ETrackingUniverseOrigin eTrackingOrigin,ref HmdMatrix34_t pmatTrackingOriginToKeyboardTransform)
-	{
-		FnTable.SetKeyboardTransformAbsolute(eTrackingOrigin,ref pmatTrackingOriginToKeyboardTransform);
-	}
-	internal void SetKeyboardPositionForOverlay(ulong ulOverlayHandle,HmdRect2_t avoidRect)
-	{
-		FnTable.SetKeyboardPositionForOverlay(ulOverlayHandle,avoidRect);
-	}
-	internal EVROverlayError SetOverlayIntersectionMask(ulong ulOverlayHandle,ref VROverlayIntersectionMaskPrimitive_t pMaskPrimitives,uint unNumMaskPrimitives,uint unPrimitiveSize)
-	{
-		EVROverlayError result = FnTable.SetOverlayIntersectionMask(ulOverlayHandle,ref pMaskPrimitives,unNumMaskPrimitives,unPrimitiveSize);
-		return result;
-	}
-}
-
-
-internal class CVRRenderModels
-{
-	IVRRenderModels FnTable;
-	internal CVRRenderModels(IntPtr pInterface)
-	{
-		FnTable = (IVRRenderModels)Marshal.PtrToStructure(pInterface, typeof(IVRRenderModels));
-	}
-	internal EVRRenderModelError LoadRenderModel_Async(string pchRenderModelName,ref IntPtr ppRenderModel)
-	{
-		EVRRenderModelError result = FnTable.LoadRenderModel_Async(pchRenderModelName,ref ppRenderModel);
-		return result;
-	}
-	internal void FreeRenderModel(IntPtr pRenderModel)
-	{
-		FnTable.FreeRenderModel(pRenderModel);
-	}
-	internal EVRRenderModelError LoadTexture_Async(int textureId,ref IntPtr ppTexture)
-	{
-		EVRRenderModelError result = FnTable.LoadTexture_Async(textureId,ref ppTexture);
-		return result;
-	}
-	internal void FreeTexture(IntPtr pTexture)
-	{
-		FnTable.FreeTexture(pTexture);
-	}
-	internal EVRRenderModelError LoadTextureD3D11_Async(int textureId,IntPtr pD3D11Device,ref IntPtr ppD3D11Texture2D)
-	{
-		EVRRenderModelError result = FnTable.LoadTextureD3D11_Async(textureId,pD3D11Device,ref ppD3D11Texture2D);
-		return result;
-	}
-	internal EVRRenderModelError LoadIntoTextureD3D11_Async(int textureId,IntPtr pDstTexture)
-	{
-		EVRRenderModelError result = FnTable.LoadIntoTextureD3D11_Async(textureId,pDstTexture);
-		return result;
-	}
-	internal void FreeTextureD3D11(IntPtr pD3D11Texture2D)
-	{
-		FnTable.FreeTextureD3D11(pD3D11Texture2D);
-	}
-	internal uint GetRenderModelName(uint unRenderModelIndex,System.Text.StringBuilder pchRenderModelName,uint unRenderModelNameLen)
-	{
-		uint result = FnTable.GetRenderModelName(unRenderModelIndex,pchRenderModelName,unRenderModelNameLen);
-		return result;
-	}
-	internal uint GetRenderModelCount()
-	{
-		uint result = FnTable.GetRenderModelCount();
-		return result;
-	}
-	internal uint GetComponentCount(string pchRenderModelName)
-	{
-		uint result = FnTable.GetComponentCount(pchRenderModelName);
-		return result;
-	}
-	internal uint GetComponentName(string pchRenderModelName,uint unComponentIndex,System.Text.StringBuilder pchComponentName,uint unComponentNameLen)
-	{
-		uint result = FnTable.GetComponentName(pchRenderModelName,unComponentIndex,pchComponentName,unComponentNameLen);
-		return result;
-	}
-	internal ulong GetComponentButtonMask(string pchRenderModelName,string pchComponentName)
-	{
-		ulong result = FnTable.GetComponentButtonMask(pchRenderModelName,pchComponentName);
-		return result;
-	}
-	internal uint GetComponentRenderModelName(string pchRenderModelName,string pchComponentName,System.Text.StringBuilder pchComponentRenderModelName,uint unComponentRenderModelNameLen)
-	{
-		uint result = FnTable.GetComponentRenderModelName(pchRenderModelName,pchComponentName,pchComponentRenderModelName,unComponentRenderModelNameLen);
-		return result;
-	}
-	internal bool GetComponentState(string pchRenderModelName,string pchComponentName,ref VRControllerState_t pControllerState,ref RenderModel_ControllerMode_State_t pState,ref RenderModel_ComponentState_t pComponentState)
-	{
-		bool result = FnTable.GetComponentState(pchRenderModelName,pchComponentName,ref pControllerState,ref pState,ref pComponentState);
-		return result;
-	}
-	internal bool RenderModelHasComponent(string pchRenderModelName,string pchComponentName)
-	{
-		bool result = FnTable.RenderModelHasComponent(pchRenderModelName,pchComponentName);
-		return result;
-	}
-	internal uint GetRenderModelThumbnailURL(string pchRenderModelName,System.Text.StringBuilder pchThumbnailURL,uint unThumbnailURLLen,ref EVRRenderModelError peError)
-	{
-		uint result = FnTable.GetRenderModelThumbnailURL(pchRenderModelName,pchThumbnailURL,unThumbnailURLLen,ref peError);
-		return result;
-	}
-	internal uint GetRenderModelOriginalPath(string pchRenderModelName,System.Text.StringBuilder pchOriginalPath,uint unOriginalPathLen,ref EVRRenderModelError peError)
-	{
-		uint result = FnTable.GetRenderModelOriginalPath(pchRenderModelName,pchOriginalPath,unOriginalPathLen,ref peError);
-		return result;
-	}
-	internal string GetRenderModelErrorNameFromEnum(EVRRenderModelError error)
-	{
-		IntPtr result = FnTable.GetRenderModelErrorNameFromEnum(error);
-		return Marshal.PtrToStringAnsi(result);
-	}
-}
-
-
-internal class CVRNotifications
-{
-	IVRNotifications FnTable;
-	internal CVRNotifications(IntPtr pInterface)
-	{
-		FnTable = (IVRNotifications)Marshal.PtrToStructure(pInterface, typeof(IVRNotifications));
-	}
-	internal EVRNotificationError CreateNotification(ulong ulOverlayHandle,ulong ulUserValue,EVRNotificationType type,string pchText,EVRNotificationStyle style,ref NotificationBitmap_t pImage,ref uint pNotificationId)
-	{
-		pNotificationId = 0;
-		EVRNotificationError result = FnTable.CreateNotification(ulOverlayHandle,ulUserValue,type,pchText,style,ref pImage,ref pNotificationId);
-		return result;
-	}
-	internal EVRNotificationError RemoveNotification(uint notificationId)
-	{
-		EVRNotificationError result = FnTable.RemoveNotification(notificationId);
-		return result;
-	}
-}
-
-
-internal class CVRSettings
-{
-	IVRSettings FnTable;
-	internal CVRSettings(IntPtr pInterface)
-	{
-		FnTable = (IVRSettings)Marshal.PtrToStructure(pInterface, typeof(IVRSettings));
-	}
-	internal string GetSettingsErrorNameFromEnum(EVRSettingsError eError)
-	{
-		IntPtr result = FnTable.GetSettingsErrorNameFromEnum(eError);
-		return Marshal.PtrToStringAnsi(result);
-	}
-	internal bool Sync(bool bForce,ref EVRSettingsError peError)
-	{
-		bool result = FnTable.Sync(bForce,ref peError);
-		return result;
-	}
-	internal void SetBool(string pchSection,string pchSettingsKey,bool bValue,ref EVRSettingsError peError)
-	{
-		FnTable.SetBool(pchSection,pchSettingsKey,bValue,ref peError);
-	}
-	internal void SetInt32(string pchSection,string pchSettingsKey,int nValue,ref EVRSettingsError peError)
-	{
-		FnTable.SetInt32(pchSection,pchSettingsKey,nValue,ref peError);
-	}
-	internal void SetFloat(string pchSection,string pchSettingsKey,float flValue,ref EVRSettingsError peError)
-	{
-		FnTable.SetFloat(pchSection,pchSettingsKey,flValue,ref peError);
-	}
-	internal void SetString(string pchSection,string pchSettingsKey,string pchValue,ref EVRSettingsError peError)
-	{
-		FnTable.SetString(pchSection,pchSettingsKey,pchValue,ref peError);
-	}
-	internal bool GetBool(string pchSection,string pchSettingsKey,ref EVRSettingsError peError)
-	{
-		bool result = FnTable.GetBool(pchSection,pchSettingsKey,ref peError);
-		return result;
-	}
-	internal int GetInt32(string pchSection,string pchSettingsKey,ref EVRSettingsError peError)
-	{
-		int result = FnTable.GetInt32(pchSection,pchSettingsKey,ref peError);
-		return result;
-	}
-	internal float GetFloat(string pchSection,string pchSettingsKey,ref EVRSettingsError peError)
-	{
-		float result = FnTable.GetFloat(pchSection,pchSettingsKey,ref peError);
-		return result;
-	}
-	internal void GetString(string pchSection,string pchSettingsKey,System.Text.StringBuilder pchValue,uint unValueLen,ref EVRSettingsError peError)
-	{
-		FnTable.GetString(pchSection,pchSettingsKey,pchValue,unValueLen,ref peError);
-	}
-	internal void RemoveSection(string pchSection,ref EVRSettingsError peError)
-	{
-		FnTable.RemoveSection(pchSection,ref peError);
-	}
-	internal void RemoveKeyInSection(string pchSection,string pchSettingsKey,ref EVRSettingsError peError)
-	{
-		FnTable.RemoveKeyInSection(pchSection,pchSettingsKey,ref peError);
-	}
-}
-
-
-internal class CVRScreenshots
-{
-	IVRScreenshots FnTable;
-	internal CVRScreenshots(IntPtr pInterface)
-	{
-		FnTable = (IVRScreenshots)Marshal.PtrToStructure(pInterface, typeof(IVRScreenshots));
-	}
-	internal EVRScreenshotError RequestScreenshot(ref uint pOutScreenshotHandle,EVRScreenshotType type,string pchPreviewFilename,string pchVRFilename)
-	{
-		pOutScreenshotHandle = 0;
-		EVRScreenshotError result = FnTable.RequestScreenshot(ref pOutScreenshotHandle,type,pchPreviewFilename,pchVRFilename);
-		return result;
-	}
-	internal EVRScreenshotError HookScreenshot(EVRScreenshotType [] pSupportedTypes)
-	{
-		EVRScreenshotError result = FnTable.HookScreenshot(pSupportedTypes,(int) pSupportedTypes.Length);
-		return result;
-	}
-	internal EVRScreenshotType GetScreenshotPropertyType(uint screenshotHandle,ref EVRScreenshotError pError)
-	{
-		EVRScreenshotType result = FnTable.GetScreenshotPropertyType(screenshotHandle,ref pError);
-		return result;
-	}
-	internal uint GetScreenshotPropertyFilename(uint screenshotHandle,EVRScreenshotPropertyFilenames filenameType,System.Text.StringBuilder pchFilename,uint cchFilename,ref EVRScreenshotError pError)
-	{
-		uint result = FnTable.GetScreenshotPropertyFilename(screenshotHandle,filenameType,pchFilename,cchFilename,ref pError);
-		return result;
-	}
-	internal EVRScreenshotError UpdateScreenshotProgress(uint screenshotHandle,float flProgress)
-	{
-		EVRScreenshotError result = FnTable.UpdateScreenshotProgress(screenshotHandle,flProgress);
-		return result;
-	}
-	internal EVRScreenshotError TakeStereoScreenshot(ref uint pOutScreenshotHandle,string pchPreviewFilename,string pchVRFilename)
-	{
-		pOutScreenshotHandle = 0;
-		EVRScreenshotError result = FnTable.TakeStereoScreenshot(ref pOutScreenshotHandle,pchPreviewFilename,pchVRFilename);
-		return result;
-	}
-	internal EVRScreenshotError SubmitScreenshot(uint screenshotHandle,EVRScreenshotType type,string pchSourcePreviewFilename,string pchSourceVRFilename)
-	{
-		EVRScreenshotError result = FnTable.SubmitScreenshot(screenshotHandle,type,pchSourcePreviewFilename,pchSourceVRFilename);
-		return result;
-	}
-}
-
-
-internal class CVRResources
-{
-	IVRResources FnTable;
-	internal CVRResources(IntPtr pInterface)
-	{
-		FnTable = (IVRResources)Marshal.PtrToStructure(pInterface, typeof(IVRResources));
-	}
-	internal uint LoadSharedResource(string pchResourceName,string pchBuffer,uint unBufferLen)
-	{
-		uint result = FnTable.LoadSharedResource(pchResourceName,pchBuffer,unBufferLen);
-		return result;
-	}
-	internal uint GetResourceFullPath(string pchResourceName,string pchResourceTypeDirectory,string pchPathBuffer,uint unBufferLen)
-	{
-		uint result = FnTable.GetResourceFullPath(pchResourceName,pchResourceTypeDirectory,pchPathBuffer,unBufferLen);
-		return result;
-	}
-}
-
-
-internal class OpenVRInterop
-{
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_InitInternal", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern uint InitInternal(ref EVRInitError peError, EVRApplicationType eApplicationType);
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_ShutdownInternal", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern void ShutdownInternal();
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_IsHmdPresent", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern bool IsHmdPresent();
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_IsRuntimeInstalled", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern bool IsRuntimeInstalled();
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_GetStringForHmdError", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern IntPtr GetStringForHmdError(EVRInitError error);
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_GetGenericInterface", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern IntPtr GetGenericInterface([In, MarshalAs(UnmanagedType.LPStr)] string pchInterfaceVersion, ref EVRInitError peError);
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_IsInterfaceVersionValid", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern bool IsInterfaceVersionValid([In, MarshalAs(UnmanagedType.LPStr)] string pchInterfaceVersion);
-	[DllImportAttribute("openvr_api", EntryPoint = "VR_GetInitToken", CallingConvention = CallingConvention.Cdecl)]
-	internal static extern uint GetInitToken();
-}
-
-
-internal enum EVREye
-{
-	Eye_Left = 0,
-	Eye_Right = 1,
-}
-internal enum EGraphicsAPIConvention
-{
-	API_DirectX = 0,
-	API_OpenGL = 1,
-}
-internal enum EColorSpace
-{
-	Auto = 0,
-	Gamma = 1,
-	Linear = 2,
-}
-internal enum ETrackingResult
-{
-	Uninitialized = 1,
-	Calibrating_InProgress = 100,
-	Calibrating_OutOfRange = 101,
-	Running_OK = 200,
-	Running_OutOfRange = 201,
-}
-internal enum ETrackedDeviceClass
-{
-	Invalid = 0,
-	HMD = 1,
-	Controller = 2,
-	TrackingReference = 4,
-	Count = 5,
-	Other = 1000,
-}
-internal enum ETrackedControllerRole
-{
-	Invalid = 0,
-	LeftHand = 1,
-	RightHand = 2,
-}
-internal enum ETrackingUniverseOrigin
-{
-	TrackingUniverseSeated = 0,
-	TrackingUniverseStanding = 1,
-	TrackingUniverseRawAndUncalibrated = 2,
-}
-internal enum ETrackedDeviceProperty
-{
-	Prop_TrackingSystemName_String = 1000,
-	Prop_ModelNumber_String = 1001,
-	Prop_SerialNumber_String = 1002,
-	Prop_RenderModelName_String = 1003,
-	Prop_WillDriftInYaw_Bool = 1004,
-	Prop_ManufacturerName_String = 1005,
-	Prop_TrackingFirmwareVersion_String = 1006,
-	Prop_HardwareRevision_String = 1007,
-	Prop_AllWirelessDongleDescriptions_String = 1008,
-	Prop_ConnectedWirelessDongle_String = 1009,
-	Prop_DeviceIsWireless_Bool = 1010,
-	Prop_DeviceIsCharging_Bool = 1011,
-	Prop_DeviceBatteryPercentage_Float = 1012,
-	Prop_StatusDisplayTransform_Matrix34 = 1013,
-	Prop_Firmware_UpdateAvailable_Bool = 1014,
-	Prop_Firmware_ManualUpdate_Bool = 1015,
-	Prop_Firmware_ManualUpdateURL_String = 1016,
-	Prop_HardwareRevision_Uint64 = 1017,
-	Prop_FirmwareVersion_Uint64 = 1018,
-	Prop_FPGAVersion_Uint64 = 1019,
-	Prop_VRCVersion_Uint64 = 1020,
-	Prop_RadioVersion_Uint64 = 1021,
-	Prop_DongleVersion_Uint64 = 1022,
-	Prop_BlockServerShutdown_Bool = 1023,
-	Prop_CanUnifyCoordinateSystemWithHmd_Bool = 1024,
-	Prop_ContainsProximitySensor_Bool = 1025,
-	Prop_DeviceProvidesBatteryStatus_Bool = 1026,
-	Prop_DeviceCanPowerOff_Bool = 1027,
-	Prop_Firmware_ProgrammingTarget_String = 1028,
-	Prop_DeviceClass_Int32 = 1029,
-	Prop_HasCamera_Bool = 1030,
-	Prop_DriverVersion_String = 1031,
-	Prop_Firmware_ForceUpdateRequired_Bool = 1032,
-	Prop_ViveSystemButtonFixRequired_Bool = 1033,
-	Prop_ReportsTimeSinceVSync_Bool = 2000,
-	Prop_SecondsFromVsyncToPhotons_Float = 2001,
-	Prop_DisplayFrequency_Float = 2002,
-	Prop_UserIpdMeters_Float = 2003,
-	Prop_CurrentUniverseId_Uint64 = 2004,
-	Prop_PreviousUniverseId_Uint64 = 2005,
-	Prop_DisplayFirmwareVersion_Uint64 = 2006,
-	Prop_IsOnDesktop_Bool = 2007,
-	Prop_DisplayMCType_Int32 = 2008,
-	Prop_DisplayMCOffset_Float = 2009,
-	Prop_DisplayMCScale_Float = 2010,
-	Prop_EdidVendorID_Int32 = 2011,
-	Prop_DisplayMCImageLeft_String = 2012,
-	Prop_DisplayMCImageRight_String = 2013,
-	Prop_DisplayGCBlackClamp_Float = 2014,
-	Prop_EdidProductID_Int32 = 2015,
-	Prop_CameraToHeadTransform_Matrix34 = 2016,
-	Prop_DisplayGCType_Int32 = 2017,
-	Prop_DisplayGCOffset_Float = 2018,
-	Prop_DisplayGCScale_Float = 2019,
-	Prop_DisplayGCPrescale_Float = 2020,
-	Prop_DisplayGCImage_String = 2021,
-	Prop_LensCenterLeftU_Float = 2022,
-	Prop_LensCenterLeftV_Float = 2023,
-	Prop_LensCenterRightU_Float = 2024,
-	Prop_LensCenterRightV_Float = 2025,
-	Prop_UserHeadToEyeDepthMeters_Float = 2026,
-	Prop_CameraFirmwareVersion_Uint64 = 2027,
-	Prop_CameraFirmwareDescription_String = 2028,
-	Prop_DisplayFPGAVersion_Uint64 = 2029,
-	Prop_DisplayBootloaderVersion_Uint64 = 2030,
-	Prop_DisplayHardwareVersion_Uint64 = 2031,
-	Prop_AudioFirmwareVersion_Uint64 = 2032,
-	Prop_CameraCompatibilityMode_Int32 = 2033,
-	Prop_ScreenshotHorizontalFieldOfViewDegrees_Float = 2034,
-	Prop_ScreenshotVerticalFieldOfViewDegrees_Float = 2035,
-	Prop_DisplaySuppressed_Bool = 2036,
-	Prop_DisplayAllowNightMode_Bool = 2037,
-	Prop_AttachedDeviceId_String = 3000,
-	Prop_SupportedButtons_Uint64 = 3001,
-	Prop_Axis0Type_Int32 = 3002,
-	Prop_Axis1Type_Int32 = 3003,
-	Prop_Axis2Type_Int32 = 3004,
-	Prop_Axis3Type_Int32 = 3005,
-	Prop_Axis4Type_Int32 = 3006,
-	Prop_ControllerRoleHint_Int32 = 3007,
-	Prop_FieldOfViewLeftDegrees_Float = 4000,
-	Prop_FieldOfViewRightDegrees_Float = 4001,
-	Prop_FieldOfViewTopDegrees_Float = 4002,
-	Prop_FieldOfViewBottomDegrees_Float = 4003,
-	Prop_TrackingRangeMinimumMeters_Float = 4004,
-	Prop_TrackingRangeMaximumMeters_Float = 4005,
-	Prop_ModeLabel_String = 4006,
-	Prop_IconPathName_String = 5000,
-	Prop_NamedIconPathDeviceOff_String = 5001,
-	Prop_NamedIconPathDeviceSearching_String = 5002,
-	Prop_NamedIconPathDeviceSearchingAlert_String = 5003,
-	Prop_NamedIconPathDeviceReady_String = 5004,
-	Prop_NamedIconPathDeviceReadyAlert_String = 5005,
-	Prop_NamedIconPathDeviceNotReady_String = 5006,
-	Prop_NamedIconPathDeviceStandby_String = 5007,
-	Prop_NamedIconPathDeviceAlertLow_String = 5008,
-	Prop_VendorSpecific_Reserved_Start = 10000,
-	Prop_VendorSpecific_Reserved_End = 10999,
-}
-internal enum ETrackedPropertyError
-{
-	TrackedProp_Success = 0,
-	TrackedProp_WrongDataType = 1,
-	TrackedProp_WrongDeviceClass = 2,
-	TrackedProp_BufferTooSmall = 3,
-	TrackedProp_UnknownProperty = 4,
-	TrackedProp_InvalidDevice = 5,
-	TrackedProp_CouldNotContactServer = 6,
-	TrackedProp_ValueNotProvidedByDevice = 7,
-	TrackedProp_StringExceedsMaximumLength = 8,
-	TrackedProp_NotYetAvailable = 9,
-}
-internal enum EVRSubmitFlags
-{
-	Submit_Default = 0,
-	Submit_LensDistortionAlreadyApplied = 1,
-	Submit_GlRenderBuffer = 2,
-	Submit_VulkanTexture = 4,
-}
-internal enum EVRState
-{
-	Undefined = -1,
-	Off = 0,
-	Searching = 1,
-	Searching_Alert = 2,
-	Ready = 3,
-	Ready_Alert = 4,
-	NotReady = 5,
-	Standby = 6,
-	Ready_Alert_Low = 7,
-}
-internal enum EVREventType
-{
-	VREvent_None = 0,
-	VREvent_TrackedDeviceActivated = 100,
-	VREvent_TrackedDeviceDeactivated = 101,
-	VREvent_TrackedDeviceUpdated = 102,
-	VREvent_TrackedDeviceUserInteractionStarted = 103,
-	VREvent_TrackedDeviceUserInteractionEnded = 104,
-	VREvent_IpdChanged = 105,
-	VREvent_EnterStandbyMode = 106,
-	VREvent_LeaveStandbyMode = 107,
-	VREvent_TrackedDeviceRoleChanged = 108,
-	VREvent_WatchdogWakeUpRequested = 109,
-	VREvent_LensDistortionChanged = 110,
-	VREvent_ButtonPress = 200,
-	VREvent_ButtonUnpress = 201,
-	VREvent_ButtonTouch = 202,
-	VREvent_ButtonUntouch = 203,
-	VREvent_MouseMove = 300,
-	VREvent_MouseButtonDown = 301,
-	VREvent_MouseButtonUp = 302,
-	VREvent_FocusEnter = 303,
-	VREvent_FocusLeave = 304,
-	VREvent_Scroll = 305,
-	VREvent_TouchPadMove = 306,
-	VREvent_OverlayFocusChanged = 307,
-	VREvent_InputFocusCaptured = 400,
-	VREvent_InputFocusReleased = 401,
-	VREvent_SceneFocusLost = 402,
-	VREvent_SceneFocusGained = 403,
-	VREvent_SceneApplicationChanged = 404,
-	VREvent_SceneFocusChanged = 405,
-	VREvent_InputFocusChanged = 406,
-	VREvent_SceneApplicationSecondaryRenderingStarted = 407,
-	VREvent_HideRenderModels = 410,
-	VREvent_ShowRenderModels = 411,
-	VREvent_OverlayShown = 500,
-	VREvent_OverlayHidden = 501,
-	VREvent_DashboardActivated = 502,
-	VREvent_DashboardDeactivated = 503,
-	VREvent_DashboardThumbSelected = 504,
-	VREvent_DashboardRequested = 505,
-	VREvent_ResetDashboard = 506,
-	VREvent_RenderToast = 507,
-	VREvent_ImageLoaded = 508,
-	VREvent_ShowKeyboard = 509,
-	VREvent_HideKeyboard = 510,
-	VREvent_OverlayGamepadFocusGained = 511,
-	VREvent_OverlayGamepadFocusLost = 512,
-	VREvent_OverlaySharedTextureChanged = 513,
-	VREvent_DashboardGuideButtonDown = 514,
-	VREvent_DashboardGuideButtonUp = 515,
-	VREvent_ScreenshotTriggered = 516,
-	VREvent_ImageFailed = 517,
-	VREvent_DashboardOverlayCreated = 518,
-	VREvent_RequestScreenshot = 520,
-	VREvent_ScreenshotTaken = 521,
-	VREvent_ScreenshotFailed = 522,
-	VREvent_SubmitScreenshotToDashboard = 523,
-	VREvent_ScreenshotProgressToDashboard = 524,
-	VREvent_Notification_Shown = 600,
-	VREvent_Notification_Hidden = 601,
-	VREvent_Notification_BeginInteraction = 602,
-	VREvent_Notification_Destroyed = 603,
-	VREvent_Quit = 700,
-	VREvent_ProcessQuit = 701,
-	VREvent_QuitAborted_UserPrompt = 702,
-	VREvent_QuitAcknowledged = 703,
-	VREvent_DriverRequestedQuit = 704,
-	VREvent_ChaperoneDataHasChanged = 800,
-	VREvent_ChaperoneUniverseHasChanged = 801,
-	VREvent_ChaperoneTempDataHasChanged = 802,
-	VREvent_ChaperoneSettingsHaveChanged = 803,
-	VREvent_SeatedZeroPoseReset = 804,
-	VREvent_AudioSettingsHaveChanged = 820,
-	VREvent_BackgroundSettingHasChanged = 850,
-	VREvent_CameraSettingsHaveChanged = 851,
-	VREvent_ReprojectionSettingHasChanged = 852,
-	VREvent_ModelSkinSettingsHaveChanged = 853,
-	VREvent_EnvironmentSettingsHaveChanged = 854,
-	VREvent_PowerSettingsHaveChanged = 855,
-	VREvent_StatusUpdate = 900,
-	VREvent_MCImageUpdated = 1000,
-	VREvent_FirmwareUpdateStarted = 1100,
-	VREvent_FirmwareUpdateFinished = 1101,
-	VREvent_KeyboardClosed = 1200,
-	VREvent_KeyboardCharInput = 1201,
-	VREvent_KeyboardDone = 1202,
-	VREvent_ApplicationTransitionStarted = 1300,
-	VREvent_ApplicationTransitionAborted = 1301,
-	VREvent_ApplicationTransitionNewAppStarted = 1302,
-	VREvent_ApplicationListUpdated = 1303,
-	VREvent_ApplicationMimeTypeLoad = 1304,
-	VREvent_Compositor_MirrorWindowShown = 1400,
-	VREvent_Compositor_MirrorWindowHidden = 1401,
-	VREvent_Compositor_ChaperoneBoundsShown = 1410,
-	VREvent_Compositor_ChaperoneBoundsHidden = 1411,
-	VREvent_TrackedCamera_StartVideoStream = 1500,
-	VREvent_TrackedCamera_StopVideoStream = 1501,
-	VREvent_TrackedCamera_PauseVideoStream = 1502,
-	VREvent_TrackedCamera_ResumeVideoStream = 1503,
-	VREvent_TrackedCamera_EditingSurface = 1550,
-	VREvent_PerformanceTest_EnableCapture = 1600,
-	VREvent_PerformanceTest_DisableCapture = 1601,
-	VREvent_PerformanceTest_FidelityLevel = 1602,
-	VREvent_VendorSpecific_Reserved_Start = 10000,
-	VREvent_VendorSpecific_Reserved_End = 19999,
-}
-internal enum EDeviceActivityLevel
-{
-	k_EDeviceActivityLevel_Unknown = -1,
-	k_EDeviceActivityLevel_Idle = 0,
-	k_EDeviceActivityLevel_UserInteraction = 1,
-	k_EDeviceActivityLevel_UserInteraction_Timeout = 2,
-	k_EDeviceActivityLevel_Standby = 3,
-}
-internal enum EVRButtonId
-{
-	k_EButton_System = 0,
-	k_EButton_ApplicationMenu = 1,
-	k_EButton_Grip = 2,
-	k_EButton_DPad_Left = 3,
-	k_EButton_DPad_Up = 4,
-	k_EButton_DPad_Right = 5,
-	k_EButton_DPad_Down = 6,
-	k_EButton_A = 7,
-	k_EButton_ProximitySensor = 31,
-	k_EButton_Axis0 = 32,
-	k_EButton_Axis1 = 33,
-	k_EButton_Axis2 = 34,
-	k_EButton_Axis3 = 35,
-	k_EButton_Axis4 = 36,
-	k_EButton_SteamVR_Touchpad = 32,
-	k_EButton_SteamVR_Trigger = 33,
-	k_EButton_Dashboard_Back = 2,
-	k_EButton_Max = 64,
-}
-internal enum EVRMouseButton
-{
-	Left = 1,
-	Right = 2,
-	Middle = 4,
-}
-internal enum EHiddenAreaMeshType
-{
-	k_eHiddenAreaMesh_Standard = 0,
-	k_eHiddenAreaMesh_Inverse = 1,
-	k_eHiddenAreaMesh_LineLoop = 2,
-}
-internal enum EVRControllerAxisType
-{
-	k_eControllerAxis_None = 0,
-	k_eControllerAxis_TrackPad = 1,
-	k_eControllerAxis_Joystick = 2,
-	k_eControllerAxis_Trigger = 3,
-}
-internal enum EVRControllerEventOutputType
-{
-	ControllerEventOutput_OSEvents = 0,
-	ControllerEventOutput_VREvents = 1,
-}
-internal enum ECollisionBoundsStyle
-{
-	COLLISION_BOUNDS_STYLE_BEGINNER = 0,
-	COLLISION_BOUNDS_STYLE_INTERMEDIATE = 1,
-	COLLISION_BOUNDS_STYLE_SQUARES = 2,
-	COLLISION_BOUNDS_STYLE_ADVANCED = 3,
-	COLLISION_BOUNDS_STYLE_NONE = 4,
-	COLLISION_BOUNDS_STYLE_COUNT = 5,
-}
-internal enum EVROverlayError
-{
-	None = 0,
-	UnknownOverlay = 10,
-	InvalidHandle = 11,
-	PermissionDenied = 12,
-	OverlayLimitExceeded = 13,
-	WrongVisibilityType = 14,
-	KeyTooLong = 15,
-	NameTooLong = 16,
-	KeyInUse = 17,
-	WrongTransformType = 18,
-	InvalidTrackedDevice = 19,
-	InvalidParameter = 20,
-	ThumbnailCantBeDestroyed = 21,
-	ArrayTooSmall = 22,
-	RequestFailed = 23,
-	InvalidTexture = 24,
-	UnableToLoadFile = 25,
-	KeyboardAlreadyInUse = 26,
-	NoNeighbor = 27,
-	TooManyMaskPrimitives = 29,
-	BadMaskPrimitive = 30,
-}
-internal enum EVRApplicationType
-{
-	VRApplication_Other = 0,
-	VRApplication_Scene = 1,
-	VRApplication_Overlay = 2,
-	VRApplication_Background = 3,
-	VRApplication_Utility = 4,
-	VRApplication_VRMonitor = 5,
-	VRApplication_SteamWatchdog = 6,
-	VRApplication_Max = 7,
-}
-internal enum EVRFirmwareError
-{
-	None = 0,
-	Success = 1,
-	Fail = 2,
-}
-internal enum EVRNotificationError
-{
-	OK = 0,
-	InvalidNotificationId = 100,
-	NotificationQueueFull = 101,
-	InvalidOverlayHandle = 102,
-	SystemWithUserValueAlreadyExists = 103,
-}
-internal enum EVRInitError
-{
-	None = 0,
-	Unknown = 1,
-	Init_InstallationNotFound = 100,
-	Init_InstallationCorrupt = 101,
-	Init_VRClientDLLNotFound = 102,
-	Init_FileNotFound = 103,
-	Init_FactoryNotFound = 104,
-	Init_InterfaceNotFound = 105,
-	Init_InvalidInterface = 106,
-	Init_UserConfigDirectoryInvalid = 107,
-	Init_HmdNotFound = 108,
-	Init_NotInitialized = 109,
-	Init_PathRegistryNotFound = 110,
-	Init_NoConfigPath = 111,
-	Init_NoLogPath = 112,
-	Init_PathRegistryNotWritable = 113,
-	Init_AppInfoInitFailed = 114,
-	Init_Retry = 115,
-	Init_InitCanceledByUser = 116,
-	Init_AnotherAppLaunching = 117,
-	Init_SettingsInitFailed = 118,
-	Init_ShuttingDown = 119,
-	Init_TooManyObjects = 120,
-	Init_NoServerForBackgroundApp = 121,
-	Init_NotSupportedWithCompositor = 122,
-	Init_NotAvailableToUtilityApps = 123,
-	Init_Internal = 124,
-	Init_HmdDriverIdIsNone = 125,
-	Init_HmdNotFoundPresenceFailed = 126,
-	Init_VRMonitorNotFound = 127,
-	Init_VRMonitorStartupFailed = 128,
-	Init_LowPowerWatchdogNotSupported = 129,
-	Init_InvalidApplicationType = 130,
-	Init_NotAvailableToWatchdogApps = 131,
-	Init_WatchdogDisabledInSettings = 132,
-	Driver_Failed = 200,
-	Driver_Unknown = 201,
-	Driver_HmdUnknown = 202,
-	Driver_NotLoaded = 203,
-	Driver_RuntimeOutOfDate = 204,
-	Driver_HmdInUse = 205,
-	Driver_NotCalibrated = 206,
-	Driver_CalibrationInvalid = 207,
-	Driver_HmdDisplayNotFound = 208,
-	Driver_TrackedDeviceInterfaceUnknown = 209,
-	Driver_HmdDriverIdOutOfBounds = 211,
-	Driver_HmdDisplayMirrored = 212,
-	IPC_ServerInitFailed = 300,
-	IPC_ConnectFailed = 301,
-	IPC_SharedStateInitFailed = 302,
-	IPC_CompositorInitFailed = 303,
-	IPC_MutexInitFailed = 304,
-	IPC_Failed = 305,
-	IPC_CompositorConnectFailed = 306,
-	IPC_CompositorInvalidConnectResponse = 307,
-	IPC_ConnectFailedAfterMultipleAttempts = 308,
-	Compositor_Failed = 400,
-	Compositor_D3D11HardwareRequired = 401,
-	Compositor_FirmwareRequiresUpdate = 402,
-	Compositor_OverlayInitFailed = 403,
-	Compositor_ScreenshotsInitFailed = 404,
-	VendorSpecific_UnableToConnectToOculusRuntime = 1000,
-	VendorSpecific_HmdFound_CantOpenDevice = 1101,
-	VendorSpecific_HmdFound_UnableToRequestConfigStart = 1102,
-	VendorSpecific_HmdFound_NoStoredConfig = 1103,
-	VendorSpecific_HmdFound_ConfigTooBig = 1104,
-	VendorSpecific_HmdFound_ConfigTooSmall = 1105,
-	VendorSpecific_HmdFound_UnableToInitZLib = 1106,
-	VendorSpecific_HmdFound_CantReadFirmwareVersion = 1107,
-	VendorSpecific_HmdFound_UnableToSendUserDataStart = 1108,
-	VendorSpecific_HmdFound_UnableToGetUserDataStart = 1109,
-	VendorSpecific_HmdFound_UnableToGetUserDataNext = 1110,
-	VendorSpecific_HmdFound_UserDataAddressRange = 1111,
-	VendorSpecific_HmdFound_UserDataError = 1112,
-	VendorSpecific_HmdFound_ConfigFailedSanityCheck = 1113,
-	Steam_SteamInstallationNotFound = 2000,
-}
-internal enum EVRScreenshotType
-{
-	None = 0,
-	Mono = 1,
-	Stereo = 2,
-	Cubemap = 3,
-	MonoPanorama = 4,
-	StereoPanorama = 5,
-}
-internal enum EVRScreenshotPropertyFilenames
-{
-	Preview = 0,
-	VR = 1,
-}
-internal enum EVRTrackedCameraError
-{
-	None = 0,
-	OperationFailed = 100,
-	InvalidHandle = 101,
-	InvalidFrameHeaderVersion = 102,
-	OutOfHandles = 103,
-	IPCFailure = 104,
-	NotSupportedForThisDevice = 105,
-	SharedMemoryFailure = 106,
-	FrameBufferingFailure = 107,
-	StreamSetupFailure = 108,
-	InvalidGLTextureId = 109,
-	InvalidSharedTextureHandle = 110,
-	FailedToGetGLTextureId = 111,
-	SharedTextureFailure = 112,
-	NoFrameAvailable = 113,
-	InvalidArgument = 114,
-	InvalidFrameBufferSize = 115,
-}
-internal enum EVRTrackedCameraFrameType
-{
-	Distorted = 0,
-	Undistorted = 1,
-	MaximumUndistorted = 2,
-	MAX_CAMERA_FRAME_TYPES = 3,
-}
-internal enum EVRApplicationError
-{
-	None = 0,
-	AppKeyAlreadyExists = 100,
-	NoManifest = 101,
-	NoApplication = 102,
-	InvalidIndex = 103,
-	UnknownApplication = 104,
-	IPCFailed = 105,
-	ApplicationAlreadyRunning = 106,
-	InvalidManifest = 107,
-	InvalidApplication = 108,
-	LaunchFailed = 109,
-	ApplicationAlreadyStarting = 110,
-	LaunchInProgress = 111,
-	OldApplicationQuitting = 112,
-	TransitionAborted = 113,
-	IsTemplate = 114,
-	BufferTooSmall = 200,
-	PropertyNotSet = 201,
-	UnknownProperty = 202,
-	InvalidParameter = 203,
-}
-internal enum EVRApplicationProperty
-{
-	Name_String = 0,
-	LaunchType_String = 11,
-	WorkingDirectory_String = 12,
-	BinaryPath_String = 13,
-	Arguments_String = 14,
-	URL_String = 15,
-	Description_String = 50,
-	NewsURL_String = 51,
-	ImagePath_String = 52,
-	Source_String = 53,
-	IsDashboardOverlay_Bool = 60,
-	IsTemplate_Bool = 61,
-	IsInstanced_Bool = 62,
-	LastLaunchTime_Uint64 = 70,
-}
-internal enum EVRApplicationTransitionState
-{
-	VRApplicationTransition_None = 0,
-	VRApplicationTransition_OldAppQuitSent = 10,
-	VRApplicationTransition_WaitingForExternalLaunch = 11,
-	VRApplicationTransition_NewAppLaunched = 20,
-}
-internal enum ChaperoneCalibrationState
-{
-	OK = 1,
-	Warning = 100,
-	Warning_BaseStationMayHaveMoved = 101,
-	Warning_BaseStationRemoved = 102,
-	Warning_SeatedBoundsInvalid = 103,
-	Error = 200,
-	Error_BaseStationUninitalized = 201,
-	Error_BaseStationConflict = 202,
-	Error_PlayAreaInvalid = 203,
-	Error_CollisionBoundsInvalid = 204,
-}
-internal enum EChaperoneConfigFile
-{
-	Live = 1,
-	Temp = 2,
-}
-internal enum EChaperoneImportFlags
-{
-	EChaperoneImport_BoundsOnly = 1,
-}
-internal enum EVRCompositorError
-{
-	None = 0,
-	RequestFailed = 1,
-	IncompatibleVersion = 100,
-	DoNotHaveFocus = 101,
-	InvalidTexture = 102,
-	IsNotSceneApplication = 103,
-	TextureIsOnWrongDevice = 104,
-	TextureUsesUnsupportedFormat = 105,
-	SharedTexturesNotSupported = 106,
-	IndexOutOfRange = 107,
-	AlreadySubmitted = 108,
-}
-internal enum VROverlayInputMethod
-{
-	None = 0,
-	Mouse = 1,
-}
-internal enum VROverlayTransformType
-{
-	VROverlayTransform_Absolute = 0,
-	VROverlayTransform_TrackedDeviceRelative = 1,
-	VROverlayTransform_SystemOverlay = 2,
-	VROverlayTransform_TrackedComponent = 3,
-}
-internal enum VROverlayFlags
-{
-	None = 0,
-	Curved = 1,
-	RGSS4X = 2,
-	NoDashboardTab = 3,
-	AcceptsGamepadEvents = 4,
-	ShowGamepadFocus = 5,
-	SendVRScrollEvents = 6,
-	SendVRTouchpadEvents = 7,
-	ShowTouchPadScrollWheel = 8,
-	TransferOwnershipToInternalProcess = 9,
-	SideBySide_Parallel = 10,
-	SideBySide_Crossed = 11,
-	Panorama = 12,
-	StereoPanorama = 13,
-	SortWithNonSceneOverlays = 14,
-}
-internal enum EGamepadTextInputMode
-{
-	k_EGamepadTextInputModeNormal = 0,
-	k_EGamepadTextInputModePassword = 1,
-	k_EGamepadTextInputModeSubmit = 2,
-}
-internal enum EGamepadTextInputLineMode
-{
-	k_EGamepadTextInputLineModeSingleLine = 0,
-	k_EGamepadTextInputLineModeMultipleLines = 1,
-}
-internal enum EOverlayDirection
-{
-	Up = 0,
-	Down = 1,
-	Left = 2,
-	Right = 3,
-	Count = 4,
-}
-internal enum EVROverlayIntersectionMaskPrimitiveType
-{
-	OverlayIntersectionPrimitiveType_Rectangle = 0,
-	OverlayIntersectionPrimitiveType_Circle = 1,
-}
-internal enum EVRRenderModelError
-{
-	None = 0,
-	Loading = 100,
-	NotSupported = 200,
-	InvalidArg = 300,
-	InvalidModel = 301,
-	NoShapes = 302,
-	MultipleShapes = 303,
-	TooManyVertices = 304,
-	MultipleTextures = 305,
-	BufferTooSmall = 306,
-	NotEnoughNormals = 307,
-	NotEnoughTexCoords = 308,
-	InvalidTexture = 400,
-}
-internal enum EVRComponentProperty
-{
-	IsStatic = 1,
-	IsVisible = 2,
-	IsTouched = 4,
-	IsPressed = 8,
-	IsScrolled = 16,
-}
-internal enum EVRNotificationType
-{
-	Transient = 0,
-	Persistent = 1,
-	Transient_SystemWithUserValue = 2,
-}
-internal enum EVRNotificationStyle
-{
-	None = 0,
-	Application = 100,
-	Contact_Disabled = 200,
-	Contact_Enabled = 201,
-	Contact_Active = 202,
-}
-internal enum EVRSettingsError
-{
-	None = 0,
-	IPCFailed = 1,
-	WriteFailed = 2,
-	ReadFailed = 3,
-	JsonParseFailed = 4,
-	UnsetSettingHasNoDefault = 5,
-}
-internal enum EVRScreenshotError
-{
-	None = 0,
-	RequestFailed = 1,
-	IncompatibleVersion = 100,
-	NotFound = 101,
-	BufferTooSmall = 102,
-	ScreenshotAlreadyInProgress = 108,
-}
-
-[StructLayout(LayoutKind.Explicit)] internal struct VREvent_Data_t
-{
-	[FieldOffset(0)] internal VREvent_Reserved_t reserved;
-	[FieldOffset(0)] internal VREvent_Controller_t controller;
-	[FieldOffset(0)] internal VREvent_Mouse_t mouse;
-	[FieldOffset(0)] internal VREvent_Scroll_t scroll;
-	[FieldOffset(0)] internal VREvent_Process_t process;
-	[FieldOffset(0)] internal VREvent_Notification_t notification;
-	[FieldOffset(0)] internal VREvent_Overlay_t overlay;
-	[FieldOffset(0)] internal VREvent_Status_t status;
-	[FieldOffset(0)] internal VREvent_Ipd_t ipd;
-	[FieldOffset(0)] internal VREvent_Chaperone_t chaperone;
-	[FieldOffset(0)] internal VREvent_PerformanceTest_t performanceTest;
-	[FieldOffset(0)] internal VREvent_TouchPadMove_t touchPadMove;
-	[FieldOffset(0)] internal VREvent_SeatedZeroPoseReset_t seatedZeroPoseReset;
-	[FieldOffset(0)] internal VREvent_Screenshot_t screenshot;
-	[FieldOffset(0)] internal VREvent_Keyboard_t keyboard; // This has to be at the end due to a mono bug
-}
-
-
-[StructLayout(LayoutKind.Explicit)] internal struct VROverlayIntersectionMaskPrimitive_Data_t
-{
-	[FieldOffset(0)] internal IntersectionMaskRectangle_t m_Rectangle;
-	[FieldOffset(0)] internal IntersectionMaskCircle_t m_Circle;
-}
-
-[StructLayout(LayoutKind.Sequential)] internal struct HmdMatrix34_t
-{
-	internal float m0; //float[3][4]
-	internal float m1;
-	internal float m2;
-	internal float m3;
-	internal float m4;
-	internal float m5;
-	internal float m6;
-	internal float m7;
-	internal float m8;
-	internal float m9;
-	internal float m10;
-	internal float m11;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdMatrix44_t
-{
-	internal float m0; //float[4][4]
-	internal float m1;
-	internal float m2;
-	internal float m3;
-	internal float m4;
-	internal float m5;
-	internal float m6;
-	internal float m7;
-	internal float m8;
-	internal float m9;
-	internal float m10;
-	internal float m11;
-	internal float m12;
-	internal float m13;
-	internal float m14;
-	internal float m15;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdVector3_t
-{
-	internal float v0; //float[3]
-	internal float v1;
-	internal float v2;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdVector4_t
-{
-	internal float v0; //float[4]
-	internal float v1;
-	internal float v2;
-	internal float v3;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdVector3d_t
-{
-	internal double v0; //double[3]
-	internal double v1;
-	internal double v2;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdVector2_t
-{
-	internal float v0; //float[2]
-	internal float v1;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdQuaternion_t
-{
-	internal double w;
-	internal double x;
-	internal double y;
-	internal double z;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdColor_t
-{
-	internal float r;
-	internal float g;
-	internal float b;
-	internal float a;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdQuad_t
-{
-	internal HmdVector3_t vCorners0; //HmdVector3_t[4]
-	internal HmdVector3_t vCorners1;
-	internal HmdVector3_t vCorners2;
-	internal HmdVector3_t vCorners3;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HmdRect2_t
-{
-	internal HmdVector2_t vTopLeft;
-	internal HmdVector2_t vBottomRight;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct DistortionCoordinates_t
-{
-	internal float rfRed0; //float[2]
-	internal float rfRed1;
-	internal float rfGreen0; //float[2]
-	internal float rfGreen1;
-	internal float rfBlue0; //float[2]
-	internal float rfBlue1;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct Texture_t
-{
-	internal IntPtr handle; // void *
-	internal EGraphicsAPIConvention eType;
-	internal EColorSpace eColorSpace;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct TrackedDevicePose_t
-{
-	internal HmdMatrix34_t mDeviceToAbsoluteTracking;
-	internal HmdVector3_t vVelocity;
-	internal HmdVector3_t vAngularVelocity;
-	internal ETrackingResult eTrackingResult;
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool bPoseIsValid;
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool bDeviceIsConnected;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VRTextureBounds_t
-{
-	internal float uMin;
-	internal float vMin;
-	internal float uMax;
-	internal float vMax;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VulkanData_t
-{
-	internal ulong m_nImage;
-	internal IntPtr m_pDevice; // struct VkDevice_T *
-	internal IntPtr m_pPhysicalDevice; // struct VkPhysicalDevice_T *
-	internal IntPtr m_pInstance; // struct VkInstance_T *
-	internal IntPtr m_pQueue; // struct VkQueue_T *
-	internal uint m_nQueueFamilyIndex;
-	internal uint m_nWidth;
-	internal uint m_nHeight;
-	internal uint m_nFormat;
-	internal uint m_nSampleCount;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Controller_t
-{
-	internal uint button;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Mouse_t
-{
-	internal float x;
-	internal float y;
-	internal uint button;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Scroll_t
-{
-	internal float xdelta;
-	internal float ydelta;
-	internal uint repeatCount;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_TouchPadMove_t
-{
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool bFingerDown;
-	internal float flSecondsFingerDown;
-	internal float fValueXFirst;
-	internal float fValueYFirst;
-	internal float fValueXRaw;
-	internal float fValueYRaw;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Notification_t
-{
-	internal ulong ulUserValue;
-	internal uint notificationId;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Process_t
-{
-	internal uint pid;
-	internal uint oldPid;
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool bForced;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Overlay_t
-{
-	internal ulong overlayHandle;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Status_t
-{
-	internal uint statusState;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Keyboard_t
-{
-	internal byte cNewInput0,cNewInput1,cNewInput2,cNewInput3,cNewInput4,cNewInput5,cNewInput6,cNewInput7;
-	internal ulong uUserValue;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Ipd_t
-{
-	internal float ipdMeters;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Chaperone_t
-{
-	internal ulong m_nPreviousUniverse;
-	internal ulong m_nCurrentUniverse;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Reserved_t
-{
-	internal ulong reserved0;
-	internal ulong reserved1;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_PerformanceTest_t
-{
-	internal uint m_nFidelityLevel;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_SeatedZeroPoseReset_t
-{
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool bResetBySystemMenu;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_Screenshot_t
-{
-	internal uint handle;
-	internal uint type;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_ScreenshotProgress_t
-{
-	internal float progress;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_ApplicationLaunch_t
-{
-	internal uint pid;
-	internal uint unArgsHandle;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_EditingCameraSurface_t
-{
-	internal ulong overlayHandle;
-	internal uint nVisualMode;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VREvent_t
-{
-	internal uint eventType;
-	internal uint trackedDeviceIndex;
-	internal float eventAgeSeconds;
-	internal VREvent_Data_t data;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct HiddenAreaMesh_t
-{
-	internal IntPtr pVertexData; // const struct vr::HmdVector2_t *
-	internal uint unTriangleCount;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VRControllerAxis_t
-{
-	internal float x;
-	internal float y;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VRControllerState_t
-{
-	internal uint unPacketNum;
-	internal ulong ulButtonPressed;
-	internal ulong ulButtonTouched;
-	internal VRControllerAxis_t rAxis0; //VRControllerAxis_t[5]
-	internal VRControllerAxis_t rAxis1;
-	internal VRControllerAxis_t rAxis2;
-	internal VRControllerAxis_t rAxis3;
-	internal VRControllerAxis_t rAxis4;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct Compositor_OverlaySettings
-{
-	internal uint size;
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool curved;
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool antialias;
-	internal float scale;
-	internal float distance;
-	internal float alpha;
-	internal float uOffset;
-	internal float vOffset;
-	internal float uScale;
-	internal float vScale;
-	internal float gridDivs;
-	internal float gridWidth;
-	internal float gridScale;
-	internal HmdMatrix44_t transform;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct CameraVideoStreamFrameHeader_t
-{
-	internal EVRTrackedCameraFrameType eFrameType;
-	internal uint nWidth;
-	internal uint nHeight;
-	internal uint nBytesPerPixel;
-	internal uint nFrameSequence;
-	internal TrackedDevicePose_t standingTrackedDevicePose;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct AppOverrideKeys_t
-{
-	internal IntPtr pchKey; // const char *
-	internal IntPtr pchValue; // const char *
-}
-[StructLayout(LayoutKind.Sequential)] internal struct Compositor_FrameTiming
-{
-	internal uint m_nSize;
-	internal uint m_nFrameIndex;
-	internal uint m_nNumFramePresents;
-	internal uint m_nNumMisPresented;
-	internal uint m_nNumDroppedFrames;
-	internal uint m_nReprojectionFlags;
-	internal double m_flSystemTimeInSeconds;
-	internal float m_flPreSubmitGpuMs;
-	internal float m_flPostSubmitGpuMs;
-	internal float m_flTotalRenderGpuMs;
-	internal float m_flCompositorRenderGpuMs;
-	internal float m_flCompositorRenderCpuMs;
-	internal float m_flCompositorIdleCpuMs;
-	internal float m_flClientFrameIntervalMs;
-	internal float m_flPresentCallCpuMs;
-	internal float m_flWaitForPresentCpuMs;
-	internal float m_flSubmitFrameMs;
-	internal float m_flWaitGetPosesCalledMs;
-	internal float m_flNewPosesReadyMs;
-	internal float m_flNewFrameReadyMs;
-	internal float m_flCompositorUpdateStartMs;
-	internal float m_flCompositorUpdateEndMs;
-	internal float m_flCompositorRenderStartMs;
-	internal TrackedDevicePose_t m_HmdPose;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct Compositor_CumulativeStats
-{
-	internal uint m_nPid;
-	internal uint m_nNumFramePresents;
-	internal uint m_nNumDroppedFrames;
-	internal uint m_nNumReprojectedFrames;
-	internal uint m_nNumFramePresentsOnStartup;
-	internal uint m_nNumDroppedFramesOnStartup;
-	internal uint m_nNumReprojectedFramesOnStartup;
-	internal uint m_nNumLoading;
-	internal uint m_nNumFramePresentsLoading;
-	internal uint m_nNumDroppedFramesLoading;
-	internal uint m_nNumReprojectedFramesLoading;
-	internal uint m_nNumTimedOut;
-	internal uint m_nNumFramePresentsTimedOut;
-	internal uint m_nNumDroppedFramesTimedOut;
-	internal uint m_nNumReprojectedFramesTimedOut;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VROverlayIntersectionParams_t
-{
-	internal HmdVector3_t vSource;
-	internal HmdVector3_t vDirection;
-	internal ETrackingUniverseOrigin eOrigin;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VROverlayIntersectionResults_t
-{
-	internal HmdVector3_t vPoint;
-	internal HmdVector3_t vNormal;
-	internal HmdVector2_t vUVs;
-	internal float fDistance;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct IntersectionMaskRectangle_t
-{
-	internal float m_flTopLeftX;
-	internal float m_flTopLeftY;
-	internal float m_flWidth;
-	internal float m_flHeight;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct IntersectionMaskCircle_t
-{
-	internal float m_flCenterX;
-	internal float m_flCenterY;
-	internal float m_flRadius;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct VROverlayIntersectionMaskPrimitive_t
-{
-	internal EVROverlayIntersectionMaskPrimitiveType m_nPrimitiveType;
-	internal VROverlayIntersectionMaskPrimitive_Data_t m_Primitive;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct RenderModel_ComponentState_t
-{
-	internal HmdMatrix34_t mTrackingToComponentRenderModel;
-	internal HmdMatrix34_t mTrackingToComponentLocal;
-	internal uint uProperties;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct RenderModel_Vertex_t
-{
-	internal HmdVector3_t vPosition;
-	internal HmdVector3_t vNormal;
-	internal float rfTextureCoord0; //float[2]
-	internal float rfTextureCoord1;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct RenderModel_TextureMap_t
-{
-	internal char unWidth;
-	internal char unHeight;
-	internal IntPtr rubTextureMapData; // const uint8_t *
-}
-[StructLayout(LayoutKind.Sequential)] internal struct RenderModel_t
-{
-	internal IntPtr rVertexData; // const struct vr::RenderModel_Vertex_t *
-	internal uint unVertexCount;
-	internal IntPtr rIndexData; // const uint16_t *
-	internal uint unTriangleCount;
-	internal int diffuseTextureId;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct RenderModel_ControllerMode_State_t
-{
-	[MarshalAs(UnmanagedType.I1)]
-	internal bool bScrollWheelVisible;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct NotificationBitmap_t
-{
-	internal IntPtr m_pImageData; // void *
-	internal int m_nWidth;
-	internal int m_nHeight;
-	internal int m_nBytesPerPixel;
-}
-[StructLayout(LayoutKind.Sequential)] internal struct COpenVRContext
-{
-	internal IntPtr m_pVRSystem; // class vr::IVRSystem *
-	internal IntPtr m_pVRChaperone; // class vr::IVRChaperone *
-	internal IntPtr m_pVRChaperoneSetup; // class vr::IVRChaperoneSetup *
-	internal IntPtr m_pVRCompositor; // class vr::IVRCompositor *
-	internal IntPtr m_pVROverlay; // class vr::IVROverlay *
-	internal IntPtr m_pVRResources; // class vr::IVRResources *
-	internal IntPtr m_pVRRenderModels; // class vr::IVRRenderModels *
-	internal IntPtr m_pVRExtendedDisplay; // class vr::IVRExtendedDisplay *
-	internal IntPtr m_pVRSettings; // class vr::IVRSettings *
-	internal IntPtr m_pVRApplications; // class vr::IVRApplications *
-	internal IntPtr m_pVRTrackedCamera; // class vr::IVRTrackedCamera *
-	internal IntPtr m_pVRScreenshots; // class vr::IVRScreenshots *
-}
-
-internal class OpenVR
-{
-
-	internal static uint InitInternal(ref EVRInitError peError, EVRApplicationType eApplicationType)
-	{
-		return OpenVRInterop.InitInternal(ref peError, eApplicationType);
-	}
-
-	internal static void ShutdownInternal()
-	{
-		OpenVRInterop.ShutdownInternal();
-	}
-
-	internal static bool IsHmdPresent()
-	{
-		return OpenVRInterop.IsHmdPresent();
-	}
-
-	internal static bool IsRuntimeInstalled()
-	{
-		return OpenVRInterop.IsRuntimeInstalled();
-	}
-
-	internal static string GetStringForHmdError(EVRInitError error)
-	{
-		return Marshal.PtrToStringAnsi(OpenVRInterop.GetStringForHmdError(error));
-	}
-
-	internal static IntPtr GetGenericInterface(string pchInterfaceVersion, ref EVRInitError peError)
-	{
-		return OpenVRInterop.GetGenericInterface(pchInterfaceVersion, ref peError);
-	}
-
-	internal static bool IsInterfaceVersionValid(string pchInterfaceVersion)
-	{
-		return OpenVRInterop.IsInterfaceVersionValid(pchInterfaceVersion);
-	}
-
-	internal static uint GetInitToken()
-	{
-		return OpenVRInterop.GetInitToken();
-	}
-
-	internal const uint k_unMaxDriverDebugResponseSize = 32768;
-	internal const uint k_unTrackedDeviceIndex_Hmd = 0;
-	internal const uint k_unMaxTrackedDeviceCount = 16;
-	internal const uint k_unTrackedDeviceIndexOther = 4294967294;
-	internal const uint k_unTrackedDeviceIndexInvalid = 4294967295;
-	internal const uint k_unMaxPropertyStringSize = 32768;
-	internal const uint k_unControllerStateAxisCount = 5;
-	internal const ulong k_ulOverlayHandleInvalid = 0;
-	internal const uint k_unScreenshotHandleInvalid = 0;
-	internal const string IVRSystem_Version = "IVRSystem_014";
-	internal const string IVRExtendedDisplay_Version = "IVRExtendedDisplay_001";
-	internal const string IVRTrackedCamera_Version = "IVRTrackedCamera_003";
-	internal const uint k_unMaxApplicationKeyLength = 128;
-	internal const string k_pch_MimeType_HomeApp = "vr/home";
-	internal const string k_pch_MimeType_GameTheater = "vr/game_theater";
-	internal const string IVRApplications_Version = "IVRApplications_006";
-	internal const string IVRChaperone_Version = "IVRChaperone_003";
-	internal const string IVRChaperoneSetup_Version = "IVRChaperoneSetup_005";
-	internal const string IVRCompositor_Version = "IVRCompositor_018";
-	internal const uint k_unVROverlayMaxKeyLength = 128;
-	internal const uint k_unVROverlayMaxNameLength = 128;
-	internal const uint k_unMaxOverlayCount = 64;
-	internal const uint k_unMaxOverlayIntersectionMaskPrimitivesCount = 32;
-	internal const string IVROverlay_Version = "IVROverlay_013";
-	internal const string k_pch_Controller_Component_GDC2015 = "gdc2015";
-	internal const string k_pch_Controller_Component_Base = "base";
-	internal const string k_pch_Controller_Component_Tip = "tip";
-	internal const string k_pch_Controller_Component_HandGrip = "handgrip";
-	internal const string k_pch_Controller_Component_Status = "status";
-	internal const string IVRRenderModels_Version = "IVRRenderModels_005";
-	internal const uint k_unNotificationTextMaxSize = 256;
-	internal const string IVRNotifications_Version = "IVRNotifications_002";
-	internal const uint k_unMaxSettingsKeyLength = 128;
-	internal const string IVRSettings_Version = "IVRSettings_002";
-	internal const string k_pch_SteamVR_Section = "steamvr";
-	internal const string k_pch_SteamVR_RequireHmd_String = "requireHmd";
-	internal const string k_pch_SteamVR_ForcedDriverKey_String = "forcedDriver";
-	internal const string k_pch_SteamVR_ForcedHmdKey_String = "forcedHmd";
-	internal const string k_pch_SteamVR_DisplayDebug_Bool = "displayDebug";
-	internal const string k_pch_SteamVR_DebugProcessPipe_String = "debugProcessPipe";
-	internal const string k_pch_SteamVR_EnableDistortion_Bool = "enableDistortion";
-	internal const string k_pch_SteamVR_DisplayDebugX_Int32 = "displayDebugX";
-	internal const string k_pch_SteamVR_DisplayDebugY_Int32 = "displayDebugY";
-	internal const string k_pch_SteamVR_SendSystemButtonToAllApps_Bool = "sendSystemButtonToAllApps";
-	internal const string k_pch_SteamVR_LogLevel_Int32 = "loglevel";
-	internal const string k_pch_SteamVR_IPD_Float = "ipd";
-	internal const string k_pch_SteamVR_Background_String = "background";
-	internal const string k_pch_SteamVR_BackgroundUseDomeProjection_Bool = "backgroundUseDomeProjection";
-	internal const string k_pch_SteamVR_BackgroundCameraHeight_Float = "backgroundCameraHeight";
-	internal const string k_pch_SteamVR_BackgroundDomeRadius_Float = "backgroundDomeRadius";
-	internal const string k_pch_SteamVR_GridColor_String = "gridColor";
-	internal const string k_pch_SteamVR_PlayAreaColor_String = "playAreaColor";
-	internal const string k_pch_SteamVR_ShowStage_Bool = "showStage";
-	internal const string k_pch_SteamVR_ActivateMultipleDrivers_Bool = "activateMultipleDrivers";
-	internal const string k_pch_SteamVR_DirectMode_Bool = "directMode";
-	internal const string k_pch_SteamVR_DirectModeEdidVid_Int32 = "directModeEdidVid";
-	internal const string k_pch_SteamVR_DirectModeEdidPid_Int32 = "directModeEdidPid";
-	internal const string k_pch_SteamVR_UsingSpeakers_Bool = "usingSpeakers";
-	internal const string k_pch_SteamVR_SpeakersForwardYawOffsetDegrees_Float = "speakersForwardYawOffsetDegrees";
-	internal const string k_pch_SteamVR_BaseStationPowerManagement_Bool = "basestationPowerManagement";
-	internal const string k_pch_SteamVR_NeverKillProcesses_Bool = "neverKillProcesses";
-	internal const string k_pch_SteamVR_RenderTargetMultiplier_Float = "renderTargetMultiplier";
-	internal const string k_pch_SteamVR_AllowAsyncReprojection_Bool = "allowAsyncReprojection";
-	internal const string k_pch_SteamVR_AllowReprojection_Bool = "allowInterleavedReprojection";
-	internal const string k_pch_SteamVR_ForceReprojection_Bool = "forceReprojection";
-	internal const string k_pch_SteamVR_ForceFadeOnBadTracking_Bool = "forceFadeOnBadTracking";
-	internal const string k_pch_SteamVR_DefaultMirrorView_Int32 = "defaultMirrorView";
-	internal const string k_pch_SteamVR_ShowMirrorView_Bool = "showMirrorView";
-	internal const string k_pch_SteamVR_MirrorViewGeometry_String = "mirrorViewGeometry";
-	internal const string k_pch_SteamVR_StartMonitorFromAppLaunch = "startMonitorFromAppLaunch";
-	internal const string k_pch_SteamVR_EnableHomeApp = "enableHomeApp";
-	internal const string k_pch_SteamVR_SetInitialDefaultHomeApp = "setInitialDefaultHomeApp";
-	internal const string k_pch_SteamVR_CycleBackgroundImageTimeSec_Int32 = "CycleBackgroundImageTimeSec";
-	internal const string k_pch_SteamVR_RetailDemo_Bool = "retailDemo";
-	internal const string k_pch_SteamVR_IpdOffset_Float = "ipdOffset";
-	internal const string k_pch_Lighthouse_Section = "driver_lighthouse";
-	internal const string k_pch_Lighthouse_DisableIMU_Bool = "disableimu";
-	internal const string k_pch_Lighthouse_UseDisambiguation_String = "usedisambiguation";
-	internal const string k_pch_Lighthouse_DisambiguationDebug_Int32 = "disambiguationdebug";
-	internal const string k_pch_Lighthouse_PrimaryBasestation_Int32 = "primarybasestation";
-	internal const string k_pch_Lighthouse_DBHistory_Bool = "dbhistory";
-	internal const string k_pch_Null_Section = "driver_null";
-	internal const string k_pch_Null_EnableNullDriver_Bool = "enable";
-	internal const string k_pch_Null_SerialNumber_String = "serialNumber";
-	internal const string k_pch_Null_ModelNumber_String = "modelNumber";
-	internal const string k_pch_Null_WindowX_Int32 = "windowX";
-	internal const string k_pch_Null_WindowY_Int32 = "windowY";
-	internal const string k_pch_Null_WindowWidth_Int32 = "windowWidth";
-	internal const string k_pch_Null_WindowHeight_Int32 = "windowHeight";
-	internal const string k_pch_Null_RenderWidth_Int32 = "renderWidth";
-	internal const string k_pch_Null_RenderHeight_Int32 = "renderHeight";
-	internal const string k_pch_Null_SecondsFromVsyncToPhotons_Float = "secondsFromVsyncToPhotons";
-	internal const string k_pch_Null_DisplayFrequency_Float = "displayFrequency";
-	internal const string k_pch_UserInterface_Section = "userinterface";
-	internal const string k_pch_UserInterface_StatusAlwaysOnTop_Bool = "StatusAlwaysOnTop";
-	internal const string k_pch_UserInterface_MinimizeToTray_Bool = "MinimizeToTray";
-	internal const string k_pch_UserInterface_Screenshots_Bool = "screenshots";
-	internal const string k_pch_UserInterface_ScreenshotType_Int = "screenshotType";
-	internal const string k_pch_Notifications_Section = "notifications";
-	internal const string k_pch_Notifications_DoNotDisturb_Bool = "DoNotDisturb";
-	internal const string k_pch_Keyboard_Section = "keyboard";
-	internal const string k_pch_Keyboard_TutorialCompletions = "TutorialCompletions";
-	internal const string k_pch_Keyboard_ScaleX = "ScaleX";
-	internal const string k_pch_Keyboard_ScaleY = "ScaleY";
-	internal const string k_pch_Keyboard_OffsetLeftX = "OffsetLeftX";
-	internal const string k_pch_Keyboard_OffsetRightX = "OffsetRightX";
-	internal const string k_pch_Keyboard_OffsetY = "OffsetY";
-	internal const string k_pch_Keyboard_Smoothing = "Smoothing";
-	internal const string k_pch_Perf_Section = "perfcheck";
-	internal const string k_pch_Perf_HeuristicActive_Bool = "heuristicActive";
-	internal const string k_pch_Perf_NotifyInHMD_Bool = "warnInHMD";
-	internal const string k_pch_Perf_NotifyOnlyOnce_Bool = "warnOnlyOnce";
-	internal const string k_pch_Perf_AllowTimingStore_Bool = "allowTimingStore";
-	internal const string k_pch_Perf_SaveTimingsOnExit_Bool = "saveTimingsOnExit";
-	internal const string k_pch_Perf_TestData_Float = "perfTestData";
-	internal const string k_pch_CollisionBounds_Section = "collisionBounds";
-	internal const string k_pch_CollisionBounds_Style_Int32 = "CollisionBoundsStyle";
-	internal const string k_pch_CollisionBounds_GroundPerimeterOn_Bool = "CollisionBoundsGroundPerimeterOn";
-	internal const string k_pch_CollisionBounds_CenterMarkerOn_Bool = "CollisionBoundsCenterMarkerOn";
-	internal const string k_pch_CollisionBounds_PlaySpaceOn_Bool = "CollisionBoundsPlaySpaceOn";
-	internal const string k_pch_CollisionBounds_FadeDistance_Float = "CollisionBoundsFadeDistance";
-	internal const string k_pch_CollisionBounds_ColorGammaR_Int32 = "CollisionBoundsColorGammaR";
-	internal const string k_pch_CollisionBounds_ColorGammaG_Int32 = "CollisionBoundsColorGammaG";
-	internal const string k_pch_CollisionBounds_ColorGammaB_Int32 = "CollisionBoundsColorGammaB";
-	internal const string k_pch_CollisionBounds_ColorGammaA_Int32 = "CollisionBoundsColorGammaA";
-	internal const string k_pch_Camera_Section = "camera";
-	internal const string k_pch_Camera_EnableCamera_Bool = "enableCamera";
-	internal const string k_pch_Camera_EnableCameraInDashboard_Bool = "enableCameraInDashboard";
-	internal const string k_pch_Camera_EnableCameraForCollisionBounds_Bool = "enableCameraForCollisionBounds";
-	internal const string k_pch_Camera_EnableCameraForRoomView_Bool = "enableCameraForRoomView";
-	internal const string k_pch_Camera_BoundsColorGammaR_Int32 = "cameraBoundsColorGammaR";
-	internal const string k_pch_Camera_BoundsColorGammaG_Int32 = "cameraBoundsColorGammaG";
-	internal const string k_pch_Camera_BoundsColorGammaB_Int32 = "cameraBoundsColorGammaB";
-	internal const string k_pch_Camera_BoundsColorGammaA_Int32 = "cameraBoundsColorGammaA";
-	internal const string k_pch_Camera_BoundsStrength_Int32 = "cameraBoundsStrength";
-	internal const string k_pch_audio_Section = "audio";
-	internal const string k_pch_audio_OnPlaybackDevice_String = "onPlaybackDevice";
-	internal const string k_pch_audio_OnRecordDevice_String = "onRecordDevice";
-	internal const string k_pch_audio_OnPlaybackMirrorDevice_String = "onPlaybackMirrorDevice";
-	internal const string k_pch_audio_OffPlaybackDevice_String = "offPlaybackDevice";
-	internal const string k_pch_audio_OffRecordDevice_String = "offRecordDevice";
-	internal const string k_pch_audio_VIVEHDMIGain = "viveHDMIGain";
-	internal const string k_pch_Power_Section = "power";
-	internal const string k_pch_Power_PowerOffOnExit_Bool = "powerOffOnExit";
-	internal const string k_pch_Power_TurnOffScreensTimeout_Float = "turnOffScreensTimeout";
-	internal const string k_pch_Power_TurnOffControllersTimeout_Float = "turnOffControllersTimeout";
-	internal const string k_pch_Power_ReturnToWatchdogTimeout_Float = "returnToWatchdogTimeout";
-	internal const string k_pch_Power_AutoLaunchSteamVROnButtonPress = "autoLaunchSteamVROnButtonPress";
-	internal const string k_pch_Dashboard_Section = "dashboard";
-	internal const string k_pch_Dashboard_EnableDashboard_Bool = "enableDashboard";
-	internal const string k_pch_Dashboard_ArcadeMode_Bool = "arcadeMode";
-	internal const string k_pch_modelskin_Section = "modelskins";
-	internal const string IVRScreenshots_Version = "IVRScreenshots_001";
-	internal const string IVRResources_Version = "IVRResources_001";
-
-	static uint VRToken { get; set; }
-
-	const string FnTable_Prefix = "FnTable:";
-
-	class COpenVRContext
-	{
-		internal COpenVRContext() { Clear(); }
-
-		internal void Clear()
-		{
-			m_pVRSystem = null;
-			m_pVRChaperone = null;
-			m_pVRChaperoneSetup = null;
-			m_pVRCompositor = null;
-			m_pVROverlay = null;
-			m_pVRRenderModels = null;
-			m_pVRExtendedDisplay = null;
-			m_pVRSettings = null;
-			m_pVRApplications = null;
-			m_pVRScreenshots = null;
-			m_pVRTrackedCamera = null;
-		}
-
-		void CheckClear()
-		{
-			if (VRToken != GetInitToken())
-			{
-				Clear();
-				VRToken = GetInitToken();
-			}
-		}
-
-		internal CVRSystem VRSystem()
-		{
-			CheckClear();
-			if (m_pVRSystem == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRSystem_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRSystem = new CVRSystem(pInterface);
-			}
-			return m_pVRSystem;
-		}
-
-		internal CVRChaperone VRChaperone()
-		{
-			CheckClear();
-			if (m_pVRChaperone == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRChaperone_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRChaperone = new CVRChaperone(pInterface);
-			}
-			return m_pVRChaperone;
-		}
-
-		internal CVRChaperoneSetup VRChaperoneSetup()
-		{
-			CheckClear();
-			if (m_pVRChaperoneSetup == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRChaperoneSetup_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRChaperoneSetup = new CVRChaperoneSetup(pInterface);
-			}
-			return m_pVRChaperoneSetup;
-		}
-
-		internal CVRCompositor VRCompositor()
-		{
-			CheckClear();
-			if (m_pVRCompositor == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRCompositor_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRCompositor = new CVRCompositor(pInterface);
-			}
-			return m_pVRCompositor;
-		}
-
-		internal CVROverlay VROverlay()
-		{
-			CheckClear();
-			if (m_pVROverlay == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVROverlay_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVROverlay = new CVROverlay(pInterface);
-			}
-			return m_pVROverlay;
-		}
-
-		internal CVRRenderModels VRRenderModels()
-		{
-			CheckClear();
-			if (m_pVRRenderModels == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRRenderModels_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRRenderModels = new CVRRenderModels(pInterface);
-			}
-			return m_pVRRenderModels;
-		}
-
-		internal CVRExtendedDisplay VRExtendedDisplay()
-		{
-			CheckClear();
-			if (m_pVRExtendedDisplay == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRExtendedDisplay_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRExtendedDisplay = new CVRExtendedDisplay(pInterface);
-			}
-			return m_pVRExtendedDisplay;
-		}
-
-		internal CVRSettings VRSettings()
-		{
-			CheckClear();
-			if (m_pVRSettings == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRSettings_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRSettings = new CVRSettings(pInterface);
-			}
-			return m_pVRSettings;
-		}
-
-		internal CVRApplications VRApplications()
-		{
-			CheckClear();
-			if (m_pVRApplications == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRApplications_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRApplications = new CVRApplications(pInterface);
-			}
-			return m_pVRApplications;
-		}
-
-		internal CVRScreenshots VRScreenshots()
-		{
-			CheckClear();
-			if (m_pVRScreenshots == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRScreenshots_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRScreenshots = new CVRScreenshots(pInterface);
-			}
-			return m_pVRScreenshots;
-		}
-
-		internal CVRTrackedCamera VRTrackedCamera()
-		{
-			CheckClear();
-			if (m_pVRTrackedCamera == null)
-			{
-				var eError = EVRInitError.None;
-				var pInterface = OpenVRInterop.GetGenericInterface(FnTable_Prefix+IVRTrackedCamera_Version, ref eError);
-				if (pInterface != IntPtr.Zero && eError == EVRInitError.None)
-					m_pVRTrackedCamera = new CVRTrackedCamera(pInterface);
-			}
-			return m_pVRTrackedCamera;
-		}
-
-		private CVRSystem m_pVRSystem;
-		private CVRChaperone m_pVRChaperone;
-		private CVRChaperoneSetup m_pVRChaperoneSetup;
-		private CVRCompositor m_pVRCompositor;
-		private CVROverlay m_pVROverlay;
-		private CVRRenderModels m_pVRRenderModels;
-		private CVRExtendedDisplay m_pVRExtendedDisplay;
-		private CVRSettings m_pVRSettings;
-		private CVRApplications m_pVRApplications;
-		private CVRScreenshots m_pVRScreenshots;
-		private CVRTrackedCamera m_pVRTrackedCamera;
-	};
-
-	private static COpenVRContext _OpenVRInternal_ModuleContext = null;
-	static COpenVRContext OpenVRInternal_ModuleContext
-	{
-		get
-		{
-			if (_OpenVRInternal_ModuleContext == null)
-				_OpenVRInternal_ModuleContext = new COpenVRContext();
-			return _OpenVRInternal_ModuleContext;
-		}
-	}
-
-	internal static CVRSystem System { get { return OpenVRInternal_ModuleContext.VRSystem(); } }
-	internal static CVRChaperone Chaperone { get { return OpenVRInternal_ModuleContext.VRChaperone(); } }
-	internal static CVRChaperoneSetup ChaperoneSetup { get { return OpenVRInternal_ModuleContext.VRChaperoneSetup(); } }
-	internal static CVRCompositor Compositor { get { return OpenVRInternal_ModuleContext.VRCompositor(); } }
-	internal static CVROverlay Overlay { get { return OpenVRInternal_ModuleContext.VROverlay(); } }
-	internal static CVRRenderModels RenderModels { get { return OpenVRInternal_ModuleContext.VRRenderModels(); } }
-	internal static CVRExtendedDisplay ExtendedDisplay { get { return OpenVRInternal_ModuleContext.VRExtendedDisplay(); } }
-	internal static CVRSettings Settings { get { return OpenVRInternal_ModuleContext.VRSettings(); } }
-	internal static CVRApplications Applications { get { return OpenVRInternal_ModuleContext.VRApplications(); } }
-	internal static CVRScreenshots Screenshots { get { return OpenVRInternal_ModuleContext.VRScreenshots(); } }
-	internal static CVRTrackedCamera TrackedCamera { get { return OpenVRInternal_ModuleContext.VRTrackedCamera(); } }
-
-	/** Finds the active installation of vrclient.dll and initializes it */
-	internal static CVRSystem Init(ref EVRInitError peError, EVRApplicationType eApplicationType = EVRApplicationType.VRApplication_Scene)
-	{
-		VRToken = InitInternal(ref peError, eApplicationType);
-		OpenVRInternal_ModuleContext.Clear();
-
-		if (peError != EVRInitError.None)
-			return null;
-
-		bool bInterfaceValid = IsInterfaceVersionValid(IVRSystem_Version);
-		if (!bInterfaceValid)
-		{
-			ShutdownInternal();
-			peError = EVRInitError.Init_InterfaceNotFound;
-			return null;
-		}
-
-		return OpenVR.System;
-	}
-
-	/** unloads vrclient.dll. Any interface pointers from the interface are
-	* invalid after this point */
-	internal static void Shutdown()
-	{
-		ShutdownInternal();
-	}
-
-}
-
-
-
-}
-
diff --git a/sources/engine/Xenko.VirtualReality/OpenXR/OpenXRHmd.cs b/sources/engine/Xenko.VirtualReality/OpenXR/OpenXRHmd.cs
new file mode 100644
index 0000000000..7108328c04
--- /dev/null
+++ b/sources/engine/Xenko.VirtualReality/OpenXR/OpenXRHmd.cs
@@ -0,0 +1,902 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Graphics;
+using Silk.NET.OpenXR;
+using System.Runtime.InteropServices;
+using System.Linq;
+using Silk.NET.Core;
+using System.Diagnostics;
+using Silk.NET.Core.Native;
+using Xenko.Graphics.SDL;
+using Vortice.Vulkan;
+using System.IO;
+
+#if XENKO_PLATFORM_WINDOWS_DESKTOP
+using Microsoft.Win32;
+using System.Data;
+#endif
+
+namespace Xenko.VirtualReality
+{
+    public class OpenXRHmd : VRDevice
+    {
+        // API Objects for accessing OpenXR
+        public XR Xr;
+        public Session globalSession;
+        public Swapchain globalSwapchain;
+        public Space globalPlaySpace;
+        public FrameState globalFrameState = new FrameState()
+        {
+            Type = StructureType.FrameState
+        };
+        public ReferenceSpaceType play_space_type = ReferenceSpaceType.Stage; //XR_REFERENCE_SPACE_TYPE_LOCAL;
+        //public SwapchainImageVulkan2KHR[] images;
+        //public SwapchainImageVulkan2KHR[] depth_images;
+        public SwapchainImageVulkanKHR[] images;
+        public SwapchainImageVulkanKHR[] depth_images;
+        public ActionSet globalActionSet;
+        public InteractionProfileState handProfileState;
+        internal ulong leftHandPath;
+
+        // array of view_count containers for submitting swapchains with rendered VR frames
+        CompositionLayerProjectionView[] projection_views;
+
+        // array of view_count views, filled by the runtime with current HMD display pose
+        View[] views;
+
+        // ExtDebugUtils is a handy OpenXR debugging extension which we'll enable if available unless told otherwise.
+        public bool? IsDebugUtilsSupported;
+
+        // OpenXR handles
+        public Instance Instance;
+        public ulong system_id = 0;
+
+        // Misc
+        private bool _unmanagedResourcesFreed;
+
+        /// <summary>
+        /// A simple function which throws an exception if the given OpenXR result indicates an error has been raised.
+        /// </summary>
+        /// <param name="result">The OpenXR result in question.</param>
+        /// <returns>
+        /// The same result passed in, just in case it's meaningful and we just want to use this to filter out errors.
+        /// </returns>
+        /// <exception cref="Exception">An exception for the given result if it indicates an error.</exception>
+        protected internal static Result CheckResult(Result result, string forFunction)
+        {
+            if ((int)result < 0)
+            {
+                Window.GenerateGenericError(null, 
+                    $"Only SteamVR is supported as an OpenXR runtime. Make sure it is set & running:\nSteamVR Settings > Show Advanced Settings > Developer > Set SteamVR as OpenXR Runtime\n\nAlso verify the correct High-Speed GPU is running this program.\n\nCode: {result} ({result:X}) in " + forFunction + "\n\nStack Trace: " + (new StackTrace()).ToString(),
+                    "OpenXR Error: is SteamVR set as the OpenXR runtime? Correct GPU?");
+            }
+
+            return result;
+        }
+
+        private List<string> Extensions = new List<string>();
+
+        public unsafe ulong GetSwapchainImage()
+        {
+            // Get the swapchain image
+            var swapchainIndex = 0u;
+            var acquireInfo = new SwapchainImageAcquireInfo() { Type = StructureType.SwapchainImageAcquireInfo };
+            CheckResult(Xr.AcquireSwapchainImage(globalSwapchain, in acquireInfo, ref swapchainIndex), "AcquireSwapchainImage");
+
+            var waitInfo = new SwapchainImageWaitInfo(timeout: long.MaxValue) { Type = StructureType.SwapchainImageWaitInfo };
+            swapImageCollected = Xr.WaitSwapchainImage(globalSwapchain, in waitInfo) == Result.Success;
+
+            return images[swapchainIndex].Image;
+        }
+
+        private unsafe void Prepare()
+        {
+            // Create our API object for OpenXR.
+            Xr = XR.GetApi();
+
+            Extensions.Clear();
+            //Extensions.Add("XR_KHR_vulkan_enable2");
+            Extensions.Add("XR_KHR_vulkan_enable");
+            Extensions.Add("XR_EXT_hp_mixed_reality_controller");
+            Extensions.Add("XR_HTC_vive_cosmos_controller_interaction");
+            Extensions.Add("XR_MSFT_hand_interaction");
+            Extensions.Add("XR_EXT_samsung_odyssey_controller");
+            Extensions.Add("XR_HTC_vive_focus3_controller_interaction");
+            Extensions.Add("XR_HTC_hand_interaction");
+
+            uint propCount = 0;
+            Xr.EnumerateInstanceExtensionProperties((byte*)null, 0, &propCount, null);
+
+            ExtensionProperties[] props = new ExtensionProperties[propCount];
+            for (int i = 0; i < props.Length; i++) props[i].Type = StructureType.ExtensionProperties;
+
+            fixed (ExtensionProperties* pptr = &props[0])
+                Xr.EnumerateInstanceExtensionProperties((byte*)null, propCount, ref propCount, pptr);
+
+            List<string> AvailableExtensions = new List<string>();
+            for (int i = 0; i < props.Length; i++)
+            {
+                fixed (void* nptr = props[i].ExtensionName)
+                    AvailableExtensions.Add(Marshal.PtrToStringAnsi(new System.IntPtr(nptr)));
+            }
+
+            for (int i=0; i<Extensions.Count; i++)
+            {
+                if (AvailableExtensions.Contains(Extensions[i]) == false)
+                {
+                    Extensions.RemoveAt(i);
+                    i--;
+                }
+            }
+
+            var appInfo = new ApplicationInfo(1, 1, new Version64(1, 0, 42)); // Silk.NET 2.22 is 1.1.42, but we only need 1.0 OpenXR
+            string engName = "FocusEngine";
+            string appName = AppDomain.CurrentDomain.FriendlyName;
+            Marshal.Copy(engName.ToCharArray(), 0, (IntPtr)appInfo.EngineName, engName.Length);
+            Marshal.WriteByte((IntPtr)(appInfo.EngineName + engName.Length), 0);
+            Marshal.Copy(appName.ToCharArray(), 0, (IntPtr)appInfo.ApplicationName, appName.Length);
+            Marshal.WriteByte((IntPtr)(appInfo.ApplicationName + appName.Length), 0);
+
+            var requestedExtensions = SilkMarshal.StringArrayToPtr(Extensions);
+            InstanceCreateInfo instanceCreateInfo = new InstanceCreateInfo
+            (
+                applicationInfo: appInfo,
+                enabledExtensionCount: (uint)Extensions.Count,
+                enabledExtensionNames: (byte**)requestedExtensions
+            );
+
+            Instance localInstance = new Instance(0);
+            CheckResult(Xr.CreateInstance(&instanceCreateInfo, &localInstance), "CreateInstance");
+            Instance = localInstance;
+
+            // We're creating a head-mounted-display (HMD, i.e. a VR headset) example, so we ask for a runtime which
+            // supports that form factor. The response we get is a ulong that is the System ID.
+            var getInfo = new SystemGetInfo(formFactor: FormFactor.HeadMountedDisplay);
+            CheckResult(Xr.GetSystem(Instance, in getInfo, ref system_id), "GetSystem");
+        }
+
+        private void ReleaseUnmanagedResources()
+        {
+            if (_unmanagedResourcesFreed)
+            {
+                return;
+            }
+
+            CheckResult(Xr.DestroyInstance(Instance), "DestroyInstance");
+            _unmanagedResourcesFreed = true;
+        }
+
+        private GameBase baseGame;
+
+        private Size2 renderSize;
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private unsafe delegate Result pfnGetVulkanGraphicsRequirements2KHR(Instance instance, ulong sys_id, GraphicsRequirementsVulkanKHR* req);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private unsafe delegate Result pfnGetVulkanGraphicsDevice2KHR(Instance instance, VulkanGraphicsDeviceGetInfoKHR* getInfo, VkPhysicalDevice* vulkanPhysicalDevice);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private unsafe delegate Result pfnGetVulkanGraphicsRequirementsKHR(Instance instance, ulong sys_id, GraphicsRequirementsVulkanKHR* req);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private unsafe delegate Result pfnGetVulkanInstanceExtensionsKHR(Instance instance, ulong systemId, int bufferCapacityInput, int* bufferCountOutput, char* buffer);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private unsafe delegate Result pfnGetVulkanDeviceExtensionsKHR(Instance instance, ulong systemId, int bufferCapacityInput, int* bufferCountOutput, char* buffer);
+
+        [UnmanagedFunctionPointer(CallingConvention.StdCall)]
+        private unsafe delegate Result pfnGetVulkanGraphicsDeviceKHR(Instance instance, ulong systemId, VkHandle vkInstance, VkHandle* vkPhysicalDevice);
+
+        public OpenXRHmd(GameBase game)
+        {
+            baseGame = game;
+            VRApi = VRApi.OpenXR;
+        }
+
+        public override Size2 ActualRenderFrameSize { get => renderSize; }
+        public override float RenderFrameScaling { get; set; } = 1f;
+        public float FOVScale = 1f;
+
+        public override DeviceState State
+        {
+            get
+            {
+                if (Xr == null) return DeviceState.Invalid;
+                return DeviceState.Valid;
+            }
+        }
+
+        private Vector3 headPos;
+        public override Vector3 HeadPosition => headPos;
+
+        private Quaternion headRot;
+        public override Quaternion HeadRotation => headRot;
+
+        private Vector3 headLinVel;
+        public override Vector3 HeadLinearVelocity => headLinVel;
+
+        private Vector3 headAngVel;
+        public override Vector3 HeadAngularVelocity => headAngVel;
+
+        private OpenXrTouchController leftHand;
+        public override TouchController LeftHand => leftHand;
+
+        private OpenXrTouchController rightHand;
+        public override TouchController RightHand => rightHand;
+
+        private ulong poseCount;
+        public override ulong PoseCount => poseCount;
+
+        public override bool CanInitialize => true;
+
+        internal Texture swapTexture;
+        internal bool begunFrame, swapImageCollected;
+        internal ulong swapchainPointer;
+
+        public override unsafe void Commit(CommandList commandList, Texture renderFrame)
+        {
+            // if we didn't wait a frame, don't commit
+            if (begunFrame == false || swapImageCollected == false)
+                return;
+
+#if XENKO_GRAPHICS_API_VULKAN
+            // copy texture to swapchain image
+            swapTexture.SetFullHandles(new VkImage(swapchainPointer), VkImageView.Null, 
+                                       renderFrame.NativeLayout, renderFrame.NativeAccessMask,
+                                       renderFrame.NativeFormat, renderFrame.NativeImageAspect);
+#endif
+            commandList.Copy(renderFrame, swapTexture);
+        }
+
+        public override unsafe void Flush()
+        {
+            // if we didn't wait a frame, don't commit
+            if (begunFrame == false)
+                return;
+
+            begunFrame = false;
+
+            // Release the swapchain image
+            var releaseInfo = new SwapchainImageReleaseInfo() { Type = StructureType.SwapchainImageReleaseInfo };
+            CheckResult(Xr.ReleaseSwapchainImage(globalSwapchain, in releaseInfo), "ReleaseSwapchainImage");
+
+            // https://github.com/dotnet/Silk.NET/blob/b0b31779ce4db9b68922977fa11772b95f506e09/examples/CSharp/OpenGL%20Demos/OpenGL%20VR%20Demo/OpenXR/Renderer.cs#L507
+            var frameEndInfo = new FrameEndInfo()
+            {
+                Type = StructureType.FrameEndInfo,
+                DisplayTime = globalFrameState.PredictedDisplayTime,
+                EnvironmentBlendMode = EnvironmentBlendMode.Opaque
+            };
+
+            fixed (CompositionLayerProjectionView* ptr = &projection_views[0])
+            {
+                var projectionLayer = new CompositionLayerProjection
+                (
+                    viewCount: 2,
+                    views: ptr,
+                    space: globalPlaySpace
+                );
+
+                var layerPointer = (CompositionLayerBaseHeader*)&projectionLayer;
+                for (var eye = 0; eye < 2; eye++)
+                {
+                    ref var layerView = ref projection_views[eye];
+                    layerView.Fov = views[eye].Fov;
+                    layerView.Pose = views[eye].Pose;
+                }
+
+                frameEndInfo.LayerCount = 1;
+                frameEndInfo.Layers = &layerPointer;
+
+                CheckResult(Xr.EndFrame(globalSession, in frameEndInfo), "EndFrame");
+            }
+        }
+
+        internal static Quaternion ConvertToFocus(ref Quaternionf quat)
+        {
+            return new Quaternion(-quat.X, -quat.Y, -quat.Z, quat.W);
+        }
+
+        internal static Quaternionf ConvertToXR(Quaternion quat)
+        {
+            return new Quaternionf(-quat.X, -quat.Y, -quat.Z, quat.W);
+        }
+
+        public override unsafe void UpdatePositions(GameTime gameTime)
+        {
+            ActiveActionSet active_actionsets = new ActiveActionSet()
+            {
+                 ActionSet = globalActionSet
+            };
+
+            ActionsSyncInfo actions_sync_info = new ActionsSyncInfo()
+            {
+                Type = StructureType.ActionsSyncInfo,
+                CountActiveActionSets = 1,
+                ActiveActionSets = &active_actionsets,
+            };
+
+            Xr.SyncAction(globalSession, &actions_sync_info);
+
+            leftHand.Update(gameTime);
+            rightHand.Update(gameTime);
+
+            // --- Create projection matrices and view matrices for each eye
+            ViewLocateInfo view_locate_info = new ViewLocateInfo()
+            {
+                Type = StructureType.ViewLocateInfo,
+                ViewConfigurationType = ViewConfigurationType.PrimaryStereo,
+                DisplayTime = globalFrameState.PredictedDisplayTime,
+                Space = globalPlaySpace
+            };
+
+            ViewState view_state = new ViewState()
+            {
+                Type = StructureType.ViewState
+            };
+
+            uint view_count;
+            Xr.LocateView(globalSession, &view_locate_info, &view_state, 2, &view_count, views);
+
+            // since we got eye positions, our head is between our eyes
+            rawHeadPos.X = (views[0].Pose.Position.X + views[1].Pose.Position.X) * 0.5f;
+            rawHeadPos.Y = (views[0].Pose.Position.Y + views[1].Pose.Position.Y) * 0.5f;
+            rawHeadPos.Z = (views[0].Pose.Position.Z + views[1].Pose.Position.Z) * 0.5f;
+
+            Vector3 tempvec = Vector3.Zero;
+            for (int i=0; i<2; i++)
+            {
+                ref Posef pose = ref views[i].Pose;
+                // eye transform post-processing
+                if (BodyRotation != Quaternion.Identity)
+                {
+                    tempvec.X = pose.Position.X;
+                    tempvec.Y = pose.Position.Y;
+                    tempvec.Z = pose.Position.Z;
+                    // center us on our rotation center
+                    tempvec.X -= _rotCenter.X;
+                    tempvec.Z -= _rotCenter.Z;
+                    // now rotate position by BodyRotation
+                    Quaternion lbr = BodyRotation;
+                    Vector3.Transform(ref tempvec, ref lbr, out tempvec);
+                    // ok, push it back
+                    pose.Position.X = tempvec.X;
+                    pose.Position.Y = tempvec.Y;
+                    pose.Position.Z = tempvec.Z;
+                }
+
+                pose.Position.X *= BodyScaling;
+                pose.Position.Y *= BodyScaling;
+                pose.Position.Z *= BodyScaling;
+                pose.Position.X += BodyOffset.X;
+                pose.Position.Y += BodyOffset.Y;
+                pose.Position.Z += BodyOffset.Z;
+            }
+
+            // get final head position
+            headPos.X = (views[0].Pose.Position.X + views[1].Pose.Position.X) * 0.5f;
+            headPos.Y = (views[0].Pose.Position.Y + views[1].Pose.Position.Y) * 0.5f;
+            headPos.Z = (views[0].Pose.Position.Z + views[1].Pose.Position.Z) * 0.5f;
+
+            // get final head rotation
+            headRot.X = views[0].Pose.Orientation.X;
+            headRot.Y = views[0].Pose.Orientation.Y;
+            headRot.Z = views[0].Pose.Orientation.Z;
+            headRot.W = views[0].Pose.Orientation.W;
+            headRot = headRot * BodyRotation;
+        }
+
+        public override unsafe void Draw(GameTime gameTime)
+        {
+            // wait get poses (headPos etc.)
+            // --- Wait for our turn to do head-pose dependent computation and render a frame
+            FrameWaitInfo frame_wait_info = new FrameWaitInfo()
+            {
+                Type = StructureType.FrameWaitInfo,
+            };
+
+            CheckResult(Xr.WaitFrame(globalSession, in frame_wait_info, ref globalFrameState), "WaitFrame");
+
+            if ((Bool32)globalFrameState.ShouldRender)
+            {
+                FrameBeginInfo frame_begin_info = new FrameBeginInfo()
+                {
+                    Type = StructureType.TypeFrameBeginInfo,
+                };
+
+                CheckResult(Xr.BeginFrame(globalSession, &frame_begin_info), "BeginFrame");
+
+                swapchainPointer = GetSwapchainImage();
+                begunFrame = true;
+            }
+
+            poseCount++;
+        }
+
+        private void AttemptOverrideOpenXRRuntime()
+        {
+#if XENKO_PLATFORM_WINDOWS_DESKTOP
+            // wait, do we even need to do this?
+            string ar = Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Khronos\\OpenXR\\1", "ActiveRuntime", null) as string;
+            if (ar != null && ar.Contains("SteamVR")) return;
+
+            string[] possibleSteamXRLocations =
+            {
+                "C:/Program Files (x86)/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "C:/SteamLibrary/steamapps/common/SteamVR/steamxr_win64.json",
+                "D:/SteamLibrary/steamapps/common/SteamVR/steamxr_win64.json",
+                "C:/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "D:/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "D:/Program Files (x86)/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "E:/Program Files (x86)/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "F:/Program Files (x86)/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "C:/Program Files/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "D:/Program Files/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "E:/Program Files/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "F:/Program Files/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "E:/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "F:/Steam/steamapps/common/SteamVR/steamxr_win64.json",
+                "E:/SteamLibrary/steamapps/common/SteamVR/steamxr_win64.json",
+                "F:/SteamLibrary/steamapps/common/SteamVR/steamxr_win64.json"
+            };
+
+            foreach (string s in possibleSteamXRLocations)
+            {
+                if (File.Exists(s))
+                {
+                    Environment.SetEnvironmentVariable("XR_RUNTIME_JSON", s);
+                    System.Console.WriteLine("Set OpenXR runtime to: " + s);
+                    return;
+                }
+            }
+#endif
+        }
+
+        public override unsafe void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, VRDeviceSystem.MIRROR_OPTION requireMirror)
+        {
+            // Changing the form_factor may require changing the view_type too.
+            ViewConfigurationType view_type = ViewConfigurationType.PrimaryStereo;
+
+            // Typically STAGE for room scale/standing, LOCAL for seated
+            Space play_space;
+
+            // the session deals with the renderloop submitting frames to the runtime
+            Session session;
+
+            // each physical Display/Eye is described by a view.
+            // view_count usually depends on the form_factor / view_type.
+            // dynamically allocating all view related structs instead of assuming 2
+            // hopefully allows this app to scale easily to different view_counts.
+            uint view_count = 0;
+            // the viewconfiguration views contain information like resolution about each view
+            ViewConfigurationView[] viewconfig_views;
+
+            // array of view_count handles for swapchains.
+            // it is possible to use imageRect to render all views to different areas of the
+            // same texture, but in this example we use one swapchain per view
+            Swapchain swapchain;
+            // array of view_count ints, storing the length of swapchains
+            uint[] swapchain_lengths;
+
+            // depth swapchain equivalent to the VR color swapchains (not supported yet)
+            //Swapchain depth_swapchains;
+            //uint[] depth_swapchain_lengths;
+
+            AttemptOverrideOpenXRRuntime();
+
+            Prepare();
+
+            SystemProperties system_props = new SystemProperties() {
+                Type = StructureType.SystemProperties,
+            };
+
+            CheckResult(Xr.GetSystemProperties(Instance, system_id, &system_props), "GetSystemProperties");
+
+            viewconfig_views = new ViewConfigurationView[32];
+            for (int i=0; i<viewconfig_views.Length; i++)
+            {
+                viewconfig_views[i] = new ViewConfigurationView()
+                {
+                    Type = StructureType.ViewConfigurationView,                     
+                };
+            }
+
+            fixed (ViewConfigurationView* viewspnt = &viewconfig_views[0])
+                CheckResult(Xr.EnumerateViewConfigurationView(Instance, system_id, view_type, (uint)viewconfig_views.Length, ref view_count, viewspnt), "EnumerateViewConfigurationView");
+            Array.Resize<ViewConfigurationView>(ref viewconfig_views, (int)view_count);
+
+            // get size
+            renderSize.Height = (int)Math.Round(viewconfig_views[0].RecommendedImageRectHeight * RenderFrameScaling);
+            renderSize.Width = (int)Math.Round(viewconfig_views[0].RecommendedImageRectWidth * RenderFrameScaling) * 2; // 2 views in one frame
+
+            GraphicsRequirementsVulkanKHR vulk = new GraphicsRequirementsVulkanKHR()
+            {
+                Type = StructureType.GraphicsRequirementsVulkanKhr
+            };
+
+            Silk.NET.Core.PfnVoidFunction func = new Silk.NET.Core.PfnVoidFunction();
+            CheckResult(Xr.GetInstanceProcAddr(Instance, "xrGetVulkanGraphicsRequirementsKHR", ref func), "GetInstanceProcAddr::xrGetVulkanGraphicsRequirementsKHR");
+            // this function pointer was loaded with xrGetInstanceProcAddr
+            Delegate vulk_req = Marshal.GetDelegateForFunctionPointer((IntPtr)func.Handle, typeof(pfnGetVulkanGraphicsRequirementsKHR));
+            vulk_req.DynamicInvoke(Instance, system_id, new System.IntPtr(&vulk));
+
+#if DEBUG
+            Silk.NET.Core.PfnVoidFunction iex = new Silk.NET.Core.PfnVoidFunction();
+            CheckResult(Xr.GetInstanceProcAddr(Instance, "xrGetVulkanInstanceExtensionsKHR", ref iex), "GetInstanceProcAddr::xrGetVulkanInstanceExtensionsKHR");
+            // this function pointer was loaded with xrGetInstanceProcAddr
+            Delegate iex_d = Marshal.GetDelegateForFunctionPointer((IntPtr)iex.Handle, typeof(pfnGetVulkanInstanceExtensionsKHR));
+            int bufsize = 0;
+            byte[] buffer = new byte[256];
+            fixed (byte* bptr = &buffer[0])
+            {
+                iex_d.DynamicInvoke(Instance, system_id, buffer.Length, new System.IntPtr(&bufsize), new System.IntPtr(bptr));
+                string InstanceExtensions = System.Text.Encoding.Default.GetString(bptr, bufsize);
+                System.Diagnostics.Debug.WriteLine("Instance Vulkan Extensions Desired: " + InstanceExtensions);
+            }
+
+            Silk.NET.Core.PfnVoidFunction dex = new Silk.NET.Core.PfnVoidFunction();
+            CheckResult(Xr.GetInstanceProcAddr(Instance, "xrGetVulkanDeviceExtensionsKHR", ref dex), "GetInstanceProcAddr::xrGetVulkanDeviceExtensionsKHR");
+            // this function pointer was loaded with xrGetInstanceProcAddr
+            Delegate dex_d = Marshal.GetDelegateForFunctionPointer((IntPtr)dex.Handle, typeof(pfnGetVulkanDeviceExtensionsKHR));
+            fixed (byte* bptr = &buffer[0])
+            {
+                dex_d.DynamicInvoke(Instance, system_id, buffer.Length, new System.IntPtr(&bufsize), new System.IntPtr(bptr));
+                string DeviceExtensions = System.Text.Encoding.Default.GetString(bptr, bufsize);
+                System.Diagnostics.Debug.WriteLine("Device Vulkan Extensions Desired: " + DeviceExtensions);
+            }
+#endif
+
+#if XENKO_GRAPHICS_API_VULKAN
+
+            VulkanGraphicsDeviceGetInfoKHR vgd = new VulkanGraphicsDeviceGetInfoKHR()
+            {
+                SystemId = system_id,
+                Type = StructureType.TypeVulkanGraphicsDeviceGetInfoKhr,
+                VulkanInstance = new VkHandle((nint)device.NativeInstance.Handle)
+            };
+
+            VkHandle physicalDevice = new VkHandle();
+
+            // vulkan below
+            CheckResult(Xr.GetInstanceProcAddr(Instance, "xrGetVulkanGraphicsDeviceKHR", ref func), "GetInstanceProcAddr::xrGetVulkanGraphicsDeviceKHR");
+            Delegate vulk_dev = Marshal.GetDelegateForFunctionPointer((IntPtr)func.Handle, typeof(pfnGetVulkanGraphicsDeviceKHR));
+            vulk_dev.DynamicInvoke(Instance, system_id, new VkHandle((nint)device.NativeInstance.Handle), new System.IntPtr(&physicalDevice));
+
+            /* // vulkan2 below
+            CheckResult(Xr.GetInstanceProcAddr(Instance, "xrGetVulkanGraphicsDevice2KHR", ref func), "GetInstanceProcAddr::xrGetVulkanGraphicsDevice2KHR");
+            Delegate vulk_dev = Marshal.GetDelegateForFunctionPointer((IntPtr)func.Handle, typeof(pfnGetVulkanGraphicsDevice2KHR));
+            vulk_dev.DynamicInvoke(Instance, new System.IntPtr(&vgd), new System.IntPtr(&physicalDevice));
+            */
+
+            // --- Create session
+            var graphics_binding_vulkan = new GraphicsBindingVulkanKHR()
+            {
+                Type = StructureType.TypeGraphicsBindingVulkanKhr,
+                Device = new VkHandle((nint)device.NativeDevice.Handle),
+                Instance = new VkHandle((nint)device.NativeInstance.Handle),
+                PhysicalDevice = physicalDevice,
+                QueueFamilyIndex = 0,
+                QueueIndex = 0,
+            };
+#else
+            GraphicsBindingVulkanKHR graphics_binding_vulkan = new GraphicsBindingVulkanKHR();
+            throw new Exception("OpenXR is only compatible with Vulkan");
+#endif
+
+            if (graphics_binding_vulkan.PhysicalDevice.Handle == 0)
+                Window.GenerateGenericError(null, "OpenXR couldn't find a physical device.\n\nIs an OpenXR runtime running (e.g. SteamVR)?");
+
+            SessionCreateInfo session_create_info = new SessionCreateInfo() {
+                Type = StructureType.SessionCreateInfo,
+                Next = &graphics_binding_vulkan,
+                SystemId = system_id
+            };
+
+            CheckResult(Xr.CreateSession(Instance, &session_create_info, &session), "CreateSession");
+            globalSession = session;
+
+            ReferenceSpaceCreateInfo play_space_create_info = new ReferenceSpaceCreateInfo()
+            {
+                Type = StructureType.TypeReferenceSpaceCreateInfo,
+                ReferenceSpaceType = play_space_type,
+                PoseInReferenceSpace = new Posef(new Quaternionf(0f, 0f, 0f, 1f), new Vector3f(0f, 0f, 0f))
+            };
+
+            CheckResult(Xr.CreateReferenceSpace(session, &play_space_create_info, &play_space), "CreateReferenceSpace");
+            globalPlaySpace = play_space;
+
+            // --- Create swapchain for main VR rendering
+            {
+                // In the frame loop we render into OpenGL textures we receive from the runtime here.
+                swapchain = new Swapchain();
+                swapchain_lengths = new uint[1];
+                SwapchainCreateInfo swapchain_create_info = new SwapchainCreateInfo() {
+                    Type = StructureType.SwapchainCreateInfo,
+                    UsageFlags = SwapchainUsageFlags.TransferDstBit |
+                                 SwapchainUsageFlags.SampledBit |
+                                 SwapchainUsageFlags.ColorAttachmentBit,
+                    CreateFlags = 0,
+                    Format = (long)43, // VK_FORMAT_R8G8B8A8_SRGB = 43
+                    SampleCount = 1, //viewconfig_views[0].RecommendedSwapchainSampleCount,
+                    Width = (uint)renderSize.Width,
+                    Height = (uint)renderSize.Height,
+                    FaceCount = 1,
+                    ArraySize = 1,
+                    MipCount = 1,
+                };
+
+                CheckResult(Xr.CreateSwapchain(session, &swapchain_create_info, &swapchain), "CreateSwapchain");
+                globalSwapchain = swapchain;
+
+                swapTexture = new Texture(baseGame.GraphicsDevice, new TextureDescription()
+                {
+                    ArraySize = 1,
+                    Depth = 1,
+                    Dimension = TextureDimension.Texture2D,
+                    Flags = TextureFlags.RenderTarget | TextureFlags.ShaderResource,
+                    Format = PixelFormat.R8G8B8A8_UNorm_SRgb,
+                    Height = renderSize.Height,
+                    MipLevels = 1,
+                    MultisampleCount = MultisampleCount.None,
+                    Options = TextureOptions.None,
+                    Usage = GraphicsResourceUsage.Default,
+                    Width = renderSize.Width,
+                });
+
+                images = new SwapchainImageVulkanKHR[32];
+                uint img_count = 0;
+
+                fixed (void* sibhp = &images[0]) {
+                    CheckResult(Xr.EnumerateSwapchainImages(swapchain, (uint)images.Length, ref img_count, (SwapchainImageBaseHeader*)sibhp), "EnumerateSwapchainImages");
+                }
+                Array.Resize(ref images, (int)img_count);
+            }
+
+            // --- Create swapchain for depth buffers if supported (//TODO support depth buffering)
+            /*{
+                if (depth.supported)
+                {
+                    depth_swapchains = malloc(sizeof(XrSwapchain) * view_count);
+                    depth_swapchain_lengths = malloc(sizeof(uint32_t) * view_count);
+                    depth_images = malloc(sizeof(XrSwapchainImageOpenGLKHR*) * view_count);
+                    for (uint32_t i = 0; i < view_count; i++)
+                    {
+                        XrSwapchainCreateInfo swapchain_create_info = {
+				                .type = XR_TYPE_SWAPCHAIN_CREATE_INFO,
+				                .usageFlags = XR_SWAPCHAIN_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
+				                .createFlags = 0,
+				                .format = depth_format,
+				                .sampleCount = viewconfig_views[i].recommendedSwapchainSampleCount,
+				                .width = viewconfig_views[i].recommendedImageRectWidth,
+				                .height = viewconfig_views[i].recommendedImageRectHeight,
+				                .faceCount = 1,
+				                .arraySize = 1,
+				                .mipCount = 1,
+				                .next = NULL,
+                            };
+
+                        result = xrCreateSwapchain(session, &swapchain_create_info, &depth_swapchains[i]);
+                        if (!xr_check(instance, result, "Failed to create swapchain %d!", i))
+                            return 1;
+
+                        result =
+                            xrEnumerateSwapchainImages(depth_swapchains[i], 0, &depth_swapchain_lengths[i], NULL);
+                        if (!xr_check(instance, result, "Failed to enumerate swapchains"))
+                            return 1;
+
+                        // these are wrappers for the actual OpenGL texture id
+                        depth_images[i] = malloc(sizeof(XrSwapchainImageOpenGLKHR) * depth_swapchain_lengths[i]);
+                        for (uint32_t j = 0; j < depth_swapchain_lengths[i]; j++)
+                        {
+                            depth_images[i][j].type = XR_TYPE_SWAPCHAIN_IMAGE_OPENGL_KHR;
+                            depth_images[i][j].next = NULL;
+                        }
+                        result = xrEnumerateSwapchainImages(depth_swapchains[i], depth_swapchain_lengths[i],
+                                                            &depth_swapchain_lengths[i],
+                                                            (XrSwapchainImageBaseHeader*)depth_images[i]);
+                        if (!xr_check(instance, result, "Failed to enumerate swapchain images"))
+                            return 1;
+                    }
+                }
+            }*/
+
+
+            // Do not allocate these every frame to save some resources
+            views = new View[view_count]; //(XrView*)malloc(sizeof(XrView) * view_count);
+            for (int i = 0; i < view_count; i++)
+                views[i].Type = StructureType.View;
+
+            projection_views = new CompositionLayerProjectionView[view_count]; //(XrCompositionLayerProjectionView*)malloc(sizeof(XrCompositionLayerProjectionView) * view_count);
+            for (int i = 0; i < view_count; i++)
+            {
+                projection_views[i].Type = StructureType.CompositionLayerProjectionView; //XR_TYPE_COMPOSITION_LAYER_PROJECTION_VIEW;
+                projection_views[i].SubImage.Swapchain = swapchain;
+                projection_views[i].SubImage.ImageArrayIndex = 0;
+                projection_views[i].SubImage.ImageRect.Offset.X = (renderSize.Width * i) / 2;
+                projection_views[i].SubImage.ImageRect.Offset.Y = 0;
+                projection_views[i].SubImage.ImageRect.Extent.Width = renderSize.Width / 2;
+                projection_views[i].SubImage.ImageRect.Extent.Height = renderSize.Height;
+
+                // projection_views[i].{pose, fov} have to be filled every frame in frame loop
+            };
+
+
+            /*if (depth.supported) //TODO: depth buffering support
+            {
+                depth.infos = (XrCompositionLayerDepthInfoKHR*)malloc(sizeof(XrCompositionLayerDepthInfoKHR) *
+                                                                      view_count);
+                for (uint32_t i = 0; i < view_count; i++)
+                {
+                    depth.infos[i].type = XR_TYPE_COMPOSITION_LAYER_DEPTH_INFO_KHR;
+                    depth.infos[i].next = NULL;
+                    depth.infos[i].minDepth = 0.f;
+                    depth.infos[i].maxDepth = 1.f;
+                    depth.infos[i].nearZ = gl_rendering.near_z;
+                    depth.infos[i].farZ = gl_rendering.far_z;
+
+                    depth.infos[i].subImage.swapchain = depth_swapchains[i];
+                    depth.infos[i].subImage.imageArrayIndex = 0;
+                    depth.infos[i].subImage.imageRect.offset.x = 0;
+                    depth.infos[i].subImage.imageRect.offset.y = 0;
+                    depth.infos[i].subImage.imageRect.extent.width =
+                        viewconfig_views[i].recommendedImageRectWidth;
+                    depth.infos[i].subImage.imageRect.extent.height =
+                        viewconfig_views[i].recommendedImageRectHeight;
+
+                    // depth is chained to projection, not submitted as separate layer
+                    projection_views[i].next = &depth.infos[i];
+                };
+            }*/
+
+            ActionSetCreateInfo gameplay_actionset_info = new ActionSetCreateInfo()
+            {
+                Type = StructureType.TypeActionSetCreateInfo
+            };
+
+            Span<byte> asname = new Span<byte>(gameplay_actionset_info.ActionSetName, 16);
+            Span<byte> lsname = new Span<byte>(gameplay_actionset_info.LocalizedActionSetName, 16);
+            SilkMarshal.StringIntoSpan("actionset\0", asname);
+            SilkMarshal.StringIntoSpan("ActionSet\0", lsname);
+
+            ActionSet gameplay_actionset;
+            CheckResult(Xr.CreateActionSet(Instance, &gameplay_actionset_info, &gameplay_actionset), "CreateActionSet");
+            globalActionSet = gameplay_actionset;
+
+            OpenXRInput.Initialize(this);
+
+            leftHand = new OpenXrTouchController(this, TouchControllerHand.Left);
+            rightHand = new OpenXrTouchController(this, TouchControllerHand.Right);
+
+            // --- Begin session */
+            SessionBeginInfo session_begin_info = new SessionBeginInfo()
+            {
+                Type = StructureType.SessionBeginInfo,
+                PrimaryViewConfigurationType = view_type
+            };
+
+            CheckResult(Xr.BeginSession(session, &session_begin_info), "BeginSession");
+
+            SessionActionSetsAttachInfo actionset_attach_info = new SessionActionSetsAttachInfo()
+            {
+	            Type = StructureType.SessionActionSetsAttachInfo,
+	            CountActionSets = 1,
+	            ActionSets = &gameplay_actionset
+            };
+
+            CheckResult(Xr.AttachSessionActionSets(session, &actionset_attach_info), "AttachSessionActionSets");
+
+            // figure out what interaction profile we are using, and determine if it has a touchpad/thumbstick or both
+            handProfileState.Type = StructureType.InteractionProfileState;
+            Xr.StringToPath(Instance, "/user/hand/left", ref leftHandPath);
+        }
+
+        internal Matrix createViewMatrix(Vector3 translation, Quaternion rotation)
+        {
+            Matrix rotationMatrix = Matrix.RotationQuaternion(rotation);
+            Matrix translationMatrix = Matrix.Translation(translation);
+            Matrix viewMatrix = translationMatrix * rotationMatrix;
+            viewMatrix.Invert();
+            return viewMatrix;
+        }
+
+        internal Matrix createProjectionFov(Fovf fov, float nearZ, float farZ)
+        {
+            Matrix result = Matrix.Identity;
+
+            float tanAngleLeft = (float)Math.Tan(fov.AngleLeft * FOVScale);
+            float tanAngleRight = (float)Math.Tan(fov.AngleRight * FOVScale);
+
+            float tanAngleDown = (float)Math.Tan(fov.AngleDown * FOVScale);
+            float tanAngleUp = (float)Math.Tan(fov.AngleUp * FOVScale);
+
+            float tanAngleWidth = tanAngleRight - tanAngleLeft;
+            float tanAngleHeight = (tanAngleUp - tanAngleDown);
+
+            float offsetZ = 0;
+
+	        if (farZ <= nearZ) {    
+		        // place the far plane at infinity
+		        result[0] = 2 / tanAngleWidth;
+		        result[4] = 0;
+		        result[8] = (tanAngleRight + tanAngleLeft) / tanAngleWidth;
+		        result[12] = 0;
+
+		        result[1] = 0;
+		        result[5] = 2 / tanAngleHeight;
+		        result[9] = (tanAngleUp + tanAngleDown) / tanAngleHeight;
+		        result[13] = 0;
+
+		        result[2] = 0;
+		        result[6] = 0;
+		        result[10] = -1;
+		        result[14] = -(nearZ + offsetZ);
+
+		        result[3] = 0;
+		        result[7] = 0;
+		        result[11] = -1;
+		        result[15] = 0;
+	        } else {
+		        // normal projection
+		        result[0] = 2 / tanAngleWidth;
+		        result[4] = 0;
+		        result[8] = (tanAngleRight + tanAngleLeft) / tanAngleWidth;
+		        result[12] = 0;
+
+		        result[1] = 0;
+		        result[5] = 2 / tanAngleHeight;
+		        result[9] = (tanAngleUp + tanAngleDown) / tanAngleHeight;
+		        result[13] = 0;
+
+		        result[2] = 0;
+		        result[6] = 0;
+		        result[10] = -(farZ + offsetZ) / (farZ - nearZ);
+		        result[14] = -(farZ* (nearZ + offsetZ)) / (farZ - nearZ);
+
+		        result[3] = 0;
+		        result[7] = 0;
+		        result[11] = -1;
+		        result[15] = 0;
+	        }
+
+            return result;
+        }
+
+        public override void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Quaternion cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection)
+        {
+            View eyeview = views[(int)eye];
+            projection = createProjectionFov(eyeview.Fov, near, far);
+            Vector3 eyePos = new Vector3(eyeview.Pose.Position.X, eyeview.Pose.Position.Y, eyeview.Pose.Position.Z);
+            if (!ignoreHeadPosition) eyePos += cameraPosition;
+            Quaternion eyeRot = new Quaternion(eyeview.Pose.Orientation.X, eyeview.Pose.Orientation.Y, eyeview.Pose.Orientation.Z, eyeview.Pose.Orientation.W) * BodyRotation;
+            if (!ignoreHeadRotation) eyeRot *= cameraRotation;
+            var finalUp = Vector3.Transform(Vector3.UnitY, eyeRot);
+            var finalForward = Vector3.Transform(new Vector3(0f, 0f, -1f), eyeRot);
+            view = Matrix.LookAtRH(eyePos, eyePos + finalForward, finalUp);
+        }
+
+        public override unsafe void Update(GameTime gameTime)
+        {
+            // make sure we got the profile
+            if (handProfileState.InteractionProfile == 0)
+            {
+                CheckResult(Xr.GetCurrentInteractionProfile(globalSession, leftHandPath, ref handProfileState), "GetCurrentInteractionProfile");
+
+                if (handProfileState.InteractionProfile != 0)
+                {
+                    bool hasThumb = OpenXRInput.HasThumbsticks.Contains(handProfileState.InteractionProfile);
+                    bool hasTouch = OpenXRInput.HasTouchpads.Contains(handProfileState.InteractionProfile);
+
+                    // remember what controllers have what
+                    leftHand.HasThumbstick = hasThumb;
+                    leftHand.HasTouchpad = hasTouch;
+                    rightHand.HasThumbstick = hasThumb;
+                    rightHand.HasTouchpad = hasTouch;
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.VirtualReality/OpenXR/OpenXRInput.cs b/sources/engine/Xenko.VirtualReality/OpenXR/OpenXRInput.cs
new file mode 100644
index 0000000000..c94db655ee
--- /dev/null
+++ b/sources/engine/Xenko.VirtualReality/OpenXR/OpenXRInput.cs
@@ -0,0 +1,377 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Silk.NET.Core.Native;
+using Silk.NET.OpenXR;
+using Xenko.Core;
+
+namespace Xenko.VirtualReality
+{
+    public class OpenXRInput
+    {
+        public static bool LogInputDetected = false;
+
+        // different types of input we are interested in
+        public enum HAND_PATHS
+        {
+            BaseIndex = 0,
+            AimPosition = 1,
+            GripPosition = 2,
+            TriggerValue = 3,
+            TriggerClick = 4,
+            ThumbstickX = 5,
+            ThumbstickY = 6,
+            ThumbstickClick = 7,
+            TrackpadX = 8,
+            TrackpadY = 9,
+            TrackpadClick = 10,
+            TrackpadForce = 11,
+            GripValue = 12,
+            GripClick = 13,
+            ButtonXA = 14, // x on left, a on right (or either index)
+            ButtonYB = 15, // y on left, b on right (or either index)
+            Menu = 16,
+            System = 17, // may be inaccessible
+            HapticOut = 18
+        }
+        public const int HAND_PATH_COUNT = 19;
+
+        internal class TouchThumb
+        {
+            public bool HasTouch, HasThumb;
+        }
+
+        internal static HashSet<ulong> HasTouchpads = new HashSet<ulong>(), HasThumbsticks = new HashSet<ulong>();
+
+        // most likely matches for input types above
+        private static List<string>[] PathPriorities =
+        {
+            new List<string>() { "" }, // BaseIndex 0
+            new List<string>() { "/input/aim/pose" }, // AimPosition 1
+            new List<string>() { "/input/grip/pose" }, // GripPosition 2
+            new List<string>() { "/input/trigger/value", "/input/select/value" }, // TriggerValue 3
+            new List<string>() { "/input/trigger/click", "/input/select/click" }, // TriggerClick 4
+            new List<string>() { "/input/thumbstick/x" }, // ThumbstickX 5
+            new List<string>() { "/input/thumbstick/y" }, // ThumbstickY 6
+            new List<string>() { "/input/thumbstick/click" }, // ThumbstickClick 7
+            new List<string>() { "/input/trackpad/x" }, // TrackpadX 8
+            new List<string>() { "/input/trackpad/y" }, // TrackpadY 9
+            new List<string>() { "/input/trackpad/click" }, // TrackpadClick 10
+            new List<string>() { "/input/trackpad/force" }, // TrackpadForce 11
+            new List<string>() { "/input/squeeze/force", "/input/squeeze/value" }, // GripValue 12
+            new List<string>() { "/input/squeeze/click" }, // GripClick 13
+            new List<string>() { "/input/x/click", "/input/a/click" }, // ButtonXA 14
+            new List<string>() { "/input/y/click", "/input/b/click" }, // ButtonYB 15
+            new List<string>() { "/input/menu/click" }, // Menu 16
+            new List<string>() { "/input/system/click" }, // System 17
+            new List<string>() { "/output/haptic" }, // HapticOut 18
+        };
+
+        private static ActionType GetActionType(HAND_PATHS hp)
+        {
+            switch (hp)
+            {
+                case HAND_PATHS.BaseIndex:
+                case HAND_PATHS.AimPosition:
+                case HAND_PATHS.GripPosition:
+                    return ActionType.PoseInput;
+                case HAND_PATHS.GripValue:
+                case HAND_PATHS.ThumbstickX:
+                case HAND_PATHS.ThumbstickY:
+                case HAND_PATHS.TrackpadX:
+                case HAND_PATHS.TrackpadY:
+                case HAND_PATHS.TriggerValue:
+                case HAND_PATHS.TrackpadForce:
+                    return ActionType.FloatInput;
+                case HAND_PATHS.HapticOut:
+                    return ActionType.VibrationOutput;
+                case HAND_PATHS.GripClick:
+                case HAND_PATHS.ThumbstickClick:
+                case HAND_PATHS.TriggerClick:
+                case HAND_PATHS.TrackpadClick:
+                case HAND_PATHS.Menu:
+                case HAND_PATHS.System:
+                default:
+                    return ActionType.BooleanInput;
+            }
+        }
+
+        private static OpenXRHmd baseHMD;
+        internal static Silk.NET.OpenXR.Action[,] MappedActions = new Silk.NET.OpenXR.Action[2, HAND_PATH_COUNT];
+
+        public static string[] InteractionProfiles =
+        {
+            "/interaction_profiles/khr/simple_controller",
+            "/interaction_profiles/google/daydream_controller",
+            "/interaction_profiles/htc/vive_controller",
+            "/interaction_profiles/htc/vive_pro",
+            "/interaction_profiles/microsoft/motion_controller",
+            "/interaction_profiles/hp/mixed_reality_controller",
+            "/interaction_profiles/samsung/odyssey_controller",
+            "/interaction_profiles/oculus/go_controller",
+            "/interaction_profiles/oculus/touch_controller",
+            "/interaction_profiles/valve/index_controller",
+            "/interaction_profiles/htc/vive_cosmos_controller",
+            "/interaction_profiles/huawei/controller",
+            "/interaction_profiles/microsoft/hand_interaction",
+            "/interaction_profiles/htc/vive_focus3_controller",
+            "/interaction_profiles/htc/hand_interaction",
+            "/interaction_profiles/ml/ml2_controller"
+        };
+
+        internal static unsafe bool IsPathSupported(OpenXRHmd hmd, ulong profile, ActionSuggestedBinding* suggested)
+        {
+            InteractionProfileSuggestedBinding suggested_bindings = new InteractionProfileSuggestedBinding()
+            {
+                Type = StructureType.TypeInteractionProfileSuggestedBinding,
+                InteractionProfile = profile,
+                CountSuggestedBindings = 1,
+                SuggestedBindings = suggested
+            };
+
+            return hmd.Xr.SuggestInteractionProfileBinding(hmd.Instance, &suggested_bindings) == Result.Success;
+        }
+
+        public enum INPUT_DESIRED
+        {
+            VALUE = 0,
+            YAXIS = 1,
+            XAXIS = 2,
+            CLICK = 3
+        };
+
+        public static Silk.NET.OpenXR.Action GetAction(TouchControllerHand hand, TouchControllerButton button, INPUT_DESIRED wantMode)
+        {
+            switch (button)
+            {
+                case TouchControllerButton.ButtonXA:
+                    return MappedActions[(int)hand, (int)HAND_PATHS.ButtonXA];
+                case TouchControllerButton.ButtonYB:
+                    return MappedActions[(int)hand, (int)HAND_PATHS.ButtonYB];
+                case TouchControllerButton.Grip:
+                    return wantMode == INPUT_DESIRED.CLICK ? MappedActions[(int)hand, (int)HAND_PATHS.GripClick] : MappedActions[(int)hand, (int)HAND_PATHS.GripValue];
+                case TouchControllerButton.Menu:
+                    return MappedActions[(int)hand, (int)HAND_PATHS.Menu];
+                case TouchControllerButton.System:
+                    return MappedActions[(int)hand, (int)HAND_PATHS.System];
+                case TouchControllerButton.Trigger:
+                    return wantMode == INPUT_DESIRED.CLICK ? MappedActions[(int)hand, (int)HAND_PATHS.TriggerClick] : MappedActions[(int)hand, (int)HAND_PATHS.TriggerValue];
+                case TouchControllerButton.Thumbstick:
+                    switch (wantMode)
+                    {
+                        default:
+                        case INPUT_DESIRED.CLICK:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.ThumbstickClick];
+                        case INPUT_DESIRED.XAXIS:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.ThumbstickX];
+                        case INPUT_DESIRED.YAXIS:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.ThumbstickY];
+                    }
+                case TouchControllerButton.Touchpad:
+                    switch (wantMode)
+                    {
+                        default:
+                        case INPUT_DESIRED.CLICK:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.TrackpadClick];
+                        case INPUT_DESIRED.XAXIS:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.TrackpadX];
+                        case INPUT_DESIRED.YAXIS:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.TrackpadY];
+                        case INPUT_DESIRED.VALUE:
+                            return MappedActions[(int)hand, (int)HAND_PATHS.TrackpadForce];
+                    }
+                default:
+                    throw new ArgumentException("Don't know button: " + button);
+            }
+        }
+
+        public static bool GetActionBool(TouchControllerHand hand, TouchControllerButton button, out bool wasChangedSinceLast, bool fallback = false)
+        {
+            ActionStateGetInfo getbool = new ActionStateGetInfo()
+            {
+                Action = GetAction(hand, button, INPUT_DESIRED.CLICK),
+                Type = StructureType.TypeActionStateGetInfo
+            };
+
+            ActionStateBoolean boolresult = new ActionStateBoolean()
+            {
+                Type = StructureType.TypeActionStateBoolean
+            };
+
+            baseHMD.Xr.GetActionStateBoolean(baseHMD.globalSession, in getbool, ref boolresult);
+
+            if (boolresult.IsActive == 0)
+            {
+                if (fallback)
+                {
+                    // couldn't find an input...
+                    wasChangedSinceLast = false;
+                    return false;
+                }
+
+                // fallback if couldn't find bool
+                return GetActionFloat(hand, button, out wasChangedSinceLast, INPUT_DESIRED.VALUE, true) >= 0.75f;
+            }
+
+            wasChangedSinceLast = boolresult.ChangedSinceLastSync == 1;
+            return boolresult.CurrentState == 1;
+        }
+
+        public static float GetActionFloat(TouchControllerHand hand, TouchControllerButton button, out bool wasChangedSinceLast, INPUT_DESIRED inputMode, bool fallback = false)
+        {
+            ActionStateGetInfo getfloat = new ActionStateGetInfo()
+            {
+                Action = GetAction(hand, button, inputMode),
+                Type = StructureType.TypeActionStateGetInfo
+            };
+
+            ActionStateFloat floatresult = new ActionStateFloat()
+            {
+                Type = StructureType.TypeActionStateFloat
+            };
+
+            baseHMD.Xr.GetActionStateFloat(baseHMD.globalSession, in getfloat, ref floatresult);
+
+            if (floatresult.IsActive == 0)
+            {
+                if (fallback)
+                {
+                    // couldn't find an input...
+                    wasChangedSinceLast = false;
+                    return 0f;
+                }
+
+                // fallback if couldn't find float
+                return GetActionBool(hand, button, out wasChangedSinceLast, true) ? 1f : 0f;
+            }
+
+            wasChangedSinceLast = floatresult.ChangedSinceLastSync == 1;
+            return floatresult.CurrentState;
+        }
+
+        /// <summary>
+        /// Checks OpenXR to see what the current interaction profile is. Defaults to checking the left controller.
+        /// </summary>
+        /// <returns>String of the interaction path.</returns>
+        public static string GetCurrentInteractionProfile(string checkpath = "/user/hand/left")
+        {
+            if (baseHMD == null || baseHMD.Xr == null)
+                return "No HMD enabled or fully initialized yet!";
+
+            ulong path = 0;
+            InteractionProfileState state = new InteractionProfileState() { Type = StructureType.TypeInteractionProfileState };
+            OpenXRHmd.CheckResult(baseHMD.Xr.StringToPath(baseHMD.Instance, checkpath, ref path), "StringToPath");
+            OpenXRHmd.CheckResult(baseHMD.Xr.GetCurrentInteractionProfile(baseHMD.globalSession, path, ref state), "GetCurrentInteractionProfile");
+            byte[] buf = new byte[256];
+            uint outlen = 0;
+            OpenXRHmd.CheckResult(baseHMD.Xr.PathToString(baseHMD.Instance, state.InteractionProfile, (uint)buf.Length, ref outlen, ref buf[0]), "PathToString");
+            if (outlen == 0) return "Error getting Interaction Profile String";
+            return System.Text.Encoding.Default.GetString(buf, 0, (int)outlen - 1); // -1 to get rid of null character
+        }
+
+        internal static unsafe void Initialize(OpenXRHmd hmd)
+        {
+            baseHMD = hmd;
+
+            // make actions
+            for (int i=0; i<HAND_PATH_COUNT; i++)
+            {
+                for (int j=0; j<2; j++)
+                {
+                    ActionCreateInfo action_info = new ActionCreateInfo()
+                    {
+                        Type = StructureType.TypeActionCreateInfo,
+                        ActionType = GetActionType((HAND_PATHS)i),
+                    };
+
+                    Span<byte> aname = new Span<byte>(action_info.ActionName, 32);
+                    Span<byte> lname = new Span<byte>(action_info.LocalizedActionName, 32);
+                    string fullname = ((HAND_PATHS)i).ToString() + "H" + j.ToString() + '\0';
+                    SilkMarshal.StringIntoSpan(fullname.ToLower(), aname);
+                    SilkMarshal.StringIntoSpan(fullname, lname);
+
+                    fixed (Silk.NET.OpenXR.Action* aptr = &MappedActions[j, i])
+                        hmd.Xr.CreateAction(hmd.globalActionSet, &action_info, aptr);
+                }
+            }
+
+            string allInputDetected = "";
+
+            // probe bindings for all profiles
+            for (int i=0; i<InteractionProfiles.Length; i++)
+            {
+                ulong profile = 0;
+                hmd.Xr.StringToPath(hmd.Instance, InteractionProfiles[i], ref profile);
+
+                List<ActionSuggestedBinding> bindings = new List<ActionSuggestedBinding>();
+                // for each hand...
+                for (int hand=0; hand<2; hand++)
+                {
+                    // for each path we want to bind...
+                    for (int path=0; path<HAND_PATH_COUNT; path++)
+                    {
+                        // list all possible paths that might be valid and pick the first one
+                        List<string> possiblePaths = PathPriorities[path];
+                        for (int pathattempt=0; pathattempt<possiblePaths.Count; pathattempt++)
+                        {
+                            // get the hand at the start, then put in the attempt
+                            string final_path = hand == (int)TouchControllerHand.Left ? "/user/hand/left" : "/user/hand/right";
+                            final_path += possiblePaths[pathattempt];
+
+                            ulong hp_ulong = 0;
+                            hmd.Xr.StringToPath(hmd.Instance, final_path, ref hp_ulong);
+
+                            var suggest = new ActionSuggestedBinding()
+                            {
+                                Action = MappedActions[hand, path],
+                                Binding = hp_ulong
+                            };
+
+                            if (IsPathSupported(hmd, profile, &suggest))
+                            {
+                                // note that this controller has a touchpad/thumbstick
+                                switch ((HAND_PATHS)path)
+                                {
+                                    case HAND_PATHS.ThumbstickX:
+                                        HasThumbsticks.Add(profile);
+                                        break;
+                                    case HAND_PATHS.TrackpadX:
+                                        HasTouchpads.Add(profile);
+                                        break;
+                                }
+
+                                if (LogInputDetected)
+                                    allInputDetected += "\nGot " + final_path + " for " + InteractionProfiles[i];
+
+                                // got one!
+                                bindings.Add(suggest);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // ok, we got all supported paths for this profile, lets do the final suggestion with all of them
+                if (bindings.Count > 0)
+                {
+                    ActionSuggestedBinding[] final_bindings = bindings.ToArray();
+                    fixed (ActionSuggestedBinding* asbptr = &final_bindings[0])
+                    {
+                        InteractionProfileSuggestedBinding suggested_bindings = new InteractionProfileSuggestedBinding()
+                        {
+                            Type = StructureType.TypeInteractionProfileSuggestedBinding,
+                            InteractionProfile = profile,
+                            CountSuggestedBindings = (uint)final_bindings.Length,
+                            SuggestedBindings = asbptr
+                        };
+
+                        OpenXRHmd.CheckResult(hmd.Xr.SuggestInteractionProfileBinding(hmd.Instance, &suggested_bindings), "SuggestInteractionProfileBinding");
+                    }
+                }
+            }
+
+            if (LogInputDetected)
+                ErrorFileLogger.WriteLogToFile(allInputDetected);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.VirtualReality/OpenXR/OpenXrTouchController.cs b/sources/engine/Xenko.VirtualReality/OpenXR/OpenXrTouchController.cs
new file mode 100644
index 0000000000..f78c114e87
--- /dev/null
+++ b/sources/engine/Xenko.VirtualReality/OpenXR/OpenXrTouchController.cs
@@ -0,0 +1,319 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Silk.NET.OpenXR;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+
+namespace Xenko.VirtualReality
+{
+    class OpenXrTouchController : TouchController
+    {
+        private OpenXRHmd baseHMD;
+        private SpaceLocation handLocation;
+        private TouchControllerHand myHand;
+
+        public ulong[] hand_paths = new ulong[12];
+
+        private bool[,] buttonWasDown = new bool[(int)TouchControllerButton.MaxCount, 2];
+
+        public Space myAimSpace, myGripSpace;
+        public Silk.NET.OpenXR.Action myAimAction, myGripAction;
+
+        public OpenXrTouchController(OpenXRHmd hmd, TouchControllerHand whichHand)
+        {
+            baseHMD = hmd;
+            handLocation.Type = StructureType.TypeSpaceLocation;
+            myHand = whichHand;
+
+            myAimAction = OpenXRInput.MappedActions[(int)myHand, (int)OpenXRInput.HAND_PATHS.AimPosition];
+            ActionSpaceCreateInfo action_space_info = new ActionSpaceCreateInfo()
+            {
+                Type = StructureType.TypeActionSpaceCreateInfo,
+                Action = myAimAction,
+                PoseInActionSpace = new Posef(new Quaternionf(0f, 0f, 0f, 1f), new Vector3f(0f, 0f, 0f)),
+            };
+            OpenXRHmd.CheckResult(baseHMD.Xr.CreateActionSpace(baseHMD.globalSession, in action_space_info, ref myAimSpace), "CreateActionSpaceAim");
+
+            myGripAction = OpenXRInput.MappedActions[(int)myHand, (int)OpenXRInput.HAND_PATHS.GripPosition];
+            ActionSpaceCreateInfo action_grip_space_info = new ActionSpaceCreateInfo()
+            {
+                Type = StructureType.TypeActionSpaceCreateInfo,
+                Action = myGripAction,
+                PoseInActionSpace = action_space_info.PoseInActionSpace,
+            };
+            OpenXRHmd.CheckResult(baseHMD.Xr.CreateActionSpace(baseHMD.globalSession, in action_grip_space_info, ref myGripSpace), "CreateActionSpaceGrip");
+        }
+
+        private Vector3 currentPos;
+        public override Vector3 Position => currentPos;
+
+        private Quaternion currentRot;
+        public override Quaternion Rotation => currentRot;
+
+        private Vector3 currentVel;
+        public override Vector3 LinearVelocity => currentVel;
+
+        private Vector3 currentAngVel;
+        public override Vector3 AngularVelocity => currentAngVel;
+
+        public override DeviceState State => (handLocation.LocationFlags & SpaceLocationFlags.SpaceLocationPositionValidBit) != 0 ? DeviceState.Valid : DeviceState.OutOfRange;
+
+        public override bool SwapTouchpadJoystick { get; set; }
+
+        private Quaternion? holdOffsetGrip, holdOffsetPoint;
+        private float _holdoffset_grip, _holdoffset_point;
+
+        /// <summary>
+        /// Shortcut to setting offset for both grip and point
+        /// </summary>
+        public override float HoldAngleOffset
+        {
+            set
+            {
+                HoldAngleOffset_Grip = value;
+                HoldAngleOffset_Point = value;
+            }
+        }
+
+        public override float HoldAngleOffset_Grip
+        {
+            get => _holdoffset_grip; 
+            set
+            {
+                _holdoffset_grip = value;
+                holdOffsetGrip = value == 0 ? null : Quaternion.RotationXDeg(_holdoffset_grip);
+            }
+        }
+
+        public override float HoldAngleOffset_Point {
+            get => _holdoffset_point;
+            set
+            {
+                _holdoffset_point = value;
+                holdOffsetPoint = value == 0 ? null : Quaternion.RotationXDeg(_holdoffset_point);
+            }
+        }
+
+        public override bool HasThumbstick { get; internal set; }
+
+        public override bool HasTouchpad { get; internal set; }
+
+        public override float Trigger => OpenXRInput.GetActionFloat(myHand, TouchControllerButton.Trigger, out _, OpenXRInput.INPUT_DESIRED.VALUE);
+
+        public override float Grip => OpenXRInput.GetActionFloat(myHand, TouchControllerButton.Grip, out _, OpenXRInput.INPUT_DESIRED.VALUE);
+
+        public override bool IndexPointing => false;
+
+        public override bool IndexResting => false;
+
+        public override bool ThumbUp => false;
+
+        public override bool ThumbResting => false;
+
+        public override Vector2 TouchpadAxis => GetAxis((int)TouchControllerButton.Touchpad);
+
+        public override Vector2 ThumbstickAxis => GetAxis((int)TouchControllerButton.Thumbstick);
+
+        public override string DebugControllerState()
+        {
+            string val = "TouchpadAxis: " + TouchpadAxis.ToString() + "\n" +
+                         "ThumbstickAxis: " + ThumbstickAxis.ToString() + "\n";
+            for (int i=0;i<8;i++)
+            {
+                TouchControllerButton tcb = (TouchControllerButton)i;
+                val += tcb.ToString() + "Pressed: " + IsPressed(tcb) + "\n";
+                val += tcb.ToString() + "Down: " + IsPressedDown(tcb) + "\n";
+                val += tcb.ToString() + "Released: " + IsPressReleased(tcb) + "\n";
+            }
+            return val;
+        }
+
+        internal TouchControllerButton PickCorrectAxis(TouchControllerButton asked)
+        {
+            // first check swap
+            if (SwapTouchpadJoystick)
+            {
+                switch (asked)
+                {
+                    case TouchControllerButton.Thumbstick:
+                        asked = TouchControllerButton.Touchpad;
+                        break;
+                    case TouchControllerButton.Touchpad:
+                        asked = TouchControllerButton.Thumbstick;
+                        break;
+                }
+            }
+
+            // if this isn't available, try the other one
+            switch(asked)
+            {
+                case TouchControllerButton.Touchpad:
+                    return HasTouchpad ? TouchControllerButton.Touchpad : TouchControllerButton.Thumbstick;
+                case TouchControllerButton.Thumbstick:
+                    return HasThumbstick ? TouchControllerButton.Thumbstick : TouchControllerButton.Touchpad;
+            }
+
+            return asked;
+        }
+
+        public override Vector2 GetAxis(int index)
+        {
+            TouchControllerButton button = PickCorrectAxis(index == 0 ? TouchControllerButton.Thumbstick : TouchControllerButton.Touchpad);
+
+            return new Vector2(OpenXRInput.GetActionFloat(myHand, button, out _, OpenXRInput.INPUT_DESIRED.XAXIS),
+                               OpenXRInput.GetActionFloat(myHand, button, out _, OpenXRInput.INPUT_DESIRED.YAXIS));
+        }
+
+        public override bool IsPressed(TouchControllerButton button)
+        {
+            return OpenXRInput.GetActionBool(myHand, PickCorrectAxis(button), out _);
+        }
+
+        public override bool IsPressedDown(TouchControllerButton button)
+        {
+            bool isDownNow = OpenXRInput.GetActionBool(myHand, PickCorrectAxis(button), out _);
+            bool wasPressedDown = isDownNow && buttonWasDown[(int)button, 1] == false;
+            buttonWasDown[(int)button, 0] = isDownNow;
+            return wasPressedDown;
+        }
+
+        public override bool IsPressReleased(TouchControllerButton button)
+        {
+            bool isDownNow = OpenXRInput.GetActionBool(myHand, PickCorrectAxis(button), out _);
+            bool wasReleasedUp = !isDownNow && buttonWasDown[(int)button, 1] == true;
+            buttonWasDown[(int)button, 0] = isDownNow;
+            return wasReleasedUp;
+        }
+
+        public override bool IsTouched(TouchControllerButton button)
+        {
+            // unsupported right now
+            return false;
+        }
+
+        public override bool IsTouchedDown(TouchControllerButton button)
+        {
+            // unsupported right now
+            return false;
+        }
+
+        public override bool IsTouchReleased(TouchControllerButton button)
+        {
+            // unsupported right now
+            return false;
+        }
+
+        public override unsafe bool Vibrate(double? duration = null, float frequency = 0f, float amplitude = 1f)
+        {
+            HapticActionInfo hai = new HapticActionInfo()
+            {
+                Action = OpenXRInput.MappedActions[(int)myHand, (int)OpenXRInput.HAND_PATHS.HapticOut],
+                Type = StructureType.TypeHapticActionInfo               
+            };
+
+            HapticVibration hv = new HapticVibration()
+            {
+                Amplitude = amplitude,                
+                Frequency = frequency,
+                Duration = duration.HasValue ? (long)Math.Round(1000000000.0 * duration.Value) : -1,
+                Type = StructureType.TypeHapticVibration
+            };
+
+            return baseHMD.Xr.ApplyHapticFeedback(baseHMD.globalSession, &hai, (HapticBaseHeader*)&hv) == Result.Success;
+        }
+
+        public override unsafe void Update(GameTime time)
+        {
+            // move our data on historical button down state over
+            for (int i = 0; i < (int)TouchControllerButton.MaxCount; i++)
+                buttonWasDown[i, 1] = buttonWasDown[i, 0];
+
+            ActionStatePose hand_pose_state = new ActionStatePose()
+            {
+                Type = StructureType.TypeActionStatePose,
+            };
+
+            ActionStateGetInfo get_info = new ActionStateGetInfo()
+            {
+                Type = StructureType.TypeActionStateGetInfo,
+                Action = UseGripInsteadOfAimPose ? myGripAction : myAimAction,
+            };
+
+            SpaceVelocity sv = new SpaceVelocity()
+            {
+                Type = StructureType.TypeSpaceVelocity
+            };
+
+            handLocation.Next = &sv;
+
+            baseHMD.Xr.GetActionStatePose(baseHMD.globalSession, in get_info, ref hand_pose_state);
+
+            baseHMD.Xr.LocateSpace(UseGripInsteadOfAimPose ? myGripSpace : myAimSpace, baseHMD.globalPlaySpace,
+                                   baseHMD.globalFrameState.PredictedDisplayTime, ref handLocation);
+
+            // apply scaling and offset early, which might be needed for velocity backup calculation
+            bool hasBodyRot = baseHMD.BodyRotation != Quaternion.Identity;
+            if (hasBodyRot)
+            {
+                Vector3 handpos = new Vector3(handLocation.Pose.Position.X - baseHMD._rotCenter.X,
+                                              handLocation.Pose.Position.Y,
+                                              handLocation.Pose.Position.Z - baseHMD._rotCenter.Z);
+                Quaternion lbr = baseHMD.BodyRotation;
+                Vector3.Transform(ref handpos, ref lbr, out handpos);
+                handLocation.Pose.Position.X = handpos.X;
+                handLocation.Pose.Position.Y = handpos.Y;
+                handLocation.Pose.Position.Z = handpos.Z;
+            }
+            handLocation.Pose.Position.X *= baseHMD.BodyScaling;
+            handLocation.Pose.Position.Y *= baseHMD.BodyScaling;
+            handLocation.Pose.Position.Z *= baseHMD.BodyScaling;
+            handLocation.Pose.Position.X += baseHMD.BodyOffset.X;
+            handLocation.Pose.Position.Y += baseHMD.BodyOffset.Y;
+            handLocation.Pose.Position.Z += baseHMD.BodyOffset.Z;
+
+            if ((sv.VelocityFlags & SpaceVelocityFlags.SpaceVelocityLinearValidBit) == 0 || sv.LinearVelocity.X == 0f && sv.LinearVelocity.Y == 0f && sv.LinearVelocity.Z == 0f)
+            {
+                // invalid linear velocity, try calculating it based on position difference
+                currentVel.X = handLocation.Pose.Position.X - currentPos.X;
+                currentVel.Y = handLocation.Pose.Position.Y - currentPos.Y;
+                currentVel.Z = handLocation.Pose.Position.Z - currentPos.Z;
+                currentVel /= (float)time.Elapsed.TotalSeconds;
+            }
+            else
+            {
+                currentVel.X = sv.LinearVelocity.X;
+                currentVel.Y = sv.LinearVelocity.Y;
+                currentVel.Z = sv.LinearVelocity.Z;
+            }
+
+            currentAngVel.X = sv.AngularVelocity.X;
+            currentAngVel.Y = sv.AngularVelocity.Y;
+            currentAngVel.Z = sv.AngularVelocity.Z;
+
+            currentPos.X = handLocation.Pose.Position.X;
+            currentPos.Y = handLocation.Pose.Position.Y;
+            currentPos.Z = handLocation.Pose.Position.Z;
+
+            currentVel *= baseHMD.BodyScaling;
+
+            Quaternion? holdOffset = UseGripInsteadOfAimPose ? holdOffsetGrip : holdOffsetPoint;
+
+            if (holdOffset.HasValue)
+            {
+                Quaternion orig = new Quaternion(handLocation.Pose.Orientation.X, handLocation.Pose.Orientation.Y,
+                                                 handLocation.Pose.Orientation.Z, handLocation.Pose.Orientation.W);
+                currentRot = holdOffset.Value * orig;
+            }
+            else
+            {
+                currentRot.X = handLocation.Pose.Orientation.X;
+                currentRot.Y = handLocation.Pose.Orientation.Y;
+                currentRot.Z = handLocation.Pose.Orientation.Z;
+                currentRot.W = handLocation.Pose.Orientation.W;
+            }
+
+            if (hasBodyRot) currentRot *= baseHMD.BodyRotation;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.VirtualReality/TouchController.cs b/sources/engine/Xenko.VirtualReality/TouchController.cs
index 4f8cbd71b1..38180cf648 100644
--- a/sources/engine/Xenko.VirtualReality/TouchController.cs
+++ b/sources/engine/Xenko.VirtualReality/TouchController.cs
@@ -8,6 +8,8 @@ namespace Xenko.VirtualReality
 {
     public abstract class TouchController : IDisposable
     {
+        public virtual VRDevice HostDevice { get; internal set; }
+
         public abstract Vector3 Position { get; }
 
         public abstract Quaternion Rotation { get; }
@@ -18,10 +20,24 @@ public abstract class TouchController : IDisposable
 
         public abstract DeviceState State { get; }
 
+        public virtual bool UseGripInsteadOfAimPose { get; set; }
+
         public virtual void Update(GameTime time)
         {           
         }
 
+        public abstract bool SwapTouchpadJoystick { get; set; }
+
+        public abstract bool HasTouchpad { get; internal set; }
+
+        public abstract bool HasThumbstick { get; internal set;  }
+
+        public abstract float HoldAngleOffset { set; }
+
+        public abstract float HoldAngleOffset_Grip { get; set; }
+
+        public abstract float HoldAngleOffset_Point { get; set; }
+
         public abstract float Trigger { get; }
 
         public abstract float Grip { get; }
@@ -34,10 +50,19 @@ public virtual void Update(GameTime time)
 
         public abstract bool ThumbResting { get; }
 
-        public abstract Vector2 ThumbAxis { get; }
+        public abstract Vector2 TouchpadAxis { get; }
 
         public abstract Vector2 ThumbstickAxis { get; }
 
+        /// <summary>
+        /// Vibrate the controller
+        /// </summary>
+        /// <param name="duration">Duration of vibration in seconds. If null, defaults to OpenXR's MIN_HAPTIC</param>
+        /// <param name="frequency">Frequency of the duration. Defaults to 0, which is optimally picked by runtime. 3000hz is another option</param>
+        /// <param name="amplitude">How big is the vibration? Defaults to 100%</param>
+        /// <returns>true if successful</returns>
+        public abstract bool Vibrate(double? duration = null, float frequency = 0f, float amplitude = 1f);
+
         /// <summary>
         /// Returns true if in this frame the button switched to pressed state
         /// </summary>
@@ -73,6 +98,13 @@ public virtual void Update(GameTime time)
         /// <returns></returns>
         public abstract bool IsTouched(TouchControllerButton button);
 
+        /// <summary>
+        /// Get a general axis result of the controller
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        public abstract Vector2 GetAxis(int index);
+
         /// <summary>
         /// Returns true if in this frame the button was released
         /// </summary>
@@ -80,6 +112,8 @@ public virtual void Update(GameTime time)
         /// <returns></returns>
         public abstract bool IsTouchReleased(TouchControllerButton button);
 
+        public abstract string DebugControllerState();
+
         public virtual void Dispose()
         {          
         }
diff --git a/sources/engine/Xenko.VirtualReality/TouchControllerButton.cs b/sources/engine/Xenko.VirtualReality/TouchControllerButton.cs
index 1d763dd5a2..ee5b45ab57 100644
--- a/sources/engine/Xenko.VirtualReality/TouchControllerButton.cs
+++ b/sources/engine/Xenko.VirtualReality/TouchControllerButton.cs
@@ -4,62 +4,14 @@ namespace Xenko.VirtualReality
 {
     public enum TouchControllerButton
     {
-        /// <summary>
-        /// Oculus: Thumbstick
-        /// Vive: Thumb trackpad
-        /// Windows Mixed Reality: Thumbstick
-        /// </summary>
-        Thumbstick,
-
-        /// <summary>
-        /// Oculus: Thumbstick
-        /// Vive: Thumb trackpad
-        /// Windows Mixed Reality: Touchpad
-        /// </summary>
-        Touchpad,
-        /// <summary>
-        /// Oculus: A
-        /// Windows Mixed Reality: Right half of right touchpad
-        /// </summary>
-        A,
-
-        /// <summary>
-        /// Oculus: B
-        /// Windows Mixed Reality: Left half of right touchpad
-        /// </summary>
-        B,
-
-        /// <summary>
-        /// Oculus: X
-        /// Windows Mixed Reality: Left half of left touchpad
-        /// </summary>
-        X,
-
-        /// <summary>
-        /// Oculus: Y
-        /// Windows Mixed Reality: Right half of left touchpad
-        /// </summary>
-        Y,
-
-        /// <summary>
-        /// Oculus: Trigger
-        /// Vive : Trigger
-        /// Windows Mixed Reality: Trigger
-        /// </summary>
-        Trigger,
-
-        /// <summary>
-        /// Oculus: Grip
-        /// Vive: Grip
-        /// Windows Mixed Reality: Grip
-        /// </summary>
-        Grip,
-
-        /// <summary>
-        /// Oculus: Left controller menu button
-        /// Vive: Both controllers menu button
-        /// Windows Mixed Reality: Both controllers menu button
-        /// </summary>
-        Menu,
+        Thumbstick = 0,
+        Touchpad = 1,
+        ButtonXA = 2,
+        ButtonYB = 3,
+        Trigger = 4,
+        Grip = 5,
+        Menu = 6,
+        System = 7,
+        MaxCount = 8
     }
 }
diff --git a/sources/engine/Xenko.VirtualReality/TouchControllerHand.cs b/sources/engine/Xenko.VirtualReality/TouchControllerHand.cs
index d609996f28..b461631f0c 100644
--- a/sources/engine/Xenko.VirtualReality/TouchControllerHand.cs
+++ b/sources/engine/Xenko.VirtualReality/TouchControllerHand.cs
@@ -6,5 +6,6 @@ public enum TouchControllerHand
     {
         Left,
         Right,
+        None
     }
 }
diff --git a/sources/engine/Xenko.VirtualReality/TrackedItem.cs b/sources/engine/Xenko.VirtualReality/TrackedItem.cs
deleted file mode 100644
index ffa32f266c..0000000000
--- a/sources/engine/Xenko.VirtualReality/TrackedItem.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-
-namespace Xenko.VirtualReality
-{
-    public abstract class TrackedItem : IDisposable
-    {
-        public abstract Vector3 Position { get; }
-
-        public abstract Quaternion Rotation { get; }
-
-        public abstract Vector3 LinearVelocity { get; }
-
-        public abstract Vector3 AngularVelocity { get; }
-
-        public abstract DeviceState State { get; }
-
-        public abstract DeviceClass Class { get; }
-
-        public abstract string SerialNumber { get; }
-
-        public abstract float BatteryPercentage { get; }
-
-        public virtual void Update(GameTime time)
-        {           
-        }
-
-        public virtual void Dispose()
-        {          
-        }
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/VRApi.cs b/sources/engine/Xenko.VirtualReality/VRApi.cs
index 30df93c9ea..ce7f1131b4 100644
--- a/sources/engine/Xenko.VirtualReality/VRApi.cs
+++ b/sources/engine/Xenko.VirtualReality/VRApi.cs
@@ -4,11 +4,6 @@ namespace Xenko.VirtualReality
 {
     public enum VRApi
     {
-        Oculus = 0,
-        OpenVR = 1,
-        WindowsMixedReality = 2,
-        Dummy = 100,
-        //Fove,
-        //Google,
+        OpenXR = 2
     }
 }
diff --git a/sources/engine/Xenko.VirtualReality/VRDevice.cs b/sources/engine/Xenko.VirtualReality/VRDevice.cs
index 28bcae58b2..d97e02b313 100644
--- a/sources/engine/Xenko.VirtualReality/VRDevice.cs
+++ b/sources/engine/Xenko.VirtualReality/VRDevice.cs
@@ -13,14 +13,10 @@ public abstract class VRDevice : IDisposable
 
         protected VRDevice()
         {
-            ViewScaling = 1.0f;
+            BodyScaling = 1.0f;
         }
 
-        public abstract Size2 OptimalRenderFrameSize { get; }
-
-        public abstract Size2 ActualRenderFrameSize { get; protected set; }
-
-        public abstract Texture MirrorTexture { get; protected set; }
+        public abstract Size2 ActualRenderFrameSize { get; }
 
         public abstract float RenderFrameScaling { get; set; }
 
@@ -38,30 +34,48 @@ protected VRDevice()
 
         public abstract TouchController RightHand { get; }
 
-        public abstract TrackedItem[] TrackedItems { get; }
+        public abstract ulong PoseCount { get; }
 
         public VRApi VRApi { get; protected set; }
 
         /// <summary>
-        /// Allows you to scale the view, effectively it will change the size of the player in respect to the world, turning it into a giant or a tiny ant.
+        /// Allows you to scale your whole body, effectively it will change the size of the player in respect to the world, turning it into a giant or a tiny ant.
         /// </summary>
         /// <remarks>This will reduce the near clip plane of the cameras, it might induce depth issues.</remarks>
-        public float ViewScaling { get; set; }
+        public float BodyScaling { get; set; }
 
-        public abstract bool CanInitialize { get; }
+        /// <summary>
+        /// Translate the player and controllers by this value, if it exists
+        /// </summary>
+        public Vector3 BodyOffset { get; set; } = Vector3.Zero;
 
-        public bool SupportsOverlays { get; protected set; } = false;
+        /// <summary>
+        /// If you want to ignore all camera (and parent) rotations and use this as the base rotation your head rotation is added to, set it here.
+        /// </summary>
+        public Quaternion? BaseRotationOverride { get; set; } = null;
 
-        public virtual VROverlay CreateOverlay(int width, int height, int mipLevels, int sampleCount)
-        {
-            return null;
+        /// <summary>
+        /// Like BodyOffset, this will rotate the player and controllers accordingly. Very useful for snap turning in-place. DO NOT use this for pitch/roll.
+        /// </summary>
+        public Quaternion BodyRotation {
+            get => _br;
+            set
+            {
+                if (_br != value)
+                {
+                    _br = value;
+                    _rotCenter = rawHeadPos;
+                }
+            }
         }
 
-        public virtual void ReleaseOverlay(VROverlay overlay)
-        {         
-        }
+        internal Vector3 rawHeadPos;
+        private Quaternion _br = Quaternion.Identity;
+        internal Vector3 _rotCenter = Vector3.Zero;
 
-        public abstract void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, bool requireMirror, int mirrorWidth, int mirrorHeight);
+        public abstract bool CanInitialize { get; }
+
+        public abstract void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, VRDeviceSystem.MIRROR_OPTION requireMirror);
 
         public virtual void Recenter()
         {
@@ -71,16 +85,20 @@ public virtual void SetTrackingSpace(TrackingSpace space)
         {
         }
 
-        public abstract void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Matrix cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection);
+        public abstract void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Quaternion cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection);
 
         public abstract void Commit(CommandList commandList, Texture renderFrame);
 
+        public virtual void Flush() { }
+
         public virtual void Dispose()
         {           
         }
 
         public abstract void Update(GameTime gameTime);
 
+        public abstract void UpdatePositions(GameTime gameTime);
+
         public abstract void Draw(GameTime gameTime);
     }
 }
diff --git a/sources/engine/Xenko.VirtualReality/VRDeviceSystem.cs b/sources/engine/Xenko.VirtualReality/VRDeviceSystem.cs
index 676b73e312..258362993d 100644
--- a/sources/engine/Xenko.VirtualReality/VRDeviceSystem.cs
+++ b/sources/engine/Xenko.VirtualReality/VRDeviceSystem.cs
@@ -11,27 +11,96 @@ namespace Xenko.VirtualReality
 {
     public class VRDeviceSystem : GameSystemBase
     {
+        /// <summary>
+        /// Mirroring options
+        /// </summary>
+        public enum MIRROR_OPTION
+        {
+            NONE = 0,
+            BOTH_EYES = 1,
+            SINGLE_EYE = 2
+        };
+
+        /// <summary>
+        /// An active instance of the VRDeviceSystem
+        /// </summary>
+        public static VRDeviceSystem GetSystem { get; private set; }
+
+        /// <summary>
+        /// Is VR currently active and initialized? May take some frames to start returning true.
+        /// </summary>
+        public static bool VRActive
+        {
+            get
+            {
+                return GetSystem != null && GetSystem.Enabled && GetSystem.Device != null;
+            }
+        }
+
+        /// <summary>
+        /// Action to run when VR is fully initialized and ready to go. Argument is the initialized VRDevice
+        /// </summary>
+        public static Action<VRDevice> OnVRInitialized;
+
+        /// <summary>
+        /// Swap hands at a low level? Easy way to have right hand act like the left hand and vice versa.
+        /// </summary>
+        public bool SwapControllerHands;
+
+        /// <summary>
+        /// Which VR button to activate UI? Defaults to trigger.
+        /// </summary>
+        public static TouchControllerButton UIActivationButton = TouchControllerButton.Trigger;
+
+        /// <summary>
+        /// Which VR button to activate UI like you were right clicking a mouse? Defaults to Grip. Can be null if you don't want a second activation button.
+        /// </summary>
+        public static TouchControllerButton? UIActivationButton2 = TouchControllerButton.Grip;
+
+        /// <summary>
+        /// Which hand will be used to track pointer positions on UIComponents using that feature?
+        /// </summary>
+        public static TouchControllerHand UITrackingHand = TouchControllerHand.Right;
+
+        /// <summary>
+        /// Shortcut to getting VR hands
+        /// </summary>
+        /// <param name="hand">Which hand?</param>
+        /// <returns>TouchController object, otherwise null</returns>
+        public TouchController GetController(TouchControllerHand hand)
+        {
+            if (Device == null) return null;
+
+            switch(hand)
+            {
+                case TouchControllerHand.Left:
+                    return SwapControllerHands ? Device.RightHand : Device.LeftHand;
+                case TouchControllerHand.Right:
+                    return SwapControllerHands ? Device.LeftHand : Device.RightHand;
+                default:
+                    return null;
+            }
+        }
+
         private static bool physicalDeviceInUse;
 
         public VRDeviceSystem(IServiceRegistry registry) : base(registry)
         {
+            GetSystem = this;
+
             EnabledChanged += OnEnabledChanged;
 
             DrawOrder = -100;
             UpdateOrder = -100;
         }
 
-        public VRApi[] PreferredApis;
+        public VRApi PreferredApi;
 
-        public Dictionary<VRApi, float> PreferredScalings;
+        public float PreferredScalings;
 
         public VRDevice Device { get; private set; }
 
-        public bool RequireMirror;
-
-        public int MirrorWidth;
-
-        public int MirrorHeight;
+        public MIRROR_OPTION RequireMirror;
 
         public bool PreviousUseCustomProjectionMatrix;
 
@@ -45,10 +114,7 @@ private void OnEnabledChanged(object sender, EventArgs eventArgs)
         {
             if (Enabled && Device == null)
             {
-                if (PreferredApis == null)
-                {
-                    return;
-                }
+                double refreshRate = 90.0;
 
                 if (physicalDeviceInUse)
                 {
@@ -56,71 +122,25 @@ private void OnEnabledChanged(object sender, EventArgs eventArgs)
                     goto postswitch;
                 }
 
-                foreach (var hmdApi in PreferredApis)
+                switch (PreferredApi)
                 {
-                    switch (hmdApi)
-                    {
-                        case VRApi.Dummy:
-                        {
-                            Device = new DummyDevice(Services);
-                            break;
-                        }
-                        case VRApi.Oculus:
-                        {
-#if XENKO_GRAPHICS_API_DIRECT3D11
-                            Device = new OculusOvrHmd();
-                                
-#endif
-                            break;
-                        }
-                        case VRApi.OpenVR:
-                        {
-#if XENKO_GRAPHICS_API_DIRECT3D11
-                            Device = new OpenVRHmd();
-#endif
-                            break;
-                        }
-                        case VRApi.WindowsMixedReality:
-                        {
-#if XENKO_GRAPHICS_API_DIRECT3D11 && XENKO_PLATFORM_UWP
-                            if (Windows.Graphics.Holographic.HolographicSpace.IsAvailable && GraphicsDevice.Presenter is WindowsMixedRealityGraphicsPresenter)
-                            {
-                                Device = new WindowsMixedRealityHmd();
-                            }
+                    case VRApi.OpenXR:
+#if XENKO_GRAPHICS_API_VULKAN
+                        Device = new OpenXRHmd(Game);
 #endif
-                            break;
-                        }
-                        //case VRApi.Fove:
-                        //{
-                        //#if XENKO_GRAPHICS_API_DIRECT3D11
-                        //    Device = new FoveHmd();
-                        //#endif
-                        //break;
-                        //}
-                        //case VRApi.Google:
-                        //{
-                        //#if XENKO_PLATFORM_IOS || XENKO_PLATFORM_ANDROID
-                        //    VRDevice = new GoogleVrHmd();
-                        //#endif
-                        //    break;
-                        //}
-                        default:
-                            throw new ArgumentOutOfRangeException();
-                    }
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
+                }
 
-                    if (Device != null)
+                if (Device != null)
+                {
+                    Device.Game = Game;
+
+                    if (Device != null && !Device.CanInitialize)
                     {
-                        Device.Game = Game;
-
-                        if (Device != null && !Device.CanInitialize)
-                        {
-                            Device.Dispose();
-                            Device = null;
-                        }
-                        else
-                        {
-                            break;
-                        }
+                        Device.Dispose();
+                        Device = null;
                     }
                 }
 
@@ -129,20 +149,27 @@ private void OnEnabledChanged(object sender, EventArgs eventArgs)
                 var deviceManager = (GraphicsDeviceManager)Services.GetService<IGraphicsDeviceManager>();
                 if (Device != null)
                 {
-                    Device.RenderFrameScaling = PreferredScalings[Device.VRApi];
-                    Device.Enable(GraphicsDevice, deviceManager, RequireMirror, MirrorWidth, MirrorHeight);
+                    Game.TreatNotFocusedLikeMinimized = false;
+                    Game.DrawEvenMinimized = true;
+                    Game.IsFixedTimeStep = false;
+                    deviceManager.SynchronizeWithVerticalRetrace = false;
+
+                    Device.RenderFrameScaling = PreferredScalings;
+                    Device.Enable(GraphicsDevice, deviceManager, RequireMirror);
+                    Device.SetTrackingSpace(TrackingSpace.Standing);
                     physicalDeviceInUse = true;
+
+                    // WaitGetPoses should throttle our application, so don't do it elsewhere
+                    Game.TargetElapsedTime = TimeSpan.Zero;
+                    Game.WindowMinimumUpdateRate.MinimumElapsedTime = TimeSpan.Zero;
+                    Game.MinimizedMinimumUpdateRate.MinimumElapsedTime = TimeSpan.Zero;
                 }
-                else
-                {
-                    //fallback to dummy device
-                    Device = new DummyDevice(Services)
-                    {
-                        Game = Game,
-                        RenderFrameScaling = 1.0f,
-                    };
-                    Device.Enable(GraphicsDevice, deviceManager, RequireMirror, MirrorWidth, MirrorHeight);
-                }
+
+                // init virtual buttons for use with VR input
+                Xenko.Input.VirtualButton.RegisterExternalVirtualButtonType(typeof(Xenko.VirtualReality.VRButtons));
+
+                // run actions when VR is initialized?
+                if (Device != null && OnVRInitialized != null) OnVRInitialized(Device);
             }
         }
 
@@ -160,11 +187,7 @@ protected override void Destroy()
         {
             if (Device != null)
             {
-                if (!(Device is DummyDevice))
-                {
-                    physicalDeviceInUse = false;
-                }
-
+                physicalDeviceInUse = false;
                 Device.Dispose();
                 Device = null;
             }
diff --git a/sources/engine/Xenko.VirtualReality/VROverlay.cs b/sources/engine/Xenko.VirtualReality/VROverlay.cs
deleted file mode 100644
index 284db20487..0000000000
--- a/sources/engine/Xenko.VirtualReality/VROverlay.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using Xenko.Core.Mathematics;
-using Xenko.Graphics;
-
-namespace Xenko.VirtualReality
-{
-    public abstract class VROverlay
-    {
-        public Vector3 Position;
-
-        public Quaternion Rotation;
-
-        public Vector2 SurfaceSize;
-
-        public bool FollowHeadRotation;
-
-        public virtual bool Enabled { get; set; } = true;
-
-        public int Width { get; protected set; }
-
-        public int Height { get; protected set; }
-
-        public abstract void Dispose();
-
-        public abstract void UpdateSurface(CommandList commandList, Texture texture);
-    }
-}
diff --git a/sources/engine/Xenko.VirtualReality/VirtualButton.VR.cs b/sources/engine/Xenko.VirtualReality/VirtualButton.VR.cs
new file mode 100644
index 0000000000..bd55f2d8f7
--- /dev/null
+++ b/sources/engine/Xenko.VirtualReality/VirtualButton.VR.cs
@@ -0,0 +1,204 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Core.Mathematics;
+using Xenko.Input;
+
+namespace Xenko.VirtualReality
+{
+    /// <summary>
+    /// VR virtual button.
+    /// </summary>
+    public class VRButtons : VirtualButton
+    {
+        public static readonly VirtualButton RightTrigger = new VRButtons("RightTrigger", (int)TouchControllerButton.Trigger | (1 << 16));
+
+        public static readonly VirtualButton RightXA = new VRButtons("RightXA", (int)TouchControllerButton.ButtonXA | (1 << 16));
+
+        public static readonly VirtualButton RightYB = new VRButtons("RightYB", (int)TouchControllerButton.ButtonYB | (1 << 16));
+
+        public static readonly VirtualButton RightMenu = new VRButtons("RightMenu", (int)TouchControllerButton.Menu | (1 << 16));
+
+        public static readonly VirtualButton RightGrip = new VRButtons("RightGrip", (int)TouchControllerButton.Grip | (1 << 16));
+
+        public static readonly VirtualButton RightThumbstickUp = new VRButtons("RightThumbstickUp", (int)TouchControllerButton.Thumbstick | (1 << 16) | (0 << 17), true);
+
+        public static readonly VirtualButton RightThumbstickDown = new VRButtons("RightThumbstickDown", (int)TouchControllerButton.Thumbstick | (1 << 16) | (1 << 17), true);
+
+        public static readonly VirtualButton RightThumbstickLeft = new VRButtons("RightThumbstickLeft", (int)TouchControllerButton.Thumbstick | (1 << 16) | (2 << 17), true);
+
+        public static readonly VirtualButton RightThumbstickRight = new VRButtons("RightThumbstickRight", (int)TouchControllerButton.Thumbstick | (1 << 16) | (3 << 17), true);
+
+        public static readonly VirtualButton RightThumbstickCenter = new VRButtons("RightThumbstickCenter", (int)TouchControllerButton.Thumbstick | (1 << 16) | (4 << 17), true);
+
+        public static readonly VirtualButton RightTouchpadUp = new VRButtons("RightTouchpadUp", (int)TouchControllerButton.Touchpad | (1 << 16) | (0 << 17), true);
+
+        public static readonly VirtualButton RightTouchpadDown = new VRButtons("RightTouchpadDown", (int)TouchControllerButton.Touchpad | (1 << 16) | (1 << 17), true);
+
+        public static readonly VirtualButton RightTouchpadLeft = new VRButtons("RightTouchpadLeft", (int)TouchControllerButton.Touchpad | (1 << 16) | (2 << 17), true);
+
+        public static readonly VirtualButton RightTouchpadRight = new VRButtons("RightTouchpadRight", (int)TouchControllerButton.Touchpad | (1 << 16) | (3 << 17), true);
+
+        public static readonly VirtualButton RightTouchpadCenter = new VRButtons("RightTouchpadCenter", (int)TouchControllerButton.Touchpad | (1 << 16) | (4 << 17), true);
+
+        public static readonly VirtualButton LeftTrigger = new VRButtons("LeftTrigger", (int)TouchControllerButton.Trigger);
+
+        public static readonly VirtualButton LeftXA = new VRButtons("LeftXA", (int)TouchControllerButton.ButtonXA);
+
+        public static readonly VirtualButton LeftYB = new VRButtons("LeftYB", (int)TouchControllerButton.ButtonYB);
+
+        public static readonly VirtualButton LeftMenu = new VRButtons("LeftMenu", (int)TouchControllerButton.Menu);
+
+        public static readonly VirtualButton LeftGrip = new VRButtons("LeftGrip", (int)TouchControllerButton.Grip);
+
+        public static readonly VirtualButton LeftThumbstickUp = new VRButtons("LeftThumbstickUp", (int)TouchControllerButton.Thumbstick | (0 << 17), true);
+
+        public static readonly VirtualButton LeftThumbstickDown = new VRButtons("LeftThumbstickDown", (int)TouchControllerButton.Thumbstick | (1 << 17), true);
+
+        public static readonly VirtualButton LeftThumbstickLeft = new VRButtons("LeftThumbstickLeft", (int)TouchControllerButton.Thumbstick | (2 << 17), true);
+
+        public static readonly VirtualButton LeftThumbstickRight = new VRButtons("LeftThumbstickRight", (int)TouchControllerButton.Thumbstick | (3 << 17), true);
+
+        public static readonly VirtualButton LeftThumbstickCenter = new VRButtons("LeftThumbstickCenter", (int)TouchControllerButton.Thumbstick | (4 << 17), true);
+
+        public static readonly VirtualButton LeftTouchpadUp = new VRButtons("LeftTouchpadUp", (int)TouchControllerButton.Touchpad | (0 << 17), true);
+
+        public static readonly VirtualButton LeftTouchpadDown = new VRButtons("LeftTouchpadDown", (int)TouchControllerButton.Touchpad | (1 << 17), true);
+
+        public static readonly VirtualButton LeftTouchpadLeft = new VRButtons("LeftTouchpadLeft", (int)TouchControllerButton.Touchpad | (2 << 17), true);
+
+        public static readonly VirtualButton LeftTouchpadRight = new VRButtons("LeftTouchpadRight", (int)TouchControllerButton.Touchpad | (3 << 17), true);
+
+        public static readonly VirtualButton LeftTouchpadCenter = new VRButtons("LeftTouchpadCenter", (int)TouchControllerButton.Touchpad | (4 << 17), true);
+
+        protected VRButtons(string name, int id, bool isPositiveAndNegative = false)
+            : base(name, VirtualButtonType.VR, id, isPositiveAndNegative)
+        {
+        }
+
+        public bool IsRightHand => ((Index & (1 << 16)) != 0) == !VRDeviceSystem.GetSystem.SwapControllerHands;
+        public bool IsRightHandIgnoreSwapped => ((Index & (1 << 16)) != 0);
+        public TouchControllerButton GetTouchControllerButton => (TouchControllerButton)(Index & 0xFF);
+
+        public override float GetValue()
+        {
+            TouchController tc = VRDeviceSystem.GetSystem?.GetController((Index & (1 << 16)) != 0 ? TouchControllerHand.Right : TouchControllerHand.Left);
+            if (tc == null) return 0f;
+            TouchControllerButton button = (TouchControllerButton)(Index & 0xFF);
+            switch (button)
+            {
+                case TouchControllerButton.Grip:
+                    return tc.Grip;
+                case TouchControllerButton.Thumbstick:
+                    return (Index & (1 << 17)) != 0 ? tc.ThumbstickAxis.Y : tc.ThumbstickAxis.X;
+                case TouchControllerButton.Touchpad:
+                    return (Index & (1 << 17)) != 0 ? tc.TouchpadAxis.Y : tc.TouchpadAxis.X;
+                case TouchControllerButton.Trigger:
+                    return tc.Trigger;
+                default:
+                    return tc.IsPressed(button) ? 1f : 0f;
+            }
+        }
+
+        public override bool IsDown()
+        {
+            TouchController tc = VRDeviceSystem.GetSystem?.GetController((Index & (1 << 16)) != 0 ? TouchControllerHand.Right : TouchControllerHand.Left);
+            if (tc == null) return false;
+            TouchControllerButton strippedButton = (TouchControllerButton)(Index & 0xFF);
+            if (tc.IsPressed(strippedButton) == false) return false;
+            Vector2 axis;
+            switch (strippedButton)
+            {
+                default:
+                    return true;
+                case TouchControllerButton.Thumbstick:
+                    axis = tc.ThumbstickAxis;
+                    break;
+                case TouchControllerButton.Touchpad:
+                    axis = tc.TouchpadAxis;
+                    break;
+            }
+            switch (Index >> 17)
+            {
+                case 0: // up
+                    return axis.Y > 0.5f;
+                case 1: // down
+                    return axis.Y < -0.5f;
+                case 2: // left
+                    return axis.X < -0.5f;
+                case 3: // right
+                    return axis.X > 0.5f;
+                case 4: // center
+                    return axis.X > -0.5f && axis.X < 0.5f && axis.Y < 0.5f && axis.Y > -0.5f;
+            }
+            return false;
+        }
+
+        public override bool IsPressed()
+        {
+            TouchController tc = VRDeviceSystem.GetSystem?.GetController((Index & (1 << 16)) != 0 ? TouchControllerHand.Right : TouchControllerHand.Left);
+            if (tc == null) return false;
+            TouchControllerButton strippedButton = (TouchControllerButton)(Index & 0xFF);
+            if (tc.IsPressedDown(strippedButton) == false) return false;
+            Vector2 axis;
+            switch (strippedButton)
+            {
+                default:
+                    return true;
+                case TouchControllerButton.Thumbstick:
+                    axis = tc.ThumbstickAxis;
+                    break;
+                case TouchControllerButton.Touchpad:
+                    axis = tc.TouchpadAxis;
+                    break;
+            }
+            switch (Index >> 17)
+            {
+                case 0: // up
+                    return axis.Y > 0.5f;
+                case 1: // down
+                    return axis.Y < -0.5f;
+                case 2: // left
+                    return axis.X < -0.5f;
+                case 3: // right
+                    return axis.X > 0.5f;
+                case 4: // center
+                    return axis.X > -0.5f && axis.X < 0.5f && axis.Y < 0.5f && axis.Y > -0.5f;
+            }
+            return false;
+        }
+
+        public override bool IsReleased()
+        {
+            TouchController tc = VRDeviceSystem.GetSystem?.GetController((Index & (1 << 16)) != 0 ? TouchControllerHand.Right : TouchControllerHand.Left);
+            if (tc == null) return false;
+            TouchControllerButton strippedButton = (TouchControllerButton)(Index & 0xFF);
+            if (tc.IsPressReleased(strippedButton) == false) return false;
+            Vector2 axis;
+            switch (strippedButton)
+            {
+                default:
+                    return true;
+                case TouchControllerButton.Thumbstick:
+                    axis = tc.ThumbstickAxis;
+                    break;
+                case TouchControllerButton.Touchpad:
+                    axis = tc.TouchpadAxis;
+                    break;
+            }
+            switch (Index >> 17)
+            {
+                case 0: // up
+                    return axis.Y > 0.5f;
+                case 1: // down
+                    return axis.Y < -0.5f;
+                case 2: // left
+                    return axis.X < -0.5f;
+                case 3: // right
+                    return axis.X > 0.5f;
+                case 4: // center
+                    return axis.X > -0.5f && axis.X < 0.5f && axis.Y < 0.5f && axis.Y > -0.5f;
+            }
+            return false;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.VirtualReality/WindowsMixedReality/SystemNumericsExtensions.cs b/sources/engine/Xenko.VirtualReality/WindowsMixedReality/SystemNumericsExtensions.cs
deleted file mode 100644
index f578d012e5..0000000000
--- a/sources/engine/Xenko.VirtualReality/WindowsMixedReality/SystemNumericsExtensions.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_PLATFORM_UWP
-
-using Xenko.Core.Mathematics;
-
-namespace Xenko.VirtualReality
-{
-    internal static class SystemNumericsExtensions
-    {
-        /// <summary>
-        /// Performs a conversion from <see cref="System.Numerics.Matrix4x4"/> to <see cref="Xenko.Core.Mathematics.Matrix"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static Matrix ToMatrix(this System.Numerics.Matrix4x4 value)
-        {
-            return new Matrix()
-            {
-                M11 = value.M11, M12 = value.M12, M13 = value.M13, M14 = value.M14,
-                M21 = value.M21, M22 = value.M22, M23 = value.M23, M24 = value.M24,
-                M31 = value.M31, M32 = value.M32, M33 = value.M33, M34 = value.M34,
-                M41 = value.M41, M42 = value.M42, M43 = value.M43, M44 = value.M44
-            };
-        }
-
-        /// <summary>
-        /// Performs a conversion from <see cref="System.Numerics.Quaternion"/> to <see cref="Xenko.Core.Mathematics.Quaternion"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static Quaternion ToQuaternion(this System.Numerics.Quaternion value)
-        {
-            return new Quaternion(value.X, value.Y, value.Z, value.W);
-        }
-
-        /// <summary>
-        /// Performs a conversion from <see cref="System.Numerics.Vector3"/> to <see cref="Xenko.Core.Mathematics.Vector3"/>.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static Vector3 ToVector3(this System.Numerics.Vector3 value)
-        {
-            return new Vector3(value.X, value.Y, value.Z);
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/WindowsMixedReality/WindowsMixedRealityHmd.cs b/sources/engine/Xenko.VirtualReality/WindowsMixedReality/WindowsMixedRealityHmd.cs
deleted file mode 100644
index c16f652020..0000000000
--- a/sources/engine/Xenko.VirtualReality/WindowsMixedReality/WindowsMixedRealityHmd.cs
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_DIRECT3D11 && XENKO_PLATFORM_UWP
-
-using Windows.Graphics.DirectX.Direct3D11;
-using Windows.Graphics.Holographic;
-using Windows.Perception.Spatial;
-using Windows.UI.Input.Spatial;
-using Xenko.Core.Mathematics;
-using Xenko.Games;
-using Xenko.Graphics;
-
-namespace Xenko.VirtualReality
-{
-    internal class WindowsMixedRealityHmd : VRDevice
-    {
-        private Matrix currentView = Matrix.Identity;
-        private WindowsMixedRealityGraphicsPresenter graphicsPresenter;
-        private HolographicCamera holographicCamera;
-        private HolographicSpace holographicSpace;
-        private SpatialInteractionManager interactionManager;
-        private DeviceState internalState;
-        private WindowsMixedRealityTouchController leftHandController;
-        private WindowsMixedRealityTouchController rightHandController;
-        private SpatialLocation spatialLocation;
-        private SpatialLocator spatialLocator;
-        private SpatialStationaryFrameOfReference stationaryReferenceFrame;
-
-        public WindowsMixedRealityHmd()
-        {
-            VRApi = VRApi.WindowsMixedReality;
-            SupportsOverlays = false;
-        }
-
-        public override Size2 OptimalRenderFrameSize => ActualRenderFrameSize;
-
-        public override Size2 ActualRenderFrameSize
-        {
-            get => new Size2((int)holographicCamera.RenderTargetSize.Width * 2, (int)holographicCamera.RenderTargetSize.Height);
-            protected set { }
-        }
-
-        public override Texture MirrorTexture { get; protected set; }
-
-        public override float RenderFrameScaling
-        {
-            get => (float)holographicCamera.ViewportScaleFactor;
-            set { if (holographicCamera != null) holographicCamera.ViewportScaleFactor = value; }
-        }
-
-        public override DeviceState State => internalState;
-
-        public override Vector3 HeadPosition => spatialLocation.Position.ToVector3();
-
-        public override Quaternion HeadRotation => spatialLocation.Orientation.ToQuaternion();
-
-        public override Vector3 HeadLinearVelocity => spatialLocation.AbsoluteLinearVelocity.ToVector3();
-
-        public override Vector3 HeadAngularVelocity => spatialLocation.AbsoluteAngularVelocity.ToQuaternion().YawPitchRoll;
-
-        public override TouchController LeftHand => leftHandController;
-
-        public override TouchController RightHand => rightHandController;
-
-        public override TrackedItem[] TrackedItems => new TrackedItem[0];
-
-        public override bool CanInitialize => true;
-
-        public override void Commit(CommandList commandList, Texture renderFrame)
-        {
-            // On versions of the platform that support the CommitDirect3D11DepthBuffer API, we can
-            // provide the depth buffer to the system, and it will use depth information to stabilize
-            // the image at a per-pixel level.
-            var pose = graphicsPresenter.HolographicFrame.CurrentPrediction.CameraPoses[0];
-            HolographicCameraRenderingParameters renderingParameters = graphicsPresenter.HolographicFrame.GetRenderingParameters(pose);
-            SharpDX.Direct3D11.Texture2D depthBuffer = new SharpDX.Direct3D11.Texture2D(commandList.DepthStencilBuffer.NativeResource.NativePointer);
-
-            // Direct3D interop APIs are used to provide the buffer to the WinRT API.
-            SharpDX.DXGI.Resource1 depthStencilResource = depthBuffer.QueryInterface<SharpDX.DXGI.Resource1>();
-            SharpDX.DXGI.Surface2 depthDxgiSurface = new SharpDX.DXGI.Surface2(depthStencilResource, 0);
-            IDirect3DSurface depthD3DSurface = WindowsMixedRealityGraphicsPresenter.CreateDirect3DSurface(depthDxgiSurface.NativePointer);
-
-            if (depthD3DSurface != null)
-            {
-                // Calling CommitDirect3D11DepthBuffer causes the system to queue Direct3D commands to
-                // read the depth buffer. It will then use that information to stabilize the image as
-                // the HolographicFrame is presented.
-                renderingParameters.CommitDirect3D11DepthBuffer(depthD3DSurface);
-            }
-        }
-
-        public override void Draw(GameTime gameTime)
-        {
-        }
-
-        public override void Enable(GraphicsDevice device, GraphicsDeviceManager graphicsDeviceManager, bool requireMirror, int mirrorWidth, int mirrorHeight)
-        {
-            HolographicSpace.IsAvailableChanged += HolographicSpace_IsAvailableChanged;
-            HolographicSpace_IsAvailableChanged(null, null);
-
-            graphicsPresenter = device.Presenter as WindowsMixedRealityGraphicsPresenter;
-
-            holographicSpace = graphicsPresenter.NativePresenter as HolographicSpace;
-            holographicCamera = graphicsPresenter.HolographicFrame.CurrentPrediction.CameraPoses[0].HolographicCamera;
-
-            interactionManager = SpatialInteractionManager.GetForCurrentView();
-
-            leftHandController = new WindowsMixedRealityTouchController(TouchControllerHand.Left, interactionManager);
-            rightHandController = new WindowsMixedRealityTouchController(TouchControllerHand.Right, interactionManager);
-
-            MirrorTexture = graphicsPresenter.BackBuffer;
-        }
-
-        public override void ReadEyeParameters(Eyes eye, float near, float far, ref Vector3 cameraPosition, ref Matrix cameraRotation, bool ignoreHeadRotation, bool ignoreHeadPosition, out Matrix view, out Matrix projection)
-        {
-            var cameraPose = graphicsPresenter.HolographicFrame.CurrentPrediction.CameraPoses[0];
-
-            cameraPose.HolographicCamera.SetNearPlaneDistance(near);
-            cameraPose.HolographicCamera.SetFarPlaneDistance(far);
-
-            var viewTransform = cameraPose.TryGetViewTransform(stationaryReferenceFrame.CoordinateSystem);
-
-            if (viewTransform.HasValue)
-            {
-                currentView = eye == Eyes.Left
-                    ? viewTransform.Value.Left.ToMatrix()
-                    : viewTransform.Value.Right.ToMatrix();
-            }
-
-            if (ignoreHeadPosition)
-            {
-                currentView.TranslationVector = Vector3.Zero;
-            }
-
-            if (ignoreHeadRotation)
-            {
-                // keep the scale just in case
-                currentView.Row1 = new Vector4(currentView.Row1.Length(), 0, 0, 0);
-                currentView.Row2 = new Vector4(0, currentView.Row2.Length(), 0, 0);
-                currentView.Row3 = new Vector4(0, 0, currentView.Row3.Length(), 0);
-            }
-
-            view = Matrix.Translation(-cameraPosition) * cameraRotation * currentView;
-
-            projection = eye == Eyes.Left
-                ? cameraPose.ProjectionTransform.Left.ToMatrix()
-                : cameraPose.ProjectionTransform.Right.ToMatrix();
-        }
-
-        public override void Update(GameTime gameTime)
-        {
-            HolographicFramePrediction prediction = graphicsPresenter.HolographicFrame.CurrentPrediction;
-
-            SpatialCoordinateSystem coordinateSystem = stationaryReferenceFrame.CoordinateSystem;
-            spatialLocation = spatialLocator.TryLocateAtTimestamp(prediction.Timestamp, coordinateSystem);
-
-            leftHandController.Update(prediction.Timestamp, coordinateSystem);
-            rightHandController.Update(prediction.Timestamp, coordinateSystem);
-        }
-
-        private void HolographicSpace_IsAvailableChanged(object sender, object e)
-        {
-            internalState = HolographicSpace.IsAvailable ? DeviceState.Valid : DeviceState.Invalid;
-
-            HolographicDisplay holographicDisplay = HolographicDisplay.GetDefault();
-            SpatialLocator newSpatialLocator = holographicDisplay?.SpatialLocator;
-
-            if (spatialLocator != newSpatialLocator)
-            {
-                if (spatialLocator != null)
-                {
-                    spatialLocator.LocatabilityChanged -= SpatialLocator_LocatabilityChanged;
-                    spatialLocator = null;
-                }
-
-                if (newSpatialLocator != null)
-                {
-                    spatialLocator = newSpatialLocator;
-                    spatialLocator.LocatabilityChanged += SpatialLocator_LocatabilityChanged;
-                    stationaryReferenceFrame = spatialLocator.CreateStationaryFrameOfReferenceAtCurrentLocation();
-                }
-            }
-        }
-
-        private void SpatialLocator_LocatabilityChanged(SpatialLocator sender, object args)
-        {
-            switch (sender.Locatability)
-            {
-                case SpatialLocatability.Unavailable:
-                    internalState = DeviceState.Invalid;
-                    break;
-                default:
-                    internalState = DeviceState.Valid;
-                    break;
-            }
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/WindowsMixedReality/WindowsMixedRealityTouchController.cs b/sources/engine/Xenko.VirtualReality/WindowsMixedReality/WindowsMixedRealityTouchController.cs
deleted file mode 100644
index db24da438e..0000000000
--- a/sources/engine/Xenko.VirtualReality/WindowsMixedReality/WindowsMixedRealityTouchController.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-#if XENKO_GRAPHICS_API_DIRECT3D11 && XENKO_PLATFORM_UWP
-
-using Windows.Perception;
-using Windows.Perception.Spatial;
-using Windows.UI.Input.Spatial;
-using Xenko.Core.Mathematics;
-
-namespace Xenko.VirtualReality
-{
-    internal class WindowsMixedRealityTouchController : TouchController
-    {
-        private readonly SpatialInteractionSourceHandedness hand;
-        private readonly SpatialInteractionManager interactionManager;
-
-        private Vector3 currentAngularVelocity;
-        private Vector3 currentLinearVelocity;
-        private Vector3 currentPosition;
-        private Quaternion currentRotation = Quaternion.Identity;
-        private SpatialInteractionSourceState currentState;
-        private DeviceState internalState;
-        private SpatialInteractionSourceState previousState;
-
-        internal WindowsMixedRealityTouchController(TouchControllerHand hand, SpatialInteractionManager interactionManager)
-        {
-            this.hand = (SpatialInteractionSourceHandedness)(hand + 1);
-            this.interactionManager = interactionManager;
-
-            interactionManager.SourceLost += InteractionManager_SourceLost;
-        }
-
-        public override Vector3 Position => currentPosition;
-
-        public override Quaternion Rotation => currentRotation;
-
-        public override Vector3 LinearVelocity => currentLinearVelocity;
-
-        public override Vector3 AngularVelocity => currentAngularVelocity;
-
-        public override DeviceState State => internalState;
-
-        public override float Trigger => (float)currentState.SelectPressedValue;
-
-        public override float Grip => currentState.IsGrasped ? 1.0f : 0.0f;
-
-        public override bool IndexPointing => false;
-
-        public override bool IndexResting => true;
-
-        public override bool ThumbUp => !currentState.ControllerProperties.IsTouchpadTouched;
-
-        public override bool ThumbResting => currentState.ControllerProperties.IsTouchpadTouched;
-
-        public override Vector2 ThumbAxis => new Vector2((float)currentState.ControllerProperties.TouchpadX, (float)currentState.ControllerProperties.TouchpadY);
-
-        public override Vector2 ThumbstickAxis => new Vector2((float)currentState.ControllerProperties.ThumbstickX, (float)currentState.ControllerProperties.ThumbstickY);
-
-        public override bool IsPressed(TouchControllerButton button) => IsButtonPressed(button, currentState);
-
-        public override bool IsPressedDown(TouchControllerButton button) => !IsButtonPressed(button, previousState) ? IsButtonPressed(button, currentState) : false;
-
-        public override bool IsPressReleased(TouchControllerButton button) => IsButtonPressed(button, previousState) ? !IsButtonPressed(button, currentState) : false;
-
-        public override bool IsTouched(TouchControllerButton button) => !IsButtonTouched(button, currentState);
-
-        public override bool IsTouchedDown(TouchControllerButton button) => !IsButtonTouched(button, previousState) ? IsButtonTouched(button, currentState) : false;
-
-        public override bool IsTouchReleased(TouchControllerButton button) => IsButtonTouched(button, previousState) ? !IsButtonTouched(button, currentState) : false;
-
-        public void Update(PerceptionTimestamp timeStamp, SpatialCoordinateSystem coordinateSystem)
-        {
-            var states = interactionManager.GetDetectedSourcesAtTimestamp(timeStamp);
-
-            foreach (SpatialInteractionSourceState state in states)
-            {
-                if (state.Source.Handedness == hand)
-                {
-                    SpatialInteractionSourceLocation location = state.Properties.TryGetLocation(coordinateSystem);
-
-                    if (location != null)
-                    {
-                        SetSpatialInteractionSourceLocation(location);
-                    }
-
-                    previousState = currentState;
-                    currentState = state;
-
-                    internalState = previousState != null ? DeviceState.Valid : DeviceState.Invalid;
-                }
-            }
-        }
-
-        private bool IsButtonPressed(TouchControllerButton button, SpatialInteractionSourceState state)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Thumbstick:
-                    return state.ControllerProperties.IsThumbstickPressed;
-                case TouchControllerButton.Touchpad:
-                    return state.ControllerProperties.IsTouchpadPressed;
-                case TouchControllerButton.A when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Right:
-                    return ThumbAxis.X >= 0.0f;
-                case TouchControllerButton.B when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Right:
-                    return ThumbAxis.X < 0.0f;
-                case TouchControllerButton.X when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Left:
-                    return ThumbAxis.X < 0.0f;
-                case TouchControllerButton.Y when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Left:
-                    return ThumbAxis.X >= 0.0f;
-                case TouchControllerButton.Trigger:
-                    return state.IsSelectPressed;
-                case TouchControllerButton.Grip:
-                    return state.IsGrasped;
-                case TouchControllerButton.Menu:
-                    return state.IsMenuPressed;
-                default:
-                    return false;
-            }
-        }
-
-        private bool IsButtonTouched(TouchControllerButton button, SpatialInteractionSourceState state)
-        {
-            switch (button)
-            {
-                case TouchControllerButton.Touchpad:
-                    return state.ControllerProperties.IsTouchpadTouched;
-                case TouchControllerButton.A when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Right:
-                    return ThumbAxis.X >= 0.0f;
-                case TouchControllerButton.B when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Right:
-                    return ThumbAxis.X < 0.0f;
-                case TouchControllerButton.X when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Left:
-                    return ThumbAxis.X < 0.0f;
-                case TouchControllerButton.Y when state.ControllerProperties.IsTouchpadPressed && hand == SpatialInteractionSourceHandedness.Left:
-                    return ThumbAxis.X >= 0.0f;
-                default:
-                    return false;
-            }
-        }
-
-        private void InteractionManager_SourceLost(SpatialInteractionManager sender, SpatialInteractionSourceEventArgs args)
-        {
-            if (args.State.Source.Handedness == hand)
-            {
-                internalState = DeviceState.Invalid;
-
-                previousState = null;
-                currentState = null;
-            }
-        }
-
-        private void SetSpatialInteractionSourceLocation(SpatialInteractionSourceLocation location)
-        {
-            currentPosition = location.Position?.ToVector3() ?? currentPosition;
-            currentRotation = location.Orientation?.ToQuaternion() ?? currentRotation;
-            currentLinearVelocity = location.Velocity?.ToVector3() ?? currentLinearVelocity;
-            currentAngularVelocity = location.AngularVelocity?.ToVector3() ?? currentAngularVelocity;
-        }
-    }
-}
-
-#endif
diff --git a/sources/engine/Xenko.VirtualReality/Xenko.Native.Libs.targets b/sources/engine/Xenko.VirtualReality/Xenko.Native.Libs.targets
deleted file mode 100644
index d6d394f1b3..0000000000
--- a/sources/engine/Xenko.VirtualReality/Xenko.Native.Libs.targets
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    We need both XenkoNativePathLibs and XenkoNativePathLibs2 as in Windows platforms it's a simple string while on other platforms they need to be iterated and processed
-  -->
-  <PropertyGroup>
-    <XenkoNativePathLibs Condition="'$(XenkoPlatform)' == 'Windows'">LibOVR.lib</XenkoNativePathLibs>
-  </PropertyGroup>
-
-  <!--
-  <ItemGroup>
-    <XenkoNativePathLibs2 Condition="'$(XenkoPlatform)' == 'iOS'" Include="$(XenkoDependenciesDir)\GoogleVR\lib\iOS\libgvr.a;" />
-  </ItemGroup>
-  -->
-</Project>
diff --git a/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj b/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj
index 9bc6d2feb0..63629e4cfe 100644
--- a/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj
+++ b/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj
@@ -1,12 +1,10 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
-    <XenkoNativeOutputName>libxenkovr</XenkoNativeOutputName>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -14,34 +12,26 @@
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPublicApi>true</XenkoPublicApi>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
-  <Choose>
-    <When Condition=" '$(XenkoPlatform)' == 'Android'">
-      <ItemGroup>
-        <Reference Include="Mono.Android" />
-        <Reference Include="GoogleVRJava">
-          <HintPath>..\..\..\deps\GoogleVR\lib\Android\GoogleVRJava.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition=" '$(XenkoPlatform)' == 'iOS'">
-      <ItemGroup>
-        <Reference Include="Xamarin.iOS" />
-      </ItemGroup>
-    </When>
-  </Choose>
-  <Choose>
-    <When Condition=" '$(XenkoGraphicsApi)' == 'Direct3D11' Or '$(XenkoGraphicsApi)' == 'Direct3D12' ">
-      <ItemGroup>
-        <XenkoNativeLib Include="..\..\..\deps\OpenVR\$(XenkoPlatform)\**\openvr_api.*">
-          <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-          <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
-          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </XenkoNativeLib>
-      </ItemGroup>
-    </When>
-  </Choose>
+  <ItemGroup Condition="'$(XenkoGraphicsApi)' == 'Direct3D11' Or '$(XenkoGraphicsApi)' == 'Vulkan'">
+    <XenkoNativeLib Include="..\..\..\deps\OpenVR\$(XenkoPlatform)\**\openvr_api.*">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+	  <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+	  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </XenkoNativeLib>
+    <XenkoNativeLib Include="..\..\..\deps\OpenXR\openxr_loader.dll">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </XenkoNativeLib>
+    <XenkoNativeLib Include="..\..\..\deps\WindowsRegistry\Microsoft.Win32.Registry.dll">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+      <RelativePath>%(RecursiveDir)%(Filename)%(Extension)</RelativePath>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </XenkoNativeLib>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
@@ -54,27 +44,12 @@
       <Project>{84deb606-77ed-49cd-9aed-d2b13c1f5a1e}</Project>
       <Name>Xenko.Input</Name>
     </ProjectReference>
+    <PackageReference Include="Silk.NET.OpenXR" Version="2.22.0" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
   </ItemGroup>
+  <Import Project="$(XenkoPostSettingsTargets)" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <ItemGroup>
-    <XenkoContent Condition="'$(XenkoPlatform)' == 'Linux'" Include="Xenko.VirtualReality.dll.config" />
-    <None Include="Xenko.Native.Libs.targets">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="GoogleVR\GoogleVR.cpp" />
-    <None Include="OculusOVR\OculusOVR.cpp" />
-    <None Include="Fove\Fove.cpp" />
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
   </ItemGroup>
-  <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-
-  <PropertyGroup>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-  <Target Name="IncludeExtraAssemblies">
-    <ItemGroup>
-      <BuildOutputInPackage Include="$(OutputPath)GoogleVRJava.dll" Condition=" '$(XenkoPlatform)' == 'Android' " />
-    </ItemGroup>
-  </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.dll.config b/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.dll.config
deleted file mode 100644
index bb70bca1d5..0000000000
--- a/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.dll.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<configuration>
-    <dllmap dll="libxenko" cpu="x86" target="x86/libxenkovr.so"/>
-    <dllmap dll="libxenko" cpu="x86-64" target="x64/libxenkovr.so"/>
-</configuration>
diff --git a/sources/engine/Xenko.Voxels/Module.cs b/sources/engine/Xenko.Voxels/Module.cs
new file mode 100644
index 0000000000..d6aa7b1a06
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Module.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Reflection;
+using Xenko.Core;
+using Xenko.Core.Reflection;
+
+namespace Xenko.Voxels
+{
+    internal class Module
+    {
+        [ModuleInitializer]
+        public static void Initialize()
+        {
+            AssemblyRegistry.Register(typeof(Module).GetTypeInfo().Assembly, AssemblyCommonCategories.Assets);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Properties/AssemblyInfo.cs b/sources/engine/Xenko.Voxels/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..5550c60e8e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Properties/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Xenko.Engine" + Xenko.PublicKeys.Default)]
+[assembly: InternalsVisibleTo("Xenko.Editor" + Xenko.PublicKeys.Default)]
+[assembly: InternalsVisibleTo("Xenko.Assets.Presentation" + Xenko.PublicKeys.Default)]
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/IVoxelVisualization.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/IVoxelVisualization.cs
new file mode 100644
index 0000000000..c7010f37ac
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/IVoxelVisualization.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Rendering.Images;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    public interface IVoxelVisualization
+    {
+        ImageEffectShader GetShader(RenderDrawContext context, VoxelAttribute attr);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawEffect.xksl
new file mode 100644
index 0000000000..9939cb8c8d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawEffect.xksl
@@ -0,0 +1,13 @@
+namespace Xenko.Rendering.Voxels.Debug
+{
+    effect VoxelVisualizationRawEffect
+    {
+        using params VoxelVisualizationRawShaderKeys;
+
+        mixin VoxelVisualizationRawShader;
+        if (VoxelVisualizationRawShaderKeys.Attribute != null)
+        {
+            mixin compose Attribute = VoxelVisualizationRawShaderKeys.Attribute;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawEffect.xksl.cs
new file mode 100644
index 0000000000..6360eb8f54
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawEffect.xksl.cs
@@ -0,0 +1,47 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class VoxelVisualizationRawEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "VoxelVisualizationRawShader");
+                if (context.GetParam(VoxelVisualizationRawShaderKeys.Attribute) != null)
+                {
+
+                    {
+                        var __mixinToCompose__ = context.GetParam(VoxelVisualizationRawShaderKeys.Attribute);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "Attribute", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("VoxelVisualizationRawEffect", new VoxelVisualizationRawEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShader.xksl b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShader.xksl
new file mode 100644
index 0000000000..7960f6c214
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShader.xksl
@@ -0,0 +1,28 @@
+namespace Xenko.Rendering.Voxels.Debug
+{
+    shader VoxelVisualizationRawShader : ImageEffectShader
+    {
+        compose IVoxelSampler Attribute;
+        float2 range;
+        float rangeOffset;
+        float mip;
+
+        stage override float4 Shading()
+        {
+            float2 offsetRange = range + float(abs(range.y-range.x) * rangeOffset).xx;
+            float2 screenPos = streams.TexCoord.xy;
+            screenPos.y = 1.0 - screenPos.y;
+
+            float4 color = float4(0, 0, 0, 0);
+            for (int i = 0; i < 200; i++)
+            {
+                color += Attribute.SampleRaw(float3(streams.TexCoord.x, lerp(offsetRange.x, offsetRange.y, (float)i / 200.0), streams.TexCoord.y), mip-1, (mip>0)?1:0, 0) * (1.0 - color.a);
+                if (color.a > 0.99)
+                {
+                    break;
+                }
+            }
+            return color.xyzz + float4(0.1, 0.1, 0.1, 1.0) * (1.0 - color.a);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShader.xksl.cs
new file mode 100644
index 0000000000..b1ec8bee7c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShader.xksl.cs
@@ -0,0 +1,25 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    public static partial class VoxelVisualizationRawShaderKeys
+    {
+        public static readonly ValueParameterKey<Vector2> range = ParameterKeys.NewValue<Vector2>();
+        public static readonly ValueParameterKey<float> rangeOffset = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<float> mip = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShaderKeys.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShaderKeys.cs
new file mode 100644
index 0000000000..a8f2901588
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationRawShaderKeys.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    public partial class VoxelVisualizationRawShaderKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSource> Attribute = ParameterKeys.NewPermutation<ShaderSource>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewEffect.xksl
new file mode 100644
index 0000000000..9a8587f798
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewEffect.xksl
@@ -0,0 +1,21 @@
+namespace Xenko.Rendering.Voxels.Debug
+{
+    effect VoxelVisualizationViewEffect
+    {
+        using params VoxelVisualizationViewShaderKeys;
+        using params MarchAttributesKeys;
+
+        mixin VoxelVisualizationViewShader;
+        if (VoxelVisualizationViewShaderKeys.marcher != null)
+        {
+            mixin compose marcher = VoxelVisualizationViewShaderKeys.marcher;
+        }
+        if (MarchAttributesKeys.AttributeSamplers != null)
+        {
+            foreach (var attr in MarchAttributesKeys.AttributeSamplers)
+            {
+                mixin compose AttributeSamplers += (attr);
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewEffect.xksl.cs
new file mode 100644
index 0000000000..cfbedef36d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewEffect.xksl.cs
@@ -0,0 +1,62 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class VoxelVisualizationViewEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "VoxelVisualizationViewShader");
+                if (context.GetParam(VoxelVisualizationViewShaderKeys.marcher) != null)
+                {
+
+                    {
+                        var __mixinToCompose__ = context.GetParam(VoxelVisualizationViewShaderKeys.marcher);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "marcher", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                }
+                if (context.GetParam(MarchAttributesKeys.AttributeSamplers) != null)
+                {
+                    foreach(var attr in context.GetParam(MarchAttributesKeys.AttributeSamplers))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributeSamplers", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("VoxelVisualizationViewEffect", new VoxelVisualizationViewEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShader.xksl b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShader.xksl
new file mode 100644
index 0000000000..ae6d9816c9
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShader.xksl
@@ -0,0 +1,28 @@
+namespace Xenko.Rendering.Voxels.Debug
+{
+    shader VoxelVisualizationViewShader : MarchAttributes, ImageEffectShader
+    {
+        compose VoxelMarchMethod marcher;
+
+        float4 background;
+        float4x4 view;
+        float4x4 viewInv;
+
+        stage override float4 Shading()
+        {
+            float2 screenPos = streams.TexCoord.xy;
+            screenPos.y = 1.0 - screenPos.y;
+
+            float4 p1 = mul(float4(screenPos*2.0-1.0,1,1), viewInv);
+            p1.xyz/=p1.w;
+            float4 p2 = mul(float4(0,0,0,1), viewInv);
+            p2.xyz/=p2.w;
+
+            float3 rayDir = normalize( p1.xyz - p2.xyz);
+            float3 rayPos = p2.xyz;
+
+            float4 color = marcher.March(rayPos, rayDir);
+            return color.xyzz + background * saturate(1.0-color.a);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShader.xksl.cs
new file mode 100644
index 0000000000..4079725ebd
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShader.xksl.cs
@@ -0,0 +1,25 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    public static partial class VoxelVisualizationViewShaderKeys
+    {
+        public static readonly ValueParameterKey<Vector4> background = ParameterKeys.NewValue<Vector4>();
+        public static readonly ValueParameterKey<Matrix> view = ParameterKeys.NewValue<Matrix>();
+        public static readonly ValueParameterKey<Matrix> viewInv = ParameterKeys.NewValue<Matrix>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShaderKeys.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShaderKeys.cs
new file mode 100644
index 0000000000..3209283de1
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/Shaders/VoxelVisualizationViewShaderKeys.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    public partial class VoxelVisualizationViewShaderKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSource> marcher = ParameterKeys.NewPermutation<ShaderSource>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/VoxelVisualizationRaw.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/VoxelVisualizationRaw.cs
new file mode 100644
index 0000000000..3ac6d09723
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/VoxelVisualizationRaw.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Rendering.Images;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Debug")]
+    public class VoxelVisualizationRaw : IVoxelVisualization
+    {
+        public int Mipmap = 0;
+        public Vector2 Range = new Vector2(0.0f,1.0f);
+        public int RangeOffset = 0;
+        private ImageEffectShader voxelDebugEffectShader = new ImageEffectShader("VoxelVisualizationRawEffect");
+        public ImageEffectShader GetShader(RenderDrawContext context, VoxelAttribute attr)
+        {
+            VoxelViewContext viewContext = new VoxelViewContext(false);
+            attr.UpdateSamplingLayout("Attribute");
+            attr.ApplySamplingParameters(viewContext, voxelDebugEffectShader.Parameters);
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationRawShaderKeys.Attribute, attr.GetSamplingShader());
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationRawShaderKeys.mip, Mipmap);
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationRawShaderKeys.rangeOffset, RangeOffset);
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationRawShaderKeys.range, Range);
+
+            return voxelDebugEffectShader;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/VoxelVisualizationView.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/VoxelVisualizationView.cs
new file mode 100644
index 0000000000..e2e362e699
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DebugVisualizations/VoxelVisualizationView.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Core;
+using Xenko.Rendering.Images;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Shadows;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Standard")]
+    public class VoxelVisualizationView : IVoxelVisualization
+    {
+        [NotNull]
+        public IVoxelMarchMethod MarchMethod { get; set; } = new VoxelMarchBeam(200, 1.0f, 1.0f);
+
+        public Color Background = new Color(0.1f,0.1f,0.1f,1.0f);
+
+        private ImageEffectShader voxelDebugEffectShader = new ImageEffectShader("VoxelVisualizationViewEffect");
+        public ImageEffectShader GetShader(RenderDrawContext context, VoxelAttribute attr)
+        {
+            VoxelViewContext viewContext = new VoxelViewContext(false);
+            Matrix ViewProjection = context.RenderContext.RenderView.ViewProjection;
+
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationViewShaderKeys.view, ViewProjection);
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationViewShaderKeys.viewInv, Matrix.Invert(ViewProjection));
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationViewShaderKeys.background, (Vector4)Background);
+
+            attr.UpdateSamplingLayout("AttributeSamplers[0]");
+            attr.ApplySamplingParameters(viewContext, voxelDebugEffectShader.Parameters);
+            MarchMethod.UpdateMarchingLayout("marcher");
+            MarchMethod.ApplyMarchingParameters(voxelDebugEffectShader.Parameters);
+            voxelDebugEffectShader.Parameters.Set(VoxelVisualizationViewShaderKeys.marcher, MarchMethod.GetMarchingShader(0));
+
+            ShaderSourceCollection collection = new ShaderSourceCollection
+            {
+                attr.GetSamplingShader()
+            };
+            voxelDebugEffectShader.Parameters.Set(MarchAttributesKeys.AttributeSamplers, collection);
+
+            return voxelDebugEffectShader;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DefaultGraphicsCompositorVoxels.xkgfxcomp b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DefaultGraphicsCompositorVoxels.xkgfxcomp
new file mode 100644
index 0000000000..fda4d4ed5e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/DefaultGraphicsCompositorVoxels.xkgfxcomp
@@ -0,0 +1,209 @@
+!GraphicsCompositorAsset
+Id: 472e6944-3ddc-47db-8d6f-2e0a987475ec
+SerializedVersion: {Xenko: 3.1.0.1}
+Tags: []
+Archetype: 823a81bf-bac0-4552-9267-aeed499c40df:DefaultGraphicsCompositorLevel10
+Cameras:
+    de2e75c3b2b23e54162686363f3f138e:
+        Id: 0ad0a331-55d2-4a3d-8909-05a4493a7d24
+        Name: Main
+RenderStages:
+    47116750c1a5d449b4ad3625f71439b3:
+        Id: 4a600aa5-eda0-4861-a9b4-d200df85da1e
+        Name: Opaque
+        EffectSlotName: Main
+        SortMode: !SortModeStateChange {}
+    9105a30fee026d4893472b6aee83d035:
+        Id: 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+        Name: Transparent
+        EffectSlotName: Main
+        SortMode: !BackToFrontSortMode {}
+    554e52c061404d4684dd7c4c70f70e0e:
+        Id: 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+        Name: ShadowMapCaster
+        EffectSlotName: ShadowMapCaster
+        SortMode: !FrontToBackSortMode {}
+    33d9d311a1a65601da9ef56775477f95:
+        Id: 259cf50a-634a-4ac6-846e-4f843be0a38f
+        Name: GBuffer
+        EffectSlotName: GBuffer
+        SortMode: !FrontToBackSortMode {}
+    54e148fa49ca18c6b30f86e89ec95388*:
+        Id: ffa492d9-b8a2-4d74-abe8-d82c542fc526
+        Name: VoxelizationPassFirst
+        EffectSlotName: Voxelizer
+    eb9689239718d7dab8a56c2ce49b59d3*:
+        Id: ba28c12c-261f-45e6-bd4e-02cf38141f06
+        Name: VoxelizationPassSecond
+        EffectSlotName: Voxelizer2
+RenderFeatures:
+    d8fb80b0e7995140a46bca8dc36ee8a2: !Xenko.Rendering.MeshRenderFeature,Xenko.Rendering
+        RenderStageSelectors:
+            44cf4a95ef82544e9ce3c6507d5569a9: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
+                OpaqueRenderStage: ref!! 4a600aa5-eda0-4861-a9b4-d200df85da1e
+                TransparentRenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+                EffectName: XenkoForwardShadingEffect
+            6f7224048750e7260ea87c444f74b32c: !Xenko.Rendering.Shadows.ShadowMapRenderStageSelector,Xenko.Rendering
+                ShadowMapRenderStage: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+                EffectName: XenkoForwardShadingEffect.ShadowMapCaster
+            106341b76db9fcda6a033dad16aa708b: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
+                OpaqueRenderStage: ref!! 259cf50a-634a-4ac6-846e-4f843be0a38f
+                EffectName: XenkoForwardShadingEffect.ShadowMapCaster
+            1cd2eaa455053c4bb2b0e1b2c156cb3a*: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
+                OpaqueRenderStage: ref!! ffa492d9-b8a2-4d74-abe8-d82c542fc526
+                TransparentRenderStage: ref!! ffa492d9-b8a2-4d74-abe8-d82c542fc526
+                EffectName: XenkoForwardShadingEffectVXGI.VoxelizeToFragmentsEffect
+            3a8978fa14c861d9a85751a80428226a*: !Xenko.Rendering.MeshTransparentRenderStageSelector,Xenko.Rendering
+                OpaqueRenderStage: ref!! ba28c12c-261f-45e6-bd4e-02cf38141f06
+                TransparentRenderStage: ref!! ba28c12c-261f-45e6-bd4e-02cf38141f06
+                EffectName: XenkoForwardShadingEffectVXGI.VoxelizeToFragmentsEffect
+        PipelineProcessors:
+            d70f5aee0616e4ab25081ceaf643290c: !Xenko.Rendering.MeshPipelineProcessor,Xenko.Rendering
+                TransparentRenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+            26c899b17f88c21ab13bf60a7220ccd1: !Xenko.Rendering.ShadowMeshPipelineProcessor,Xenko.Rendering
+                ShadowMapRenderStage: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+            371dd885d403a507d2e779f9d9f0c277*: !Xenko.Rendering.Voxels.VoxelPipelineProcessor,Xenko.Voxels
+                VoxelRenderStage:
+                    ec88b51356d469c565289d94b1a68908: ref!! ffa492d9-b8a2-4d74-abe8-d82c542fc526
+                    991d03d23b97ee4e131f40890c642eeb: ref!! ba28c12c-261f-45e6-bd4e-02cf38141f06
+        RenderFeatures:
+            86b959cbdf51a1438d4973177c77c627: !Xenko.Rendering.TransformRenderFeature,Xenko.Rendering {}
+            8e0351fee9883922648a11016224b195: !Xenko.Rendering.SkinningRenderFeature,Xenko.Rendering {}
+            f5a2017030ba4b28784e804807ce7628: !Xenko.Rendering.Materials.MaterialRenderFeature,Xenko.Rendering {}
+            83fea7526ebe4893a5bad953d0502bfd: !Xenko.Rendering.Shadows.ShadowCasterRenderFeature,Xenko.Rendering {}
+            65743b4380f4cc43b2b4bdc23cd0c07c: !Xenko.Rendering.Lights.ForwardLightingRenderFeature,Xenko.Rendering
+                LightRenderers:
+                    7ac2775468f53c4399b2f3f6357c85c9: !Xenko.Rendering.Lights.LightAmbientRenderer,Xenko.Rendering {}
+                    7b68f9cd17404a4ba9e5f7df72e3b48d: !Xenko.Rendering.Lights.LightDirectionalGroupRenderer,Xenko.Rendering {}
+                    411fdcfb9fc388449a0443173dfa3f27: !Xenko.Rendering.Lights.LightSkyboxRenderer,Xenko.Rendering {}
+                    facdcd5b543cf1c6bdf2138aab6cc473: !Xenko.Rendering.Lights.LightClusteredPointSpotGroupRenderer,Xenko.Rendering {}
+                    79582329a9cf466e960f8920f579de9b: !Xenko.Rendering.Lights.LightPointGroupRenderer,Xenko.Rendering {}
+                    cf0c6bd4198b4cc4aaaab5b54870bdfd: !Xenko.Rendering.Lights.LightSpotGroupRenderer,Xenko.Rendering {}
+                    451af18f3f5c4187cf3fe5f33feb46b1: !Xenko.Rendering.LightProbes.LightProbeRenderer,Xenko.Rendering {}
+                    e658234519ffb99a3f45f76c2ac5a918*: !Xenko.Rendering.Voxels.VoxelGI.LightVoxelRenderer,Xenko.Voxels {}
+                ShadowMapRenderer: !Xenko.Rendering.Shadows.ShadowMapRenderer,Xenko.Rendering
+                    Renderers:
+                        7c3d3d4c86834c3551bacde2527b3836: !Xenko.Rendering.Shadows.LightDirectionalShadowMapRenderer,Xenko.Rendering
+                            ShadowCasterRenderStage: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+                        1c204b09435636256a3fcfd6f9ddb347: !Xenko.Rendering.Shadows.LightSpotShadowMapRenderer,Xenko.Rendering
+                            ShadowCasterRenderStage: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+                        7c8c69ce27034b4c8bbcab0bcdfe954b: !Xenko.Rendering.Shadows.LightPointShadowMapRendererParaboloid,Xenko.Rendering
+                            ShadowCasterRenderStage: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+                        d59ef45dd99e49d3af3887763d153aa7: !Xenko.Rendering.Shadows.LightPointShadowMapRendererCubeMap,Xenko.Rendering
+                            ShadowCasterRenderStage: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+            2731c76697c106b6878b9c989a1b6527*: !Xenko.Rendering.Voxels.VoxelRenderFeature,Xenko.Voxels {}
+    28e9bf54a5adbe063f59fb17acb2723e: !Xenko.Rendering.Sprites.SpriteRenderFeature,Xenko.Rendering
+        RenderStageSelectors:
+            d74665cff080638a2439c4422e542d85: !Xenko.Rendering.Sprites.SpriteTransparentRenderStageSelector,Xenko.Rendering
+                OpaqueRenderStage: ref!! 4a600aa5-eda0-4861-a9b4-d200df85da1e
+                TransparentRenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+                EffectName: Test
+    60780391e205770513fdd53e07279a01: !Xenko.Rendering.Background.BackgroundRenderFeature,Xenko.Rendering
+        RenderStageSelectors:
+            11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
+                RenderStage: ref!! 4a600aa5-eda0-4861-a9b4-d200df85da1e
+                EffectName: Test
+    93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
+        RenderStageSelectors:
+            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Rendering
+                RenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+                EffectName: Test
+    9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
+        RenderStageSelectors:
+            af1bd241305893ef8ff7952184e1cb0b: !Xenko.Particles.Rendering.ParticleEmitterTransparentRenderStageSelector,Xenko.Particles
+                OpaqueRenderStage: ref!! 4a600aa5-eda0-4861-a9b4-d200df85da1e
+                TransparentRenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+                EffectName: null
+        PipelineProcessors: {}
+SharedRenderers:
+    d5b2e71c088247e21556decdce138d96: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
+        Id: 9b1e5aa4-7a90-46b6-b05e-e1877d016a47
+        Clear:
+            Id: 66a42307-1985-4316-871a-768449238c11
+            Color: {R: 0.40491876, G: 0.411895424, B: 0.43775, A: 1.0}
+        LightProbes: true
+        OpaqueRenderStage: ref!! 4a600aa5-eda0-4861-a9b4-d200df85da1e
+        TransparentRenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+        ShadowMapRenderStages:
+            2323a99a8a983e182f318e55604659b0: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+        GBufferRenderStage: ref!! 259cf50a-634a-4ac6-846e-4f843be0a38f
+        PostEffects: null
+        LightShafts: null
+        VRSettings:
+            Enabled: false
+            RequiredApis: {}
+            Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
+        MSAALevel: None
+        MSAAResolver: {}
+    34ecb9b2633eacfc439ba8744fe05102: !PostProcessingEffects
+        Id: dbb783b1-cca8-44b3-8e10-48deaf86f59f
+        AmbientOcclusion:
+            Enabled: false
+        LocalReflections:
+            Enabled: false
+            ResolvePassResolution: Full
+            DepthResolution: Half
+        DepthOfField:
+            Enabled: false
+            DOFAreas: {X: 0.5, Y: 6.0, Z: 50.0, W: 200.0}
+        BrightFilter:
+            Color: {R: 1.0, G: 1.0, B: 1.0}
+        Bloom:
+            Distortion: {X: 1.0, Y: 1.0}
+            Afterimage:
+                Enabled: false
+        LightStreak:
+            Attenuation: 0.7
+        LensFlare: {}
+        ColorTransforms:
+            Transforms:
+                1e06f805f8b2e949a06c30d45fe413ef: !ToneMap
+                    Operator: !ToneMapHejl2Operator {}
+                c57351444609d14ea258b3f511ec8a74: !FilmGrain
+                    Enabled: false
+                e86e22e9a5d65545b8b55fca26e0afee: !Vignetting
+                    Enabled: false
+                    Color: {R: 0.0, G: 0.0, B: 0.0}
+        Antialiasing: !FXAAEffect {}
+    ee80a20a9bd99f2d70711114e15fe7ca: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering
+        Id: 998158f8-004d-4a1d-b97d-c9f408967d94
+        DebugRenderStages: {}
+    1e613773efe82ecea16a632365e3dbf7*: !Xenko.Rendering.Voxels.ForwardRendererVoxels,Xenko.Voxels
+        Id: af83e982-9eed-45f6-be56-1df2674f9859
+        Clear:
+            Id: cdb52f17-46cb-481e-8800-2f4d647bc6cd
+            Color: {R: 0.403921574, G: 0.4117647, B: 0.435294122, A: 1.0}
+        LightProbes: true
+        OpaqueRenderStage: ref!! 4a600aa5-eda0-4861-a9b4-d200df85da1e
+        TransparentRenderStage: ref!! 0d98fb34-5f41-4cc2-b2e2-a1081aae70c4
+        ShadowMapRenderStages:
+            ddf97afe25e23f1680daedd5e5bd5eee: ref!! 5a47fa2e-0966-479a-8ebe-5d2c0dad2be5
+        GBufferRenderStage: ref!! 259cf50a-634a-4ac6-846e-4f843be0a38f
+        PostEffects: !PostProcessingEffects ref!! dbb783b1-cca8-44b3-8e10-48deaf86f59f
+        LightShafts: null
+        VRSettings:
+            Enabled: false
+            RequiredApis: {}
+            Overlays: {}
+        SubsurfaceScatteringBlurEffect: null
+        MSAALevel: None
+        MSAAResolver: {}
+        VoxelRenderer: !Xenko.Rendering.Voxels.VoxelRenderer,Xenko.Voxels
+            VoxelStages:
+                ebc6da9e9cc380a03b62962f06cf721e: ref!! ffa492d9-b8a2-4d74-abe8-d82c542fc526
+                357b97f2667196c0f2740c021ab0a92e: ref!! ba28c12c-261f-45e6-bd4e-02cf38141f06
+        VoxelVisualization: {}
+    60459475d3a3adaf2d1ba5d99913ca75: ~(Deleted)
+Game: !Xenko.Rendering.Compositing.SceneCameraRenderer,Xenko.Engine
+    Id: 76fe87cf-f574-4ad6-85b8-e9a9586be0e2
+    Camera: ref!! 0ad0a331-55d2-4a3d-8909-05a4493a7d24
+    Child: !Xenko.Rendering.Compositing.SceneRendererCollection,Xenko.Rendering
+        Id: 82568e46-92e7-421a-8dca-114a74e0cd69
+        Children:
+            d39c5ddbf8b7d5ca02bafb6496b1cc3c*: !Xenko.Rendering.Voxels.ForwardRendererVoxels,Xenko.Voxels ref!! af83e982-9eed-45f6-be56-1df2674f9859
+            01d338078e9b21121ead0868932613dd: !Xenko.Rendering.Compositing.DebugRenderer,Xenko.Rendering ref!! 998158f8-004d-4a1d-b97d-c9f408967d94
+    RenderMask: All
+SingleView: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine ref!! 9b1e5aa4-7a90-46b6-b05e-e1877d016a47
+Editor*: !Xenko.Rendering.Voxels.ForwardRendererVoxels,Xenko.Voxels ref!! af83e982-9eed-45f6-be56-1df2674f9859
+BlockPositions: {}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/ForwardRendererVoxels.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/ForwardRendererVoxels.cs
new file mode 100644
index 0000000000..0bf2f9f3e9
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/ForwardRendererVoxels.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.InteropServices;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Storage;
+using Xenko.Graphics;
+using Xenko.Rendering.Images;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Shadows;
+using Xenko.Rendering.SubsurfaceScattering;
+using Xenko.VirtualReality;
+using Xenko.Rendering.Compositing;
+using Xenko.Rendering.Voxels.Debug;
+
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// Renders your game. It should use current <see cref="RenderContext.RenderView"/> and <see cref="CameraComponentRendererExtensions.GetCurrentCamera"/>.
+    /// </summary>
+    [Display("Forward & Voxel renderer")]
+    public class ForwardRendererVoxels : ForwardRenderer
+    {
+        public IVoxelRenderer VoxelRenderer { get; set; }
+
+        protected IShadowMapRenderer ShadowMapRenderer_notPrivate;
+
+        public VoxelDebug VoxelVisualization { get; set; }
+
+        protected override void InitializeCore()
+        {
+            ShadowMapRenderer_notPrivate = Context.RenderSystem.RenderFeatures.OfType<MeshRenderFeature>().FirstOrDefault()?.RenderFeatures.OfType<ForwardLightingRenderFeature>().FirstOrDefault()?.ShadowMapRenderer;
+            base.InitializeCore();
+        }
+        protected override void CollectCore(RenderContext context)
+        {
+            VoxelRenderer?.Collect(Context, ShadowMapRenderer_notPrivate);
+            base.CollectCore(context);
+        }
+        protected override void DrawCore(RenderContext context, RenderDrawContext drawContext)
+        {
+            using (drawContext.PushRenderTargetsAndRestore())
+            {
+                VoxelRenderer?.Draw(drawContext, ShadowMapRenderer_notPrivate);
+            }
+
+            base.DrawCore(context, drawContext);
+        }
+
+        protected override void DrawView(RenderContext context, RenderDrawContext drawContext, int eyeIndex, int eyeCount)
+        {
+            base.DrawView(context, drawContext, eyeIndex, eyeCount);
+
+            // Voxel Debug if enabled
+            if (VoxelVisualization != null)
+            {
+                VoxelVisualization.VoxelRenderer = VoxelRenderer;
+                VoxelVisualization.Draw(drawContext, viewOutputTarget);
+            }
+        }
+    }
+}
+
+
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/IVoxelRenderer.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/IVoxelRenderer.cs
new file mode 100644
index 0000000000..1b9dba9d05
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/IVoxelRenderer.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Graphics;
+using Xenko.Rendering;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Shadows;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelRenderer
+    {
+        void Collect(RenderContext Context, IShadowMapRenderer ShadowMapRenderer);
+
+        void Draw(RenderDrawContext drawContext, IShadowMapRenderer ShadowMapRenderer);
+        Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume> GetProcessedVolumes();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelDebug.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelDebug.cs
new file mode 100644
index 0000000000..80945d36e9
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelDebug.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Graphics;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Collections;
+using Xenko.Core.Extensions;
+using Xenko.Core.Mathematics;
+using Xenko.Shaders;
+using Xenko.Rendering.Images;
+using Xenko.Rendering.Voxels;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Skyboxes;
+using System.Linq;
+using Xenko.Rendering.Compositing;
+
+namespace Xenko.Rendering.Voxels.Debug
+{
+    [DataContract("VoxelDebug")]
+    public class VoxelDebug : ImageEffect
+    {
+        [DataMemberIgnore]
+        public IVoxelRenderer VoxelRenderer;
+        protected override void InitializeCore()
+        {
+            base.InitializeCore();
+        }
+        protected override void DrawCore(RenderDrawContext context)
+        {
+            if (!Initialized)
+                Initialize(context.RenderContext);
+
+            if (VoxelRenderer == null)
+            {
+                return;
+            }
+
+            Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume> datas = VoxelRenderer.GetProcessedVolumes();
+            if (datas == null)
+            {
+                return;
+            }
+            foreach (var datapairs in datas)
+            {
+                var data = datapairs.Value;
+
+                if (!data.VisualizeVoxels || data.VoxelVisualization == null || data.VisualizationAttribute == null)
+                    continue;
+
+                ImageEffectShader shader = data.VoxelVisualization.GetShader(context, data.VisualizationAttribute);
+
+                if (shader == null)
+                    continue;
+
+                shader.SetOutput(GetSafeOutput(0));
+
+                shader.Draw(context);
+            }
+        }
+        public void Draw(RenderDrawContext drawContext, Texture output)
+        {
+            SetOutput(output);
+            DrawCore(drawContext);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelPipelineProcessor.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelPipelineProcessor.cs
new file mode 100644
index 0000000000..f912b671b6
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelPipelineProcessor.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System.Collections.Generic;
+using System.ComponentModel;
+using Xenko.Graphics;
+
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// Pipline processor for <see cref="RenderMesh"/> that cast shadows, to properly disable culling and depth clip.
+    /// </summary>
+    public class VoxelPipelineProcessor : PipelineProcessor
+    {
+        public List<RenderStage> VoxelRenderStage { get; set; } = new List<RenderStage>();
+
+        [DefaultValue(false)]
+        public bool DepthClipping { get; set; } = false;
+
+        public override void Process(RenderNodeReference renderNodeReference, ref RenderNode renderNode, RenderObject renderObject, PipelineStateDescription pipelineState)
+        {
+            // Disable culling and depth clip
+            if (VoxelRenderStage.Contains(renderNode.RenderStage))
+            {
+                pipelineState.RasterizerState = new RasterizerStateDescription(CullMode.None) { DepthClipEnable = DepthClipping };
+                pipelineState.DepthStencilState.DepthBufferEnable = false;
+                pipelineState.DepthStencilState.DepthBufferWriteEnable = false;
+                pipelineState.DepthStencilState.StencilEnable = false;
+                pipelineState.DepthStencilState.StencilWriteMask = 0;
+                pipelineState.DepthStencilState.StencilMask = 0;
+                pipelineState.BlendState.RenderTarget0.BlendEnable = false;
+                pipelineState.BlendState.IndependentBlendEnable = false;
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelRenderFeature.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelRenderFeature.cs
new file mode 100644
index 0000000000..88e1ace8a1
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelRenderFeature.cs
@@ -0,0 +1,171 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Storage;
+using Xenko.Core.Threading;
+using Xenko.Graphics;
+using Xenko.Rendering.Shadows;
+using Xenko.Rendering.Voxels;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// A render feature that computes and uploads info for voxelization
+    /// </summary>
+    public class VoxelRenderFeature : SubRenderFeature
+    {
+        [DataMemberIgnore]
+        public static readonly PropertyKey<Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume>> CurrentProcessedVoxelVolumes = new PropertyKey<Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume>>("VoxelRenderFeature.CurrentProcessedVoxelVolumes", typeof(VoxelRenderFeature));
+
+        private Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume> renderVoxelVolumeData;
+        
+        private LogicalGroupReference VoxelizerStorerCasterKey;
+        private StaticObjectPropertyKey<RenderEffect> renderEffectKey;
+
+        protected override void InitializeCore()
+        {
+            base.InitializeCore();
+            renderEffectKey = ((RootEffectRenderFeature)RootRenderFeature).RenderEffectKey;
+            VoxelizerStorerCasterKey = ((RootEffectRenderFeature)RootRenderFeature).CreateViewLogicalGroup("VoxelizerStorer");
+        }
+
+        public override void PrepareEffectPermutations(RenderDrawContext context)
+        {
+            renderVoxelVolumeData = Context.VisibilityGroup.Tags.Get(CurrentProcessedVoxelVolumes);
+            if (renderVoxelVolumeData == null) return;
+
+
+            var renderEffects = RootRenderFeature.RenderData.GetData(renderEffectKey);
+            int effectSlotCount = ((RootEffectRenderFeature)RootRenderFeature).EffectPermutationSlotCount;
+
+
+            var rootEffectRenderFeature = ((RootEffectRenderFeature)RootRenderFeature);
+
+            if (rootEffectRenderFeature == null) return;
+
+            foreach (var processedVolumeKeyValue in renderVoxelVolumeData)
+            {
+                var processedVolume = processedVolumeKeyValue.Value;
+
+                foreach (VoxelizationPass pass in processedVolume.passList.passes)
+                {
+                    pass.storer.UpdateVoxelizationLayout("Storage");
+                    for (int i = 0; i < pass.AttributesIndirect.Count; i++)
+                    {
+                        var attr = pass.AttributesIndirect[i];
+                        attr.UpdateVoxelizationLayout($"AttributesIndirect[{i}]");
+                    }
+                }
+                foreach (var group in processedVolume.groupedPasses)
+                {
+                    //Each pass in a group should have identical shaders
+                    var pass = group[0];
+
+                    Dispatcher.ForEach(RootRenderFeature.RenderObjects, renderObject =>
+                    {
+                        var renderMesh = (RenderMesh)renderObject;
+
+                        var staticObjectNode = renderMesh.StaticObjectNode;
+
+
+                        var effectSlot = rootEffectRenderFeature.GetEffectPermutationSlot(RenderSystem.RenderStages[pass.view.RenderStages[0].Index]);
+                        {
+
+                            var staticEffectObjectNode = staticObjectNode * effectSlotCount + effectSlot.Index;
+                            var renderEffect = renderEffects[staticEffectObjectNode];
+
+                            // Skip effects not used during this frame
+                            if (renderEffect != null)
+                            {
+                                renderEffect.EffectValidator.ValidateParameterThreaded(VoxelizeToFragmentsKeys.Storage, pass.source);
+                                renderEffect.EffectValidator.ValidateParameterThreaded(VoxelizeToFragmentsKeys.RequireGeometryShader, pass.storer.RequireGeometryShader() || pass.method.RequireGeometryShader());
+                                renderEffect.EffectValidator.ValidateParameterThreaded(VoxelizeToFragmentsKeys.GeometryShaderMaxVertexCount, pass.storer.GeometryShaderOutputCount() * pass.method.GeometryShaderOutputCount());
+                            }
+                        }
+                    });
+                }
+            }
+        }
+        public override void Prepare(RenderDrawContext context)
+        {
+            renderVoxelVolumeData = Context.VisibilityGroup.Tags.Get(CurrentProcessedVoxelVolumes);
+            if (renderVoxelVolumeData == null) return;
+
+            foreach (var processedVolumeKeyValue in renderVoxelVolumeData)
+            {
+                var processedVolume = processedVolumeKeyValue.Value;
+                foreach (VoxelizationPass pass in processedVolume.passList.passes)
+                {
+                    var viewFeature = pass.view.Features[RootRenderFeature.Index];
+
+
+                    // Find a PerView layout from an effect in normal state
+                    ViewResourceGroupLayout firstViewLayout = null;
+                    foreach (var viewLayout in viewFeature.Layouts)
+                    {
+                        // Only process view layouts in normal state
+                        if (viewLayout.State != RenderEffectState.Normal)
+                            continue;
+
+                        var viewLighting = viewLayout.GetLogicalGroup(VoxelizerStorerCasterKey);
+                        if (viewLighting.Hash != ObjectId.Empty)
+                        {
+                            firstViewLayout = viewLayout;
+                            break;
+                        }
+                    }
+
+                    // Nothing found for this view (no effects in normal state)
+                    if (firstViewLayout == null)
+                        continue;
+
+                    var viewParameters = new ParameterCollection();
+
+                    var firstViewLighting = firstViewLayout.GetLogicalGroup(VoxelizerStorerCasterKey);
+
+                    // Prepare layout (should be similar for all PerView)
+                    {
+
+                        // Generate layout
+                        var viewParameterLayout = new ParameterCollectionLayout();
+                        viewParameterLayout.ProcessLogicalGroup(firstViewLayout, ref firstViewLighting);
+
+                        viewParameters.UpdateLayout(viewParameterLayout);
+                    }
+
+
+
+                    ParameterCollection VSViewParameters = viewParameters;
+
+                    pass.storer.ApplyVoxelizationParameters(VSViewParameters);
+                    foreach (var attr in processedVolume.Attributes)
+                    {
+                        attr.Attribute.ApplyVoxelizationParameters(VSViewParameters);
+                    }
+
+                    foreach (var viewLayout in viewFeature.Layouts)
+                    {
+                        if (viewLayout.State != RenderEffectState.Normal)
+                            continue;
+
+                        var voxelizerStorer = viewLayout.GetLogicalGroup(VoxelizerStorerCasterKey);
+                        if (voxelizerStorer.Hash == ObjectId.Empty)
+                            continue;
+
+                        if (voxelizerStorer.Hash != firstViewLighting.Hash)
+                            throw new InvalidOperationException("PerView VoxelizerStorer layout differs between different RenderObject in the same RenderView");
+
+
+                        var resourceGroup = viewLayout.Entries[pass.view.Index].Resources;
+                        resourceGroup.UpdateLogicalGroup(ref voxelizerStorer, VSViewParameters);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelRenderer.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelRenderer.cs
new file mode 100644
index 0000000000..ac40ecb040
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelRenderer.cs
@@ -0,0 +1,263 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Shaders;
+using Xenko.Graphics;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Voxels;
+using Xenko.Core.Extensions;
+using System.Linq;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    public class VoxelRenderer : IVoxelRenderer
+    {
+        [DataMemberIgnore]
+        public static readonly PropertyKey<Dictionary<VoxelVolumeComponent, DataVoxelVolume>> CurrentRenderVoxelVolumes = new PropertyKey<Dictionary<VoxelVolumeComponent, DataVoxelVolume>>("VoxelRenderer.CurrentRenderVoxelVolumes", typeof(VoxelRenderer));
+        [DataMemberIgnore]
+        public static readonly PropertyKey<Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume>> CurrentProcessedVoxelVolumes = new PropertyKey<Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume>>("VoxelRenderer.CurrentProcessedVoxelVolumes", typeof(VoxelRenderer));
+        private Dictionary<VoxelVolumeComponent, DataVoxelVolume> renderVoxelVolumes;
+        private Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume> renderVoxelVolumeData;
+
+
+        readonly ProfilingKey PassesVoxelizationProfilingKey = new ProfilingKey("Voxelization: Passes");
+        readonly ProfilingKey FragmentVoxelizationProfilingKey = new ProfilingKey("Voxelization: Passes - Fragments");
+        readonly ProfilingKey BufferProcessingVoxelizationProfilingKey = new ProfilingKey("Voxelization: Arrangement");
+        readonly ProfilingKey MipmappingVoxelizationProfilingKey = new ProfilingKey("Voxelization: Mipmapping");
+
+        public List<RenderStage> VoxelStages { get; set; } = new List<RenderStage>();
+
+        public Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume> GetProcessedVolumes()
+        {
+            return renderVoxelVolumeData;
+        }
+        public virtual void Collect(RenderContext Context, Shadows.IShadowMapRenderer ShadowMapRenderer)
+        {
+            renderVoxelVolumes = Context.VisibilityGroup.Tags.Get(CurrentRenderVoxelVolumes);
+            renderVoxelVolumeData = Context.VisibilityGroup.Tags.Get(CurrentProcessedVoxelVolumes);
+
+            if (renderVoxelVolumes == null || renderVoxelVolumes.Count == 0)
+                return;
+
+            //Setup per volume passes and texture allocations
+            foreach ( var pair in renderVoxelVolumes )
+            {
+                var dataVolume = pair.Value;
+                var bounds = dataVolume.VolumeSize;
+
+                ProcessedVoxelVolume processedVolume;
+                if (!renderVoxelVolumeData.TryGetValue(pair.Key, out processedVolume))
+                {
+                    processedVolume = new ProcessedVoxelVolume();
+                    renderVoxelVolumeData.Add(pair.Key, processedVolume);
+                }
+
+
+                //Setup matrix
+                Vector3 matScale = dataVolume.VolumeSize;
+                Vector3 matTrans = dataVolume.VolumeTranslation;
+                
+                Matrix corMatrix = Matrix.Scaling(matScale) * Matrix.Translation(matTrans);
+                VoxelStorageContext storageContext = new VoxelStorageContext
+                {
+                    device = Context.GraphicsDevice,
+                    Extents = bounds,
+                    VoxelSize = dataVolume.AproxVoxelSize,
+                    Matrix = corMatrix
+                };
+
+                if (dataVolume.VoxelGridSnapping)
+                {
+                    matTrans /= storageContext.RealVoxelSize();
+                    matTrans.X = (float)Math.Floor(matTrans.X);
+                    matTrans.Y = (float)Math.Floor(matTrans.Y);
+                    matTrans.Z = (float)Math.Floor(matTrans.Z);
+                    matTrans *= storageContext.RealVoxelSize();
+
+                    corMatrix = Matrix.Scaling(matScale) * Matrix.Translation(matTrans);
+                    storageContext.Matrix = corMatrix;
+                }
+                storageContext.Translation = matTrans;
+                storageContext.VoxelSpaceTranslation = matTrans / storageContext.RealVoxelSize();
+
+                //Update storage
+                dataVolume.Storage.UpdateFromContext(storageContext);
+
+                //Transfer voxelization info
+                processedVolume.VisualizeVoxels = dataVolume.VisualizeVoxels;
+                processedVolume.Storage = dataVolume.Storage;
+                processedVolume.StorageContext = storageContext;
+                processedVolume.VoxelizationMethod = dataVolume.VoxelizationMethod;
+                processedVolume.VoxelVisualization = dataVolume.VoxelVisualization;
+                processedVolume.VisualizationAttribute = dataVolume.VisualizationAttribute;
+                processedVolume.Voxelize = dataVolume.Voxelize;
+                processedVolume.OutputAttributes = dataVolume.Attributes;
+
+                processedVolume.Attributes.Clear();
+                processedVolume.passList.Clear();
+                processedVolume.groupedPasses.Clear();
+
+                processedVolume.passList.defaultVoxelizationMethod = dataVolume.VoxelizationMethod;
+
+
+                //Create final list of attributes (including temporary ones)
+                foreach (var attr in dataVolume.Attributes)
+                {
+                    attr.CollectAttributes(processedVolume.Attributes, VoxelizationStage.Initial, true);
+                }
+
+                //Allocate textures and space in the temporary buffer
+                foreach (var attr in processedVolume.Attributes)
+                {
+                    attr.Attribute.PrepareLocalStorage(storageContext, dataVolume.Storage);
+                    if (attr.Output)
+                    {
+                        attr.Attribute.PrepareOutputStorage(storageContext, dataVolume.Storage);
+                    }
+                    else
+                    {
+                        attr.Attribute.ClearOutputStorage();
+                    }
+                }
+                dataVolume.Storage.UpdateTempStorage(storageContext);
+
+                //Create list of voxelization passes that need to be done
+                dataVolume.Storage.CollectVoxelizationPasses(processedVolume, storageContext);
+
+                //Group voxelization passes where the RenderStage can be shared
+                //TODO: Group identical attributes
+                for (int i = 0; i < processedVolume.passList.passes.Count; i++)
+                {
+                    bool added = false;
+                    var passA = processedVolume.passList.passes[i];
+                    for (int group = 0; group < processedVolume.groupedPasses.Count; group++)
+                    {
+                        var passB = processedVolume.groupedPasses[group][0];
+                        if (
+                           passB.storer.CanShareRenderStage(passA.storer)
+                        && passB.method.CanShareRenderStage(passA.method)
+                        && passB.AttributesDirect.SequenceEqual(passA.AttributesDirect)
+                        && passB.AttributesIndirect.SequenceEqual(passA.AttributesIndirect)
+                        && passB.AttributesTemp.SequenceEqual(passA.AttributesTemp)
+                        )
+                        {
+                            processedVolume.groupedPasses[group].Add(passA);
+                            added = true;
+                            break;
+                        }
+                    }
+                    if (!added)
+                    {
+                        List<VoxelizationPass> newGroup = new List<VoxelizationPass>
+                        {
+                            passA
+                        };
+                        processedVolume.groupedPasses.Add(newGroup);
+                    }
+                }
+
+                if (VoxelStages.Count < processedVolume.groupedPasses.Count)
+                {
+                    throw new ArgumentOutOfRangeException(processedVolume.groupedPasses.Count.ToString() + " Render Stages required for voxelization, only " + VoxelStages.Count.ToString() + " provided.");
+                }
+
+                //Finish preparing the passes, collecting views and setting up shader sources and shadows
+                for (int group = 0; group < processedVolume.groupedPasses.Count; group++)
+                {
+                    foreach(var pass in processedVolume.groupedPasses[group])
+                    {
+                        pass.renderStage = VoxelStages[group];
+                        pass.source = pass.storer.GetVoxelizationShader(pass, processedVolume);
+                        pass.view.RenderStages.Add(pass.renderStage);
+
+                        Context.RenderSystem.Views.Add(pass.view);
+                        Context.VisibilityGroup.TryCollect(pass.view);
+
+                        if (pass.requireShadows)
+                        {
+                            ShadowMapRenderer?.RenderViewsWithShadows.Add(pass.view);
+                        }
+                    }
+                }
+            }
+        }
+        public virtual void Draw(RenderDrawContext drawContext, Shadows.IShadowMapRenderer ShadowMapRenderer)
+        {
+            if (renderVoxelVolumes == null || renderVoxelVolumes.Count == 0)
+                return;
+
+            if (drawContext.GraphicsDevice.Features.CurrentProfile < GraphicsProfile.Level_11_0)
+                return;
+
+            var context = drawContext;
+
+            using (drawContext.PushRenderTargetsAndRestore())
+            {
+                // Draw all shadow views generated for the current view
+                foreach (var processedVolumeKeyValue in renderVoxelVolumeData)
+                {
+                    var processedVolume = processedVolumeKeyValue.Value;
+                    if (!processedVolume.Voxelize) continue;
+
+                    VoxelStorageContext storageContext = processedVolume.StorageContext;
+
+                    using (drawContext.QueryManager.BeginProfile(Color.Black, PassesVoxelizationProfilingKey))
+                    {
+                        foreach (VoxelizationPass pass in processedVolume.passList.passes)
+                        {
+                            RenderView voxelizeRenderView = pass.view;
+
+                            if (pass.requireShadows)
+                            {
+                                //Render Shadow Maps
+                                RenderView oldView = drawContext.RenderContext.RenderView;
+
+                                drawContext.RenderContext.RenderView = voxelizeRenderView;
+                                    ShadowMapRenderer.Draw(drawContext);
+                                drawContext.RenderContext.RenderView = oldView;
+                            }
+
+                            //Render/Collect voxel fragments
+                            using (drawContext.QueryManager.BeginProfile(Color.Black, FragmentVoxelizationProfilingKey))
+                            {
+                                using (drawContext.PushRenderTargetsAndRestore())
+                                {
+                                    pass.method.Render(storageContext, context, pass.view);
+                                }
+                            }
+                        }
+                        foreach (VoxelizationPass pass in processedVolume.passList.passes)
+                        {
+                            pass.method.Reset();
+                        }
+                    }
+
+                    //Fill and write to voxel volume
+                    using (drawContext.QueryManager.BeginProfile(Color.Black, BufferProcessingVoxelizationProfilingKey))
+                    {
+                        processedVolume.Storage.PostProcess(storageContext, context, processedVolume);
+                    }
+
+                    //Mipmap
+                    using (drawContext.QueryManager.BeginProfile(Color.Black, MipmappingVoxelizationProfilingKey))
+                    {
+                        foreach (var attr in processedVolume.Attributes)
+                        {
+                            if (attr.Output)
+                            {
+                                attr.Attribute.PostProcess(context);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelViewContext.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelViewContext.cs
new file mode 100644
index 0000000000..9acb215886
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/VoxelViewContext.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Xenko.Rendering.Voxels
+{
+    public struct VoxelViewContext
+    {
+        public bool IsVoxelView;
+        public VoxelViewContext(VoxelizationPassList passes, int viewIndex)
+        {
+            IsVoxelView = false;
+            foreach (var pass in passes.passes)
+            {
+                if (pass.view.Index == viewIndex)
+                {
+                    IsVoxelView = true;
+                    break;
+                }
+            }
+        }
+        public VoxelViewContext(bool voxelView)
+        {
+            IsVoxelView = voxelView;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/XenkoForwardShadingEffectVXGI.xksl b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/XenkoForwardShadingEffectVXGI.xksl
new file mode 100644
index 0000000000..7f94f27fbb
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/XenkoForwardShadingEffectVXGI.xksl
@@ -0,0 +1,73 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Rendering.Data;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    partial effect XenkoLightingVXGI
+    {
+        using params LightingKeys;
+
+        // -----------------------------------------------
+        // Add light groups
+        // -----------------------------------------------
+        ShaderSourceCollection directLightGroups = LightingKeys.DirectLightGroups;
+        if (directLightGroups != null)
+        {
+            foreach(ShaderSource directLightGroup in directLightGroups)
+            {
+                // Use parenthesis (...) to avoid lightGroup to be interpreted as a mixin named "lightGroup"
+                mixin compose directLightGroups += (directLightGroup);
+            }
+        }
+
+        // -----------------------------------------------
+        // Add environment light groups
+        // -----------------------------------------------
+        ShaderSourceCollection environmentLights = LightingKeys.EnvironmentLights;
+        if (environmentLights != null)
+        {
+            foreach(ShaderSource environmentLight in environmentLights)
+            {
+                // Use parenthesis (...) to avoid lightGroup to be interpreted as a mixin named "lightGroup"
+                mixin compose environmentLights += (environmentLight);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Forward shading effect
+    /// </summary>
+    effect XenkoForwardShadingEffectVXGI
+    {
+        using params MaterialKeys;
+
+        // Derive from XenkoEffectBase
+        mixin XenkoEffectBase;
+
+        // -----------------------------------------------
+        // Mix material and lighting shading for Pixel Shader
+        // -----------------------------------------------
+        ShaderSource extensionPixelStageSurfaceShaders = MaterialKeys.PixelStageSurfaceShaders;
+        if (extensionPixelStageSurfaceShaders != null)
+        {
+            mixin MaterialSurfacePixelStageCompositor;
+            mixin compose materialPixelStage = (extensionPixelStageSurfaceShaders);
+            mixin compose streamInitializerPixelStage = MaterialKeys.PixelStageStreamInitializer;
+
+            ShaderSource extensionPixelStageSurfaceFilter = MaterialKeys.PixelStageSurfaceFilter;
+            if (extensionPixelStageSurfaceFilter != null)
+            {
+                mixin (extensionPixelStageSurfaceFilter);
+            }
+        }
+
+        // -----------------------------------------------
+        // Add direct and environment light groups
+        // -----------------------------------------------
+        mixin XenkoLightingVXGI;
+
+        mixin child VoxelizeToFragmentsEffect;
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/XenkoForwardShadingEffectVXGI.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/XenkoForwardShadingEffectVXGI.xksl.cs
new file mode 100644
index 0000000000..38d86d154c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/GraphicsCompositor/XenkoForwardShadingEffectVXGI.xksl.cs
@@ -0,0 +1,118 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+using Xenko.Rendering.Data;
+using Xenko.Rendering.Materials;
+namespace Xenko.Rendering.Voxels
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class XenkoLightingVXGI  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                ShaderSourceCollection directLightGroups = context.GetParam(LightingKeys.DirectLightGroups);
+                if (directLightGroups != null)
+                {
+                    foreach(ShaderSource directLightGroup in directLightGroups)
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (directLightGroup);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "directLightGroups", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+                ShaderSourceCollection environmentLights = context.GetParam(LightingKeys.EnvironmentLights);
+                if (environmentLights != null)
+                {
+                    foreach(ShaderSource environmentLight in environmentLights)
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (environmentLight);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "environmentLights", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("XenkoLightingVXGI", new XenkoLightingVXGI());
+            }
+        }
+    }
+    internal static partial class ShaderMixins
+    {
+        internal partial class XenkoForwardShadingEffectVXGI  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "XenkoEffectBase");
+                ShaderSource extensionPixelStageSurfaceShaders = context.GetParam(MaterialKeys.PixelStageSurfaceShaders);
+                if (extensionPixelStageSurfaceShaders != null)
+                {
+                    context.Mixin(mixin, "MaterialSurfacePixelStageCompositor");
+
+                    {
+                        var __mixinToCompose__ = (extensionPixelStageSurfaceShaders);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "materialPixelStage", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+
+                    {
+                        var __mixinToCompose__ = context.GetParam(MaterialKeys.PixelStageStreamInitializer);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "streamInitializerPixelStage", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                    ShaderSource extensionPixelStageSurfaceFilter = context.GetParam(MaterialKeys.PixelStageSurfaceFilter);
+                    if (extensionPixelStageSurfaceFilter != null)
+                    {
+                        context.Mixin(mixin, (extensionPixelStageSurfaceFilter));
+                    }
+                }
+                context.Mixin(mixin, "XenkoLightingVXGI");
+                if (context.ChildEffectName == "VoxelizeToFragmentsEffect")
+                {
+                    context.Mixin(mixin, "VoxelizeToFragmentsEffect");
+                    return;
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("XenkoForwardShadingEffectVXGI", new XenkoForwardShadingEffectVXGI());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxel.cs b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxel.cs
new file mode 100644
index 0000000000..40504cc8bc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxel.cs
@@ -0,0 +1,38 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Core;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Rendering.Lights;
+
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    /// <summary>
+    /// A light casting from a voxel representation.
+    /// </summary>
+    [DataContract("LightVoxel")]
+    [Display("Voxel")]
+    public class LightVoxel : IEnvironmentLight
+    {
+        [DataMember(1)]
+        public VoxelVolumeComponent Volume { get; set; }
+        [DataMember(10)]
+        public int AttributeIndex { get; set; } = 0;
+
+        [DataMember(20)]
+        public IVoxelMarchSet DiffuseMarcher { get; set; } = new VoxelMarchSetHemisphere6(new VoxelMarchConePerMipmap());
+        [DataMember(30)]
+        public IVoxelMarchMethod SpecularMarcher { get; set; } = new VoxelMarchCone(30, 0.5f, 1.0f);
+
+        [DataMember(40)]
+        public float BounceIntensityScale { get; set; }
+        [DataMember(50)]
+        public float SpecularIntensityScale { get; set; }
+
+        public bool Update(RenderLight light)
+        {
+            return true;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelEffect.xksl
new file mode 100644
index 0000000000..e5e6fca5f1
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelEffect.xksl
@@ -0,0 +1,34 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Rendering.Data;
+using Xenko.Rendering.Lights;
+
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    /// <summary>
+    /// Base effect
+    /// </summary>
+    effect LightVoxelEffect
+    {
+        using params LightVoxelShaderKeys;
+        using params MarchAttributesKeys;
+
+        mixin LightVoxelShader;
+
+        if (LightVoxelShaderKeys.diffuseMarcher != null)
+        {
+            mixin compose diffuseMarcher = LightVoxelShaderKeys.diffuseMarcher;
+        }
+        if (LightVoxelShaderKeys.specularMarcher != null)
+        {
+            mixin compose specularMarcher = LightVoxelShaderKeys.specularMarcher;
+        }
+        if (MarchAttributesKeys.AttributeSamplers!=null)
+        {
+            foreach (var attr in MarchAttributesKeys.AttributeSamplers)
+            {
+                mixin compose AttributeSamplers += (attr);
+            }
+        }
+   };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelEffect.xksl.cs
new file mode 100644
index 0000000000..6e95231d59
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelEffect.xksl.cs
@@ -0,0 +1,75 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+using Xenko.Rendering.Data;
+using Xenko.Rendering.Lights;
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class LightVoxelEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "LightVoxelShader");
+                if (context.GetParam(LightVoxelShaderKeys.diffuseMarcher) != null)
+                {
+
+                    {
+                        var __mixinToCompose__ = context.GetParam(LightVoxelShaderKeys.diffuseMarcher);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "diffuseMarcher", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                }
+                if (context.GetParam(LightVoxelShaderKeys.specularMarcher) != null)
+                {
+
+                    {
+                        var __mixinToCompose__ = context.GetParam(LightVoxelShaderKeys.specularMarcher);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "specularMarcher", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                }
+                if (context.GetParam(MarchAttributesKeys.AttributeSamplers) != null)
+                {
+                    foreach(var attr in context.GetParam(MarchAttributesKeys.AttributeSamplers))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributeSamplers", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("LightVoxelEffect", new LightVoxelEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelRenderer.cs b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelRenderer.cs
new file mode 100644
index 0000000000..412386553b
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelRenderer.cs
@@ -0,0 +1,209 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Collections;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Graphics;
+using Xenko.Rendering.Skyboxes;
+using Xenko.Shaders;
+using Xenko.Rendering.Voxels;
+using Xenko.Rendering.Shadows;
+using Xenko.Rendering.Lights;
+using Xenko.Engine.Processors;
+
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    /// <summary>
+    /// Light renderer for <see cref="LightVoxel"/>.
+    /// </summary>
+    public class LightVoxelRenderer : LightGroupRendererBase
+    {
+        private readonly Dictionary<RenderLight, LightVoxelShaderGroup> lightShaderGroupsPerVoxel = new Dictionary<RenderLight, LightVoxelShaderGroup>();
+        private PoolListStruct<LightVoxelShaderGroup> pool = new PoolListStruct<LightVoxelShaderGroup>(8, CreateLightVoxelShaderGroup);
+
+        public override Type[] LightTypes { get; } = { typeof(LightVoxel) };
+
+        public LightVoxelRenderer()
+        {
+            IsEnvironmentLight = true;
+        }
+
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            foreach (var lightShaderGroup in lightShaderGroupsPerVoxel)
+                lightShaderGroup.Value.Reset();
+
+            lightShaderGroupsPerVoxel.Clear();
+            pool.Reset();
+        }
+
+        /// <inheritdoc/>
+        public override void ProcessLights(ProcessLightsParameters parameters)
+        {
+            foreach (var index in parameters.LightIndices)
+            {
+                // For now, we allow only one cubemap at once
+                var light = parameters.LightCollection[index];
+
+                // Prepare LightVoxelShaderGroup
+                LightVoxelShaderGroup lightShaderGroup;
+                if (!lightShaderGroupsPerVoxel.TryGetValue(light, out lightShaderGroup))
+                {
+                    lightShaderGroup = pool.Add();
+                    lightShaderGroup.Light = light;
+
+                    lightShaderGroupsPerVoxel.Add(light, lightShaderGroup);
+                }
+            }
+
+            // Consume all the lights
+            parameters.LightIndices.Clear();
+        }
+
+        public override void UpdateShaderPermutationEntry(ForwardLightingRenderFeature.LightShaderPermutationEntry shaderEntry)
+        {
+            foreach (var cubemap in lightShaderGroupsPerVoxel)
+            {
+                shaderEntry.EnvironmentLights.Add(cubemap.Value);
+            }
+        }
+
+        private static LightVoxelShaderGroup CreateLightVoxelShaderGroup()
+        {
+            return new LightVoxelShaderGroup(new ShaderMixinGeneratorSource("LightVoxelEffect"));
+        }
+
+        private class LightVoxelShaderGroup : LightShaderGroup
+        {
+            private ValueParameterKey<float> intensityKey;
+            private ValueParameterKey<float> specularIntensityKey;
+
+            private PermutationParameterKey<ShaderSource> diffuseMarcherKey;
+            private PermutationParameterKey<ShaderSource> specularMarcherKey;
+            private PermutationParameterKey<ShaderSourceCollection> attributeSamplersKey;
+
+            public RenderLight Light { get; set; }
+
+            VoxelAttribute traceAttribute = null;
+
+            public LightVoxelShaderGroup(ShaderSource mixin) : base(mixin)
+            {
+                HasEffectPermutations = true;
+                traceAttribute = null;
+            }
+
+            ProcessedVoxelVolume GetProcessedVolume()
+            {
+                var lightVoxel = ((LightVoxel)Light.Type);
+                if (lightVoxel.Volume == null)
+                {
+                    throw new ArgumentNullException("No Voxel Volume Component selected for voxel light.");
+                }
+                var voxelVolumeProcessor = lightVoxel.Volume.Entity.EntityManager.GetProcessor<VoxelVolumeProcessor>();
+                if (voxelVolumeProcessor == null)
+                    return null;
+
+                ProcessedVoxelVolume processedVolume = voxelVolumeProcessor.GetProcessedVolumeForComponent(lightVoxel.Volume);
+                return processedVolume;
+            }
+
+            VoxelAttribute GetTraceAttr()
+            {
+                var lightVoxel = ((LightVoxel)Light.Type);
+
+                ProcessedVoxelVolume processedVolume = GetProcessedVolume();
+                if (processedVolume == null)
+                    return null;
+
+                if (processedVolume.OutputAttributes.Count > lightVoxel.AttributeIndex)
+                {
+                    return processedVolume.OutputAttributes[lightVoxel.AttributeIndex];
+                }
+                else
+                {
+                    throw new ArgumentOutOfRangeException("Tried to access attribute index " + lightVoxel.AttributeIndex.ToString() + " (zero-indexed) when the Voxel Volume Component has only " + processedVolume.OutputAttributes.Count.ToString() + " attributes.");
+                }
+            }
+            public override void UpdateLayout(string compositionName)
+            {
+                base.UpdateLayout(compositionName);
+
+                traceAttribute = GetTraceAttr();
+
+                intensityKey = LightVoxelShaderKeys.Intensity.ComposeWith(compositionName);
+                specularIntensityKey = LightVoxelShaderKeys.SpecularIntensity.ComposeWith(compositionName);
+
+                diffuseMarcherKey = LightVoxelShaderKeys.diffuseMarcher.ComposeWith(compositionName);
+                specularMarcherKey = LightVoxelShaderKeys.specularMarcher.ComposeWith(compositionName);
+                attributeSamplersKey = MarchAttributesKeys.AttributeSamplers.ComposeWith(compositionName);
+
+                if (traceAttribute != null)
+                {
+                    if (((LightVoxel)Light.Type).DiffuseMarcher != null)
+                        ((LightVoxel)Light.Type).DiffuseMarcher.UpdateMarchingLayout("diffuseMarcher." + compositionName);
+                    if (((LightVoxel)Light.Type).SpecularMarcher != null)
+                        ((LightVoxel)Light.Type).SpecularMarcher.UpdateMarchingLayout("specularMarcher." + compositionName);
+                    traceAttribute.UpdateSamplingLayout("AttributeSamplers[0]." + compositionName);
+                }
+            }
+
+            public override void ApplyEffectPermutations(RenderEffect renderEffect)
+            {
+                if (traceAttribute != null)
+                {
+                    ShaderSourceCollection collection = new ShaderSourceCollection
+                    {
+                        traceAttribute.GetSamplingShader()
+                    };
+                    renderEffect.EffectValidator.ValidateParameterThreaded(attributeSamplersKey, collection);
+
+                    if (((LightVoxel)Light.Type).DiffuseMarcher != null)
+                        renderEffect.EffectValidator.ValidateParameterThreaded(diffuseMarcherKey, ((LightVoxel)Light.Type).DiffuseMarcher.GetMarchingShader(0));
+                    if (((LightVoxel)Light.Type).SpecularMarcher != null)
+                        renderEffect.EffectValidator.ValidateParameterThreaded(specularMarcherKey, ((LightVoxel)Light.Type).SpecularMarcher.GetMarchingShader(0));
+                }
+            }
+
+            public override void ApplyViewParameters(RenderDrawContext context, int viewIndex, ParameterCollection parameters)
+            {
+                base.ApplyViewParameters(context, viewIndex, parameters);
+
+                var lightVoxel = ((LightVoxel)Light.Type);
+
+                if (lightVoxel.Volume == null)
+                    return;
+                ProcessedVoxelVolume processedVolume = GetProcessedVolume();
+                if (processedVolume == null)
+                    return;
+
+                var intensity = Light.Intensity;
+                var intensityBounceScale = lightVoxel.BounceIntensityScale;
+                var specularIntensity = lightVoxel.SpecularIntensityScale * intensity;
+
+                VoxelViewContext viewContext = new VoxelViewContext(processedVolume.passList, viewIndex);
+                if (viewContext.IsVoxelView)
+                {
+                    intensity *= intensityBounceScale / 3.141592f;
+                    specularIntensity = 0.0f;
+                }
+
+                parameters.Set(intensityKey, intensity);
+                parameters.Set(specularIntensityKey, specularIntensity);
+
+                if (traceAttribute != null)
+                {
+                    lightVoxel.DiffuseMarcher?.ApplyMarchingParameters(parameters);
+                    lightVoxel.SpecularMarcher?.ApplyMarchingParameters(parameters);
+                    traceAttribute.ApplySamplingParameters(viewContext, parameters);
+                }
+            }
+        }
+    }
+}
+
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShader.xksl
new file mode 100644
index 0000000000..3dc5c2292f
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShader.xksl
@@ -0,0 +1,45 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Rendering.Lights;
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    /// <summary>
+    /// Defines a Voxel environment light
+    /// </summary>
+    shader LightVoxelShader : MarchAttributes, Camera, Texturing, EnvironmentLight, MaterialPixelShadingStream, NormalStream, PositionStream4, Transformation
+    {
+        cbuffer PerView.Lighting
+        {
+            float Intensity;
+            float SpecularIntensity;
+        }
+
+        compose VoxelMarchSet diffuseMarcher;
+        compose VoxelRadiusMarchMethod specularMarcher;
+
+        override void PrepareEnvironmentLight()
+        {
+            base.PrepareEnvironmentLight();
+            if (Intensity > 0.0)
+            {
+                float3 worldPos = streams.PositionWS;
+
+                float3 tan = normalize(cross(streams.normalWS.xyz, normalize(float3(1, 1, 1))));
+                float3 bitan = cross(tan, streams.normalWS.xyz);
+                float3x3 tangentMatrix = float3x3(tan, bitan, streams.normalWS.xyz);
+
+                float4 reflLighting = float4(0, 0, 0, 0);
+
+                float3 startPos = worldPos + streams.normalWS.xyz * specularMarcher.StepSizeRadius(1.0);
+
+                reflLighting = diffuseMarcher.March(worldPos, streams.normalWS.xyz);
+
+                streams.envLightDiffuseColor = reflLighting.rgb * Intensity;
+                if (SpecularIntensity > 0.0)
+                    streams.envLightSpecularColor = specularMarcher.MarchRadius(startPos, reflect(-streams.viewWS, streams.normalWS), sqrt(streams.alphaRoughness)).rgb * SpecularIntensity;
+                else
+                    streams.envLightSpecularColor = float4(0,0,0,0);
+            }
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShader.xksl.cs
new file mode 100644
index 0000000000..ad76088540
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShader.xksl.cs
@@ -0,0 +1,25 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+using Xenko.Rendering.Lights;
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    public static partial class LightVoxelShaderKeys
+    {
+        public static readonly ValueParameterKey<float> Intensity = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<float> SpecularIntensity = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShaderKeys.cs b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShaderKeys.cs
new file mode 100644
index 0000000000..731df07aa6
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Light/LightVoxelShaderKeys.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Shaders;
+using Xenko.Rendering.Lights;
+
+namespace Xenko.Rendering.Voxels.VoxelGI
+{
+    public partial class LightVoxelShaderKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSource> diffuseMarcher = ParameterKeys.NewPermutation<ShaderSource>();
+        public static readonly PermutationParameterKey<ShaderSource> specularMarcher = ParameterKeys.NewPermutation<ShaderSource>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelMarchMethod.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelMarchMethod.cs
new file mode 100644
index 0000000000..3dbaf19a7a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelMarchMethod.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelMarchMethod
+    {
+        ShaderSource GetMarchingShader(int attrID);
+        void UpdateMarchingLayout(string compositionName);
+        void ApplyMarchingParameters(ParameterCollection parameters);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelSampler.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelSampler.xksl
new file mode 100644
index 0000000000..cf7d495ca3
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelSampler.xksl
@@ -0,0 +1,34 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader IVoxelSampler
+    {
+        float4 Sample(float3 position, float3 normal, float diameter)
+        {
+            return 0;
+        }
+        float4 SampleByMipNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return 0;
+        }
+        float4 SampleNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return 0;
+        }
+        float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+        {
+            return float4(1, 0, 0, 0);
+        }
+        float VoxelSize()
+        {
+            return 1.0;
+        }
+        float4 Test()
+        {
+            return float4(1,0,0,1);
+        }
+        float4 ComputeLocal(float3 position)
+        {
+            return 0;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStreams.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelSampler.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStreams.cs
rename to sources/engine/Xenko.Voxels/Voxels/Marching/IVoxelSampler.xksl.cs
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/IVoxelMarchSet.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/IVoxelMarchSet.cs
new file mode 100644
index 0000000000..2a3ab7e9f0
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/IVoxelMarchSet.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelMarchSet
+    {
+        ShaderSource GetMarchingShader(int attrID);
+        void UpdateMarchingLayout(string compositionName);
+        void ApplyMarchingParameters(ParameterCollection parameters);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSet.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSet.xksl
new file mode 100644
index 0000000000..920c53a8e2
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSet.xksl
@@ -0,0 +1,4 @@
+shader VoxelMarchSet
+{
+    float4 March(float3 rayPos, float3 rayDir){ return float4(0, 0, 0, 0); }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructure.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSet.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestStructure.cs
rename to sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSet.xksl.cs
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere12.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere12.xksl
new file mode 100644
index 0000000000..68e8c5f2ec
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere12.xksl
@@ -0,0 +1,53 @@
+shader VoxelMarchSetHemisphere12 : VoxelMarchSet
+{
+    cbuffer PerView.Lighting
+    {
+        float offset;
+    }
+    compose VoxelMarchMethod Marcher;
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        float3 tan = normalize(cross(rayDir, normalize(float3(1, 1, 1))));
+        float3 bitan = cross(tan, rayDir);
+        float3x3 tangentMatrix = float3x3(tan, bitan, rayDir);
+
+        float3 startPos = rayPos + rayDir * Marcher.StepSize() * offset;
+
+        float4 reflLighting = float4(0, 0, 0, 0);
+        
+        //Dot products of rays
+        float central = 0.84;
+        float outer = 0.22;
+        float sum = (central*4+outer*8);
+        central /= sum;
+        outer /= sum;
+
+        rayDir = mul(float3(-0.38, -0.37, 0.84), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * central;
+        rayDir = mul(float3(-0.31, 0.43, 0.84), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * central;
+        rayDir = mul(float3(0.36, 0.39, 0.84), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * central;
+        rayDir = mul(float3(0.36, -0.39, 0.84), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * central;
+
+        rayDir = mul(float3(-0.87, 0.41, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(-0.35, 0.90, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(0.40, 0.88, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(0.92, 0.31, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(0.87, -0.43, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(0.30, -0.92, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(-0.43, -0.87, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+        rayDir = mul(float3(-0.93, -0.28, 0.22), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+
+        return reflLighting;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere12.xksl.cs
similarity index 66%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest.cs
rename to sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere12.xksl.cs
index 5263961629..cffe88dae3 100644
--- a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/ForEachTest.cs
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere12.xksl.cs
@@ -8,16 +8,16 @@
 
 using System;
 using Xenko.Core;
-using Xenko.Effects;
+using Xenko.Rendering;
 using Xenko.Graphics;
 using Xenko.Shaders;
 using Xenko.Core.Mathematics;
 using Buffer = Xenko.Graphics.Buffer;
 
-namespace Xenko.Effects
+namespace Xenko.Rendering
 {
-    public static partial class ForEachTestKeys
+    public static partial class VoxelMarchSetHemisphere12Keys
     {
-        public static readonly ParameterKey<float[]> collec = ParameterKeys.New<float[]>();
+        public static readonly ValueParameterKey<float> offset = ParameterKeys.NewValue<float>();
     }
 }
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere6.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere6.xksl
new file mode 100644
index 0000000000..2589695b91
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere6.xksl
@@ -0,0 +1,45 @@
+shader VoxelMarchSetHemisphere6 : VoxelMarchSet, ShaderBase
+{
+    cbuffer PerView.Lighting
+    {
+        float offset;
+    }
+    compose VoxelMarchMethod Marcher;
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        float3 tan = normalize(cross(rayDir, normalize(float3(1, 1, 1))));
+        float3 bitan = cross(tan, rayDir);
+        float3x3 tangentMatrix = float3x3(tan, bitan, rayDir);
+
+        float3 startPos = rayPos + rayDir * Marcher.StepSize() * offset;
+
+        float4 reflLighting = float4(0, 0, 0, 0);
+        
+        //Dot products of rays
+        float central = 1.0;
+        float outer = 0.445;
+        float sum = central + outer * 5;
+        central /= sum;
+        outer /= sum;
+
+        rayDir = mul(float3(0, 0, 1), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * central;
+
+        rayDir = mul(normalize(float3(0.85, 0.278, 0.445)), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+
+        rayDir = mul(normalize(float3(0.527, -0.723, 0.445)), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+
+        rayDir = mul(normalize(float3(-0.526, -0.724, 0.445)), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+
+        rayDir = mul(normalize(float3(-0.851, 0.277, 0.445)), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+
+        rayDir = mul(normalize(float3(0.895, 0.445, 0.445)), tangentMatrix);
+        reflLighting += Marcher.March(startPos, rayDir) * outer;
+
+        return reflLighting;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere6.xksl.cs
similarity index 66%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest.cs
rename to sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere6.xksl.cs
index 4a1a029e58..3029fdfba2 100644
--- a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/MacroTest.cs
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetHemisphere6.xksl.cs
@@ -8,16 +8,16 @@
 
 using System;
 using Xenko.Core;
-using Xenko.Effects;
+using Xenko.Rendering;
 using Xenko.Graphics;
 using Xenko.Shaders;
 using Xenko.Core.Mathematics;
 using Buffer = Xenko.Graphics.Buffer;
 
-namespace Xenko.Effects
+namespace Xenko.Rendering
 {
-    public static partial class MacroTestKeys
+    public static partial class VoxelMarchSetHemisphere6Keys
     {
-        public static readonly ParameterKey<float> u = ParameterKeys.New<float>();
+        public static readonly ValueParameterKey<float> offset = ParameterKeys.NewValue<float>();
     }
 }
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetRandomHemisphere.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetRandomHemisphere.xksl
new file mode 100644
index 0000000000..c32b0085e2
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetRandomHemisphere.xksl
@@ -0,0 +1,44 @@
+shader VoxelMarchSetRandomHemisphere : VoxelMarchSet, ShaderBase
+{
+    cbuffer PerView.Lighting
+    {
+        int marchCount;
+        float time;
+    }
+    float Random(in float2 uv)
+    {
+        float2 noise = (frac(sin(dot(uv,float2(12.9898,78.233)*2.0)) * 43758.5453));
+        return abs(noise.x + noise.y) * 0.5;
+    }
+    float3 CosineWeightedPointOnHemisphere(float2 uv) {
+        float u = Random(uv) * 6.28;
+        float v = Random(uv + 0.1);
+
+        v = sqrt(v);
+
+        float2 pos = float2(sin(u),cos(u)) * v;
+
+        return float3(pos, sqrt(1-pos.x*pos.x-pos.y*pos.y));
+    }
+
+    compose VoxelMarchMethod Marcher;
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        float3 tan = normalize(cross(rayDir, normalize(float3(1,1,1))));
+        float3 bitan = cross(tan, rayDir);
+        float3x3 tangentMatrix = float3x3(tan, bitan, rayDir);
+
+        float3 startPos = rayPos + rayDir * Marcher.StepSize();
+
+        float4 reflLighting = float4(0, 0, 0, 0);
+
+        for(int i = 0; i < marchCount; i ++)
+        {
+            float3 dir = CosineWeightedPointOnHemisphere(streams.ShadingPosition.xy + i*1.73 + time);
+            dir = mul(dir, tangentMatrix);
+            reflLighting += Marcher.March(startPos, dir);
+        }
+
+        return reflLighting/(float)marchCount;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetRandomHemisphere.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetRandomHemisphere.xksl.cs
new file mode 100644
index 0000000000..aa8474f0db
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/Shaders/VoxelMarchSetRandomHemisphere.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelMarchSetRandomHemisphereKeys
+    {
+        public static readonly ValueParameterKey<int> marchCount = ParameterKeys.NewValue<int>();
+        public static readonly ValueParameterKey<float> time = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetBase.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetBase.cs
new file mode 100644
index 0000000000..274c81df20
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetBase.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    public class VoxelMarchSetBase
+    {
+        public IVoxelMarchMethod Marcher { set; get; } = new VoxelMarchConePerMipmap();
+        public float Offset { set; get; } = 1.0f;
+        public VoxelMarchSetBase()
+        {
+
+        }
+        public VoxelMarchSetBase(IVoxelMarchMethod marcher)
+        {
+            Marcher = marcher;
+        }
+
+        protected ValueParameterKey<float> OffsetKey;
+        public virtual void UpdateMarchingLayout(string compositionName)
+        {
+            Marcher.UpdateMarchingLayout("Marcher." + compositionName);
+        }
+        public virtual void ApplyMarchingParameters(ParameterCollection parameters)
+        {
+            Marcher.ApplyMarchingParameters(parameters);
+            parameters.Set(OffsetKey, Offset);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetHemisphere12.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetHemisphere12.cs
new file mode 100644
index 0000000000..91f7f5f68e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetHemisphere12.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Hemisphere (12)")]
+    public class VoxelMarchSetHemisphere12 : VoxelMarchSetBase, IVoxelMarchSet
+    {
+        public VoxelMarchSetHemisphere12()
+        {
+
+        }
+        public VoxelMarchSetHemisphere12(IVoxelMarchMethod marcher)
+        {
+            Marcher = marcher;
+        }
+
+        public ShaderSource GetMarchingShader(int attrID)
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(new ShaderClassSource("VoxelMarchSetHemisphere12"));
+            mixin.AddComposition("Marcher", Marcher.GetMarchingShader(attrID));
+            return mixin;
+        }
+
+        public override void UpdateMarchingLayout(string compositionName)
+        {
+            base.UpdateMarchingLayout(compositionName);
+            OffsetKey = VoxelMarchSetHemisphere12Keys.offset.ComposeWith(compositionName);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetHemisphere6.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetHemisphere6.cs
new file mode 100644
index 0000000000..85c341d16b
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetHemisphere6.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Hemisphere (6)")]
+    public class VoxelMarchSetHemisphere6 : VoxelMarchSetBase, IVoxelMarchSet
+    {
+        public VoxelMarchSetHemisphere6()
+        {
+
+        }
+        public VoxelMarchSetHemisphere6(IVoxelMarchMethod marcher)
+        {
+            Marcher = marcher;
+        }
+
+        public ShaderSource GetMarchingShader(int attrID)
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(new ShaderClassSource("VoxelMarchSetHemisphere6"));
+            mixin.AddComposition("Marcher", Marcher.GetMarchingShader(attrID));
+            return mixin;
+        }
+
+        public override void UpdateMarchingLayout(string compositionName)
+        {
+            base.UpdateMarchingLayout(compositionName);
+            OffsetKey = VoxelMarchSetHemisphere6Keys.offset.ComposeWith(compositionName);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetRandomHemisphere.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetRandomHemisphere.cs
new file mode 100644
index 0000000000..44d088537c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/MarchSets/VoxelMarchSetRandomHemisphere.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Random Hemisphere")]
+    public class VoxelMarchSetRandomHemisphere : IVoxelMarchSet
+    {
+        public IVoxelMarchMethod Marcher { set; get; } = new VoxelMarchConePerMipmap();
+        public int Count = 6;
+        public bool AnimateNoise = false;
+
+        float time = 0f;
+
+        public VoxelMarchSetRandomHemisphere()
+        {
+
+        }
+        public VoxelMarchSetRandomHemisphere(IVoxelMarchMethod marcher)
+        {
+            Marcher = marcher;
+        }
+        public ShaderSource GetMarchingShader(int attrID)
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(new ShaderClassSource("VoxelMarchSetRandomHemisphere"));
+            mixin.AddComposition("Marcher", Marcher.GetMarchingShader(attrID));
+            return mixin;
+        }
+
+        ValueParameterKey<int> CountKey;
+        ValueParameterKey<float> TimeKey;
+        public void UpdateMarchingLayout(string compositionName)
+        {
+            Marcher.UpdateMarchingLayout("Marcher." + compositionName);
+            CountKey = VoxelMarchSetRandomHemisphereKeys.marchCount.ComposeWith(compositionName);
+            TimeKey = VoxelMarchSetRandomHemisphereKeys.time.ComposeWith(compositionName);
+        }
+        public void ApplyMarchingParameters(ParameterCollection parameters)
+        {
+            time += Count * 3.73f;
+            if (time > 4000f) time = 0f;
+
+            Marcher.ApplyMarchingParameters(parameters);
+            parameters.Set(CountKey, Count);
+            parameters.Set(TimeKey, AnimateNoise ? time : 0f);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributes.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributes.xksl
new file mode 100644
index 0000000000..a9247cd79d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributes.xksl
@@ -0,0 +1,4 @@
+shader MarchAttributes
+{
+    stage compose IVoxelSampler AttributeSamplers[];
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestVertexStream.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributes.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Shaders.Tests/GameAssets/Shaders/TestVertexStream.cs
rename to sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributes.xksl.cs
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesEffect.xksl
new file mode 100644
index 0000000000..b78ca40f4c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesEffect.xksl
@@ -0,0 +1,16 @@
+namespace Xenko.Rendering.Voxels
+{
+    partial effect MarchAttributesEffect
+    {
+        using params MarchAttributesKeys;
+
+        mixin MarchAttributes;
+        if (MarchAttributesKeys.AttributeSamplers!=null)
+        {
+            foreach (var attr in MarchAttributesKeys.AttributeSamplers)
+            {
+                mixin compose AttributeSamplers += (attr);
+            }
+        }
+    };
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesEffect.xksl.cs
new file mode 100644
index 0000000000..90bf1846e0
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesEffect.xksl.cs
@@ -0,0 +1,51 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class MarchAttributesEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "MarchAttributes");
+                if (context.GetParam(MarchAttributesKeys.AttributeSamplers) != null)
+                {
+                    foreach(var attr in context.GetParam(MarchAttributesKeys.AttributeSamplers))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributeSamplers", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("MarchAttributesEffect", new MarchAttributesEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesKeys.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesKeys.cs
new file mode 100644
index 0000000000..44abc13d6d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/MarchAttributesKeys.cs
@@ -0,0 +1,12 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public partial class MarchAttributesKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSourceCollection> AttributeSamplers = ParameterKeys.NewPermutation<ShaderSourceCollection>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchBeam.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchBeam.xksl
new file mode 100644
index 0000000000..086d27d401
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchBeam.xksl
@@ -0,0 +1,30 @@
+shader VoxelMarchBeam<int steps, float stepScale, float beamDiameter> : VoxelMarchMethod, VoxelRadiusMarchMethod, MarchAttributes
+{
+    #ifndef AttributeID
+        #define AttributeID 0
+    #endif
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        return MarchRadius(rayPos, rayDir, 1.0);
+    }
+    override float4 MarchRadius(float3 rayPos, float3 rayDir, float radiusScale)
+    {
+        float voxelSize = AttributeSamplers[AttributeID].VoxelSize();
+        float dist = voxelSize;
+        float4 light = float4(0.0, 0.0, 0.0, 0.0);
+
+        for (int i = 0; i < steps; i++)
+        {
+            float size = beamDiameter * radiusScale;
+            float3 pos = rayPos + rayDir * dist;
+
+            light += AttributeSamplers[AttributeID].Sample(pos, -rayDir, AttributeSamplers[AttributeID].VoxelSize() * size) * saturate(1.0 - light.a);
+
+            dist += AttributeSamplers[AttributeID].VoxelSize() * stepScale;
+        }
+        return light;
+    }
+    
+    override float StepSize() { return AttributeSamplers[AttributeID].VoxelSize(); }
+    override float StepSizeRadius(float radiusScale) { return radiusScale * AttributeSamplers[AttributeID].VoxelSize(); }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Video/Shaders/VideoShader.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchBeam.xksl.cs
similarity index 100%
rename from sources/engine/Xenko.Video/Shaders/VideoShader.cs
rename to sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchBeam.xksl.cs
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchCone.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchCone.xksl
new file mode 100644
index 0000000000..80a505e58c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchCone.xksl
@@ -0,0 +1,34 @@
+shader VoxelMarchCone<int steps, float stepScale, float coneRatio, float offset> : VoxelMarchMethod, VoxelRadiusMarchMethod, MarchAttributes
+{
+    #ifndef sampleFunction
+        #define sampleFunction Sample
+        #define AttributeID 0
+    #endif
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        return MarchRadius(rayPos, rayDir, 1.0);
+    }
+    override float4 MarchRadius(float3 rayPos, float3 rayDir, float radiusScale)
+    {
+        float finalRatio = coneRatio.x * radiusScale;
+        float voxelSize = AttributeSamplers[AttributeID].VoxelSize();
+        
+        float dist = voxelSize / max(1,finalRatio);
+
+        float4 light = float4(0.0, 0.0, 0.0, 0.0);
+        rayPos += offset * voxelSize * rayDir;
+
+        for (int i = 0; i < steps; i ++)
+        {
+            float diameter = max(voxelSize, finalRatio * dist);
+            float3 pos = rayPos + rayDir * dist;
+
+            light += AttributeSamplers[AttributeID].sampleFunction(pos, -rayDir, diameter) * saturate(1.0 - light.a);
+
+            dist += diameter * stepScale;
+        }
+        return light;
+    }
+    override float StepSize() { return AttributeSamplers[AttributeID].VoxelSize(); }
+    override float StepSizeRadius(float radiusScale) { return radiusScale * AttributeSamplers[AttributeID].VoxelSize(); }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchCone.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchCone.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchCone.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConeEditMode.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConeEditMode.xksl
new file mode 100644
index 0000000000..9b48ac83ef
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConeEditMode.xksl
@@ -0,0 +1,45 @@
+shader VoxelMarchConeEditMode : VoxelMarchMethod, VoxelRadiusMarchMethod, MarchAttributes
+{
+    #ifndef AttributeID
+        #define AttributeID 0
+    #endif
+    cbuffer PerView.Lighting
+    {
+        int steps;
+        float stepScale;
+        float coneRatio;
+        int fast;
+        float offset;
+    }
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        return MarchRadius(rayPos, rayDir, 1.0);
+    }
+    override float4 MarchRadius(float3 rayPos, float3 rayDir, float radiusScale)
+    {
+        float finalRatio = coneRatio.x * radiusScale;
+        float voxelSize = AttributeSamplers[AttributeID].VoxelSize();
+
+        float dist = voxelSize / max(1,finalRatio);
+
+        float4 light = float4(0.0, 0.0, 0.0, 0.0);
+        rayPos += offset * voxelSize * rayDir;
+
+        for (int i = 0; i < steps; i ++)
+        {
+            float diameter = max(voxelSize, finalRatio * dist);
+            float3 pos = rayPos + rayDir * dist;
+
+            if (fast)
+                light += AttributeSamplers[AttributeID].SampleNearestMip(pos, -rayDir, diameter) * saturate(1.0 - light.a);
+            else
+                light += AttributeSamplers[AttributeID].Sample(pos, -rayDir, diameter) * saturate(1.0 - light.a);
+
+            dist += diameter * stepScale;
+        }
+        return light;
+    }
+    
+    override float StepSize() { return AttributeSamplers[AttributeID].VoxelSize(); }
+    override float StepSizeRadius(float radiusScale) { return radiusScale * AttributeSamplers[AttributeID].VoxelSize(); }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConeEditMode.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConeEditMode.xksl.cs
new file mode 100644
index 0000000000..f3a6eac004
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConeEditMode.xksl.cs
@@ -0,0 +1,27 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelMarchConeEditModeKeys
+    {
+        public static readonly ValueParameterKey<int> steps = ParameterKeys.NewValue<int>();
+        public static readonly ValueParameterKey<float> stepScale = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<float> coneRatio = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<int> fast = ParameterKeys.NewValue<int>();
+        public static readonly ValueParameterKey<float> offset = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConePerMipmap.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConePerMipmap.xksl
new file mode 100644
index 0000000000..98f0381d6a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConePerMipmap.xksl
@@ -0,0 +1,31 @@
+shader VoxelMarchConePerMipmap<int steps> : VoxelMarchMethod, MarchAttributes
+{
+    #ifndef AttributeID
+        #define AttributeID 0
+    #endif
+    cbuffer PerView.Lighting
+    {
+        float offset;
+        float coneRatioInv;
+    }
+    override float4 March(float3 rayPos, float3 rayDir)
+    {
+        float voxelSize = AttributeSamplers[AttributeID].VoxelSize();
+        rayPos += rayDir * voxelSize * offset;
+        float dist = voxelSize * coneRatioInv;
+        float size = 0;
+        float4 light = float4(0.0, 0.0, 0.0, 0.0);
+        for (int i = 0; i < steps; i++)
+        {
+            float3 pos = rayPos + rayDir * dist;
+
+            light += AttributeSamplers[AttributeID].SampleByMipNearestMip(pos, -rayDir, size) * saturate(1.0 - light.a);
+
+            dist *= 2;
+            size += 1;
+        }
+        return light;
+    }
+
+    override float StepSize() { return AttributeSamplers[AttributeID].VoxelSize(); }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConePerMipmap.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConePerMipmap.xksl.cs
new file mode 100644
index 0000000000..6454801c7b
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchConePerMipmap.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelMarchConePerMipmapKeys
+    {
+        public static readonly ValueParameterKey<float> offset = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<float> coneRatioInv = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchMethod.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchMethod.xksl
new file mode 100644
index 0000000000..371396c5d5
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchMethod.xksl
@@ -0,0 +1,5 @@
+shader VoxelMarchMethod
+{
+    float4 March(float3 rayPos, float3 rayDir){ return float4(0, 0, 0, 0); }
+    float StepSize(){ return 1.0; }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchMethod.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchMethod.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelMarchMethod.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelRadiusMarchMethod.xksl b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelRadiusMarchMethod.xksl
new file mode 100644
index 0000000000..4dddce2a77
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelRadiusMarchMethod.xksl
@@ -0,0 +1,5 @@
+shader VoxelRadiusMarchMethod
+{
+    float4 MarchRadius(float3 rayPos, float3 rayDir, float radiusScale){ return float4(0, 0, 0, 0); }
+    float StepSizeRadius(float radiusScale){ return radiusScale; }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelRadiusMarchMethod.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelRadiusMarchMethod.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/Shaders/VoxelRadiusMarchMethod.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchBeam.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchBeam.cs
new file mode 100644
index 0000000000..21ea94757d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchBeam.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Beam")]
+    public class VoxelMarchBeam : IVoxelMarchMethod
+    {
+        public int Steps = 9;
+        public float StepScale = 1.0f;
+        public float BeamDiameter = 1.0f;
+        public VoxelMarchBeam()
+        {
+
+        }
+        public VoxelMarchBeam(int steps, float stepScale, float diameter)
+        {
+            Steps = steps;
+            StepScale = stepScale;
+            BeamDiameter = diameter;
+        }
+        public ShaderSource GetMarchingShader(int attrID)
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(new ShaderClassSource("VoxelMarchBeam", Steps, StepScale, BeamDiameter));
+            mixin.Macros.Add(new ShaderMacro("AttributeID", attrID));
+            return mixin;
+        }
+
+        public void UpdateMarchingLayout(string compositionName)
+        {
+        }
+        public void ApplyMarchingParameters(ParameterCollection parameters)
+        {
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchCone.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchCone.cs
new file mode 100644
index 0000000000..c05ddf2b91
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchCone.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Cone")]
+    public class VoxelMarchCone : IVoxelMarchMethod
+    {
+        [DataMember(0)]
+        public bool EditMode = true;
+        [DataMember(10)]
+        public bool Fast = false;
+        [DataMember(20)]
+        public int Steps = 9;
+        [DataMember(30)]
+        public float StepScale = 1.0f;
+        [DataMember(40)]
+        public float ConeRatio = 1.0f;
+        [DataMember(50)]
+        public float StartOffset = 1.0f;
+
+        public VoxelMarchCone()
+        {
+
+        }
+        public VoxelMarchCone(int steps, float stepScale, float ratio)
+        {
+            Steps = steps;
+            StepScale = stepScale;
+            ConeRatio = ratio;
+            EditMode = false;
+        }
+        public ShaderSource GetMarchingShader(int attrID)
+        {
+            var mixin = new ShaderMixinSource();
+            if (EditMode)
+            {
+                mixin.Mixins.Add(new ShaderClassSource("VoxelMarchConeEditMode"));
+            }
+            else
+            {
+                mixin.Mixins.Add(new ShaderClassSource("VoxelMarchCone", Steps, StepScale, ConeRatio, StartOffset));
+                mixin.Macros.Add(new ShaderMacro("sampleFunction", Fast ? "SampleNearestMip" : "Sample"));
+            }
+            mixin.Macros.Add(new ShaderMacro("AttributeID", attrID));
+
+            return mixin;
+        }
+
+        ValueParameterKey<int> StepsKey;
+        ValueParameterKey<float> StepScaleKey;
+        ValueParameterKey<float> ConeRatioKey;
+        ValueParameterKey<int> FastKey;
+        ValueParameterKey<float> OffsetKey;
+        public void UpdateMarchingLayout(string compositionName)
+        {
+            if (EditMode)
+            {
+                StepsKey = VoxelMarchConeEditModeKeys.steps.ComposeWith(compositionName);
+                StepScaleKey = VoxelMarchConeEditModeKeys.stepScale.ComposeWith(compositionName);
+                ConeRatioKey = VoxelMarchConeEditModeKeys.coneRatio.ComposeWith(compositionName);
+                FastKey = VoxelMarchConeEditModeKeys.fast.ComposeWith(compositionName);
+                OffsetKey = VoxelMarchConeEditModeKeys.offset.ComposeWith(compositionName);
+            }
+        }
+        public void ApplyMarchingParameters(ParameterCollection parameters)
+        {
+            if (EditMode)
+            {
+                parameters.Set(StepsKey, Steps);
+                parameters.Set(StepScaleKey, StepScale);
+                parameters.Set(ConeRatioKey, ConeRatio);
+                parameters.Set(FastKey, Fast ? 1 : 0);
+                parameters.Set(OffsetKey, StartOffset);
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchConePerMipmap.cs b/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchConePerMipmap.cs
new file mode 100644
index 0000000000..67c7721d2c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Marching/VoxelMarchConePerMipmap.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Cone (Mipmap Exact)")]
+    public class VoxelMarchConePerMipmap : IVoxelMarchMethod
+    {
+        [DataMember(0)]
+        public int Steps { get; set; } = 7;
+
+        [DataMember(10)]
+        public float ConeRatio { get; set; } = 1f;
+
+        [DataMember(20)]
+        public float StartOffset { get; set; } = 0.5f;
+
+        public VoxelMarchConePerMipmap()
+        {
+
+        }
+        public VoxelMarchConePerMipmap(float ratio, int steps)
+        {
+            ConeRatio = ratio;
+            Steps = steps;
+        }
+        public ShaderSource GetMarchingShader(int attrID)
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(new ShaderClassSource("VoxelMarchConePerMipmap", Steps));
+            mixin.Macros.Add(new ShaderMacro("AttributeID", attrID));
+            return mixin;
+        }
+        ValueParameterKey<float> OffsetKey;
+        ValueParameterKey<float> ConeRatioInvKey;
+        public void UpdateMarchingLayout(string compositionName)
+        {
+            OffsetKey = VoxelMarchConePerMipmapKeys.offset.ComposeWith(compositionName);
+            ConeRatioInvKey = VoxelMarchConePerMipmapKeys.coneRatioInv.ComposeWith(compositionName);
+        }
+        public void ApplyMarchingParameters(ParameterCollection parameters)
+        {
+            parameters.Set(OffsetKey, StartOffset);
+            parameters.Set(ConeRatioInvKey, 1.0f/ConeRatio);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/VoxelUtils.cs b/sources/engine/Xenko.Voxels/Voxels/VoxelUtils.cs
new file mode 100644
index 0000000000..9c7fee3ba6
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/VoxelUtils.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+
+namespace Xenko.Rendering.Voxels
+{
+    static class VoxelUtils
+    {
+        public static bool DisposeBufferBySpecs(Xenko.Graphics.Buffer buf, int count)
+        {
+            if (buf == null || buf.ElementCount != count)
+            {
+                if (buf != null)
+                    buf.Dispose();
+
+                return true;
+            }
+            return false;
+        }
+
+        public static bool TextureDimensionsEqual(Texture tex, Vector3 dim)
+        {
+            return (tex.Width == dim.X &&
+                    tex.Height == dim.Y &&
+                    tex.Depth == dim.Z);
+        }
+        public static bool DisposeTextureBySpecs(Xenko.Graphics.Texture tex, Vector3 dim, Xenko.Graphics.PixelFormat pixelFormat)
+        {
+            if (tex == null || !TextureDimensionsEqual(tex, dim) || tex.Format != pixelFormat)
+            {
+                if (tex != null)
+                    tex.Dispose();
+
+                return true;
+            }
+            return false;
+        }
+        public static bool DisposeTextureBySpecs(Xenko.Graphics.Texture tex, Vector3 dim, Xenko.Graphics.PixelFormat pixelFormat, MultisampleCount samples)
+        {
+            if (tex == null || !TextureDimensionsEqual(tex, dim) || tex.Format != pixelFormat || tex.MultisampleCount != samples)
+            {
+                if (tex != null)
+                    tex.Dispose();
+
+                return true;
+            }
+            return false;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttribute.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttribute.xksl
new file mode 100644
index 0000000000..2597448d54
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttribute.xksl
@@ -0,0 +1,9 @@
+shader VoxelAttribute
+{
+    void InitializeDummy(){}
+    void InitializeFromStreams(){}
+    void InitializeFromBuffer(RWBuffer<uint> buffer, uint address, uint2 base_stride){}
+    void IndirectWrite(RWBuffer<uint> buffer, uint address){}
+    void DirectWrite(uint3 address, uint strideIndex, uint stride){}
+    float4 SampleLocal(){return float4(0,0,0,1);};
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttribute.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttribute.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttribute.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageSampler.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageSampler.xksl
new file mode 100644
index 0000000000..b5100759e6
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageSampler.xksl
@@ -0,0 +1,41 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader VoxelAttributeDirectionalCoverageSampler : IVoxelSampler, Texturing
+    {
+        compose VoxelStorageTextureShader storage;
+
+        override float4 ComputeLocal(float3 position)
+        {
+            return float4(0,0,0,1);
+        }
+
+        float4 SetColor(float3 col)
+        {
+            return float4(col.r,col.g,col.b,max(col.r,max(col.g,col.b)));
+        }
+        override float4 Sample(float3 position, float3 normal, float diameter)
+        {
+            return SetColor(storage.Sample(position, diameter, 0).rgb);
+        }
+        override float4 SampleNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return SetColor(storage.SampleNearestMip(position, diameter, 0).rgb);
+        }
+        override float4 SampleByMipNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return SetColor(storage.SampleByMipNearestMip(position, diameter, 0).rgb);
+        }
+        override float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+        {
+            return storage.SampleRaw(pos,mipmap,textureID,axis);
+        }
+        override float VoxelSize()
+        {
+            return storage.VoxelSize();
+        }
+        override float4 Test()
+        {
+            return float4(0,1,0,1);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageSampler.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageSampler.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageSampler.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageShader.xksl
new file mode 100644
index 0000000000..26b2cbb2d7
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageShader.xksl
@@ -0,0 +1,54 @@
+shader VoxelAttributeDirectionalCoverageShader : VoxelAttribute, ShaderBaseStream, NormalStream, DataPacking
+{
+    stream uint Voxel_Coverage;
+    stream float3 Voxel_CoverageResolved;
+    stream uint coverage : SV_Coverage;
+
+    RWTexture3D<float3> DirectOutput;
+
+    override void InitializeDummy()
+    {
+        streams.Voxel_Coverage = 0;
+        streams.Voxel_CoverageResolved = float3(0,0,0);
+    }
+    override void InitializeFromStreams()
+    {
+        uint shift = 0;
+        float xdot = abs(streams.normalWS.x);
+        float ydot = abs(streams.normalWS.y);
+        float zdot = abs(streams.normalWS.z);
+        if (xdot > ydot && xdot > zdot)
+            shift = 0;
+        if (ydot > xdot && ydot > zdot)
+            shift = 8;
+        if (zdot > ydot && zdot > xdot)
+            shift = 16;
+        streams.Voxel_Coverage = uint(streams.coverage)<<shift;
+    }
+    override void DirectWrite(uint3 address, uint strideIndex, uint stride)
+    {
+        address.y += strideIndex * stride;
+        DirectOutput[address] = streams.Voxel_CoverageResolved;
+    }
+    override void IndirectWrite(RWBuffer<uint> buffer, uint address)
+    {
+        uint unusedOut;
+        InterlockedOr(buffer[address], streams.Voxel_Coverage, unusedOut);
+        address++;
+    }
+    override void InitializeFromBuffer(RWBuffer<uint> buffer, uint address, uint2 base_stride)
+    {
+        streams.Voxel_Coverage = buffer[address];
+        address++;
+
+        uint3 coverage = UnpackByte3ToUint3(streams.Voxel_Coverage);
+        streams.Voxel_CoverageResolved = (float3(countbits(coverage.x),countbits(coverage.y),countbits(coverage.z)))/8.0;
+    }
+    float3 GetResolved(){
+        return streams.Voxel_CoverageResolved; 
+    }
+    override float4 SampleLocal()
+    {
+        return float4(streams.Voxel_CoverageResolved, 1.0);
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageShader.xksl.cs
new file mode 100644
index 0000000000..e429b9b132
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeDirectionalCoverageShader.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelAttributeDirectionalCoverageShaderKeys
+    {
+        public static readonly ObjectParameterKey<Texture> DirectOutput = ParameterKeys.NewObject<Texture>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeEmissionOpacityShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeEmissionOpacityShader.xksl
new file mode 100644
index 0000000000..8bcbf5d171
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeEmissionOpacityShader.xksl
@@ -0,0 +1,29 @@
+shader VoxelAttributeEmissionOpacityShader : VoxelAttribute, ShaderBaseStream
+{
+    compose VoxelLayout_Float4 layout;
+    
+    override void InitializeDummy()
+    {
+        layout.InitializeDummy();
+    }
+    override void InitializeFromStreams()
+    {
+        layout.InitializeFromStreams(streams.ColorTarget);
+    }
+    override void DirectWrite(uint3 address, uint strideIndex, uint stride)
+    {
+        layout.DirectWrite(address, strideIndex, stride);
+    }
+    override void IndirectWrite(RWBuffer<uint> buffer, uint address)
+    {
+        layout.IndirectWrite(buffer,address);
+    }
+    override void InitializeFromBuffer(RWBuffer<uint> buffer, uint address, uint2 base_stride)
+    {
+        layout.InitializeFromBuffer(buffer, address);
+    }
+    override float4 SampleLocal()
+    {
+        return layout.SampleLocal();
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeEmissionOpacityShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeEmissionOpacityShader.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeEmissionOpacityShader.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSoliditySampler.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSoliditySampler.xksl
new file mode 100644
index 0000000000..09b7115edc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSoliditySampler.xksl
@@ -0,0 +1,37 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader VoxelAttributeSoliditySampler : IVoxelSampler, Texturing
+    {
+        compose VoxelStorageTextureShader storage;
+
+        override float4 ComputeLocal(float3 position)
+        {
+            return float4(0,0,0,1);
+        }
+
+        float4 SetColor(float4 col)
+        {
+            return float4(0,0,0,col.a);
+        }
+        override float4 Sample(float3 position, float3 normal, float diameter)
+        {
+            return SetColor(storage.Sample(position, diameter, 0).rrrr);
+        }
+        override float4 SampleNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return SetColor(storage.SampleNearestMip(position, diameter, 0).rrrr);
+        }
+        override float4 SampleByMipNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return SetColor(storage.SampleByMipNearestMip(position, diameter, 0).rrrr);
+        }
+        override float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+        {
+            return storage.SampleRaw(pos,mipmap,textureID,axis);
+        }
+        override float VoxelSize()
+        {
+            return storage.VoxelSize();
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSoliditySampler.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSoliditySampler.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSoliditySampler.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSolidityShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSolidityShader.xksl
new file mode 100644
index 0000000000..45a1f158a0
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSolidityShader.xksl
@@ -0,0 +1,106 @@
+shader VoxelAttributeSolidityShader : VoxelAttribute, VoxelPositionStream, ShaderBaseStream, NormalStream, DataPacking
+{
+    stream uint Voxel_SolidifyTop;
+    stream uint Voxel_SolidifyBottom;
+    stream float Voxel_Solidity;
+    stream int sendTo;
+    stream int ignoreTil;
+
+    RWTexture3D<float> DirectOutput;
+
+    override void InitializeDummy()
+    {
+        streams.Voxel_SolidifyTop = 0;
+        streams.Voxel_SolidifyBottom = 0;
+        streams.Voxel_Solidity = 0;
+        streams.sendTo = 0;
+        streams.ignoreTil = 0;
+    }
+    override void InitializeFromStreams()
+    {
+        uint pos = FloatUnormToUint(streams.PositionVXS.y) & (0xFFFFFFFF << 2);
+        uint invpos = FloatUnormToUint(1.0 - streams.PositionVXS.y) & (0xFFFFFFFF << 2);
+        uint type = 0;
+        streams.normalWS = normalize(streams.normalWS);
+        if (streams.normalWS.y < -0.0)
+            type = 1;
+        if (streams.normalWS.y > 0.0)
+            type = 2;
+
+        streams.Voxel_SolidifyTop = pos + type;
+        streams.Voxel_SolidifyBottom = invpos + type;
+
+        streams.sendTo = 0;
+        streams.ignoreTil = 0;
+    }
+    override void DirectWrite(uint3 address, uint strideIndex, uint stride)
+    {
+        address.y += strideIndex * stride;
+        DirectOutput[address] = streams.Voxel_Solidity;
+    }
+    override void IndirectWrite(RWBuffer<uint> buffer, uint address)
+    {
+        InterlockedMax(buffer[address], streams.Voxel_SolidifyTop);
+        address++;
+        InterlockedMax(buffer[address], streams.Voxel_SolidifyBottom);
+    }
+    bool ResolvesSelf()
+    {
+        return (streams.Voxel_SolidifyTop & 3) == 2 && (streams.Voxel_SolidifyBottom & 3) == 1;
+    }
+    bool IsSender()
+    {
+        return (streams.Voxel_SolidifyTop & 3) == 1;
+    }
+    bool IsReceiver()
+    {
+        return (streams.Voxel_SolidifyBottom & 3) == 2;
+    }
+    override float4 SampleLocal()
+    {
+        return float4(IsReceiver()?1:0,IsSender()?1:0,ResolvesSelf()?1:0,streams.Voxel_Solidity);
+    }
+    override void InitializeFromBuffer(RWBuffer<uint> buffer, uint address, uint2 base_stride)
+    {
+        int Y = streams.PositionVXPS.y;
+        int maxY = streams.VoxelVolumeSize.y;
+
+        uint originalAddress = address;
+
+        streams.Voxel_Solidity = 0;
+
+        if (Y>streams.ignoreTil)
+        {
+            if (Y>=streams.sendTo)
+            {
+                streams.ignoreTil = maxY;
+                for(int y = Y ; y < maxY; y++)
+                {
+                    uint tempAddress = base_stride.x + base_stride.y * y;
+                    streams.Voxel_SolidifyTop = buffer[tempAddress];
+                    streams.Voxel_SolidifyBottom = buffer[tempAddress + 1];
+                    if (IsReceiver())
+                    {
+                        if (streams.ignoreTil<y)
+                        {
+                            streams.sendTo = y;
+                            break;
+                        }
+                    }
+                    if (IsSender())
+                    {
+                        streams.ignoreTil = y;
+                    }
+                    if (ResolvesSelf())
+                    {
+                        streams.ignoreTil = maxY;
+                    }
+                }
+            }
+            else if (Y<streams.sendTo)
+            {
+                streams.Voxel_Solidity = 1;
+            }
+        }
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSolidityShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSolidityShader.xksl.cs
new file mode 100644
index 0000000000..210b36a073
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/Shaders/VoxelAttributeSolidityShader.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelAttributeSolidityShaderKeys
+    {
+        public static readonly ObjectParameterKey<Texture> DirectOutput = ParameterKeys.NewObject<Texture>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttribute.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttribute.cs
new file mode 100644
index 0000000000..9c57606b7a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttribute.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    public abstract class VoxelAttribute
+    {
+        public abstract void PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage);
+        public abstract void PrepareOutputStorage(VoxelStorageContext context, IVoxelStorage storage);
+        public abstract void ClearOutputStorage();
+
+        public abstract void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelizationStage stage, bool output);
+        public abstract void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output);
+
+        public virtual  bool RequiresColumns() => false;
+        public abstract void PostProcess(RenderDrawContext drawContext);
+
+        //Writing
+        public abstract ShaderSource GetVoxelizationShader();
+        public abstract void UpdateVoxelizationLayout(string compositionName);
+        public abstract void ApplyVoxelizationParameters(ParameterCollection parameters);
+
+        [DataMemberIgnore]
+        public virtual int BufferOffset { get; set; } = -1;
+
+        //Sampling
+        public abstract ShaderSource GetSamplingShader();
+        public abstract void UpdateSamplingLayout(string compositionName);
+        public abstract void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters);
+
+        [DataMemberIgnore]
+        public virtual int LocalSamplerID { get; set; } = -1;
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeDirectionalCoverage.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeDirectionalCoverage.cs
new file mode 100644
index 0000000000..b97dc6d52e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeDirectionalCoverage.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Directional Coverage")]
+    public class VoxelAttributeDirectionalCoverage : VoxelAttribute
+    {
+        IVoxelStorageTexture CoverageTex;
+
+        public override void PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            BufferOffset = storage.RequestTempStorage(32);
+        }
+        public override void PrepareOutputStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            storage.UpdateTexture(context, ref CoverageTex, Graphics.PixelFormat.R11G11B10_Float, 1);
+        }
+        public override void ClearOutputStorage()
+        {
+            CoverageTex = null;
+        }
+
+
+
+
+        public override void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelizationStage stage, bool output)
+        {
+            passList.defaultVoxelizationMethod.CollectVoxelizationPasses(passList, storer, view, resolution, this, stage, output, false);
+        }
+        public override void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output)
+        {
+            attributes.Add(new AttributeStream(this, VoxelizationStage.Post, output));
+        }
+
+        ShaderSource[] mipmapper = { new ShaderClassSource("Voxel2x2x2MipmapperSimple") };
+        public override void PostProcess(RenderDrawContext drawContext)
+        {
+            CoverageTex.PostProcess(drawContext, mipmapper);
+        }
+
+
+
+
+        ShaderClassSource source = new ShaderClassSource("VoxelAttributeDirectionalCoverageShader");
+        ObjectParameterKey<Xenko.Graphics.Texture> DirectOutput;
+
+        public override ShaderSource GetVoxelizationShader()
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(source);
+            return mixin;
+        }
+        public override void UpdateVoxelizationLayout(string compositionName)
+        {
+            DirectOutput = VoxelAttributeDirectionalCoverageShaderKeys.DirectOutput.ComposeWith(compositionName);
+        }
+        public override void ApplyVoxelizationParameters(ParameterCollection parameters)
+        {
+            CoverageTex?.ApplyVoxelizationParameters(DirectOutput, parameters);
+        }
+
+
+
+
+        ShaderClassSource sampler = new ShaderClassSource("VoxelAttributeDirectionalCoverageSampler");
+
+        public override ShaderSource GetSamplingShader()
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(sampler);
+            if (CoverageTex!=null)
+                mixin.AddComposition("storage", CoverageTex.GetSamplingShader());
+            return mixin;
+        }
+        public override void UpdateSamplingLayout(string compositionName)
+        {
+            CoverageTex?.UpdateSamplingLayout("storage." + compositionName);
+        }
+        public override void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters)
+        {
+            CoverageTex?.ApplySamplingParameters(viewContext, parameters);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeEmissionOpacity.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeEmissionOpacity.cs
new file mode 100644
index 0000000000..cfa4426163
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeEmissionOpacity.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Emission+Opacity")]
+    public class VoxelAttributeEmissionOpacity : VoxelAttribute
+    {
+        public enum LightFalloffs
+        {
+            [Display("Sharp")] Sharp,
+            [Display("Physically Based")] PhysicallyBased,
+            [Display("Physically Based + Shadowing Heuristic")] Heuristic,
+        }
+
+        [NotNull]
+        public IVoxelLayout VoxelLayout { get; set; } = new VoxelLayoutIsotropic();
+
+        public List<VoxelModifierEmissionOpacity> Modifiers { get; set; } = new List<VoxelModifierEmissionOpacity>();
+
+        public LightFalloffs LightFalloff { get; set; } = LightFalloffs.Heuristic;
+
+
+        public override void PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            BufferOffset = VoxelLayout.PrepareLocalStorage(context, storage);
+        }
+        public override void PrepareOutputStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            VoxelLayout.PrepareOutputStorage(context, storage);
+        }
+        public override void ClearOutputStorage()
+        {
+            VoxelLayout.ClearOutputStorage();
+        }
+
+
+
+
+        public override void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelizationStage stage, bool output)
+        {
+            passList.defaultVoxelizationMethod.CollectVoxelizationPasses(passList, storer, view, resolution, this, stage, output, true);
+        }
+        public override void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output)
+        {
+            foreach (VoxelModifierEmissionOpacity modifier in Modifiers)
+            {
+                if (!modifier.Enabled) continue;
+
+                modifier.CollectAttributes(attributes, VoxelizationStage.Post, false);
+            }
+            attributes.Add(new AttributeStream(this, VoxelizationStage.Post, output));
+        }
+
+        public override bool RequiresColumns()
+        {
+            foreach (VoxelModifierEmissionOpacity modifier in Modifiers)
+            {
+                if (!modifier.Enabled) continue;
+
+                if (modifier.RequiresColumns())
+                    return true;
+            }
+            return false;
+        }
+        public override void PostProcess(RenderDrawContext drawContext)
+        {
+            VoxelLayout.PostProcess(drawContext, LightFalloff);
+        }
+
+
+
+
+        ShaderClassSource source = new ShaderClassSource("VoxelAttributeEmissionOpacityShader");
+
+        public override ShaderSource GetVoxelizationShader()
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(source);
+            mixin.AddComposition("layout", VoxelLayout.GetVoxelizationShader(Modifiers));
+            return mixin;
+        }
+        public override void UpdateVoxelizationLayout(string compositionName)
+        {
+            int i = 0;
+            foreach (VoxelModifierEmissionOpacity modifier in Modifiers)
+            {
+                if (!modifier.Enabled) continue;
+
+                modifier.UpdateVoxelizationLayout($"Modifiers[{i}].layout.{compositionName}");
+                i++;
+            }
+            VoxelLayout.UpdateVoxelizationLayout("layout." + compositionName, Modifiers);
+        }
+        public override void ApplyVoxelizationParameters(ParameterCollection parameters)
+        {
+            foreach (VoxelModifierEmissionOpacity modifier in Modifiers)
+            {
+                if (!modifier.Enabled) continue;
+
+                modifier.ApplyVoxelizationParameters(parameters);
+            }
+            VoxelLayout.ApplyVoxelizationParameters(parameters, Modifiers);
+        }
+
+
+
+
+        public override ShaderSource GetSamplingShader()
+        {
+            return VoxelLayout.GetSamplingShader();
+        }
+        public override void UpdateSamplingLayout(string compositionName)
+        {
+            VoxelLayout.UpdateSamplingLayout(compositionName);
+        }
+        public override void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters)
+        {
+            VoxelLayout.ApplySamplingParameters(viewContext, parameters);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeSolidity.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeSolidity.cs
new file mode 100644
index 0000000000..3921861966
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Attributes/VoxelAttributeSolidity.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Solidity")]
+    public class VoxelAttributeSolidity : VoxelAttribute
+    {
+        IVoxelStorageTexture SolidityTex;
+
+        public override void PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            BufferOffset = storage.RequestTempStorage(64);
+        }
+        public override void PrepareOutputStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            storage.UpdateTexture(context, ref SolidityTex, Graphics.PixelFormat.R8_UNorm, 1);
+        }
+        public override void ClearOutputStorage()
+        {
+            SolidityTex = null;
+        }
+
+
+
+
+        VoxelizationMethodSingleAxis method = new VoxelizationMethodSingleAxis
+        {
+            MultisampleCount = Graphics.MultisampleCount.None,
+            VoxelizationAxis = VoxelizationMethodSingleAxis.Axis.Y
+        };
+        public override void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelizationStage stage, bool output)
+        {
+            method.CollectVoxelizationPasses(passList, storer, view, resolution, this, stage, output, false);
+        }
+        public override void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output)
+        {
+            attributes.Add(new AttributeStream(this, VoxelizationStage.Post, output));
+        }
+
+        public override bool RequiresColumns()
+        {
+            return true;
+        }
+        ShaderSource[] mipmapper = { new ShaderClassSource("Voxel2x2x2MipmapperSimple") };
+
+        public override void PostProcess(RenderDrawContext drawContext)
+        {
+            SolidityTex.PostProcess(drawContext, mipmapper);
+        }
+
+
+
+
+        ShaderClassSource source = new ShaderClassSource("VoxelAttributeSolidityShader");
+        ObjectParameterKey<Xenko.Graphics.Texture> DirectOutput;
+
+        public override ShaderSource GetVoxelizationShader()
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(source);
+            return mixin;
+        }
+        public override void UpdateVoxelizationLayout(string compositionName)
+        {
+            DirectOutput = VoxelAttributeSolidityShaderKeys.DirectOutput.ComposeWith(compositionName);
+        }
+        public override void ApplyVoxelizationParameters(ParameterCollection parameters)
+        {
+            SolidityTex?.ApplyVoxelizationParameters(DirectOutput, parameters);
+        }
+
+
+
+
+        ValueParameterKey<float> BrightnessKey;
+        ShaderClassSource sampler = new ShaderClassSource("VoxelAttributeSoliditySampler");
+
+        public override ShaderSource GetSamplingShader()
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(sampler);
+            if (SolidityTex!=null)
+            mixin.AddComposition("storage", SolidityTex.GetSamplingShader());
+            return mixin;
+        }
+        public override void UpdateSamplingLayout(string compositionName)
+        {
+            BrightnessKey = VoxelIsotropicSamplerKeys.maxBrightness.ComposeWith(compositionName);
+            SolidityTex?.UpdateSamplingLayout("storage." + compositionName);
+        }
+        public override void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters)
+        {
+            parameters.Set(BrightnessKey, 1.0f);
+            SolidityTex?.ApplySamplingParameters(viewContext, parameters);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/IVoxelBufferWriter.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/IVoxelBufferWriter.cs
new file mode 100644
index 0000000000..d4f68d806a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/IVoxelBufferWriter.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelBufferWriter
+    {
+        ShaderSource GetShader();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteAssign.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteAssign.xksl
new file mode 100644
index 0000000000..bd21b906dc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteAssign.xksl
@@ -0,0 +1,13 @@
+    shader VoxelBufferWriteAssign : VoxelBufferWriter
+    {
+        override void Write_Internal(RWBuffer<uint> fragmentsBuffer, inout uint address, uint data)
+        {
+            fragmentsBuffer[address] = data;
+            address++;
+        }
+        
+        override float4 Test()
+        {
+            return float4(0,1,0,1);
+        }
+    };
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteAssign.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteAssign.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteAssign.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteMax.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteMax.xksl
new file mode 100644
index 0000000000..5fc152f439
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteMax.xksl
@@ -0,0 +1,14 @@
+    shader VoxelBufferWriteMax : VoxelBufferWriter
+    {
+        override void Write_Internal(RWBuffer<uint> fragmentsBuffer, inout uint address, uint data)
+        {
+            uint unusedOut = -1;
+            InterlockedMax(fragmentsBuffer[address], data, unusedOut);
+            address++;
+        }
+        
+        override float4 Test()
+        {
+            return float4(0,1,0,1);
+        }
+    };
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteMax.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteMax.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriteMax.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriter.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriter.xksl
new file mode 100644
index 0000000000..1284cfbf40
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriter.xksl
@@ -0,0 +1,27 @@
+    shader VoxelBufferWriter
+    {
+        void Write_Internal(RWBuffer<uint> fragmentsBuffer, inout uint address, uint data){}
+        void Write_Internal(RWBuffer<uint> fragmentsBuffer, inout uint address, uint2 data)
+        {
+            Write_Internal(fragmentsBuffer, address,data.x);
+            Write_Internal(fragmentsBuffer, address,data.y);
+        }
+        void Write_Internal(RWBuffer<uint> fragmentsBuffer, inout uint address, uint3 data)
+        {
+            Write_Internal(fragmentsBuffer, address,data.x);
+            Write_Internal(fragmentsBuffer, address,data.y);
+            Write_Internal(fragmentsBuffer, address,data.z);
+        }
+        void Write_Internal(RWBuffer<uint> fragmentsBuffer, inout uint address, uint4 data)
+        {
+            Write_Internal(fragmentsBuffer, address,data.x);
+            Write_Internal(fragmentsBuffer, address,data.y);
+            Write_Internal(fragmentsBuffer, address,data.z);
+            Write_Internal(fragmentsBuffer, address,data.w);
+        }
+        
+        float4 Test()
+        {
+            return float4(1,0,0,1);
+        }
+    };
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriter.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriter.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/Shaders/VoxelBufferWriter.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/VoxelBufferWriteAssign.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/VoxelBufferWriteAssign.cs
new file mode 100644
index 0000000000..992e97383e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/VoxelBufferWriteAssign.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    //[DataContract("VoxelFlickerReductionNone")]
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("None")]
+    public class VoxelBufferWriteAssign : IVoxelBufferWriter
+    {
+        ShaderSource source = new ShaderClassSource("VoxelBufferWriteAssign");
+        public ShaderSource GetShader()
+        {
+            return source;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/VoxelBufferWriteMax.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/VoxelBufferWriteMax.cs
new file mode 100644
index 0000000000..22c85f0bdb
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/BufferWriters/VoxelBufferWriteMax.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    //[DataContract("VoxelFlickerReductionAverage")]
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Max")]
+    public class VoxelBufferWriteMax : IVoxelBufferWriter
+    {
+        ShaderSource source = new ShaderClassSource("VoxelBufferWriteMax");
+        public ShaderSource GetShader()
+        {
+            return source;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/IVoxelFragmentPacker.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/IVoxelFragmentPacker.cs
new file mode 100644
index 0000000000..5c7f3b6c74
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/IVoxelFragmentPacker.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelFragmentPacker
+    {
+        ShaderSource GetShader();
+        int GetBits(int channels);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/DataPacking.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/DataPacking.xksl
new file mode 100644
index 0000000000..a8689adb1a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/DataPacking.xksl
@@ -0,0 +1,96 @@
+shader DataPacking
+{
+    uint FloatToUnsignedFloatWExponent5(float num, int mantissa)
+    {
+        uint fltInt32 = asuint(num);
+        int offset = (23-mantissa);
+        int bitdepth = mantissa+5;
+        int bias = 15;//pow(2,5 - 1) - 1;
+        int biascounter = 0x38000000;//(127-bias)<<23;
+
+        if (((fltInt32 & 0x7f800000) >> offset) <= (biascounter >> offset))
+            return 0;
+
+        uint fltInt16    =  (((fltInt32 & 0x7fffffff) >> offset) - (biascounter >> offset)) & (0xFFFFFFFF >> (32-bitdepth));
+        
+        return fltInt16;
+    }
+    float UnsignedFloatWExponent5ToFloat(uint num, int mantissa)
+    {
+        uint fltInt16 = num;
+        int offset = (23-mantissa);
+        int bitdepth = mantissa+5;
+        int bias = pow(2,5 - 1) - 1;
+        int biascounter = (127-bias)<<23;
+
+        if (num==0)
+            return 0;
+
+        uint fltInt32        = ((fltInt16) << offset) + 0x38000000;
+
+        return asfloat(fltInt32);
+    }
+    uint Float3ToR11G11B10(float3 num)
+    {
+        return FloatToUnsignedFloatWExponent5(num.r, 6) | (FloatToUnsignedFloatWExponent5(num.g, 6)<<11) | (FloatToUnsignedFloatWExponent5(num.b, 5)<<22);
+    }
+    float3 R11G11B10ToFloat3(uint num)
+    {
+        float3 ret;
+        ret.r = UnsignedFloatWExponent5ToFloat(num & (0xFFFFFFFF>>(32-11)),6);
+        ret.g = UnsignedFloatWExponent5ToFloat((num>>11) & (0xFFFFFFFF>>(32-11)),6);
+        ret.b = UnsignedFloatWExponent5ToFloat((num>>22),5);
+        return ret;
+    }
+    uint FloatToHalfFloat(float num)
+    {
+        uint fltInt32 = asuint(num);
+
+        if (((fltInt32 & 0x7f800000) >> 13) <= (0x38000000 >> 13))
+            return 0;
+
+        uint fltInt16    =  (((fltInt32 & 0x7fffffff) >> 13) - (0x38000000 >> 13)) & 0x00007fff;
+        fltInt16    |= ((fltInt32 & 0x80000000) >> 16);
+
+        return fltInt16;
+    }
+    float HalfFloatToFloat(uint num)
+    {
+        if (num==0)
+            return 0;
+
+        uint fltInt16 = num;
+
+        uint fltInt32    =  ((fltInt16 & 0x00008000) << 16);
+        fltInt32        |= ((fltInt16 & 0x00007fff) << 13) + 0x38000000;
+
+        return asfloat(fltInt32);
+    }
+    uint PackFloat2ToHalfFloat2(float2 num)
+    {
+        return FloatToHalfFloat(num.r) | (FloatToHalfFloat(num.g)<<16);
+    }
+    float2 UnpackHalfFloat2ToFloat2(uint num)
+    {
+        return float2(  HalfFloatToFloat(num & 0x0000ffff),
+                        HalfFloatToFloat(num >> 16)         );
+    }
+
+    uint3 UnpackByte3ToUint3(uint num)
+    {
+        return uint3(
+            num & 0x000000ff,
+            (num >> 8) & 0x000000ff,
+            (num >> 16) & 0x000000ff
+        );
+    }
+
+    uint FloatUnormToUint(float num)
+    {
+        return (uint)(num * 4294967295.0);
+    }
+    float UintToFloatUnorm(uint num)
+    {
+        return float(num) / 4294967295.0;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/DataPacking.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/DataPacking.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/DataPacking.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat16.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat16.xksl
new file mode 100644
index 0000000000..8335291f01
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat16.xksl
@@ -0,0 +1,61 @@
+shader VoxelFragmentPackFloat16 : VoxelFragmentPacker, DataPacking
+{
+    override void Skip(inout uint address, float unpacked){address += 1;}
+    override void Skip(inout uint address, float2 unpacked){address += 1;}
+    override void Skip(inout uint address, float3 unpacked){address += 2;}
+    override void Skip(inout uint address, float4 unpacked){address += 2;}
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, FloatToHalfFloat(unpacked.r));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float2 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, PackFloat2ToHalfFloat2(unpacked.rg));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float3 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, 
+        uint2(
+            PackFloat2ToHalfFloat2(unpacked.rg),
+            FloatToHalfFloat(unpacked.b)
+        )
+        );
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float4 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, 
+        uint2(
+            PackFloat2ToHalfFloat2(unpacked.rg),
+            PackFloat2ToHalfFloat2(unpacked.ba)
+        )
+        );
+    }
+
+
+
+
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float unpacked)
+    {
+        unpacked = HalfFloatToFloat(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float2 unpacked)
+    {
+        unpacked = UnpackHalfFloat2ToFloat2(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float3 unpacked)
+    {
+        unpacked.rg = UnpackHalfFloat2ToFloat2(fragmentsBuffer[address]);
+        address++;
+        unpacked.b = HalfFloatToFloat(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float4 unpacked)
+    {
+        unpacked.rg = UnpackHalfFloat2ToFloat2(fragmentsBuffer[address]);
+        address++;
+        unpacked.ba = UnpackHalfFloat2ToFloat2(fragmentsBuffer[address]);
+        address++;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat16.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat16.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat16.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat32.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat32.xksl
new file mode 100644
index 0000000000..302431dad4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat32.xksl
@@ -0,0 +1,59 @@
+shader VoxelFragmentPackFloat32 : VoxelFragmentPacker
+{
+    override void Skip(inout uint address, float unpacked){address += 1;}
+    override void Skip(inout uint address, float2 unpacked){address += 2;}
+    override void Skip(inout uint address, float3 unpacked){address += 3;}
+    override void Skip(inout uint address, float4 unpacked){address += 4;}
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, asuint(unpacked));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float2 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, asuint(unpacked));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float3 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, asuint(unpacked));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float4 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, asuint(unpacked));
+    }
+
+
+    
+
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float unpacked)
+    {
+        unpacked = asfloat(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float2 unpacked)
+    {
+        unpacked.r = asfloat(fragmentsBuffer[address]);
+        address++;
+        unpacked.g = asfloat(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float3 unpacked)
+    {
+        unpacked.r = asfloat(fragmentsBuffer[address]);
+        address++;
+        unpacked.g = asfloat(fragmentsBuffer[address]);
+        address++;
+        unpacked.b = asfloat(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float4 unpacked)
+    {
+        unpacked.r = asfloat(fragmentsBuffer[address]);
+        address++;
+        unpacked.g = asfloat(fragmentsBuffer[address]);
+        address++;
+        unpacked.b = asfloat(fragmentsBuffer[address]);
+        address++;
+        unpacked.a = asfloat(fragmentsBuffer[address]);
+        address++;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat32.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat32.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloat32.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloatR11G11B10.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloatR11G11B10.xksl
new file mode 100644
index 0000000000..19410f1bf0
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloatR11G11B10.xksl
@@ -0,0 +1,64 @@
+shader VoxelFragmentPackFloatR11G11B10 : VoxelFragmentPacker, DataPacking
+{
+    override void Skip(inout uint address, float unpacked){address += 1;}
+    override void Skip(inout uint address, float2 unpacked){address += 1;}
+    override void Skip(inout uint address, float3 unpacked){address += 1;}
+    override void Skip(inout uint address, float4 unpacked){address += 2;}
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float3 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, Float3ToR11G11B10(unpacked));
+    }
+
+
+
+
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float3 unpacked)
+    {
+        unpacked.rgb = R11G11B10ToFloat3(fragmentsBuffer[address]);
+        address++;
+    }
+
+
+
+    //Until partial packing is implemented (if ever), write some halfs when not writing exactly 3 values
+    //Otherwise many bits are wasted
+    //Keep layout consistent though (or things like InterlockedMax can give unexpected results)
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, FloatToHalfFloat(unpacked.r));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float2 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, PackFloat2ToHalfFloat2(unpacked.rg));
+    }
+    override void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float4 unpacked)
+    {
+        writer.Write_Internal(fragmentsBuffer, address, 
+        uint2(
+            Float3ToR11G11B10(unpacked.rgb),
+            FloatToHalfFloat(unpacked.a)
+        )
+        );
+    }
+
+
+
+
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float unpacked)
+    {
+        unpacked = HalfFloatToFloat(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float2 unpacked)
+    {
+        unpacked = UnpackHalfFloat2ToFloat2(fragmentsBuffer[address]);
+        address++;
+    }
+    override void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float4 unpacked)
+    {
+        unpacked.rgb = R11G11B10ToFloat3(fragmentsBuffer[address]);
+        address++;
+        unpacked.a = HalfFloatToFloat(fragmentsBuffer[address]);
+        address++;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloatR11G11B10.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloatR11G11B10.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPackFloatR11G11B10.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPacker.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPacker.xksl
new file mode 100644
index 0000000000..2630f872fb
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPacker.xksl
@@ -0,0 +1,19 @@
+shader VoxelFragmentPacker
+{
+    compose VoxelBufferWriter writer;
+
+    void Skip(inout uint address, float unpacked){}
+    void Skip(inout uint address, float2 unpacked){}
+    void Skip(inout uint address, float3 unpacked){}
+    void Skip(inout uint address, float4 unpacked){}
+
+    void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float unpacked){}
+    void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float2 unpacked){}
+    void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float3 unpacked){}
+    void Write(RWBuffer<uint> fragmentsBuffer, inout uint address, float4 unpacked){}
+
+    void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float unpacked){unpacked = 0;}
+    void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float2 unpacked){unpacked = float2(0,0);}
+    void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float3 unpacked){unpacked = float3(0,0,0);}
+    void Read(RWBuffer<uint> fragmentsBuffer, inout uint address, out float4 unpacked){unpacked = float4(0,0,0,0);}
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPacker.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPacker.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/Shaders/VoxelFragmentPacker.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloat16.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloat16.cs
new file mode 100644
index 0000000000..a600ad9cfc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloat16.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Float16")]
+    public class VoxelFragmentPackFloat16 : IVoxelFragmentPacker
+    {
+        ShaderSource source = new ShaderClassSource("VoxelFragmentPackFloat16");
+        public ShaderSource GetShader()
+        {
+            return source;
+        }
+        public int GetBits(int channels)
+        {
+            return channels * 16;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloat32.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloat32.cs
new file mode 100644
index 0000000000..6f95eb396c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloat32.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Float32")]
+    public class VoxelFragmentPackFloat32 : IVoxelFragmentPacker
+    {
+        ShaderSource source = new ShaderClassSource("VoxelFragmentPackFloat32");
+        public ShaderSource GetShader()
+        {
+            return source;
+        }
+        public int GetBits(int channels)
+        {
+            return channels * 32;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloatR11G11B10.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloatR11G11B10.cs
new file mode 100644
index 0000000000..1035c3718e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/FragmentPackers/VoxelFragmentPackFloatR11G11B10.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("R11G11B10F")]
+    public class VoxelFragmentPackFloatR11G11B10 : IVoxelFragmentPacker
+    {
+        ShaderSource source = new ShaderClassSource("VoxelFragmentPackFloatR11G11B10");
+        public ShaderSource GetShader()
+        {
+            return source;
+        }
+        public int GetBits(int channels)
+        {
+            return ((channels+2) / 3)*32;//(channels)/3 * 32 + (channels % 3) * 11;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/IVoxelLayout.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/IVoxelLayout.cs
new file mode 100644
index 0000000000..0ba99a926a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/IVoxelLayout.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Shaders;
+using static Xenko.Rendering.Voxels.VoxelAttributeEmissionOpacity;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelLayout
+    {
+        int PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage);
+        void PrepareOutputStorage(VoxelStorageContext context, IVoxelStorage storage);
+        void ClearOutputStorage();
+
+        void PostProcess(RenderDrawContext drawContext, LightFalloffs LightFalloff);
+
+        //Writing
+        ShaderSource GetVoxelizationShader(List<VoxelModifierEmissionOpacity> modifiers);
+        void UpdateVoxelizationLayout(string compositionName, List<VoxelModifierEmissionOpacity> modifiers);
+        void ApplyVoxelizationParameters(ParameterCollection parameters, List<VoxelModifierEmissionOpacity> modifiers);
+
+        //Sampling
+        ShaderSource GetSamplingShader();
+        void UpdateSamplingLayout(string compositionName);
+        void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedSampler.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedSampler.xksl
new file mode 100644
index 0000000000..ea019e9fcc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedSampler.xksl
@@ -0,0 +1,48 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader VoxelAnisotropicPairedSampler : IVoxelSampler, Texturing
+    {
+        compose VoxelStorageTextureShader storage;
+        cbuffer PerView.Lighting
+        {
+            float maxBrightness;
+        }
+        
+        float4 applyMaxBrightness(float4 col)
+        {
+            return float4(col.rgb * maxBrightness, col.a);
+        }
+        override float4 Sample(float3 position, float3 normal, float diameter)
+        {
+            return applyMaxBrightness(
+                   storage.Sample(position, diameter, 0) * abs(normal.x) +
+                   storage.Sample(position, diameter, 1) * abs(normal.y) +
+                   storage.Sample(position, diameter, 2) * abs(normal.z)
+                   );
+        }
+        override float4 SampleNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return applyMaxBrightness(
+                   storage.SampleNearestMip(position, diameter, 0) * abs(normal.x) +
+                   storage.SampleNearestMip(position, diameter, 1) * abs(normal.y) +
+                   storage.SampleNearestMip(position, diameter, 2) * abs(normal.z)
+                   );
+        }
+        override float4 SampleByMipNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return applyMaxBrightness(
+                   storage.SampleByMipNearestMip(position, diameter, 0) * abs(normal.x) +
+                   storage.SampleByMipNearestMip(position, diameter, 1) * abs(normal.y) +
+                   storage.SampleByMipNearestMip(position, diameter, 2) * abs(normal.z)
+                   );
+        }
+        override float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+        {
+            return storage.SampleRaw(pos, mipmap, textureID, axis);
+        }
+        override float VoxelSize()
+        {
+            return storage.VoxelSize();
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedSampler.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedSampler.xksl.cs
new file mode 100644
index 0000000000..3944efc478
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedSampler.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class VoxelAnisotropicPairedSamplerKeys
+    {
+        public static readonly ValueParameterKey<float> maxBrightness = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedWriter_Float4.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedWriter_Float4.xksl
new file mode 100644
index 0000000000..335dd8a0b2
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedWriter_Float4.xksl
@@ -0,0 +1,62 @@
+shader VoxelAnisotropicPairedWriter_Float4 : VoxelLayout_Float4, NormalStream
+{
+    stream float4 axisX;
+    stream float4 axisY;
+    stream float4 axisZ;
+    RWTexture3D<float4> DirectOutput;
+    compose VoxelFragmentPacker writer;
+
+    float maxBrightnessInv;
+    
+    compose VoxelModifierApplierAnisotropicPaired Modifiers[];
+    override void InitializeDummy()
+    {
+        streams.axisX = float4(0,0,0,0);
+        streams.axisY = float4(0,0,0,0);
+        streams.axisZ = float4(0,0,0,0);
+    }
+    override void InitializeFromStreams(float4 original)
+    {
+        streams.axisX = original * abs(streams.normalWS.x);
+        streams.axisY = original * abs(streams.normalWS.y);
+        streams.axisZ = original * abs(streams.normalWS.z);
+    }
+    float4 applyMaxBrightness(float4 col)
+    {
+        return float4(col.rgb * maxBrightnessInv, col.a);
+    }
+    override void DirectWrite(uint3 address, uint strideIndex, uint stride)
+    {
+        address.y += strideIndex * stride * 3;
+        float4 tempAxisX = streams.axisX;
+        float4 tempAxisY = streams.axisY;
+        float4 tempAxisZ = streams.axisZ;
+        foreach (var modifier in Modifiers)
+        {
+            modifier.Apply(tempAxisX, tempAxisY, tempAxisZ);
+        }
+        streams.axisX = tempAxisX;
+        streams.axisY = tempAxisY;
+        streams.axisZ = tempAxisZ;
+
+        DirectOutput[address] = applyMaxBrightness(streams.axisX);address.y += stride;
+        DirectOutput[address] = applyMaxBrightness(streams.axisY);address.y += stride;
+        DirectOutput[address] = applyMaxBrightness(streams.axisZ);
+    }
+    override void IndirectWrite(RWBuffer<uint> buffer, uint address)
+    {
+        writer.Write(buffer, address, streams.axisX);
+        writer.Write(buffer, address, streams.axisY);
+        writer.Write(buffer, address, streams.axisZ);
+    }
+    override void InitializeFromBuffer(RWBuffer<uint> buffer, uint address)
+    {
+        writer.Read(buffer, address, streams.axisX);
+        writer.Read(buffer, address, streams.axisY);
+        writer.Read(buffer, address, streams.axisZ);
+    }
+    override float4 SampleLocal()
+    {
+        return streams.axisX;
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedWriter_Float4.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedWriter_Float4.xksl.cs
new file mode 100644
index 0000000000..9244be84a2
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicPairedWriter_Float4.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelAnisotropicPairedWriter_Float4Keys
+    {
+        public static readonly ObjectParameterKey<Texture> DirectOutput = ParameterKeys.NewObject<Texture>();
+        public static readonly ValueParameterKey<float> maxBrightnessInv = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicSampler.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicSampler.xksl
new file mode 100644
index 0000000000..8d7345f1a4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicSampler.xksl
@@ -0,0 +1,54 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader VoxelAnisotropicSampler : IVoxelSampler, Texturing
+    {
+        compose VoxelStorageTextureShader storage;
+        cbuffer PerView.Lighting
+        {
+            float maxBrightness;
+        }
+        
+        float4 applyMaxBrightness(float4 col)
+        {
+            return float4(col.rgb * maxBrightness, col.a);
+        }
+        override float4 Sample(float3 position, float3 normal, float diameter)
+        {
+            float4 sum = float4(0,0,0,0);
+
+            sum  = storage.Sample(position, diameter, normal.x > 0 ? 0 : 1) * abs(normal.x);
+            sum += storage.Sample(position, diameter, normal.y > 0 ? 2 : 3) * abs(normal.y);
+            sum += storage.Sample(position, diameter, normal.z > 0 ? 4 : 5) * abs(normal.z);
+
+            return applyMaxBrightness(sum);
+        }
+        override float4 SampleNearestMip(float3 position, float3 normal, float diameter)
+        {
+            float4 sum = float4(0, 0, 0, 0);
+
+            sum  = storage.SampleNearestMip(position, diameter, normal.x > 0 ? 0 : 1) * abs(normal.x);
+            sum += storage.SampleNearestMip(position, diameter, normal.y > 0 ? 2 : 3) * abs(normal.y);
+            sum += storage.SampleNearestMip(position, diameter, normal.z > 0 ? 4 : 5) * abs(normal.z);
+
+            return applyMaxBrightness(sum);
+        }
+        override float4 SampleByMipNearestMip(float3 position, float3 normal, float diameter)
+        {
+            float4 sum = float4(0, 0, 0, 0);
+
+            sum  = storage.SampleByMipNearestMip(position, diameter, normal.x > 0 ? 0 : 1) * abs(normal.x);
+            sum += storage.SampleByMipNearestMip(position, diameter, normal.y > 0 ? 2 : 3) * abs(normal.y);
+            sum += storage.SampleByMipNearestMip(position, diameter, normal.z > 0 ? 4 : 5) * abs(normal.z);
+
+            return applyMaxBrightness(sum);
+        }
+        override float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+        {
+            return storage.SampleRaw(pos, mipmap, textureID, axis);
+        }
+        override float VoxelSize()
+        {
+            return storage.VoxelSize();
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicSampler.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicSampler.xksl.cs
new file mode 100644
index 0000000000..b085b45427
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicSampler.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class VoxelAnisotropicSamplerKeys
+    {
+        public static readonly ValueParameterKey<float> maxBrightness = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicWriter_Float4.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicWriter_Float4.xksl
new file mode 100644
index 0000000000..48216de75a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicWriter_Float4.xksl
@@ -0,0 +1,98 @@
+shader VoxelAnisotropicWriter_Float4 : VoxelLayout_Float4, NormalStream
+{
+    stream float4 axisXP;
+    stream float4 axisXN;
+    stream float4 axisYP;
+    stream float4 axisYN;
+    stream float4 axisZP;
+    stream float4 axisZN;
+    RWTexture3D<float4> DirectOutput;
+    compose VoxelFragmentPacker writer;
+
+    float maxBrightnessInv;
+    
+    compose VoxelModifierApplierAnisotropic Modifiers[];
+    override void InitializeDummy()
+    {
+        streams.axisXP = float4(0,0,0,0);
+        streams.axisYP = float4(0,0,0,0);
+        streams.axisZP = float4(0,0,0,0);
+        streams.axisXN = float4(0,0,0,0);
+        streams.axisYN = float4(0,0,0,0);
+        streams.axisZN = float4(0,0,0,0);
+    }
+    override void InitializeFromStreams(float4 original)
+    {
+        if (streams.normalWS.x > 0)
+            streams.axisXP = original * streams.normalWS.x;
+        else
+            streams.axisXN = original * -streams.normalWS.x;
+
+        if (streams.normalWS.y > 0)
+            streams.axisYP = original * streams.normalWS.y;
+        else
+            streams.axisYN = original * -streams.normalWS.y;
+
+        if (streams.normalWS.z > 0)
+            streams.axisZP = original * streams.normalWS.z;
+        else
+            streams.axisZN = original * -streams.normalWS.z;
+    }
+    float4 applyMaxBrightness(float4 col)
+    {
+        return float4(col.rgb * maxBrightnessInv, col.a);
+    }
+    override void DirectWrite(uint3 address, uint strideIndex, uint stride)
+    {
+        address.y += strideIndex * stride * 6;
+        float4 tempAxisXP = streams.axisXP;
+        float4 tempAxisXN = streams.axisXN;
+        float4 tempAxisYP = streams.axisYP;
+        float4 tempAxisYN = streams.axisYN;
+        float4 tempAxisZP = streams.axisZP;
+        float4 tempAxisZN = streams.axisZN;
+        foreach (var modifier in Modifiers)
+        {
+            modifier.Apply(tempAxisXP, tempAxisXN, tempAxisYP, tempAxisYN, tempAxisZP, tempAxisZN);
+        }
+        streams.axisXP = tempAxisXP;
+        streams.axisXN = tempAxisXN;
+        streams.axisYP = tempAxisYP;
+        streams.axisYN = tempAxisYN;
+        streams.axisZP = tempAxisZP;
+        streams.axisZN = tempAxisZN;
+        DirectOutput[address] = applyMaxBrightness(streams.axisXP);
+        address.y += stride;
+            DirectOutput[address] = applyMaxBrightness(streams.axisXN);
+        address.y += stride;
+            DirectOutput[address] = applyMaxBrightness(streams.axisYP);
+        address.y += stride;
+            DirectOutput[address] = applyMaxBrightness(streams.axisYN);
+        address.y += stride;
+            DirectOutput[address] = applyMaxBrightness(streams.axisZP);
+        address.y += stride;
+            DirectOutput[address] = applyMaxBrightness(streams.axisZN);
+    }
+    override void IndirectWrite(RWBuffer<uint> buffer, uint address)
+    {
+            writer.Write(buffer, address, streams.axisXP);
+            writer.Write(buffer, address, streams.axisXN);
+            writer.Write(buffer, address, streams.axisYP);
+            writer.Write(buffer, address, streams.axisYN);
+            writer.Write(buffer, address, streams.axisZP);
+            writer.Write(buffer, address, streams.axisZN);
+    }
+    override void InitializeFromBuffer(RWBuffer<uint> buffer, uint address)
+    {
+        writer.Read(buffer, address, streams.axisXP);
+        writer.Read(buffer, address, streams.axisXN);
+        writer.Read(buffer, address, streams.axisYP);
+        writer.Read(buffer, address, streams.axisYN);
+        writer.Read(buffer, address, streams.axisZP);
+        writer.Read(buffer, address, streams.axisZN);
+    }
+    override float4 SampleLocal()
+    {
+        return streams.axisXP;
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicWriter_Float4.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicWriter_Float4.xksl.cs
new file mode 100644
index 0000000000..5666019642
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelAnisotropicWriter_Float4.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelAnisotropicWriter_Float4Keys
+    {
+        public static readonly ObjectParameterKey<Texture> DirectOutput = ParameterKeys.NewObject<Texture>();
+        public static readonly ValueParameterKey<float> maxBrightnessInv = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicSampler.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicSampler.xksl
new file mode 100644
index 0000000000..fa45ba1c46
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicSampler.xksl
@@ -0,0 +1,36 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader VoxelIsotropicSampler : IVoxelSampler, Texturing
+    {
+        compose VoxelStorageTextureShader storage;
+        cbuffer PerView.Lighting
+        {
+            float maxBrightness;
+        }
+
+        override float4 ComputeLocal(float3 position)
+        {
+            return float4(0,0,0,1);
+        }
+        override float4 Sample(float3 position, float3 normal, float diameter)
+        {
+            return storage.Sample(position, diameter, 0) * float4(maxBrightness, maxBrightness, maxBrightness, 1.0);
+        }
+        override float4 SampleNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return storage.SampleNearestMip(position, diameter, 0) * float4(maxBrightness, maxBrightness, maxBrightness, 1.0);
+        }
+        override float4 SampleByMipNearestMip(float3 position, float3 normal, float diameter)
+        {
+            return storage.SampleByMipNearestMip(position, diameter, 0) * float4(maxBrightness, maxBrightness, maxBrightness, 1.0);
+        }
+        override float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+        {
+            return storage.SampleRaw(pos,mipmap,textureID,axis);
+        }
+        override float VoxelSize()
+        {
+            return storage.VoxelSize();
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicSampler.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicSampler.xksl.cs
new file mode 100644
index 0000000000..3ac878ef71
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicSampler.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class VoxelIsotropicSamplerKeys
+    {
+        public static readonly ValueParameterKey<float> maxBrightness = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicWriter_Float4.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicWriter_Float4.xksl
new file mode 100644
index 0000000000..ebe3a26a80
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicWriter_Float4.xksl
@@ -0,0 +1,42 @@
+shader VoxelIsotropicWriter_Float4 : VoxelLayout_Float4
+{
+    stream float4 center;
+    RWTexture3D<float4> DirectOutput;
+    compose VoxelFragmentPacker writer;
+    
+    float maxBrightnessInv;
+
+    compose VoxelModifierApplierIsotropic Modifiers[];
+    override void InitializeDummy()
+    {
+        streams.center = float4(0,0,0,0);
+    }
+    override void InitializeFromStreams(float4 original)
+    {
+        streams.center = original;
+    }
+    override void DirectWrite(uint3 address, uint strideIndex, uint stride)
+    {
+        address.y += strideIndex * stride;
+        float4 tempcenter = streams.center;
+        foreach (var modifier in Modifiers)
+        {
+            modifier.Apply(tempcenter);
+        }
+        streams.center = tempcenter;
+
+        DirectOutput[address] = float4(streams.center.rgb * maxBrightnessInv, streams.center.a);
+    }
+    override void IndirectWrite(RWBuffer<uint> buffer, uint address)
+    {
+        writer.Write(buffer, address, streams.center);
+    }
+    override void InitializeFromBuffer(RWBuffer<uint> buffer, uint address)
+    {
+        writer.Read(buffer, address, streams.center);
+    }
+    override float4 SampleLocal()
+    {
+        return streams.center;
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicWriter_Float4.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicWriter_Float4.xksl.cs
new file mode 100644
index 0000000000..97ac563f97
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelIsotropicWriter_Float4.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelIsotropicWriter_Float4Keys
+    {
+        public static readonly ObjectParameterKey<Texture> DirectOutput = ParameterKeys.NewObject<Texture>();
+        public static readonly ValueParameterKey<float> maxBrightnessInv = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelLayout_Float4.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelLayout_Float4.xksl
new file mode 100644
index 0000000000..59b88cbde1
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelLayout_Float4.xksl
@@ -0,0 +1,12 @@
+shader VoxelLayout_Float4 : NormalStream
+{
+    void InitializeDummy(){}
+    void InitializeFromStreams(float4 original){}
+    void IndirectWrite(RWBuffer<uint> buffer, uint address){}
+    void InitializeFromBuffer(RWBuffer<uint> buffer, uint address){}
+    void DirectWrite(uint3 address, uint strideIndex, uint stride){}
+    float4 SampleLocal()
+    {
+        return float4(0,0,0,0);
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelLayout_Float4.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelLayout_Float4.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/Shaders/VoxelLayout_Float4.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutAnisotropic.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutAnisotropic.cs
new file mode 100644
index 0000000000..aba1a4be96
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutAnisotropic.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using static Xenko.Rendering.Voxels.VoxelAttributeEmissionOpacity;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Anisotropic (6 sided)")]
+    public class VoxelLayoutAnisotropic : VoxelLayoutBase, IVoxelLayout
+    {
+        protected override int LayoutCount { get; set; } = 6;
+        protected override ShaderClassSource Writer { get; set; } = new ShaderClassSource("VoxelAnisotropicWriter_Float4");
+        protected override ShaderClassSource Sampler { get; set; } = new ShaderClassSource("VoxelAnisotropicSampler");
+        protected override string ApplierKey { get; set; } = "Anisotropic";
+
+        public void UpdateVoxelizationLayout(string compositionName, List<VoxelModifierEmissionOpacity> modifier)
+        {
+            DirectOutput = VoxelAnisotropicWriter_Float4Keys.DirectOutput.ComposeWith(compositionName);
+            BrightnessInvKey = VoxelAnisotropicWriter_Float4Keys.maxBrightnessInv.ComposeWith(compositionName);
+        }
+        public void UpdateSamplingLayout(string compositionName)
+        {
+            BrightnessKey = VoxelAnisotropicSamplerKeys.maxBrightness.ComposeWith(compositionName);
+            storageTex.UpdateSamplingLayout("storage." + compositionName);
+        }
+
+        ShaderClassSource mipmapXP = new ShaderClassSource("Voxel2x2x2Mipmapper_AnisoXP");
+        ShaderClassSource mipmapXN = new ShaderClassSource("Voxel2x2x2Mipmapper_AnisoXN");
+        ShaderClassSource mipmapYP = new ShaderClassSource("Voxel2x2x2Mipmapper_AnisoYP");
+        ShaderClassSource mipmapYN = new ShaderClassSource("Voxel2x2x2Mipmapper_AnisoYN");
+        ShaderClassSource mipmapZP = new ShaderClassSource("Voxel2x2x2Mipmapper_AnisoZP");
+        ShaderClassSource mipmapZN = new ShaderClassSource("Voxel2x2x2Mipmapper_AnisoZN");
+        override public void PostProcess(RenderDrawContext drawContext, LightFalloffs LightFalloff)
+        {
+            if (mipmapperSharp == null)
+            {
+                PrepareMipmapShaders();
+                mipmapperHeuristic[0] = mipmapXP;
+                mipmapperHeuristic[1] = mipmapXN;
+                mipmapperHeuristic[2] = mipmapYP;
+                mipmapperHeuristic[3] = mipmapYN;
+                mipmapperHeuristic[4] = mipmapZP;
+                mipmapperHeuristic[5] = mipmapZN;
+            }
+            base.PostProcess(drawContext, LightFalloff);
+        }
+        override public void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters)
+        {
+            if (StorageFormat != StorageFormats.RGBA16F)
+                parameters.Set(BrightnessKey, maxBrightness * (float)Math.PI);
+            else
+                parameters.Set(BrightnessKey, (float)Math.PI);
+
+            storageTex.ApplySamplingParameters(viewContext, parameters);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutAnisotropicPaired.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutAnisotropicPaired.cs
new file mode 100644
index 0000000000..e779ee0591
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutAnisotropicPaired.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Anisotropic (3 sided)")]
+    public class VoxelLayoutAnisotropicPaired : VoxelLayoutBase, IVoxelLayout
+    {
+        protected override int LayoutCount { get; set; } = 3;
+        protected override ShaderClassSource Writer { get; set; } = new ShaderClassSource("VoxelAnisotropicPairedWriter_Float4");
+        protected override ShaderClassSource Sampler { get; set; } = new ShaderClassSource("VoxelAnisotropicPairedSampler");
+        protected override string ApplierKey { get; set; } = "AnisotropicPaired";
+
+        public void UpdateVoxelizationLayout(string compositionName, List<VoxelModifierEmissionOpacity> modifier)
+        {
+            DirectOutput = VoxelAnisotropicPairedWriter_Float4Keys.DirectOutput.ComposeWith(compositionName);
+            BrightnessInvKey = VoxelAnisotropicPairedWriter_Float4Keys.maxBrightnessInv.ComposeWith(compositionName);
+        }
+        public void UpdateSamplingLayout(string compositionName)
+        {
+            BrightnessKey = VoxelAnisotropicPairedSamplerKeys.maxBrightness.ComposeWith(compositionName);
+            storageTex.UpdateSamplingLayout("storage." + compositionName);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutBase.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutBase.cs
new file mode 100644
index 0000000000..3ad9623242
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutBase.cs
@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using static Xenko.Rendering.Voxels.VoxelAttributeEmissionOpacity;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    public class VoxelLayoutBase
+    {
+        public enum StorageFormats
+        {
+            R10G10B10A2,
+            RGBA8,
+            RGBA16F,
+        };
+
+        [NotNull]
+        public IVoxelStorageMethod StorageMethod { get; set; } = new VoxelStorageMethodIndirect();
+
+        public StorageFormats StorageFormat { get; set; } = StorageFormats.RGBA16F;
+
+        Graphics.PixelFormat StorageFormatToPixelFormat()
+        {
+            Graphics.PixelFormat format = Graphics.PixelFormat.R16G16B16A16_Float;
+            switch (StorageFormat)
+            {
+                case StorageFormats.RGBA8:
+                    format = Graphics.PixelFormat.R8G8B8A8_UNorm;
+                    break;
+                case StorageFormats.R10G10B10A2:
+                    format = Graphics.PixelFormat.R10G10B10A2_UNorm;
+                    break;
+                case StorageFormats.RGBA16F:
+                    format = Graphics.PixelFormat.R16G16B16A16_Float;
+                    break;
+            }
+            return format;
+        }
+
+        [Display("Max Brightness (non float format)")]
+        public float maxBrightness = 10.0f;
+
+
+
+
+        //Per-Layout Settings
+        protected virtual int LayoutCount { get; set; } = 1;
+        protected virtual ShaderClassSource Writer { get; set; } = new ShaderClassSource("VoxelIsotropicWriter_Float4");
+        protected virtual ShaderClassSource Sampler { get; set; } = new ShaderClassSource("VoxelIsotropicSampler");
+        protected virtual string ApplierKey { get; set; } = "Isotropic";
+
+
+
+
+        protected IVoxelStorageTexture storageTex;
+
+        virtual public int PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            return StorageMethod.PrepareLocalStorage(context, storage, 4, LayoutCount);
+        }
+        virtual public void PrepareOutputStorage(VoxelStorageContext context, IVoxelStorage storage)
+        {
+            storage.UpdateTexture(context, ref storageTex, StorageFormatToPixelFormat(), LayoutCount);
+        }
+        virtual public void ClearOutputStorage()
+        {
+            storageTex = null;
+        }
+
+        protected ShaderSource[] mipmapperSharp = null;
+        protected ShaderSource[] mipmapperPhysicallyBased = null;
+        protected ShaderSource[] mipmapperHeuristic = null;
+
+        virtual public void PrepareMipmapShaders()
+        {
+            mipmapperSharp = new ShaderSource[LayoutCount];
+            mipmapperPhysicallyBased = new ShaderSource[LayoutCount];
+            mipmapperHeuristic = new ShaderSource[LayoutCount];
+
+            ShaderSource sharp = new ShaderClassSource("Voxel2x2x2MipmapperSimple");
+            ShaderSource physicallybased = new ShaderClassSource("Voxel2x2x2MipmapperPhysicallyBased");
+            ShaderSource heuristic = new ShaderClassSource("Voxel2x2x2MipmapperHeuristic");
+            for (int i = 0; i < LayoutCount; i++)
+            {
+                mipmapperSharp[i] = sharp;
+                mipmapperPhysicallyBased[i] = physicallybased;
+                mipmapperHeuristic[i] = heuristic;
+            }
+        }
+        virtual public void PostProcess(RenderDrawContext drawContext, LightFalloffs LightFalloff)
+        {
+            if (mipmapperSharp == null)
+            {
+                PrepareMipmapShaders();
+            }
+            switch (LightFalloff)
+            {
+                case LightFalloffs.Sharp:
+                    storageTex.PostProcess(drawContext, mipmapperSharp); break;
+                case LightFalloffs.PhysicallyBased:
+                    storageTex.PostProcess(drawContext, mipmapperPhysicallyBased); break;
+                case LightFalloffs.Heuristic:
+                    storageTex.PostProcess(drawContext, mipmapperHeuristic); break;
+                default:
+                    throw new InvalidOperationException("Cannot call PostProcess on voxel texture with unknown LightFalloff type.");
+            }
+        }
+
+
+        
+
+        protected ValueParameterKey<float> BrightnessInvKey;
+        protected ObjectParameterKey<Xenko.Graphics.Texture> DirectOutput;
+
+        virtual public ShaderSource GetVoxelizationShader(List<VoxelModifierEmissionOpacity> modifiers)
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(Writer);
+            StorageMethod.Apply(mixin);
+            foreach (var modifier in modifiers)
+            {
+                if (!modifier.Enabled) continue;
+
+                ShaderSource applier = modifier.GetApplier(ApplierKey);
+                if (applier != null)
+                    mixin.AddCompositionToArray("Modifiers", applier);
+            }
+            return mixin;
+        }
+        virtual public void ApplyVoxelizationParameters(ParameterCollection parameters, List<VoxelModifierEmissionOpacity> modifiers)
+        {
+            if (StorageFormat != StorageFormats.RGBA16F)
+                parameters.Set(BrightnessInvKey, 1.0f / maxBrightness);
+            else
+                parameters.Set(BrightnessInvKey, 1.0f);
+
+            storageTex.ApplyVoxelizationParameters(DirectOutput, parameters);
+        }
+
+
+
+
+        protected ValueParameterKey<float> BrightnessKey;
+
+        virtual public ShaderSource GetSamplingShader()
+        {
+            var mixin = new ShaderMixinSource();
+            mixin.Mixins.Add(Sampler);
+            mixin.AddComposition("storage", storageTex.GetSamplingShader());
+            return mixin;
+        }
+        virtual public void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters)
+        {
+            if (StorageFormat != StorageFormats.RGBA16F)
+                parameters.Set(BrightnessKey, maxBrightness);
+            else
+                parameters.Set(BrightnessKey, 1.0f);
+
+            storageTex.ApplySamplingParameters(viewContext, parameters);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutIsotropic.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutIsotropic.cs
new file mode 100644
index 0000000000..fea12b545b
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Layout/VoxelLayoutIsotropic.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Isotropic (single)")]
+    public class VoxelLayoutIsotropic : VoxelLayoutBase, IVoxelLayout
+    {
+        protected override int LayoutCount { get; set; } = 1;
+        protected override ShaderClassSource Writer { get; set; } = new ShaderClassSource("VoxelIsotropicWriter_Float4");
+        protected override ShaderClassSource Sampler { get; set; } = new ShaderClassSource("VoxelIsotropicSampler");
+        protected override string ApplierKey { get; set; } = "Isotropic";
+
+        public void UpdateVoxelizationLayout(string compositionName, List<VoxelModifierEmissionOpacity> modifiers)
+        {
+            DirectOutput = VoxelIsotropicWriter_Float4Keys.DirectOutput.ComposeWith(compositionName);
+            BrightnessInvKey = VoxelIsotropicWriter_Float4Keys.maxBrightnessInv.ComposeWith(compositionName);
+        }
+        public void UpdateSamplingLayout(string compositionName)
+        {
+            BrightnessKey = VoxelIsotropicSamplerKeys.maxBrightness.ComposeWith(compositionName);
+            storageTex.UpdateSamplingLayout("storage." + compositionName);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAnisotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAnisotropic.xksl
new file mode 100644
index 0000000000..deabdd93e8
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAnisotropic.xksl
@@ -0,0 +1,7 @@
+shader VoxelModifierApplierAnisotropic
+{
+    void Apply(inout float4 XP, inout float4 XN, inout float4 YP, inout float4 YN, inout float4 ZP, inout float4 ZN){ }
+    void Apply(inout float3 XP, inout float3 XN, inout float3 YP, inout float3 YN, inout float3 ZP, inout float3 ZN){ }
+    void Apply(inout float2 XP, inout float2 XN, inout float2 YP, inout float2 YN, inout float2 ZP, inout float2 ZN){ }
+    void Apply(inout float XP, inout float XN, inout float YP, inout float YN, inout float ZP, inout float ZN){ }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAnisotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAnisotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAnisotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAntiAliasingAnisotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAntiAliasingAnisotropic.xksl
new file mode 100644
index 0000000000..b025ef18cb
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAntiAliasingAnisotropic.xksl
@@ -0,0 +1,13 @@
+shader VoxelModifierApplierAntiAliasingAnisotropic<int DirectionalOpacityAttributeID> : VoxelModifierApplierAnisotropic, LocalSamples
+{
+    override void Apply(inout float4 XP, inout float4 XN, inout float4 YP, inout float4 YN, inout float4 ZP, inout float4 ZN)
+    {
+        float3 PlaneCoverage = streams.LocalSample[DirectionalOpacityAttributeID].xyz;
+        XP *= PlaneCoverage.x;
+        XN *= PlaneCoverage.x;
+        YP *= PlaneCoverage.y;
+        YN *= PlaneCoverage.y;
+        ZP *= PlaneCoverage.z;
+        ZN *= PlaneCoverage.z;
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAntiAliasingAnisotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAntiAliasingAnisotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierAntiAliasingAnisotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierOpacifyAnisotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierOpacifyAnisotropic.xksl
new file mode 100644
index 0000000000..941ea7b492
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierOpacifyAnisotropic.xksl
@@ -0,0 +1,15 @@
+shader VoxelModifierApplierOpacifyAnisotropic : VoxelModifierApplierAnisotropic
+{
+    [Link("VoxelModifierApplierOpacifyIsotropic.Amount")]
+    float Amount;
+
+    override void Apply(inout float4 XP, inout float4 XN, inout float4 YP, inout float4 YN, inout float4 ZP, inout float4 ZN)
+    {
+        XP.a *= Amount;
+        XN.a *= Amount;
+        YP.a *= Amount;
+        YN.a *= Amount;
+        ZP.a *= Amount;
+        ZN.a *= Amount;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierOpacifyAnisotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierOpacifyAnisotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierOpacifyAnisotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierSolidifyAnisotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierSolidifyAnisotropic.xksl
new file mode 100644
index 0000000000..5126312998
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierSolidifyAnisotropic.xksl
@@ -0,0 +1,13 @@
+shader VoxelModifierApplierSolidifyAnisotropic<int SolidityAttributeID> : VoxelModifierApplierAnisotropic, LocalSamples
+{
+    override void Apply(inout float4 XP, inout float4 XN, inout float4 YP, inout float4 YN, inout float4 ZP, inout float4 ZN)
+    {
+        float Solidity = streams.LocalSample[SolidityAttributeID].a;
+        XP.a = max(Solidity, XP.a);
+        XN.a = max(Solidity, XN.a);
+        YP.a = max(Solidity, YP.a);
+        YN.a = max(Solidity, YN.a);
+        ZP.a = max(Solidity, ZP.a);
+        ZN.a = max(Solidity, ZN.a);
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierSolidifyAnisotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierSolidifyAnisotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Anisotropic/VoxelModifierApplierSolidifyAnisotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAnisotropicPaired.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAnisotropicPaired.xksl
new file mode 100644
index 0000000000..325ddcb624
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAnisotropicPaired.xksl
@@ -0,0 +1,7 @@
+shader VoxelModifierApplierAnisotropicPaired
+{
+    void Apply(inout float4 X, inout float4 Y, inout float4 Z){ }
+    void Apply(inout float3 X, inout float3 Y, inout float3 Z){ }
+    void Apply(inout float2 X, inout float2 Y, inout float2 Z){ }
+    void Apply(inout float X, inout float Y, inout float Z){ }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAnisotropicPaired.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAnisotropicPaired.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAnisotropicPaired.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAntiAliasingAnisotropicPaired.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAntiAliasingAnisotropicPaired.xksl
new file mode 100644
index 0000000000..e628dec7c5
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAntiAliasingAnisotropicPaired.xksl
@@ -0,0 +1,10 @@
+shader VoxelModifierApplierAntiAliasingAnisotropicPaired<int DirectionalOpacityAttributeID> : VoxelModifierApplierAnisotropicPaired, LocalSamples
+{
+    override void Apply(inout float4 X, inout float4 Y, inout float4 Z)
+    {
+        float3 PlaneCoverage = streams.LocalSample[DirectionalOpacityAttributeID].xyz;
+        X *= PlaneCoverage.x;
+        Y *= PlaneCoverage.y;
+        Z *= PlaneCoverage.z;
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAntiAliasingAnisotropicPaired.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAntiAliasingAnisotropicPaired.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierAntiAliasingAnisotropicPaired.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierOpacifyAnisotropicPaired.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierOpacifyAnisotropicPaired.xksl
new file mode 100644
index 0000000000..2ee99ac5d4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierOpacifyAnisotropicPaired.xksl
@@ -0,0 +1,12 @@
+shader VoxelModifierApplierOpacifyAnisotropicPaired : VoxelModifierApplierAnisotropicPaired
+{
+    [Link("VoxelModifierApplierOpacifyIsotropic.Amount")]
+    float Amount;
+
+    override void Apply(inout float4 X, inout float4 Y, inout float4 Z)
+    {
+        X.a *= Amount;
+        Y.a *= Amount;
+        Z.a *= Amount;
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierOpacifyAnisotropicPaired.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierOpacifyAnisotropicPaired.xksl.cs
new file mode 100644
index 0000000000..2d108c4eaf
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierOpacifyAnisotropicPaired.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierSolidifyAnisotropicPaired.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierSolidifyAnisotropicPaired.xksl
new file mode 100644
index 0000000000..b6dd522512
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierSolidifyAnisotropicPaired.xksl
@@ -0,0 +1,10 @@
+shader VoxelModifierApplierSolidifyAnisotropicPaired<int SolidityAttributeID> : VoxelModifierApplierAnisotropicPaired, LocalSamples
+{
+    override void Apply(inout float4 X, inout float4 Y, inout float4 Z)
+    {
+        float Solidity = streams.LocalSample[SolidityAttributeID].a;
+        X.a = max(Solidity, X.a);
+        Y.a = max(Solidity, Y.a);
+        Z.a = max(Solidity, Z.a);
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierSolidifyAnisotropicPaired.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierSolidifyAnisotropicPaired.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/AnisotropicPaired/VoxelModifierApplierSolidifyAnisotropicPaired.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierAntiAliasingIsotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierAntiAliasingIsotropic.xksl
new file mode 100644
index 0000000000..1a12af1001
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierAntiAliasingIsotropic.xksl
@@ -0,0 +1,8 @@
+shader VoxelModifierApplierAntiAliasingIsotropic<int DirectionalOpacityAttributeID> : VoxelModifierApplierIsotropic, LocalSamples
+{
+    override void Apply(inout float4 center)
+    {
+        float3 PlaneCoverage = streams.LocalSample[DirectionalOpacityAttributeID].xyz;
+        center *= max(PlaneCoverage.x, max(PlaneCoverage.y, PlaneCoverage.z));
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierAntiAliasingIsotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierAntiAliasingIsotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierAntiAliasingIsotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierIsotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierIsotropic.xksl
new file mode 100644
index 0000000000..2f98ecfaf9
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierIsotropic.xksl
@@ -0,0 +1,7 @@
+shader VoxelModifierApplierIsotropic
+{
+    void Apply(inout float4 center){}
+    void Apply(inout float3 center){}
+    void Apply(inout float2 center){}
+    void Apply(inout float center){}
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierIsotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierIsotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierIsotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierOpacifyIsotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierOpacifyIsotropic.xksl
new file mode 100644
index 0000000000..fb2b98c2c0
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierOpacifyIsotropic.xksl
@@ -0,0 +1,8 @@
+shader VoxelModifierApplierOpacifyIsotropic : VoxelModifierApplierIsotropic
+{
+    float Amount;
+    override void Apply(inout float4 center)
+    {
+        center.a *= Amount;
+    }
+};
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierOpacifyIsotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierOpacifyIsotropic.xksl.cs
new file mode 100644
index 0000000000..18245950cd
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierOpacifyIsotropic.xksl.cs
@@ -0,0 +1,23 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelModifierApplierOpacifyIsotropicKeys
+    {
+        public static readonly ValueParameterKey<float> Amount = ParameterKeys.NewValue<float>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierSolidifyIsotropic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierSolidifyIsotropic.xksl
new file mode 100644
index 0000000000..a38ed8b997
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierSolidifyIsotropic.xksl
@@ -0,0 +1,8 @@
+shader VoxelModifierApplierSolidifyIsotropic<int SolidityAttributeID> : VoxelModifierApplierIsotropic, LocalSamples
+{
+    override void Apply(inout float4 center)
+    {
+        float Solidity = streams.LocalSample[SolidityAttributeID].a;
+        center.a = max(Solidity, center.a);
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierSolidifyIsotropic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierSolidifyIsotropic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/Appliers/Isotropic/VoxelModifierApplierSolidifyIsotropic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacity.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacity.cs
new file mode 100644
index 0000000000..f8ac33cb74
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacity.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Rendering.Voxels;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    public abstract class VoxelModifierEmissionOpacity : VoxelModifier
+    {
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacityAntiAliasing.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacityAntiAliasing.cs
new file mode 100644
index 0000000000..3204b9855c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacityAntiAliasing.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Anti Aliasing")]
+    public class VoxelModifierEmissionOpacityAntiAliasing : VoxelModifierEmissionOpacity
+    {
+        VoxelAttributeDirectionalCoverage directionalCoverage = new VoxelAttributeDirectionalCoverage();
+
+        public override void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output)
+        {
+            directionalCoverage.CollectAttributes(attributes, stage, output);
+        }
+
+        public override ShaderSource GetApplier(string layout)
+        {
+            return new ShaderClassSource("VoxelModifierApplierAntiAliasing" + layout, directionalCoverage.LocalSamplerID);
+        }
+
+        public override void UpdateVoxelizationLayout(string compositionName) { }
+        public override void ApplyVoxelizationParameters(ParameterCollection parameters) { }
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacityOpacify.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacityOpacify.cs
new file mode 100644
index 0000000000..90435919e4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacityOpacify.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Opacify")]
+    public class VoxelModifierEmissionOpacityOpacify : VoxelModifierEmissionOpacity
+    {
+        public float Amount = 2.0f;
+        public override void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output) { }
+
+        public override ShaderSource GetApplier(string layout)
+        {
+            return new ShaderClassSource("VoxelModifierApplierOpacify" + layout);
+        }
+
+        ValueParameterKey<float> AmountKey;
+        public override void UpdateVoxelizationLayout(string compositionName)
+        {
+            AmountKey = VoxelModifierApplierOpacifyIsotropicKeys.Amount.ComposeWith(compositionName);
+        }
+
+        public override void ApplyVoxelizationParameters(ParameterCollection parameters)
+        {
+            parameters.Set(AmountKey, Amount);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacitySolidify.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacitySolidify.cs
new file mode 100644
index 0000000000..55d20caa42
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/EmissionOpacityFilters/VoxelModifierEmissionOpacitySolidify.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Solidify")]
+    public class VoxelModifierEmissionOpacitySolidify : VoxelModifierEmissionOpacity
+    {
+        VoxelAttributeSolidity solidityAttribute = new VoxelAttributeSolidity();
+
+        public override void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output)
+        {
+            solidityAttribute.CollectAttributes(attributes, stage, output);
+        }
+        public override bool RequiresColumns()
+        {
+            return true;
+        }
+        public override ShaderSource GetApplier(string layout)
+        {
+            return new ShaderClassSource("VoxelModifierApplierSolidify" + layout, solidityAttribute.LocalSamplerID);
+        }
+        public override void UpdateVoxelizationLayout(string compositionName) { }
+        public override void ApplyVoxelizationParameters(ParameterCollection parameters) { }
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/VoxelModifier.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/VoxelModifier.cs
new file mode 100644
index 0000000000..ecc64d6e6d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/Modifiers/VoxelModifier.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    public abstract class VoxelModifier
+    {
+        [DataMember(-20)]
+        [DefaultValue(true)]
+        public bool Enabled { get; set; } = true;
+
+        public virtual  bool RequiresColumns() => false;
+        public abstract void CollectAttributes(List<AttributeStream> attributes, VoxelizationStage stage, bool output);
+        public abstract void UpdateVoxelizationLayout(string compositionName);
+        public abstract void ApplyVoxelizationParameters(ParameterCollection parameters);
+        public abstract ShaderSource GetApplier(string layout);
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/RenderVoxelVolume.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/RenderVoxelVolume.cs
new file mode 100644
index 0000000000..d6abc7fc9a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/RenderVoxelVolume.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Games;
+using Xenko.Engine;
+using Xenko.Shaders;
+using Xenko.Rendering.Voxels.Debug;
+
+namespace Xenko.Rendering.Voxels
+{
+    public class DataVoxelVolume
+    {
+        public Vector3 VolumeSize;
+        public Vector3 VolumeTranslation;
+        public float AproxVoxelSize;
+        public bool Voxelize;
+
+        public bool VoxelGridSnapping;
+        public bool VisualizeVoxels;
+        public VoxelAttribute VisualizationAttribute;
+        public IVoxelVisualization VoxelVisualization;
+
+        public List<VoxelAttribute> Attributes = new List<VoxelAttribute>();
+
+        public IVoxelStorage Storage;
+        public IVoxelizationMethod VoxelizationMethod;
+    }
+    public enum VoxelizationStage
+    {
+        Initial,
+        Post
+    }
+    public struct AttributeStream
+    {
+        public VoxelAttribute Attribute;
+        public VoxelizationStage Stage;
+        public bool Output;
+        public AttributeStream(VoxelAttribute attribute, VoxelizationStage stage, bool output)
+        {
+            Attribute = attribute;
+            Stage = stage;
+            Output = output;
+        }
+    }
+    public class ProcessedVoxelVolume
+    {
+        public bool Voxelize;
+        public bool VisualizeVoxels;
+        public VoxelAttribute VisualizationAttribute;
+        public IVoxelVisualization VoxelVisualization;
+
+        public IVoxelStorage Storage;
+        public IVoxelizationMethod VoxelizationMethod;
+        public VoxelStorageContext StorageContext;
+
+        public VoxelizationPassList passList = new VoxelizationPassList();
+
+        public List<List<VoxelizationPass>> groupedPasses = new List<List<VoxelizationPass>>();
+
+        public List<VoxelAttribute> OutputAttributes = new List<VoxelAttribute>();
+        public List<AttributeStream> Attributes = new List<AttributeStream>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/StorageMethod/IVoxelStorageMethod.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/StorageMethod/IVoxelStorageMethod.cs
new file mode 100644
index 0000000000..af8d166192
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/StorageMethod/IVoxelStorageMethod.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelStorageMethod
+    {
+        void Apply(ShaderMixinSource mixin);
+        int PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage, int channels, int layoutCount);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/StorageMethod/VoxelStorageMethodIndirect.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/StorageMethod/VoxelStorageMethodIndirect.cs
new file mode 100644
index 0000000000..e03f8c947d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/StorageMethod/VoxelStorageMethodIndirect.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core;
+using Xenko.Shaders;
+using Xenko.Rendering.Materials;
+using Xenko.Core.Annotations;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Filtered")]
+    public class VoxelStorageMethodIndirect : IVoxelStorageMethod
+    {
+        [NotNull]
+        public IVoxelFragmentPacker TempStorageFormat { get; set; } = new VoxelFragmentPackFloatR11G11B10();
+        [NotNull]
+        public IVoxelBufferWriter Filter { get; set; } = new VoxelBufferWriteMax();
+
+        public void Apply(ShaderMixinSource mixin)
+        {
+            var writermixin = new ShaderMixinSource();
+            writermixin.Mixins.Add((ShaderClassSource)TempStorageFormat.GetShader());
+            writermixin.AddComposition("writer", Filter.GetShader());
+            mixin.AddComposition("writer", writermixin);
+        }
+
+        public int PrepareLocalStorage(VoxelStorageContext context, IVoxelStorage storage, int channels, int layoutCount)
+        {
+            return storage.RequestTempStorage(TempStorageFormat.GetBits(channels) * layoutCount);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelPositionStream.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelPositionStream.xksl
new file mode 100644
index 0000000000..bf41a01acc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelPositionStream.xksl
@@ -0,0 +1,6 @@
+shader VoxelPositionStream
+{
+    stage stream float3 PositionVXS : POSITIONVXS;
+    stage stream int3 PositionVXPS : POSITIONVXPS;
+    stage stream float3 VoxelVolumeSize : VOXELVOLUMESIZE;
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelPositionStream.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelPositionStream.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelPositionStream.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/IVoxelStorage.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/IVoxelStorage.cs
new file mode 100644
index 0000000000..13cf0916ec
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/IVoxelStorage.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Graphics;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelStorage
+    {
+        void UpdateFromContext(VoxelStorageContext context);
+        void CollectVoxelizationPasses(ProcessedVoxelVolume data, VoxelStorageContext storageContext);
+        
+        int RequestTempStorage(int count);
+        void UpdateTexture(VoxelStorageContext context, ref IVoxelStorageTexture texture, Xenko.Graphics.PixelFormat pixelFormat, int layoutSize);
+        void UpdateTempStorage(VoxelStorageContext context);
+        void PostProcess(VoxelStorageContext context, RenderDrawContext drawContext, ProcessedVoxelVolume data);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/IVoxelStorageTexture.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/IVoxelStorageTexture.cs
new file mode 100644
index 0000000000..6766e83f25
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/IVoxelStorageTexture.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Graphics;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelStorageTexture
+    {
+        void UpdateVoxelizationLayout(string compositionName);
+        void UpdateSamplingLayout(string compositionName);
+        void ApplyVoxelizationParameters(ObjectParameterKey<Texture> MainKey, ParameterCollection parameters);
+        void PostProcess(RenderDrawContext drawContext, ShaderSource[] mipmapShaders);
+        ShaderClassSource GetSamplingShader();
+        void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/LocalSamples.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/LocalSamples.xksl
new file mode 100644
index 0000000000..1e725fba7b
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/LocalSamples.xksl
@@ -0,0 +1,4 @@
+shader LocalSamples
+{
+    stage stream float4 LocalSample[10];
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/LocalSamples.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/LocalSamples.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/LocalSamples.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXN.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXN.xksl
new file mode 100644
index 0000000000..501cc17314
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXN.xksl
@@ -0,0 +1,14 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper_AnisoXN : Voxel2x2x2Mipmapper
+    {
+        float4 blend(float4 s0, float4 s1)
+        {
+            return s0*(1-s1.a) + s1;
+        }
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (blend(s100,s000) + blend(s110,s010) + blend(s111,s011) + blend(s101,s001))/4;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXN.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXN.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXN.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXP.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXP.xksl
new file mode 100644
index 0000000000..d94e0c513c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXP.xksl
@@ -0,0 +1,14 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper_AnisoXP : Voxel2x2x2Mipmapper
+    {
+        float4 blend(float4 s0, float4 s1)
+        {
+            return s0*(1-s1.a) + s1;
+        }
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (blend(s000,s100) + blend(s010,s110) + blend(s011,s111) + blend(s001,s101))/4;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXP.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXP.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoXP.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYN.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYN.xksl
new file mode 100644
index 0000000000..59ceee258e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYN.xksl
@@ -0,0 +1,14 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper_AnisoYN : Voxel2x2x2Mipmapper
+    {
+        float4 blend(float4 s0, float4 s1)
+        {
+            return s0*(1-s1.a) + s1;
+        }
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (blend(s010,s000) + blend(s110,s100) + blend(s111,s101) + blend(s011,s001))/4;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYN.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYN.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYN.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYP.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYP.xksl
new file mode 100644
index 0000000000..9ac80a4fa5
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYP.xksl
@@ -0,0 +1,14 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper_AnisoYP : Voxel2x2x2Mipmapper
+    {
+        float4 blend(float4 s0, float4 s1)
+        {
+            return s0*(1-s1.a) + s1;
+        }
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (blend(s000,s010) + blend(s100,s110) + blend(s101,s111) + blend(s001,s011))/4;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYP.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYP.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoYP.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZN.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZN.xksl
new file mode 100644
index 0000000000..7f0532cca4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZN.xksl
@@ -0,0 +1,14 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper_AnisoZN : Voxel2x2x2Mipmapper
+    {
+        float4 blend(float4 s0, float4 s1)
+        {
+            return s0*(1-s1.a) + s1;
+        }
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (blend(s001,s000) + blend(s101,s100) + blend(s111,s110) + blend(s011,s010))/4;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZN.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZN.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZN.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZP.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZP.xksl
new file mode 100644
index 0000000000..757df9eeb7
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZP.xksl
@@ -0,0 +1,14 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper_AnisoZP : Voxel2x2x2Mipmapper
+    {
+        float4 blend(float4 s0, float4 s1)
+        {
+            return s0*(1-s1.a) + s1;
+        }
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (blend(s000,s001) + blend(s100,s101) + blend(s110,s111) + blend(s010,s011))/4;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZP.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZP.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Anisotropic/Voxel2x2x2Mipmapper_AnisoZP.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmap.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmap.xksl
new file mode 100644
index 0000000000..3bccf7faca
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmap.xksl
@@ -0,0 +1,32 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmap : Math, Texturing, ComputeShaderBase
+    {
+        stage float3 ReadOffset;
+        stage float3 WriteOffset;
+        stage Texture3D<half4> ReadTex;
+        stage RWTexture3D<half4> WriteTex;
+
+        compose Voxel2x2x2Mipmapper mipmapper;
+
+        override void Compute()
+        {
+            uint3 pos = streams.DispatchThreadId;
+
+            uint3 posR = pos * 2 + (int3)ReadOffset;
+
+            float4 fragmentSum = mipmapper.Mipmap(
+                ReadTex.Load(int4(posR, 0)),
+                ReadTex.Load(int4(posR + uint3(1, 0, 0), 0)),
+                ReadTex.Load(int4(posR + uint3(1, 1, 0), 0)),
+                ReadTex.Load(int4(posR + uint3(1, 0, 1), 0)),
+                ReadTex.Load(int4(posR + uint3(0, 1, 1), 0)),
+                ReadTex.Load(int4(posR + uint3(0, 1, 0), 0)),
+                ReadTex.Load(int4(posR + uint3(0, 0, 1), 0)),
+                ReadTex.Load(int4(posR + uint3(1, 1, 1), 0))
+            );
+
+            WriteTex[pos + WriteOffset] = fragmentSum;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmap.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmap.xksl.cs
new file mode 100644
index 0000000000..58b90e89db
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmap.xksl.cs
@@ -0,0 +1,26 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class Voxel2x2x2MipmapKeys
+    {
+        public static readonly ValueParameterKey<Vector3> ReadOffset = ParameterKeys.NewValue<Vector3>();
+        public static readonly ValueParameterKey<Vector3> WriteOffset = ParameterKeys.NewValue<Vector3>();
+        public static readonly ObjectParameterKey<Texture> ReadTex = ParameterKeys.NewObject<Texture>();
+        public static readonly ObjectParameterKey<Texture> WriteTex = ParameterKeys.NewObject<Texture>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapEffect.xksl
new file mode 100644
index 0000000000..66510bf7cf
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapEffect.xksl
@@ -0,0 +1,13 @@
+namespace Xenko.Rendering.Voxels
+{
+    partial effect Voxel2x2x2MipmapEffect
+    {
+        using params Voxel2x2x2MipmapKeys;
+        
+        mixin Voxel2x2x2Mipmap;
+        if (Voxel2x2x2MipmapKeys.mipmapper!=null)
+        {
+            mixin compose mipmapper = Voxel2x2x2MipmapKeys.mipmapper;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapEffect.xksl.cs
new file mode 100644
index 0000000000..620e818b4e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapEffect.xksl.cs
@@ -0,0 +1,47 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class Voxel2x2x2MipmapEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "Voxel2x2x2Mipmap");
+                if (context.GetParam(Voxel2x2x2MipmapKeys.mipmapper) != null)
+                {
+
+                    {
+                        var __mixinToCompose__ = context.GetParam(Voxel2x2x2MipmapKeys.mipmapper);
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "mipmapper", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("Voxel2x2x2MipmapEffect", new Voxel2x2x2MipmapEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapKeys.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapKeys.cs
new file mode 100644
index 0000000000..88b9c35dfd
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapKeys.cs
@@ -0,0 +1,15 @@
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class Voxel2x2x2MipmapKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSource> mipmapper = ParameterKeys.NewPermutation<ShaderSource>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmapper.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmapper.xksl
new file mode 100644
index 0000000000..ff6e00e285
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmapper.xksl
@@ -0,0 +1,10 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2Mipmapper : Math, Texturing, ComputeShaderBase
+    {
+        float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return float4(1,0,0,1);
+        }
+    };
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmapper.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmapper.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2Mipmapper.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperHeuristic.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperHeuristic.xksl
new file mode 100644
index 0000000000..b84a3334f7
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperHeuristic.xksl
@@ -0,0 +1,25 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2MipmapperHeuristic : Voxel2x2x2Mipmapper
+    {
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            float filledSum = ceil(s000.a) + ceil(s100.a) + ceil(s110.a) + ceil(s101.a) + ceil(s011.a) + ceil(s010.a) + ceil(s001.a) + ceil(s111.a);
+            float4 fragmentSum = (s000 + s100 + s110 + s101 + s011 + s010 + s001 + s111);
+            fragmentSum.rgb /= max(filledSum, 4);
+            fragmentSum.a /= 8;
+            return fragmentSum;
+            //Rather than divide by 8...
+            //I figure that since the visible surface of the
+            //emitter is a 2D projection, it should decrease
+            //by 2 dimensions rather than 3 (i.e divide by 4 rather than 8).
+
+            //This makes the lighting fall-off much more realistic,
+            //but I find the opacity coverage too strong then.
+            //so keep that dividing by 8.
+
+            //Of course, then the brightness in areas with clusters of voxels
+            //becomes too high, so instead divide by the number of filled voxels, minimum 4
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperHeuristic.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperHeuristic.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperHeuristic.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperPhysicallyBased.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperPhysicallyBased.xksl
new file mode 100644
index 0000000000..569cb093ac
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperPhysicallyBased.xksl
@@ -0,0 +1,21 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2MipmapperPhysicallyBased : Voxel2x2x2Mipmapper
+    {
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            float4 fragmentSum = (s000 + s100 + s110 + s101 + s011 + s010 + s001 + s111);
+            fragmentSum.rgb /= 4;
+            fragmentSum.a /= 8;
+            return fragmentSum;
+            //Rather than divide by 8...
+            //I figure that since the visible surface of the
+            //emitter is a 2D projection, it should decrease
+            //by 2 dimensions rather than 3 (i.e divide by 4 rather than 8).
+
+            //This makes the lighting fall-off much more realistic,
+            //but I find the opacity coverage too strong then.
+            //so keep that dividing by 8.
+        }
+    };
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperPhysicallyBased.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperPhysicallyBased.xksl.cs
new file mode 100644
index 0000000000..2d108c4eaf
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperPhysicallyBased.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperSimple.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperSimple.xksl
new file mode 100644
index 0000000000..bd575c19c6
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperSimple.xksl
@@ -0,0 +1,10 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader Voxel2x2x2MipmapperSimple : Voxel2x2x2Mipmapper
+    {
+        override float4 Mipmap(float4 s000, float4 s100, float4 s110, float4 s101, float4 s011, float4 s010, float4 s001, float4 s111)
+        {
+            return (s000 + s100 + s110 + s101 + s011 + s010 + s001 + s111)/8;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperSimple.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperSimple.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Mipmapping/Voxel2x2x2MipmapperSimple.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTexture.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTexture.xksl
new file mode 100644
index 0000000000..797efcc1b0
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTexture.xksl
@@ -0,0 +1,52 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader BufferToTexture : LocalSamples, ComputeShaderBase, VoxelPositionStream, DataPacking
+    {
+        stage RWBuffer<uint> VoxelFragments;
+        
+        stage float3 clipMapResolution;
+
+        stage float  storageUints;
+
+        stage uint  clipOffset;
+
+        compose VoxelAttribute AttributesTemp[];
+        compose VoxelAttribute AttributesIndirect[];
+
+        #ifndef IndirectStoreMacro
+            #define IndirectStoreMacro
+            #define IndirectReadAndStoreMacro
+        #endif
+
+        override void Compute()
+        {
+            int3 clipMapResolutionI = (int3)clipMapResolution;
+
+            uint3 pos = streams.DispatchThreadId.xyz;
+            pos.y = pos.y % clipMapResolutionI.y;
+            uint clipIndex = clipOffset + streams.DispatchThreadId.y/clipMapResolutionI.y;
+
+            streams.PositionVXPS = pos;
+            streams.VoxelVolumeSize = clipMapResolutionI;
+
+            uint wStride = clipMapResolutionI.x * clipMapResolutionI.y * clipMapResolutionI.z;
+            uint VoxelFragmentsIndex = clipIndex * wStride + pos.x + pos.y * clipMapResolutionI.x + pos.z * clipMapResolutionI.x * clipMapResolutionI.y;
+            VoxelFragmentsIndex *= (uint)storageUints;
+
+            uint yStride = clipMapResolutionI.x * (uint)storageUints;
+            uint initialVoxelFragmentsIndex = VoxelFragmentsIndex;
+
+
+
+            foreach (var attr in AttributesTemp)
+                attr.InitializeDummy();
+            foreach (var attr in AttributesIndirect)
+                attr.InitializeDummy();
+
+            IndirectReadAndStoreMacro
+
+            foreach (var attr in AttributesIndirect)
+                attr.DirectWrite(streams.PositionVXPS, clipIndex, (int)clipMapResolutionI.y);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTexture.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTexture.xksl.cs
new file mode 100644
index 0000000000..84d1b77f75
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTexture.xksl.cs
@@ -0,0 +1,26 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class BufferToTextureKeys
+    {
+        public static readonly ObjectParameterKey<Buffer> VoxelFragments = ParameterKeys.NewObject<Buffer>();
+        public static readonly ValueParameterKey<Vector3> clipMapResolution = ParameterKeys.NewValue<Vector3>();
+        public static readonly ValueParameterKey<float> storageUints = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<uint> clipOffset = ParameterKeys.NewValue<uint>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumns.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumns.xksl
new file mode 100644
index 0000000000..3da911dd33
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumns.xksl
@@ -0,0 +1,81 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader BufferToTextureColumns : LocalSamples, ComputeShaderBase, VoxelPositionStream, DataPacking
+    {
+        [Link("BufferToTexture.VoxelFragments")]
+        stage RWBuffer<uint> VoxelFragments;
+
+        [Link("BufferToTexture.clipMapResolution")]
+        stage float3 clipMapResolution;
+
+        [Link("BufferToTexture.storageUints")]
+        stage float storageUints;
+
+        [Link("BufferToTexture.clipOffset")]
+        stage uint clipOffset;
+
+        
+        compose VoxelAttribute AttributesTemp[];
+        compose VoxelAttribute AttributesIndirect[];
+
+        #ifndef IndirectStoreMacro
+            #define IndirectStoreMacro
+            #define IndirectReadAndStoreMacro
+        #endif
+
+        override void Compute()
+        {
+            int3 clipMapResolutionI = (int3)clipMapResolution;
+            
+            uint3 pos = streams.DispatchThreadId.xyz;
+            uint clipIndex = streams.DispatchThreadId.y + clipOffset;
+
+            pos.y = 0;
+            streams.PositionVXPS = pos;
+            streams.VoxelVolumeSize = clipMapResolutionI;
+
+            uint wStride = clipMapResolutionI.x * clipMapResolutionI.y * clipMapResolutionI.z;
+            uint VoxelFragmentsIndex = clipIndex * wStride + pos.x + pos.y * clipMapResolutionI.x + pos.z * clipMapResolutionI.x * clipMapResolutionI.y;
+            VoxelFragmentsIndex *= (uint)storageUints;
+
+            uint yStride = clipMapResolutionI.x * (uint)storageUints;
+            uint initialVoxelFragmentsIndex = VoxelFragmentsIndex;
+
+            foreach (var attr in AttributesTemp)
+                attr.InitializeDummy();
+            foreach (var attr in AttributesIndirect)
+                attr.InitializeDummy();
+
+            IndirectStoreMacro
+
+            VoxelFragmentsIndex += (uint)storageUints * clipMapResolutionI.x;
+
+            foreach (var attr in AttributesIndirect)
+                attr.DirectWrite(streams.PositionVXPS, clipIndex, (int)clipMapResolutionI.y);
+
+            streams.PositionVXPS.y++;
+            for (int i = 0; streams.PositionVXPS.y < clipMapResolutionI.y-1 ; streams.PositionVXPS.y ++)
+            {
+                uint VoxelFragmentsIndexOld = VoxelFragmentsIndex;
+
+                //See VoxelStorageClipmaps.cs Line #307
+                IndirectReadAndStoreMacro
+
+                foreach (var attr in AttributesIndirect)
+                    attr.DirectWrite(streams.PositionVXPS, clipIndex, (int)clipMapResolutionI.y);
+
+                VoxelFragmentsIndex = VoxelFragmentsIndexOld + (uint)storageUints * clipMapResolutionI.x;
+            }
+            foreach (var attr in AttributesTemp)
+                attr.InitializeDummy();
+
+            foreach (var attr in AttributesIndirect)
+                attr.InitializeDummy();
+
+            IndirectStoreMacro
+
+            foreach (var attr in AttributesIndirect)
+                attr.DirectWrite(streams.PositionVXPS, clipIndex, (int)clipMapResolutionI.y);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumns.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumns.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumns.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumnsEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumnsEffect.xksl
new file mode 100644
index 0000000000..60be573b0a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumnsEffect.xksl
@@ -0,0 +1,26 @@
+namespace Xenko.Rendering.Voxels
+{
+    partial effect BufferToTextureColumnsEffect
+    {
+        using params BufferToTextureKeys;
+        
+        mixin BufferToTextureColumns;
+        if (BufferToTextureKeys.AttributesIndirect!=null)
+        {
+            foreach (var attr in BufferToTextureKeys.AttributesIndirect)
+            {
+                mixin compose AttributesIndirect += (attr);
+            }
+        }
+        if (BufferToTextureKeys.AttributesTemp!=null)
+        {
+            foreach (var attr in BufferToTextureKeys.AttributesTemp)
+            {
+                mixin compose AttributesTemp += (attr);
+            }
+        }
+        
+        mixin macro BufferToTextureKeys.IndirectReadAndStoreMacro;
+        mixin macro BufferToTextureKeys.IndirectStoreMacro;
+    };
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumnsEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumnsEffect.xksl.cs
new file mode 100644
index 0000000000..fdb114d9cd
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureColumnsEffect.xksl.cs
@@ -0,0 +1,68 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class BufferToTextureColumnsEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "BufferToTextureColumns");
+                if (context.GetParam(BufferToTextureKeys.AttributesIndirect) != null)
+                {
+                    foreach(var attr in context.GetParam(BufferToTextureKeys.AttributesIndirect))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributesIndirect", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+                if (context.GetParam(BufferToTextureKeys.AttributesTemp) != null)
+                {
+                    foreach(var attr in context.GetParam(BufferToTextureKeys.AttributesTemp))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributesTemp", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+                mixin.AddMacro("IndirectReadAndStoreMacro", context.GetParam(BufferToTextureKeys.IndirectReadAndStoreMacro));
+                mixin.AddMacro("IndirectStoreMacro", context.GetParam(BufferToTextureKeys.IndirectStoreMacro));
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("BufferToTextureColumnsEffect", new BufferToTextureColumnsEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureEffect.xksl
new file mode 100644
index 0000000000..925c11bae3
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureEffect.xksl
@@ -0,0 +1,26 @@
+namespace Xenko.Rendering.Voxels
+{
+    partial effect BufferToTextureEffect
+    {
+        using params BufferToTextureKeys;
+        
+        mixin BufferToTexture;
+        if (BufferToTextureKeys.AttributesIndirect!=null)
+        {
+            foreach (var attr in BufferToTextureKeys.AttributesIndirect)
+            {
+                mixin compose AttributesIndirect += (attr);
+            }
+        }
+        if (BufferToTextureKeys.AttributesTemp!=null)
+        {
+            foreach (var attr in BufferToTextureKeys.AttributesTemp)
+            {
+                mixin compose AttributesTemp += (attr);
+            }
+        }
+        
+        mixin macro BufferToTextureKeys.IndirectReadAndStoreMacro;
+        mixin macro BufferToTextureKeys.IndirectStoreMacro;
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureEffect.xksl.cs
new file mode 100644
index 0000000000..eff136c507
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureEffect.xksl.cs
@@ -0,0 +1,68 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class BufferToTextureEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "BufferToTexture");
+                if (context.GetParam(BufferToTextureKeys.AttributesIndirect) != null)
+                {
+                    foreach(var attr in context.GetParam(BufferToTextureKeys.AttributesIndirect))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributesIndirect", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+                if (context.GetParam(BufferToTextureKeys.AttributesTemp) != null)
+                {
+                    foreach(var attr in context.GetParam(BufferToTextureKeys.AttributesTemp))
+
+                    {
+
+                        {
+                            var __mixinToCompose__ = (attr);
+                            var __subMixin = new ShaderMixinSource();
+                            context.PushCompositionArray(mixin, "AttributesTemp", __subMixin);
+                            context.Mixin(__subMixin, __mixinToCompose__);
+                            context.PopComposition();
+                        }
+                    }
+                }
+                mixin.AddMacro("IndirectReadAndStoreMacro", context.GetParam(BufferToTextureKeys.IndirectReadAndStoreMacro));
+                mixin.AddMacro("IndirectStoreMacro", context.GetParam(BufferToTextureKeys.IndirectStoreMacro));
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("BufferToTextureEffect", new BufferToTextureEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureKeys.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureKeys.cs
new file mode 100644
index 0000000000..fcb2c81fb6
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/BufferToTextureKeys.cs
@@ -0,0 +1,13 @@
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public partial class BufferToTextureKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSourceCollection> AttributesIndirect = ParameterKeys.NewPermutation<ShaderSourceCollection>();
+        public static readonly PermutationParameterKey<ShaderSourceCollection> AttributesTemp = ParameterKeys.NewPermutation<ShaderSourceCollection>();
+        public static readonly PermutationParameterKey<ShaderSourceCollection> AttributeLocalSamples = ParameterKeys.NewPermutation<ShaderSourceCollection>();
+        public static readonly PermutationParameterKey<string> IndirectReadAndStoreMacro = ParameterKeys.NewPermutation<string>();
+        public static readonly PermutationParameterKey<string> IndirectStoreMacro = ParameterKeys.NewPermutation<string>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/ClearBuffer.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/ClearBuffer.xksl
new file mode 100644
index 0000000000..d0580293f2
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/ClearBuffer.xksl
@@ -0,0 +1,12 @@
+namespace Xenko.Rendering.Voxels
+{
+    shader ClearBuffer : ComputeShaderBase
+    {
+        stage RWBuffer<uint> buffer;
+        int offset;
+        override void Compute()
+        {
+            buffer[streams.DispatchThreadId.x + offset] = 0;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/ClearBuffer.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/ClearBuffer.xksl.cs
new file mode 100644
index 0000000000..abadc8e1dc
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Processing/ClearBuffer.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class ClearBufferKeys
+    {
+        public static readonly ObjectParameterKey<Buffer> buffer = ParameterKeys.NewObject<Buffer>();
+        public static readonly ValueParameterKey<int> offset = ParameterKeys.NewValue<int>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageClipmapShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageClipmapShader.xksl
new file mode 100644
index 0000000000..1df2611e6d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageClipmapShader.xksl
@@ -0,0 +1,105 @@
+shader VoxelStorageClipmapShader : VoxelStorageShader, Texturing, ShaderBaseStream, Transformation
+{
+    cbuffer PerView.VoxelizerStorer
+    {
+        float3 clipMapResolution;
+        //#ifdef singleClip
+            float clipPos;
+            float3 clipScale;
+            float3 clipOffset;
+        //#else
+            float clipMapCount;
+            float4 perClipMapOffsetScale[20];
+        //#endif
+        float storageUints;
+    }
+    rgroup PerView.VoxelizerStorer
+    {
+        RWBuffer<uint> fragmentsBuffer;
+    }
+    compose VoxelAttribute AttributesTemp[];
+    compose VoxelAttribute AttributesDirect[];
+    compose VoxelAttribute AttributesIndirect[];
+
+    #ifdef singleClip
+        #define clipScaleIn clipScale
+        #define clipOffsetIn clipOffset
+        #define clipPosIn ((uint)clipPos)
+    #else
+        stage stream uint clipIndex;
+        #define clipScaleIn perClipMapOffsetScale[streams.clipIndex].w
+        #define clipOffsetIn perClipMapOffsetScale[streams.clipIndex].xyz
+        #define clipPosIn ((streams.clipIndex) * clipMapResolutionI.x * clipMapResolutionI.y * clipMapResolutionI.z)
+    #endif
+
+    #ifndef IndirectStoreMacro
+        #define IndirectStoreMacro
+    #endif
+
+    override bool MightStoreFragments()
+    {
+        float3 texPos = streams.PositionWS.xyz * clipScaleIn + clipOffsetIn;
+        return dot(texPos - saturate(texPos), float3(1, 1, 1)) == 0;
+    }
+    override void StoreFragments()
+    {
+        int3 clipMapResolutionI = (int3)clipMapResolution;
+
+        float3 texPos = streams.PositionWS.xyz * clipScaleIn + clipOffsetIn;
+
+        streams.PositionVXS = texPos;
+        streams.VoxelVolumeSize = clipMapResolution;
+        streams.PositionVXPS = int3(floor(saturate(texPos) * clipMapResolution));
+
+        int3 pixelPos = streams.PositionVXPS;
+
+        uint index = clipPosIn + pixelPos.x + pixelPos.y * clipMapResolutionI.x + pixelPos.z * clipMapResolutionI.x * clipMapResolutionI.y;
+
+        uint writeindex = index * (uint)storageUints;
+
+        foreach (var attr in AttributesTemp)
+        {
+            attr.InitializeFromStreams();
+        }
+
+        foreach (var attr in AttributesDirect)
+        {
+            attr.InitializeFromStreams();
+        }
+
+        foreach (var attr in AttributesIndirect)
+        {
+            attr.InitializeFromStreams();
+        }
+        
+        //See VoxelStorageClipmaps.cs Line #307 and Line #425
+        IndirectStoreMacro
+    }
+    #ifndef singleClip
+        override void GenerateTriangles(triangle Input input[3], inout TriangleStream<Output> triangleStream)
+        {
+            method.InitializeFromTriangle(input);
+            int3 clipMapResolutionI = (int3)clipMapResolution;
+
+            for (streams.clipIndex = 0; streams.clipIndex < clipMapCount; streams.clipIndex++)
+            {
+                [unroll]
+                for (int i = 0; i < 3 ; i ++)
+                {
+                    streams = input[i];
+                    streams.ShadingPosition.xyz = mul(float4(streams.PositionWS.xyz * clipScaleIn + clipOffsetIn, 1),Transformation.View).xyz;
+                    streams.ShadingPosition.xyz = streams.ShadingPosition.xyz * 2 - 1;
+                    method.Append(triangleStream);
+                }
+                method.RestartStrip(triangleStream);
+            }
+        }
+    #else
+        override void PrepareVertex()
+        {
+            method.PrepareVertex();
+            streams.ShadingPosition.xyz = mul(float4(streams.PositionWS.xyz * clipScaleIn + clipOffsetIn, 1),Transformation.View).xyz;
+            streams.ShadingPosition.xyz = streams.ShadingPosition.xyz * 2 - 1;
+        }
+    #endif
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageClipmapShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageClipmapShader.xksl.cs
new file mode 100644
index 0000000000..e3c944023e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageClipmapShader.xksl.cs
@@ -0,0 +1,30 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelStorageClipmapShaderKeys
+    {
+        public static readonly ValueParameterKey<Vector3> clipMapResolution = ParameterKeys.NewValue<Vector3>();
+        public static readonly ValueParameterKey<float> clipPos = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<Vector3> clipScale = ParameterKeys.NewValue<Vector3>();
+        public static readonly ValueParameterKey<Vector3> clipOffset = ParameterKeys.NewValue<Vector3>();
+        public static readonly ValueParameterKey<float> clipMapCount = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<Vector4> perClipMapOffsetScale = ParameterKeys.NewValue<Vector4>();
+        public static readonly ValueParameterKey<float> storageUints = ParameterKeys.NewValue<float>();
+        public static readonly ObjectParameterKey<Buffer> fragmentsBuffer = ParameterKeys.NewObject<Buffer>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageShader.xksl
new file mode 100644
index 0000000000..08aa5323f9
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageShader.xksl
@@ -0,0 +1,19 @@
+shader VoxelStorageShader : VoxelPositionStream, PositionStream4, ShaderBaseStream
+{
+    compose VoxelizationMethod method;
+    void PrepareFragments(){ method.PrepareFragment(); }
+    void StoreFragments(){ }
+    bool MightStoreFragments(){ return false; }
+    void PrepareVertex(){ method.PrepareVertex(); }
+    void GenerateTriangles(triangle Input input [3], inout TriangleStream<Output> triangleStream)
+    {
+        method.InitializeFromTriangle(input);
+        [unroll]
+        for (int i = 0; i < 3 ; i++)
+        {
+            streams = input[i];
+            method.Append(triangleStream);
+        }
+        method.RestartStrip(triangleStream);
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageShader.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageShader.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureClipmapShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureClipmapShader.xksl
new file mode 100644
index 0000000000..f8dc22c11e
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureClipmapShader.xksl
@@ -0,0 +1,179 @@
+shader VoxelStorageTextureClipmapShader<float voxelSizeT, float clipCountT, float axisCountT, float mipHeightT> : VoxelStorageTextureShader, Texturing
+{
+    #define MapCount 20
+    cbuffer PerView.Lighting
+    {
+        float4 perMapOffsetScale[MapCount];
+    }
+    rgroup PerView.Lighting
+    {
+        Texture3D clipMaps;
+        Texture3D mipMaps;
+    }
+
+    stage SamplerState LinearBorderSampler3D
+    {
+        Filter = MIN_MAG_MIP_LINEAR;
+        AddressU = Border;
+        AddressV = Border;
+        AddressW = Border;
+    };
+    stage SamplerState LinearBorderSampler3D_NearestMip
+    {
+        Filter = MIN_MAG_LINEAR_MIP_POINT;
+        AddressU = Border;
+        AddressV = Border;
+        AddressW = Border;
+    };
+    override float VoxelSize()
+    {
+        return voxelSizeT;
+    }
+    override float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis)
+    {
+        if (textureID == 0)
+        {
+            return clipMaps.SampleLevel(Sampler, pos, 0);
+        }
+        else
+        {
+            return mipMaps.SampleLevel(Sampler, pos, mipmap);
+        }
+        return float4(0,0,0,0);
+    }
+
+    override float4 SampleNearestMip(float3 pos, float diameter, int axis)
+    {
+        diameter *= 1.0 / voxelSizeT;
+        float mipmap = log2(max(1, diameter));
+        return SampleByMipNearestMip(pos, mipmap, axis);
+    }
+    override float4 SampleByMipNearestMip(float3 pos, float mipmap, int axis)
+    {
+        //Clipmaps
+        float3 clipMapSizeClip = float3(1, 1.0 / (clipCountT * axisCountT), 1);
+        float3 axisStrideClip = float3(0, 1.0 / (clipCountT * axisCountT), 0);
+        float3 clipSetStrideClip = float3(0, 1.0 / clipCountT, 0);
+
+        //Mipmaps
+        float3 axisSizeMip = float3(1, 1.0 / (axisCountT), 1);
+        float3 axisStrideMip = float3(0, 1.0 / (axisCountT), 0);
+
+        float mipBase = floor(mipmap);
+
+        float4 offsetScale = perMapOffsetScale[mipBase];
+        pos = pos * offsetScale.w + offsetScale.xyz;
+
+        if (mipBase >= clipCountT)
+        {
+            //Seperate the different axis within the same texture
+            //by clamping to the usable texel range
+            //and fading out above and below
+            float boundaryFade = 1.0;
+            if (axisCountT > 1)
+            {
+                float height = mipHeightT / (pow(2, mipBase - clipCountT));
+
+                float texelY = pos.y * height;
+                float texelYClamped = clamp(texelY, 1, height - 1);
+                float boundaryFade = saturate(1.0 - abs(texelYClamped - texelY));
+
+                pos.y = texelYClamped / height;
+
+                pos *= axisSizeMip;
+                pos += axisStrideMip * axis;
+            }
+            return mipMaps.SampleLevel(LinearBorderSampler3D_NearestMip, pos, mipBase - clipCountT) * boundaryFade;
+        }
+        else
+        {
+            pos.y = saturate(pos.y);
+
+            pos *= clipMapSizeClip;
+            pos += axisStrideClip * axis + clipSetStrideClip * mipBase;
+            return clipMaps.SampleLevel(LinearBorderSampler3D_NearestMip, pos, 0);
+        }
+    }
+    override float4 Sample(float3 pos, float diameter, int axis)
+    {
+        //Clipmaps
+        float3 clipMapSizeClip = float3(1, 1.0 / (clipCountT * axisCountT), 1);
+        float3 axisStrideClip = float3(0, 1.0 / (clipCountT * axisCountT), 0);
+        float3 clipSetStrideClip = float3(0, 1.0 / clipCountT, 0);
+
+        //Mipmaps
+        float3 axisSizeMip = float3(1, 1.0 / (axisCountT), 1);
+        float3 axisStrideMip = float3(0, 1.0 / (axisCountT), 0);
+
+
+        diameter *= 1.0 / voxelSizeT;
+        float mipmap = log2(max(1, diameter));
+
+        float mipBase = floor(mipmap);
+
+
+        float4 offsetScale = perMapOffsetScale[mipBase];
+        float3 posFine = pos * offsetScale.w + offsetScale.xyz;
+
+        offsetScale = perMapOffsetScale[mipBase + 1];
+        float3 posCoarse = pos * offsetScale.w + offsetScale.xyz;
+        if (mipBase >= clipCountT)
+        {
+            //Seperate the different axis within the same texture
+            //by clamping to the usable texel range
+            //and fading out above and below
+            float boundaryFade = 1.0;
+            if (axisCountT > 1)
+            {
+                float height = mipHeightT / (pow(2, mipBase - clipCountT));
+
+                float texelY = posFine.y * height;
+                float texelYClamped = clamp(texelY, 1, height - 1);
+                float boundaryFade = saturate(1.0 - abs(texelYClamped - texelY));
+
+                posFine.y = texelYClamped / height;
+
+                posFine *= axisSizeMip;
+                posFine += axisStrideMip * axis;
+
+                posCoarse *= axisSizeMip;
+                posCoarse += axisStrideMip * axis;
+            }
+            return lerp (
+                mipMaps.SampleLevel(LinearBorderSampler3D, posFine, mipBase - clipCountT),
+                mipMaps.SampleLevel(LinearBorderSampler3D, posCoarse, mipBase - clipCountT + 1),
+                mipmap - mipBase) * boundaryFade;
+        }
+        else
+        {
+            posFine.y = saturate(posFine.y);
+            posCoarse.y = saturate(posCoarse.y);
+            if (mipBase == clipCountT-1)
+            {
+                posFine *= clipMapSizeClip;
+                posFine += axisStrideClip * axis + clipSetStrideClip * mipBase;
+
+                posCoarse *= axisSizeMip;
+                posCoarse += axisStrideMip * axis;
+                return lerp(
+                    clipMaps.SampleLevel(LinearBorderSampler3D, posFine, 0),
+                    mipMaps.SampleLevel(LinearBorderSampler3D, posCoarse, 0),
+                    mipmap-mipBase
+                );
+            }
+            else
+            {
+                posFine *= clipMapSizeClip;
+                posFine += axisStrideClip * axis + clipSetStrideClip * mipBase;
+
+                posCoarse *= clipMapSizeClip;
+                posCoarse += axisStrideClip * axis + clipSetStrideClip * (mipBase+1);
+                return lerp(
+                    clipMaps.SampleLevel(LinearBorderSampler3D, posFine, 0),
+                    clipMaps.SampleLevel(LinearBorderSampler3D, posCoarse, 0),
+                    mipmap-mipBase
+                );
+            }
+        }
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureClipmapShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureClipmapShader.xksl.cs
new file mode 100644
index 0000000000..cc653c2120
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureClipmapShader.xksl.cs
@@ -0,0 +1,27 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class VoxelStorageTextureClipmapShaderKeys
+    {
+        public static readonly ValueParameterKey<Vector4> perMapOffsetScale = ParameterKeys.NewValue<Vector4>();
+        public static readonly ObjectParameterKey<Texture> clipMaps = ParameterKeys.NewObject<Texture>();
+        public static readonly ObjectParameterKey<Texture> mipMaps = ParameterKeys.NewObject<Texture>();
+        public static readonly ObjectParameterKey<SamplerState> LinearBorderSampler3D = ParameterKeys.NewObject<SamplerState>();
+        public static readonly ObjectParameterKey<SamplerState> LinearBorderSampler3D_NearestMip = ParameterKeys.NewObject<SamplerState>();
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureShader.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureShader.xksl
new file mode 100644
index 0000000000..fc4fdb9873
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureShader.xksl
@@ -0,0 +1,8 @@
+shader VoxelStorageTextureShader
+{
+    float4 Sample(float3 pos, float diameter, int axis){ return float4(0, 1, 0, 0); }
+    float4 SampleNearestMip(float3 pos, float diameter, int axis){ return float4(0, 1, 0, 0); }
+    float4 SampleByMipNearestMip(float3 pos, float mipmap, int axis){ return float4(0, 1, 0, 0); }
+    float4 SampleRaw(float3 pos, float mipmap, int textureID, int axis){ return float4(1, 0, 0, 0); }
+    float VoxelSize(){ return 1.0; };
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureShader.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureShader.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/Shaders/VoxelStorageTextureShader.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageClipmaps.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageClipmaps.cs
new file mode 100644
index 0000000000..f31135d8cf
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageClipmaps.cs
@@ -0,0 +1,377 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Graphics;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Clipmaps")]
+    public class VoxelStorageClipmaps : IVoxelStorage
+    {
+        public enum Resolutions{
+            x32 = 32,
+            x64 = 64,
+            x128 = 128,
+            x256 = 256
+        };
+        public enum UpdateMethods
+        {
+            [Display("Single Clipmap")] SingleClipmap,
+            [Display("All Clipmaps (Geometry Shader)")] AllClipmapsGeometryShader,
+            [Display("All Clipmaps (Multiple Renders)")] AllClipmapsMultipleRenders,
+        };
+
+        [DataMember(0)]
+        public Resolutions ClipResolution { get; set; } = Resolutions.x128;
+        [DataMember(10)]
+        public UpdateMethods UpdatesPerFrame { get; set; } = UpdateMethods.SingleClipmap;
+        [DataMember(20)]
+        public bool DownsampleFinerClipMaps { get; set; } = true;
+
+        int storageUints;
+        Xenko.Graphics.Buffer FragmentsBuffer = null;
+
+        int ClipMapCount;
+        int MipMapCount;
+        int ClipMapCurrent = -1;
+        Vector3 ClipMapResolution;
+
+        Vector3[] PerMapSnappingOffset = new Vector3[20];
+        Vector4[] PerMapOffsetScale = new Vector4[20];
+        Vector3[] MippingOffset = new Vector3[20];
+        Int3[] MippingOffsetTranslation = new Int3[20];
+
+        bool ShouldUpdateClipIndex(int i)
+        {
+            return i == ClipMapCurrent || UpdatesPerFrame != UpdateMethods.SingleClipmap || (i >= ClipMapCount && ClipMapCurrent == ClipMapCount - 1);
+        }
+        
+        public void UpdateFromContext(VoxelStorageContext context)
+        {
+            var virtualResolution = context.Resolution();
+            var largestDimension = (double)Math.Max(virtualResolution.X, Math.Max(virtualResolution.Y, virtualResolution.Z));
+
+            ClipMapCount = (int)Math.Log(largestDimension / Math.Min(largestDimension, (double)ClipResolution), 2) + 1;
+
+            ClipMapCurrent++;
+            if (ClipMapCurrent >= ClipMapCount)
+            {
+                ClipMapCurrent = 0;
+            }
+
+            float FinestClipMapScale = (float)Math.Pow(2, ClipMapCount - 1);
+            ClipMapResolution = new Vector3(virtualResolution.X, virtualResolution.Y, virtualResolution.Z) / FinestClipMapScale;
+            MipMapCount = (int)Math.Floor(Math.Log(Math.Min(ClipMapResolution.X, Math.Min(ClipMapResolution.Y, ClipMapResolution.Z)), 2));
+
+            int voxelScale = 1;
+
+            for (int i = 0; i < (ClipMapCount + MipMapCount); i++)
+            {
+                Vector3 SnappedVolumeTranslation = context.VoxelSpaceTranslation;
+                SnappedVolumeTranslation.X = (float)Math.Floor(SnappedVolumeTranslation.X / voxelScale) * voxelScale;
+                SnappedVolumeTranslation.Y = (float)Math.Floor(SnappedVolumeTranslation.Y / voxelScale) * voxelScale;
+                SnappedVolumeTranslation.Z = (float)Math.Floor(SnappedVolumeTranslation.Z / voxelScale) * voxelScale;
+
+                if (ShouldUpdateClipIndex(i))
+                {
+                    PerMapSnappingOffset[i] = -SnappedVolumeTranslation * context.RealVoxelSize();
+                    MippingOffsetTranslation[i] = new Int3((int)SnappedVolumeTranslation.X, (int)SnappedVolumeTranslation.Y, (int)SnappedVolumeTranslation.Z);
+                }
+
+                voxelScale *= 2;
+            }
+
+            float extentScale = (float)Math.Pow(2f, ClipMapCount - 1);
+            voxelScale = 1;
+
+            for (int i = 0; i < (ClipMapCount + MipMapCount); i++)
+            {
+                if (ShouldUpdateClipIndex(i))
+                {
+                    Vector3 offset = (PerMapSnappingOffset[i]) * extentScale / context.Extents + 0.5f;
+                    PerMapOffsetScale[i] = new Vector4(offset, (1.0f / context.Extents.X) * extentScale);
+                }
+
+                if (i + 1 == ClipMapCurrent || ShouldUpdateClipIndex(i))
+                {
+                    MippingOffset[i] = (Vector3)((MippingOffsetTranslation[i] - MippingOffsetTranslation[i + 1]) / voxelScale);
+                }
+
+                if (i < ClipMapCount - 1)
+                {
+                    extentScale /= 2;
+                }
+                voxelScale *= 2;
+            }
+
+        }
+
+
+        int tempStorageCounter;
+        public int RequestTempStorage(int count)
+        {
+            int bufferOffset = tempStorageCounter / 32;
+            tempStorageCounter += ((count+31)/32)*32;
+            return bufferOffset;
+        }
+
+        public void UpdateTempStorage(VoxelStorageContext context)
+        {
+            storageUints = (tempStorageCounter + 31)/32;
+            tempStorageCounter = 0;
+
+            var resolution = ClipMapResolution;
+            int fragments = (int)(resolution.X * resolution.Y * resolution.Z) * ClipMapCount;
+
+            if (VoxelUtils.DisposeBufferBySpecs(FragmentsBuffer, storageUints * fragments) && storageUints * fragments > 0)
+            {
+                FragmentsBuffer = Xenko.Graphics.Buffer.Typed.New(context.device, storageUints * fragments, PixelFormat.R32_UInt, true);
+            }
+        }
+
+
+
+        public void UpdateTexture(VoxelStorageContext context, ref IVoxelStorageTexture texture, Xenko.Graphics.PixelFormat pixelFormat, int LayoutSize)
+        {
+            VoxelStorageTextureClipmap clipmap = texture as VoxelStorageTextureClipmap;
+            if (clipmap == null)
+            {
+                clipmap = new VoxelStorageTextureClipmap();
+            }
+
+            Vector3 ClipMapTextureResolution = new Vector3(ClipMapResolution.X, ClipMapResolution.Y * ClipMapCount * LayoutSize, ClipMapResolution.Z);
+            Vector3 MipMapResolution = new Vector3(ClipMapResolution.X / 2, ClipMapResolution.Y / 2 * LayoutSize, ClipMapResolution.Z / 2);
+            if (VoxelUtils.DisposeTextureBySpecs(clipmap.ClipMaps, ClipMapTextureResolution, pixelFormat))
+            {
+                clipmap.ClipMaps = Xenko.Graphics.Texture.New3D(context.device, (int)ClipMapTextureResolution.X, (int)ClipMapTextureResolution.Y, (int)ClipMapTextureResolution.Z, new MipMapCount(false), pixelFormat, TextureFlags.ShaderResource | TextureFlags.UnorderedAccess);
+            }
+            if (VoxelUtils.DisposeTextureBySpecs(clipmap.MipMaps, MipMapResolution, pixelFormat))
+            {
+                if (clipmap.TempMipMaps != null)
+                {
+                    for (int i = 0; i < clipmap.TempMipMaps.Length; i++)
+                    {
+                        clipmap.TempMipMaps[i].Dispose();
+                    }
+                }
+
+                Vector3 MipMapResolutionMax = MipMapResolution;
+
+                clipmap.MipMaps = Xenko.Graphics.Texture.New3D(context.device, (int)MipMapResolution.X, (int)MipMapResolution.Y, (int)MipMapResolution.Z, new MipMapCount(true), pixelFormat, TextureFlags.ShaderResource | TextureFlags.UnorderedAccess);
+
+                clipmap.TempMipMaps = new Xenko.Graphics.Texture[MipMapCount];
+
+                for (int i = 0; i < clipmap.TempMipMaps.Length; i++)
+                {
+                    clipmap.TempMipMaps[i] = Xenko.Graphics.Texture.New3D(context.device, (int)MipMapResolutionMax.X, (int)MipMapResolutionMax.Y, (int)MipMapResolutionMax.Z, false, pixelFormat, TextureFlags.ShaderResource | TextureFlags.UnorderedAccess);
+
+                    MipMapResolutionMax /= 2;
+                }
+            }
+            clipmap.DownsampleFinerClipMaps = DownsampleFinerClipMaps;
+            clipmap.ClipMapResolution = ClipMapResolution;
+            clipmap.ClipMapCount = ClipMapCount;
+            clipmap.LayoutSize = LayoutSize;
+            clipmap.VoxelSize = context.RealVoxelSize();
+            clipmap.VolumeTranslation = new Int3((int)context.VoxelSpaceTranslation.X, (int)context.VoxelSpaceTranslation.Y, (int)context.VoxelSpaceTranslation.Z);
+
+            Array.Copy(MippingOffset, clipmap.MippingOffset, MippingOffset.Length);
+            Array.Copy(PerMapOffsetScale, clipmap.PerMapOffsetScale, PerMapOffsetScale.Length);
+
+
+
+            texture = clipmap;
+        }
+
+        public void CollectVoxelizationPasses(ProcessedVoxelVolume data, VoxelStorageContext storageContext)
+        {
+            Matrix BaseVoxelMatrix = storageContext.Matrix;
+            BaseVoxelMatrix.Invert();
+            BaseVoxelMatrix = BaseVoxelMatrix * Matrix.Scaling(2f, 2f, 2f);
+            if (UpdatesPerFrame != UpdateMethods.AllClipmapsMultipleRenders)
+            {
+                /*
+                 * Having trouble with shadow culling when this is enabled - currently performed in vertex shader instead
+                if (UpdateMethod == UpdateMethods.OneClipPerFrame)
+                {
+                    BaseVoxelMatrix = Matrix.Scaling(PerMapOffsetScale[ClipMapCurrent].W) * Matrix.Translation(PerMapOffsetScale[ClipMapCurrent].XYZ());
+                    BaseVoxelMatrix = BaseVoxelMatrix * Matrix.Translation(-0.5f,-0.5f,-0.5f);
+                    BaseVoxelMatrix = BaseVoxelMatrix * Matrix.Scaling(2f, 2f, 2f);
+                }
+                */
+                VoxelStorerClipmap Storer = new VoxelStorerClipmap
+                {
+                    storageUints = storageUints,
+                    FragmentsBuffer = FragmentsBuffer,
+                    ClipMapCount = ClipMapCount,
+                    ClipMapCurrent = ClipMapCurrent,
+                    ClipMapResolution = ClipMapResolution,
+                    PerMapOffsetScale = PerMapOffsetScale,
+                    UpdatesPerFrame = UpdatesPerFrame
+                };
+                foreach (var attr in data.Attributes)
+                {
+                    attr.Attribute.CollectVoxelizationPasses(data.passList, Storer, BaseVoxelMatrix, ClipMapResolution, attr.Stage, attr.Output);
+                }
+            }
+            if (UpdatesPerFrame == UpdateMethods.AllClipmapsMultipleRenders)
+            {
+                for (int i = 0; i < ClipMapCount; i++)
+                {
+                    VoxelStorerClipmap Storer = new VoxelStorerClipmap
+                    {
+                        storageUints = storageUints,
+                        FragmentsBuffer = FragmentsBuffer,
+                        ClipMapCount = ClipMapCount,
+                        ClipMapCurrent = i,
+                        ClipMapResolution = ClipMapResolution,
+                        PerMapOffsetScale = PerMapOffsetScale,
+                        UpdatesPerFrame = UpdateMethods.SingleClipmap
+                    };
+                    foreach (var attr in data.Attributes)
+                    {
+                        attr.Attribute.CollectVoxelizationPasses(data.passList, Storer, BaseVoxelMatrix, ClipMapResolution, attr.Stage, attr.Output);
+                    }
+                }
+            }
+        }
+
+        Xenko.Rendering.ComputeEffect.ComputeEffectShader BufferToTexture;
+        Xenko.Rendering.ComputeEffect.ComputeEffectShader BufferToTextureColumns;
+        Xenko.Rendering.ComputeEffect.ComputeEffectShader ClearBuffer;
+
+        public void PostProcess(VoxelStorageContext storageContext, RenderDrawContext drawContext, ProcessedVoxelVolume data)
+        {
+            if (Math.Max(Math.Max(ClipMapResolution.X, ClipMapResolution.Y), ClipMapResolution.Z) < 32)
+                return;
+            if (FragmentsBuffer == null)
+                return;
+            var context = drawContext.RenderContext;
+            if (ClearBuffer == null)
+            {
+                ClearBuffer = new Xenko.Rendering.ComputeEffect.ComputeEffectShader(context) { ShaderSourceName = "ClearBuffer" };
+                BufferToTexture = new Xenko.Rendering.ComputeEffect.ComputeEffectShader(context) { ShaderSourceName = "BufferToTextureEffect" };
+                BufferToTextureColumns = new Xenko.Rendering.ComputeEffect.ComputeEffectShader(context) { ShaderSourceName = "BufferToTextureColumnsEffect" };
+            }
+
+            bool VoxelsAreIndependent = true;
+
+            List<VoxelAttribute> IndirectVoxels = new List<VoxelAttribute>();
+            List<VoxelAttribute> TempVoxels = new List<VoxelAttribute>();
+            ShaderSourceCollection Indirect = new ShaderSourceCollection();
+            ShaderSourceCollection Temp = new ShaderSourceCollection();
+
+            //Assign sample indices and check whether voxels can be calculated independently
+            int sampleIndex = 0;
+            foreach (var attr in data.Attributes)
+            {
+                attr.Attribute.LocalSamplerID = sampleIndex;
+                VoxelsAreIndependent &= !attr.Attribute.RequiresColumns();
+                sampleIndex++;
+            }
+
+            //Populate ShaderSourceCollections and temp lists
+            foreach (var attr in data.Attributes)
+            {
+                if (attr.Stage != VoxelizationStage.Post) continue;
+                if (attr.Output)
+                {
+                    Indirect.Add(attr.Attribute.GetVoxelizationShader());
+                    IndirectVoxels.Add(attr.Attribute);
+                }
+                else
+                {
+                    Temp.Add(attr.Attribute.GetVoxelizationShader());
+                    TempVoxels.Add(attr.Attribute);
+                }
+            }
+
+            var BufferWriter = VoxelsAreIndependent ? BufferToTexture : BufferToTextureColumns;
+
+            for (int i = 0; i < IndirectVoxels.Count; i++)
+            {
+                var attr = IndirectVoxels[i];
+                attr.UpdateVoxelizationLayout($"AttributesIndirect[{i}]");
+            }
+            for (int i = 0; i < TempVoxels.Count; i++)
+            {
+                var attr = TempVoxels[i];
+                attr.UpdateVoxelizationLayout($"AttributesTemp[{i}]");
+            }
+            foreach (var attr in data.Attributes)
+            {
+                attr.Attribute.ApplyVoxelizationParameters(BufferWriter.Parameters);
+            }
+
+
+            int processYSize = VoxelsAreIndependent ? (int)ClipMapResolution.Y : 1;
+            processYSize *= (UpdatesPerFrame == UpdateMethods.SingleClipmap) ? 1 : ClipMapCount;
+
+            BufferWriter.ThreadGroupCounts = VoxelsAreIndependent ? new Int3(32, 32, 32) : new Int3(32, 1, 32);
+            BufferWriter.ThreadNumbers = new Int3((int)ClipMapResolution.X / BufferWriter.ThreadGroupCounts.X, processYSize / BufferWriter.ThreadGroupCounts.Y, (int)ClipMapResolution.Z / BufferWriter.ThreadGroupCounts.Z);
+
+            BufferWriter.Parameters.Set(BufferToTextureKeys.VoxelFragments, FragmentsBuffer);
+            BufferWriter.Parameters.Set(BufferToTextureKeys.clipMapResolution, ClipMapResolution);
+            BufferWriter.Parameters.Set(BufferToTextureKeys.storageUints, storageUints);
+
+            BufferWriter.Parameters.Set(BufferToTextureKeys.clipOffset, (uint)(UpdatesPerFrame == UpdateMethods.SingleClipmap ? ClipMapCurrent : 0));
+
+
+            //Modifiers are stored within attributes, yet need to be able to query their results. 
+            //Ideally a stage stream could resolve this, however due to the lack of pointers, there would be a cyclic dependency of AttributesList->Attribute->Modifier->AttributesList->...
+            //So instead the results will be stored within a second array that only contains float4s. Unfortunately the only way to iterate through the AttributesList is by foreach, which
+            //makes it difficult to access the results array (AttributeLocalSamples) by index. So instead it's just all done through this macro...
+            string IndirectReadAndStoreMacro = "";
+            string IndirectStoreMacro = "";
+            for (int i = 0; i < Temp.Count; i ++)
+            {
+                string iStr = i.ToString();
+                string sampleIndexStr = TempVoxels[i].LocalSamplerID.ToString();
+                IndirectReadAndStoreMacro += $"AttributesTemp[{iStr}].InitializeFromBuffer(VoxelFragments, VoxelFragmentsIndex + {TempVoxels[i].BufferOffset}, uint2({TempVoxels[i].BufferOffset} + initialVoxelFragmentsIndex, yStride));\n" +
+                                             $"streams.LocalSample[{sampleIndexStr}] = AttributesTemp[{iStr}].SampleLocal();\n\n";
+                IndirectStoreMacro += $"streams.LocalSample[{sampleIndexStr}] = AttributesTemp[{iStr}].SampleLocal();\n";
+            }
+            for (int i = 0; i < Indirect.Count; i++)
+            {
+                string iStr = i.ToString();
+                string sampleIndexStr = IndirectVoxels[i].LocalSamplerID.ToString();
+                IndirectReadAndStoreMacro += $"AttributesIndirect[{iStr}].InitializeFromBuffer(VoxelFragments, VoxelFragmentsIndex + {IndirectVoxels[i].BufferOffset}, uint2({IndirectVoxels[i].BufferOffset} + initialVoxelFragmentsIndex, yStride));\n" +
+                                             $"streams.LocalSample[{sampleIndexStr}] = AttributesIndirect[{iStr}].SampleLocal();\n\n";
+                IndirectStoreMacro += $"streams.LocalSample[{sampleIndexStr}] = AttributesIndirect[{iStr}].SampleLocal();\n";
+            }
+
+
+
+            BufferWriter.Parameters.Set(BufferToTextureKeys.AttributesIndirect, Indirect);
+            BufferWriter.Parameters.Set(BufferToTextureKeys.AttributesTemp, Temp);
+            BufferWriter.Parameters.Set(BufferToTextureKeys.IndirectReadAndStoreMacro, IndirectReadAndStoreMacro);
+            BufferWriter.Parameters.Set(BufferToTextureKeys.IndirectStoreMacro, IndirectStoreMacro);
+
+            ((RendererBase)BufferWriter).Draw(drawContext);
+
+
+
+            ClearBuffer.Parameters.Set(ClearBufferKeys.buffer, FragmentsBuffer);
+
+            if (UpdatesPerFrame != UpdateMethods.SingleClipmap)
+            {
+                //Clear all
+                ClearBuffer.ThreadNumbers = new Int3(1024, 1, 1);
+                ClearBuffer.ThreadGroupCounts = new Int3(FragmentsBuffer.ElementCount / 1024, 1, 1);
+                ClearBuffer.Parameters.Set(ClearBufferKeys.offset, 0);
+            }
+            else
+            {
+                //Clear next clipmap buffer
+                ClearBuffer.ThreadNumbers = new Int3(1024, 1, 1);
+                ClearBuffer.ThreadGroupCounts = new Int3((int)(ClipMapResolution.X * ClipMapResolution.Y * ClipMapResolution.Z * storageUints) / 1024, 1, 1);
+                ClearBuffer.Parameters.Set(ClearBufferKeys.offset, (int)(((ClipMapCurrent+1) % ClipMapCount) * ClipMapResolution.X * ClipMapResolution.Y * ClipMapResolution.Z * storageUints));
+            }
+            ((RendererBase)ClearBuffer).Draw(drawContext);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageContext.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageContext.cs
new file mode 100644
index 0000000000..11d34a3e27
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageContext.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public class VoxelStorageContext
+    {
+        public GraphicsDevice device;
+        public Vector3 Extents;
+        public Vector3 Translation;
+        public Vector3 VoxelSpaceTranslation;
+        public float VoxelSize;
+        public Matrix Matrix;
+
+        public float RealVoxelSize()
+        {
+            Int3 resolution = Resolution();
+            return Extents.X/(float)resolution.X;
+        }
+        public Int3 Resolution()
+        {
+            var resolution = Extents / VoxelSize;
+
+            //Calculate closest power of 2 on each axis
+            resolution.X = (float)Math.Pow(2, Math.Round(Math.Log(resolution.X, 2)));
+            resolution.Y = (float)Math.Pow(2, Math.Round(Math.Log(resolution.Y, 2)));
+            resolution.Z = (float)Math.Pow(2, Math.Round(Math.Log(resolution.Z, 2)));
+
+            return new Int3((int)resolution.X, (int)resolution.Y, (int)resolution.Z);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageTextureClipmap.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageTextureClipmap.cs
new file mode 100644
index 0000000000..2b2ed2d703
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorageTextureClipmap.cs
@@ -0,0 +1,204 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+using Xenko.Rendering.Shadows;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public class VoxelStorageTextureClipmap : IVoxelStorageTexture
+    {
+        public Vector3 ClipMapResolution;
+        public int ClipMapCount;
+        public int LayoutSize;
+        public float VoxelSize;
+        public Int3 VolumeTranslation;
+
+        public bool DownsampleFinerClipMaps;
+
+        public Xenko.Graphics.Texture ClipMaps = null;
+        public Xenko.Graphics.Texture MipMaps = null;
+        public Xenko.Graphics.Texture[] TempMipMaps = null;
+
+        public Vector4[] PerMapOffsetScale = new Vector4[20];
+        public Vector4[] PerMapOffsetScaleCurrent = new Vector4[20];
+        public Vector3[] MippingOffset = new Vector3[20];
+
+        ShaderClassSource sampler = new ShaderClassSource("VoxelStorageTextureClipmapShader");
+
+        public void UpdateVoxelizationLayout(string compositionName)
+        {
+
+        }
+        public void ApplyVoxelizationParameters(ObjectParameterKey<Texture> MainKey, ParameterCollection parameters)
+        {
+            parameters.Set(MainKey, ClipMaps);
+        }
+
+        Xenko.Rendering.ComputeEffect.ComputeEffectShader VoxelMipmapSimple;
+        //Memory leaks if the ThreadGroupCounts/Numbers/Composition changes (I suppose due to recompiles...?)
+        //so instead cache them as seperate shaders.
+        Xenko.Rendering.ComputeEffect.ComputeEffectShader[][] VoxelMipmapSimpleGroups;
+
+        public void PostProcess(RenderDrawContext drawContext, ShaderSource[] mipmapShaders)
+        {
+            if (mipmapShaders.Length != LayoutSize)
+            {
+                return;
+            }
+
+            if (VoxelMipmapSimple == null)
+            {
+                VoxelMipmapSimple = new Xenko.Rendering.ComputeEffect.ComputeEffectShader(drawContext.RenderContext) { ShaderSourceName = "Voxel2x2x2MipmapEffect" };
+            }
+
+            if (VoxelMipmapSimpleGroups == null || VoxelMipmapSimpleGroups.Length != LayoutSize || VoxelMipmapSimpleGroups[0].Length != TempMipMaps.Length)
+            {
+                if (VoxelMipmapSimpleGroups != null)
+                {
+                    for (int axis = 0; axis < LayoutSize; axis++)
+                    {
+                        if (VoxelMipmapSimpleGroups[axis] != null)
+                        {
+                            foreach (var shader in VoxelMipmapSimpleGroups[axis])
+                            {
+                                shader.Dispose();
+                            }
+                        }
+                    }
+                }
+                VoxelMipmapSimpleGroups = new Xenko.Rendering.ComputeEffect.ComputeEffectShader[LayoutSize][];
+                for (int axis = 0; axis < LayoutSize; axis++)
+                {
+                    VoxelMipmapSimpleGroups[axis] = new Xenko.Rendering.ComputeEffect.ComputeEffectShader[TempMipMaps.Length];
+                    for (int i = 0; i < VoxelMipmapSimpleGroups[axis].Length; i++)
+                    {
+                        VoxelMipmapSimpleGroups[axis][i] = new Xenko.Rendering.ComputeEffect.ComputeEffectShader(drawContext.RenderContext) { ShaderSourceName = "Voxel2x2x2MipmapEffect" };
+                    }
+                }
+            }
+
+            int offsetIndex = 0;
+            //Mipmap detailed clipmaps into less detailed ones
+            Vector3 totalResolution = ClipMapResolution * new Vector3(1,LayoutSize,1);
+            Int3 threadGroupCounts = new Int3(32, 32, 32);
+            if (DownsampleFinerClipMaps)
+            {
+                for (int i = 0; i < ClipMapCount - 1; i++)
+                {
+                    Vector3 Offset = MippingOffset[offsetIndex];
+
+                    VoxelMipmapSimple.ThreadNumbers = new Int3(8);
+                    VoxelMipmapSimple.ThreadGroupCounts = (Int3)((ClipMapResolution / 2f) / (Vector3)VoxelMipmapSimple.ThreadNumbers);
+
+                    for (int axis = 0; axis < LayoutSize; axis++)
+                    {
+                        VoxelMipmapSimple.Parameters.Set(Voxel2x2x2MipmapKeys.ReadTex, ClipMaps);
+                        VoxelMipmapSimple.Parameters.Set(Voxel2x2x2MipmapKeys.WriteTex, TempMipMaps[0]);
+                        VoxelMipmapSimple.Parameters.Set(Voxel2x2x2MipmapKeys.ReadOffset, -(Vector3.Mod(Offset, new Vector3(2))) + new Vector3(0, (int)totalResolution.Y * i + (int)ClipMapResolution.Y * axis, 0));
+                        VoxelMipmapSimple.Parameters.Set(Voxel2x2x2MipmapKeys.WriteOffset, new Vector3(0, ClipMapResolution.Y / 2 * axis, 0));
+                        VoxelMipmapSimple.Parameters.Set(Voxel2x2x2MipmapKeys.mipmapper, mipmapShaders[axis]);
+                        ((RendererBase)VoxelMipmapSimple).Draw(drawContext);
+                    }
+
+                    Offset -= Vector3.Mod(Offset, new Vector3(2));
+                    //Copy each axis, ignoring the top and bottom plane
+                    for (int axis = 0; axis < LayoutSize; axis++)
+                    {
+                        int axisOffset = axis * (int)ClipMapResolution.Y;
+
+                        Int3 CopySize = new Int3((int)ClipMapResolution.X / 2 - 2, (int)ClipMapResolution.Y / 2 - 2, (int)ClipMapResolution.Z / 2 - 2);
+
+
+                        Int3 DstMinBound = new Int3((int)ClipMapResolution.X / 4 + (int)Offset.X / 2 + 1, (int)totalResolution.Y * (i + 1) + axisOffset + (int)ClipMapResolution.Y / 4 + 1 + (int)Offset.Y / 2, (int)ClipMapResolution.Z / 4 + (int)Offset.Z / 2 + 1);
+                        Int3 DstMaxBound = DstMinBound + CopySize;
+
+                        DstMaxBound = Int3.Min(DstMaxBound, new Int3((int)totalResolution.X, (int)totalResolution.Y * (i + 2), (int)totalResolution.Z));
+                        DstMinBound = Int3.Min(DstMinBound, new Int3((int)totalResolution.X, (int)totalResolution.Y * (i + 2), (int)totalResolution.Z));
+                        DstMaxBound = Int3.Max(DstMaxBound, new Int3(0, (int)totalResolution.Y * (i + 1), 0));
+                        DstMinBound = Int3.Max(DstMinBound, new Int3(0, (int)totalResolution.Y * (i + 1), 0));
+
+                        Int3 SizeBound = DstMaxBound - DstMinBound;
+
+                        Int3 SrcMinBound = new Int3(1, axisOffset / 2 + 1, 1);
+                        Int3 SrcMaxBound = SrcMinBound + SizeBound;
+
+                        if (SizeBound.X > 0 && SizeBound.Y > 0 && SizeBound.Z > 0)
+                        {
+                            drawContext.CommandList.CopyRegion(TempMipMaps[0], 0,
+                                new ResourceRegion(
+                                    SrcMinBound.X, SrcMinBound.Y, SrcMinBound.Z,
+                                    SrcMaxBound.X, SrcMaxBound.Y, SrcMaxBound.Z
+                                ),
+                                ClipMaps, 0,
+                                DstMinBound.X, DstMinBound.Y, DstMinBound.Z);
+                        }
+                    }
+                    offsetIndex++;
+                }
+            }
+            Vector3 resolution = ClipMapResolution;
+            offsetIndex = ClipMapCount-1;
+            //Mipmaps for the largest clipmap
+            for (int i = 0; i < TempMipMaps.Length - 1; i++)
+            {
+                Vector3 Offset = MippingOffset[offsetIndex];
+                resolution /= 2;
+
+                Vector3 threadNums = Vector3.Min(resolution, new Vector3(8));
+
+                for (int axis = 0; axis < LayoutSize; axis++)
+                {
+                    var mipmapShader = VoxelMipmapSimpleGroups[axis][i];
+                    mipmapShader.ThreadNumbers = (Int3)(threadNums);
+                    mipmapShader.ThreadGroupCounts = (Int3)(resolution / threadNums);
+                    if (i == 0)
+                    {
+                        mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.ReadTex, ClipMaps);
+                        mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.ReadOffset, -Offset + new Vector3(0, (int)ClipMapResolution.Y * LayoutSize * (ClipMapCount - 1) + (int)ClipMapResolution.Y * axis, 0));
+                        mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.WriteOffset, new Vector3(0, resolution.Y * axis, 0));
+                    }
+                    else
+                    {
+                        mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.ReadTex, TempMipMaps[i - 1]);
+                        mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.ReadOffset, -Offset + new Vector3(0, resolution.Y * axis * 2, 0));
+                        mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.WriteOffset, new Vector3(0, resolution.Y * axis, 0));
+                    }
+                    mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.WriteTex, TempMipMaps[i]);
+                    mipmapShader.Parameters.Set(Voxel2x2x2MipmapKeys.mipmapper, mipmapShaders[axis]);
+                    ((RendererBase)mipmapShader).Draw(drawContext);
+                }
+                //Don't seem to be able to read and write to the same texture, even if the views
+                //point to different mipmaps.
+                drawContext.CommandList.CopyRegion(TempMipMaps[i], 0, null, MipMaps, i);
+                offsetIndex++;
+            }
+            Array.Copy(PerMapOffsetScale, PerMapOffsetScaleCurrent, PerMapOffsetScale.Length);
+        }
+
+
+
+
+        private ObjectParameterKey<Texture> ClipMapskey;
+        private ObjectParameterKey<Texture> MipMapskey;
+        private ValueParameterKey<Vector4> perMapOffsetScaleKey;
+        public void UpdateSamplingLayout(string compositionName)
+        {
+            ClipMapskey = VoxelStorageTextureClipmapShaderKeys.clipMaps.ComposeWith(compositionName);
+            MipMapskey = VoxelStorageTextureClipmapShaderKeys.mipMaps.ComposeWith(compositionName);
+            perMapOffsetScaleKey = VoxelStorageTextureClipmapShaderKeys.perMapOffsetScale.ComposeWith(compositionName);
+        }
+        public ShaderClassSource GetSamplingShader()
+        {
+            sampler = new ShaderClassSource("VoxelStorageTextureClipmapShader", VoxelSize, ClipMapCount, LayoutSize, ClipMapResolution.Y/2.0f);
+            return sampler;
+        }
+        public void ApplySamplingParameters(VoxelViewContext viewContext, ParameterCollection parameters)
+        {
+            parameters.Set(ClipMapskey, ClipMaps);
+            parameters.Set(MipMapskey, MipMaps);
+            parameters.Set(perMapOffsetScaleKey, viewContext.IsVoxelView? PerMapOffsetScaleCurrent : PerMapOffsetScale);
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorers/IVoxelStorer.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorers/IVoxelStorer.cs
new file mode 100644
index 0000000000..271fbef62a
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorers/IVoxelStorer.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Graphics;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelStorer
+    {
+        void PostProcess(VoxelStorageContext context, RenderDrawContext drawContext, ProcessedVoxelVolume data);
+
+        ShaderSource GetVoxelizationShader(VoxelizationPass pass, ProcessedVoxelVolume data);
+        void ApplyVoxelizationParameters(ParameterCollection param);
+        void UpdateVoxelizationLayout(string compositionName);
+
+        bool RequireGeometryShader();
+        int GeometryShaderOutputCount();
+        bool CanShareRenderStage(IVoxelStorer storer);
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorers/VoxelStorerClipmap.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorers/VoxelStorerClipmap.cs
new file mode 100644
index 0000000000..8e4b0cd7ef
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelStorage/VoxelStorers/VoxelStorerClipmap.cs
@@ -0,0 +1,162 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Core.Mathematics;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Graphics;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public class VoxelStorerClipmap : IVoxelStorer
+    {
+        public VoxelStorageClipmaps.UpdateMethods UpdatesPerFrame;
+
+        public int storageUints;
+        public Xenko.Graphics.Buffer FragmentsBuffer = null;
+
+        public int ClipMapCount;
+        public int ClipMapCurrent = -1;
+        public Vector3 ClipMapResolution;
+
+        public Vector4[] PerMapOffsetScale = new Vector4[20];
+
+        public bool UpdatesOneClipPerFrame()
+        {
+            return UpdatesPerFrame == VoxelStorageClipmaps.UpdateMethods.SingleClipmap || ClipMapCount <= 1;
+        }
+
+
+        public bool CanShareRenderStage(IVoxelStorer storer)
+        {
+            VoxelStorerClipmap storerClipmap = storer as VoxelStorerClipmap;
+            if (storerClipmap == null)
+            {
+                return false;
+            }
+
+            bool singleClipA = UpdatesOneClipPerFrame();
+            bool singleClipB = storerClipmap.UpdatesOneClipPerFrame();
+
+            return singleClipA == singleClipB;
+        }
+        public override bool Equals(object obj)
+        {
+            VoxelStorerClipmap storerClipmap = obj as VoxelStorerClipmap;
+            if (storerClipmap == null)
+            {
+                return false;
+            }
+
+            bool singleClipA = UpdatesOneClipPerFrame();
+            bool singleClipB = storerClipmap.UpdatesOneClipPerFrame();
+            bool sameClipSet = (storerClipmap.UpdatesPerFrame == VoxelStorageClipmaps.UpdateMethods.SingleClipmap && storerClipmap.ClipMapCurrent == ClipMapCurrent);
+
+            return singleClipA == singleClipB && (!singleClipA || sameClipSet);
+        }
+        public override int GetHashCode()
+        {
+            return UpdatesOneClipPerFrame().GetHashCode();
+        }
+
+
+        ObjectParameterKey<Xenko.Graphics.Buffer> fragmentsBufferKey;
+        ValueParameterKey<Vector3> clipMapResolutionKey;
+        ValueParameterKey<float> storageUintsKey;
+
+        ValueParameterKey<float> clipMapCountKey;
+
+        ValueParameterKey<Vector3> clipScaleKey;
+        ValueParameterKey<float> clipPosKey;
+        ValueParameterKey<Vector3> clipOffsetKey;
+        ValueParameterKey<Vector4> perClipMapOffsetScaleKey;
+        public void UpdateVoxelizationLayout(string compositionName)
+        {
+            fragmentsBufferKey = VoxelStorageClipmapShaderKeys.fragmentsBuffer.ComposeWith(compositionName);
+            clipMapResolutionKey = VoxelStorageClipmapShaderKeys.clipMapResolution.ComposeWith(compositionName);
+            storageUintsKey = VoxelStorageClipmapShaderKeys.storageUints.ComposeWith(compositionName);
+
+            if (UpdatesOneClipPerFrame())
+            {
+                clipScaleKey = VoxelStorageClipmapShaderKeys.clipScale.ComposeWith(compositionName);
+                clipOffsetKey = VoxelStorageClipmapShaderKeys.clipOffset.ComposeWith(compositionName);
+                clipPosKey = VoxelStorageClipmapShaderKeys.clipPos.ComposeWith(compositionName);
+            }
+            else
+            {
+                clipMapCountKey = VoxelStorageClipmapShaderKeys.clipMapCount.ComposeWith(compositionName);
+                perClipMapOffsetScaleKey = VoxelStorageClipmapShaderKeys.perClipMapOffsetScale.ComposeWith(compositionName);
+            }
+        }
+        public void ApplyVoxelizationParameters(ParameterCollection param)
+        {
+            param.Set(fragmentsBufferKey, FragmentsBuffer);
+            param.Set(clipMapResolutionKey, ClipMapResolution);
+            param.Set(storageUintsKey, storageUints);
+
+            if (UpdatesOneClipPerFrame())
+            {
+                param.Set(clipScaleKey, new Vector3(PerMapOffsetScale[ClipMapCurrent].W));
+                param.Set(clipOffsetKey, PerMapOffsetScale[ClipMapCurrent].XYZ());
+                param.Set(clipPosKey, ClipMapCurrent * ClipMapResolution.X * ClipMapResolution.Y * ClipMapResolution.Z);
+            }
+            else
+            {
+                param.Set(clipMapCountKey, ClipMapCount);
+                param.Set(perClipMapOffsetScaleKey, PerMapOffsetScale);
+            }
+        }
+
+        ShaderClassSource storage = new ShaderClassSource("VoxelStorageClipmapShader");
+
+        public ShaderSource GetVoxelizationShader(VoxelizationPass pass, ProcessedVoxelVolume data)
+        {
+            bool singleClip = UpdatesOneClipPerFrame();
+            ShaderSource VoxelizationMethodSource = pass.method.GetVoxelizationShader();
+            ShaderMixinSource cachedMixin = new ShaderMixinSource();
+            cachedMixin.Mixins.Add(storage);
+            cachedMixin.AddComposition("method", VoxelizationMethodSource);
+            if (singleClip)
+            {
+                cachedMixin.AddMacro("singleClip", true);
+            }
+
+            string IndirectStoreMacro = "";
+            for (int i = 0; i < pass.AttributesIndirect.Count; i++)
+            {
+                string iStr = i.ToString();
+                IndirectStoreMacro += $"AttributesIndirect[{iStr}].IndirectWrite(fragmentsBuffer, writeindex + {pass.AttributesIndirect[i].BufferOffset});\n";
+            }
+
+            cachedMixin.AddMacro("IndirectStoreMacro", IndirectStoreMacro);
+
+            foreach (var attr in pass.AttributesTemp)
+            {
+                cachedMixin.AddCompositionToArray("AttributesTemp", attr.GetVoxelizationShader());
+            }
+            foreach (var attr in pass.AttributesDirect)
+            {
+                cachedMixin.AddCompositionToArray("AttributesDirect", attr.GetVoxelizationShader());
+            }
+            foreach (var attr in pass.AttributesIndirect)
+            {
+                cachedMixin.AddCompositionToArray("AttributesIndirect", attr.GetVoxelizationShader());
+            }
+
+            return cachedMixin;
+        }
+
+        public bool RequireGeometryShader()
+        {
+            return UpdatesPerFrame == VoxelStorageClipmaps.UpdateMethods.AllClipmapsGeometryShader && !UpdatesOneClipPerFrame();
+        }
+        public int GeometryShaderOutputCount()
+        {
+            return UpdatesPerFrame == VoxelStorageClipmaps.UpdateMethods.SingleClipmap ? 1 : ClipMapCount;
+        }
+
+        public void PostProcess(VoxelStorageContext context, RenderDrawContext drawContext, ProcessedVoxelVolume data)
+        {
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelVolumeComponent.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelVolumeComponent.cs
new file mode 100644
index 0000000000..d175748da8
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelVolumeComponent.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Engine.Design;
+using Xenko.Engine.Processors;
+using Xenko.Rendering.Voxels.Debug;
+
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// Voxelizes a region.
+    /// </summary>
+    [DataContract("VoxelVolumeComponent")]
+    [DefaultEntityComponentRenderer(typeof(VoxelVolumeProcessor))]
+    [Display("Voxel Volume", Expand = ExpandRule.Once)]
+    [ComponentCategory("Lights")]
+    [CategoryOrder(10, "Attributes")]
+    [CategoryOrder(60, "Visualization/Debug")]
+    public class VoxelVolumeComponent : ActivableEntityComponent
+    {
+        private bool enabled = true;
+
+        public override bool Enabled
+        {
+            get { return enabled; }
+            set { enabled = value; Changed?.Invoke(this, null); }
+        }
+
+        [DataMember(1)]
+        public bool Voxelize = true;
+
+        [DataMember(10)]
+        [NotNull]
+        public IVoxelizationMethod VoxelizationMethod { get; set; } = new VoxelizationMethodDominantAxis();
+
+        [DataMember(20)]
+        [NotNull]
+        public IVoxelStorage Storage { get; set; } = new VoxelStorageClipmaps();
+
+        [DataMember(30)]
+        [Category]
+        public List<VoxelAttribute> Attributes { get; set; } = new List<VoxelAttribute>();
+
+
+        [DataMember(35)]
+        public float VoxelVolumeSize { get; set; } = 20f;
+        [DataMember(40)]
+        public float AproximateVoxelSize { get; set; } = 0.15f;
+        [DataMember(50)]
+        public bool VoxelGridSnapping { get; set; } = true;
+
+        [DataMember(60)]
+        [Display(category: "Visualization/Debug")]
+        public bool VisualizeVoxels { get; set; } = false;
+        [DataMember(70)]
+        [Display(category: "Visualization/Debug")]
+        public int VisualizeIndex { get; set; } = 0;
+        [DataMember(80)]
+        [Display(category: "Visualization/Debug")]
+        public IVoxelVisualization Visualization { get; set; } = null;
+
+        public event EventHandler Changed;
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelVolumeProcessor.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelVolumeProcessor.cs
new file mode 100644
index 0000000000..dbeb8e64b1
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelVolumeProcessor.cs
@@ -0,0 +1,92 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Engine;
+using Xenko.Games;
+using Xenko.Extensions;
+using Xenko.Core.Mathematics;
+using Xenko.Graphics;
+using Xenko.Graphics.GeometricPrimitives;
+using Xenko.Rendering;
+using Xenko.Rendering.Voxels;
+using Xenko.Rendering.Shadows;
+using Xenko.Rendering.Materials;
+using Xenko.Rendering.Materials.ComputeColors;
+
+namespace Xenko.Engine.Processors
+{
+    public class VoxelVolumeProcessor : EntityProcessor<VoxelVolumeComponent>, IEntityComponentRenderProcessor
+    {
+        private Dictionary<VoxelVolumeComponent, DataVoxelVolume> renderVoxelVolumes = new Dictionary<VoxelVolumeComponent, DataVoxelVolume>();
+        public Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume> processedVoxelVolumes = new Dictionary<VoxelVolumeComponent, ProcessedVoxelVolume>();
+
+        public VisibilityGroup VisibilityGroup { get; set; }
+        public RenderGroup RenderGroup { get; set; }
+        protected override void OnSystemAdd()
+        {
+            base.OnSystemAdd();
+
+            VisibilityGroup.Tags.Set(VoxelRenderer.CurrentRenderVoxelVolumes, renderVoxelVolumes);
+            VisibilityGroup.Tags.Set(VoxelRenderer.CurrentProcessedVoxelVolumes, processedVoxelVolumes);
+            VisibilityGroup.Tags.Set(VoxelRenderFeature.CurrentProcessedVoxelVolumes, processedVoxelVolumes);
+        }
+
+        public override void Draw(RenderContext context)
+        {
+            RegenerateVoxelVolumes();
+        }
+        
+        public ProcessedVoxelVolume GetProcessedVolumeForComponent(VoxelVolumeComponent component)
+        {
+            if (!processedVoxelVolumes.TryGetValue(component, out var data))
+                return null;
+            return data;
+        }
+        public DataVoxelVolume GetRenderVolumeForComponent(VoxelVolumeComponent component)
+        {
+            if (!renderVoxelVolumes.TryGetValue(component, out var data))
+                return null;
+            return data;
+        }
+
+        private void RegenerateVoxelVolumes()
+        {
+            renderVoxelVolumes.Clear();
+            processedVoxelVolumes.Clear();
+            for (int i=0; i<ComponentDataKeys.Count; i++)
+            {
+                var volume = ComponentDataKeys[i];
+
+                if (!volume.Enabled)
+                    continue;
+
+                DataVoxelVolume data;
+                    renderVoxelVolumes.Add(volume, data = new DataVoxelVolume());
+                processedVoxelVolumes.Add(volume, new ProcessedVoxelVolume());
+
+                data.VolumeTranslation = volume.Entity.Transform.WorldMatrix.TranslationVector;
+                data.VolumeSize = new Vector3(volume.VoxelVolumeSize);
+
+
+                data.Voxelize = volume.Voxelize;
+                data.AproxVoxelSize = volume.AproximateVoxelSize;
+
+                data.VoxelGridSnapping = volume.VoxelGridSnapping;
+                data.VisualizeVoxels = volume.VisualizeVoxels;
+                data.VoxelVisualization = volume.Visualization;
+                data.Attributes = volume.Attributes;
+                data.Storage = volume.Storage;
+                data.VoxelizationMethod = volume.VoxelizationMethod;
+
+                if (volume.Attributes.Count > volume.VisualizeIndex)
+                {
+                    data.VisualizationAttribute = volume.Attributes[volume.VisualizeIndex];
+                }
+                else
+                {
+                    data.VisualizationAttribute = null;
+                }
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/IVoxelizationMethod.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/IVoxelizationMethod.cs
new file mode 100644
index 0000000000..c852b12847
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/IVoxelizationMethod.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Shaders;
+using Xenko.Graphics;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Voxels;
+using Xenko.Core.Extensions;
+using Xenko.Rendering;
+
+namespace Xenko.Rendering.Voxels
+{
+    public interface IVoxelizationMethod
+    {
+        void Reset();
+        void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelAttribute attr, VoxelizationStage stage, bool output, bool shadows);
+        void Render(VoxelStorageContext storageContext, RenderDrawContext drawContext, RenderView view);
+
+        bool RequireGeometryShader();
+        int GeometryShaderOutputCount();
+
+        ShaderSource GetVoxelizationShader();
+        bool CanShareRenderStage(IVoxelizationMethod method);
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethod.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethod.xksl
new file mode 100644
index 0000000000..ea59cedea4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethod.xksl
@@ -0,0 +1,17 @@
+shader VoxelizationMethod : VoxelPositionStream, PositionStream4, ShaderBaseStream
+{
+    void PrepareFragment(){ }
+    void PrepareVertex(){ }
+
+    void InitializeFromTriangle(triangle Input input[3]) { }
+
+    void Append(inout TriangleStream<Output> triangleStream)
+    {
+        streams.ShadingPosition.z = streams.ShadingPosition.z * 0.5 + 0.5;
+        triangleStream.Append(streams);
+    }
+    void RestartStrip(inout TriangleStream<Output> triangleStream)
+    {
+        triangleStream.RestartStrip();
+    }
+};
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethod.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethod.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethod.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodDominantAxis.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodDominantAxis.xksl
new file mode 100644
index 0000000000..0b1942bd15
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodDominantAxis.xksl
@@ -0,0 +1,48 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// Voxelization, projects to axis of largest area and writes fragments to buffer
+    /// </summary>
+    shader VoxelizationMethodDominantAxis : VoxelizationMethod, Math, Transformation, ShaderBase, NormalStream, PositionStream4, VoxelPositionStream
+    {
+        centroid stream float3 centroidPositionWS;
+        centroid stream float3 centroidNormalWS;
+        override void PrepareFragment()
+        {
+            streams.PositionWS = float4(streams.centroidPositionWS,1);
+            streams.normalWS = streams.centroidNormalWS;
+        }
+        override void PrepareVertex()
+        {
+            streams.centroidPositionWS = streams.PositionWS.xyz;
+            streams.centroidNormalWS = streams.normalWS.xyz;
+        }
+        stream int dominantAxis;
+        override void InitializeFromTriangle(triangle Input input[3])
+        {
+            float3 nor = abs(cross((input[1].ShadingPosition.xyz - input[0].ShadingPosition.xyz), (input[2].ShadingPosition.xyz - input[0].ShadingPosition.xyz)));
+            streams.dominantAxis = nor.x > nor.y ? 0 : 1;
+            streams.dominantAxis = nor.z > nor.y && nor.z > nor.x ? 2 : streams.dominantAxis;
+        }
+        void TransformPoint(inout float4 v1)
+        {
+            if (streams.dominantAxis == 0)
+            {
+                v1.xyz = float3(v1.yzx);
+            }
+            else if (streams.dominantAxis == 1)
+            {
+                v1.xyz = float3(v1.xzy);
+            }
+            v1.w = 1;
+        }
+        override void Append(inout TriangleStream<Output> triangleStream)
+        {
+            TransformPoint(streams.ShadingPosition);
+            streams.ShadingPosition.z = streams.ShadingPosition.z * 0.5 + 0.5;
+            triangleStream.Append(streams);
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodDominantAxis.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodDominantAxis.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodDominantAxis.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodSingleAxis.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodSingleAxis.xksl
new file mode 100644
index 0000000000..7b805a49be
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodSingleAxis.xksl
@@ -0,0 +1,20 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// Voxelization, projects to axis of largest area and writes fragments to buffer
+    /// </summary>
+    shader VoxelizationMethodSingleAxis : VoxelizationMethod, Math, Transformation, ShaderBase, NormalStream, PositionStream4, VoxelPositionStream
+    {
+        centroid stream float3 centroidPositionWS;
+        override void PrepareFragment()
+        {
+            streams.PositionWS = float4(streams.centroidPositionWS,1);
+        }
+        override void PrepareVertex()
+        {
+            streams.centroidPositionWS = streams.PositionWS.xyz;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodSingleAxis.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodSingleAxis.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/Shader/VoxelizationMethodSingleAxis.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodDominantAxis.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodDominantAxis.cs
new file mode 100644
index 0000000000..a152683c9c
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodDominantAxis.cs
@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Shaders;
+using Xenko.Graphics;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Voxels;
+using Xenko.Core.Extensions;
+using Xenko.Rendering;
+
+
+namespace Xenko.Rendering.Voxels
+{
+    //Uses a geometry shader to project each triangle to the axis
+    //of maximum coverage, and lets the pipeline generate fragments from there
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Dominant Axis (Geometry Shader)")]
+    public class VoxelizationMethodDominantAxis : IVoxelizationMethod
+    {
+        List<RenderView> VoxelizationViews { get; } = new List<RenderView>();
+        Dictionary<RenderView, Int2> VoxelizationViewSizes { get; } = new Dictionary<RenderView, Int2>();
+        int currentViewIndex = 0;
+
+        public MultisampleCount MultisampleCount = MultisampleCount.X8;
+
+        public override bool Equals(object obj)
+        {
+            VoxelizationMethodDominantAxis method = obj as VoxelizationMethodDominantAxis;
+            if (method == null)
+            {
+                return false;
+            }
+            if (method.MultisampleCount != MultisampleCount)
+            {
+                return false;
+            }
+            return true;
+        }
+
+        public bool CanShareRenderStage(IVoxelizationMethod obj)
+        {
+            VoxelizationMethodDominantAxis method = obj as VoxelizationMethodDominantAxis;
+            if (method == null)
+            {
+                return false;
+            }
+            return true;
+        }
+        public override int GetHashCode()
+        {
+            return MultisampleCount.GetHashCode();
+        }
+
+        public void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelAttribute attr, VoxelizationStage stage, bool output, bool shadows)
+        {
+            while (VoxelizationViews.Count <= currentViewIndex)
+            {
+                VoxelizationViews.Add(new RenderView());
+                VoxelizationViewSizes[VoxelizationViews[VoxelizationViews.Count-1]] = new Int2();
+            }
+            RenderView voxelizationView = VoxelizationViews[currentViewIndex];
+
+            voxelizationView.View = Matrix.Identity;
+            voxelizationView.Projection = view;
+            voxelizationView.ViewProjection = view;
+
+            float maxRes = Math.Max(resolution.X, Math.Max(resolution.Y, resolution.Z));
+            Matrix aspectScale = Matrix.Scaling(resolution / maxRes);
+            voxelizationView.Projection *= aspectScale;
+            voxelizationView.ViewProjection = voxelizationView.View * voxelizationView.Projection;
+
+            voxelizationView.ViewSize = new Vector2(maxRes * 8, maxRes * 8);
+            VoxelizationViewSizes[voxelizationView] = new Int2((int)maxRes, (int)maxRes);
+
+
+            //The BoundingFrustum constructor doesn't end up calculating the correct Near Plane for the symmetric matrix, squish it so the Z is from 0 to 1
+            Matrix SquishedMatrix = voxelizationView.ViewProjection * Matrix.Scaling(1f, 1f, 0.5f) * Matrix.Translation(new Vector3(0, 0, 0.5f));
+            voxelizationView.Frustum = new BoundingFrustum(ref SquishedMatrix);
+
+            voxelizationView.CullingMode = CameraCullingMode.None;
+            voxelizationView.NearClipPlane = 0.1f;
+            voxelizationView.FarClipPlane = 1000.0f;
+
+            currentViewIndex++;
+
+            passList.AddDirect(storer, this, voxelizationView, attr, stage, output, shadows);
+        }
+
+        Xenko.Graphics.Texture MSAARenderTarget = null;
+
+        public void Render(VoxelStorageContext storageContext, RenderDrawContext drawContext, RenderView view)
+        {
+            RenderView voxelizationView = view;
+            Int2 ViewSize = VoxelizationViewSizes[view];
+
+            if (VoxelUtils.DisposeTextureBySpecs(MSAARenderTarget, new Vector3(ViewSize.X, ViewSize.Y, 1), PixelFormat.R8G8B8A8_UNorm, MultisampleCount))
+            {
+                MSAARenderTarget = Texture.New(storageContext.device, TextureDescription.New2D(ViewSize.X, ViewSize.Y, new MipMapCount(false), PixelFormat.R8G8B8A8_UNorm, TextureFlags.RenderTarget, 1, GraphicsResourceUsage.Default, MultisampleCount), null);
+            }
+
+            drawContext.CommandList.ResetTargets();
+            if (MSAARenderTarget != null)
+                drawContext.CommandList.SetRenderTarget(null, MSAARenderTarget);
+
+            var renderSystem = drawContext.RenderContext.RenderSystem;
+
+            drawContext.CommandList.SetViewport(new Viewport(0, 0, ViewSize.X, ViewSize.Y));
+
+            renderSystem.Draw(drawContext, voxelizationView, renderSystem.RenderStages[voxelizationView.RenderStages[0].Index]);
+        }
+        public void Reset()
+        {
+            currentViewIndex = 0;
+        }
+
+        ShaderClassSource method = new ShaderClassSource("VoxelizationMethodDominantAxis");
+        ShaderMixinSource methodmixin = null;
+        public ShaderSource GetVoxelizationShader()
+        {
+            if (methodmixin == null)
+            {
+                methodmixin = new ShaderMixinSource();
+                methodmixin.Mixins.Add(method);
+            }
+            return methodmixin;
+        }
+        public bool RequireGeometryShader()
+        {
+            return true;
+        }
+        public int GeometryShaderOutputCount()
+        {
+            return 3;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodSingleAxis.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodSingleAxis.cs
new file mode 100644
index 0000000000..725b98b266
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodSingleAxis.cs
@@ -0,0 +1,149 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Shaders;
+using Xenko.Graphics;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Voxels;
+using Xenko.Core.Extensions;
+using Xenko.Rendering;
+
+
+namespace Xenko.Rendering.Voxels
+{
+    //Uses a geometry shader to project each triangle to the axis
+    //of maximum coverage, and lets the pipeline generate fragments from there
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Single Axis")]
+    public class VoxelizationMethodSingleAxis : IVoxelizationMethod
+    {
+        List<RenderView> VoxelizationViews { get; } = new List<RenderView>();
+        Dictionary<RenderView,Int2> VoxelizationViewSizes { get; } = new Dictionary<RenderView, Int2>();
+        int currentViewIndex = 0;
+
+        public enum Axis {X, Y, Z};
+        public Axis VoxelizationAxis = Axis.Y;
+
+        public MultisampleCount MultisampleCount = MultisampleCount.X8;
+
+        public override bool Equals(object obj)
+        {
+            VoxelizationMethodSingleAxis method = obj as VoxelizationMethodSingleAxis;
+            if (method == null)
+            {
+                return false;
+            }
+            if (method.MultisampleCount != MultisampleCount)
+            {
+                return false;
+            }
+            return true;
+        }
+        public bool CanShareRenderStage(IVoxelizationMethod obj)
+        {
+            return Equals(obj);
+        }
+        public override int GetHashCode()
+        {
+            return MultisampleCount.GetHashCode();
+        }
+
+
+        public void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelAttribute attr, VoxelizationStage stage, bool output, bool shadows)
+        {
+            var actualView = Matrix.Identity;
+            if (VoxelizationAxis == Axis.Y)
+            {
+                actualView.ExchangeRows(1, 2);
+            }
+            if (VoxelizationAxis == Axis.X)
+            {
+                actualView.ExchangeRows(0, 2);
+            }
+
+            while (VoxelizationViews.Count <= currentViewIndex)
+            {
+                VoxelizationViews.Add(new RenderView());
+                VoxelizationViewSizes[VoxelizationViews[VoxelizationViews.Count-1]] = new Int2();
+            }
+            RenderView voxelizationView = VoxelizationViews[currentViewIndex];
+
+            float maxRes = Math.Max(resolution.X, Math.Max(resolution.Y, resolution.Z));
+            Matrix aspectScale = Matrix.Scaling(new Vector3(resolution.X, resolution.Z, resolution.Y) / maxRes);
+
+            VoxelizationViewSizes[voxelizationView] = new Int2((int)maxRes, (int)maxRes);
+
+            voxelizationView.View = actualView;
+            voxelizationView.Projection = view * aspectScale;
+            voxelizationView.ViewProjection = voxelizationView.View * voxelizationView.Projection;
+            voxelizationView.ViewSize = new Vector2(maxRes * 8, maxRes * 8);
+
+
+            //The BoundingFrustum constructor doesn't end up calculating the correct Near Plane for the symmetric matrix, squish it so the Z is from 0 to 1
+            Matrix SquishedMatrix = voxelizationView.ViewProjection * Matrix.Scaling(1f, 1f, 0.5f) * Matrix.Translation(new Vector3(0, 0, 0.5f));
+            voxelizationView.Frustum = new BoundingFrustum(ref SquishedMatrix);
+
+            voxelizationView.CullingMode = CameraCullingMode.None;
+            voxelizationView.NearClipPlane = 0.1f;
+            voxelizationView.FarClipPlane = 1000.0f;
+
+            currentViewIndex++;
+
+            passList.AddDirect(storer, this, voxelizationView, attr, stage, output, shadows);
+        }
+
+        Xenko.Graphics.Texture MSAARenderTarget = null;
+
+        public void Render(VoxelStorageContext storageContext, RenderDrawContext drawContext, RenderView view)
+        {
+            RenderView voxelizationView = view;
+            Int2 ViewSize = VoxelizationViewSizes[view];
+
+            if (VoxelUtils.DisposeTextureBySpecs(MSAARenderTarget, new Vector3(ViewSize.X, ViewSize.Y, 1), PixelFormat.R8G8B8A8_UNorm, MultisampleCount))
+            {
+                MSAARenderTarget = Texture.New(storageContext.device, TextureDescription.New2D(ViewSize.X, ViewSize.Y, new MipMapCount(false), PixelFormat.R8G8B8A8_UNorm, TextureFlags.RenderTarget, 1, GraphicsResourceUsage.Default, MultisampleCount), null);
+            }
+
+            drawContext.CommandList.ResetTargets();
+            if (MSAARenderTarget != null)
+                drawContext.CommandList.SetRenderTarget(null, MSAARenderTarget);
+
+            var renderSystem = drawContext.RenderContext.RenderSystem;
+
+            drawContext.CommandList.SetViewport(new Viewport(0, 0, ViewSize.X, ViewSize.Y));
+
+            renderSystem.Draw(drawContext, voxelizationView, renderSystem.RenderStages[voxelizationView.RenderStages[0].Index]);
+            drawContext.CommandList.ResetTargets();
+        }
+        public void Reset()
+        {
+            currentViewIndex = 0;
+        }
+
+        ShaderClassSource method = new ShaderClassSource("VoxelizationMethodSingleAxis");
+        ShaderMixinSource methodmixin = null;
+        public ShaderSource GetVoxelizationShader()
+        {
+            if (methodmixin == null)
+            {
+                methodmixin = new ShaderMixinSource();
+                methodmixin.Mixins.Add(method);
+            }
+            return methodmixin;
+        }
+        public bool RequireGeometryShader()
+        {
+            return false;
+        }
+        public int GeometryShaderOutputCount()
+        {
+            return 3;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodTriAxis.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodTriAxis.cs
new file mode 100644
index 0000000000..5b0bd26da5
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationMethod/VoxelizationMethodTriAxis.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using Xenko.Core;
+using Xenko.Core.Collections;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Shaders;
+using Xenko.Graphics;
+using Xenko.Rendering.Lights;
+using Xenko.Rendering.Voxels;
+using Xenko.Core.Extensions;
+using Xenko.Rendering;
+
+namespace Xenko.Rendering.Voxels
+{
+    //Renders the scene 3 times from different axis to generate all the fragments, no geometry shader needed. Shadows don't work currently.
+    [DataContract(DefaultMemberMode = DataMemberMode.Default)]
+    [Display("Tri Axis")]
+    public class VoxelizationMethodTriAxis : IVoxelizationMethod
+    {
+        VoxelizationMethodSingleAxis axisX = new VoxelizationMethodSingleAxis
+        {
+            VoxelizationAxis = VoxelizationMethodSingleAxis.Axis.X
+        };
+        VoxelizationMethodSingleAxis axisY = new VoxelizationMethodSingleAxis
+        {
+            VoxelizationAxis = VoxelizationMethodSingleAxis.Axis.Y
+        };
+        VoxelizationMethodSingleAxis axisZ = new VoxelizationMethodSingleAxis
+        {
+            VoxelizationAxis = VoxelizationMethodSingleAxis.Axis.Z
+        };
+
+        public MultisampleCount MultisampleCount = MultisampleCount.X8;
+
+        public void CollectVoxelizationPasses(VoxelizationPassList passList, IVoxelStorer storer, Matrix view, Vector3 resolution, VoxelAttribute attr, VoxelizationStage stage, bool output, bool shadows)
+        {
+            axisX.MultisampleCount = MultisampleCount;
+            axisY.MultisampleCount = MultisampleCount;
+            axisZ.MultisampleCount = MultisampleCount;
+
+            axisX.CollectVoxelizationPasses(passList, storer, view, resolution, attr, stage, output, shadows);
+            axisY.CollectVoxelizationPasses(passList, storer, view, resolution, attr, stage, output, shadows);
+            axisZ.CollectVoxelizationPasses(passList, storer, view, resolution, attr, stage, output, shadows);
+        }
+        public void Render(VoxelStorageContext storageContext, RenderDrawContext drawContext, RenderView view)
+        {
+        }
+        public void Reset()
+        {
+        }
+        public ShaderSource GetVoxelizationShader()
+        {
+            return null;
+        }
+        public bool RequireGeometryShader()
+        {
+            return false;
+        }
+        public int GeometryShaderOutputCount()
+        {
+            return 3;
+        }
+        public bool CanShareRenderStage(IVoxelizationMethod obj)
+        {
+            VoxelizationMethodSingleAxis method = obj as VoxelizationMethodSingleAxis;
+            if (method == null)
+            {
+                return false;
+            }
+            if (method.MultisampleCount != MultisampleCount)
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationPass.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationPass.cs
new file mode 100644
index 0000000000..2976418a91
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationPass.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+using Xenko.Rendering;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public class VoxelizationPass
+    {
+        public RenderView view;
+        public IVoxelStorer storer;
+        public IVoxelizationMethod method;
+        //Stage1
+        public List<VoxelAttribute> AttributesTemp = new List<VoxelAttribute>();
+        public List<VoxelAttribute> AttributesDirect = new List<VoxelAttribute>();
+        public List<VoxelAttribute> AttributesIndirect = new List<VoxelAttribute>();
+
+        public ShaderSource source;
+
+        public bool requireShadows = false;
+        public RenderStage renderStage = null;
+
+
+        public void Add(VoxelAttribute attr, VoxelizationStage stage, bool output, bool shadows)
+        {
+            if (stage == VoxelizationStage.Initial)
+            {
+                if (output)
+                {
+                    AttributesDirect.Add(attr);
+                }
+                else
+                {
+                    AttributesTemp.Add(attr);
+                }
+            }
+            else if (stage == VoxelizationStage.Post)
+            {
+                AttributesIndirect.Add(attr);
+            }
+
+            requireShadows |= shadows;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationPassList.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationPassList.cs
new file mode 100644
index 0000000000..e1b78e3f09
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizationPassList.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Rendering.Voxels
+{
+    public class VoxelizationPassList
+    {
+        public List<VoxelizationPass> passes = new List<VoxelizationPass>();
+        public IVoxelizationMethod defaultVoxelizationMethod;
+        public void AddDirect(IVoxelStorer storer, IVoxelizationMethod method, RenderView view, VoxelAttribute attr, VoxelizationStage stage, bool output, bool shadows)
+        {
+            bool toAdd = true;
+            foreach (VoxelizationPass pass in passes)
+            {
+                if (pass.storer.Equals(storer) && pass.method.Equals(method) && pass.view.ViewProjection == view.ViewProjection)
+                {
+                    pass.Add(attr, stage, output, shadows);
+                    toAdd = false;
+                    break;
+                }
+            }
+            if (toAdd)
+            {
+                VoxelizationPass pass = new VoxelizationPass
+                {
+                    storer = storer,
+                    method = method,
+                    view = view
+                };
+                pass.Add(attr, stage, output, shadows);
+                passes.Add(pass);
+            }
+        }
+        public void Clear()
+        {
+            passes.Clear();
+            defaultVoxelizationMethod = null;
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragments.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragments.xksl
new file mode 100644
index 0000000000..3aa7cc4857
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragments.xksl
@@ -0,0 +1,35 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+namespace Xenko.Rendering.Voxels
+{
+    /// <summary>
+    /// Voxelization, projects to axis of largest area and writes fragments to buffer
+    /// </summary>
+    shader VoxelizeToFragments : Math, Transformation, ShaderBase, Texturing, NormalStream, PositionStream4, VoxelPositionStream, MaterialPixelStream, MaterialPixelShadingStream
+    {
+        compose VoxelStorageShader Storage;
+        override stage void PSMain()
+        {
+            Storage.PrepareFragments();
+            streams.IsFrontFace = true;
+            if (Storage.MightStoreFragments())
+            {
+                base.PSMain();
+                Storage.StoreFragments();
+                streams.ColorTarget = float4(0,0,0,0);
+            }
+        }
+        override stage void VSMain()
+        {
+            base.VSMain();
+            Storage.PrepareVertex();
+        }
+        #ifdef RequireGeometryShader
+            [maxvertexcount(GeometryShaderMaxVertexCount)]
+            void GSMain(triangle Input input[3], inout TriangleStream<Output> triangleStream)
+            {
+                Storage.GenerateTriangles(input, triangleStream);
+            }
+        #endif
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragments.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragments.xksl.cs
new file mode 100644
index 0000000000..274fe38f51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragments.xksl.cs
@@ -0,0 +1,9 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+// Nothing to generate
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsEffect.xksl b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsEffect.xksl
new file mode 100644
index 0000000000..b0e12cd37d
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsEffect.xksl
@@ -0,0 +1,24 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using Xenko.Rendering.Materials;
+using Xenko.Rendering.Voxels;
+
+namespace Xenko.Rendering.Voxels
+{
+    partial effect VoxelizeToFragmentsEffect
+    {
+        using params MaterialKeys;
+        using params VoxelizeToFragmentsKeys;
+
+        mixin VoxelizeToFragments;
+        if (VoxelizeToFragmentsKeys.Storage!=null)
+        {
+            mixin compose Storage = (VoxelizeToFragmentsKeys.Storage);
+        }
+        if (VoxelizeToFragmentsKeys.RequireGeometryShader == true)
+        {
+            mixin macro RequireGeometryShader = true;
+            mixin macro VoxelizeToFragmentsKeys.GeometryShaderMaxVertexCount;
+        }
+    };
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsEffect.xksl.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsEffect.xksl.cs
new file mode 100644
index 0000000000..55774d5373
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsEffect.xksl.cs
@@ -0,0 +1,54 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+using Xenko.Rendering.Materials;
+using Xenko.Rendering.Voxels;
+namespace Xenko.Rendering.Voxels
+{
+    internal static partial class ShaderMixins
+    {
+        internal partial class VoxelizeToFragmentsEffect  : IShaderMixinBuilder
+        {
+            public void Generate(ShaderMixinSource mixin, ShaderMixinContext context)
+            {
+                context.Mixin(mixin, "VoxelizeToFragments");
+                if (context.GetParam(VoxelizeToFragmentsKeys.Storage) != null)
+                {
+
+                    {
+                        var __mixinToCompose__ = (context.GetParam(VoxelizeToFragmentsKeys.Storage));
+                        var __subMixin = new ShaderMixinSource();
+                        context.PushComposition(mixin, "Storage", __subMixin);
+                        context.Mixin(__subMixin, __mixinToCompose__);
+                        context.PopComposition();
+                    }
+                }
+                if (context.GetParam(VoxelizeToFragmentsKeys.RequireGeometryShader) == true)
+                {
+                    mixin.AddMacro("RequireGeometryShader", true);
+                    mixin.AddMacro("GeometryShaderMaxVertexCount", context.GetParam(VoxelizeToFragmentsKeys.GeometryShaderMaxVertexCount));
+                }
+            }
+
+            [ModuleInitializer]
+            internal static void __Initialize__()
+
+            {
+                ShaderMixinManager.Register("VoxelizeToFragmentsEffect", new VoxelizeToFragmentsEffect());
+            }
+        }
+    }
+}
diff --git a/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsKeys.cs b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsKeys.cs
new file mode 100644
index 0000000000..c152c60597
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Voxels/Voxelization/VoxelizeToFragmentsKeys.cs
@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+using Xenko.Rendering.Voxels;
+using Xenko.Shaders;
+
+namespace Xenko.Rendering.Voxels
+{
+    public static partial class VoxelizeToFragmentsKeys
+    {
+        public static readonly PermutationParameterKey<ShaderSource> Storage = ParameterKeys.NewPermutation<ShaderSource>();
+        public static readonly PermutationParameterKey<bool> RequireGeometryShader = ParameterKeys.NewPermutation<bool>();
+        public static readonly PermutationParameterKey<int> GeometryShaderMaxVertexCount = ParameterKeys.NewPermutation<int>();
+    }
+}
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Xenko.Voxels.csproj b/sources/engine/Xenko.Voxels/Xenko.Voxels.csproj
new file mode 100644
index 0000000000..fdb794fb51
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Xenko.Voxels.csproj
@@ -0,0 +1,31 @@
+<Project>
+  <PropertyGroup>
+    <XenkoRuntime>true</XenkoRuntime>
+    <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
+  </PropertyGroup>
+  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
+    <XenkoPlatformDependent>true</XenkoPlatformDependent>
+    <XenkoBuildTags>*</XenkoBuildTags>
+    <XenkoPackAssets>true</XenkoPackAssets>
+    <XenkoPublicApi>true</XenkoPublicApi>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
+    <ProjectReference Include="..\Xenko.Native\Xenko.Native.csproj" />
+    <ProjectReference Include="..\Xenko.Games\Xenko.Games.csproj" />
+    <ProjectReference Include="..\Xenko.Rendering\Xenko.Rendering.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
+  <Import Project="$(XenkoPostSettingsTargets)" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko.Voxels/Xenko.Voxels.xkpkg b/sources/engine/Xenko.Voxels/Xenko.Voxels.xkpkg
new file mode 100644
index 0000000000..bc07889ca4
--- /dev/null
+++ b/sources/engine/Xenko.Voxels/Xenko.Voxels.xkpkg
@@ -0,0 +1,5 @@
+!Package
+SerializedVersion: {Assets: 3.1.0.0}
+AssetFolders:
+    -   Path: !dir Voxels
+RootAssets: []
diff --git a/sources/engine/Xenko/CompilationMode.cs b/sources/engine/Xenko/CompilationMode.cs
index 0878771ea7..fac1c0c30f 100644
--- a/sources/engine/Xenko/CompilationMode.cs
+++ b/sources/engine/Xenko/CompilationMode.cs
@@ -21,7 +21,7 @@ public enum CompilationMode
         /// </summary>
         /// <remarks>
         /// Impact on compilation on other components:
-        /// - Shaders are compiled in optimization level 1 with debug information.
+        /// - Shaders are compiled in optimization level 2 with <c>no debug</c> information.
         /// </remarks>
         Release,
 
diff --git a/sources/engine/Xenko/Effects/ParameterKey.cs b/sources/engine/Xenko/Effects/ParameterKey.cs
index 7f99814105..bae4da4695 100644
--- a/sources/engine/Xenko/Effects/ParameterKey.cs
+++ b/sources/engine/Xenko/Effects/ParameterKey.cs
@@ -3,6 +3,7 @@
 #pragma warning disable SA1402 // File may only contain a single type
 using System;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Xenko.Core;
 using Xenko.Core.Serialization;
 using Xenko.Core.Storage;
@@ -14,7 +15,7 @@ namespace Xenko.Rendering
     /// </summary>
     public abstract class ParameterKey : PropertyKey
     {
-        public ulong HashCode;
+        public ulong HashCode, BaseType;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ParameterKey" /> class.
@@ -64,14 +65,14 @@ internal void SetOwnerType(Type ownerType)
         /// <returns>
         ///   <c>true</c> if the specified <see cref="object"/> is equal to this instance; otherwise, <c>false</c>.
         /// </returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public override bool Equals(object obj)
         {
             //return ReferenceEquals(this, obj);
             if (ReferenceEquals(null, obj)) return false;
             if (ReferenceEquals(this, obj)) return true;
-            var against = obj as ParameterKey;
-            if (against == null) return false;
-            return (Equals(against.Name, Name));
+            if (obj is ParameterKey pk) return Equals(pk.Name, Name);
+            return false;
         }
 
         /// <summary>
@@ -93,6 +94,7 @@ public override int GetHashCode()
         /// <returns>
         /// The result of the operator.
         /// </returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator ==(ParameterKey left, ParameterKey right)
         {
             return Equals(left, right);
@@ -106,6 +108,7 @@ public override int GetHashCode()
         /// <returns>
         /// The result of the operator.
         /// </returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool operator !=(ParameterKey left, ParameterKey right)
         {
             return !Equals(left, right);
@@ -124,6 +127,29 @@ private unsafe void UpdateName()
                 var objIdData = (ulong*)&objId;
                 HashCode = objIdData[0] ^ objIdData[1];
             }
+
+            // calculate fast basetype
+            var btBuilder = new ObjectIdBuilder();
+            int dots = 0;
+            string baseType = Name;
+            for (int i=0; i<Name.Length; i++)
+            {
+                var name = Name[i];
+                if (name == '.')
+                {
+                    dots++;
+                    if (dots == 2)
+                    {
+                        baseType = Name.Substring(0, i);
+                        break;
+                    }
+                }
+            }
+
+            btBuilder.Write(baseType);
+            var objId2 = btBuilder.ComputeHash();
+            var objIdData2 = (ulong*)&objId2;
+            BaseType = objIdData2[0] ^ objIdData2[1];
         }
 
         /// <summary>
diff --git a/sources/engine/Xenko/Effects/ParameterKeySerializer.cs b/sources/engine/Xenko/Effects/ParameterKeySerializer.cs
index bf98278e29..a8a5248a58 100644
--- a/sources/engine/Xenko/Effects/ParameterKeySerializer.cs
+++ b/sources/engine/Xenko/Effects/ParameterKeySerializer.cs
@@ -21,7 +21,7 @@ public override void Serialize(ref ValueParameterKey<T> obj, ArchiveMode mode, S
             {
                 var parameterName = stream.ReadString();
                 var parameterLength = stream.ReadInt32();
-                obj = (ValueParameterKey<T>)ParameterKeys.FindByName(parameterName);
+                obj = ParameterKeys.FindByName(parameterName) as ValueParameterKey<T>;
 
                 // If parameter could not be found, create one matching this type.
                 if (obj == null)
diff --git a/sources/engine/Xenko/Effects/ParameterKeyValueMetadata.cs b/sources/engine/Xenko/Effects/ParameterKeyValueMetadata.cs
index 5a1c983157..2eba45732b 100644
--- a/sources/engine/Xenko/Effects/ParameterKeyValueMetadata.cs
+++ b/sources/engine/Xenko/Effects/ParameterKeyValueMetadata.cs
@@ -39,7 +39,7 @@ public ParameterKeyValueMetadata(T defaultValue)
         /// <summary>
         /// Gets the default value.
         /// </summary>
-        public readonly T DefaultValue;
+        public T DefaultValue { get; internal set; }
 
         public override unsafe bool WriteBuffer(IntPtr dest, int alignment = 1)
         {
diff --git a/sources/engine/Xenko/Graphics/DataBox.cs b/sources/engine/Xenko/Graphics/DataBox.cs
index 383113ae95..75ea0d37d2 100644
--- a/sources/engine/Xenko/Graphics/DataBox.cs
+++ b/sources/engine/Xenko/Graphics/DataBox.cs
@@ -102,7 +102,7 @@ public override int GetHashCode()
 
         private bool EqualsByRef(ref DataBox other)
         {
-            return DataPointer.Equals(other.DataPointer) && RowPitch == other.RowPitch && SlicePitch == other.SlicePitch;
+            return DataPointer == other.DataPointer && RowPitch == other.RowPitch && SlicePitch == other.SlicePitch;
         }
     }
 }
diff --git a/sources/engine/Xenko/Graphics/GraphicsPlatform.cs b/sources/engine/Xenko/Graphics/GraphicsPlatform.cs
index 62c03f1d67..f060a9b50a 100644
--- a/sources/engine/Xenko/Graphics/GraphicsPlatform.cs
+++ b/sources/engine/Xenko/Graphics/GraphicsPlatform.cs
@@ -20,21 +20,6 @@ public enum GraphicsPlatform
         /// </summary>
         Direct3D11,
 
-        /// <summary>
-        /// HLSL Direct3D Shader.
-        /// </summary>
-        Direct3D12,
-
-        /// <summary>
-        /// GLSL OpenGL Shader.
-        /// </summary>
-        OpenGL,
-
-        /// <summary>
-        /// GLSL OpenGL ES Shader.
-        /// </summary>
-        OpenGLES,
-
         /// <summary>
         /// GLSL/SPIR-V Shader.
         /// </summary>
diff --git a/sources/engine/Xenko/Graphics/PixelFormat.cs b/sources/engine/Xenko/Graphics/PixelFormat.cs
index 39076b4674..8182626a66 100644
--- a/sources/engine/Xenko/Graphics/PixelFormat.cs
+++ b/sources/engine/Xenko/Graphics/PixelFormat.cs
@@ -561,5 +561,8 @@ public enum PixelFormat
         ATC_RGB = unchecked((int)1120),
         ATC_RGBA_Explicit = unchecked((int)1121),
         ATC_RGBA_Interpolated = unchecked((int)1122),
+
+        ASTC_RGBA_4X4 = unchecked((int)1130),
+        ASTC_RGBA_4X4_SRgb = unchecked((int)1131),
     }
 }
diff --git a/sources/engine/Xenko/Graphics/PixelFormatExtensions.cs b/sources/engine/Xenko/Graphics/PixelFormatExtensions.cs
index 054659903c..e1a7134690 100644
--- a/sources/engine/Xenko/Graphics/PixelFormatExtensions.cs
+++ b/sources/engine/Xenko/Graphics/PixelFormatExtensions.cs
@@ -40,7 +40,7 @@ public static class PixelFormatExtensions
         private static readonly bool[] alpha32Formats = new bool[256];
         private static readonly bool[] typelessFormats = new bool[256];
         private static readonly Dictionary<PixelFormat, PixelFormat> sRgbConvertion;
-        
+
         private static int GetIndex(PixelFormat format)
         {
             // DirectX official pixel formats (0..115 use 0..127 in the arrays)
@@ -150,6 +150,8 @@ public static int AlphaSizeInBits(this PixelFormat format)
 
                 case PixelFormat.ETC2_RGBA:
                 case PixelFormat.ETC2_RGBA_SRgb:
+                case PixelFormat.ASTC_RGBA_4X4:
+                case PixelFormat.ASTC_RGBA_4X4_SRgb:
                     return 8;
 
                 case PixelFormat.ETC2_RGB_A1:
@@ -174,7 +176,8 @@ public static bool IsValid(this PixelFormat format)
             return ((int)(format) >= 1 && (int)(format) <= 115) // DirectX formats
                 || ((int)(format) >= 1024 && (int)(format) <= 1033) // PVRTC formats
                 || ((int)(format) >= 1088 && (int)(format) <= 1097) // ETC formats
-                || ((int)(format) >= 1120 && (int)(format) <= 1122); // ATITC formats
+                || ((int)(format) >= 1120 && (int)(format) <= 1122) // ATITC formats
+                || ((int)(format) >= 1130 && (int)(format) <= 1131); // ASTC formats
         }
 
         /// <summary>
@@ -341,13 +344,15 @@ public static int ComputeScanlineCount(this PixelFormat fmt, int height)
                 case PixelFormat.ATC_RGB:
                 case PixelFormat.ATC_RGBA_Explicit:
                 case PixelFormat.ATC_RGBA_Interpolated:
+                case PixelFormat.ASTC_RGBA_4X4:
+                case PixelFormat.ASTC_RGBA_4X4_SRgb:
                     return Math.Max(1, (height + 3) / 4);
 
                 default:
                     return height;
             }
         }
-        
+
         /// <summary>
         /// Determine if the format has an equivalent sRGB format.
         /// </summary>
@@ -483,7 +488,7 @@ static PixelFormatExtensions()
             InitFormat(new[] { PixelFormat.A8_UNorm, PixelFormat.R8_SInt, PixelFormat.R8_SNorm, PixelFormat.R8_Typeless, PixelFormat.R8_UInt, PixelFormat.R8_UNorm }, 8);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.B5G5R5A1_UNorm,
                 PixelFormat.B5G6R5_UNorm,
                 PixelFormat.D16_UNorm,
@@ -501,10 +506,12 @@ static PixelFormatExtensions()
 #if DIRECTX11_1
                 PixelFormat.B4G4R4A4_UNorm,
 #endif
+                PixelFormat.ASTC_RGBA_4X4,
+                PixelFormat.ASTC_RGBA_4X4_SRgb,
             }, 16);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.B8G8R8X8_Typeless,
                 PixelFormat.B8G8R8X8_UNorm,
                 PixelFormat.B8G8R8X8_UNorm_SRgb,
@@ -546,7 +553,7 @@ static PixelFormatExtensions()
             }, 32);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.R16G16B16A16_Float,
                 PixelFormat.R16G16B16A16_SInt,
                 PixelFormat.R16G16B16A16_SNorm,
@@ -561,7 +568,7 @@ static PixelFormatExtensions()
             }, 64);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.R32G32B32_Float,
                 PixelFormat.R32G32B32_SInt,
                 PixelFormat.R32G32B32_Typeless,
@@ -569,7 +576,7 @@ static PixelFormatExtensions()
             }, 96);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.R32G32B32A32_Float,
                 PixelFormat.R32G32B32A32_SInt,
                 PixelFormat.R32G32B32A32_Typeless,
@@ -577,7 +584,7 @@ static PixelFormatExtensions()
             }, 128);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.BC1_Typeless,
                 PixelFormat.BC1_UNorm,
                 PixelFormat.BC1_UNorm_SRgb,
@@ -587,7 +594,7 @@ static PixelFormatExtensions()
             }, 4);
 
             InitFormat(new[]
-            { 
+            {
                 PixelFormat.BC2_Typeless,
                 PixelFormat.BC2_UNorm,
                 PixelFormat.BC2_UNorm_SRgb,
@@ -652,6 +659,8 @@ static PixelFormatExtensions()
                     PixelFormat.ATC_RGB,
                     PixelFormat.ATC_RGBA_Explicit,
                     PixelFormat.ATC_RGBA_Interpolated,
+                    PixelFormat.ASTC_RGBA_4X4,
+                    PixelFormat.ASTC_RGBA_4X4_SRgb,
                 }, compressedFormats);
 
             // Init srgb formats
@@ -670,6 +679,7 @@ static PixelFormatExtensions()
                     PixelFormat.PVRTC_4bpp_RGBA_SRgb,
                     PixelFormat.ETC2_RGBA_SRgb,
                     PixelFormat.ETC2_RGB_SRgb,
+                    PixelFormat.ASTC_RGBA_4X4_SRgb,
                 }, srgbFormats);
 
             // Init srgb formats
@@ -751,6 +761,8 @@ static PixelFormatExtensions()
                 { PixelFormat.ETC2_RGBA, PixelFormat.ETC2_RGBA_SRgb },
                 { PixelFormat.ETC2_RGB_SRgb, PixelFormat.ETC2_RGB },
                 { PixelFormat.ETC2_RGB, PixelFormat.ETC2_RGB_SRgb },
+                { PixelFormat.ASTC_RGBA_4X4_SRgb, PixelFormat.ASTC_RGBA_4X4 },
+                { PixelFormat.ASTC_RGBA_4X4, PixelFormat.ASTC_RGBA_4X4_SRgb },
             };
         }
 
diff --git a/sources/engine/Xenko/Graphics/SamplerStateDescription.cs b/sources/engine/Xenko/Graphics/SamplerStateDescription.cs
index 73043475df..168b128dd1 100644
--- a/sources/engine/Xenko/Graphics/SamplerStateDescription.cs
+++ b/sources/engine/Xenko/Graphics/SamplerStateDescription.cs
@@ -122,7 +122,7 @@ public override int GetHashCode()
 
         private void SetDefaults()
         {
-            Filter = TextureFilter.Linear;
+            Filter = TextureFilter.Anisotropic;
             AddressU = TextureAddressMode.Clamp;
             AddressV = TextureAddressMode.Clamp;
             AddressW = TextureAddressMode.Clamp;
diff --git a/sources/engine/Xenko/Graphics/StandardImageHelper.Windows.cs b/sources/engine/Xenko/Graphics/StandardImageHelper.Windows.cs
index 2e376c305c..7945c0e6a3 100644
--- a/sources/engine/Xenko/Graphics/StandardImageHelper.Windows.cs
+++ b/sources/engine/Xenko/Graphics/StandardImageHelper.Windows.cs
@@ -24,7 +24,7 @@ public static unsafe Image LoadFromMemory(IntPtr pSource, int size, bool makeACo
                 var sourceArea = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
                 // Lock System.Drawing.Bitmap
 
-                var bitmapData = bitmap.LockBits(sourceArea, ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
+                var bitmapData = bitmap.LockBits(sourceArea, ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
                 var image = Image.New2D(bitmap.Width, bitmap.Height, 1, PixelFormat.B8G8R8A8_UNorm, 1, bitmapData.Stride);
                 // var dataRect = new DataRectangle(bitmapData.Stride, bitmapData.Scan0);
 
@@ -87,7 +87,7 @@ private static void SaveFromMemory(PixelBuffer[] pixelBuffers, int count, ImageD
                 var sourceArea = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
 
                 // Lock System.Drawing.Bitmap
-                var bitmapData = bitmap.LockBits(sourceArea, ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppPArgb);
+                var bitmapData = bitmap.LockBits(sourceArea, ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
 
                 try
                 {
diff --git a/sources/engine/Xenko/Rendering/ParameterCollection.cs b/sources/engine/Xenko/Rendering/ParameterCollection.cs
index f320fd7189..9fe0417470 100644
--- a/sources/engine/Xenko/Rendering/ParameterCollection.cs
+++ b/sources/engine/Xenko/Rendering/ParameterCollection.cs
@@ -95,9 +95,9 @@ public override string ToString()
         /// <typeparam name="T"></typeparam>
         /// <param name="parameterKey"></param>
         /// <returns></returns>
-        public ObjectParameterAccessor<T> GetAccessor<T>(ObjectParameterKey<T> parameterKey, bool createIfNew = true)
+        public ObjectParameterAccessor<T> GetObjectAccessor<T>(ObjectParameterKey<T> parameterKey, bool createIfNew = true, int index = 0)
         {
-            var accessor = GetObjectParameterHelper(parameterKey, createIfNew);
+            var accessor = GetObjectParameterHelper(parameterKey, createIfNew, index);
             return new ObjectParameterAccessor<T>(accessor.Offset, accessor.Count);
         }
 
@@ -107,10 +107,10 @@ public ObjectParameterAccessor<T> GetAccessor<T>(ObjectParameterKey<T> parameter
         /// <typeparam name="T"></typeparam>
         /// <param name="parameterKey"></param>
         /// <returns></returns>
-        public PermutationParameter<T> GetAccessor<T>(PermutationParameterKey<T> parameterKey, bool createIfNew = true)
+        public PermutationParameter<T> GetPermutationAccessor<T>(PermutationParameterKey<T> parameterKey, bool createIfNew = true, int index = 0)
         {
             // Remap it as PermutationParameter
-            var accessor = GetObjectParameterHelper(parameterKey, createIfNew);
+            var accessor = GetObjectParameterHelper(parameterKey, createIfNew, index);
             return new PermutationParameter<T>(accessor.Offset, accessor.Count);
         }
 
@@ -120,19 +120,23 @@ public PermutationParameter<T> GetAccessor<T>(PermutationParameterKey<T> paramet
         /// <typeparam name="T"></typeparam>
         /// <param name="parameterKey"></param>
         /// <returns></returns>
-        public ValueParameter<T> GetAccessor<T>(ValueParameterKey<T> parameterKey, int elementCount = 1) where T : struct
+        public ValueParameter<T> GetValueAccessor<T>(ValueParameterKey<T> parameterKey, int elementCount = 1, int index = 0) where T : struct
         {
-            var accessor = GetValueAccessorHelper(parameterKey, elementCount);
+            var accessor = GetValueAccessorHelper(parameterKey, elementCount, index);
             return new ValueParameter<T>(accessor.Offset, accessor.Count);
         }
 
-        private unsafe Accessor GetValueAccessorHelper(ParameterKey parameterKey, int elementCount = 1)
+        private unsafe Accessor GetValueAccessorHelper(ParameterKey parameterKey, int elementCount = 1, int index = 0)
         {
             // Find existing first
+            bool multiindex = index > 0;
             for (int i = 0; i < parameterKeyInfos.Count; ++i)
             {
-                if (parameterKeyInfos.Items[i].Key == parameterKey)
+                var pk = parameterKeyInfos.Items[i].Key;
+                if (pk == parameterKey || multiindex && pk.BaseType == parameterKey.BaseType)
                 {
+                    if (index-- != 0) continue;
+
                     return parameterKeyInfos.Items[i].GetValueAccessor();
                 }
             }
@@ -175,27 +179,16 @@ private unsafe Accessor GetValueAccessorHelper(ParameterKey parameterKey, int el
             return new Accessor(memberOffset, elementCount);
         }
 
-        /// <summary>
-        /// Gets pointer to directly copy blittable values.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="parameter"></param>
-        /// <returns></returns>
-        public unsafe IntPtr GetValuePointer<T>(ValueParameter<T> parameter) where T : struct
-        {
-            fixed (byte* dataValues = DataValues)
-                return (IntPtr)dataValues + parameter.Offset;
-        }
-
         /// <summary>
         /// Sets an object.
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <param name="value"></param>
-        public void Set<T>(ObjectParameterKey<T> parameter, T value)
+        /// <param name="index">Which parameter index? 0 is the first found for material pass</param>
+        public void Set<T>(ObjectParameterKey<T> parameter, T value, int index = 0)
         {
-            Set(GetAccessor(parameter), value);
+            Set(GetObjectAccessor(parameter, true, index), value);
         }
 
         /// <summary>
@@ -203,14 +196,15 @@ public void Set<T>(ObjectParameterKey<T> parameter, T value)
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
+        /// <param name="index">Which parameter index? 0 is the first found for material pass</param>
         /// <returns></returns>
-        public T Get<T>(ObjectParameterKey<T> parameter, bool createIfNew = false)
+        public T Get<T>(ObjectParameterKey<T> parameter, bool createIfNew = false, int index = 0)
         {
-            var accessor = GetAccessor(parameter, createIfNew);
+            var accessor = GetObjectAccessor(parameter, createIfNew, index);
             if (accessor.BindingSlot == -1)
                 return parameter.DefaultValueMetadataT.DefaultValue;
 
-            return Get(GetAccessor(parameter, createIfNew));
+            return Get(accessor);
         }
 
         /// <summary>
@@ -219,9 +213,9 @@ public T Get<T>(ObjectParameterKey<T> parameter, bool createIfNew = false)
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <param name="value"></param>
-        public void Set<T>(PermutationParameterKey<T> parameter, T value)
+        public void Set<T>(PermutationParameterKey<T> parameter, T value, int index = 0)
         {
-            Set(GetAccessor(parameter), value);
+            Set(GetPermutationAccessor(parameter, true, index), value);
         }
 
         /// <summary>
@@ -230,13 +224,13 @@ public void Set<T>(PermutationParameterKey<T> parameter, T value)
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <returns></returns>
-        public T Get<T>(PermutationParameterKey<T> parameter, bool createIfNew = false)
+        public T Get<T>(PermutationParameterKey<T> parameter, bool createIfNew = false, int index = 0)
         {
-            var accessor = GetAccessor(parameter, createIfNew);
+            var accessor = GetPermutationAccessor(parameter, createIfNew, index);
             if (accessor.BindingSlot == -1)
                 return parameter.DefaultValueMetadataT.DefaultValue;
 
-            return Get(GetAccessor(parameter));
+            return Get(accessor);
         }
 
         /// <summary>
@@ -245,9 +239,9 @@ public T Get<T>(PermutationParameterKey<T> parameter, bool createIfNew = false)
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <param name="value"></param>
-        public void Set<T>(ValueParameterKey<T> parameter, T value) where T : struct
+        public void Set<T>(ValueParameterKey<T> parameter, T value, int index = 0) where T : struct
         {
-            Set(GetAccessor(parameter), ref value);
+            Set(GetValueAccessor(parameter, 1, index), ref value);
         }
 
         /// <summary>
@@ -256,9 +250,9 @@ public void Set<T>(ValueParameterKey<T> parameter, T value) where T : struct
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <param name="value"></param>
-        public void Set<T>(ValueParameterKey<T> parameter, ref T value) where T : struct
+        public void Set<T>(ValueParameterKey<T> parameter, ref T value, int index = 0) where T : struct
         {
-            Set(GetAccessor(parameter), ref value);
+            Set(GetValueAccessor(parameter, 1, index), ref value);
         }
 
         /// <summary>
@@ -267,9 +261,9 @@ public void Set<T>(ValueParameterKey<T> parameter, ref T value) where T : struct
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <param name="values"></param>
-        public void Set<T>(ValueParameterKey<T> parameter, T[] values) where T : struct
+        public void Set<T>(ValueParameterKey<T> parameter, T[] values, int index = 0) where T : struct
         {
-            Set(GetAccessor(parameter, values.Length), values.Length, ref values[0]);
+            Set(GetValueAccessor(parameter, values.Length, index), values.Length, ref values[0]);
         }
 
         /// <summary>
@@ -278,9 +272,9 @@ public void Set<T>(ValueParameterKey<T> parameter, T[] values) where T : struct
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <param name="values"></param>
-        public void Set<T>(ValueParameterKey<T> parameter, int count, ref T firstValue) where T : struct
+        public void Set<T>(ValueParameterKey<T> parameter, int count, ref T firstValue, int index = 0) where T : struct
         {
-            Set(GetAccessor(parameter, count), count, ref firstValue);
+            Set(GetValueAccessor(parameter, count, index), count, ref firstValue);
         }
 
         /// <summary>
@@ -289,9 +283,9 @@ public void Set<T>(ValueParameterKey<T> parameter, int count, ref T firstValue)
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
         /// <returns></returns>
-        public T Get<T>(ValueParameterKey<T> parameter) where T : struct
+        public T Get<T>(ValueParameterKey<T> parameter, int index = 0) where T : struct
         {
-            return Get(GetAccessor(parameter));
+            return Get(GetValueAccessor(parameter, 1, index));
         }
 
         /// <summary>
@@ -300,21 +294,55 @@ public T Get<T>(ValueParameterKey<T> parameter) where T : struct
         /// <typeparam name="T"></typeparam>
         /// <param name="key"></param>
         /// <returns></returns>
-        public T[] GetValues<T>(ValueParameterKey<T> key) where T : struct
+        public unsafe T[] GetValues<T>(ValueParameterKey<T> key, int index = 0) where T : struct
         {
-            var parameter = GetAccessor(key);
-            var data = GetValuePointer(parameter);
+            var parameter = GetValueAccessor(key, 1, index);
 
             // Align to float4
             var stride = (Utilities.SizeOf<T>() + 15) / 16 * 16;
             var values = new T[parameter.Count];
-            for (int i = 0; i < values.Length; ++i)
+
+            fixed (byte* dataValues = DataValues)
             {
-                Utilities.Read(data, ref values[i]);
-                data += stride;
+                var dataPtr = (IntPtr)dataValues + parameter.Offset;
+
+                for (int i = 0; i < values.Length; ++i)
+                {
+                    Utilities.Read(dataPtr, ref values[i]);
+                    dataPtr += stride;
+                }
+
+                return values;
             }
+        }
 
-            return values;
+        /// <summary>
+        /// Copies all blittable values of a given key to the specified <see cref="ParameterCollection"/>.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="key">The key for the values to copy.</param>
+        /// <param name="destination">The collection to copy the values to.</param>
+        /// <param name="destinationKey">The key for the values of the destination collection.</param>
+        public unsafe void CopyTo<T>(ValueParameterKey<T> key, ParameterCollection destination, ValueParameterKey<T> destinationKey, int index = 0) where T : struct
+        {
+            var sourceParameter = GetValueAccessor(key, 1, index);
+            var destParameter = destination.GetValueAccessor(destinationKey, sourceParameter.Count, index);
+            if (sourceParameter.Count > destParameter.Count)
+            {
+                throw new IndexOutOfRangeException();
+            }
+
+            // Align to float4
+            var stride = (Utilities.SizeOf<T>() + 15) / 16 * 16;
+            var sizeInBytes = sourceParameter.Count * stride;
+
+            fixed (byte* sourceDataValues = DataValues)
+            fixed (byte* destDataValues = destination.DataValues)
+            {
+                var sourcePtr = (IntPtr)sourceDataValues + sourceParameter.Offset;
+                var destPtr = (IntPtr)destDataValues + destParameter.Offset;
+                Utilities.CopyMemory(destPtr, sourcePtr, sizeInBytes);
+            }
         }
 
         /// <summary>
@@ -346,11 +374,10 @@ public unsafe void Set<T>(ValueParameter<T> parameter, ref T value) where T : st
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="parameter"></param>
-        /// <param name="values"></param>
-        public void Set<T>(ValueParameter<T> parameter, int count, ref T firstValue) where T : struct
+        /// <param name="count"></param>
+        /// <param name="firstValue"></param>
+        public unsafe void Set<T>(ValueParameter<T> parameter, int count, ref T firstValue) where T : struct
         {
-            var data = GetValuePointer(parameter);
-
             // Align to float4
             var stride = (Utilities.SizeOf<T>() + 15) / 16 * 16;
             var elementCount = parameter.Count;
@@ -359,13 +386,18 @@ public void Set<T>(ValueParameter<T> parameter, int count, ref T firstValue) whe
                 throw new IndexOutOfRangeException();
             }
 
-            var value = Interop.Pin(ref firstValue);
-            for (int i = 0; i < count; ++i)
+            fixed (byte* dataValues = DataValues)
             {
-                Utilities.Write(data, ref value);
-                data += stride;
+                var dataPtr = (IntPtr)dataValues + parameter.Offset;
 
-                value = Interop.IncrementPinned(value);
+                var value = Interop.Pin(ref firstValue);
+                for (int i = 0; i < count; ++i)
+                {
+                    Utilities.Write(dataPtr, ref value);
+                    dataPtr += stride;
+
+                    value = Interop.IncrementPinned(value);
+                }
             }
         }
 
@@ -377,10 +409,17 @@ public void Set<T>(ValueParameter<T> parameter, int count, ref T firstValue) whe
         /// <param name="value"></param>
         public void Set<T>(PermutationParameter<T> parameter, T value)
         {
-            if (!EqualityComparer<T>.Default.Equals((T)ObjectValues[parameter.BindingSlot], value))
+            bool isSame = EqualityComparer<T>.Default.Equals((T)ObjectValues[parameter.BindingSlot], value);
+            if (!isSame)
+            {
                 PermutationCounter++;
+            }
 
-            ObjectValues[parameter.BindingSlot] = value;
+            // For value types, we don't assign again because this causes boxing.
+            if (!typeof(T).IsValueType || !isSame)
+            {
+                ObjectValues[parameter.BindingSlot] = value;
+            }
         }
 
         /// <summary>
@@ -428,29 +467,29 @@ public T Get<T>(ObjectParameterAccessor<T> parameterAccessor)
             return (T)ObjectValues[parameterAccessor.BindingSlot];
         }
 
-        public void SetObject(ParameterKey key, object value)
+        public void SetObject(ParameterKey key, object value, int index = 0)
         {
             if (key.Type != ParameterKeyType.Permutation && key.Type != ParameterKeyType.Object)
                 throw new InvalidOperationException("SetObject can only be used for Permutation or Object keys");
 
-            var accessor = GetObjectParameterHelper(key);
+            var accessor = GetObjectParameterHelper(key, true, index);
 
             if (key.Type == ParameterKeyType.Permutation)
             {
                 var oldValue = ObjectValues[accessor.Offset];
                 if ((oldValue != null && (value == null || !oldValue.Equals(value))) // oldValue non null => check equality
                     || (oldValue == null && value != null)) // oldValue null => check if value too
-                        PermutationCounter++;
+                    PermutationCounter++;
             }
             ObjectValues[accessor.Offset] = value;
         }
 
-        public object GetObject(ParameterKey key)
+        public object GetObject(ParameterKey key, int index = 0)
         {
             if (key.Type != ParameterKeyType.Permutation && key.Type != ParameterKeyType.Object)
-                throw new InvalidOperationException("SetObject can only be used for Permutation or Object keys");
+                throw new InvalidOperationException("GetObject can only be used for Permutation or Object keys");
 
-            var accessor = GetObjectParameterHelper(key, false);
+            var accessor = GetObjectParameterHelper(key, false, index);
             if (accessor.Offset == -1)
                 return null;
 
@@ -477,7 +516,7 @@ public bool Remove(ParameterKey key)
         /// </summary>
         public void Clear()
         {
-            DataValues = null;
+            DataValues = EmptyData;
             ObjectValues = null;
             layout = null;
             parameterKeyInfos.Clear();
@@ -564,7 +603,7 @@ public unsafe void UpdateLayout(ParameterCollectionLayout collectionLayout)
                     newParameterKeyInfos.Items[i].BindingSlot = resourceCount++;
                 }
             }
-            
+
             var newDataValues = new byte[bufferSize];
             var newResourceValues = new object[resourceCount];
 
@@ -616,13 +655,17 @@ public unsafe void UpdateLayout(ParameterCollectionLayout collectionLayout)
             ObjectValues = newResourceValues;
         }
 
-        protected Accessor GetObjectParameterHelper(ParameterKey parameterKey, bool createIfNew = true)
+        protected Accessor GetObjectParameterHelper(ParameterKey parameterKey, bool createIfNew = true, int index = 0)
         {
             // Find existing first
+            bool multiindex = index > 0;
             for (int i = 0; i < parameterKeyInfos.Count; ++i)
             {
-                if (parameterKeyInfos.Items[i].Key == parameterKey)
+                var pk = parameterKeyInfos.Items[i].Key;
+                if (pk == parameterKey || multiindex && pk.BaseType == parameterKey.BaseType)
                 {
+                    if (index-- != 0) continue;
+
                     return parameterKeyInfos.Items[i].GetObjectAccessor();
                 }
             }
diff --git a/sources/engine/Xenko/Xenko.csproj b/sources/engine/Xenko/Xenko.csproj
index a5c7ac864e..9d048a6201 100644
--- a/sources/engine/Xenko/Xenko.csproj
+++ b/sources/engine/Xenko/Xenko.csproj
@@ -1,13 +1,11 @@
 <Project>
-
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandardNoRuntimeIdentifiers>true</XenkoRuntimeNetStandardNoRuntimeIdentifiers>
   </PropertyGroup>
 
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
@@ -38,9 +36,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj" />
     <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj" />
-    <!-- SharpDX is needed for WIC -->
-    <PackageReference Include="SharpDX.Direct2D1" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'UWP'" />
-    <PackageReference Include="System.Drawing.Common" Version="4.5.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'Linux'" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'Linux'" />
   </ItemGroup>
 
   <ItemGroup>
@@ -55,6 +51,8 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <ItemGroup>
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/sources/engine/Xenko/runtime.json b/sources/engine/Xenko/runtime.json
index b7b6768647..849f359755 100644
--- a/sources/engine/Xenko/runtime.json
+++ b/sources/engine/Xenko/runtime.json
@@ -1,17 +1,5 @@
 {
   "runtimes": {
-    "win": {
-      "#import": [
-        "win-d3d11",
-        "any"
-      ]
-    },
-    "linux": {
-      "#import": [
-        "linux-opengl",
-        "unix"
-      ]
-    },
     "win-d3d11": {
       "#import": [
         "win"
@@ -29,57 +17,6 @@
         "win-x64"
       ]
     },
-    "win-d3d12": {
-      "#import": [
-        "win"
-      ]
-    },
-    "win-d3d12-x86": {
-      "#import": [
-        "win-d3d12",
-        "win-x86"
-      ]
-    },
-    "win-d3d12-x64": {
-      "#import": [
-        "win-d3d12",
-        "win-x64"
-      ]
-    },
-    "win-opengl": {
-      "#import": [
-        "win"
-      ]
-    },
-    "win-opengl-x86": {
-      "#import": [
-        "win-opengl",
-        "win-x86"
-      ]
-    },
-    "win-opengl-x64": {
-      "#import": [
-        "win-opengl",
-        "win-x64"
-      ]
-    },
-    "win-opengles": {
-      "#import": [
-        "win"
-      ]
-    },
-    "win-opengles-x86": {
-      "#import": [
-        "win-opengles",
-        "win-x86"
-      ]
-    },
-    "win-opengles-x64": {
-      "#import": [
-        "win-opengles",
-        "win-x64"
-      ]
-    },
     "win-vulkan": {
       "#import": [
         "win"
@@ -115,60 +52,6 @@
         "win7-x64"
       ]
     },
-    "win7-d3d12": {
-      "#import": [
-        "win-d3d12",
-        "win7"
-      ]
-    },
-    "win7-d3d12-x86": {
-      "#import": [
-        "win7-d3d12",
-        "win7-x86"
-      ]
-    },
-    "win7-d3d12-x64": {
-      "#import": [
-        "win7-d3d12",
-        "win7-x64"
-      ]
-    },
-    "win7-opengl": {
-      "#import": [
-        "win-opengl",
-        "win7"
-      ]
-    },
-    "win7-opengl-x86": {
-      "#import": [
-        "win7-opengl",
-        "win7-x86"
-      ]
-    },
-    "win7-opengl-x64": {
-      "#import": [
-        "win7-opengl",
-        "win7-x64"
-      ]
-    },
-    "win7-opengles": {
-      "#import": [
-        "win-opengles",
-        "win7"
-      ]
-    },
-    "win7-opengles-x86": {
-      "#import": [
-        "win7-opengles",
-        "win7-x86"
-      ]
-    },
-    "win7-opengles-x64": {
-      "#import": [
-        "win7-opengles",
-        "win7-x64"
-      ]
-    },
     "win7-vulkan": {
       "#import": [
         "win-vulkan",
@@ -205,95 +88,7 @@
         "win10-x64"
       ]
     },
-    "win10-d3d12": {
-      "#import": [
-        "win-d3d12",
-        "win10"
-      ]
-    },
-    "win10-d3d12-x86": {
-      "#import": [
-        "win10-d3d12",
-        "win10-x86"
-      ]
-    },
-    "win10-d3d12-x64": {
-      "#import": [
-        "win10-d3d12",
-        "win10-x64"
-      ]
-    },
-    "win10-opengl": {
-      "#import": [
-        "win-opengl",
-        "win10"
-      ]
-    },
-    "win10-opengl-x86": {
-      "#import": [
-        "win10-opengl",
-        "win10-x86"
-      ]
-    },
-    "win10-opengl-x64": {
-      "#import": [
-        "win10-opengl",
-        "win10-x64"
-      ]
-    },
-    "win10-opengles": {
-      "#import": [
-        "win-opengles",
-        "win10"
-      ]
-    },
-    "win10-opengles-x86": {
-      "#import": [
-        "win10-opengles",
-        "win10-x86"
-      ]
-    },
-    "win10-opengles-x64": {
-      "#import": [
-        "win10-opengles",
-        "win10-x64"
-      ]
-    },
-    "win10-vulkan": {
-      "#import": [
-        "win-vulkan",
-        "win10"
-      ]
-    },
-    "win10-vulkan-x86": {
-      "#import": [
-        "win10-vulkan",
-        "win10-x86"
-      ]
-    },
-    "win10-vulkan-x64": {
-      "#import": [
-        "win10-vulkan",
-        "win10-x64"
-      ]
-    },
-    "linux-opengl": {
-      "#import": [
-        "linux"
-      ]
-    },
-    "linux-opengl-x64": {
-      "#import": [
-        "linux-opengl",
-        "linux-x64"
-      ]
-    },
-    "linux-vulkan": {
-      "#import": [
-        "linux"
-      ]
-    },
-    "linux-vulkan-x64": {
+    "linux": {
       "#import": [
         "linux-vulkan",
         "linux-x64"
diff --git a/sources/engine/Xenko/runtime.tt b/sources/engine/Xenko/runtime.tt
index 6fe7a121ee..0a220aa078 100644
--- a/sources/engine/Xenko/runtime.tt
+++ b/sources/engine/Xenko/runtime.tt
@@ -6,22 +6,9 @@
 <#@ output extension=".json" #>
 {
   "runtimes": {
-<# // Redefine defaults #>
-    "win": {
-      "#import": [
-        "win-d3d11",
-        "any"
-      ]
-    },
-    "linux": {
-      "#import": [
-        "linux-opengl",
-        "unix"
-      ]
-    },
 <# foreach (var platform in new[] { "win", "win7", "win10", "linux" })
    {
-     foreach (var graphicsPlatform in platform.StartsWith("win") ? new[] { "d3d11", "d3d12", "opengl", "opengles", "vulkan" } : new[] { "opengl", "vulkan" })
+     foreach (var graphicsPlatform in platform.StartsWith("win") ? new[] { "d3d11", "vulkan" } : new[] { "vulkan" })
      {
        var platformForGraphicsPlatformVariant = platform.StartsWith("win") ? "win" : platform;
        foreach (var cpuVariant in platform.StartsWith("win") ? new[] { string.Empty, "-x86", "-x64" } : new[] { string.Empty, "-x64" })
diff --git a/sources/launcher/Prerequisites/launcher-prerequisites.aip b/sources/launcher/Prerequisites/launcher-prerequisites.aip
index f71c7fff13..17c5cabcb2 100644
--- a/sources/launcher/Prerequisites/launcher-prerequisites.aip
+++ b/sources/launcher/Prerequisites/launcher-prerequisites.aip
@@ -51,7 +51,7 @@
     <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba Subject: Silicon Studio Corporation&#10;Issuer: COMODO RSA Code Signing CA&#10;Valid from 10/02/2014 to 10/03/2019"/>
+    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="edad2b260091eacffbc42859d0339c74b263bfec Subject: vvvv - Dießl &amp; Gregor GbR&#10;Issuer: Sectigo RSA Code Signing CA&#10;Valid from 08/10/2019 to 07/25/2020"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
     <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
diff --git a/sources/launcher/Setup/Logo.ico b/sources/launcher/Setup/Logo.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/launcher/Setup/Logo.ico and b/sources/launcher/Setup/Logo.ico differ
diff --git a/sources/launcher/Setup/XenkoLogoNoTextWhite.png b/sources/launcher/Setup/XenkoLogoNoTextWhite.png
index 1740c14a22..94cc23f633 100644
--- a/sources/launcher/Setup/XenkoLogoNoTextWhite.png
+++ b/sources/launcher/Setup/XenkoLogoNoTextWhite.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20adab96a3d460bce8ec7cd3e6b4978399ea92226a4ff8fbf52a379ae8bb6915
-size 1161
+oid sha256:fe5074d3dd03e0e6fbc200e5e5d4d52d9b2b44f20e16f147dc3b62b97a58b9e1
+size 74851
diff --git a/sources/launcher/Setup/insticon.ico b/sources/launcher/Setup/insticon.ico
index fdf03a32a7..cf8c0e9594 100644
Binary files a/sources/launcher/Setup/insticon.ico and b/sources/launcher/Setup/insticon.ico differ
diff --git a/sources/launcher/Setup/setup.aip b/sources/launcher/Setup/setup.aip
index 09eaf2f8be..be7fc7d933 100644
--- a/sources/launcher/Setup/setup.aip
+++ b/sources/launcher/Setup/setup.aip
@@ -98,7 +98,7 @@
     <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba Subject: Silicon Studio Corporation&#10;Issuer: COMODO RSA Code Signing CA&#10;Valid from 10/02/2014 to 10/03/2019"/>
+    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="edad2b260091eacffbc42859d0339c74b263bfec Subject: vvvv - Dießl &amp; Gregor GbR&#10;Issuer: Sectigo RSA Code Signing CA&#10;Valid from 08/10/2019 to 07/25/2020"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
     <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
diff --git a/sources/launcher/Xenko.Launcher/Resources/EditorIcon.png b/sources/launcher/Xenko.Launcher/Resources/EditorIcon.png
index 75cd35bf1e..4b5059507f 100644
--- a/sources/launcher/Xenko.Launcher/Resources/EditorIcon.png
+++ b/sources/launcher/Xenko.Launcher/Resources/EditorIcon.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:742c263d0eb2267168a1eb47ffcf278e9aafa16c8bab6a5758fad8e932e78310
-size 340
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/launcher/Xenko.Launcher/Resources/Logo.ico b/sources/launcher/Xenko.Launcher/Resources/Logo.ico
index 4e896766ac..cf8c0e9594 100644
Binary files a/sources/launcher/Xenko.Launcher/Resources/Logo.ico and b/sources/launcher/Xenko.Launcher/Resources/Logo.ico differ
diff --git a/sources/launcher/Xenko.Launcher/Resources/Strings.Designer.cs b/sources/launcher/Xenko.Launcher/Resources/Strings.Designer.cs
index bd85dda4f4..9e48237268 100644
--- a/sources/launcher/Xenko.Launcher/Resources/Strings.Designer.cs
+++ b/sources/launcher/Xenko.Launcher/Resources/Strings.Designer.cs
@@ -19,7 +19,7 @@ namespace Xenko.LauncherApp.Resources {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Strings {
@@ -312,6 +312,15 @@ public static string InstallLatestVersion {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Install {0}.
+        /// </summary>
+        public static string InstallVersion {
+            get {
+                return ResourceManager.GetString("InstallVersion", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Xenko launcher.
         /// </summary>
diff --git a/sources/launcher/Xenko.Launcher/Resources/Strings.resx b/sources/launcher/Xenko.Launcher/Resources/Strings.resx
index 5bed38117e..061b5d64c8 100644
--- a/sources/launcher/Xenko.Launcher/Resources/Strings.resx
+++ b/sources/launcher/Xenko.Launcher/Resources/Strings.resx
@@ -422,4 +422,8 @@
     <value>Open '{0}'</value>
     <comment>The tooltip for website links.</comment>
   </data>
-</root>
\ No newline at end of file
+  <data name="InstallVersion" xml:space="preserve">
+    <value>Install {0}</value>
+    <comment>{0}: long version name</comment>
+  </data>
+</root>
diff --git a/sources/launcher/Xenko.Launcher/Resources/list-26.png b/sources/launcher/Xenko.Launcher/Resources/list-26.png
new file mode 100644
index 0000000000..0150452383
--- /dev/null
+++ b/sources/launcher/Xenko.Launcher/Resources/list-26.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff001a3184d887221f1b393d929b8f5a3444786e98edbfd821c67d33ee426574
+size 242
diff --git a/sources/launcher/Xenko.Launcher/ViewModels/DocumentationPageViewModel.cs b/sources/launcher/Xenko.Launcher/ViewModels/DocumentationPageViewModel.cs
index cb414cdbfc..b6ea222a4e 100644
--- a/sources/launcher/Xenko.Launcher/ViewModels/DocumentationPageViewModel.cs
+++ b/sources/launcher/Xenko.Launcher/ViewModels/DocumentationPageViewModel.cs
@@ -31,7 +31,7 @@ private async Task OpenUrl()
         {
             try
             {
-                Process.Start(Url);
+                Process.Start(new ProcessStartInfo(Url) { UseShellExecute = true });
             }
             catch (Exception)
             {
diff --git a/sources/launcher/Xenko.Launcher/ViewModels/LauncherViewModel.cs b/sources/launcher/Xenko.Launcher/ViewModels/LauncherViewModel.cs
index f49503ed95..19507bceda 100644
--- a/sources/launcher/Xenko.Launcher/ViewModels/LauncherViewModel.cs
+++ b/sources/launcher/Xenko.Launcher/ViewModels/LauncherViewModel.cs
@@ -93,7 +93,7 @@ public void Dispose()
 
         public VsixVersionViewModel VsixPackage { get; }
 
-        public XenkoVersionViewModel ActiveVersion { get { return activeVersion; } set { SetValue(ref activeVersion, value, () => Dispatcher.InvokeAsync(() => StartStudioCommand.IsEnabled = (value != null))); } }
+        public XenkoVersionViewModel ActiveVersion { get { return activeVersion; } set { SetValue(ref activeVersion, value); Dispatcher.InvokeAsync(() => StartStudioCommand.IsEnabled = (value != null) && value.CanStart); } }
 
         public ObservableList<RecentProjectViewModel> RecentProjects { get; } = new ObservableList<RecentProjectViewModel>();
 
@@ -195,7 +195,6 @@ public async Task RetrieveAllXenkoVersions()
             await RetrieveLocalXenkoVersions();
             await RetrieveServerXenkoVersions();
             Dispatcher.Invoke(() => IsSynchronizing = false);
-
         }
 
         public async Task RetrieveLocalXenkoVersions()
@@ -231,7 +230,7 @@ public async Task RetrieveLocalXenkoVersions()
                             {
                                 version = (XenkoStoreVersionViewModel)xenkoVersions[index];
                             }
-                            version.UpdateLocalPackage(localPackage);
+                            version.UpdateLocalPackage(localPackage, package);
                             updatedLocalPackages.Add(version);
                         }
                     }
@@ -240,7 +239,7 @@ public async Task RetrieveLocalXenkoVersions()
                     Dispatcher.Invoke(() =>
                     {
                         foreach (var xenkoUninstalledVersion in xenkoVersions.OfType<XenkoStoreVersionViewModel>().Where(x => !updatedLocalPackages.Contains(x)))
-                            xenkoUninstalledVersion.UpdateLocalPackage(null);
+                            xenkoUninstalledVersion.UpdateLocalPackage(null, new NugetLocalPackage[0]);
                     });
 
                     // Update the active version if it is now invalid.
@@ -368,7 +367,7 @@ private async Task RetrieveServerXenkoVersions()
                                 // If yes, update it and remove it from the list of old version
                                 version = (XenkoStoreVersionViewModel)xenkoVersions[index];
                             }
-                            version.UpdateServerPackage(serverPackage);
+                            version.UpdateServerPackage(serverPackage, package);
                         }
                     }
                 }
@@ -516,7 +515,7 @@ public async Task StartStudio(string argument)
             await Task.Delay(5000);
             Dispatcher.Invoke(() =>
             {
-                StartStudioCommand.IsEnabled = ActiveVersion != null;
+                StartStudioCommand.IsEnabled = ActiveVersion != null && ActiveVersion.CanStart;
                 //Save settings because launcher maybe have not been closed
                 LauncherSettings.ActiveVersion = ActiveVersion != null ? ActiveVersion.Name : "";
                 LauncherSettings.Save();
@@ -543,7 +542,7 @@ private async Task OpenUrl(string url)
         {
             try
             {
-                Process.Start(url);
+                Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
             }
             // FIXME: catch only specific exceptions?
             catch (Exception)
diff --git a/sources/launcher/Xenko.Launcher/ViewModels/NewsPageViewModel.cs b/sources/launcher/Xenko.Launcher/ViewModels/NewsPageViewModel.cs
index 1750d4fa53..ade8a7b675 100644
--- a/sources/launcher/Xenko.Launcher/ViewModels/NewsPageViewModel.cs
+++ b/sources/launcher/Xenko.Launcher/ViewModels/NewsPageViewModel.cs
@@ -27,7 +27,7 @@ private async Task OpenUrl()
         {
             try
             {
-                Process.Start(Url);
+                Process.Start(new ProcessStartInfo(Url) { UseShellExecute = true });
             }
             catch (Exception)
             {
diff --git a/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreAlternateVersionViewModel.cs b/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreAlternateVersionViewModel.cs
new file mode 100644
index 0000000000..2f6904d6db
--- /dev/null
+++ b/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreAlternateVersionViewModel.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Core;
+using Xenko.Core.Annotations;
+using Xenko.Core.Packages;
+using Xenko.Core.Presentation.Commands;
+using Xenko.Core.Presentation.ViewModel;
+
+namespace Xenko.LauncherApp.ViewModels
+{
+    internal sealed class XenkoStoreAlternateVersionViewModel : DispatcherViewModel
+    {
+        private XenkoStoreVersionViewModel xenkoVersion;
+        internal NugetServerPackage ServerPackage;
+        internal NugetLocalPackage LocalPackage;
+
+        public XenkoStoreAlternateVersionViewModel([NotNull] XenkoStoreVersionViewModel xenkoVersion)
+            : base(xenkoVersion.ServiceProvider)
+        {
+            this.xenkoVersion = xenkoVersion;
+
+            SetAsActiveCommand = new AnonymousCommand(ServiceProvider, () =>
+            {
+                xenkoVersion.UpdateLocalPackage(LocalPackage, null);
+                if (LocalPackage == null)
+                {
+                    // If it's a non installed version, offer same version for serverPackage so that it offers to install this specific version
+                    xenkoVersion.UpdateServerPackage(ServerPackage, null);
+                }
+                else
+                {
+                    // Otherwise, offer latest version for update
+                    xenkoVersion.UpdateServerPackage(xenkoVersion.LatestServerPackage, null);
+                }
+
+                xenkoVersion.Launcher.ActiveVersion = xenkoVersion;
+            });
+        }
+
+        /// <summary>
+        /// Gets the command that will set the associated version as active.
+        /// </summary>
+        public CommandBase SetAsActiveCommand { get; }
+
+        public string FullName
+        {
+            get
+            {
+                if (LocalPackage != null)
+                    return $"{LocalPackage.Id} {LocalPackage.Version} (installed)";
+                return $"{ServerPackage.Id} {ServerPackage.Version}";
+            }
+        }
+
+        public PackageVersion Version => LocalPackage?.Version ?? ServerPackage.Version;
+
+        internal void UpdateLocalPackage(NugetLocalPackage package)
+        {
+            OnPropertyChanging(nameof(FullName), nameof(Version));
+            LocalPackage = package;
+            OnPropertyChanged(nameof(FullName), nameof(Version));
+        }
+
+        internal void UpdateServerPackage(NugetServerPackage package)
+        {
+            OnPropertyChanging(nameof(FullName), nameof(Version));
+            ServerPackage = package;
+            OnPropertyChanged(nameof(FullName), nameof(Version));
+        }
+    }
+}
diff --git a/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreVersionViewModel.cs b/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreVersionViewModel.cs
index 66b4fcac46..930e3d64f5 100644
--- a/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreVersionViewModel.cs
+++ b/sources/launcher/Xenko.Launcher/ViewModels/XenkoStoreVersionViewModel.cs
@@ -12,6 +12,8 @@
 using Xenko.Core.Presentation.Collections;
 using Xenko.Core.Presentation.Commands;
 using Xenko.Core.Presentation.Services;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Xenko.LauncherApp.ViewModels
 {
@@ -20,6 +22,7 @@ namespace Xenko.LauncherApp.ViewModels
     /// </summary>
     internal sealed class XenkoStoreVersionViewModel : XenkoVersionViewModel
     {
+        internal NugetServerPackage LatestServerPackage;
         private ReleaseNotesViewModel releaseNotes;
 
         /// <summary>
@@ -57,6 +60,8 @@ public override string FullName
         /// </summary>
         public string ServerVersionFullName => ServerPackage?.Version?.ToString() ?? "";
 
+        public ObservableList<XenkoStoreAlternateVersionViewModel> AlternateVersions { get; } = new ObservableList<XenkoStoreAlternateVersionViewModel>();
+
         /// <summary>
         /// Gets the release notes associated to this version.
         /// </summary>
@@ -77,22 +82,82 @@ public override string FullName
         /// Updates the local package of this version.
         /// </summary>
         /// <param name="package">The local package corresponding to this version.</param>
-        internal void UpdateLocalPackage(NugetLocalPackage package)
+        internal void UpdateLocalPackage(NugetLocalPackage package, IEnumerable<NugetLocalPackage> alternateVersions)
         {
             OnPropertyChanging(nameof(FullName), nameof(Version));
             LocalPackage = package;
             OnPropertyChanged(nameof(FullName), nameof(Version));
             Dispatcher.Invoke(UpdateStatus);
+            if (alternateVersions != null)
+            {
+                Dispatcher.Invoke(() =>
+                    UpdateAlternateVersions(alternateVersions, (alternateVersionViewModel, alternateVersion) =>
+                    {
+                        if (alternateVersion == null && alternateVersionViewModel.ServerPackage == null)
+                            AlternateVersions.Remove(alternateVersionViewModel);
+                        else
+                            alternateVersionViewModel.UpdateLocalPackage(alternateVersion);
+                    }));
+            }
         }
 
         /// <summary>
         /// Updates the server package of this version.
         /// </summary>
         /// <param name="package">The server package corresponding to this version.</param>
-        internal void UpdateServerPackage(NugetServerPackage package)
+        internal void UpdateServerPackage(NugetServerPackage package, IEnumerable<NugetServerPackage> alternateVersions)
         {
+            OnPropertyChanging(nameof(FullName), nameof(Version));
             ServerPackage = package;
+            OnPropertyChanged(nameof(FullName), nameof(Version));
+
+            // Always keep track of highest version
+            if (ServerPackage != null && (LatestServerPackage == null || LatestServerPackage.Version < ServerPackage.Version))
+                LatestServerPackage = ServerPackage;
+
             Dispatcher.Invoke(UpdateStatus);
+            if (alternateVersions != null)
+            {
+                Dispatcher.Invoke(() =>
+                    UpdateAlternateVersions(alternateVersions, (alternateVersionViewModel, alternateVersion) =>
+                    {
+                        if (alternateVersion == null && alternateVersionViewModel.LocalPackage == null)
+                            AlternateVersions.Remove(alternateVersionViewModel);
+                        else
+                            alternateVersionViewModel.UpdateServerPackage(alternateVersion);
+                    }));
+            }
+        }
+
+        private void UpdateAlternateVersions<T>(IEnumerable<T> alternateVersions, Action<XenkoStoreAlternateVersionViewModel, T> updateAction) where T : NugetPackage
+        {
+            var updatedViewModels = new HashSet<XenkoStoreAlternateVersionViewModel>();
+            foreach (var alternateVersion in alternateVersions)
+            {
+
+                int index = AlternateVersions.IndexOf(x => x.Version == alternateVersion.Version);
+                XenkoStoreAlternateVersionViewModel alternateVersionViewModel;
+                if (index < 0)
+                {
+                    // If not, add it
+                    alternateVersionViewModel = new XenkoStoreAlternateVersionViewModel(this);
+                    AlternateVersions.Add(alternateVersionViewModel);
+                }
+                else
+                {
+                    // If yes, update it and remove it from the list of old version
+                    alternateVersionViewModel = AlternateVersions[index];
+                }
+
+                updateAction(alternateVersionViewModel, alternateVersion);
+                updatedViewModels.Add(alternateVersionViewModel);
+            }
+
+            // Update versions that are not installed locally anymore
+            foreach (var alternateVersionViewModel in AlternateVersions.Where(x => !updatedViewModels.Contains(x)).ToList())
+            {
+                updateAction(alternateVersionViewModel, null);
+            }
         }
 
         internal async Task RunPrerequisitesInstaller()
@@ -183,6 +248,8 @@ protected override void AfterDownload()
         {
             base.AfterDownload();
             RunPrerequisitesInstaller().Forget();
+
+            Launcher.ActiveVersion = this;
         }
 
         /// <summary>
diff --git a/sources/launcher/Xenko.Launcher/ViewModels/XenkoVersionViewModel.cs b/sources/launcher/Xenko.Launcher/ViewModels/XenkoVersionViewModel.cs
index 380f187d2a..96d0d72616 100644
--- a/sources/launcher/Xenko.Launcher/ViewModels/XenkoVersionViewModel.cs
+++ b/sources/launcher/Xenko.Launcher/ViewModels/XenkoVersionViewModel.cs
@@ -12,6 +12,7 @@ namespace Xenko.LauncherApp.ViewModels
     internal abstract class XenkoVersionViewModel : PackageVersionViewModel, IComparable<XenkoVersionViewModel>, IComparable<Tuple<int, int>>
     {
         private bool isVisible;
+        private bool canStart;
 
         internal XenkoVersionViewModel(LauncherViewModel launcher, NugetStore store, NugetLocalPackage localPackage, int major, int minor)
             : base(launcher, store, localPackage)
@@ -58,6 +59,11 @@ internal XenkoVersionViewModel(LauncherViewModel launcher, NugetStore store, Nug
         /// </summary>
         public bool IsVisible { get { return isVisible; } private set { SetValue(ref isVisible, value); } }
 
+        /// <summary>
+        /// Gets whether this version can be started.
+        /// </summary>
+        public bool CanStart { get { return canStart; } private set { SetValue(ref canStart, value); } }
+
         /// <summary>
         /// Builds a string that represents the given version numbers.
         /// </summary>
@@ -92,6 +98,9 @@ protected override void UpdateStatus()
             IsVisible = Launcher.ShowBetaVersions || !IsBeta || CanDelete;
             SetAsActiveCommand.IsEnabled = CanDelete;
             DeleteCommand.IsEnabled = CanDelete;
+            CanStart = CanDelete;
+            if (Launcher.ActiveVersion == this)
+                Launcher.StartStudioCommand.IsEnabled = CanStart;
         }
 
         public int CompareTo(XenkoVersionViewModel other)
diff --git a/sources/launcher/Xenko.Launcher/Views/Commands.cs b/sources/launcher/Xenko.Launcher/Views/Commands.cs
index 0689c33fd7..f88d6624aa 100644
--- a/sources/launcher/Xenko.Launcher/Views/Commands.cs
+++ b/sources/launcher/Xenko.Launcher/Views/Commands.cs
@@ -37,7 +37,7 @@ private static void OpenHyperlink([NotNull] string url)
             try
             {
                 // Make sure we open proper HTML pages
-                Process.Start(url.ReplaceLast(".md", ".html"));
+                Process.Start(new ProcessStartInfo(url.ReplaceLast(".md", ".html")) { UseShellExecute = true });
             }
             catch (System.ComponentModel.Win32Exception e)
             {
diff --git a/sources/launcher/Xenko.Launcher/Views/LauncherWindow.xaml b/sources/launcher/Xenko.Launcher/Views/LauncherWindow.xaml
index 1285e1494e..bf84fe5cf4 100644
--- a/sources/launcher/Xenko.Launcher/Views/LauncherWindow.xaml
+++ b/sources/launcher/Xenko.Launcher/Views/LauncherWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:vm="clr-namespace:Xenko.LauncherApp.ViewModels"
         xmlns:sskk="http://schemas.xenko.com/xaml/presentation"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+        xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:services="clr-namespace:Xenko.LauncherApp.Services"
         xmlns:s="clr-namespace:System;assembly=mscorlib"
         xmlns:r="clr-namespace:Xenko.LauncherApp.Resources"
@@ -39,6 +39,7 @@
       <BitmapImage x:Key="ImageDelete" UriSource="pack://application:,,,/Xenko.Launcher;component/Resources/delete-26-dark.png"/>
       <BitmapImage x:Key="ImageUpgrade" UriSource="pack://application:,,,/Xenko.Launcher;component/Resources/upgrade-16.png"/>
       <BitmapImage x:Key="ImageReleaseNotes" UriSource="pack://application:,,,/Xenko.Launcher;component/Resources/note-26-dark.png"/>
+      <BitmapImage x:Key="ImageListVersions" UriSource="pack://application:,,,/Xenko.Launcher;component/Resources/list-26.png"/>
       <BitmapImage x:Key="ImageBackground" UriSource="pack://application:,,,/Xenko.Launcher;component/Resources/Robot.jpg"/>
 
       <s:Double x:Key="ReleaseNotesMargin">20</s:Double>
@@ -51,6 +52,8 @@
       <SolidColorBrush x:Key="EmphasisButtonBackground" Color="#900520"/>
       <Color x:Key="EmphasisButtonHoverColor">#DA0830</Color>
 
+      <Style TargetType="{x:Type l:StaysOpenContextMenu}" BasedOn="{StaticResource {x:Type ContextMenu}}"/>
+
       <DataTemplate DataType="{x:Type vm:XenkoDevVersionViewModel}">
         <DockPanel Margin="0,2" Height="32" SnapsToDevicePixels="True" Background="{StaticResource TileAlphaBackgroundBrush}"
                    Visibility="{Binding IsVisible, Converter={sskk:VisibleOrCollapsed}, Mode=OneWay}">
@@ -79,6 +82,10 @@
         </DockPanel>
       </DataTemplate>
 
+      <DataTemplate DataType="{x:Type vm:XenkoStoreAlternateVersionViewModel}">
+        <TextBlock Text="ASD" />
+      </DataTemplate>
+
       <DataTemplate DataType="{x:Type vm:XenkoStoreVersionViewModel}">
         <DockPanel Margin="0,2" Height="32" SnapsToDevicePixels="True" Background="{StaticResource TileAlphaBackgroundBrush}"
                    Visibility="{Binding IsVisible, Converter={sskk:VisibleOrCollapsed}, Mode=OneWay}">
@@ -117,6 +124,34 @@
                                                        DefaultValue="{x:Static r:Strings.ToolTipDefault}"/>
               </i:Interaction.Behaviors>
             </Button>
+            <!-- ALTERNATE VERSIONS -->
+            <ToggleButton x:Name="Toggle" Content="{sskk:Image {StaticResource ImageListVersions}, 20, 20}" Width="32" Height="32"
+                ToolTipService.IsEnabled="False" ToolTip="Install another version" Margin="4,0,0,0"/>
+            <Popup IsOpen="{Binding IsChecked, ElementName=Toggle, Mode=TwoWay}" StaysOpen="False" AllowsTransparency="True">
+              <Border Margin="6" Background="{StaticResource ControlBackgroundBrush}"
+                BorderBrush="{StaticResource NormalBrush}" BorderThickness="1">
+                <Border.Effect>
+                  <DropShadowEffect BlurRadius="5" Opacity="0.4"/>
+                </Border.Effect>
+                <Menu ItemsSource="{Binding AlternateVersions}">
+                  <Menu.ItemsPanel>
+                    <ItemsPanelTemplate>
+                      <StackPanel Orientation="Vertical"/>
+                    </ItemsPanelTemplate>
+                  </Menu.ItemsPanel>
+                  <Menu.ItemTemplate>
+                    <DataTemplate>
+                      <MenuItem Header="{Binding FullName, Converter={sskk:FormatString}, ConverterParameter={x:Static r:Strings.ToolTipSetActiveVersion}}"
+                                Command="{Binding SetAsActiveCommand}">
+                        <i:Interaction.Behaviors>
+                          <sskk:OnEventSetPropertyBehavior EventName="Click" EventOwnerType="MenuItem" Target="{Binding ElementName=Toggle}" Property="ToggleButton.IsChecked" Value="{sskk:False}" />
+                        </i:Interaction.Behaviors>
+                      </MenuItem>
+                    </DataTemplate>
+                  </Menu.ItemTemplate>
+                </Menu>
+              </Border>
+            </Popup>
           </StackPanel>
           <!-- RELEASE NOTES BUTTON -->
           <Button Content="{sskk:Image {StaticResource ImageReleaseNotes}, 20, 20}" Width="32" Height="32"
@@ -398,12 +433,13 @@
               <Border BorderBrush="{StaticResource TileBorderBrush}" BorderThickness="{StaticResource TileBorderThickness}" DockPanel.Dock="Top">
                 <StackPanel>
                   <Grid Height="48">
+                    <!-- Launch game studio -->
                     <Button IsEnabled="{sskk:MultiBinding {Binding ActiveVersion.IsProcessing, Converter={sskk:InvertBool}},
                           {Binding StartStudioCommand.IsEnabled}, Converter={sskk:AndMultiConverter}}"
                           Command="{Binding StartStudioCommand}" Content="{Binding ActiveVersion.FullName}"
                           HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextBlock.FontSize="24"
                           ContentStringFormat="{x:Static r:Strings.StartVersion}" Background="{StaticResource EmphasisButtonBackground}" ToolTipService.IsEnabled="False"
-                          Visibility="{Binding ActiveVersion, Converter={sskk:Chained {sskk:ObjectToBool}, {sskk:VisibleOrCollapsed}}}"
+                          Visibility="{Binding ActiveVersion.CanStart, Converter={sskk:VisibleOrCollapsed}}"
                           ToolTip="{Binding ActiveVersion.FullName, Converter={sskk:FormatString}, ConverterParameter={x:Static r:Strings.ToolTipStartButton}}">
                       <Button.Resources>
                         <!-- ReSharper disable once Xaml.RedundantResource - Overriding hovered color from theme-->
@@ -414,6 +450,24 @@
                                                                                DefaultValue="{x:Static r:Strings.ToolTipDefault}"/>
                       </i:Interaction.Behaviors>
                     </Button>
+                    <!-- Install specific version -->
+                    <Button IsEnabled="{sskk:MultiBinding {Binding ActiveVersion.IsProcessing, Converter={sskk:InvertBool}},
+                          {Binding ActiveVersion.DownloadCommand.IsEnabled}, Converter={sskk:AndMultiConverter}}"
+                          Command="{Binding ActiveVersion.DownloadCommand}" Content="{Binding ActiveVersion.FullName}"
+                          HorizontalAlignment="Stretch" VerticalAlignment="Stretch" TextBlock.FontSize="24"
+                          ContentStringFormat="{x:Static r:Strings.InstallVersion}" Background="{StaticResource EmphasisButtonBackground}" ToolTipService.IsEnabled="False"
+                          Visibility="{sskk:MultiBinding {Binding ActiveVersion.DownloadCommand.IsEnabled}, {Binding ActiveVersion.CanStart, Converter={sskk:InvertBool}}, Converter={sskk:MultiChained {sskk:AndMultiConverter}, {sskk:VisibleOrCollapsed}}}"
+                          ToolTip="{Binding ActiveVersion.FullName, Converter={sskk:FormatString}, ConverterParameter={x:Static r:Strings.ToolTipDownload}}">
+                      <Button.Resources>
+                        <!-- ReSharper disable once Xaml.RedundantResource - Overriding hovered color from theme-->
+                        <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="{StaticResource EmphasisButtonHoverColor}"/>
+                      </Button.Resources>
+                      <i:Interaction.Behaviors>
+                        <sskk:BindCurrentToolTipStringBehavior ToolTipTarget="{Binding CurrentToolTip}"
+                                                                               DefaultValue="{x:Static r:Strings.ToolTipDefault}"/>
+                      </i:Interaction.Behaviors>
+                    </Button>
+                    <!-- Install latest version (nothing installed) -->
                     <Button IsEnabled="{sskk:MultiBinding {Binding IsSynchronizing, Converter={sskk:InvertBool}},
                           {Binding InstallLatestVersionCommand.IsEnabled}, Converter={sskk:AndMultiConverter}}"
                           Command="{Binding InstallLatestVersionCommand}" Content="{x:Static r:Strings.InstallLatestVersion}"
diff --git a/sources/launcher/Xenko.Launcher/Views/StaysOpenContextMenu.cs b/sources/launcher/Xenko.Launcher/Views/StaysOpenContextMenu.cs
new file mode 100644
index 0000000000..12eddc2905
--- /dev/null
+++ b/sources/launcher/Xenko.Launcher/Views/StaysOpenContextMenu.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xenko.LauncherApp.Views
+{
+    public class StaysOpenContextMenu : ContextMenu
+    {
+        private bool mustStayOpen;
+
+        static StaysOpenContextMenu()
+        {
+            IsOpenProperty.OverrideMetadata(
+                typeof(StaysOpenContextMenu),
+                new FrameworkPropertyMetadata(false, null, CoerceIsOpen));
+            StaysOpenProperty.OverrideMetadata(
+                typeof(StaysOpenContextMenu),
+                new FrameworkPropertyMetadata(false, PropertyChanged, CoerceStaysOpen));
+        }
+
+        private static void PropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            StaysOpenContextMenu menu = (StaysOpenContextMenu)d;
+            menu.mustStayOpen = (bool)e.NewValue;
+        }
+
+        private static object CoerceStaysOpen(DependencyObject d, object basevalue)
+        {
+            d.CoerceValue(IsOpenProperty);
+            return basevalue;
+        }
+
+        private static object CoerceIsOpen(DependencyObject d, object basevalue)
+        {
+            StaysOpenContextMenu menu = (StaysOpenContextMenu)d;
+            if (menu.StaysOpen && menu.mustStayOpen)
+            {
+                return true;
+            }
+
+            return basevalue;
+        }
+
+        public void CloseContextMenu()
+        {
+            this.mustStayOpen = false;
+            this.IsOpen = false;
+        }
+    }
+}
diff --git a/sources/launcher/Xenko.Launcher/Xenko.Launcher.csproj b/sources/launcher/Xenko.Launcher/Xenko.Launcher.csproj
index 0af2fcdcc4..14b8f33b90 100644
--- a/sources/launcher/Xenko.Launcher/Xenko.Launcher.csproj
+++ b/sources/launcher/Xenko.Launcher/Xenko.Launcher.csproj
@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <PublishUrl>publish\</PublishUrl>
@@ -49,6 +49,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Announcements\Release30.md" />
+    <None Remove="Resources\list-26.png" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xenko.Metrics" Version="1.0.0" />
@@ -62,10 +63,6 @@
     </Reference>
     <Reference Include="System.Security" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\deps\ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
@@ -125,6 +122,7 @@
   <ItemGroup>
     <EmbeddedResource Update="Announcements\Release30.md" />
     <Resource Include="Resources\EditorIcon.png" />
+    <Resource Include="Resources\list-26.png" />
     <Resource Include="Resources\update.png" />
     <Resource Include="Resources\roadmap.png" />
     <Resource Include="Resources\survey.png" />
@@ -199,7 +197,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="..\..\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems" Label="Shared" Condition="Exists('..\..\editor\Xenko.PrivacyPolicy\Xenko.PrivacyPolicy.projitems')" />
   <Import Project="..\..\editor\Xenko.Core.MostRecentlyUsedFiles\Xenko.Core.MostRecentlyUsedFiles.projitems" Label="Shared" />
   <Import Project="..\..\assets\Xenko.Core.Assets.Yaml\Xenko.Core.Assets.Yaml.projitems" Label="Shared" />
diff --git a/sources/launcher/Xenko.LauncherApp/Resources/Logo.ico b/sources/launcher/Xenko.LauncherApp/Resources/Logo.ico
index 4e896766ac..cf8c0e9594 100644
Binary files a/sources/launcher/Xenko.LauncherApp/Resources/Logo.ico and b/sources/launcher/Xenko.LauncherApp/Resources/Logo.ico differ
diff --git a/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.csproj b/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.csproj
index 903fd54060..37756352b1 100644
--- a/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.csproj
+++ b/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.csproj
@@ -28,7 +28,7 @@
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
 	
 	<!-- Assembly version for the launcher, used to generate the appropriate nuget package -->
-    <InformationalVersion>3.0.8</InformationalVersion>
+    <InformationalVersion>3.0.9</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.nuspec b/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.nuspec
index a83ebadb4d..89f3e7c9f7 100644
--- a/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.nuspec
+++ b/sources/launcher/Xenko.LauncherApp/Xenko.LauncherApp.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Xenko.Launcher</id>
-    <version>3.0.8</version>
+    <version>3.0.9</version>
     <authors>Xenko</authors>
     <owners>Xenko</owners>
     <licenseUrl>http://xenko.com/license.txt</licenseUrl>
diff --git a/sources/localization/Xenko.Core.Assets.Editor.pot b/sources/localization/Xenko.Core.Assets.Editor.pot
index 822f0390e0..cbc1c771e1 100644
--- a/sources/localization/Xenko.Core.Assets.Editor.pot
+++ b/sources/localization/Xenko.Core.Assets.Editor.pot
@@ -31,7 +31,7 @@ msgstr ""
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs:41
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs:60
 msgctxt "Log"
-msgid "An exception occurred while generating the template."
+msgid "An exception occurred while generating the template. Try clearing the nuget cache or just browse and reopen."
 msgstr ""
 
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml.cs:28
@@ -418,7 +418,7 @@ msgstr ""
 #. Log message displayed when an exception occurs while opening a session.
 #: ../editor/Xenko.Core.Assets.Editor/ViewModel/SessionViewModel.cs:399
 msgctxt "Log"
-msgid "There was a problem opening the solution."
+msgid "There was a problem opening the solution. Try clearing nuget cache."
 msgstr ""
 
 #: ../editor/Xenko.Core.Assets.Editor/ViewModel/SessionViewModel.cs:446
diff --git a/sources/localization/extract_strings.bat b/sources/localization/extract_strings.bat
index 9b7a696dd9..1cceb6cb7a 100644
--- a/sources/localization/extract_strings.bat
+++ b/sources/localization/extract_strings.bat
@@ -1,7 +1,7 @@
 @set SOURCES_DIR=%~dp0..
 @set MSGMERGE=%~dp0..\..\deps\gettext\msgmerge
 @set OUTPUT_DIR=%SOURCES_DIR%\localization
-@set TOOL_DIR=%SOURCES_DIR%\tools\Xenko.Core.Translation.Extractor\bin\Debug\net472
+@set TOOL_DIR=%SOURCES_DIR%\tools\Xenko.Core.Translation.Extractor\bin\Debug\net48
 
 @cd %OUTPUT_DIR%
 
diff --git a/sources/localization/fr/Xenko.Core.Assets.Editor.fr.po b/sources/localization/fr/Xenko.Core.Assets.Editor.fr.po
index 1f4ab0b30f..7ee645cfc1 100644
--- a/sources/localization/fr/Xenko.Core.Assets.Editor.fr.po
+++ b/sources/localization/fr/Xenko.Core.Assets.Editor.fr.po
@@ -32,7 +32,7 @@ msgstr "Opération annulée."
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs:41
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs:60
 msgctxt "Log"
-msgid "An exception occurred while generating the template."
+msgid "An exception occurred while generating the template. Try clearing the nuget cache or just browse and reopen."
 msgstr ""
 
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml.cs:28
diff --git a/sources/localization/ja/Xenko.Core.Assets.Editor.ja.po b/sources/localization/ja/Xenko.Core.Assets.Editor.ja.po
index 5d3e42620f..9516d13fff 100644
--- a/sources/localization/ja/Xenko.Core.Assets.Editor.ja.po
+++ b/sources/localization/ja/Xenko.Core.Assets.Editor.ja.po
@@ -32,7 +32,7 @@ msgstr "この操作は中止しました"
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs:41
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/TemplateGeneratorHelper.cs:60
 msgctxt "Log"
-msgid "An exception occurred while generating the template."
+msgid "An exception occurred while generating the template. Try clearing the nuget cache or just browse and reopen."
 msgstr "テンプレートを作る際に例外が発生しました。"
 
 #: ../editor/Xenko.Core.Assets.Editor/Components/TemplateDescriptions/Views/ProjectSelectionWindow.xaml.cs:28
diff --git a/sources/metrics/Xenko.Metrics/Xenko.Metrics.csproj b/sources/metrics/Xenko.Metrics/Xenko.Metrics.csproj
index fbb645ed1f..0426017852 100644
--- a/sources/metrics/Xenko.Metrics/Xenko.Metrics.csproj
+++ b/sources/metrics/Xenko.Metrics/Xenko.Metrics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sources/native/WindowsProjects/UWP/UWP.vcxproj b/sources/native/WindowsProjects/UWP/UWP.vcxproj
deleted file mode 100644
index 437ac73c4a..0000000000
--- a/sources/native/WindowsProjects/UWP/UWP.vcxproj
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8f5685d5-4aff-4d77-a86b-8fec5c5456a2}</ProjectGuid>
-    <Keyword>DynamicLibrary</Keyword>
-    <ProjectName>$(XenkoNativeOutputName)</ProjectName>
-    <RootNamespace>$(XenkoNativeOutputName)</RootNamespace>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <AppContainerApplication>true</AppContainerApplication>
-    <ApplicationType>Windows Store</ApplicationType>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <WindowsTargetPlatformMinVersion>10.0.16299.0</WindowsTargetPlatformMinVersion>
-    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <IntermediateOutputPath>$(XenkoNativeProjectObjFolder)\</IntermediateOutputPath>
-    <IntDir>$(IntermediateOutputPath)</IntDir>
-    <OutDir>$(XenkoNativeOutputDir)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <GenerateManifest>false</GenerateManifest>
-    <IgnoreImportLibrary>false</IgnoreImportLibrary>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <PrecompiledHeaderFile />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\UWP\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>$(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <PrecompiledHeaderFile />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\UWP\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>$(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <PrecompiledHeaderFile />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\UWP\ARM\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>/INCREMENTAL:NO $(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <PrecompiledHeaderFile />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\UWP\ARM\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>/INCREMENTAL:NO $(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <PrecompiledHeaderFile />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\UWP\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions> $(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <CompileAsWinRT>false</CompileAsWinRT>
-      <PrecompiledHeaderFile />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\UWP\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>$(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Object Include="$(XenkoNativeProjectObjFolder)\*.obj" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/sources/native/WindowsProjects/UWP/UWP.vcxproj.filters b/sources/native/WindowsProjects/UWP/UWP.vcxproj.filters
deleted file mode 100644
index ad1a42783d..0000000000
--- a/sources/native/WindowsProjects/UWP/UWP.vcxproj.filters
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tga;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dllmain.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Object Include="..\..\..\obj\*.obj" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/native/WindowsProjects/UWP/dllmain.cpp b/sources/native/WindowsProjects/UWP/dllmain.cpp
deleted file mode 100644
index 07467335ce..0000000000
--- a/sources/native/WindowsProjects/UWP/dllmain.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <windows.h>
-
-BOOL APIENTRY DllMain(HMODULE /* hModule */, DWORD ul_reason_for_call, LPVOID /* lpReserved */)
-{
-    switch (ul_reason_for_call)
-    {
-    case DLL_PROCESS_ATTACH:
-    case DLL_THREAD_ATTACH:
-    case DLL_THREAD_DETACH:
-    case DLL_PROCESS_DETACH:
-        break;
-    }
-    return TRUE;
-}
diff --git a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj b/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj
index 149abfe738..b6d3b8b048 100644
--- a/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj
+++ b/sources/native/WindowsProjects/WindowsDesktop/WindowsDesktop.vcxproj
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
       <Platform>x64</Platform>
@@ -25,29 +17,16 @@
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -56,12 +35,6 @@
   </ImportGroup>
   <ImportGroup Label="Shared">
   </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
@@ -81,26 +54,6 @@
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;WINDOWSDESKTOP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\Windows\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>$(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <PrecompiledHeader>
@@ -121,29 +74,6 @@
       <AdditionalOptions>$(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WINDOWSDESKTOP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>
-      </AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>$(XenkoDependenciesDir)\NativePath\Windows\x86\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalOptions>$(XenkoNativePathLibs) %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -172,17 +102,11 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </PrecompiledHeader>
-      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+        <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
       </PrecompiledHeader>
       <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+        <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
       </PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
diff --git a/sources/native/Xenko.Native.targets b/sources/native/Xenko.Native.targets
index cd72ca6760..3f064474ba 100644
--- a/sources/native/Xenko.Native.targets
+++ b/sources/native/Xenko.Native.targets
@@ -43,22 +43,18 @@
 
   <!-- Define NEED_DLL_EXPORT for platforms that requires it. -->
   <PropertyGroup>
-    <XenkoNativeClang Condition=" '$(XenkoPlatform)' == 'Windows' OR '$(XenkoPlatform)' == 'UWP' ">$(XenkoNativeClang) -DNEED_DLL_EXPORT</XenkoNativeClang>
+    <XenkoNativeClang Condition=" '$(XenkoPlatform)' == 'Windows'">$(XenkoNativeClang) -DNEED_DLL_EXPORT</XenkoNativeClang>
   </PropertyGroup>
   
   <!-- Define default CPU architectures -->
   <ItemGroup>
-    <XenkoNativeCPU Condition=" '$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP' " Include="x86;x64"/>
-    <XenkoNativeCPU Condition=" '$(XenkoPlatform)' == 'UWP' " Include="ARM"/>
-    <XenkoNativeCPU Condition=" '$(XenkoPlatform)' == 'Android' " Include="arm64-v8a;armeabi-v7a;x86;x86_64"/>
+    <XenkoNativeCPU Condition=" '$(XenkoPlatform)' == 'Windows'" Include="x64"/>
   </ItemGroup>
   
   <!-- Define default dynamic library extensions -->
   <PropertyGroup>
-    <XenkoNativeLibraryTargetExt Condition=" '$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP' ">.dll</XenkoNativeLibraryTargetExt>
-    <XenkoNativeLibraryTargetExt Condition=" '$(XenkoPlatform)' == 'Android' Or '$(XenkoPlatform)' == 'Linux' ">.so</XenkoNativeLibraryTargetExt>
-    <XenkoNativeLibraryTargetExt Condition=" '$(XenkoPlatform)' == 'macOS' ">.dylib</XenkoNativeLibraryTargetExt>
-    <XenkoNativeLibraryTargetExt Condition=" '$(XenkoPlatform)' == 'iOS' ">.a</XenkoNativeLibraryTargetExt>
+    <XenkoNativeLibraryTargetExt Condition="'$(XenkoPlatform)' == 'Windows'">.dll</XenkoNativeLibraryTargetExt>
+    <XenkoNativeLibraryTargetExt Condition="'$(XenkoPlatform)' == 'macOS'">.dylib</XenkoNativeLibraryTargetExt>
   </PropertyGroup>
   
   <ItemGroup>
@@ -88,7 +84,7 @@
     <ItemGroup>
       <XenkoNativeOutput Include="@(_XenkoNativeOutput->'$(XenkoNativeOutputPath)%(Identity)')"/>
       <XenkoNativeOutput>
-        <Link>$([MSBuild]::MakeRelative('$(_OutputPathRelative)', '$(XenkoNativeOutputPath)'))%(RelativePath)</Link>
+        <Link>$([MSBuild]::MakeRelative('$(_OutputPathRelative)', '$(XenkoNativeOutputPath)'))\%(RelativePath)</Link>        
       </XenkoNativeOutput>
       <XenkoNativeLib Include="@(XenkoNativeOutput)"/>
     </ItemGroup>
@@ -123,116 +119,21 @@
   </Target>-->
   
   <Target Name="CompileNativeClang_Windows" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'Windows' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
-    <MakeDir Directories="$(OutputObjectPath)\x86"/>
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -fms-extensions -DWINDOWS_DESKTOP -target i686-pc-windows-msvc" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot;  -fms-extensions -DWINDOWS_DESKTOP -target i686-pc-windows-msvc" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\WindowsDesktop\WindowsDesktop.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
-
     <MakeDir Directories="$(OutputObjectPath)\x64"/>
     <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -fms-extensions -DWINDOWS_DESKTOP -target x86_64-pc-windows-msvc" />
     <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; -gcodeview -fno-ms-extensions -nobuiltininc -nostdinc++ $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot;  -fms-extensions -DWINDOWS_DESKTOP -target x86_64-pc-windows-msvc" />
     <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\WindowsDesktop\WindowsDesktop.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
 
-    <SignFile Condition="'$(XenkoSignTool)' == 'true'" CertificateThumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba" SigningTarget="%(XenkoNativeOutput.Identity)" TimestampUrl="http://timestamp.globalsign.com/scripts/timstamp.dll" />
-	
-    <!-- Workaround: forcing C# rebuild so that timestamp are up to date (ideally we should have separate input/output groups for C# and Native) -->
-    <Delete Files="@(IntermediateAssembly)"/>
-  </Target>
-
-  <Target Name="CompileNativeClang_UWP" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)"  Condition="'$(XenkoPlatform)' == 'UWP' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
-    <MakeDir Directories="$(OutputObjectPath)\x86"/>
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x86\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -GS- -MD -DUWP -m32" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x86;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x86;Configuration=$(Configuration);Platform=x86" StopOnFirstFailure="true" />
-
-    <MakeDir Directories="$(OutputObjectPath)\x64"/>
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\x64\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -GS- -MD -DUWP -m64" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\x64;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\x64;Configuration=$(Configuration);Platform=x64" StopOnFirstFailure="true" />
-
-    <MakeDir Directories="$(OutputObjectPath)\ARM"/>
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\clang-cl.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\ARM\%(XenkoNativeCFile.Filename).obj&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -WX -GS- -MD -DUWP -m32 --target=thumbv7-windows-msvc" />
-    <MSBuild Projects="$(MSBuildThisFileDirectory)\WindowsProjects\UWP\UWP.vcxproj" Targets="Build" Properties="XenkoNativeOutputName=$(XenkoNativeOutputName);XenkoNativeOutputDir=$(XenkoNativeOutputPath)\ARM;XenkoDependenciesDir=$(XenkoDependenciesDir);XenkoNativePathLibs=libNativePath.lib $(XenkoNativePathLibs);XenkoNativeProjectFolder=$(ProjectDir);XenkoNativeProjectObjFolder=$(OutputObjectPath)\ARM;Configuration=$(Configuration);Platform=ARM" StopOnFirstFailure="true" />
-
-    <!-- Workaround: forcing C# rebuild so that timestamp are up to date (ideally we should have separate input/output groups for C# and Native) -->
-    <Delete Files="@(IntermediateAssembly)"/>
-  </Target>
-
-  <Target Name="CompileNativeClang_iOS" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'iOS' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armv7.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target armv7-apple-ios" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armv7.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target armv7-apple-ios" />
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\llvm-ar.exe&quot; rcs -format=bsd &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_armv7.a&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_armv7.o&quot;', ' ')" />
-
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armv7s.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target armv7s-apple-ios" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armv7s.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target armv7s-apple-ios" />
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\llvm-ar.exe&quot; rcs -format=bsd &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_armv7s.a&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_armv7s.o&quot;', ' ')" />
-    
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_arm64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target arm64-apple-ios" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_arm64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target arm64-apple-ios" />
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\llvm-ar.exe&quot; rcs -format=bsd &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_arm64.a&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_arm64.o&quot;', ' ')" />
-    
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_i386.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target i386-apple-ios" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_i386.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target i386-apple-ios" />
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\llvm-ar.exe&quot; rcs -format=bsd &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_i386.a&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_i386.o&quot;', ' ')" />
-    
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x86_64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target x86_64-apple-ios" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x86_64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DIOS -mios-version-min=6.0 -target x86_64-apple-ios" />
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\llvm-ar.exe&quot; rcs -format=bsd &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_x86_64.a&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_x86_64.o&quot;', ' ')" />
-    
-    <Exec Command="&quot;$(XenkoDependenciesDir)\LLVM\lipo.exe&quot; &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_armv7.a&quot; &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_armv7s.a&quot; &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_arm64.a&quot; &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_i386.a&quot; &quot;$(OutputObjectPath)\$(XenkoNativeOutputName)_x86_64.a&quot; -create -output &quot;$(XenkoNativeOutputPath)\$(XenkoNativeOutputName).a&quot;" />
-
-    <Copy SourceFiles="$(XenkoDependenciesDir)\NativePath\iOS\libNativePath.a" DestinationFolder="$(XenkoNativeOutputPath)" />
-    
-    <Copy SourceFiles="@(XenkoNativePathLibs2)" DestinationFolder="$(XenkoNativeOutputPath)" />
-    
-    <ItemGroup>
-      <XenkoNativeLib Include="$(XenkoNativeOutputPath)libNativePath.a"/>
-      <XenkoNativeLib Include="@(XenkoNativePathLibs2->'$(XenkoNativeOutputPath)%(Filename)%(Extension)')"/>
-    </ItemGroup>
-
     <!-- Workaround: forcing C# rebuild so that timestamp are up to date (ideally we should have separate input/output groups for C# and Native) -->
     <Delete Files="@(IntermediateAssembly)"/>
   </Target>
 
-  <Target Name="CompileNativeClang_iOS_Clean" Condition="'$(XenkoPlatform)' == 'iOS'" BeforeTargets="Clean">
-    <Delete Files="@(XenkoNativePathLibs2->'$(XenkoNativeOutputPath)\%(Filename).a', ' ')" />
-  </Target>
-
   <!-- RELEASE.TXT does not seem to exist anymore
   <PropertyGroup Condition="Exists('$(AndroidNdkDirectory)\RELEASE.TXT')">
     <XenkoNativeAndroidIs64Bit Condition="'$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText(`$(AndroidNdkDirectory)\RELEASE.TXT`)), `r\d\d\w?\s\(64-bit\)`).Success)' == 'true'">-x86_64</XenkoNativeAndroidIs64Bit>
     <XenkoNativeAndroidIs64Bit Condition="'$([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText(`$(AndroidNdkDirectory)\RELEASE.TXT`)), `r\d\d\w?\s\(64-bit\)`).Success)' == 'false'"></XenkoNativeAndroidIs64Bit>
   </PropertyGroup>
   -->
-  
-  <PropertyGroup>
-    <XenkoNativeAndroidIs64Bit>-x86_64</XenkoNativeAndroidIs64Bit>
-  </PropertyGroup>
-  
-  <Target Name="CompileNativeClang_Android" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'Android' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
-    <Error Text="The AndroidNdkDirectory environment variable is not set!" Condition="'$(AndroidNdkDirectory)' == ''" />
-
-    <MakeDir Directories="$(XenkoNativeOutputPath)\armeabi-v7a"/>
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armeabi-v7a.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target armv7-none-android" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_armeabi-v7a.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target armv7-none-android" />
-    <Exec Command="&quot;$(AndroidNdkDirectory)\toolchains\arm-linux-androideabi-4.9\prebuilt\windows$(XenkoNativeAndroidIs64Bit)\bin\arm-linux-androideabi-gcc.exe&quot; $(XenkoNativeToolingDebug) -shared -o &quot;$(XenkoNativeOutputPath)\armeabi-v7a\$(XenkoNativeOutputName)$(XenkoNativeLibraryTargetExt)&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_armeabi-v7a.o&quot;', ' ') --sysroot=&quot;$(AndroidNdkDirectory)\platforms\android-9\arch-arm&quot; @(XenkoNativePathLibs2->'&quot;$(XenkoDependenciesDir)\NativePath\Android\armeabi-v7a\%(Filename).a&quot;', ' ') &quot;$(XenkoDependenciesDir)\NativePath\Android\armeabi-v7a\libNativePath.a&quot; $(XenkoNativeAndroidGCC)" />
-
-    <MakeDir Directories="$(XenkoNativeOutputPath)\arm64-v8a"/>
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_arm64-v8a.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target aarch64-none-android" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_arm64-v8a.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target aarch64-none-android" />
-    <Exec Command="&quot;$(AndroidNdkDirectory)\toolchains\aarch64-linux-android-4.9\prebuilt\windows$(XenkoNativeAndroidIs64Bit)\bin\aarch64-linux-android-gcc.exe&quot; $(XenkoNativeToolingDebug) -shared -o &quot;$(XenkoNativeOutputPath)\arm64-v8a\$(XenkoNativeOutputName)$(XenkoNativeLibraryTargetExt)&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_arm64-v8a.o&quot;', ' ') --sysroot=&quot;$(AndroidNdkDirectory)\platforms\android-21\arch-arm64&quot; @(XenkoNativePathLibs2->'&quot;$(XenkoDependenciesDir)\NativePath\Android\arm64-v8a\%(Filename).a&quot;', ' ') &quot;$(XenkoDependenciesDir)\NativePath\Android\arm64-v8a\libNativePath.a&quot; $(XenkoNativeAndroidGCC)" />
-
-    <MakeDir Directories="$(XenkoNativeOutputPath)\x86"/>
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x86.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target i386-none-android" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x86.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target i386-none-android" />
-    <Exec Command="&quot;$(AndroidNdkDirectory)\toolchains\x86-4.9\prebuilt\windows$(XenkoNativeAndroidIs64Bit)\bin\i686-linux-android-gcc.exe&quot; $(XenkoNativeToolingDebug) -shared -o &quot;$(XenkoNativeOutputPath)\x86\$(XenkoNativeOutputName)$(XenkoNativeLibraryTargetExt)&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_x86.o&quot;', ' ') --sysroot=&quot;$(AndroidNdkDirectory)\platforms\android-9\arch-x86&quot; @(XenkoNativePathLibs2->'&quot;$(XenkoDependenciesDir)\NativePath\Android\x86\%(Filename).a&quot;', ' ') &quot;$(XenkoDependenciesDir)\NativePath\Android\x86\libNativePath.a&quot; $(XenkoNativeAndroidGCC)" />
-    
-    <MakeDir Directories="$(XenkoNativeOutputPath)\x86_64"/>
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x86_64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target x86_64-none-android" />
-    <Exec Condition="'%(XenkoNativeCFile.Extension)' == '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClangCPP) $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x86_64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -DANDROID -target x86_64-none-android" />
-    <Exec Command="&quot;$(AndroidNdkDirectory)\toolchains\x86_64-4.9\prebuilt\windows$(XenkoNativeAndroidIs64Bit)\bin\x86_64-linux-android-gcc.exe&quot; $(XenkoNativeToolingDebug) -shared -o &quot;$(XenkoNativeOutputPath)\x86_64\$(XenkoNativeOutputName)$(XenkoNativeLibraryTargetExt)&quot; @(XenkoNativeCFile->'&quot;$(OutputObjectPath)\%(Filename)_x86_64.o&quot;', ' ') --sysroot=&quot;$(AndroidNdkDirectory)\platforms\android-21\arch-x86_64&quot; @(XenkoNativePathLibs2->'&quot;$(XenkoDependenciesDir)\NativePath\Android\x86_64\%(Filename).a&quot;', ' ') &quot;$(XenkoDependenciesDir)\NativePath\Android\x86_64\libNativePath.a&quot; $(XenkoNativeAndroidGCC)" />
-
-    <!-- Workaround: forcing C# rebuild so that timestamp are up to date (ideally we should have separate input/output groups for C# and Native) -->
-    <Delete Files="@(IntermediateAssembly)"/>
-  </Target>
 
   <Target Name="CompileNativeClang_Linux" Inputs="@(XenkoNativeCFile);@(XenkoNativeHFile)" Outputs="@(XenkoNativeOutput)" Condition="'$(XenkoPlatform)' == 'Linux' And $(DesignTimeBuild) != true And $(BuildingProject) != false" BeforeTargets="CoreCompile" DependsOnTargets="_XenkoRegisterNativeOutputs">
     <Exec Condition="'%(XenkoNativeCFile.Extension)' != '.cpp'" Command="&quot;$(XenkoDependenciesDir)\LLVM\clang.exe&quot; $(XenkoNativeClang) -o &quot;$(OutputObjectPath)\%(XenkoNativeCFile.Filename)_x64.o&quot; -c &quot;%(XenkoNativeCFile.FullPath)&quot; -fPIC -target x86_64-linux-gnu" />
diff --git a/sources/prerequisites/prerequisites.aip b/sources/prerequisites/prerequisites.aip
index aa9011a31e..0dc675beef 100644
--- a/sources/prerequisites/prerequisites.aip
+++ b/sources/prerequisites/prerequisites.aip
@@ -51,7 +51,7 @@
     <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
-    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba Subject: Silicon Studio Corporation&#10;Issuer: COMODO RSA Code Signing CA&#10;Valid from 10/02/2014 to 10/03/2019"/>
+    <ROW TimeStampUrl="http://timestamp.verisign.com/scripts/timstamp.dll" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" Thumbprint="edad2b260091eacffbc42859d0339c74b263bfec Subject: vvvv - Dießl &amp; Gregor GbR&#10;Issuer: Sectigo RSA Code Signing CA&#10;Valid from 08/10/2019 to 07/25/2020"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
     <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
@@ -197,20 +197,16 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
     <ROW PrereqKey="A6D7F21EAEB4C4A901F0979CF110936" DisplayName=".NET Framework 4.7.2" SetupFileUrl="https://download.microsoft.com/download/6/E/4/6E48E8AB-DC00-419E-9704-06DD46E5F81D/NDP472-KB4054530-x86-x64-AllOS-ENU.exe" Location="1" ExactSize="83943272" WinNTVersions="Windows XP SP3 x86, Windows Server 2003 SP2 x86, Windows Vista x86, Windows Server 2008 x86, Windows 7 RTM x86, Windows 10 version 1507 x86, Windows 10 version 1511 x86, Windows 10 version 1803 x86, Windows 10 version 1809 x86" WinNT64Versions="Windows XP SP2 x64, Windows Server 2003 SP2 x64, Windows Vista x64, Windows Server 2008 x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64, Windows 10 version 1803 x64, Windows 10 version 1809 x64" Operator="1" NoUiComLine="/q /norestart" Options="xy" MD5="87450cfa175585b23a76bbd7052ee66b" TargetName=".NET Framework 4.7.2"/>
-    <ROW PrereqKey="B35B3203FEB4CFFA576A27CB835D3E6" DisplayName="Visual C++ Redistributable for Visual Studio 2017 x86" VersionMin="14.10" SetupFileUrl="http://download.microsoft.com/download/1/f/e/1febbdb2-aded-4e14-9063-39fb17e88444/vc_redist.x86.exe" Location="1" ExactSize="0" WinNTVersions="Windows Vista RTM x86, Windows Vista SP1 x86, Windows Server 2008 RTM x86, Windows 7 RTM x86" WinNT64Versions="Windows Vista RTM x64, Windows Vista SP1 x64, Windows Server 2008 RTM x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64" Operator="0" ComLine="/passive /norestart" BasicUiComLine="/passive /norestart" NoUiComLine="/quiet /norestart" Options="ym" TargetName="Visual C++ Redistributable for Visual Studio 2017?vcredist_x86.exe"/>
-    <ROW PrereqKey="CA62D813A4E74FA2AAE86A7D7B7B1493" DisplayName="Visual C++ Redistributable for Visual Studio 2013 x64" VersionMin="12.0" SetupFileUrl="http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" Operator="1" ComLine="/passive /norestart" BasicUiComLine="/passive /norestart" NoUiComLine="/quiet /norestart" Options="xmy" TargetName="Visual C++ Redistributable for Visual Studio 2013?vcredist_x64.exe"/>
-    <ROW PrereqKey="D36C9FE0826D4D2B9C2DDCCE2C83E860" DisplayName="Visual C++ Redistributable for Visual Studio 2017 x64" VersionMin="14.10" SetupFileUrl="http://download.microsoft.com/download/3/b/f/3bf6e759-c555-4595-8973-86b7b4312927/vc_redist.x64.exe" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista RTM x64, Windows Vista SP1 x64, Windows Server 2008 RTM x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64" Operator="1" ComLine="/passive /norestart" BasicUiComLine="/passive /norestart" NoUiComLine="/quiet /norestart" Options="xym" TargetName="Visual C++ Redistributable for Visual Studio 2017?vcredist_x64.exe"/>
-    <ROW PrereqKey="D564007E3BBE4F85950A09B470A7CA65" DisplayName="Visual C++ Redistributable for Visual Studio 2013 x86" VersionMin="12.0" SetupFileUrl="http://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe" Location="1" ExactSize="0" Operator="1" ComLine="/passive /norestart" BasicUiComLine="/passive /norestart" NoUiComLine="/quiet /norestart" Options="my" TargetName="Visual C++ Redistributable for Visual Studio 2013?vcredist_x86.exe"/>
+    <ROW PrereqKey="B35B3203FEB4CFFA576A27CB835D3E6" DisplayName="Visual C++ Redistributable for Visual Studio 2019 x86" VersionMin="14.10" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/0c1cfec3-e028-4996-8bb7-0c751ba41e32/1abed1573f36075bfdfc538a2af00d37/vc_redist.x86.exe" Location="1" ExactSize="0" WinNTVersions="Windows Vista RTM x86, Windows Vista SP1 x86, Windows Server 2008 RTM x86, Windows 7 RTM x86" WinNT64Versions="Windows Vista RTM x64, Windows Vista SP1 x64, Windows Server 2008 RTM x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64" Operator="0" ComLine="/passive /norestart" BasicUiComLine="/passive /norestart" NoUiComLine="/quiet /norestart" Options="ym" TargetName="Visual C++ Redistributable for Visual Studio 2019?vcredist_x86.exe"/>
+    <ROW PrereqKey="D36C9FE0826D4D2B9C2DDCCE2C83E860" DisplayName="Visual C++ Redistributable for Visual Studio 2019 x64" VersionMin="14.10" SetupFileUrl="https://download.visualstudio.microsoft.com/download/pr/cc0046d4-e7b4-45a1-bd46-b1c079191224/9c4042a4c2e6d1f661f4c58cf4d129e9/vc_redist.x64.exe" Location="1" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows Vista RTM x64, Windows Vista SP1 x64, Windows Server 2008 RTM x64, Windows 7 RTM x64, Windows Server 2008 R2 RTM x64" Operator="1" ComLine="/passive /norestart" BasicUiComLine="/passive /norestart" NoUiComLine="/quiet /norestart" Options="xym" TargetName="Visual C++ Redistributable for Visual Studio 2019?vcredist_x64.exe"/>
     <ROW PrereqKey="MicrosoftDirectXf" DisplayName="Microsoft® DirectX for Windows®" VersionMin="4.9.0.904" SetupFileUrl="DirectX11\DXSETUP.exe" Location="0" ExactSize="0" Operator="1" ComLine="/silent" BasicUiComLine="/silent" NoUiComLine="/silent" Options="yz" TargetName="DXSETUP.exe" AdditionalFiles="APR2007_xinput_x64.cab|APR2007_xinput_x86.cab|DSETUP.dll|dsetup32.dll|dxdllreg_x86.cab|dxupdate.cab|Feb2010_X3DAudio_x64.cab|Feb2010_X3DAudio_x86.cab|Jun2010_D3DCompiler_43_x64.cab|Jun2010_D3DCompiler_43_x86.cab|Jun2010_XAudio_x64.cab|Jun2010_XAudio_x86.cab"/>
-    <ATTRIBUTE name="PrereqsOrder" value="CA62D813A4E74FA2AAE86A7D7B7B1493 D564007E3BBE4F85950A09B470A7CA65 D36C9FE0826D4D2B9C2DDCCE2C83E860 B35B3203FEB4CFFA576A27CB835D3E6 MicrosoftDirectXf A6D7F21EAEB4C4A901F0979CF110936"/>
+    <ATTRIBUTE name="PrereqsOrder" value="D36C9FE0826D4D2B9C2DDCCE2C83E860 B35B3203FEB4CFFA576A27CB835D3E6 MicrosoftDirectXf A6D7F21EAEB4C4A901F0979CF110936"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
     <ROW SearchKey="A6D7F21EAEB4C4A901F0979CF110936Rele" Prereq="A6D7F21EAEB4C4A901F0979CF110936" SearchType="9" SearchString="HKLM\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\Release" RefContent="G461813" Order="1" Property="PreReqSearch_A6D7F21EAEB4C4A901F097"/>
-    <ROW SearchKey="B35B3203FEB4CFFA576A27CB835D3E6Syst" Prereq="B35B3203FEB4CFFA576A27CB835D3E6" SearchType="0" SearchString="[SystemFolder]vcruntime140.dll" VerMin="14.10.25008" Order="2" Property="PreReqSearch_2_B35B3203FEB4CFFA576A"/>
-    <ROW SearchKey="B35B3203FEB4CFFA576A27CB835D3E6Vers" Prereq="B35B3203FEB4CFFA576A27CB835D3E6" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.10.25008" Order="1" Property="PreReqSearch_B35B3203FEB4CFFA576A27"/>
-    <ROW SearchKey="CA62D813A4E74FA2AAE86A7D7B7B1493Version" Prereq="CA62D813A4E74FA2AAE86A7D7B7B1493" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum\Version" VerMin="12.0.21005" Order="1" Property="PreReqSearch_CA62D813A4E74FA2AAE8_1"/>
-    <ROW SearchKey="D36C9FE0826D4D2B9C2DDCCE2C83E860Ver" Prereq="D36C9FE0826D4D2B9C2DDCCE2C83E860" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.10.25008" Order="1" Property="PreReqSearch_D36C9FE0826D4D2B9C2DDC"/>
-    <ROW SearchKey="D564007E3BBE4F85950A09B470A7CA65Version" Prereq="D564007E3BBE4F85950A09B470A7CA65" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\12.0\RuntimeMinimum\Version" VerMin="12.0.21005" Order="1" Property="PreReqSearch_D564007E3BBE4F85950A09"/>
+    <ROW SearchKey="B35B3203FEB4CFFA576A27CB835D3E6Syst" Prereq="B35B3203FEB4CFFA576A27CB835D3E6" SearchType="0" SearchString="[SystemFolder]vcruntime140.dll" VerMin="14.22.27821" Order="2" Property="PreReqSearch_2_B35B3203FEB4CFFA576A"/>
+    <ROW SearchKey="B35B3203FEB4CFFA576A27CB835D3E6Vers" Prereq="B35B3203FEB4CFFA576A27CB835D3E6" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.22.27821" Order="1" Property="PreReqSearch_B35B3203FEB4CFFA576A27"/>
+    <ROW SearchKey="D36C9FE0826D4D2B9C2DDCCE2C83E860Ver" Prereq="D36C9FE0826D4D2B9C2DDCCE2C83E860" SearchType="2" SearchString="HKLM\SOFTWARE\Microsoft\DevDiv\VC\Servicing\14.0\RuntimeMinimum\Version" VerMin="14.22.27821" Order="1" Property="PreReqSearch_D36C9FE0826D4D2B9C2DDC"/>
     <ROW SearchKey="SystemFolderd3dcompiler_43.dll" Prereq="MicrosoftDirectXf" SearchType="0" SearchString="[SystemFolder]d3dcompiler_43.dll" VerMin="9.29.952.3111" Order="2" Property="PreReqSearch_4"/>
     <ROW SearchKey="SystemFolderfile.dll_1" Prereq="MicrosoftDirectXf" SearchType="0" SearchString="[SystemFolder]xaudio2_7.dll" VerMin="9.29.1962.0" Order="1" Property="PreReqSearch_3"/>
     <ROW SearchKey="SystemFolderx3daudio1_7.dll" Prereq="MicrosoftDirectXf" SearchType="0" SearchString="[SystemFolder]x3daudio1_7.dll" VerMin="9.28.1886.0" Order="3" Property="PreReqSearch_6"/>
diff --git a/sources/presentation/Xenko.Core.Presentation.Dialogs/Xenko.Core.Presentation.Dialogs.csproj b/sources/presentation/Xenko.Core.Presentation.Dialogs/Xenko.Core.Presentation.Dialogs.csproj
index 694a5f63d6..dad21edc41 100644
--- a/sources/presentation/Xenko.Core.Presentation.Dialogs/Xenko.Core.Presentation.Dialogs.csproj
+++ b/sources/presentation/Xenko.Core.Presentation.Dialogs/Xenko.Core.Presentation.Dialogs.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -30,7 +30,7 @@
     <ProjectReference Include="..\Xenko.Core.Presentation\Xenko.Core.Presentation.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ActiveConnectorBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ActiveConnectorBehavior.cs
index fa6e659e97..b024849609 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ActiveConnectorBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ActiveConnectorBehavior.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Behaviors;
 
 namespace Xenko.Core.Presentation.Graph.Behaviors
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDragBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDragBehavior.cs
index a08f274ec3..1383713245 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDragBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDragBehavior.cs
@@ -4,7 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 using Xenko.Core.Presentation.Graph.ViewModel;
 using Xenko.Core.Presentation.Extensions;
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDropBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDropBehavior.cs
index 5866ec79a6..754749cce6 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDropBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/ConnectorDropBehavior.cs
@@ -6,7 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Behaviors;
 
 namespace Xenko.Core.Presentation.Graph.Behaviors
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs
index 30ffc81dc7..59c42d1d5b 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphContextMenuOpenedBehavior.cs
@@ -3,7 +3,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using GraphX;
 using GraphX.Controls;
 using Xenko.Core.Presentation.Extensions;
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphSelectionBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphSelectionBehavior.cs
index 9b24bcb499..818b060f7c 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphSelectionBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/GraphSelectionBehavior.cs
@@ -13,7 +13,7 @@
 using System.Linq;
 using GraphX;
 using System.Diagnostics;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using GraphX.Controls;
 using System.Collections.Generic;
 using System.Collections;
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphBehavior.cs
index 0663958473..b926651ebc 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphBehavior.cs
@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Data;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Markup;
 
 using GraphX;
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphSelectionBehavior.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphSelectionBehavior.cs
index a61556a2bb..c5545a9e4f 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphSelectionBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Behaviors/NodeGraphSelectionBehavior.cs
@@ -13,7 +13,7 @@
 using System.Linq;
 using GraphX;
 using System.Diagnostics;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using GraphX.Controls;
 using System.Collections.Generic;
 using System.Collections;
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Controls/NodeEdgeControl.cs b/sources/presentation/Xenko.Core.Presentation.Graph/Controls/NodeEdgeControl.cs
index 200d4556fe..bafbc399b4 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Controls/NodeEdgeControl.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Controls/NodeEdgeControl.cs
@@ -49,8 +49,8 @@ public class NodeEdgeControl : EdgeControl, INotifyPropertyChanged
         /// <param name="edge"></param>
         /// <param name="showLabels"></param>
         /// <param name="showArrows"></param>
-        public NodeEdgeControl(VertexControl source, VertexControl target, object edge, bool showLabels = false, bool showArrows = true)
-            : base(source, target, edge, showLabels, showArrows)
+        public NodeEdgeControl(VertexControl source, VertexControl target, object edge, bool showArrows = true)
+            : base(source, target, edge, showArrows)
         {
             this.Loaded += OnLoaded;
         }
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Themes/generic.xaml b/sources/presentation/Xenko.Core.Presentation.Graph/Themes/generic.xaml
index 2f6dc713c9..bc0c694fe4 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Themes/generic.xaml
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Themes/generic.xaml
@@ -7,7 +7,7 @@
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                     xmlns:cvt="clr-namespace:Xenko.Core.Presentation.ValueConverters"
                     xmlns:mwt="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     mc:Ignorable="d">
 
   <!-- NODE VERTEX CONTROL -->
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/ViewModel/NodeGraphControlFactory.cs b/sources/presentation/Xenko.Core.Presentation.Graph/ViewModel/NodeGraphControlFactory.cs
index 187a800b05..c25c01be96 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/ViewModel/NodeGraphControlFactory.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/ViewModel/NodeGraphControlFactory.cs
@@ -42,9 +42,9 @@ public VertexControl CreateVertexControl(object vertexData)
         /// <param name="showArrows"></param>
         /// <param name="visibility"></param>
         /// <returns></returns>
-        public EdgeControl CreateEdgeControl(VertexControl source, VertexControl target, object edge, bool showLabels = false, bool showArrows = true, Visibility visibility = Visibility.Visible)
+        public EdgeControl CreateEdgeControl(VertexControl source, VertexControl target, object edge, bool showArrows = true, Visibility visibility = Visibility.Visible)
         {
-            return new NodeEdgeControl(source, target, edge, showLabels, showArrows) { Visibility = visibility, RootArea = FactoryRootArea };
+            return new NodeEdgeControl(source, target, edge, showArrows) { Visibility = visibility, RootArea = FactoryRootArea };
         }
 
         /// <summary>
diff --git a/sources/presentation/Xenko.Core.Presentation.Graph/Xenko.Core.Presentation.Graph.csproj b/sources/presentation/Xenko.Core.Presentation.Graph/Xenko.Core.Presentation.Graph.csproj
index 704fe909ef..71ccc33d61 100644
--- a/sources/presentation/Xenko.Core.Presentation.Graph/Xenko.Core.Presentation.Graph.csproj
+++ b/sources/presentation/Xenko.Core.Presentation.Graph/Xenko.Core.Presentation.Graph.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -12,28 +12,10 @@
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GraphX.PCL.Common, Version=2.1.5.0, Culture=neutral, PublicKeyToken=a6cdb671d651b60a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\deps\GraphX\GraphX.PCL.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="GraphX.PCL.Logic, Version=2.1.5.0, Culture=neutral, PublicKeyToken=3b65ef85075e278f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\deps\GraphX\GraphX.PCL.Logic.dll</HintPath>
-    </Reference>
-    <Reference Include="GraphX.WPF.Controls, Version=2.1.5.0, Culture=neutral, PublicKeyToken=bab23663f80c9e76, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\deps\GraphX\GraphX.WPF.Controls.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Xenko.GraphX.WPF.Controls" Version="2.4.0" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="QuickGraph, Version=3.6.61114.0, Culture=neutral, PublicKeyToken=f3fb40175eec2af3, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\deps\GraphX\QuickGraph.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -51,15 +33,5 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-
-  <PropertyGroup>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-  <Target Name="IncludeExtraAssemblies">
-    <ItemGroup>
-      <BuildOutputInPackage Include="$(OutputPath)GraphX.*.dll" />
-      <BuildOutputInPackage Include="$(OutputPath)QuickGraph.dll" />
-    </ItemGroup>
-  </Target>
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Helpers/Types.cs b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Helpers/Types.cs
index 0effeb711e..76c9abaf3d 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Helpers/Types.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Helpers/Types.cs
@@ -27,7 +27,7 @@ public IObjectNode GetRootNode()
 
             bool IPropertyProviderViewModel.ShouldConstructMember(IMemberNode member) => true;
 
-            bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, Index index) => true;
+            bool IPropertyProviderViewModel.ShouldConstructItem(IObjectNode collection, NodeIndex index) => true;
         }
 
         public class SimpleObject
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterProperties.cs b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterProperties.cs
index 9c555984f2..0663072b32 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterProperties.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterProperties.cs
@@ -50,7 +50,7 @@ public void TestSimpleMember()
             var member = root[nameof(SimpleMember.FloatValue)];
             Assert.Equal(0, member.Children.Count);
             Assert.Equal(nameof(SimpleMember.FloatValue), member.DisplayName);
-            Assert.Equal(Index.Empty, member.Index);
+            Assert.Equal(NodeIndex.Empty, member.Index);
             Assert.False(member.IsEnumerable);
             Assert.False(member.IsReadOnly);
             Assert.True(member.IsVisible);
@@ -69,7 +69,7 @@ public void TestSimpleMemberWithContract()
             var member = root[nameof(SimpleMember.FloatValue)];
             Assert.Equal(0, member.Children.Count);
             Assert.Equal(nameof(SimpleMember.FloatValue), member.DisplayName);
-            Assert.Equal(Index.Empty, member.Index);
+            Assert.Equal(NodeIndex.Empty, member.Index);
             Assert.False(member.IsEnumerable);
             Assert.False(member.IsReadOnly);
             Assert.True(member.IsVisible);
@@ -88,7 +88,7 @@ public void TestNestedMember()
             var member = root[nameof(NestedMemberClass.MemberClass)];
             Assert.Equal(1, member.Children.Count);
             Assert.Equal(nameof(NestedMemberClass.MemberClass), member.DisplayName);
-            Assert.Equal(Index.Empty, member.Index);
+            Assert.Equal(NodeIndex.Empty, member.Index);
             Assert.False(member.IsEnumerable);
             Assert.False(member.IsReadOnly);
             Assert.True(member.IsVisible);
@@ -99,7 +99,7 @@ public void TestNestedMember()
             var innerMember = member[nameof(SimpleMember.FloatValue)];
             Assert.Equal(0, innerMember.Children.Count);
             Assert.Equal(nameof(SimpleMember.FloatValue), innerMember.DisplayName);
-            Assert.Equal(Index.Empty, innerMember.Index);
+            Assert.Equal(NodeIndex.Empty, innerMember.Index);
             Assert.False(innerMember.IsEnumerable);
             Assert.False(innerMember.IsReadOnly);
             Assert.True(innerMember.IsVisible);
@@ -118,7 +118,7 @@ public void TestNestedReadOnlyMember()
             var member = root[nameof(NestedMemberClass.MemberClass)];
             Assert.Equal(1, member.Children.Count);
             Assert.Equal(nameof(NestedMemberClass.MemberClass), member.DisplayName);
-            Assert.Equal(Index.Empty, member.Index);
+            Assert.Equal(NodeIndex.Empty, member.Index);
             Assert.False(member.IsEnumerable);
             Assert.True(member.IsReadOnly);
             Assert.True(member.IsVisible);
@@ -129,7 +129,7 @@ public void TestNestedReadOnlyMember()
             var innerMember = member[nameof(SimpleMember.FloatValue)];
             Assert.Equal(0, innerMember.Children.Count);
             Assert.Equal(nameof(SimpleMember.FloatValue), innerMember.DisplayName);
-            Assert.Equal(Index.Empty, innerMember.Index);
+            Assert.Equal(NodeIndex.Empty, innerMember.Index);
             Assert.False(innerMember.IsEnumerable);
             Assert.False(innerMember.IsReadOnly);
             Assert.True(innerMember.IsVisible);
@@ -148,7 +148,7 @@ public void TestListMember()
             var member = root[nameof(ListMember.List)];
             Assert.Equal(0, member.Children.Count);
             Assert.Equal(nameof(ListMember.List), member.DisplayName);
-            Assert.Equal(Index.Empty, member.Index);
+            Assert.Equal(NodeIndex.Empty, member.Index);
             Assert.True(member.IsEnumerable);
             Assert.False(member.IsReadOnly);
             Assert.True(member.IsVisible);
@@ -163,7 +163,7 @@ public void TestListMember()
             member = root[nameof(ListMember.List)];
             Assert.Equal(0, member.Children.Count);
             Assert.Equal(nameof(ListMember.List), member.DisplayName);
-            Assert.Equal(Index.Empty, member.Index);
+            Assert.Equal(NodeIndex.Empty, member.Index);
             Assert.False(member.IsEnumerable);
             Assert.False(member.IsReadOnly);
             Assert.True(member.IsVisible);
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterUpdates.cs b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterUpdates.cs
index ea055a1f2d..09fc4f4350 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterUpdates.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/TestNodePresenterUpdates.cs
@@ -122,7 +122,7 @@ public void TestPrimitiveListAdd()
             var context = BuildContext(instance);
             var presenter = context.Factory.CreateNodeHierarchy(context.RootNode, new GraphNodePath(context.RootNode));
 
-            presenter.Children[1].AddItem("ddd", new Index(2));
+            presenter.Children[1].AddItem("ddd", new NodeIndex(2));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(instance.List, presenter.Children[1].Value);
             Assert.Equal(3, presenter.Children[1].Children.Count);
@@ -139,7 +139,7 @@ public void TestPrimitiveListAdd()
             Assert.Equal(instance.List[1], presenter.Children[1].Children[1].Value);
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
 
-            presenter.Children[1].AddItem("eee", new Index(1));
+            presenter.Children[1].AddItem("eee", new NodeIndex(1));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(instance.List, presenter.Children[1].Value);
             Assert.Equal(4, presenter.Children[1].Children.Count);
@@ -160,7 +160,7 @@ public void TestPrimitiveListAdd()
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
             Assert.Equal(instance.List[3], presenter.Children[1].Children[3].Value);
 
-            presenter.Children[1].AddItem("fff", new Index(0));
+            presenter.Children[1].AddItem("fff", new NodeIndex(0));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(instance.List, presenter.Children[1].Value);
             Assert.Equal(5, presenter.Children[1].Children.Count);
@@ -193,7 +193,7 @@ public void TestPrimitiveListRemove()
             var context = BuildContext(instance);
             var presenter = context.Factory.CreateNodeHierarchy(context.RootNode, new GraphNodePath(context.RootNode));
 
-            presenter.Children[1].RemoveItem("fff", new Index(4));
+            presenter.Children[1].RemoveItem("fff", new NodeIndex(4));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(4, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -214,7 +214,7 @@ public void TestPrimitiveListRemove()
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
             Assert.Equal(instance.List[3], presenter.Children[1].Children[3].Value);
 
-            presenter.Children[1].RemoveItem("bbb", new Index(0));
+            presenter.Children[1].RemoveItem("bbb", new NodeIndex(0));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(3, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -231,7 +231,7 @@ public void TestPrimitiveListRemove()
             Assert.Equal(instance.List[1], presenter.Children[1].Children[1].Value);
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
 
-            presenter.Children[1].RemoveItem("ddd", new Index(1));
+            presenter.Children[1].RemoveItem("ddd", new NodeIndex(1));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(2, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -244,7 +244,7 @@ public void TestPrimitiveListRemove()
             Assert.Equal(instance.List[0], presenter.Children[1].Children[0].Value);
             Assert.Equal(instance.List[1], presenter.Children[1].Children[1].Value);
 
-            presenter.Children[1].RemoveItem("eee", new Index(1));
+            presenter.Children[1].RemoveItem("eee", new NodeIndex(1));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(1, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -253,7 +253,7 @@ public void TestPrimitiveListRemove()
             Assert.Equal(typeof(string), presenter.Children[1].Children[0].Type);
             Assert.Equal(instance.List[0], presenter.Children[1].Children[0].Value);
 
-            presenter.Children[1].RemoveItem("ccc", new Index(0));
+            presenter.Children[1].RemoveItem("ccc", new NodeIndex(0));
             Assert.Equal(typeof(List<string>), presenter.Children[1].Type);
             Assert.Equal(0, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -319,7 +319,7 @@ public void TestReferenceListAdd()
             var context = BuildContext(instance);
             var presenter = context.Factory.CreateNodeHierarchy(context.RootNode, new GraphNodePath(context.RootNode));
 
-            presenter.Children[1].AddItem(new Types.SimpleType { String = "ddd" }, new Index(2));
+            presenter.Children[1].AddItem(new Types.SimpleType { String = "ddd" }, new NodeIndex(2));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(instance.List, presenter.Children[1].Value);
             Assert.Equal(3, presenter.Children[1].Children.Count);
@@ -339,7 +339,7 @@ public void TestReferenceListAdd()
             Assert.Equal(instance.List[1], presenter.Children[1].Children[1].Value);
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
 
-            presenter.Children[1].AddItem(new Types.SimpleType { String = "eee" }, new Index(1));
+            presenter.Children[1].AddItem(new Types.SimpleType { String = "eee" }, new NodeIndex(1));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(instance.List, presenter.Children[1].Value);
             Assert.Equal(4, presenter.Children[1].Children.Count);
@@ -364,7 +364,7 @@ public void TestReferenceListAdd()
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
             Assert.Equal(instance.List[3], presenter.Children[1].Children[3].Value);
 
-            presenter.Children[1].AddItem(new Types.SimpleType { String = "fff" }, new Index(0));
+            presenter.Children[1].AddItem(new Types.SimpleType { String = "fff" }, new NodeIndex(0));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(instance.List, presenter.Children[1].Value);
             Assert.Equal(5, presenter.Children[1].Children.Count);
@@ -402,7 +402,7 @@ public void TestReferenceListRemove()
             var context = BuildContext(instance);
             var presenter = context.Factory.CreateNodeHierarchy(context.RootNode, new GraphNodePath(context.RootNode));
 
-            presenter.Children[1].RemoveItem(instance.List[4], new Index(4));
+            presenter.Children[1].RemoveItem(instance.List[4], new NodeIndex(4));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(4, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -425,7 +425,7 @@ public void TestReferenceListRemove()
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
             Assert.Equal(instance.List[3], presenter.Children[1].Children[3].Value);
 
-            presenter.Children[1].RemoveItem("bbb", new Index(0));
+            presenter.Children[1].RemoveItem("bbb", new NodeIndex(0));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(3, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -445,7 +445,7 @@ public void TestReferenceListRemove()
             Assert.Equal(instance.List[1], presenter.Children[1].Children[1].Value);
             Assert.Equal(instance.List[2], presenter.Children[1].Children[2].Value);
 
-            presenter.Children[1].RemoveItem("ddd", new Index(1));
+            presenter.Children[1].RemoveItem("ddd", new NodeIndex(1));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(2, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -460,7 +460,7 @@ public void TestReferenceListRemove()
             Assert.Equal(instance.List[0], presenter.Children[1].Children[0].Value);
             Assert.Equal(instance.List[1], presenter.Children[1].Children[1].Value);
 
-            presenter.Children[1].RemoveItem("eee", new Index(1));
+            presenter.Children[1].RemoveItem("eee", new NodeIndex(1));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(1, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
@@ -470,7 +470,7 @@ public void TestReferenceListRemove()
             Assert.Equal(typeof(string), presenter.Children[1].Children[0].Children[0].Type);
             Assert.Equal(instance.List[0], presenter.Children[1].Children[0].Value);
 
-            presenter.Children[1].RemoveItem("ccc", new Index(0));
+            presenter.Children[1].RemoveItem("ccc", new NodeIndex(0));
             Assert.Equal(typeof(List<Types.SimpleType>), presenter.Children[1].Type);
             Assert.Equal(0, presenter.Children[1].Children.Count);
             Assert.Equal(instance.List, presenter.Children[1].Value);
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Xenko.Core.Presentation.Quantum.Tests.csproj b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Xenko.Core.Presentation.Quantum.Tests.csproj
index 52994e5f12..f5ca927679 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Xenko.Core.Presentation.Quantum.Tests.csproj
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum.Tests/Xenko.Core.Presentation.Quantum.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -31,5 +31,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/IPropertyProviderViewModel.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/IPropertyProviderViewModel.cs
index db5ef3cf0c..4c85db3e74 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/IPropertyProviderViewModel.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/IPropertyProviderViewModel.cs
@@ -37,6 +37,6 @@ public interface IPropertyProviderViewModel
         /// <param name="collection">The collection to evaluate.</param>
         /// <param name="index">The index of the item to evaluate.</param>
         /// <returns><c>True</c> if the member node should be constructed, <c>False</c> otherwise.</returns>
-        bool ShouldConstructItem([NotNull] IObjectNode collection, Index index);
+        bool ShouldConstructItem([NotNull] IObjectNode collection, NodeIndex index);
     }
 }
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/ObjectGraphNodeBinding.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/ObjectGraphNodeBinding.cs
index 00bbf7d512..87d8251fd5 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/ObjectGraphNodeBinding.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/ObjectGraphNodeBinding.cs
@@ -42,7 +42,7 @@ public override void SetNodeValue(TTargetType value)
         {
             using (var transaction = ActionService?.CreateTransaction())
             {
-                Node.Update(Converter(value), Index.Empty);
+                Node.Update(Converter(value), NodeIndex.Empty);
                 ActionService?.SetName(transaction, $"Update property {PropertyName}");
             }
         }
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/INodePresenter.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/INodePresenter.cs
index 81aab253c4..cfe0e76216 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/INodePresenter.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/INodePresenter.cs
@@ -39,7 +39,7 @@ public interface INodePresenter : IDisposable
 
         bool IsVisible { get; set; }
 
-        Index Index { get; }
+        NodeIndex Index { get; }
 
         ITypeDescriptor Descriptor { get; }
 
@@ -61,9 +61,9 @@ public interface INodePresenter : IDisposable
 
         void AddItem(object value);
 
-        void AddItem(object value, Index index);
+        void AddItem(object value, NodeIndex index);
 
-        void RemoveItem(object value, Index index);
+        void RemoveItem(object value, NodeIndex index);
 
         // TODO: this should probably be removed, UpdateValue should be called on the corresponding child node presenter itself
 
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/ItemNodePresenter.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/ItemNodePresenter.cs
index 5f4034e004..378292ed26 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/ItemNodePresenter.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/ItemNodePresenter.cs
@@ -13,7 +13,7 @@ public class ItemNodePresenter : NodePresenterBase
     {
         protected readonly IObjectNode Container;
 
-        public ItemNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPropertyProviderViewModel propertyProvider, [NotNull] INodePresenter parent, [NotNull] IObjectNode container, Index index)
+        public ItemNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPropertyProviderViewModel propertyProvider, [NotNull] INodePresenter parent, [NotNull] IObjectNode container, NodeIndex index)
             : base(factory, propertyProvider, parent)
         {
             if (factory == null) throw new ArgumentNullException(nameof(factory));
@@ -21,7 +21,18 @@ public ItemNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPrope
             Container = container ?? throw new ArgumentNullException(nameof(container));
             Descriptor = TypeDescriptorFactory.Default.Find(container.Descriptor.GetInnerCollectionType());
             OwnerCollection = parent;
-            Type = (container.Descriptor as CollectionDescriptor)?.ElementType ?? (container.Descriptor as DictionaryDescriptor)?.ValueType;
+            if (container.Descriptor is CollectionDescriptor collectionDescriptor)
+            {
+                Type = collectionDescriptor.ElementType;
+            }
+            else if (container.Descriptor is DictionaryDescriptor dictionaryDescriptor)
+            {
+                Type = dictionaryDescriptor.ValueType;
+            }
+            else if (container.Descriptor is ArrayDescriptor arrayDescriptor)
+            {
+                Type = arrayDescriptor.ElementType;
+            }
             Index = index;
             Name = index.ToString();
             Order = index.IsInt ? (int?)index.Int : null; // So items are sorted by index instead of string
@@ -42,7 +53,7 @@ public override void Dispose()
 
         public INodePresenter OwnerCollection { get; }
 
-        public sealed override Index Index { get; }
+        public sealed override NodeIndex Index { get; }
 
         public override Type Type { get; }
 
@@ -81,7 +92,7 @@ public override void AddItem(object value)
             }
         }
 
-        public override void AddItem(object value, Index index)
+        public override void AddItem(object value, NodeIndex index)
         {
             if (Container.IndexedTarget(Index) == null || !Container.IndexedTarget(Index).IsEnumerable)
                 throw new NodePresenterException($"{nameof(MemberNodePresenter)}.{nameof(AddItem)} cannot be invoked on members that are not collection.");
@@ -96,7 +107,7 @@ public override void AddItem(object value, Index index)
             }
         }
 
-        public override void RemoveItem(object value, Index index)
+        public override void RemoveItem(object value, NodeIndex index)
         {
             if (Container.IndexedTarget(Index) == null || !Container.IndexedTarget(Index).IsEnumerable)
                 throw new NodePresenterException($"{nameof(MemberNodePresenter)}.{nameof(AddItem)} cannot be invoked on members that are not collection.");
@@ -136,7 +147,7 @@ private bool IsValidChange([NotNull] ItemChangeEventArgs e)
             return IsValidChange(e.ChangeType, e.Index, Index);
         }
 
-        public static bool IsValidChange(ContentChangeType changeType, Index changeIndex, Index presenterIndex)
+        public static bool IsValidChange(ContentChangeType changeType, NodeIndex changeIndex, NodeIndex presenterIndex)
         {
             // We should care only if the change is an update at the same index.
             // Other scenarios (add, remove) are handled by the parent node.
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/MemberNodePresenter.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/MemberNodePresenter.cs
index 79bf1d3006..7523e370aa 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/MemberNodePresenter.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/MemberNodePresenter.cs
@@ -57,7 +57,7 @@ public override void Dispose()
 
         public override bool IsEnumerable => Member.Target?.IsEnumerable ?? false;
 
-        public override Index Index => Index.Empty;
+        public override NodeIndex Index => NodeIndex.Empty;
 
         [NotNull]
         public override ITypeDescriptor Descriptor => Member.Descriptor;
@@ -98,7 +98,7 @@ public override void AddItem(object value)
             }
         }
 
-        public override void AddItem(object value, Index index)
+        public override void AddItem(object value, NodeIndex index)
         {
             if (Member.Target == null || !Member.Target.IsEnumerable)
                 throw new NodePresenterException($"{nameof(MemberNodePresenter)}.{nameof(AddItem)} cannot be invoked on members that are not collection.");
@@ -113,7 +113,7 @@ public override void AddItem(object value, Index index)
             }
         }
 
-        public override void RemoveItem(object value, Index index)
+        public override void RemoveItem(object value, NodeIndex index)
         {
             if (Member.Target == null || !Member.Target.IsEnumerable)
                 throw new NodePresenterException($"{nameof(MemberNodePresenter)}.{nameof(RemoveItem)} cannot be invoked on members that are not collection.");
@@ -130,7 +130,7 @@ public override void RemoveItem(object value, Index index)
 
         public override NodeAccessor GetNodeAccessor()
         {
-            return new NodeAccessor(Member, Index.Empty);
+            return new NodeAccessor(Member, NodeIndex.Empty);
         }
 
         private void OnMemberChanging(object sender, MemberNodeChangeEventArgs e)
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterBase.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterBase.cs
index 634b5d5ba8..f2178490f6 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterBase.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterBase.cs
@@ -59,7 +59,7 @@ public virtual void Dispose()
 
         public int? Order { get; set; }
 
-        public abstract Index Index { get; }
+        public abstract NodeIndex Index { get; }
 
         public abstract ITypeDescriptor Descriptor { get; }
 
@@ -80,9 +80,9 @@ public virtual void Dispose()
 
         public abstract void AddItem(object value);
 
-        public abstract void AddItem(object value, Index index);
+        public abstract void AddItem(object value, NodeIndex index);
 
-        public abstract void RemoveItem(object value, Index index);
+        public abstract void RemoveItem(object value, NodeIndex index);
 
         public abstract NodeAccessor GetNodeAccessor();
 
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterFactory.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterFactory.cs
index 4dc9b7ed9c..cd02ff4eec 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterFactory.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/NodePresenterFactory.cs
@@ -87,7 +87,7 @@ protected virtual IInitializingNodePresenter CreateMember(IPropertyProviderViewM
             return new MemberNodePresenter(this, propertyProvider, parentPresenter, member);
         }
 
-        protected virtual bool ShouldCreateItemPresenter([NotNull] INodePresenter parent, [NotNull] IObjectNode collectionNode, Index index, [CanBeNull] IPropertyProviderViewModel propertyProvider)
+        protected virtual bool ShouldCreateItemPresenter([NotNull] INodePresenter parent, [NotNull] IObjectNode collectionNode, NodeIndex index, [CanBeNull] IPropertyProviderViewModel propertyProvider)
         {
             if (parent == null) throw new ArgumentNullException(nameof(parent));
             if (collectionNode == null) throw new ArgumentNullException(nameof(collectionNode));
@@ -96,7 +96,7 @@ protected virtual bool ShouldCreateItemPresenter([NotNull] INodePresenter parent
         }
 
         [NotNull]
-        protected virtual IInitializingNodePresenter CreateItem(IPropertyProviderViewModel propertyProvider, [NotNull] INodePresenter containerPresenter, [NotNull] IObjectNode containerNode, Index index)
+        protected virtual IInitializingNodePresenter CreateItem(IPropertyProviderViewModel propertyProvider, [NotNull] INodePresenter containerPresenter, [NotNull] IObjectNode containerNode, NodeIndex index)
         {
             if (containerPresenter == null) throw new ArgumentNullException(nameof(containerPresenter));
             if (containerNode == null) throw new ArgumentNullException(nameof(containerNode));
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/RootNodePresenter.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/RootNodePresenter.cs
index 0d47cbf20b..cc44f0a44b 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/RootNodePresenter.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/RootNodePresenter.cs
@@ -33,7 +33,7 @@ public RootNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPrope
 
         public override Type Type => RootNode.Type;
 
-        public override Index Index => Index.Empty;
+        public override NodeIndex Index => NodeIndex.Empty;
 
         public override bool IsEnumerable => RootNode.IsEnumerable;
 
@@ -71,7 +71,7 @@ public override void AddItem(object value)
             }
         }
 
-        public override void AddItem(object value, Index index)
+        public override void AddItem(object value, NodeIndex index)
         {
             if (!RootNode.IsEnumerable)
                 throw new NodePresenterException($"{nameof(RootNodePresenter)}.{nameof(AddItem)} cannot be invoked on objects that are not collection.");
@@ -86,7 +86,7 @@ public override void AddItem(object value, Index index)
             }
         }
 
-        public override void RemoveItem(object value, Index index)
+        public override void RemoveItem(object value, NodeIndex index)
         {
             if (!RootNode.IsEnumerable)
                 throw new NodePresenterException($"{nameof(RootNodePresenter)}.{nameof(RemoveItem)} cannot be invoked on objects that are not collection.");
@@ -103,7 +103,7 @@ public override void RemoveItem(object value, Index index)
 
         public override NodeAccessor GetNodeAccessor()
         {
-            return new NodeAccessor(RootNode, Index.Empty);
+            return new NodeAccessor(RootNode, NodeIndex.Empty);
         }
 
         private void OnItemChanging(object sender, ItemChangeEventArgs e)
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/VirtualNodePresenter.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/VirtualNodePresenter.cs
index e4b875b510..e8fe115234 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/VirtualNodePresenter.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Presenters/VirtualNodePresenter.cs
@@ -38,7 +38,7 @@ public VirtualNodePresenter([NotNull] INodePresenterFactoryInternal factory, IPr
 
         public override bool IsEnumerable => false;
 
-        public override Index Index => AssociatedNode.Node != null ? AssociatedNode.Index : Index.Empty;
+        public override NodeIndex Index => AssociatedNode.Node != null ? AssociatedNode.Index : NodeIndex.Empty;
 
         public override ITypeDescriptor Descriptor { get; }
 
@@ -98,7 +98,7 @@ public override void UpdateValue(object newValue)
             try
             {
                 var oldValue = getter();
-                var changeType = Index == Index.Empty ? ContentChangeType.ValueChange : ContentChangeType.CollectionUpdate;
+                var changeType = Index == NodeIndex.Empty ? ContentChangeType.ValueChange : ContentChangeType.CollectionUpdate;
                 RaiseNodeChanging(newValue, changeType, Index);
                 updatingValue = true;
                 setter(newValue);
@@ -123,13 +123,13 @@ public override void AddItem(object value)
         }
 
         /// <inheritdoc/>
-        public override void AddItem(object value, Index index)
+        public override void AddItem(object value, NodeIndex index)
         {
             throw new NodePresenterException($"{nameof(AddItem)} cannot be used on a {nameof(VirtualNodePresenter)}.");
         }
 
         /// <inheritdoc/>
-        public override void RemoveItem(object value, Index index)
+        public override void RemoveItem(object value, NodeIndex index)
         {
             throw new NodePresenterException($"{nameof(RemoveItem)} cannot be used on a {nameof(VirtualNodePresenter)}.");
         }
@@ -142,15 +142,15 @@ public override NodeAccessor GetNodeAccessor()
 
         private void AssociatedNodeChanging(object sender, [NotNull] INodeChangeEventArgs e)
         {
-            RaiseNodeChanging(e.NewValue, e.ChangeType, (e as ItemChangeEventArgs)?.Index ?? Index.Empty);
+            RaiseNodeChanging(e.NewValue, e.ChangeType, (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty);
         }
 
         private void AssociatedNodeChanged(object sender, [NotNull] INodeChangeEventArgs e)
         {
-            RaiseNodeChanged(e.OldValue, e.ChangeType, (e as ItemChangeEventArgs)?.Index ?? Index.Empty);
+            RaiseNodeChanged(e.OldValue, e.ChangeType, (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty);
         }
 
-        private void RaiseNodeChanging(object newValue, ContentChangeType changeType, Index index)
+        private void RaiseNodeChanging(object newValue, ContentChangeType changeType, NodeIndex index)
         {
             if (ShouldRaiseEvent(changeType, index))
             {
@@ -158,7 +158,7 @@ private void RaiseNodeChanging(object newValue, ContentChangeType changeType, In
             }
         }
 
-        private void RaiseNodeChanged(object oldValue, ContentChangeType changeType, Index index)
+        private void RaiseNodeChanged(object oldValue, ContentChangeType changeType, NodeIndex index)
         {
             if (ShouldRaiseEvent(changeType, index))
             {
@@ -166,15 +166,15 @@ private void RaiseNodeChanged(object oldValue, ContentChangeType changeType, Ind
             }
         }
 
-        private bool ShouldRaiseEvent(ContentChangeType changeType, Index index)
+        private bool ShouldRaiseEvent(ContentChangeType changeType, NodeIndex index)
         {
             if (updatingValue)
                 return false;
 
-            if (AssociatedNode.Node == null || AssociatedNode.Index == Index.Empty)
+            if (AssociatedNode.Node == null || AssociatedNode.Index == NodeIndex.Empty)
                 return true;
 
-            return index != Index.Empty && ItemNodePresenter.IsValidChange(changeType, index, Index);
+            return index != NodeIndex.Empty && ItemNodePresenter.IsValidChange(changeType, index, Index);
         }
     }
 }
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/ViewModels/NodeViewModel.cs b/sources/presentation/Xenko.Core.Presentation.Quantum/ViewModels/NodeViewModel.cs
index bbe15e3945..cdbaf5ef6c 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/ViewModels/NodeViewModel.cs
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/ViewModels/NodeViewModel.cs
@@ -28,7 +28,7 @@ public class NodeViewModel : DispatcherViewModel, IDynamicMetaObjectProvider
         internal class DifferentValuesObject { public readonly string Name = "DifferentValues"; };
 
         protected static readonly HashSet<string> ReservedNames = new HashSet<string>();
-        private readonly AutoUpdatingSortedObservableCollection<NodeViewModel> children = new AutoUpdatingSortedObservableCollection<NodeViewModel>(new AnonymousComparer<NodeViewModel>(CompareChildren), nameof(Name), nameof(Index), nameof(Order));
+        private readonly AutoUpdatingSortedObservableCollection<NodeViewModel> children = new AutoUpdatingSortedObservableCollection<NodeViewModel>(new AnonymousComparer<NodeViewModel>(CompareChildren), nameof(Name), nameof(NodeIndex), nameof(Order));
         private readonly ObservableCollection<NodePresenterCommandWrapper> commands = new ObservableCollection<NodePresenterCommandWrapper>();
         private readonly Dictionary<string, object> associatedData = new Dictionary<string, object>();
         private readonly List<string> changingProperties = new List<string>();
@@ -171,12 +171,19 @@ public NodeViewModel Root {
         [Obsolete]
         public MemberInfo MemberInfo => null;
 
+        /// <summary>
+        /// Gets whether this node contains a list.
+        /// </summary>
+        /// <remarks>Used mostly for sorting purpose.</remarks>
+        /// <seealso cref="HasList"/>
+        public bool HasList => ListDescriptor.IsList(Type);
+
         /// <summary>
         /// Gets whether this node contains a collection.
         /// </summary>
         /// <remarks>Used mostly for sorting purpose.</remarks>
         /// <seealso cref="HasDictionary"/>
-        public bool HasCollection => CollectionDescriptor.IsCollection(Type);
+        public bool HasCollection => OldCollectionDescriptor.IsCollection(Type);
 
         /// <summary>
         /// Gets whether this node contains a dictionary.
@@ -185,6 +192,13 @@ public NodeViewModel Root {
         /// <seealso cref="HasCollection"/>
         public bool HasDictionary => DictionaryDescriptor.IsDictionary(Type);
 
+        /// <summary>
+        /// Gets whether this node contains a set.
+        /// </summary>
+        /// <remarks>Usually a set is also a collection.</remarks>
+        /// <seealso cref="HasCollection"/>
+        public bool HasSet => SetDescriptor.IsSet(Type);
+
         /// <summary>
         /// Gets the number of visible children.
         /// </summary>
@@ -396,13 +410,54 @@ public void Refresh()
         protected void CheckDynamicMemberConsistency()
         {
             var memberNames = new HashSet<string>();
+            // We should allow space or empty or null or '.' appear when it's a string key dictionary
+            // And we should allow space or '.' appear when it's a char key dictionary
+            bool freeName = false;
+            bool allowSpCharOnly = false;
+            if (HasDictionary)
+            {
+                foreach (var iType in Type.GetTypeInfo().ImplementedInterfaces)
+                {
+                    var iTypeInfo = iType.GetTypeInfo();
+                    if (iTypeInfo.IsGenericType == false) 
+                        continue;
+                    if (iTypeInfo.GetGenericTypeDefinition() != typeof(IDictionary<,>))
+                        continue;
+                    Type[] genericTypes = iTypeInfo.GetGenericArguments();
+                    if (genericTypes[0] == typeof(string))
+                    {
+                        freeName = true;
+                    }
+                    else if (genericTypes[0] == typeof(char))
+                    {
+                        allowSpCharOnly = true;
+                    }
+                    break;
+                }
+            }
+
             foreach (var child in Children)
             {
-                if (string.IsNullOrWhiteSpace(child.Name))
-                    throw new InvalidOperationException("This node has a child with a null or blank name");
+                if (!freeName)
+                {
+                    if (allowSpCharOnly)
+                    {
+                        if (child.Name == null)
+                            throw new InvalidOperationException("This node has a child with a null name");
+                    }
+                    else
+                    {
+                        if (string.IsNullOrWhiteSpace(child.Name))
+                            throw new InvalidOperationException("This node has a child with a null or blank name");
+                    }
+
+                    if (!allowSpCharOnly)
+                    {
+                        if (child.Name.Contains('.'))
+                            throw new InvalidOperationException($"This node has a child which contains a period (.) in its name: {child.Name}");
+                    }
+                }
 
-                if (child.Name.Contains('.'))
-                    throw new InvalidOperationException($"This node has a child which contains a period (.) in its name: {child.Name}");
 
                 if (memberNames.Contains(child.Name))
                     throw new InvalidOperationException($"This node contains several members named {child.Name}");
@@ -534,8 +589,7 @@ private object ConvertValue(object value)
             if (value == null)
                 return null;
             object convertedValue;
-            if (!TypeConverterHelper.TryConvert(value, Type, out convertedValue))
-                throw new InvalidOperationException("Can not convert value to the required type");
+            if (!TypeConverterHelper.TryConvert(value, Type, out convertedValue)) return NodeValue;
             return convertedValue;
         }
 
diff --git a/sources/presentation/Xenko.Core.Presentation.Quantum/Xenko.Core.Presentation.Quantum.csproj b/sources/presentation/Xenko.Core.Presentation.Quantum/Xenko.Core.Presentation.Quantum.csproj
index 615a3eca97..a123008867 100644
--- a/sources/presentation/Xenko.Core.Presentation.Quantum/Xenko.Core.Presentation.Quantum.csproj
+++ b/sources/presentation/Xenko.Core.Presentation.Quantum/Xenko.Core.Presentation.Quantum.csproj
@@ -1,7 +1,7 @@
 <Project>
 
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
  
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -28,6 +28,6 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
 </Project>
\ No newline at end of file
diff --git a/sources/presentation/Xenko.Core.Presentation.Tests/Xenko.Core.Presentation.Tests.csproj b/sources/presentation/Xenko.Core.Presentation.Tests/Xenko.Core.Presentation.Tests.csproj
index 933efaddf0..4beaf5ac16 100644
--- a/sources/presentation/Xenko.Core.Presentation.Tests/Xenko.Core.Presentation.Tests.csproj
+++ b/sources/presentation/Xenko.Core.Presentation.Tests/Xenko.Core.Presentation.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -34,5 +34,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/ActivateOnCollectionChangedBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/ActivateOnCollectionChangedBehavior.cs
index 1174ce3d7a..4d87ec0a16 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/ActivateOnCollectionChangedBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/ActivateOnCollectionChangedBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Collections.Specialized;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 
 namespace Xenko.Core.Presentation.Behaviors
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/BindCurrentToolTipStringBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/BindCurrentToolTipStringBehavior.cs
index f7a0e06a04..13bce49744 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/BindCurrentToolTipStringBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/BindCurrentToolTipStringBehavior.cs
@@ -4,7 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace Xenko.Core.Presentation.Behaviors
 {
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/CharInputBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/CharInputBehavior.cs
index bd9a5dc3c4..d6e1eb69ba 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/CharInputBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/CharInputBehavior.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using System.Linq;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 
 namespace Xenko.Core.Presentation.Behaviors
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/CloseWindowBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/CloseWindowBehavior.cs
index 8f9fdf1f1f..f094f4da95 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/CloseWindowBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/CloseWindowBehavior.cs
@@ -4,7 +4,7 @@
 using System.Reflection;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Services;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/CommandBindingBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/CommandBindingBehavior.cs
index 29919e10b9..ece48ffca5 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/CommandBindingBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/CommandBindingBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Commands;
 using Xenko.Core.Presentation.Internal;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/ContainTextAdornerBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/ContainTextAdornerBehavior.cs
index 0b52591d34..89835a95f8 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/ContainTextAdornerBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/ContainTextAdornerBehavior.cs
@@ -5,7 +5,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Media;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Adorners;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/DeferredBehaviorBase.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/DeferredBehaviorBase.cs
index c244f94542..fbae21f51d 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/DeferredBehaviorBase.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/DeferredBehaviorBase.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Internal;
 
 namespace Xenko.Core.Presentation.Behaviors
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/DragOverAutoScrollBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/DragOverAutoScrollBehavior.cs
index d95e9d0c14..27089acade 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/DragOverAutoScrollBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/DragOverAutoScrollBehavior.cs
@@ -5,7 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Extensions;
 using Xenko.Core.Presentation.Internal;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/ItemsControlCollectionViewBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/ItemsControlCollectionViewBehavior.cs
index 69013d2db9..182531b316 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/ItemsControlCollectionViewBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/ItemsControlCollectionViewBehavior.cs
@@ -4,7 +4,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Core;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/MouseMoveCaptureBehaviorBase.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/MouseMoveCaptureBehaviorBase.cs
index 4ba072339f..28e788f090 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/MouseMoveCaptureBehaviorBase.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/MouseMoveCaptureBehaviorBase.cs
@@ -4,9 +4,10 @@
 using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Internal;
+using NotNullAttribute = Xenko.Core.Annotations.NotNullAttribute;
 
 namespace Xenko.Core.Presentation.Behaviors
 {
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/MultiOverrideCursorBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/MultiOverrideCursorBehavior.cs
index 34895be8ee..bf0ee19b87 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/MultiOverrideCursorBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/MultiOverrideCursorBehavior.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using System.Windows.Markup;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Internal;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/NumericTextBoxTransactionalRepeatButtonsBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/NumericTextBoxTransactionalRepeatButtonsBehavior.cs
index 92b4773efa..33a8121cf2 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/NumericTextBoxTransactionalRepeatButtonsBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/NumericTextBoxTransactionalRepeatButtonsBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Transactions;
 using Xenko.Core.Presentation.Controls;
 using Xenko.Core.Presentation.Services;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnEventBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnEventBehavior.cs
index d72e0df048..e1476602f7 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnEventBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnEventBehavior.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Linq;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Core;
 using Xenko.Core.Presentation.Internal;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnFocusBindingInterruptionBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnFocusBindingInterruptionBehavior.cs
index 06f095e5a7..e81dba4331 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnFocusBindingInterruptionBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnFocusBindingInterruptionBehavior.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Data;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core;
 using Xenko.Core.Presentation.Extensions;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnMouseEventBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnMouseEventBehavior.cs
index c8ce59657d..65e9c01b32 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnMouseEventBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnMouseEventBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Internal;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnPropertyChangedCommandBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnPropertyChangedCommandBehavior.cs
index eaf73f4842..5b1c0030e4 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/OnPropertyChangedCommandBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/OnPropertyChangedCommandBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Linq;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 using Xenko.Core.Presentation.Core;
 using Xenko.Core.Presentation.Extensions;
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/OverrideCursorBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/OverrideCursorBehavior.cs
index dfe636ef08..d0fa0a9698 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/OverrideCursorBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/OverrideCursorBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Internal;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/ResizeBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/ResizeBehavior.cs
index 0afe5fc0e0..160f4eb217 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/ResizeBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/ResizeBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Mathematics;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/SetFocusOnLoadBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/SetFocusOnLoadBehavior.cs
index aec5e13243..7e423e2dc3 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/SetFocusOnLoadBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/SetFocusOnLoadBehavior.cs
@@ -5,7 +5,7 @@
 using System.Linq;
 using System.Text;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 
 namespace Xenko.Core.Presentation.Behaviors
 {
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/SliderDragFromTrackBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/SliderDragFromTrackBehavior.cs
index e2aaea774b..76b2916470 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/SliderDragFromTrackBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/SliderDragFromTrackBehavior.cs
@@ -6,7 +6,7 @@
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Extensions;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/TextBoxKeyUpCommandBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/TextBoxKeyUpCommandBehavior.cs
index 9d0892e290..ffe6f0e187 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/TextBoxKeyUpCommandBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/TextBoxKeyUpCommandBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Presentation.Controls;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Behaviors/ToggleButtonPopupBehavior.cs b/sources/presentation/Xenko.Core.Presentation/Behaviors/ToggleButtonPopupBehavior.cs
index 1f98637730..94e8dff5b5 100644
--- a/sources/presentation/Xenko.Core.Presentation/Behaviors/ToggleButtonPopupBehavior.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Behaviors/ToggleButtonPopupBehavior.cs
@@ -2,7 +2,7 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 
 namespace Xenko.Core.Presentation.Behaviors
diff --git a/sources/presentation/Xenko.Core.Presentation/Commands/UtilityCommands.cs b/sources/presentation/Xenko.Core.Presentation/Commands/UtilityCommands.cs
index b9c8a70c93..fd1cbcea35 100644
--- a/sources/presentation/Xenko.Core.Presentation/Commands/UtilityCommands.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Commands/UtilityCommands.cs
@@ -34,7 +34,7 @@ private static void OpenHyperlink([NotNull] string url)
             // see https://support.microsoft.com/en-us/kb/305703
             try
             {
-                Process.Start(url);
+                Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
             }
             catch (System.ComponentModel.Win32Exception e)
             {
diff --git a/sources/presentation/Xenko.Core.Presentation/Controls/VirtualizingTreePanel.cs b/sources/presentation/Xenko.Core.Presentation/Controls/VirtualizingTreePanel.cs
index ff7447e92b..5a77abdf90 100644
--- a/sources/presentation/Xenko.Core.Presentation/Controls/VirtualizingTreePanel.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Controls/VirtualizingTreePanel.cs
@@ -40,7 +40,7 @@ public SizesCache()
             public void AddOrChange(int level, double size)
             {
                 List<CachedSize> levelList;
-                if (cache.ContainsKey(level)) { levelList = cache[level]; }
+                if (cache.TryGetValue(level, out var cachedLevels)) { levelList = cachedLevels; }
                 else
                 {
                     levelList = new List<CachedSize>(5);
@@ -98,9 +98,9 @@ public void AddOrChange(int level, double size)
 
             public bool ContainsItems(int level)
             {
-                if (cache.ContainsKey(level))
+                if (cache.TryGetValue(level, out var cachedLevel))
                 {
-                    return cache[level].Count > 0;
+                    return cachedLevel.Count > 0;
                 }
 
                 return false;
@@ -113,10 +113,10 @@ public void CleanUp(int level)
 
             public double GetEstimate(int level)
             {
-                if (cache.ContainsKey(level))
+                if (cache.TryGetValue(level, out var cachedLevel))
                 {
                     var maxUsedSize = new CachedSize { OccuranceCounter = 0 };
-                    foreach (var s in cache[level])
+                    foreach (var s in cachedLevel)
                     {
                         if (maxUsedSize.OccuranceCounter < s.OccuranceCounter) maxUsedSize = s;
                     }
diff --git a/sources/presentation/Xenko.Core.Presentation/Core/DependencyPropertyWatcher.cs b/sources/presentation/Xenko.Core.Presentation/Core/DependencyPropertyWatcher.cs
index 98b457ea05..e2bc04bab5 100644
--- a/sources/presentation/Xenko.Core.Presentation/Core/DependencyPropertyWatcher.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Core/DependencyPropertyWatcher.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 using Xenko.Core.Extensions;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Dirtiables/DirtiableManager.cs b/sources/presentation/Xenko.Core.Presentation/Dirtiables/DirtiableManager.cs
index ab155b2b97..7dd31dd3f8 100644
--- a/sources/presentation/Xenko.Core.Presentation/Dirtiables/DirtiableManager.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Dirtiables/DirtiableManager.cs
@@ -117,7 +117,7 @@ private void UpdateDirtiables([NotNull] HashSet<IDirtiable> dirtiables)
                 }
 
                 // Update its dirty status according to the computed flag and a previously determinated update (from dependencies)
-                dirtiablesToUpdate[dirtiable] = dirtiablesToUpdate.ContainsKey(dirtiable) ? dirtiablesToUpdate[dirtiable] || isDirty : isDirty;
+                dirtiablesToUpdate[dirtiable] = dirtiablesToUpdate.TryGetValue(dirtiable, out var dirtiableIsDirty) ? dirtiableIsDirty || isDirty : isDirty;
             }
 
             // Finally propagate the update
diff --git a/sources/presentation/Xenko.Core.Presentation/Extensions/ObjectExtensions.cs b/sources/presentation/Xenko.Core.Presentation/Extensions/ObjectExtensions.cs
index dd66d16474..88101cc7f0 100644
--- a/sources/presentation/Xenko.Core.Presentation/Extensions/ObjectExtensions.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Extensions/ObjectExtensions.cs
@@ -75,7 +75,7 @@ private static DynamicMethod GenerateDynamicMethod([NotNull] Type instanceType)
             }
             else
             {
-                var constructorInfo = instanceType.GetConstructor(new Type[0]);
+                var constructorInfo = instanceType.GetConstructor(Array.Empty<Type>());
                 generator.Emit(OpCodes.Newobj, constructorInfo);
                 generator.Emit(OpCodes.Stloc_0);
             }
diff --git a/sources/presentation/Xenko.Core.Presentation/Extensions/WindowHelper.cs b/sources/presentation/Xenko.Core.Presentation/Extensions/WindowHelper.cs
index 33d4c6e8bc..99609c3cb7 100644
--- a/sources/presentation/Xenko.Core.Presentation/Extensions/WindowHelper.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Extensions/WindowHelper.cs
@@ -127,7 +127,7 @@ public static Rect GetWorkArea([NotNull] this Window window)
 
             var monitor = GetMonitorInfo(new WindowInteropHelper(window).Handle);
             if (monitor == null) return Rect.Empty;
-            
+
             var area = (Rect)monitor.rcWork;
             var rect = window.RectFromScreen(ref area);
             rect.Offset(window.Left, window.Top);
diff --git a/sources/presentation/Xenko.Core.Presentation/Interactivity/BehaviorCollection.cs b/sources/presentation/Xenko.Core.Presentation/Interactivity/BehaviorCollection.cs
index 1fb91f5cc7..fed8bd2204 100644
--- a/sources/presentation/Xenko.Core.Presentation/Interactivity/BehaviorCollection.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Interactivity/BehaviorCollection.cs
@@ -4,13 +4,13 @@
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.Windows;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Annotations;
 
 namespace Xenko.Core.Presentation.Interactivity
 {
     /// <summary>
-    /// A collection of behavior that synchronize with the System.Windows.Interactivity.Interaction.Behaviors attached property.
+    /// A collection of behavior that synchronize with the Microsoft.Xaml.Behaviors.Interaction.Behaviors attached property.
     /// </summary>
     public class BehaviorCollection : ObservableCollection<Behavior>, IAttachedObject
     {
@@ -44,7 +44,7 @@ public void Attach([NotNull] DependencyObject dependencyObject)
                 throw new InvalidOperationException("This BehaviorCollection has already been attached to a dependency object.");
 
             AssociatedObject = dependencyObject;
-            var behaviors = System.Windows.Interactivity.Interaction.GetBehaviors(dependencyObject);
+            var behaviors = Microsoft.Xaml.Behaviors.Interaction.GetBehaviors(dependencyObject);
             foreach (var behavior in this)
             {
                 behaviors.Add(behavior);
@@ -55,7 +55,7 @@ public void Detach()
         {
             if (AssociatedObject != null)
             {
-                var behaviors = System.Windows.Interactivity.Interaction.GetBehaviors(AssociatedObject);
+                var behaviors = Microsoft.Xaml.Behaviors.Interaction.GetBehaviors(AssociatedObject);
                 foreach (var behavior in this)
                 {
                     behaviors.Remove(behavior);
@@ -69,7 +69,7 @@ private void BehaviorCollectionChanged(object sender, NotifyCollectionChangedEve
             if (AssociatedObject == null)
                 return;
 
-            var behaviors = System.Windows.Interactivity.Interaction.GetBehaviors(AssociatedObject);
+            var behaviors = Microsoft.Xaml.Behaviors.Interaction.GetBehaviors(AssociatedObject);
             switch (e.Action)
             {
                 case NotifyCollectionChangedAction.Add:
diff --git a/sources/presentation/Xenko.Core.Presentation/Interactivity/Interaction.cs b/sources/presentation/Xenko.Core.Presentation/Interactivity/Interaction.cs
index a1ba2270a1..e253d02050 100644
--- a/sources/presentation/Xenko.Core.Presentation/Interactivity/Interaction.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Interactivity/Interaction.cs
@@ -7,11 +7,11 @@ namespace Xenko.Core.Presentation.Interactivity
 {
     /// <summary>
     /// A container for an attached dependency property that contains a collection of behavior.
-    /// The purpose of this class is to be used in place of System.Windows.Interactivity.Interaction.
+    /// The purpose of this class is to be used in place of Microsoft.Xaml.Behaviors.Interaction.
     /// This class allows to set behaviors in styles because <see cref="BehaviorCollection"/>
     /// has a public parameterless constructor and the Behaviors attached property has a public setter.
     /// When the collection is modified or set, it automatically synchronize the attached property
-    /// System.Windows.Interactivity.Interaction.Behaviors.
+    /// Microsoft.Xaml.Behaviors.Interaction.Behaviors.
     /// </summary>
     public static class Interaction
     {
diff --git a/sources/presentation/Xenko.Core.Presentation/Services/DummyTransaction.cs b/sources/presentation/Xenko.Core.Presentation/Services/DummyTransaction.cs
index 809ff31c9f..193ff5afab 100644
--- a/sources/presentation/Xenko.Core.Presentation/Services/DummyTransaction.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Services/DummyTransaction.cs
@@ -16,7 +16,7 @@ internal class DummyTransaction : ITransaction, IReadOnlyTransaction
 
         public Guid Id { get; } = Guid.NewGuid();
 
-        public IReadOnlyList<Operation> Operations { get; } = new Operation[0];
+        public IReadOnlyList<Operation> Operations { get; } = Array.Empty<Operation>();
 
         public bool IsEmpty => true;
 
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
new file mode 100644
index 0000000000..8f866c87ff
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml
@@ -0,0 +1,124 @@
+<!--
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    x:Class="Xenko.Core.Presentation.Themes.Overrides.DarkSteelTheme"
+                    mc:Ignorable="d">
+  <!-- Main Colors -->
+
+  <Color x:Key="MainColor">#FF595959</Color>
+  <Color x:Key="HoverColor">#FF393939</Color>
+  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+  <SolidColorBrush x:Key="LightBrush" Color="#FF4D4D4D" />
+  <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
+
+  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+  <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
+
+  <Color x:Key="BlackColor">#FF000000</Color>
+  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#4F4F54" />
+  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
+  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
+
+  <SolidColorBrush x:Key="BackgroundBrush" Color="#3C3C3E"/>
+  <SolidColorBrush x:Key="TextBrush" Color="#EBEBEB" />
+  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
+  <SolidColorBrush x:Key="NormalBrush" Color="#4E4E51" />
+  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF5E5E60" />
+  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+  <SolidColorBrush x:Key="GlyphBrush" Color="#FFD9D9D9" />
+
+  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#3C3C3E" />
+  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#545454" />
+  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
+
+  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
+
+  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
+  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
+  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
+  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
+  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
+
+  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#323234" />
+
+  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
+
+  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
+  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
+
+  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
+  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
+
+  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#656565" />
+  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
+  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
+
+  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
+  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
+  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#1F1F20" />
+
+  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
+
+  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
+  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
+
+  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF4D4D4D"/>
+  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#4A4A4C"/>
+  <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
+
+  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
+  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
+
+  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#1D1D1F"/>
+  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF888888" />
+  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#47474A"/>
+
+  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF494949"/>
+
+  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
+  <SolidColorBrush x:Key="MenuBorderBrush" Color="#6B6B6E"/>
+
+  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
+  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
+  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
+  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
+  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
+  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF525252"/>
+  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF303033"/>
+
+  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
+
+  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+  <!-- EXPRESSION COMMON VALUES -->
+
+  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#59FFFFFF" Offset="0" />
+    <GradientStop Color="#00FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#4CFFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+    <GradientStop Color="#00FFFFFF" Offset="0.856" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+    <GradientStop Color="#444" Offset="0.0" />
+    <GradientStop Color="#888" Offset="1.0" />
+  </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml.cs b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml.cs
new file mode 100644
index 0000000000..37829670ff
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/DarkSteelTheme.xaml.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xenko.Core.Presentation.Themes.Overrides
+{
+    public partial class DarkSteelTheme : ResourceDictionary
+    {
+        public DarkSteelTheme()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
new file mode 100644
index 0000000000..764f24af05
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml
@@ -0,0 +1,130 @@
+<!--
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Original code:
+// (c) Copyright Microsoft Corporation.
+// This source is subject to Microsoft Public License (Ms-PL).
+// Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
+// All other rights reserved.
+-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    x:Class="Xenko.Core.Presentation.Themes.Overrides.ExpressionDarkTheme"
+                    mc:Ignorable="d">
+  <!-- Main Colors -->
+
+  <Color x:Key="MainColor">#FF595959</Color>
+  <Color x:Key="HoverColor">#FF393939</Color>
+  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
+  <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
+  <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
+
+  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
+  <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
+
+  <Color x:Key="BlackColor">#FF000000</Color>
+  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
+
+  <SolidColorBrush x:Key="DarkDefaultBackground" Color="#101011" />
+  <SolidColorBrush x:Key="DarkDefaultForeground" Color="#0395D7" />
+  <SolidColorBrush x:Key="NormalDarkBackground" Color="#1A1A1D" />
+
+  <SolidColorBrush x:Key="BackgroundBrush" Color="#1A1A1D"/>
+  <SolidColorBrush x:Key="TextBrush" Color="#E6E6E6" />
+  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
+  <SolidColorBrush x:Key="NormalBrush" Color="#3E3E40" />
+  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
+  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
+  <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
+
+  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#161616" />
+  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#333333" />
+  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
+
+  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
+
+  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
+  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
+  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
+  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
+  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
+
+  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#101011" />
+
+  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
+
+  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
+  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
+
+  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
+  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
+
+  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#656565" />
+  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
+  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
+  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
+
+  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
+  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
+  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#1F1F20" />
+
+  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
+
+  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
+  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
+
+  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
+  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
+  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF333333"/>
+  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#3E3E40"/>
+  <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
+
+  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
+  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
+
+  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#040405"/>
+  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF888888" />
+  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#2D2D2D"/>
+
+  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF494949"/>
+
+  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
+  <SolidColorBrush x:Key="MenuBorderBrush" Color="#212125"/>
+
+  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
+  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
+  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
+  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
+  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
+  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF525252"/>
+  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF101011"/>
+
+  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
+
+  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
+  <!-- EXPRESSION COMMON VALUES -->
+
+  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#59FFFFFF" Offset="0" />
+    <GradientStop Color="#00FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
+    <GradientStop Color="#4CFFFFFF" Offset="0" />
+    <GradientStop Color="#26FFFFFF" Offset="1" />
+    <GradientStop Color="#26FFFFFF" Offset="0.467" />
+    <GradientStop Color="#00FFFFFF" Offset="0.475" />
+    <GradientStop Color="#00FFFFFF" Offset="0.856" />
+  </LinearGradientBrush>
+
+  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
+    <GradientStop Color="#444" Offset="0.0" />
+    <GradientStop Color="#888" Offset="1.0" />
+  </LinearGradientBrush>
+
+</ResourceDictionary>
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml.cs b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml.cs
new file mode 100644
index 0000000000..4db6e4b7d4
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/Overrides/ExpressionDarkTheme.xaml.cs
@@ -0,0 +1,17 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace Xenko.Core.Presentation.Themes.Overrides
+{
+    public partial class ExpressionDarkTheme : ResourceDictionary
+    {
+        public ExpressionDarkTheme()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/ThemeController.cs b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeController.cs
index 9cc89c93d6..751f293240 100644
--- a/sources/presentation/Xenko.Core.Presentation/Themes/ThemeController.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeController.cs
@@ -26,5 +26,7 @@ public static void SetIsDark(DependencyObject obj, bool value)
         {
             obj.SetValue(IsDarkProperty, value);
         }
+
+        public static ThemeType CurrentTheme { get; set; }
     }
 }
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/ThemeResourceDictionary.cs b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeResourceDictionary.cs
new file mode 100644
index 0000000000..7d697658c4
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeResourceDictionary.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Windows;
+
+namespace Xenko.Core.Presentation.Themes
+{
+    public class ThemeResourceDictionary : ResourceDictionary
+    {
+        private Uri expressionDarkSource;
+        private Uri darkSteelSource;
+
+        // New themes are added here as new properties.
+
+        public Uri ExpressionDarkSource
+        {
+            get => expressionDarkSource;
+            set => SetValue(ref expressionDarkSource,  value);
+        }
+
+        public Uri DarkSteelSource
+        {
+            get => darkSteelSource;
+            set => SetValue(ref darkSteelSource, value);
+        }
+
+        public void UpdateSource(ThemeType themeType)
+        {
+            switch (themeType)
+            {
+                case ThemeType.ExpressionDark:
+                    if (ExpressionDarkSource != null)
+                        Source = ExpressionDarkSource;
+                    break;
+
+                case ThemeType.DarkSteel:
+                    if (DarkSteelSource != null)
+                        Source = DarkSteelSource;
+                    break;
+            }
+        }
+
+        private void SetValue(ref Uri sourceBackingField, Uri value)
+        {
+            sourceBackingField = value;
+            UpdateSource(ThemeController.CurrentTheme);
+        }
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/ExpressionDark/Theme.xaml b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeSelector.xaml
similarity index 98%
rename from sources/presentation/Xenko.Core.Presentation/Themes/ExpressionDark/Theme.xaml
rename to sources/presentation/Xenko.Core.Presentation/Themes/ThemeSelector.xaml
index 6b5d2a8f73..bf74fc5642 100644
--- a/sources/presentation/Xenko.Core.Presentation/Themes/ExpressionDark/Theme.xaml
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeSelector.xaml
@@ -1,4 +1,8 @@
 <!--
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+//
+// Original code:
 // (c) Copyright Microsoft Corporation.
 // This source is subject to Microsoft Public License (Ms-PL).
 // Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
@@ -13,128 +17,28 @@
                     xmlns:cvt="clr-namespace:Xenko.Core.Presentation.ValueConverters"
                     xmlns:me="clr-namespace:Xenko.Core.Presentation.MarkupExtensions"
                     xmlns:behaviors="clr-namespace:Xenko.Core.Presentation.Behaviors"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:interactivity="clr-namespace:Xenko.Core.Presentation.Interactivity"
                     xmlns:commands="clr-namespace:Xenko.Core.Presentation.Controls.Commands"
                     xmlns:wnd="clr-namespace:Xenko.Core.Presentation.Windows"
                     xmlns:local="clr-namespace:Xenko.Core.Presentation"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
-                    x:Class="Xenko.Core.Presentation.Themes.ExpressionDark.ExpressionDarkTheme"
+                    xmlns:themes="clr-namespace:Xenko.Core.Presentation.Themes"
+                    x:Class="Xenko.Core.Presentation.Themes.ThemeSelector"
                     mc:Ignorable="d">
   <ResourceDictionary.MergedDictionaries>
-    <ResourceDictionary Source="../generic.xaml"/>
+    <ResourceDictionary Source="generic.xaml"/>
     <ResourceDictionary Source="pack://application:,,,/Xenko.Core.Presentation;component/Resources/VectorResources.xaml" />
+    <!--
+    // ExpressionDark is the default/fallback theme.
+    // When adding a new theme, ensure all themes:ThemeResourceDictionary in every *.xaml files
+    // are updated to ensure the theme is correctly applied.
+    -->
+    <themes:ThemeResourceDictionary Source="Overrides/ExpressionDarkTheme.xaml"
+                                    ExpressionDarkSource="Overrides/ExpressionDarkTheme.xaml"
+                                    DarkSteelSource="Overrides/DarkSteelTheme.xaml" />
   </ResourceDictionary.MergedDictionaries>
 
-  <!-- Main Colors -->
-
-  <Color x:Key="MainColor">#FF595959</Color>
-  <Color x:Key="HoverColor">#FF393939</Color>
-  <Color x:Key="DefaultColor">#FF9BB1C5</Color>
-  <SolidColorBrush x:Key="LightBrush" Color="#FF333333" />
-  <SolidColorBrush x:Key="ComboBoxBackground" Color="#212125" />
-
-  <Color x:Key="TopGradientSelectColor">#FFFFFFFF</Color>
-  <Color x:Key="BottomGradientSelectColor">#FF737373</Color>
-
-  <Color x:Key="BlackColor">#FF000000</Color>
-  <Color x:Key="WhiteColor">#FFFFFFFF</Color>
-
-  <SolidColorBrush x:Key="BackgroundBrush" Color="#1A1A1D"/>
-  <SolidColorBrush x:Key="TextBrush" Color="#E6E6E6" />
-  <SolidColorBrush x:Key="HyperlinkBrush" Color="#FF00A0FF" />
-  <SolidColorBrush x:Key="NormalBrush" Color="#3E3E40" />
-  <SolidColorBrush x:Key="NormalBorderBrush" Color="#FF333333" />
-  <SolidColorBrush x:Key="HoverBrush" Color="{StaticResource HoverColor}" />
-  <SolidColorBrush x:Key="GlyphBrush" Color="#FFD1D1D1" />
-
-  <SolidColorBrush x:Key="ScrollbarBackgroundNormal" Color="#161616" />
-  <SolidColorBrush x:Key="ScrollbarThumbNormal" Color="#333333" />
-  <SolidColorBrush x:Key="ScrollbarThumbHover" Color="#6F6F73" />
-
-  <SolidColorBrush x:Key="PressedBrush" Color="#7E000000"/>
-
-  <SolidColorBrush x:Key="RedBrush" Color="#FFDC4E4E"/>
-  <SolidColorBrush x:Key="GreenBrush" Color="#FF65C36A"/>
-  <SolidColorBrush x:Key="BlueBrush" Color="#FF3F74D1"/>
-  <SolidColorBrush x:Key="AlphaBrush" Color="#FFBCBCBC"/>
-  <SolidColorBrush x:Key="LengthBrush" Color="#FFBCBCBC"/>
-
-  <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#101011" />
-
-  <SolidColorBrush x:Key="SelectedBackgroundBrush" Color="#3399FF"/>
-
-  <Color x:Key="EmphasisGreenColor">#FF8ABB2E</Color>
-  <SolidColorBrush x:Key="EmphasisGreenBrush" Color="{StaticResource EmphasisGreenColor}"/>
-
-  <Color x:Key="EmphasisYellowColor">#FFFFCF00</Color>
-  <SolidColorBrush x:Key="EmphasisYellowBrush" Color="{StaticResource EmphasisYellowColor}"/>
-
-  <SolidColorBrush x:Key="DisabledForegroundBrush" Color="#656565" />
-  <SolidColorBrush x:Key="DisabledBackgroundBrush" Color="#040405" />
-  <SolidColorBrush x:Key="DisabledBorderBrush" Color="#AAA" />
-  <SolidColorBrush x:Key="WindowBackgroundBrush" Color="#FF595959" />
-
-  <SolidColorBrush x:Key="ToggleButtonNormalBackground" Color="#FF808080"/>
-  <SolidColorBrush x:Key="ComboToggleButtonBackground" Color="Transparent" />
-  <SolidColorBrush x:Key="ComboToggleButtonHoverBackground" Color="#1F1F20" />
-
-  <SolidColorBrush x:Key="ToggleButtonHoverBackground" Color="#FFAAAAAA"/>
-
-  <SolidColorBrush x:Key="ToolBarToggleButtonHoverBackground" Color="#FF878787"/>
-  <SolidColorBrush x:Key="ToolBarToggleButtonPressedBackground" Color="#FF969696"/>
-
-  <SolidColorBrush x:Key="DefaultedBorderBrush" Color="{StaticResource DefaultColor}" />
-  <SolidColorBrush x:Key="SolidBorderBrush" Color="#888" />
-  <SolidColorBrush x:Key="TextBoxBackgroundBrush" Color="#FF333333"/>
-  <SolidColorBrush x:Key="ButtonHoverBackgroundBrush" Color="#3E3E40"/>
-  <SolidColorBrush x:Key="MenuHoverBrush" Color="#333334"/>
-
-  <SolidColorBrush x:Key="CheckBoxBorderFocusBrush" Color="#FFE5E5E5"/>
-  <SolidColorBrush x:Key="HoverTextBorderBrush" Color="#FF6A6A6A"/>
-
-  <SolidColorBrush x:Key="MenuBackgroundBrush" Color="#040405"/>
-  <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF888888" />
-  <SolidColorBrush x:Key="ButtonNormalBackground" Color="#2D2D2D"/>
-
-  <SolidColorBrush x:Key="NormalTextBorderBrush" Color="#FF494949"/>
-
-  <SolidColorBrush x:Key="ToolBarButtonHover" Color="{StaticResource MainColor}" />
-  <SolidColorBrush x:Key="MenuBorderBrush" Color="#212125"/>
-
-  <SolidColorBrush x:Key="ListBorder" Color="#828790" />
-  <SolidColorBrush x:Key="ToolBarGripper" Color="#3A3A3A"/>
-  <SolidColorBrush x:Key="ToolBarSubMenuBackground" Color="#FFFDFDFD"/>
-  <SolidColorBrush x:Key="ToolBarMenuBorder" Color="#FFFFFFFF"/>
-  <SolidColorBrush x:Key="InnerExpanderBorderBrush" Color="#FF424242" />
-  <SolidColorBrush x:Key="InnerExpanderBackgroundBrush" Color="#FF525252"/>
-  <SolidColorBrush x:Key="ToolBarBackgroundBrush" Color="#FF101011"/>
-
-  <SolidColorBrush x:Key="MenuBlueGlyphs" Color="#007ACC" />
-
-  <DropShadowBitmapEffect x:Key="PopupDropShadow" ShadowDepth="1.5" Softness="0.15" />
-  <!-- EXPRESSION COMMON VALUES -->
-
-  <LinearGradientBrush x:Key="ShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
-    <GradientStop Color="#59FFFFFF" Offset="0" />
-    <GradientStop Color="#00FFFFFF" Offset="1" />
-    <GradientStop Color="#26FFFFFF" Offset="0.467" />
-    <GradientStop Color="#00FFFFFF" Offset="0.475" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="HoverShineBrush" EndPoint="0.5,0.971" StartPoint="0.5,0.042">
-    <GradientStop Color="#4CFFFFFF" Offset="0" />
-    <GradientStop Color="#26FFFFFF" Offset="1" />
-    <GradientStop Color="#26FFFFFF" Offset="0.467" />
-    <GradientStop Color="#00FFFFFF" Offset="0.475" />
-    <GradientStop Color="#00FFFFFF" Offset="0.856" />
-  </LinearGradientBrush>
-
-  <LinearGradientBrush x:Key="PressedBorderBrush" EndPoint="0,1" StartPoint="0,0">
-    <GradientStop Color="#444" Offset="0.0" />
-    <GradientStop Color="#888" Offset="1.0" />
-  </LinearGradientBrush>
-
   <Geometry x:Key="GeometryDebugMessage">F1 M 46.5,19C 47.8807,19 49,20.1193 49,21.5C 49,22.8807 47.8807,24 46.5,24L 45.8641,23.9184L 43.5566,26.8718C 45.1489,28.0176 46.5309,29.6405 47.6023,31.6025C 44.8701,32.4842 41.563,33 38,33C 34.4369,33 31.1299,32.4842 28.3977,31.6025C 29.4333,29.7061 30.7591,28.1265 32.2844,26.9882L 29.9221,23.9646C 29.7849,23.9879 29.6438,24 29.5,24C 28.1193,24 27,22.8808 27,21.5C 27,20.1193 28.1193,19 29.5,19C 30.8807,19 32,20.1193 32,21.5C 32,22.0018 31.8521,22.4691 31.5976,22.8607L 34.0019,25.938C 35.2525,25.3305 36.5982,25 38,25C 39.3339,25 40.617,25.2993 41.8156,25.8516L 44.2947,22.6786C 44.1066,22.3274 44,21.9262 44,21.5C 44,20.1193 45.1193,19 46.5,19 Z M 54.5,40C 55.3284,40 56,40.6716 56,41.5C 56,42.3284 55.3284,43 54.5,43L 49.9511,43C 49.88,44.0847 49.7325,45.1391 49.5162,46.1531L 54.8059,48.6197C 55.5567,48.9698 55.8815,49.8623 55.5314,50.6131C 55.1813,51.3639 54.2889,51.6887 53.5381,51.3386L 48.6665,49.067C 46.8161,53.9883 43.2172,57.4651 39,57.9435L 39,34.9864C 42.541,34.8897 45.7913,34.283 48.4239,33.3201L 48.6187,33.8074L 53.73,31.8454C 54.5034,31.5485 55.371,31.9348 55.6679,32.7082C 55.9648,33.4816 55.5785,34.3492 54.8051,34.6461L 49.482,36.6895C 49.717,37.7515 49.8763,38.859 49.9511,40L 54.5,40 Z M 21.5,40L 26.0489,40C 26.1237,38.859 26.2829,37.7516 26.518,36.6895L 21.1949,34.6461C 20.4215,34.3492 20.0352,33.4816 20.332,32.7082C 20.6289,31.9348 21.4966,31.5485 22.27,31.8454L 27.3812,33.8074L 27.5761,33.3201C 30.2087,34.283 33.4589,34.8897 37,34.9864L 37,57.9435C 32.7827,57.4651 29.1838,53.9883 27.3335,49.067L 22.4618,51.3387C 21.711,51.6888 20.8186,51.3639 20.4685,50.6131C 20.1184,49.8623 20.4432,48.9699 21.194,48.6198L 26.4838,46.1531C 26.2674,45.1392 26.12,44.0847 26.0489,43L 21.5,43C 20.6716,43 20,42.3285 20,41.5C 20,40.6716 20.6716,40 21.5,40 Z</Geometry>
   <Geometry x:Key="GeometryVerboseMessage">F1 M 40.3806,19.0027C 49.5637,19.0027 57.008,23.611 57.008,29.2958C 57.008,32.9008 54.0141,36.073 49.4815,37.9115C 50.4478,39.7772 52.1442,41.8291 53.8406,44.4135C 50.3128,43.1826 45.0382,41.9924 41.9082,39.546L 40.3806,39.5889C 31.1976,39.5889 23.7533,34.9805 23.7533,29.2958C 23.7533,23.611 31.1976,19.0027 40.3806,19.0027 Z M 44.3395,43.5477C 44.3395,48.3579 38.6677,52.2573 31.6711,52.2573L 30.7082,52.2325C 28.1329,54.6161 24.5589,57.008 20.5862,57.008C 21.5113,55.1577 23.5174,53.3075 24.7099,50.8257C 21.2717,49.2683 19.0026,46.5902 19.0026,43.5477C 19.0026,40.5065 21.27,37.8293 24.706,36.2715C 27.6472,39.1709 32.8586,41.0982 38.7973,41.0982L 40.3249,41.0553C 41.4454,41.9312 42.8409,42.646 44.3327,43.2594L 44.3395,43.5477 Z</Geometry>
   <Geometry x:Key="GeometryInfoMessage">F1 M 38,19C 48.4934,19 57,27.5066 57,38C 57,48.4934 48.4934,57 38,57C 27.5066,57 19,48.4934 19,38C 19,27.5066 27.5066,19 38,19 Z M 33.25,33.25L 33.25,36.4167L 36.4166,36.4167L 36.4166,47.5L 33.25,47.5L 33.25,50.6667L 44.3333,50.6667L 44.3333,47.5L 41.1666,47.5L 41.1666,36.4167L 41.1666,33.25L 33.25,33.25 Z M 38.7917,25.3333C 37.48,25.3333 36.4167,26.3967 36.4167,27.7083C 36.4167,29.02 37.48,30.0833 38.7917,30.0833C 40.1033,30.0833 41.1667,29.02 41.1667,27.7083C 41.1667,26.3967 40.1033,25.3333 38.7917,25.3333 Z</Geometry>
@@ -165,7 +69,6 @@
   <BitmapImage x:Key="ImageLocked" UriSource="pack://application:,,,/Xenko.Core.Presentation;component/Resources/Images/lock.png" />
   <BitmapImage x:Key="ImageUnlocked" UriSource="pack://application:,,,/Xenko.Core.Presentation;component/Resources/Images/lock-unlock.png" />
   <BitmapImage x:Key="ImageLength" UriSource="pack://application:,,,/Xenko.Core.Presentation;component/Resources/Images/ruler-triangle.png" />
-
   <!--  WINDOWS  -->
   <Style TargetType="{x:Type Window}" x:Key="WindowChromeStyle">
     <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
@@ -179,7 +82,7 @@
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="Window">
-          <Grid Background="#1A1A1D" Margin="6">
+          <Grid Background="{StaticResource BackgroundBrush}" Margin="6">
             <Border x:Name="ContentBorder" Background="{StaticResource BackgroundBrush}" BorderBrush="Black" BorderThickness="1" IsHitTestVisible="True">
               <DockPanel>
                 <DockPanel x:Name="TitleBar" DockPanel.Dock="Top" VerticalAlignment="Top" WindowChrome.IsHitTestVisibleInChrome="False"
@@ -2202,6 +2105,13 @@
     <Setter Property="Background" Value="{StaticResource BackgroundBrush}"/>
     <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
     <Setter Property="SnapsToDevicePixels" Value="True" />
+    <Setter Property="ItemsPanel">
+      <Setter.Value>
+        <ItemsPanelTemplate>
+          <StackPanel Background="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Menu}}}" IsItemsHost="True" ClipToBounds="True" Orientation="Horizontal" />
+        </ItemsPanelTemplate>
+      </Setter.Value>
+    </Setter>
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type Menu}">
@@ -2213,7 +2123,7 @@
           </ControlTemplate.Resources>
           <Grid>
             <Border Margin="1" x:Name="Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-            <StackPanel Background="{TemplateBinding Background}" IsItemsHost="True" ClipToBounds="True" Orientation="Horizontal" />
+            <ItemsPresenter/>
           </Grid>
           <ControlTemplate.Triggers>
             <Trigger Property="IsEnabled" Value="False">
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/ExpressionDark/Theme.xaml.cs b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeSelector.xaml.cs
similarity index 82%
rename from sources/presentation/Xenko.Core.Presentation/Themes/ExpressionDark/Theme.xaml.cs
rename to sources/presentation/Xenko.Core.Presentation/Themes/ThemeSelector.xaml.cs
index b8eb990011..c17fa80ea7 100644
--- a/sources/presentation/Xenko.Core.Presentation/Themes/ExpressionDark/Theme.xaml.cs
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeSelector.xaml.cs
@@ -5,11 +5,11 @@
 using System.Windows.Controls;
 using System.Windows.Media;
 
-namespace Xenko.Core.Presentation.Themes.ExpressionDark
+namespace Xenko.Core.Presentation.Themes
 {
-    public partial class ExpressionDarkTheme : ResourceDictionary
+    public partial class ThemeSelector : ResourceDictionary
     {
-        public ExpressionDarkTheme()
+        public ThemeSelector()
         {
             InitializeComponent();
         }
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/ThemeType.cs b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeType.cs
new file mode 100644
index 0000000000..65462394cc
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/ThemeType.cs
@@ -0,0 +1,13 @@
+// Copyright (c) Xenko contributors (https://xenko.com)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+namespace Xenko.Core.Presentation.Themes
+{
+    public enum ThemeType
+    {
+        [Display("Expression Dark (Default)")]
+        ExpressionDark,
+        [Display("Dark Steel")]
+        DarkSteel,
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/Themes/generic.xaml b/sources/presentation/Xenko.Core.Presentation/Themes/generic.xaml
index e7fb6c7dd2..ec29398ddd 100644
--- a/sources/presentation/Xenko.Core.Presentation/Themes/generic.xaml
+++ b/sources/presentation/Xenko.Core.Presentation/Themes/generic.xaml
@@ -7,7 +7,7 @@
                     xmlns:mwt="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
                     xmlns:interactivity="clr-namespace:Xenko.Core.Presentation.Interactivity"
                     xmlns:behaviors="clr-namespace:Xenko.Core.Presentation.Behaviors"
-                    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:xk="http://schemas.xenko.com/xaml/presentation"
                     mc:Ignorable="d">
 
diff --git a/sources/presentation/Xenko.Core.Presentation/ValueConverters/IntToBool.cs b/sources/presentation/Xenko.Core.Presentation/ValueConverters/IntToBool.cs
new file mode 100644
index 0000000000..5b394be226
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/ValueConverters/IntToBool.cs
@@ -0,0 +1,26 @@
+// Copyright (c) .NET Foundation and Contributors (https://dotnetfoundation.org/ & https://stride3d.net)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Xenko.Core.Presentation.ValueConverters
+{
+    /// <summary>
+    /// This converter will convert an <see cref="int"/> value to a boolean.
+    /// </summary>
+    public class IntToBool : ValueConverterBase<IntToBool>
+    {
+        /// <inheritdoc/>
+        public override object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return System.Convert.ToInt32(value) == System.Convert.ToInt32(parameter);
+        }
+
+        /// <inheritdoc/>
+        public override object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ((bool)value) ? parameter : Binding.DoNothing;
+        }
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/ValueConverters/TypeToNamespace.cs b/sources/presentation/Xenko.Core.Presentation/ValueConverters/TypeToNamespace.cs
new file mode 100644
index 0000000000..1660484cc1
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/ValueConverters/TypeToNamespace.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Globalization;
+using Xenko.Core.Annotations;
+
+namespace Xenko.Core.Presentation.ValueConverters
+{
+    /// <summary>
+    /// Converts the type to its namespace.
+    /// </summary>
+    public class TypeToNamespace : OneWayValueConverter<TypeToNamespace>
+    {
+        /// <inheritdoc/>
+        public override object Convert(object value, [NotNull] Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is null)
+                return null;
+
+            Type type = (Type)value;
+            if (parameter is null)
+                return type.Namespace;
+            return parameter.ToString().Replace("$", type.Namespace);
+        }
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/ValueConverters/TypeToTypeName.cs b/sources/presentation/Xenko.Core.Presentation/ValueConverters/TypeToTypeName.cs
new file mode 100644
index 0000000000..cb8b78aed3
--- /dev/null
+++ b/sources/presentation/Xenko.Core.Presentation/ValueConverters/TypeToTypeName.cs
@@ -0,0 +1,26 @@
+// Copyright (c) Stride contributors (https://stride3d.net) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Globalization;
+using Xenko.Core.Annotations;
+
+namespace Xenko.Core.Presentation.ValueConverters
+{
+    /// <summary>
+    /// Converts the type to its type name.
+    /// </summary>
+    public class TypeToTypeName : OneWayValueConverter<TypeToTypeName>
+    {
+        /// <inheritdoc/>
+        public override object Convert(object value, [NotNull] Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is null)
+                return null;
+
+            Type type = (Type)value;
+            if (parameter is null)
+                return type.Name;
+            return parameter.ToString().Replace("$", type.Name);
+        }
+    }
+}
diff --git a/sources/presentation/Xenko.Core.Presentation/ViewModel/EditableViewModel.cs b/sources/presentation/Xenko.Core.Presentation/ViewModel/EditableViewModel.cs
index 73a7a89e5c..b697c0c042 100644
--- a/sources/presentation/Xenko.Core.Presentation/ViewModel/EditableViewModel.cs
+++ b/sources/presentation/Xenko.Core.Presentation/ViewModel/EditableViewModel.cs
@@ -293,7 +293,7 @@ private void CollectionChanged([NotNull] object sender, [NotNull] NotifyCollecti
             {
                 var toIListMethod = sender.GetType().GetMethod("ToIList");
                 if (toIListMethod != null)
-                    list = (IList)toIListMethod.Invoke(sender, new object[0]);
+                    list = (IList)toIListMethod.Invoke(sender, Array.Empty<object>());
             }
             if (!UndoRedoService.UndoRedoInProgress && !suspendedCollections.Contains(collectionName))
             {
diff --git a/sources/presentation/Xenko.Core.Presentation/ViewModel/ViewModelBase.cs b/sources/presentation/Xenko.Core.Presentation/ViewModel/ViewModelBase.cs
index d3b5c669a6..57f2e6f269 100644
--- a/sources/presentation/Xenko.Core.Presentation/ViewModel/ViewModelBase.cs
+++ b/sources/presentation/Xenko.Core.Presentation/ViewModel/ViewModelBase.cs
@@ -184,7 +184,7 @@ protected bool SetValue(Func<bool> hasChangedFunction, Action updateAction, [Cal
 
         /// <summary>
         /// Manages a property modification and its notifications. The first parameter <see cref="hasChanged"/> should indicate whether the property
-        /// should actuallybe updated. If this parameter is <c>True</c>, it will invoke the provided update action. The <see cref="PropertyChanging"/>
+        /// should actually be updated. If this parameter is <c>True</c>, it will invoke the provided update action. The <see cref="PropertyChanging"/>
         /// event will be raised prior to the update action, and the <see cref="PropertyChanged"/> event will be raised after.
         /// </summary>
         /// <param name="hasChanged">A boolean that indicates whether the update must be actually done. If <c>null</c>, the update is always done.</param>
diff --git a/sources/presentation/Xenko.Core.Presentation/Xenko.Core.Presentation.csproj b/sources/presentation/Xenko.Core.Presentation/Xenko.Core.Presentation.csproj
index db8bd92c5e..abdae798a6 100644
--- a/sources/presentation/Xenko.Core.Presentation/Xenko.Core.Presentation.csproj
+++ b/sources/presentation/Xenko.Core.Presentation/Xenko.Core.Presentation.csproj
@@ -1,7 +1,7 @@
 <Project>
 
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <XenkoBuildTags>WindowsTools</XenkoBuildTags>
@@ -15,13 +15,9 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="Microsoft.Windows.Shell" Version="3.0.1" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="PresentationFramework.Aero" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -33,6 +29,7 @@
 
   <ItemGroup>
     <Page Include="**\*.xaml" SubType="Designer" Generator="MSBuild:Compile" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <Compile Update="**\*.xaml.cs" SubType="Code" DependentUpon="%(Filename)" />
   </ItemGroup>
 
@@ -61,14 +58,5 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
-
-  <PropertyGroup>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeExtraAssemblies</TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-  <Target Name="IncludeExtraAssemblies">
-    <ItemGroup>
-      <BuildOutputInPackage Include="$(OutputPath)System.Windows.Interactivity.dll" />
-    </ItemGroup>
-  </Target>
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestCollections.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestCollections.cs
index 01210f38b5..b6f7523498 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestCollections.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestCollections.cs
@@ -34,14 +34,14 @@ public void TestOverwriteCollection()
             var container = new ListContainer { List = { new SimpleObject(), new SimpleObject() } };
             var containerNode = nodeContainer.GetOrCreateNode(container);
             var oldList = container.List;
-            var oldItem1Node = containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new Index(0));
-            var oldItem2Node = containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new Index(1));
+            var oldItem1Node = containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new NodeIndex(0));
+            var oldItem2Node = containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new NodeIndex(1));
             containerNode[nameof(ListContainer.List)].Update(new List<SimpleObject> { new SimpleObject(), new SimpleObject() });
             Assert.NotEqual(oldList, containerNode[nameof(ListContainer.List)].Retrieve());
-            Assert.NotEqual(oldItem1Node, containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new Index(0)));
-            Assert.NotEqual(oldItem1Node.Retrieve(), containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new Index(0)).Retrieve());
-            Assert.NotEqual(oldItem2Node, containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new Index(1)));
-            Assert.NotEqual(oldItem2Node.Retrieve(), containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new Index(1)).Retrieve());
+            Assert.NotEqual(oldItem1Node, containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new NodeIndex(0)));
+            Assert.NotEqual(oldItem1Node.Retrieve(), containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new NodeIndex(0)).Retrieve());
+            Assert.NotEqual(oldItem2Node, containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new NodeIndex(1)));
+            Assert.NotEqual(oldItem2Node.Retrieve(), containerNode[nameof(ListContainer.List)].Target.IndexedTarget(new NodeIndex(1)).Retrieve());
         }
 
         [Fact]
@@ -64,7 +64,7 @@ public void TestMultipleTimesSameObject()
             VerifyItem(memberNode, 3, items[1], false);
             VerifyItem(memberNode, 4, items[0], false);
 
-            memberNode.Target.Update(items[1], new Index(2));
+            memberNode.Target.Update(items[1], new NodeIndex(2));
             VerifyItem(memberNode, 0, items[0], false);
             VerifyItem(memberNode, 1, items[1], false);
             VerifyItem(memberNode, 2, items[1], false);
@@ -91,7 +91,7 @@ public void TestObjectListWithSimpleObjects()
             VerifyItem(memberNode, 2, items[2], false);
 
             // Update existing item (with a different type here)
-            memberNode.Target.Update(items[3], new Index(2));
+            memberNode.Target.Update(items[3], new NodeIndex(2));
             VerifyItem(memberNode, 0, items[0], false);
             VerifyItem(memberNode, 1, items[1], false);
             VerifyItem(memberNode, 2, items[3], false);
@@ -117,7 +117,7 @@ public void TestObjectListWithBoxedPrimitiveValue()
             VerifyItem(memberNode, 2, 3.0f, true);
 
             // Update existing item (with a different type here)
-            memberNode.Target.Update(4.0, new Index(2));
+            memberNode.Target.Update(4.0, new NodeIndex(2));
             VerifyItem(memberNode, 0, 1.0f, true);
             VerifyItem(memberNode, 1, 2.0f, true);
             VerifyItem(memberNode, 2, 4.0, true);
@@ -137,11 +137,11 @@ public void TestListInObjectMember()
             Assert.True(containerNode[nameof(ListContainer.ObjectMember)].IsReference);
             Assert.NotNull(containerNode[nameof(ListContainer.ObjectMember)].Target.Indices);
             Assert.Equal(2, containerNode[nameof(ListContainer.ObjectMember)].Target.Indices.Count());
-            Assert.Equal(new Index(0), containerNode[nameof(ListContainer.ObjectMember)].Target.Indices.ToList()[0]);
-            Assert.Equal(new Index(1), containerNode[nameof(ListContainer.ObjectMember)].Target.Indices.ToList()[1]);
+            Assert.Equal(new NodeIndex(0), containerNode[nameof(ListContainer.ObjectMember)].Target.Indices.ToList()[0]);
+            Assert.Equal(new NodeIndex(1), containerNode[nameof(ListContainer.ObjectMember)].Target.Indices.ToList()[1]);
             Assert.Equal(TypeDescriptorFactory.Default.Find(typeof(object)), containerNode[nameof(ListContainer.ObjectMember)].Descriptor);
-            Assert.Equal(((IList)values[1])[0], containerNode[nameof(ListContainer.ObjectMember)].Target.IndexedTarget(new Index(0)));
-            Assert.Equal(((IList)values[1])[1], containerNode[nameof(ListContainer.ObjectMember)].Target.IndexedTarget(new Index(1)));
+            Assert.Equal(((IList)values[1])[0], containerNode[nameof(ListContainer.ObjectMember)].Target.IndexedTarget(new NodeIndex(0)));
+            Assert.Equal(((IList)values[1])[1], containerNode[nameof(ListContainer.ObjectMember)].Target.IndexedTarget(new NodeIndex(1)));
             Assert.Equal(typeof(object), containerNode[nameof(ListContainer.ObjectMember)].Type);
             // TODO: more things could be checked!
             containerNode[nameof(ListContainer.ObjectMember)].Update(values[2]);
@@ -153,7 +153,7 @@ private static void VerifyItem(IMemberNode listMemberNode, int index, object exp
         {
             var targetNode = listMemberNode.Target;
             var enumRef = targetNode.ItemReferences;
-            var indexValue = new Index(index);
+            var indexValue = new NodeIndex(index);
 
             Assert.NotNull(enumRef);
             Assert.NotNull(targetNode.Indices);
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestDynamicNode.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestDynamicNode.cs
index ac927a9ebf..ae4df84f00 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestDynamicNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestDynamicNode.cs
@@ -183,7 +183,7 @@ public void TestChangePrimitiveListItem()
             dynNode.Member5[0] = obj[1];
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(obj[1], (string)dynNode.Member5[0]);
-            rootNode[nameof(ComplexClass.Member5)].Target.Update(obj[2], new Index(0));
+            rootNode[nameof(ComplexClass.Member5)].Target.Update(obj[2], new NodeIndex(0));
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(obj[2], (string)dynNode.Member5[0]);
         }
@@ -201,7 +201,7 @@ public void TestAddPrimitiveListItem()
             dynNode.Member5.Add(obj[1]);
             Assert.Equal(instance.Member5[1], (string)dynNode.Member5[1]);
             Assert.Equal(obj[1], (string)dynNode.Member5[1]);
-            rootNode[nameof(ComplexClass.Member5)].Target.Add(obj[2], new Index(2));
+            rootNode[nameof(ComplexClass.Member5)].Target.Add(obj[2], new NodeIndex(2));
             Assert.Equal(instance.Member5[2], (string)dynNode.Member5[2]);
             Assert.Equal(obj[2], (string)dynNode.Member5[2]);
         }
@@ -216,12 +216,12 @@ public void TestInsertPrimitiveListItem()
             var dynNode = DynamicNode.FromNode(rootNode);
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(obj[0], (string)dynNode.Member5[0]);
-            dynNode.Member5.Insert(obj[1], new Index(0));
+            dynNode.Member5.Insert(obj[1], new NodeIndex(0));
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(instance.Member5[1], (string)dynNode.Member5[1]);
             Assert.Equal(obj[1], (string)dynNode.Member5[0]);
             Assert.Equal(obj[0], (string)dynNode.Member5[1]);
-            rootNode[nameof(ComplexClass.Member5)].Target.Add(obj[2], new Index(1));
+            rootNode[nameof(ComplexClass.Member5)].Target.Add(obj[2], new NodeIndex(1));
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(instance.Member5[1], (string)dynNode.Member5[1]);
             Assert.Equal(instance.Member5[2], (string)dynNode.Member5[2]);
@@ -244,12 +244,12 @@ public void TestRemovePrimitiveListItem()
             Assert.Equal(obj[0], (string)dynNode.Member5[0]);
             Assert.Equal(obj[1], (string)dynNode.Member5[1]);
             Assert.Equal(obj[2], (string)dynNode.Member5[2]);
-            dynNode.Member5.Remove(obj[1], new Index(1));
+            dynNode.Member5.Remove(obj[1], new NodeIndex(1));
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(instance.Member5[1], (string)dynNode.Member5[1]);
             Assert.Equal(obj[0], (string)dynNode.Member5[0]);
             Assert.Equal(obj[2], (string)dynNode.Member5[1]);
-            rootNode[nameof(ComplexClass.Member5)].Target.Remove(obj[2], new Index(1));
+            rootNode[nameof(ComplexClass.Member5)].Target.Remove(obj[2], new NodeIndex(1));
             Assert.Equal(instance.Member5[0], (string)dynNode.Member5[0]);
             Assert.Equal(obj[0], (string)dynNode.Member5[0]);
         }
@@ -285,7 +285,7 @@ public void TestChangeReferenceListItem()
             dynNode.Member6[0] = obj[1];
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[1], (SimpleClass)dynNode.Member6[0]);
-            rootNode[nameof(ComplexClass.Member6)].Target.Update(obj[2], new Index(0));
+            rootNode[nameof(ComplexClass.Member6)].Target.Update(obj[2], new NodeIndex(0));
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[2], (SimpleClass)dynNode.Member6[0]);
         }
@@ -303,7 +303,7 @@ public void TestAddReferenceListItem()
             dynNode.Member6.Add(obj[1]);
             Assert.Equal(instance.Member6[1], (SimpleClass)dynNode.Member6[1]);
             Assert.Equal(obj[1], (SimpleClass)dynNode.Member6[1]);
-            rootNode[nameof(ComplexClass.Member6)].Target.Add(obj[2], new Index(2));
+            rootNode[nameof(ComplexClass.Member6)].Target.Add(obj[2], new NodeIndex(2));
             Assert.Equal(instance.Member6[2], (SimpleClass)dynNode.Member6[2]);
             Assert.Equal(obj[2], (SimpleClass)dynNode.Member6[2]);
         }
@@ -318,12 +318,12 @@ public void TestInsertReferenceListItem()
             var dynNode = DynamicNode.FromNode(rootNode);
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[0], (SimpleClass)dynNode.Member6[0]);
-            dynNode.Member6.Insert(obj[1], new Index(0));
+            dynNode.Member6.Insert(obj[1], new NodeIndex(0));
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(instance.Member6[1], (SimpleClass)dynNode.Member6[1]);
             Assert.Equal(obj[1], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[0], (SimpleClass)dynNode.Member6[1]);
-            rootNode[nameof(ComplexClass.Member6)].Target.Add(obj[2], new Index(1));
+            rootNode[nameof(ComplexClass.Member6)].Target.Add(obj[2], new NodeIndex(1));
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(instance.Member6[1], (SimpleClass)dynNode.Member6[1]);
             Assert.Equal(instance.Member6[2], (SimpleClass)dynNode.Member6[2]);
@@ -346,12 +346,12 @@ public void TestRemoveReferenceListItem()
             Assert.Equal(obj[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[1], (SimpleClass)dynNode.Member6[1]);
             Assert.Equal(obj[2], (SimpleClass)dynNode.Member6[2]);
-            dynNode.Member6.Remove(obj[1], new Index(1));
+            dynNode.Member6.Remove(obj[1], new NodeIndex(1));
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(instance.Member6[1], (SimpleClass)dynNode.Member6[1]);
             Assert.Equal(obj[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[2], (SimpleClass)dynNode.Member6[1]);
-            rootNode[nameof(ComplexClass.Member6)].Target.Remove(obj[2], new Index(1));
+            rootNode[nameof(ComplexClass.Member6)].Target.Remove(obj[2], new NodeIndex(1));
             Assert.Equal(instance.Member6[0], (SimpleClass)dynNode.Member6[0]);
             Assert.Equal(obj[0], (SimpleClass)dynNode.Member6[0]);
         }
@@ -369,7 +369,7 @@ public void TestChangeReferenceListItemMember()
             dynNode.Member6[1].Member1 = obj[1];
             Assert.Equal(obj[1], (int)dynNode.Member6[1].Member1);
             Assert.Equal(instance.Member6[1].Member1, (int)dynNode.Member6[1].Member1);
-            Index index = new Index(1);
+            NodeIndex index = new NodeIndex(1);
             rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)].Update(obj[2]);
             Assert.Equal(obj[2], (int)dynNode.Member6[1].Member1);
             Assert.Equal(instance.Member6[1].Member1, (int)dynNode.Member6[1].Member1);
@@ -406,7 +406,7 @@ public void TestChangeStructListItem()
             dynNode.Member7[0] = obj[1];
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[1], (Struct)dynNode.Member7[0]);
-            rootNode[nameof(ComplexClass.Member7)].Target.Update(obj[2], new Index(0));
+            rootNode[nameof(ComplexClass.Member7)].Target.Update(obj[2], new NodeIndex(0));
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[2], (Struct)dynNode.Member7[0]);
         }
@@ -424,7 +424,7 @@ public void TestAddStructListItem()
             dynNode.Member7.Add(obj[1]);
             Assert.Equal(instance.Member7[1], (Struct)dynNode.Member7[1]);
             Assert.Equal(obj[1], (Struct)dynNode.Member7[1]);
-            rootNode[nameof(ComplexClass.Member7)].Target.Add(obj[2], new Index(2));
+            rootNode[nameof(ComplexClass.Member7)].Target.Add(obj[2], new NodeIndex(2));
             Assert.Equal(instance.Member7[2], (Struct)dynNode.Member7[2]);
             Assert.Equal(obj[2], (Struct)dynNode.Member7[2]);
         }
@@ -439,12 +439,12 @@ public void TestInsertStructListItem()
             var dynNode = DynamicNode.FromNode(rootNode);
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[0], (Struct)dynNode.Member7[0]);
-            dynNode.Member7.Insert(obj[1], new Index(0));
+            dynNode.Member7.Insert(obj[1], new NodeIndex(0));
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(instance.Member7[1], (Struct)dynNode.Member7[1]);
             Assert.Equal(obj[1], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[0], (Struct)dynNode.Member7[1]);
-            rootNode[nameof(ComplexClass.Member7)].Target.Add(obj[2], new Index(1));
+            rootNode[nameof(ComplexClass.Member7)].Target.Add(obj[2], new NodeIndex(1));
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(instance.Member7[1], (Struct)dynNode.Member7[1]);
             Assert.Equal(instance.Member7[2], (Struct)dynNode.Member7[2]);
@@ -467,12 +467,12 @@ public void TestRemoveStructListItem()
             Assert.Equal(obj[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[1], (Struct)dynNode.Member7[1]);
             Assert.Equal(obj[2], (Struct)dynNode.Member7[2]);
-            dynNode.Member7.Remove(obj[1], new Index(1));
+            dynNode.Member7.Remove(obj[1], new NodeIndex(1));
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(instance.Member7[1], (Struct)dynNode.Member7[1]);
             Assert.Equal(obj[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[2], (Struct)dynNode.Member7[1]);
-            rootNode[nameof(ComplexClass.Member7)].Target.Remove(obj[2], new Index(1));
+            rootNode[nameof(ComplexClass.Member7)].Target.Remove(obj[2], new NodeIndex(1));
             Assert.Equal(instance.Member7[0], (Struct)dynNode.Member7[0]);
             Assert.Equal(obj[0], (Struct)dynNode.Member7[0]);
         }
@@ -490,7 +490,7 @@ public void TestChangeStructListItemMember()
             dynNode.Member7[1].Member1 = obj[1];
             Assert.Equal(obj[1], (string)dynNode.Member7[1].Member1);
             Assert.Equal(instance.Member7[1].Member1, (string)dynNode.Member7[1].Member1);
-            Index index = new Index(1);
+            NodeIndex index = new NodeIndex(1);
             rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)].Update(obj[2]);
             Assert.Equal(obj[2], (string)dynNode.Member7[1].Member1);
             Assert.Equal(instance.Member7[1].Member1, (string)dynNode.Member7[1].Member1);
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeChangeListener.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeChangeListener.cs
index 619473e458..d0079f68e7 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeChangeListener.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeChangeListener.cs
@@ -41,9 +41,9 @@ public void TestChangePrimitiveMember()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member1)];
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member1)], ContentChangeType.ValueChange, Index.Empty, 3, 4, x => x.Update(4));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, 3, 4, x => x.Update(4));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member1)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member1)], ContentChangeType.ValueChange, Index.Empty, 4, 5, x => x.Update(5));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, 4, 5, x => x.Update(5));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member1)]);
         }
 
@@ -57,9 +57,9 @@ public void TestChangeReferenceMember()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member2)];
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member2)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member2)]);
         }
 
@@ -73,9 +73,9 @@ public void TestChangeReferenceMemberToNull()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member2)];
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member2)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member2)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member2)]);
         }
 
@@ -88,9 +88,9 @@ public void TestChangeBoxedPrimitiveMember()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member3)];
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, Index.Empty, 3, 4, x => x.Update(4));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, NodeIndex.Empty, 3, 4, x => x.Update(4));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member3)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, Index.Empty, 4, 5, x => x.Update(5));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, NodeIndex.Empty, 4, 5, x => x.Update(5));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member3)]);
         }
 
@@ -104,9 +104,9 @@ public void TestChangeReferenceInObjectMember()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member3)];
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member3)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member3)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member3)]);
         }
 
@@ -121,13 +121,13 @@ public void TestChangeStruct()
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member4)];
             Assert.Equal("aa", node.Target[nameof(Struct.Member1)].Retrieve());
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal("bb", node.Target[nameof(Struct.Member1)].Retrieve());
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member4)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal("cc", node.Target[nameof(Struct.Member1)].Retrieve());
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member4)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)], ContentChangeType.ValueChange, Index.Empty, "cc", "dd", x => x.Update("dd"));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, "cc", "dd", x => x.Update("dd"));
             Assert.Equal("dd", node.Target[nameof(Struct.Member1)].Retrieve());
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member4)]);
         }
@@ -143,10 +143,10 @@ public void TestChangeStructMember()
             listener.Initialize();
             var targetNode = rootNode[nameof(ComplexClass.Member4)].Target;
             var node = targetNode[nameof(Struct.Member1)];
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal(targetNode, rootNode[nameof(ComplexClass.Member4)].Target);
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal(targetNode, rootNode[nameof(ComplexClass.Member4)].Target);
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member4)].Target[nameof(Struct.Member1)]);
         }
@@ -161,15 +161,15 @@ public void TestChangePrimitiveList()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member5)];
-            Assert.Equal("aa", node.Retrieve(new Index(0)));
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member5)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
-            Assert.Equal("bb", node.Retrieve(new Index(0)));
+            Assert.Equal("aa", node.Retrieve(new NodeIndex(0)));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member5)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            Assert.Equal("bb", node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member5)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
-            Assert.Equal("cc", node.Retrieve(new Index(0)));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member5)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            Assert.Equal("cc", node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionUpdate, new Index(0), "cc", "dd", x => x.Update("dd", new Index(0)));
-            Assert.Equal("dd", node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), "cc", "dd", x => x.Update("dd", new NodeIndex(0)));
+            Assert.Equal("dd", node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
         }
 
@@ -183,12 +183,12 @@ public void TestChangePrimitiveListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member5)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[0], obj[1], x => x.Update(obj[1], new Index(0)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(0)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[0], obj[1], x => x.Update(obj[1], new NodeIndex(0)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[1], obj[2], x => x.Update(obj[2], new Index(0)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[1], obj[2], x => x.Update(obj[2], new NodeIndex(0)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
         }
 
@@ -202,12 +202,12 @@ public void TestAddPrimitiveListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member5)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionAdd, new Index(1), null, obj[1], x => x.Add(obj[1], new Index(1)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionAdd, new NodeIndex(1), null, obj[1], x => x.Add(obj[1], new NodeIndex(1)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(1)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionAdd, new Index(2), null, obj[2], x => x.Add(obj[2], new Index(2)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(2)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionAdd, new NodeIndex(2), null, obj[2], x => x.Add(obj[2], new NodeIndex(2)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(2)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
         }
 
@@ -221,15 +221,15 @@ public void TestRemovePrimitiveListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member5)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(1)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(2)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionRemove, new Index(1), obj[1], null, x => x.Remove(obj[1], new Index(1)));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(1)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(2)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionRemove, new NodeIndex(1), obj[1], null, x => x.Remove(obj[1], new NodeIndex(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(1)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionRemove, new Index(1), obj[2], null, x => x.Remove(obj[2], new Index(1)));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member5)].Target, ContentChangeType.CollectionRemove, new NodeIndex(1), obj[2], null, x => x.Remove(obj[2], new NodeIndex(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member5)]);
         }
 
@@ -243,16 +243,16 @@ public void TestChangeReferenceList()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member6)];
-            Assert.Equal(obj[0][0], node.Retrieve(new Index(0)));
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
-            Assert.Equal(obj[1][0], node.Retrieve(new Index(0)));
+            Assert.Equal(obj[0][0], node.Retrieve(new NodeIndex(0)));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            Assert.Equal(obj[1][0], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
-            Assert.Equal(obj[2][0], node.Retrieve(new Index(0)));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            Assert.Equal(obj[2][0], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
             var newItem = new SimpleClass();
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[2][0], newItem, x => x.Update(newItem, new Index(0)));
-            Assert.Equal(newItem, node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[2][0], newItem, x => x.Update(newItem, new NodeIndex(0)));
+            Assert.Equal(newItem, node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
         }
 
@@ -266,12 +266,12 @@ public void TestChangeReferenceListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member6)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[0], obj[1], x => x.Update(obj[1], new Index(0)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(0)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[0], obj[1], x => x.Update(obj[1], new NodeIndex(0)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[1], obj[2], x => x.Update(obj[2], new Index(0)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[1], obj[2], x => x.Update(obj[2], new NodeIndex(0)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
         }
 
@@ -285,12 +285,12 @@ public void TestAddReferenceListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member6)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionAdd, new Index(1), null, obj[1], x => x.Add(obj[1], new Index(1)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionAdd, new NodeIndex(1), null, obj[1], x => x.Add(obj[1], new NodeIndex(1)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(1)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionAdd, new Index(2), null, obj[2], x => x.Add(obj[2], new Index(2)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(2)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionAdd, new NodeIndex(2), null, obj[2], x => x.Add(obj[2], new NodeIndex(2)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(2)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
         }
 
@@ -304,15 +304,15 @@ public void TestRemoveReferenceListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member6)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(1)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(2)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionRemove, new Index(1), obj[1], null, x => x.Remove(obj[1], new Index(1)));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(1)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(2)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionRemove, new NodeIndex(1), obj[1], null, x => x.Remove(obj[1], new NodeIndex(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(1)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionRemove, new Index(1), obj[2], null, x => x.Remove(obj[2], new Index(1)));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target, ContentChangeType.CollectionRemove, new NodeIndex(1), obj[2], null, x => x.Remove(obj[2], new NodeIndex(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)]);
         }
 
@@ -325,13 +325,13 @@ public void TestChangeReferenceListItemMember()
             var rootNode = nodeContainer.GetOrCreateNode(instance);
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
-            Index index = new Index(1);
+            NodeIndex index = new NodeIndex(1);
             var node = rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)];
             Assert.Equal(obj[0], node.Retrieve());
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal(obj[1], node.Retrieve());
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal(obj[2], node.Retrieve());
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member6)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)]);
         }
@@ -346,19 +346,19 @@ public void TestChangeStructList()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member7)];
-            Assert.Equal(obj[0][0], node.Retrieve(new Index(0)));
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
-            Assert.Equal(obj[1][0], node.Retrieve(new Index(0)));
+            Assert.Equal(obj[0][0], node.Retrieve(new NodeIndex(0)));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            Assert.Equal(obj[1][0], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
-            Assert.Equal(obj[2][0], node.Retrieve(new Index(0)));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            Assert.Equal(obj[2][0], node.Retrieve(new NodeIndex(0)));
             var newItem = new Struct();
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
-            var itemNode = rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(0));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[2][0], newItem, x => x.Update(newItem, new Index(0)));
-            Assert.Equal(newItem, node.Retrieve(new Index(0)));
+            var itemNode = rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(0));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[2][0], newItem, x => x.Update(newItem, new NodeIndex(0)));
+            Assert.Equal(newItem, node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
-            Assert.Equal(itemNode, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(0)));
+            Assert.Equal(itemNode, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(0)));
         }
 
         [Fact]
@@ -371,18 +371,18 @@ public void TestChangeStructListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member7)];
-            var itemNode = rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(0));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[0], obj[1], x => x.Update(obj[1], new Index(0)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(0)));
+            var itemNode = rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(0));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[0], obj[1], x => x.Update(obj[1], new NodeIndex(0)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
             // TODO: would be nice to be able to keep the same boxed node!
-            Assert.Equal(itemNode, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionUpdate, new Index(0), obj[1], obj[2], x => x.Update(obj[2], new Index(0)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(0)));
+            Assert.Equal(itemNode, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionUpdate, new NodeIndex(0), obj[1], obj[2], x => x.Update(obj[2], new NodeIndex(0)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
             // TODO: would be nice to be able to keep the same boxed node!
-            Assert.Equal(itemNode, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(0)));
+            Assert.Equal(itemNode, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(0)));
         }
 
         [Fact]
@@ -395,12 +395,12 @@ public void TestAddStructListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member7)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionAdd, new Index(1), null, obj[1], x => x.Add(obj[1], new Index(1)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionAdd, new NodeIndex(1), null, obj[1], x => x.Add(obj[1], new NodeIndex(1)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(1)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionAdd, new Index(2), null, obj[2], x => x.Add(obj[2], new Index(2)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(2)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionAdd, new NodeIndex(2), null, obj[2], x => x.Add(obj[2], new NodeIndex(2)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(2)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
         }
 
@@ -414,15 +414,15 @@ public void TestRemoveStructListItem()
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
             var node = rootNode[nameof(ComplexClass.Member7)];
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            Assert.Equal(obj[1], node.Retrieve(new Index(1)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(2)));
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionRemove, new Index(1), obj[1], null, x => x.Remove(obj[1], new Index(1)));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
-            Assert.Equal(obj[2], node.Retrieve(new Index(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            Assert.Equal(obj[1], node.Retrieve(new NodeIndex(1)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(2)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionRemove, new NodeIndex(1), obj[1], null, x => x.Remove(obj[1], new NodeIndex(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
+            Assert.Equal(obj[2], node.Retrieve(new NodeIndex(1)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
-            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionRemove, new Index(1), obj[2], null, x => x.Remove(obj[2], new Index(1)));
-            Assert.Equal(obj[0], node.Retrieve(new Index(0)));
+            TestItemChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target, ContentChangeType.CollectionRemove, new NodeIndex(1), obj[2], null, x => x.Remove(obj[2], new NodeIndex(1)));
+            Assert.Equal(obj[0], node.Retrieve(new NodeIndex(0)));
             Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)]);
         }
 
@@ -435,15 +435,15 @@ public void TestChangeStructListItemMember()
             var rootNode = nodeContainer.GetOrCreateNode(instance);
             var listener = new GraphNodeChangeListener(rootNode);
             listener.Initialize();
-            Index index = new Index(1);
+            NodeIndex index = new NodeIndex(1);
             var node = rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)];
             Assert.Equal(obj[0], node.Retrieve());
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, Index.Empty, obj[0], obj[1], x => x.Update(obj[1]));
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[0], obj[1], x => x.Update(obj[1]));
             Assert.Equal(obj[1], node.Retrieve());
-            Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member1)]);
-            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, Index.Empty, obj[1], obj[2], x => x.Update(obj[2]));
+            Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member1)]);
+            TestContentChange(listener, () => rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(index)[nameof(SimpleClass.Member1)], ContentChangeType.ValueChange, NodeIndex.Empty, obj[1], obj[2], x => x.Update(obj[2]));
             Assert.Equal(obj[2], node.Retrieve());
-            Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member1)]);
+            Assert.Equal(node, rootNode[nameof(ComplexClass.Member7)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member1)]);
         }
 
         [Fact]
@@ -475,13 +475,13 @@ public void TestDiscardedReferenceMember()
             Assert.Equal(3, changedCount);
         }
 
-        private static void VerifyListenerEvent(INodeChangeEventArgs e, IGraphNode nodeOwner, ContentChangeType type, Index index, object oldValue, object newValue, bool changeApplied)
+        private static void VerifyListenerEvent(INodeChangeEventArgs e, IGraphNode nodeOwner, ContentChangeType type, NodeIndex index, object oldValue, object newValue, bool changeApplied)
         {
             Assert.NotNull(e);
             Assert.NotNull(nodeOwner);
             Assert.Equal(type, e.ChangeType);
             Assert.Equal(nodeOwner, e.Node);
-            Assert.Equal(index, (e as ItemChangeEventArgs)?.Index ?? Index.Empty);
+            Assert.Equal(index, (e as ItemChangeEventArgs)?.Index ?? NodeIndex.Empty);
             Assert.Equal(newValue, e.NewValue);
             Assert.Equal(oldValue, e.OldValue);
             if (type == ContentChangeType.ValueChange)
@@ -490,7 +490,7 @@ private static void VerifyListenerEvent(INodeChangeEventArgs e, IGraphNode nodeO
             }
         }
 
-        private static void TestContentChange([NotNull] GraphNodeChangeListener listener, [NotNull] Func<IMemberNode> fetchNode, ContentChangeType type, Index index, object oldValue, object newValue, [NotNull] Action<IMemberNode> change)
+        private static void TestContentChange([NotNull] GraphNodeChangeListener listener, [NotNull] Func<IMemberNode> fetchNode, ContentChangeType type, NodeIndex index, object oldValue, object newValue, [NotNull] Action<IMemberNode> change)
         {
             var i = 0;
             var contentOwner = fetchNode();
@@ -504,7 +504,7 @@ private static void TestContentChange([NotNull] GraphNodeChangeListener listener
             listener.ValueChanged -= changed;
         }
 
-        private static void TestItemChange([NotNull] GraphNodeChangeListener listener, [NotNull] Func<IObjectNode> fetchNode, ContentChangeType type, Index index, object oldValue, object newValue, [NotNull] Action<IObjectNode> change)
+        private static void TestItemChange([NotNull] GraphNodeChangeListener listener, [NotNull] Func<IObjectNode> fetchNode, ContentChangeType type, NodeIndex index, object oldValue, object newValue, [NotNull] Action<IObjectNode> change)
         {
             var i = 0;
             var contentOwner = fetchNode();
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeLinker.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeLinker.cs
index fa5d3fd134..97aa5fd288 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeLinker.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodeLinker.cs
@@ -155,12 +155,12 @@ public void TestObjectWithListOfReferences()
                 { source[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member1)] },
                 { source[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)] },
                 { source[nameof(SimpleClass.Member2)].Target, target[nameof(SimpleClass.Member2)].Target },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0)) },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member1)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member2)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1)) },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member1)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member2)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0)) },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member1)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member2)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1)) },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member1)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member2)] },
             };
             VerifyLinks(expectedLinks, linker);
         }
@@ -276,15 +276,15 @@ public void TestCustomFindTargetReference()
                 { source[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member1)] },
                 { source[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)] },
                 { source[nameof(SimpleClass.Member2)].Target, target[nameof(SimpleClass.Member2)].Target },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(2)) },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(2))[nameof(SimpleClass.Member1)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(2))[nameof(SimpleClass.Member2)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0)) },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member1)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(SimpleClass.Member2)] },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(2)), null },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(2))[nameof(SimpleClass.Member1)], null },
-                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new Index(2))[nameof(SimpleClass.Member2)], null },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(2)) },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(2))[nameof(SimpleClass.Member1)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(2))[nameof(SimpleClass.Member2)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1)), target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0)) },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member1)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member1)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(SimpleClass.Member2)], target[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(SimpleClass.Member2)] },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(2)), null },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(2))[nameof(SimpleClass.Member1)], null },
+                { source[nameof(SimpleClass.Member2)].Target.IndexedTarget(new NodeIndex(2))[nameof(SimpleClass.Member2)], null },
             };
             VerifyLinks(expectedLinks, linker);
         }
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodePath.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodePath.cs
index 2b68812206..1938e7e2bf 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodePath.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphNodePath.cs
@@ -80,18 +80,18 @@ public void TestEquals()
 
             path1 = new GraphNodePath(nodeContainer.GetOrCreateNode(obj));
             path1.PushMember(nameof(Class.ListMember));
-            path1.PushIndex(new Index(0));
+            path1.PushIndex(new NodeIndex(0));
             AssertAreEqual(path1.GetHashCode(), path2.GetHashCode());
             AssertAreNotEqual(path1, path2);
             path2 = new GraphNodePath(nodeContainer.GetOrCreateNode(obj));
             path2.PushMember(nameof(Class.ListMember));
-            path2.PushIndex(new Index(0));
+            path2.PushIndex(new NodeIndex(0));
             AssertAreEqual(path1.GetHashCode(), path2.GetHashCode());
             AssertAreEqual(path1, path2);
 
             path2 = new GraphNodePath(nodeContainer.GetOrCreateNode(obj));
             path2.PushMember(nameof(Class.ListMember));
-            path2.PushIndex(new Index(1));
+            path2.PushIndex(new NodeIndex(1));
             AssertAreEqual(path1.GetHashCode(), path2.GetHashCode());
             AssertAreNotEqual(path1, path2);
         }
@@ -120,7 +120,7 @@ public void TestClone()
             var path3 = path1.Clone();
             path3.PushMember(nameof(Class.ListMember));
             path3.PushTarget();
-            path3.PushIndex(new Index(1));
+            path3.PushIndex(new NodeIndex(1));
             path3.PushMember(nameof(Class.IntMember));
             clone = path3.Clone();
             AssertAreEqual(path3, clone);
@@ -155,7 +155,7 @@ public void TestCloneNewRoot()
             AssertAreEqual(path2.IsEmpty, clone.IsEmpty);
             var path3 = path1.Clone();
             path3.PushMember(nameof(Class.ListMember));
-            path3.PushIndex(new Index(1));
+            path3.PushIndex(new NodeIndex(1));
             path3.PushMember(nameof(Class.IntMember));
             clone = path3.Clone(newRoot);
             AssertAreNotEqual(path3, clone);
@@ -272,7 +272,7 @@ public void TestPushIndex()
             var path = new GraphNodePath(rootNode);
             path.PushMember(nameof(Class.ListMember));
             path.PushTarget();
-            path.PushIndex(new Index(1));
+            path.PushIndex(new NodeIndex(1));
             var targetNode = nodeContainer.GetNode(obj.ListMember[1]);
             var nodes = new IGraphNode[] { rootNode, rootNode[nameof(Class.ListMember)], rootNode[nameof(Class.ListMember)].Target, targetNode };
             Assert.NotNull(targetNode);
@@ -296,7 +296,7 @@ public void TestPushIndexAndMember()
             var path = new GraphNodePath(rootNode);
             path.PushMember(nameof(Class.ListMember));
             path.PushTarget();
-            path.PushIndex(new Index(1));
+            path.PushIndex(new NodeIndex(1));
             path.PushMember(nameof(Class.IntMember));
             var targetNode = nodeContainer.GetNode(obj.ListMember[1]);
             var intNode = targetNode[nameof(Class.IntMember)];
@@ -351,18 +351,18 @@ public void TestGetParent()
 
             path = new GraphNodePath(rootNode);
             path.PushMember(nameof(Class.ListMember));
-            path.PushIndex(new Index(1));
+            path.PushIndex(new NodeIndex(1));
             parentPath = new GraphNodePath(rootNode);
             parentPath.PushMember(nameof(Class.ListMember));
             AssertAreEqual(parentPath, path.GetParent());
 
             path = new GraphNodePath(rootNode);
             path.PushMember(nameof(Class.ListMember));
-            path.PushIndex(new Index(1));
+            path.PushIndex(new NodeIndex(1));
             path.PushMember(nameof(Class.IntMember));
             parentPath = new GraphNodePath(rootNode);
             parentPath.PushMember(nameof(Class.ListMember));
-            parentPath.PushIndex(new Index(1));
+            parentPath.PushIndex(new NodeIndex(1));
             AssertAreEqual(parentPath, path.GetParent());
         }
 
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphVisitor.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphVisitor.cs
index e844de2d3c..f531027271 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphVisitor.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestGraphVisitor.cs
@@ -234,12 +234,12 @@ public void TestObjectWithObjectList()
                 rootNode[nameof(ObjectListClass.Member1)],
                 rootNode[nameof(ObjectListClass.Member2)],
                 rootNode[nameof(ObjectListClass.Member2)].Target,
-                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new Index(0)),
-                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(ObjectListClass.Member1)],
-                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(ObjectListClass.Member2)],
-                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new Index(2)),
-                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new Index(2))[nameof(ObjectListClass.Member1)],
-                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new Index(2))[nameof(ObjectListClass.Member2)],
+                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new NodeIndex(0)),
+                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(ObjectListClass.Member1)],
+                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(ObjectListClass.Member2)],
+                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new NodeIndex(2)),
+                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new NodeIndex(2))[nameof(ObjectListClass.Member1)],
+                rootNode[nameof(ObjectListClass.Member2)].Target.IndexedTarget(new NodeIndex(2))[nameof(ObjectListClass.Member2)],
             };
             var expectedPaths = new GraphNodePath[10];
             expectedPaths[0] = new GraphNodePath(rootNode);
@@ -250,13 +250,13 @@ public void TestObjectWithObjectList()
             expectedPaths[3] = expectedPaths[2].Clone();
             expectedPaths[3].PushTarget();
             expectedPaths[4] = expectedPaths[3].Clone();
-            expectedPaths[4].PushIndex(new Index(0));
+            expectedPaths[4].PushIndex(new NodeIndex(0));
             expectedPaths[5] = expectedPaths[4].Clone();
             expectedPaths[5].PushMember(nameof(ObjectListClass.Member1));
             expectedPaths[6] = expectedPaths[4].Clone();
             expectedPaths[6].PushMember(nameof(ObjectListClass.Member2));
             expectedPaths[7] = expectedPaths[3].Clone();
-            expectedPaths[7].PushIndex(new Index(2));
+            expectedPaths[7].PushIndex(new NodeIndex(2));
             expectedPaths[8] = expectedPaths[7].Clone();
             expectedPaths[8].PushMember(nameof(ObjectListClass.Member1));
             expectedPaths[9] = expectedPaths[7].Clone();
@@ -279,12 +279,12 @@ public void TestObjectWithStructList()
                 rootNode[nameof(StructListClass.Member1)],
                 rootNode[nameof(StructListClass.Member2)],
                 rootNode[nameof(StructListClass.Member2)].Target,
-                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new Index(0)),
-                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(StructListClass.Member1)],
-                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new Index(0))[nameof(StructListClass.Member2)],
-                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new Index(1)),
-                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(StructListClass.Member1)],
-                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new Index(1))[nameof(StructListClass.Member2)],
+                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new NodeIndex(0)),
+                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(StructListClass.Member1)],
+                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new NodeIndex(0))[nameof(StructListClass.Member2)],
+                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new NodeIndex(1)),
+                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(StructListClass.Member1)],
+                rootNode[nameof(StructListClass.Member2)].Target.IndexedTarget(new NodeIndex(1))[nameof(StructListClass.Member2)],
             };
             var expectedPaths = new GraphNodePath[10];
             expectedPaths[0] = new GraphNodePath(rootNode);
@@ -295,13 +295,13 @@ public void TestObjectWithStructList()
             expectedPaths[3] = expectedPaths[2].Clone();
             expectedPaths[3].PushTarget();
             expectedPaths[4] = expectedPaths[3].Clone();
-            expectedPaths[4].PushIndex(new Index(0));
+            expectedPaths[4].PushIndex(new NodeIndex(0));
             expectedPaths[5] = expectedPaths[4].Clone();
             expectedPaths[5].PushMember(nameof(StructListClass.Member1));
             expectedPaths[6] = expectedPaths[4].Clone();
             expectedPaths[6].PushMember(nameof(StructListClass.Member2));
             expectedPaths[7] = expectedPaths[3].Clone();
-            expectedPaths[7].PushIndex(new Index(1));
+            expectedPaths[7].PushIndex(new NodeIndex(1));
             expectedPaths[8] = expectedPaths[7].Clone();
             expectedPaths[8].PushMember(nameof(StructListClass.Member1));
             expectedPaths[9] = expectedPaths[7].Clone();
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestReferences.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestReferences.cs
index f0f93a43c4..5a7d39aeb8 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestReferences.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestReferences.cs
@@ -124,8 +124,8 @@ public void TestEnumerableReference()
             Helper.TestReferenceEnumerable(memberNode.Target.ItemReferences, container.Instances);
 
             Assert.Equal(container.Instances, memberNode.Retrieve());
-            Assert.Equal(instance1, memberNode.Retrieve(new Index(0)));
-            Assert.Equal(instance2, memberNode.Retrieve(new Index(1)));
+            Assert.Equal(instance1, memberNode.Retrieve(new NodeIndex(0)));
+            Assert.Equal(instance2, memberNode.Retrieve(new NodeIndex(1)));
 
             var reference1 = memberNode.Target.ItemReferences.First();
             Helper.TestMemberNode(reference1.TargetNode, reference1.TargetNode.Members.First(), instance1, instance1.Name, nameof(TestObject.Name), false);
@@ -151,8 +151,8 @@ public void TestNullEnumerableReference()
             Helper.TestReferenceEnumerable(memberNode.Target.ItemReferences, container.Instances);
 
             Assert.Equal(container.Instances, memberNode.Retrieve());
-            Assert.Null(memberNode.Retrieve(new Index(0)));
-            Assert.Null(memberNode.Retrieve(new Index(1)));
+            Assert.Null(memberNode.Retrieve(new NodeIndex(0)));
+            Assert.Null(memberNode.Retrieve(new NodeIndex(1)));
         }
 
         /// <summary>
@@ -174,11 +174,11 @@ public void TestEnumerableReferenceUpdate()
 
             // Update item 0 to a new instance and item 1 to null
             var newInstance = new TestObject { Name = "Test3" };
-            memberNode.Target.Update(newInstance, new Index(0));
-            memberNode.Target.Update(null, new Index(1));
+            memberNode.Target.Update(newInstance, new NodeIndex(0));
+            memberNode.Target.Update(null, new NodeIndex(1));
             Assert.Equal(container.Instances, memberNode.Retrieve());
-            Assert.Equal(newInstance, memberNode.Retrieve(new Index(0)));
-            Assert.Null(memberNode.Retrieve(new Index(1)));
+            Assert.Equal(newInstance, memberNode.Retrieve(new NodeIndex(0)));
+            Assert.Null(memberNode.Retrieve(new NodeIndex(1)));
             Helper.TestReferenceEnumerable(memberNode.Target.ItemReferences, container.Instances);
 
             var newReference = memberNode.Target.ItemReferences;
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/TestStructs.cs b/sources/presentation/Xenko.Core.Quantum.Tests/TestStructs.cs
index 6388e55be1..cf9935b261 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/TestStructs.cs
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/TestStructs.cs
@@ -131,7 +131,7 @@ public void TestSimpleStructCollectionUpdate()
             Helper.TestNonNullObjectReference(memberNode.TargetReference, container.Struct, false);
             Helper.TestMemberNode(targetNode, structMemberNode, container.Struct, container.Struct.Strings, nameof(StructWithCollection.Strings), true);
 
-            structMemberNode.Target.Update("ddd", new Index(1));
+            structMemberNode.Target.Update("ddd", new NodeIndex(1));
             Assert.Equal("ddd", container.Struct.Strings[1]);
             Assert.Equal(targetNode, memberNode.Target);
             Assert.Equal(structMemberNode, targetNode[nameof(StructWithCollection.Strings)]);
diff --git a/sources/presentation/Xenko.Core.Quantum.Tests/Xenko.Core.Quantum.Tests.csproj b/sources/presentation/Xenko.Core.Quantum.Tests/Xenko.Core.Quantum.Tests.csproj
index 0584fad82e..08873d6d2e 100644
--- a/sources/presentation/Xenko.Core.Quantum.Tests/Xenko.Core.Quantum.Tests.csproj
+++ b/sources/presentation/Xenko.Core.Quantum.Tests/Xenko.Core.Quantum.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -28,5 +28,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/presentation/Xenko.Core.Quantum/BoxedNode.cs b/sources/presentation/Xenko.Core.Quantum/BoxedNode.cs
index f23c473324..bdf856b1f8 100644
--- a/sources/presentation/Xenko.Core.Quantum/BoxedNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum/BoxedNode.cs
@@ -10,30 +10,30 @@ namespace Xenko.Core.Quantum
     public class BoxedNode : ObjectNode
     {
         private GraphNodeBase boxedStructureOwner;
-        private Index boxedStructureOwnerIndex;
+        private NodeIndex boxedStructureOwnerIndex;
 
         public BoxedNode([NotNull] INodeBuilder nodeBuilder, object value, Guid guid, [NotNull] ITypeDescriptor descriptor)
             : base(nodeBuilder, value, guid, descriptor, null)
         {
         }
 
-        protected internal override void UpdateFromMember(object newValue, Index index)
+        protected internal override void UpdateFromMember(object newValue, NodeIndex index)
         {
             Update(newValue, index, true);
         }
 
         internal void UpdateFromOwner(object newValue)
         {
-            Update(newValue, Index.Empty, false);
+            Update(newValue, NodeIndex.Empty, false);
         }
 
-        internal void SetOwnerContent(IGraphNode ownerNode, Index index)
+        internal void SetOwnerContent(IGraphNode ownerNode, NodeIndex index)
         {
             boxedStructureOwner = (GraphNodeBase)ownerNode;
             boxedStructureOwnerIndex = index;
         }
 
-        private void Update(object newValue, Index index, bool updateStructureOwner)
+        private void Update(object newValue, NodeIndex index, bool updateStructureOwner)
         {
             if (!index.IsEmpty)
             {
@@ -41,7 +41,7 @@ private void Update(object newValue, Index index, bool updateStructureOwner)
                 var dictionaryDescriptor = Descriptor as DictionaryDescriptor;
                 if (collectionDescriptor != null)
                 {
-                    collectionDescriptor.SetValue(Value, index.Int, newValue);
+                    collectionDescriptor.SetValue(Value, index.Value, newValue);
                 }
                 else if (dictionaryDescriptor != null)
                 {
diff --git a/sources/presentation/Xenko.Core.Quantum/DefaultNodeBuilder.cs b/sources/presentation/Xenko.Core.Quantum/DefaultNodeBuilder.cs
index 7d6da4ce4c..f0e5c96c49 100644
--- a/sources/presentation/Xenko.Core.Quantum/DefaultNodeBuilder.cs
+++ b/sources/presentation/Xenko.Core.Quantum/DefaultNodeBuilder.cs
@@ -85,6 +85,14 @@ public IObjectNode Build([NotNull] object obj, Guid guid)
             return rootNode;
         }
 
+        public override void VisitArray(Array array, ArrayDescriptor descriptor)
+        {
+            if (!IsPrimitiveType(descriptor.ElementType))
+            {
+                base.VisitArray(array, descriptor);
+            }
+        }
+
         /// <inheritdoc/>
         public override void VisitObject(object obj, ObjectDescriptor descriptor, bool visitMembers)
         {
@@ -124,7 +132,7 @@ public override void VisitObject(object obj, ObjectDescriptor descriptor, bool v
         public override void VisitCollection(IEnumerable collection, CollectionDescriptor descriptor)
         {
             if (!descriptor.HasIndexerAccessors)
-                throw new NotSupportedException("Collections that do not have indexer accessors are not supported in Quantum.");
+                return; // HashSet or some other set, skip this (don't crash loading the project though, geez!)
 
             // Don't visit items unless they are primitive or enumerable (collections within collections)
             if (IsCollection(descriptor.ElementType))
@@ -137,7 +145,7 @@ public override void VisitCollection(IEnumerable collection, CollectionDescripto
         public override void VisitDictionary(object dictionary, DictionaryDescriptor descriptor)
         {
             if (!IsPrimitiveType(descriptor.KeyType))
-                throw new InvalidOperationException("The type of dictionary key must be a primary type.");
+                return; // unsupported dictionary, skip this (don't crash loading the project though, geez!)
 
             // Don't visit items unless they are primitive or enumerable (collections within collections)
             if (IsCollection(descriptor.ValueType))
@@ -161,7 +169,7 @@ public override void VisitObjectMember(object container, ObjectDescriptor contai
             PushContextNode(content);
             if (content.TargetReference == null)
             {
-                // For enumerable references, we visit the member to allow VisitCollection or VisitDictionary to enrich correctly the node.
+                // For enumerable references, we visit the member to allow VisitList or VisitDictionary or VisitSet or VisitCollection to enrich correctly the node.
                 Visit(content.Retrieve());
             }
             PopContextNode();
@@ -174,14 +182,14 @@ public IReference CreateReferenceForNode(Type type, object value, bool isMember)
         {
             if (isMember)
             {
-                return !IsPrimitiveType(type) ? Reference.CreateReference(value, type, Index.Empty, true) : null;
+                return !IsPrimitiveType(type) ? Reference.CreateReference(value, type, NodeIndex.Empty, true) : null;
             }
 
             var descriptor = TypeDescriptorFactory.Find(value?.GetType());
             if (descriptor is CollectionDescriptor || descriptor is DictionaryDescriptor)
             {
                 var valueType = GetElementValueType(descriptor);
-                return !IsPrimitiveType(valueType) ? Reference.CreateReference(value, type, Index.Empty, false) : null;
+                return !IsPrimitiveType(valueType) ? Reference.CreateReference(value, type, NodeIndex.Empty, false) : null;
             }
 
             return null;
diff --git a/sources/presentation/Xenko.Core.Quantum/DynamicNode.cs b/sources/presentation/Xenko.Core.Quantum/DynamicNode.cs
index 9d874192a0..25b43e9aba 100644
--- a/sources/presentation/Xenko.Core.Quantum/DynamicNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum/DynamicNode.cs
@@ -68,7 +68,7 @@ public void Add(object item)
         /// </summary>
         /// <param name="item">The item to insert.</param>
         /// <param name="index">The index of the item to insert.</param>
-        public void Insert(object item, Index index)
+        public void Insert(object item, NodeIndex index)
         {
             var targetNode = GetTargetNode();
             if (targetNode == null)
@@ -81,7 +81,7 @@ public void Insert(object item, Index index)
         /// </summary>
         /// <param name="item">The item to remove.</param>
         /// <param name="index">The index of the item to remove.</param>
-        public void Remove(object item, Index index)
+        public void Remove(object item, NodeIndex index)
         {
             var targetNode = GetTargetNode();
             if (targetNode == null)
@@ -180,7 +180,7 @@ protected IMemberNode GetTargetMemberNode(string memberName)
         [CanBeNull]
         protected abstract IObjectNode GetTargetNode();
 
-        protected static bool IsIndexExisting([NotNull] IGraphNode node, Index index)
+        protected static bool IsIndexExisting([NotNull] IGraphNode node, NodeIndex index)
         {
             if (node.IsReference)
             {
@@ -193,41 +193,65 @@ protected static bool IsIndexExisting([NotNull] IGraphNode node, Index index)
             else
             {
                 var value = node.Retrieve();
-                var collectionDescriptor = node.Descriptor as CollectionDescriptor;
-                if (collectionDescriptor != null && index.IsInt && index.Int >= 0 && index.Int < collectionDescriptor.GetCollectionCount(value))
+                var descriptor = node.Descriptor;
+                if (descriptor is CollectionDescriptor collectionDescriptor)
                 {
-                    return true;
+                    if (descriptor is SetDescriptor setDescriptor)
+                    {
+                        if (setDescriptor.Contains(value, index.Value))
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        if (index.IsInt
+                            && index.Int >= 0
+                            && index.Int < collectionDescriptor.GetCollectionCount(value))
+                        {
+                            return true;
+                        }
+                    }
                 }
-                var dictionaryDescriptor = node.Descriptor as DictionaryDescriptor;
-                if (dictionaryDescriptor != null && dictionaryDescriptor.KeyType.IsInstanceOfType(index.Value) && dictionaryDescriptor.ContainsKey(value, index.Value))
+                else if (descriptor is DictionaryDescriptor dictionaryDescriptor)
                 {
-                    return true;
+                    if (dictionaryDescriptor.KeyType.IsInstanceOfType(index.Value)
+                        && dictionaryDescriptor.ContainsKey(value, index.Value))
+                    {
+                        return true;
+                    }
                 }
             }
             return false;
         }
 
-        protected static bool IsIndexValid([NotNull] IGraphNode node, Index index)
+        protected static bool IsIndexValid([NotNull] IGraphNode node, NodeIndex index)
         {
             if (node.IsReference)
             {
                 var reference = (node as IObjectNode)?.ItemReferences;
                 return reference != null;
             }
-            var collectionDescriptor = node.Descriptor as CollectionDescriptor;
-            if (collectionDescriptor != null)
+
+            if (node.Descriptor is CollectionDescriptor collectionDescriptor)
             {
-                return index.IsInt && index.Int >= 0;
+                if (node.Descriptor.Category == DescriptorCategory.Set)
+                {
+                    return collectionDescriptor.ElementType.IsInstanceOfType(index.Value);
+                }
+                else
+                {
+                    return index.IsInt && index.Int >= 0;
+                }
             }
-            var dictionaryDescriptor = node.Descriptor as DictionaryDescriptor;
-            if (dictionaryDescriptor != null)
+            else if (node.Descriptor is DictionaryDescriptor dictionaryDescriptor)
             {
                 return dictionaryDescriptor.KeyType.IsInstanceOfType(index.Value);
             }
             return false;
         }
 
-        protected static bool UpdateCollection([NotNull] IObjectNode node, object value, Index index)
+        protected static bool UpdateCollection([NotNull] IObjectNode node, object value, NodeIndex index)
         {
             if (IsIndexExisting(node, index))
             {
@@ -254,7 +278,7 @@ public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out ob
         {
             if (indexes.Length == 1)
             {
-                var index = new Index(indexes[0]);
+                var index = new NodeIndex(indexes[0]);
                 if (IsIndexExisting(Node, index))
                 {
                     result = new DynamicIndexedNode(Node, index);
@@ -269,7 +293,7 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object
         {
             if (indexes.Length == 1)
             {
-                var index = new Index(indexes[0]);
+                var index = new NodeIndex(indexes[0]);
                 return UpdateCollection((IObjectNode)Node, value, index);
             }
             return false;
@@ -288,9 +312,9 @@ protected override IObjectNode GetTargetNode()
 
     internal class DynamicIndexedNode : DynamicNode
     {
-        private readonly Index index;
+        private readonly NodeIndex index;
 
-        internal DynamicIndexedNode(IGraphNode node, Index index)
+        internal DynamicIndexedNode(IGraphNode node, NodeIndex index)
             : base(node)
         {
             this.index = index;
@@ -301,7 +325,7 @@ public override bool TryGetIndex(GetIndexBinder binder, object[] indexes, out ob
             var targetNode = GetTargetNode();
             if (indexes.Length == 1 && targetNode != null)
             {
-                var nextIndex = new Index(indexes[0]);
+                var nextIndex = new NodeIndex(indexes[0]);
                 if (IsIndexExisting(targetNode, nextIndex))
                 {
                     result = new DynamicIndexedNode(targetNode, nextIndex);
@@ -317,7 +341,7 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indexes, object
             var targetNode = GetTargetNode();
             if (indexes.Length == 1 && targetNode != null)
             {
-                var nextIndex = new Index(indexes[0]);
+                var nextIndex = new NodeIndex(indexes[0]);
                 return UpdateCollection((IObjectNode)Node, value, nextIndex);
             }
             return false;
diff --git a/sources/presentation/Xenko.Core.Quantum/GraphNodeBase.cs b/sources/presentation/Xenko.Core.Quantum/GraphNodeBase.cs
index 157172f920..44e87f0c36 100644
--- a/sources/presentation/Xenko.Core.Quantum/GraphNodeBase.cs
+++ b/sources/presentation/Xenko.Core.Quantum/GraphNodeBase.cs
@@ -2,10 +2,12 @@
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Xenko.Core.Annotations;
 using Xenko.Core.Reflection;
+using Xenko.Core.TypeConverters;
 
 namespace Xenko.Core.Quantum
 {
@@ -45,10 +47,10 @@ protected GraphNodeBase(NodeContainer nodeContainer, Guid guid, [NotNull] ITypeD
         protected bool IsSealed { get; private set; }
 
         /// <inheritdoc/>
-        public object Retrieve() => Retrieve(Index.Empty);
+        public object Retrieve() => Retrieve(NodeIndex.Empty);
 
         /// <inheritdoc/>
-        public virtual object Retrieve(Index index)
+        public virtual object Retrieve(NodeIndex index)
         {
             return Content.Retrieve(Value, index, Descriptor);
         }
@@ -62,16 +64,37 @@ public virtual object Retrieve(Index index)
         /// This method is intended to update a boxed content when one of its member changes.
         /// It allows to properly update boxed structs.
         /// </remarks>
-        protected internal abstract void UpdateFromMember(object newValue, Index index);
+        protected internal abstract void UpdateFromMember(object newValue, NodeIndex index);
 
-        public static IEnumerable<Index> GetIndices([NotNull] IGraphNode node)
+        public static IEnumerable<NodeIndex> GetIndices([NotNull] IGraphNode node)
         {
             if (node.Descriptor is CollectionDescriptor collectionDescriptor)
             {
-                return Enumerable.Range(0, collectionDescriptor.GetCollectionCount(node.Retrieve())).Select(x => new Index(x));
+                if (node.Descriptor.Category == DescriptorCategory.Set)
+                {
+                    var enumerator = (node.Retrieve() as IEnumerable).GetEnumerator();
+                    NodeIndex[] valueArr = new NodeIndex[collectionDescriptor.GetCollectionCount(node.Retrieve())];
+                    int i = 0;
+                    while (enumerator.MoveNext())
+                    {
+                        valueArr[i++] = new NodeIndex(enumerator.Current);
+                    }
+                    return valueArr;
+                }
+                else
+                {
+                    return Enumerable.Range(0, collectionDescriptor.GetCollectionCount(node.Retrieve())).Select(x => new NodeIndex(x));
+                }
             }
-            var dictionaryDescriptor = node.Descriptor as DictionaryDescriptor;
-            return dictionaryDescriptor?.GetKeys(node.Retrieve()).Cast<object>().Select(x => new Index(x));
+            else if (node.Descriptor is DictionaryDescriptor dictionaryDescriptor)
+            {
+                return dictionaryDescriptor?.GetKeys(node.Retrieve()).Cast<object>().Select(x => new NodeIndex(x));
+            }
+            else if (node.Descriptor is ArrayDescriptor arrayDescriptor)
+            {
+                return Enumerable.Range(0, arrayDescriptor.GetLength(node.Retrieve())).Select(x => new NodeIndex(x));
+            }
+            return null;
         }
 
         /// <summary>
@@ -81,5 +104,15 @@ public void Seal()
         {
             IsSealed = true;
         }
+
+        protected static object ConvertValue(object value, Type type)
+        {
+            if (value == null)
+                return null;
+            object convertedValue;
+            if (!TypeConverterHelper.TryConvert(value, type, out convertedValue))
+                throw new InvalidOperationException("Can not convert value to the required type");
+            return convertedValue;
+        }
     }
 }
diff --git a/sources/presentation/Xenko.Core.Quantum/GraphNodeChangeListener.cs b/sources/presentation/Xenko.Core.Quantum/GraphNodeChangeListener.cs
index 89ed0eeb7b..4321872cf4 100644
--- a/sources/presentation/Xenko.Core.Quantum/GraphNodeChangeListener.cs
+++ b/sources/presentation/Xenko.Core.Quantum/GraphNodeChangeListener.cs
@@ -174,7 +174,7 @@ private void ContentFinalizeChange(object sender, [NotNull] INodeChangeEventArgs
                     {
                         var objectNode = (IObjectNode)e.Node;
                         IGraphNode addedNode;
-                        Index index;
+                        NodeIndex index;
                         var arg = (ItemChangeEventArgs)e;
                         if (!arg.Index.IsEmpty)
                         {
diff --git a/sources/presentation/Xenko.Core.Quantum/GraphNodeLinker.cs b/sources/presentation/Xenko.Core.Quantum/GraphNodeLinker.cs
index 060027820a..2ceeace09e 100644
--- a/sources/presentation/Xenko.Core.Quantum/GraphNodeLinker.cs
+++ b/sources/presentation/Xenko.Core.Quantum/GraphNodeLinker.cs
@@ -46,10 +46,28 @@ protected override void VisitChildren(IObjectNode node)
             {
                 if (VisitedLinks.TryGetValue(node, out IGraphNode targetNodeParent))
                 {
-                    foreach (var child in node.Members)
+                    var objNode = targetNodeParent as IObjectNode;
+                    var members = node.Members;
+                    if (members is List<IMemberNode> asList)
                     {
-                        string name = child.Name;
-                        VisitedLinks.Add(child, ((IObjectNode)targetNodeParent)?.TryGetChild(name));
+                        foreach (var child in asList)
+                        {
+                            VisitedLinks.Add(child, objNode?.TryGetChild(child.Name));
+                        }
+                    }
+                    else if(members is Dictionary<string, IMemberNode>.ValueCollection asVCol)
+                    {
+                        foreach (var child in asVCol)
+                        {
+                            VisitedLinks.Add(child, objNode?.TryGetChild(child.Name));
+                        }
+                    }
+                    else
+                    {
+                        foreach (var child in members)
+                        {
+                            VisitedLinks.Add(child, objNode?.TryGetChild(child.Name));
+                        }
                     }
                 }
                 base.VisitChildren(node);
@@ -80,7 +98,7 @@ protected internal override bool ShouldVisitMemberTarget(IMemberNode memberNode)
                 return linker.ShouldVisitMemberTarget(memberNode) && base.ShouldVisitMemberTarget(memberNode);
             }
 
-            protected internal override bool ShouldVisitTargetItem(IObjectNode collectionNode, Index index)
+            protected internal override bool ShouldVisitTargetItem(IObjectNode collectionNode, NodeIndex index)
             {
                 return linker.ShouldVisitTargetItem(collectionNode, index) && base.ShouldVisitTargetItem(collectionNode, index);
             }
@@ -117,7 +135,7 @@ protected virtual bool ShouldVisitMemberTarget(IMemberNode member)
             return true;
         }
 
-        protected virtual bool ShouldVisitTargetItem(IObjectNode collectionNode, Index index)
+        protected virtual bool ShouldVisitTargetItem(IObjectNode collectionNode, NodeIndex index)
         {
             return true;
         }
@@ -160,7 +178,7 @@ protected virtual IGraphNode FindTarget([NotNull] IGraphNode sourceNode)
         /// <remarks>
         /// The source reference can either be directly the <see cref="IGraphNode.TargetReference"/> of the source node if this reference is
         /// an <see cref="ObjectReference"/>, or one of the reference contained inside <see cref="IGraphNode.ItemReferences"/> if this reference
-        /// is a <see cref="ReferenceEnumerable"/>. The <see cref="Index"/> property indicates the index of the reference in this case.
+        /// is a <see cref="ReferenceEnumerable"/>. The <see cref="NodeIndex"/> property indicates the index of the reference in this case.
         /// The default implementation returns a reference in the target node that matches the index of the source reference, if available.
         /// </remarks>
         // TODO: turn back protected!
diff --git a/sources/presentation/Xenko.Core.Quantum/GraphNodePath.cs b/sources/presentation/Xenko.Core.Quantum/GraphNodePath.cs
index 03808b4630..52e78d3dbb 100644
--- a/sources/presentation/Xenko.Core.Quantum/GraphNodePath.cs
+++ b/sources/presentation/Xenko.Core.Quantum/GraphNodePath.cs
@@ -42,18 +42,18 @@ public struct NodePathElement : IEquatable<NodePathElement>
         {
             public readonly ElementType Type;
             public readonly string Name;
-            public readonly Index Index;
+            public readonly NodeIndex Index;
             public readonly Guid Guid;
 
             private NodePathElement(string value)
             {
                 Name = value;
-                Index = Index.Empty;
+                Index = NodeIndex.Empty;
                 Guid = Guid.Empty;
                 Type = ElementType.Member;
             }
 
-            private NodePathElement(Index value)
+            private NodePathElement(NodeIndex value)
             {
                 Name = null;
                 Index = value;
@@ -64,7 +64,7 @@ private NodePathElement(Index value)
             private NodePathElement(Guid value)
             {
                 Name = null;
-                Index = Index.Empty;
+                Index = NodeIndex.Empty;
                 Guid = value;
                 Type = ElementType.Target;
             }
@@ -81,7 +81,7 @@ public static NodePathElement CreateTarget()
                 return new NodePathElement(Guid.NewGuid());
             }
 
-            public static NodePathElement CreateIndex(Index index)
+            public static NodePathElement CreateIndex(NodeIndex index)
             {
                 return new NodePathElement(index);
             }
@@ -313,10 +313,10 @@ public override string ToString()
         public NodeAccessor GetAccessor()
         {
             if (path.Count == 0)
-                return new NodeAccessor(RootNode, Index.Empty);
+                return new NodeAccessor(RootNode, NodeIndex.Empty);
 
             var lastItem = path[path.Count - 1];
-            return lastItem.Type == ElementType.Index ? new NodeAccessor(GetParent().GetNode(), lastItem.Index) : new NodeAccessor(GetNode(), Index.Empty);
+            return lastItem.Type == ElementType.Index ? new NodeAccessor(GetParent().GetNode(), lastItem.Index) : new NodeAccessor(GetNode(), NodeIndex.Empty);
         }
 
         /// <summary>
@@ -359,18 +359,18 @@ public GraphNodePath Clone(IGraphNode newRoot)
 
         public void PushTarget() => PushElement(null, ElementType.Target);
 
-        public void PushIndex(Index index) => PushElement(index, ElementType.Index);
+        public void PushIndex(NodeIndex index) => PushElement(index, ElementType.Index);
 
         public void Pop() => path.RemoveAt(path.Count - 1);
 
         // TODO: Switch to tuple return as soon as we have C# 7.0
         [NotNull]
-        public static GraphNodePath From(IGraphNode root, [NotNull] MemberPath memberPath, out Index index)
+        public static GraphNodePath From(IGraphNode root, [NotNull] MemberPath memberPath, out NodeIndex index)
         {
             if (memberPath == null) throw new ArgumentNullException(nameof(memberPath));
 
             var result = new GraphNodePath(root);
-            index = Index.Empty;
+            index = NodeIndex.Empty;
             var memberPathItems = memberPath.Decompose();
             for (int i = 0; i < memberPathItems.Count; i++)
             {
@@ -382,7 +382,7 @@ public static GraphNodePath From(IGraphNode root, [NotNull] MemberPath memberPat
                 }
                 else if (memberPathItem.GetIndex() != null)
                 {
-                    var localIndex = new Index(memberPathItem.GetIndex());
+                    var localIndex = new NodeIndex(memberPathItem.GetIndex());
 
                     if (lastItem)
                     {
@@ -436,12 +436,14 @@ public MemberPath ToMemberPath()
                         var index = itemPath.Index;
                         var enumerableReference = ((IObjectNode)node).ItemReferences;
                         var descriptor = node.Descriptor;
-                        var collectionDescriptor = descriptor as CollectionDescriptor;
-                        if (collectionDescriptor != null)
-                            memberPath.Push(collectionDescriptor, index.Int);
-                        var dictionaryDescriptor = descriptor as DictionaryDescriptor;
-                        if (dictionaryDescriptor != null)
+                        if (descriptor is CollectionDescriptor collectionDescriptor)
+                        {
+                            memberPath.Push(collectionDescriptor, index.Value);
+                        }
+                        else if (descriptor is DictionaryDescriptor dictionaryDescriptor)
+                        {
                             memberPath.Push(dictionaryDescriptor, index.Value);
+                        }
 
                         if (i != path.Count - 1)
                         {
@@ -472,9 +474,9 @@ private void PushElement(object elementValue, ElementType type)
                     path.Add(NodePathElement.CreateTarget());
                     break;
                 case ElementType.Index:
-                    if (!(elementValue is Index))
+                    if (!(elementValue is NodeIndex))
                         throw new ArgumentException("The value must be an Index when type is ElementType.Index.");
-                    path.Add(NodePathElement.CreateIndex((Index)elementValue));
+                    path.Add(NodePathElement.CreateIndex((NodeIndex)elementValue));
                     break;
                 default:
                     throw new ArgumentOutOfRangeException(nameof(type));
diff --git a/sources/presentation/Xenko.Core.Quantum/GraphVisitorBase.cs b/sources/presentation/Xenko.Core.Quantum/GraphVisitorBase.cs
index 3a5c7aac43..0281befb57 100644
--- a/sources/presentation/Xenko.Core.Quantum/GraphVisitorBase.cs
+++ b/sources/presentation/Xenko.Core.Quantum/GraphVisitorBase.cs
@@ -64,14 +64,14 @@ protected virtual void VisitNode([NotNull] IGraphNode node)
             {
                 Visiting?.Invoke(node, CurrentPath);
             }
-            var objectNode = node as IObjectNode;
-            if (objectNode != null)
+
+            if (node is IObjectNode objectNode)
             {
                 VisitChildren(objectNode);
                 VisitItemTargets(objectNode);
             }
-            var memberNode = node as IMemberNode;
-            if (memberNode != null)
+
+            if (node is IMemberNode memberNode)
             {
                 VisitMemberTarget(memberNode);
             }
@@ -85,11 +85,33 @@ protected virtual void VisitNode([NotNull] IGraphNode node)
         protected virtual void VisitChildren([NotNull] IObjectNode node)
         {
             if (node == null) throw new ArgumentNullException(nameof(node));
-            foreach (var child in node.Members)
+            var members = node.Members;
+            if (members is List<IMemberNode> asList)
+            {
+                foreach (var child in asList)
+                {
+                    CurrentPath.PushMember(child.Name);
+                    VisitNode(child);
+                    CurrentPath.Pop();
+                }
+            }
+            else if (members is Dictionary<string, IMemberNode>.ValueCollection asVCol)
             {
-                CurrentPath.PushMember(child.Name);
-                VisitNode(child);
-                CurrentPath.Pop();
+                foreach (var child in asVCol)
+                {
+                    CurrentPath.PushMember(child.Name);
+                    VisitNode(child);
+                    CurrentPath.Pop();
+                }
+            }
+            else
+            {
+                foreach (var child in members)
+                {
+                    CurrentPath.PushMember(child.Name);
+                    VisitNode(child);
+                    CurrentPath.Pop();
+                }
             }
         }
 
@@ -167,7 +189,7 @@ protected internal virtual bool ShouldVisitMemberTarget([NotNull] IMemberNode me
         /// <param name="index">The index of the item to evaluate.</param>
         /// <returns>True if the node of the item corresponding to the given index in the collection contained in the given node should be visited, false otherwise.</returns>
         /// <remarks>This method is invoked only when the given <see cref="IObjectNode"/> contains a collection with items being references.</remarks>
-        protected internal virtual bool ShouldVisitTargetItem([NotNull] IObjectNode collectionNode, Index index)
+        protected internal virtual bool ShouldVisitTargetItem([NotNull] IObjectNode collectionNode, NodeIndex index)
         {
             if (collectionNode == null) throw new ArgumentNullException(nameof(collectionNode));
             var target = collectionNode.IndexedTarget(index);
diff --git a/sources/presentation/Xenko.Core.Quantum/IGraphNode.cs b/sources/presentation/Xenko.Core.Quantum/IGraphNode.cs
index a76620be76..d873eeb1d2 100644
--- a/sources/presentation/Xenko.Core.Quantum/IGraphNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum/IGraphNode.cs
@@ -44,6 +44,6 @@ public interface IGraphNode
         /// Retrieves the value of one of the item of this node, if it holds a collection.
         /// </summary>
         /// <param name="index">The index to use to retrieve the value.</param>
-        object Retrieve(Index index);
+        object Retrieve(NodeIndex index);
     }
 }
diff --git a/sources/presentation/Xenko.Core.Quantum/IObjectNode.cs b/sources/presentation/Xenko.Core.Quantum/IObjectNode.cs
index 305ded7fe9..ab1bf8f003 100644
--- a/sources/presentation/Xenko.Core.Quantum/IObjectNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum/IObjectNode.cs
@@ -28,7 +28,7 @@ public interface IObjectNode : IGraphNode, INotifyNodeItemChange
         /// <summary>
         /// Gets all the indices in the value of this content, if it is a collection. Otherwise, this property returns null.
         /// </summary>
-        IEnumerable<Index> Indices { get; }
+        IEnumerable<NodeIndex> Indices { get; }
 
         bool IsEnumerable { get; }
 
@@ -38,7 +38,7 @@ public interface IObjectNode : IGraphNode, INotifyNodeItemChange
         /// <exception cref="InvalidOperationException">The node does not contain a sequence of references to some other nodes.</exception>
         /// <exception cref="ArgumentException">The index is empty.</exception>
         /// <exception cref="KeyNotFoundException">The index does not exist.</exception>
-        IObjectNode IndexedTarget(Index index);
+        IObjectNode IndexedTarget(NodeIndex index);
 
         /// <summary>
         /// Attempts to retrieve the child node of this <see cref="IGraphNode"/> that matches the given name.
@@ -52,7 +52,7 @@ public interface IObjectNode : IGraphNode, INotifyNodeItemChange
         /// </summary>
         /// <param name="newValue">The new value to set.</param>
         /// <param name="index">The index where to update the value.</param>
-        void Update(object newValue, Index index);
+        void Update(object newValue, NodeIndex index);
 
         /// <summary>
         /// Adds a new item to this content, assuming the content is a collection.
@@ -65,13 +65,18 @@ public interface IObjectNode : IGraphNode, INotifyNodeItemChange
         /// </summary>
         /// <param name="newItem">The new item to add to the collection.</param>
         /// <param name="itemIndex">The index at which the new item must be added.</param>
-        void Add(object newItem, Index itemIndex);
+        void Add(object newItem, NodeIndex itemIndex);
 
         /// <summary>
         /// Removes an item from this content, assuming the content is a collection.
         /// </summary>
         /// <param name="item">The item to remove.</param>
         /// <param name="itemIndex">The index from which the item must be removed.</param>
-        void Remove(object item, Index itemIndex);
+        void Remove(object item, NodeIndex itemIndex);
+
+        /// <summary>
+        /// Clears all items from this content
+        /// </summary>
+        void Clear();
     }
 }
diff --git a/sources/presentation/Xenko.Core.Quantum/Internal/Content.cs b/sources/presentation/Xenko.Core.Quantum/Internal/Content.cs
index 544366244d..6fb2302fee 100644
--- a/sources/presentation/Xenko.Core.Quantum/Internal/Content.cs
+++ b/sources/presentation/Xenko.Core.Quantum/Internal/Content.cs
@@ -11,29 +11,31 @@ namespace Xenko.Core.Quantum
     internal static class Content
     {
         /// <summary>
-        /// Retrieves the value itself or the value of one of its item, depending on the given <see cref="Index"/>.
+        /// Retrieves the value itself or the value of one of its item, depending on the given <see cref="NodeIndex"/>.
         /// </summary>
         /// <param name="value">The value on which this method applies.</param>
-        /// <param name="index">The index of the item to retrieve. If <see cref="Index.Empty"/> is passed, this method will return the value itself.</param>
+        /// <param name="index">The index of the item to retrieve. If <see cref="NodeIndex.Empty"/> is passed, this method will return the value itself.</param>
         /// <param name="descriptor">The descriptor of the type of <paramref name="value"/>.</param>
         /// <returns>The value itself or the value of one of its item.</returns>
-        public static object Retrieve(object value, Index index, ITypeDescriptor descriptor)
+        public static object Retrieve(object value, NodeIndex index, ITypeDescriptor descriptor)
         {
             if (index.IsEmpty)
                 return value;
 
             if (value == null) throw new ArgumentNullException(nameof(value));
 
-            var collectionDescriptor = descriptor as CollectionDescriptor;
-            if (collectionDescriptor != null)
+            if (descriptor is CollectionDescriptor collectionDescriptor)
             {
-                return collectionDescriptor.GetValue(value, index.Int);
+                return collectionDescriptor.GetValue(value, index.Value);
             }
-            var dictionaryDescriptor = descriptor as DictionaryDescriptor;
-            if (dictionaryDescriptor != null)
+            else if (descriptor is DictionaryDescriptor dictionaryDescriptor)
             {
                 return dictionaryDescriptor.GetValue(value, index.Value);
             }
+            else if (descriptor is ArrayDescriptor arrayDescriptor)
+            {
+                return arrayDescriptor.GetValue(value, (int)index.Value);
+            }
 
             // Try with the concrete type descriptor
             var objectDescriptor = TypeDescriptorFactory.Default.Find(value.GetType());
diff --git a/sources/presentation/Xenko.Core.Quantum/ItemChangeEventArgs.cs b/sources/presentation/Xenko.Core.Quantum/ItemChangeEventArgs.cs
index e361d68dd8..f4dd2480ee 100644
--- a/sources/presentation/Xenko.Core.Quantum/ItemChangeEventArgs.cs
+++ b/sources/presentation/Xenko.Core.Quantum/ItemChangeEventArgs.cs
@@ -18,7 +18,7 @@ public class ItemChangeEventArgs : EventArgs, INodeChangeEventArgs
         /// <param name="changeType">The type of change that occurred.</param>
         /// <param name="oldValue">The old value of the item that has changed.</param>
         /// <param name="newValue">The new value of the item that has changed.</param>
-        public ItemChangeEventArgs([NotNull] IObjectNode node, Index index, ContentChangeType changeType, object oldValue, object newValue)
+        public ItemChangeEventArgs([NotNull] IObjectNode node, NodeIndex index, ContentChangeType changeType, object oldValue, object newValue)
         {
             Collection = node;
             Index = index;
@@ -36,7 +36,7 @@ public ItemChangeEventArgs([NotNull] IObjectNode node, Index index, ContentChang
         /// <summary>
         /// Gets the index where the change occurred.
         /// </summary>
-        public Index Index { get; }
+        public NodeIndex Index { get; }
 
         /// <summary>
         /// The type of change.
diff --git a/sources/presentation/Xenko.Core.Quantum/MemberNode.cs b/sources/presentation/Xenko.Core.Quantum/MemberNode.cs
index ae9ba25589..742811e468 100644
--- a/sources/presentation/Xenko.Core.Quantum/MemberNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum/MemberNode.cs
@@ -93,9 +93,9 @@ protected void NotifyContentChanged(MemberNodeChangeEventArgs args)
             FinalizeChange?.Invoke(this, args);
         }
 
-        protected internal override void UpdateFromMember(object newValue, Index index)
+        protected internal override void UpdateFromMember(object newValue, NodeIndex index)
         {
-            if (index != Index.Empty) throw new ArgumentException(@"index must be Index.Empty.", nameof(Index));
+            if (index != NodeIndex.Empty) throw new ArgumentException(@"index must be Index.Empty.", nameof(NodeIndex));
             Update(newValue, false);
         }
 
@@ -111,10 +111,10 @@ private void Update(object newValue, bool sendNotification)
             var containerValue = Parent.Retrieve();
             if (containerValue == null)
                 throw new InvalidOperationException("Container's value is null");
-            MemberDescriptor.Set(containerValue, newValue);
+            MemberDescriptor.Set(containerValue, ConvertValue(newValue, MemberDescriptor.Type));
 
             if (containerValue.GetType().GetTypeInfo().IsValueType)
-                ((GraphNodeBase)Parent).UpdateFromMember(containerValue, Index.Empty);
+                ((GraphNodeBase)Parent).UpdateFromMember(containerValue, NodeIndex.Empty);
 
             UpdateReferences();
             if (sendNotification)
diff --git a/sources/presentation/Xenko.Core.Quantum/NodeAccessor.cs b/sources/presentation/Xenko.Core.Quantum/NodeAccessor.cs
index c17a1c78fe..2df2e1fa18 100644
--- a/sources/presentation/Xenko.Core.Quantum/NodeAccessor.cs
+++ b/sources/presentation/Xenko.Core.Quantum/NodeAccessor.cs
@@ -19,14 +19,14 @@ public struct NodeAccessor
         /// <summary>
         /// The index of the accessor.
         /// </summary>
-        public readonly Index Index;
+        public readonly NodeIndex Index;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="NodeAccessor"/> structure.
         /// </summary>
         /// <param name="node">The target node of this accessor.</param>
-        /// <param name="index">The index of the target item if this accessor target an item. <see cref="Quantum.Index.Empty"/> otherwise.</param>
-        public NodeAccessor([NotNull] IGraphNode node, Index index)
+        /// <param name="index">The index of the target item if this accessor target an item. <see cref="Quantum.NodeIndex.Empty"/> otherwise.</param>
+        public NodeAccessor([NotNull] IGraphNode node, NodeIndex index)
         {
             if (node == null) throw new ArgumentNullException(nameof(node));
             if (node is IMemberNode && !index.IsEmpty) throw new ArgumentException($"Cannot create an accessor for an {nameof(IMemberNode)} that use a non-empty index.");
@@ -57,7 +57,7 @@ public NodeAccessor([NotNull] IGraphNode node, Index index)
         /// <param name="value">The new value to set.</param>
         public void UpdateValue(object value)
         {
-            if (Index != Index.Empty)
+            if (Index != NodeIndex.Empty)
             {
                 ((IObjectNode)Node).Update(value, Index);
             }
diff --git a/sources/presentation/Xenko.Core.Quantum/Index.cs b/sources/presentation/Xenko.Core.Quantum/NodeIndex.cs
similarity index 77%
rename from sources/presentation/Xenko.Core.Quantum/Index.cs
rename to sources/presentation/Xenko.Core.Quantum/NodeIndex.cs
index ba8bb50cb5..e683263b86 100644
--- a/sources/presentation/Xenko.Core.Quantum/Index.cs
+++ b/sources/presentation/Xenko.Core.Quantum/NodeIndex.cs
@@ -8,12 +8,12 @@ namespace Xenko.Core.Quantum
     /// <summary>
     /// A container structure to represent indices in Quantum nodes.
     /// </summary>
-    public struct Index : IEquatable<Index>, IComparable<Index>, IComparable
+    public struct NodeIndex : IEquatable<NodeIndex>, IComparable<NodeIndex>, IComparable
     {
         /// <summary>
         /// An index that is null.
         /// </summary>
-        public static readonly Index Empty = new Index();
+        public static readonly NodeIndex Empty = new NodeIndex();
 
         /// <summary>
         /// The value of the index.
@@ -21,13 +21,13 @@ public struct Index : IEquatable<Index>, IComparable<Index>, IComparable
         public readonly object Value;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="Index"/> structure.
+        /// Initializes a new instance of the <see cref="NodeIndex"/> structure.
         /// </summary>
         /// <param name="value">The value of the index.</param>
-        public Index(object value) : this()
+        public NodeIndex(object value) : this()
         {
             // Sanity check, to avoid boxing index into index
-            if (value is Index) throw new ArgumentException($"A {nameof(Index)} instance cannot be passed as the value of another {nameof(Index)} instance.");
+            if (value is NodeIndex) throw new ArgumentException($"A {nameof(NodeIndex)} instance cannot be passed as the value of another {nameof(NodeIndex)} instance.");
             Value = value;
         }
 
@@ -54,13 +54,13 @@ public override string ToString()
         }
 
         /// <inheritdoc/>
-        public bool Equals(Index other)
+        public bool Equals(NodeIndex other)
         {
             return Equals(Value, other.Value);
         }
 
         /// <inheritdoc/>
-        public int CompareTo(Index other)
+        public int CompareTo(NodeIndex other)
         {
             if (other.IsEmpty)
                 return IsEmpty ? 0 : 1;
@@ -78,7 +78,7 @@ public override bool Equals(object obj)
         {
             if (ReferenceEquals(null, obj))
                 return false;
-            return obj is Index && Equals((Index)obj);
+            return obj is NodeIndex && Equals((NodeIndex)obj);
         }
 
         /// <inheritdoc/>
@@ -92,17 +92,17 @@ int IComparable.CompareTo([NotNull] object obj)
             if (obj == null || obj.GetType() != GetType())
                 throw new ArgumentException(@"obj is not the same type as this instance.", nameof(obj));
 
-            var other = (Index)obj;
+            var other = (NodeIndex)obj;
             return CompareTo(other);
         }
 
-        public static bool operator==(Index a, Index b)
+        public static bool operator==(NodeIndex a, NodeIndex b)
         {
             return Equals(a.Value, b.Value);
         }
 
         /// <inheritdoc/>
-        public static bool operator!=(Index a, Index b)
+        public static bool operator!=(NodeIndex a, NodeIndex b)
         {
             return !Equals(a.Value, b.Value);
         }
diff --git a/sources/presentation/Xenko.Core.Quantum/ObjectNode.cs b/sources/presentation/Xenko.Core.Quantum/ObjectNode.cs
index fb0398fbea..8ad8e088d8 100644
--- a/sources/presentation/Xenko.Core.Quantum/ObjectNode.cs
+++ b/sources/presentation/Xenko.Core.Quantum/ObjectNode.cs
@@ -37,10 +37,10 @@ public ObjectNode([NotNull] INodeBuilder nodeBuilder, object value, Guid guid, [
         public IReadOnlyCollection<IMemberNode> Members => (IReadOnlyCollection<IMemberNode>)childrenMap.Values;
 
         /// <inheritdoc/>
-        public IEnumerable<Index> Indices => GetIndices();
+        public IEnumerable<NodeIndex> Indices => GetIndices();
 
         /// <inheritdoc/>
-        public bool IsEnumerable => Descriptor is CollectionDescriptor || Descriptor is DictionaryDescriptor;
+        public bool IsEnumerable => Descriptor is CollectionDescriptor || Descriptor is DictionaryDescriptor || Descriptor is ArrayDescriptor;
 
         /// <inheritdoc/>
         public override bool IsReference => ItemReferences != null;
@@ -73,15 +73,15 @@ public IMemberNode TryGetChild([NotNull] string name)
         }
 
         /// <inheritdoc/>
-        public IObjectNode IndexedTarget(Index index)
+        public IObjectNode IndexedTarget(NodeIndex index)
         {
-            if (index == Index.Empty) throw new ArgumentException(@"index cannot be Index.Empty when invoking this method.", nameof(index));
+            if (index == NodeIndex.Empty) throw new ArgumentException(@"index cannot be Index.Empty when invoking this method.", nameof(index));
             if (ItemReferences == null) throw new InvalidOperationException(@"The node does not contain enumerable references.");
             return ItemReferences[index].TargetNode;
         }
 
         /// <inheritdoc/>
-        public void Update(object newValue, Index index)
+        public void Update(object newValue, NodeIndex index)
         {
             Update(newValue, index, true);
         }
@@ -92,9 +92,16 @@ public void Add(object newItem)
             var collectionDescriptor = Descriptor as CollectionDescriptor;
             if (collectionDescriptor != null)
             {
-                // Some collection (such as sets) won't add item at the end but at an arbitrary location.
-                // Better send a null index in this case than sending a wrong value.
-                var index = collectionDescriptor.IsList ? new Index(collectionDescriptor.GetCollectionCount(value)) : Index.Empty;
+                NodeIndex index = NodeIndex.Empty;
+                switch (collectionDescriptor.Category)
+                {
+                    case DescriptorCategory.List:
+                        index = new NodeIndex(collectionDescriptor.GetCollectionCount(value));
+                        break;
+                    case DescriptorCategory.Set:
+                        index = new NodeIndex(newItem);
+                        break;
+                }
                 var args = new ItemChangeEventArgs(this, index, ContentChangeType.CollectionAdd, null, newItem);
                 NotifyItemChanging(args);
                 collectionDescriptor.Add(value, newItem);
@@ -106,16 +113,16 @@ public void Add(object newItem)
         }
 
         /// <inheritdoc/>
-        public void Add(object newItem, Index itemIndex)
+        public void Add(object newItem, NodeIndex itemIndex)
         {
-            var collectionDescriptor = Descriptor as CollectionDescriptor;
-            var dictionaryDescriptor = Descriptor as DictionaryDescriptor;
-            if (collectionDescriptor != null)
+            if (Descriptor is CollectionDescriptor collectionDescriptor)
             {
-                var index = collectionDescriptor.IsList ? itemIndex : Index.Empty;
+                var index = collectionDescriptor.Category == DescriptorCategory.Collection
+                    ? NodeIndex.Empty
+                    : itemIndex;
                 var args = new ItemChangeEventArgs(this, index, ContentChangeType.CollectionAdd, null, newItem);
                 NotifyItemChanging(args);
-                if (collectionDescriptor.GetCollectionCount(value) == itemIndex.Int || !collectionDescriptor.HasInsert)
+                if (!collectionDescriptor.HasInsert || collectionDescriptor.GetCollectionCount(value) == itemIndex.Int)
                 {
                     collectionDescriptor.Add(value, newItem);
                 }
@@ -126,7 +133,7 @@ public void Add(object newItem, Index itemIndex)
                 UpdateReferences();
                 NotifyItemChanged(args);
             }
-            else if (dictionaryDescriptor != null)
+            else if (Descriptor is DictionaryDescriptor dictionaryDescriptor)
             {
                 var args = new ItemChangeEventArgs(this, itemIndex, ContentChangeType.CollectionAdd, null, newItem);
                 NotifyItemChanging(args);
@@ -139,15 +146,23 @@ public void Add(object newItem, Index itemIndex)
 
         }
 
+        public void Clear() {
+            var collectionDescriptor = Descriptor as CollectionDescriptor;
+            var dictionaryDescriptor = Descriptor as DictionaryDescriptor;
+            if (collectionDescriptor != null) {
+                collectionDescriptor.Clear(value);
+            } else if (dictionaryDescriptor != null) {
+                dictionaryDescriptor.Clear(value);
+            }
+        }
+
         /// <inheritdoc/>
-        public void Remove(object item, Index itemIndex)
+        public void Remove(object item, NodeIndex itemIndex)
         {
             if (itemIndex.IsEmpty) throw new ArgumentException(@"The given index should not be empty.", nameof(itemIndex));
             var args = new ItemChangeEventArgs(this, itemIndex, ContentChangeType.CollectionRemove, item, null);
             NotifyItemChanging(args);
-            var collectionDescriptor = Descriptor as CollectionDescriptor;
-            var dictionaryDescriptor = Descriptor as DictionaryDescriptor;
-            if (collectionDescriptor != null)
+            if (Descriptor is CollectionDescriptor collectionDescriptor)
             {
                 if (collectionDescriptor.HasRemoveAt)
                 {
@@ -158,7 +173,7 @@ public void Remove(object item, Index itemIndex)
                     collectionDescriptor.Remove(value, item);
                 }
             }
-            else if (dictionaryDescriptor != null)
+            else if (Descriptor is DictionaryDescriptor dictionaryDescriptor)
             {
                 dictionaryDescriptor.Remove(value, itemIndex.Value);
             }
@@ -170,9 +185,9 @@ public void Remove(object item, Index itemIndex)
         }
 
         /// <inheritdoc/>
-        protected internal override void UpdateFromMember(object newValue, Index index)
+        protected internal override void UpdateFromMember(object newValue, NodeIndex index)
         {
-            if (index == Index.Empty)
+            if (index == NodeIndex.Empty)
             {
                 throw new InvalidOperationException("An ObjectNode value cannot be modified after it has been constructed");
             }
@@ -196,10 +211,19 @@ protected void NotifyItemChanged(ItemChangeEventArgs args)
             FinalizeChange?.Invoke(this, args);
         }
 
-        private void Update(object newValue, Index index, bool sendNotification)
+        private void Update(object newValue, NodeIndex index, bool sendNotification)
         {
-            if (index == Index.Empty)
+            if (index == NodeIndex.Empty)
                 throw new ArgumentException("index cannot be empty.");
+
+            if (Descriptor is SetDescriptor setDescriptor)
+            {
+                if (setDescriptor.Contains(Value, newValue))
+                {
+                    return;
+                }
+            }
+
             var oldValue = Retrieve(index);
             ItemChangeEventArgs itemArgs = null;
             if (sendNotification)
@@ -207,15 +231,17 @@ private void Update(object newValue, Index index, bool sendNotification)
                 itemArgs = new ItemChangeEventArgs(this, index, ContentChangeType.CollectionUpdate, oldValue, newValue);
                 NotifyItemChanging(itemArgs);
             }
-            var collectionDescriptor = Descriptor as CollectionDescriptor;
-            var dictionaryDescriptor = Descriptor as DictionaryDescriptor;
-            if (collectionDescriptor != null)
+            if (Descriptor is CollectionDescriptor collectionDescriptor)
+            {
+                collectionDescriptor.SetValue(Value, index.Value, ConvertValue(newValue, collectionDescriptor.ElementType));
+            }
+            else if (Descriptor is DictionaryDescriptor dictionaryDescriptor)
             {
-                collectionDescriptor.SetValue(Value, index.Int, newValue);
+                dictionaryDescriptor.SetValue(Value, index.Value, ConvertValue(newValue, dictionaryDescriptor.ValueType));
             }
-            else if (dictionaryDescriptor != null)
+            else if (Descriptor is ArrayDescriptor arrayDescriptor)
             {
-                dictionaryDescriptor.SetValue(Value, index.Value, newValue);
+                arrayDescriptor.SetValue(Value, (int)index.Value, ConvertValue(newValue, arrayDescriptor.ElementType));
             }
             else
                 throw new NotSupportedException("Unable to set the node value, the collection is unsupported");
@@ -233,7 +259,7 @@ private void UpdateReferences()
             NodeContainer?.UpdateReferences(this);
         }
 
-        private IEnumerable<Index> GetIndices()
+        private IEnumerable<NodeIndex> GetIndices()
         {
             var enumRef = ItemReferences;
             if (enumRef != null)
diff --git a/sources/presentation/Xenko.Core.Quantum/References/ObjectReference.cs b/sources/presentation/Xenko.Core.Quantum/References/ObjectReference.cs
index cac6d0fbd4..179cd53769 100644
--- a/sources/presentation/Xenko.Core.Quantum/References/ObjectReference.cs
+++ b/sources/presentation/Xenko.Core.Quantum/References/ObjectReference.cs
@@ -22,7 +22,7 @@ public sealed class ObjectReference : IReferenceInternal
         /// <param name="objectValue">A data object to reference. Can be null.</param>
         /// <param name="objectType">The type of data object to reference.</param>
         /// <param name="index">The index of this reference in its parent reference, if it is a <see cref="ReferenceEnumerable"/>.</param>
-        internal ObjectReference(object objectValue, [NotNull] Type objectType, Index index)
+        internal ObjectReference(object objectValue, [NotNull] Type objectType, NodeIndex index)
         {
             Reference.CheckReferenceCreationSafeGuard();
             if (objectType == null) throw new ArgumentNullException(nameof(objectType));
@@ -41,9 +41,9 @@ internal ObjectReference(object objectValue, [NotNull] Type objectType, Index in
         public object ObjectValue => TargetNode != null ? TargetNode.Retrieve() : orphanObject;
 
         /// <summary>
-        /// Gets the index of this reference in its parent collection. If the reference is not in a collection, this will return <see cref="Quantum.Index.Empty"/>.
+        /// Gets the index of this reference in its parent collection. If the reference is not in a collection, this will return <see cref="Quantum.NodeIndex.Empty"/>.
         /// </summary>
-        public Index Index { get; }
+        public NodeIndex Index { get; }
 
         /// <summary>
         /// Gets the <see cref="Guid"/> of the model node targeted by this reference, if available.
@@ -51,17 +51,17 @@ internal ObjectReference(object objectValue, [NotNull] Type objectType, Index in
         public Guid TargetGuid { get; private set; }
 
         /// <inheritdoc/>
-        public bool HasIndex(Index index)
+        public bool HasIndex(NodeIndex index)
         {
             return index.IsEmpty;
         }
 
         public void Refresh(IGraphNode ownerNode, NodeContainer nodeContainer)
         {
-            Refresh(ownerNode, nodeContainer, Index.Empty);
+            Refresh(ownerNode, nodeContainer, NodeIndex.Empty);
         }
 
-        internal void Refresh([NotNull] IGraphNode ownerNode, NodeContainer nodeContainer, Index index)
+        internal void Refresh([NotNull] IGraphNode ownerNode, NodeContainer nodeContainer, NodeIndex index)
         {
             var objectValue = ownerNode.Retrieve(index);
 
@@ -103,7 +103,7 @@ public bool Equals(IReference other)
         /// <inheritdoc/>
         public override string ToString()
         {
-            return $"{{{(Index != Index.Empty? $"[{Index.Value}]" : "")} -> {TargetNode}}}";
+            return $"{{{(Index != NodeIndex.Empty? $"[{Index.Value}]" : "")} -> {TargetNode}}}";
         }
 
         /// <summary>
diff --git a/sources/presentation/Xenko.Core.Quantum/References/Reference.cs b/sources/presentation/Xenko.Core.Quantum/References/Reference.cs
index 283bae4981..abb819fd05 100644
--- a/sources/presentation/Xenko.Core.Quantum/References/Reference.cs
+++ b/sources/presentation/Xenko.Core.Quantum/References/Reference.cs
@@ -12,7 +12,7 @@ internal static class Reference
         private static readonly ThreadLocal<int> CreatingReference = new ThreadLocal<int>();
 
         [Obsolete("This method will be rewritten to handle separately the different types of references")]
-        internal static IReference CreateReference(object objectValue, Type objectType, Index index, bool isMember)
+        internal static IReference CreateReference(object objectValue, Type objectType, NodeIndex index, bool isMember)
         {
             if (objectValue != null && !objectType.IsInstanceOfType(objectValue)) throw new ArgumentException(@"objectValue type does not match objectType", nameof(objectValue));
 
@@ -46,7 +46,7 @@ internal static IReference CreateReference(object objectValue, Type objectType,
 
         private static bool HasCollectionReference(Type type)
         {
-            return type.IsArray || CollectionDescriptor.IsCollection(type) || DictionaryDescriptor.IsDictionary(type);
+            return type.IsArray || ListDescriptor.IsList(type) || DictionaryDescriptor.IsDictionary(type) || SetDescriptor.IsSet(type) || OldCollectionDescriptor.IsCollection(type);
         }
 
         internal static void CheckReferenceCreationSafeGuard()
diff --git a/sources/presentation/Xenko.Core.Quantum/References/ReferenceEnumerable.cs b/sources/presentation/Xenko.Core.Quantum/References/ReferenceEnumerable.cs
index 0914386f63..90ac44831d 100644
--- a/sources/presentation/Xenko.Core.Quantum/References/ReferenceEnumerable.cs
+++ b/sources/presentation/Xenko.Core.Quantum/References/ReferenceEnumerable.cs
@@ -15,7 +15,7 @@ namespace Xenko.Core.Quantum.References
     /// </summary>
     public sealed class ReferenceEnumerable : IReferenceInternal, IEnumerable<ObjectReference>
     {
-        private HybridDictionary<Index, ObjectReference> items;
+        private HybridDictionary<NodeIndex, ObjectReference> items;
 
         internal ReferenceEnumerable(IEnumerable enumerable, [NotNull] Type enumerableType)
         {
@@ -46,10 +46,10 @@ internal ReferenceEnumerable(IEnumerable enumerable, [NotNull] Type enumerableTy
         /// <summary>
         /// Gets the indices of each reference in this instance.
         /// </summary>
-        internal IReadOnlyCollection<Index> Indices { get; private set; }
+        internal IReadOnlyCollection<NodeIndex> Indices { get; private set; }
 
         /// <inheritdoc/>
-        public ObjectReference this[Index index] => items[index];
+        public ObjectReference this[NodeIndex index] => items[index];
 
         /// <summary>
         /// Indicates whether the reference contains the given index.
@@ -57,7 +57,7 @@ internal ReferenceEnumerable(IEnumerable enumerable, [NotNull] Type enumerableTy
         /// <param name="index">The index to check.</param>
         /// <returns><c>True</c> if the reference contains the given index, <c>False</c> otherwise.</returns>
         /// <remarks>If it is an <see cref="ObjectReference"/> it will return true only for <c>null</c>.</remarks>
-        public bool HasIndex(Index index)
+        public bool HasIndex(NodeIndex index)
         {
             return items?.ContainsKey(index) ?? false;
         }
@@ -69,7 +69,7 @@ public void Refresh(IGraphNode ownerNode, NodeContainer nodeContainer)
 
             ObjectValue = newObjectValue;
 
-            var newReferences = new HybridDictionary<Index, ObjectReference>();
+            var newReferences = new HybridDictionary<NodeIndex, ObjectReference>();
             if (IsDictionary)
             {
                 foreach (var item in (IEnumerable)ObjectValue)
@@ -84,7 +84,7 @@ public void Refresh(IGraphNode ownerNode, NodeContainer nodeContainer)
                 var i = 0;
                 foreach (var item in (IEnumerable)ObjectValue)
                 {
-                    var key = new Index(i);
+                    var key = new NodeIndex(i);
                     var value = (ObjectReference)Reference.CreateReference(item, ElementType, key, true);
                     newReferences.Add(key, value);
                     ++i;
@@ -148,12 +148,14 @@ public void Refresh(IGraphNode ownerNode, NodeContainer nodeContainer)
                 }
                 items = newReferences;
                 // Remark: this works because both KeyCollection and List implements IReadOnlyCollection. Any internal change to HybridDictionary might break this!
-                Indices = (IReadOnlyCollection<Index>)newReferences.Keys;
+                Indices = (IReadOnlyCollection<NodeIndex>)newReferences.Keys;
             }
         }
 
         /// <inheritdoc/>
-        public IEnumerator<ObjectReference> GetEnumerator()
+        public ReferenceEnumerator GetEnumerator() => new ReferenceEnumerator(this);
+        
+        IEnumerator<ObjectReference> IEnumerable<ObjectReference>.GetEnumerator()
         {
             return new ReferenceEnumerator(this);
         }
@@ -174,7 +176,7 @@ public bool Equals(IReference other)
             return ReferenceEquals(this, otherEnumerable) || AreItemsEqual(items, otherEnumerable.items);
         }
 
-        private static bool AreItemsEqual(HybridDictionary<Index, ObjectReference> items1, HybridDictionary<Index, ObjectReference> items2)
+        private static bool AreItemsEqual(HybridDictionary<NodeIndex, ObjectReference> items1, HybridDictionary<NodeIndex, ObjectReference> items2)
         {
             if (ReferenceEquals(items1, items2))
                 return true;
@@ -218,12 +220,12 @@ public override string ToString()
             return text;
         }
 
-        private static Index GetKey([NotNull] object keyValuePair)
+        private static NodeIndex GetKey([NotNull] object keyValuePair)
         {
             var type = keyValuePair.GetType();
             if (!type.IsGenericType || type.GetGenericTypeDefinition() != typeof(KeyValuePair<,>)) throw new ArgumentException("The given object is not a KeyValuePair.");
             var keyProperty = type.GetProperty(nameof(KeyValuePair<object, object>.Key));
-            return new Index(keyProperty.GetValue(keyValuePair));
+            return new NodeIndex(keyProperty.GetValue(keyValuePair));
         }
 
         private static object GetValue([NotNull] object keyValuePair)
@@ -237,9 +239,9 @@ private static object GetValue([NotNull] object keyValuePair)
         /// <summary>
         /// An enumerator for <see cref="ReferenceEnumerable"/> that enumerates in proper item order.
         /// </summary>
-        private class ReferenceEnumerator : IEnumerator<ObjectReference>
+        public struct ReferenceEnumerator : IEnumerator<ObjectReference>
         {
-            private readonly IEnumerator<Index> indexEnumerator;
+            private readonly IEnumerator<NodeIndex> indexEnumerator;
             private ReferenceEnumerable obj;
 
             public ReferenceEnumerator([NotNull] ReferenceEnumerable obj)
diff --git a/sources/presentation/Xenko.Core.Quantum/Xenko.Core.Quantum.csproj b/sources/presentation/Xenko.Core.Quantum/Xenko.Core.Quantum.csproj
index 57a9d35a6d..cf549a303c 100644
--- a/sources/presentation/Xenko.Core.Quantum/Xenko.Core.Quantum.csproj
+++ b/sources/presentation/Xenko.Core.Quantum/Xenko.Core.Quantum.csproj
@@ -1,7 +1,7 @@
-<Project>
+<Project>
 
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>
   
   <ItemGroup>
@@ -24,6 +24,6 @@
   </ItemGroup>
 
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
 </Project>
\ No newline at end of file
diff --git a/sources/presentation/Xenko.Core.Translation.Presentation/Xenko.Core.Translation.Presentation.csproj b/sources/presentation/Xenko.Core.Translation.Presentation/Xenko.Core.Translation.Presentation.csproj
index 7b7ace98f5..d308947a00 100644
--- a/sources/presentation/Xenko.Core.Translation.Presentation/Xenko.Core.Translation.Presentation.csproj
+++ b/sources/presentation/Xenko.Core.Translation.Presentation/Xenko.Core.Translation.Presentation.csproj
@@ -1,9 +1,6 @@
 <Project>
-  <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
-  </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -30,5 +27,5 @@
     <ProjectReference Include="..\..\core\Xenko.Core.Translation\Xenko.Core.Translation.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/shaders/Irony.GrammarExplorer/030.Irony.GrammarExplorer.2010.csproj b/sources/shaders/Irony.GrammarExplorer/030.Irony.GrammarExplorer.2010.csproj
index b70a2c0876..5f9762d5ab 100644
--- a/sources/shaders/Irony.GrammarExplorer/030.Irony.GrammarExplorer.2010.csproj
+++ b/sources/shaders/Irony.GrammarExplorer/030.Irony.GrammarExplorer.2010.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.Core.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -74,5 +74,5 @@
     <ProjectReference Include="..\Irony\Irony.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/shaders/Irony/Irony.csproj b/sources/shaders/Irony/Irony.csproj
index c8c779bbb7..9b1d348b8f 100644
--- a/sources/shaders/Irony/Irony.csproj
+++ b/sources/shaders/Irony/Irony.csproj
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
@@ -11,7 +11,6 @@
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>irony_xenko.snk</AssemblyOriginatorKeyFile>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <XenkoBuildTags>*</XenkoBuildTags>
@@ -80,5 +79,4 @@
   
   <Import Project="$(XenkoPostSettingsTargets)" />
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-
 </Project>
\ No newline at end of file
diff --git a/sources/shaders/Xenko.Core.Shaders/Analysis/Hlsl/HlslSemanticAnalysis.cs b/sources/shaders/Xenko.Core.Shaders/Analysis/Hlsl/HlslSemanticAnalysis.cs
index 45f4a2ba17..0df93cdd28 100644
--- a/sources/shaders/Xenko.Core.Shaders/Analysis/Hlsl/HlslSemanticAnalysis.cs
+++ b/sources/shaders/Xenko.Core.Shaders/Analysis/Hlsl/HlslSemanticAnalysis.cs
@@ -753,7 +753,21 @@ public static Function Template1(string name, Target[] targets, TypeBase[] targe
             public static Function[] Functions = new[]
 	        {
 		        // Missing5: dst EvaluateAttribute
-		        //           Interlocked*
+		        Template1("InterlockedAdd", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedAdd", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0)),
+		        Template1("InterlockedAnd", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedAnd", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0)),
+		        Template1("InterlockedCompareExchange", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("compare_value", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedCompareStore", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("compare_value", 0), Param("value", 0)),
+		        Template1("InterlockedExchange", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedMax", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedMax", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0)),
+		        Template1("InterlockedMin", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedMin", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0)),
+		        Template1("InterlockedOr", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedOr", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0)),
+		        Template1("InterlockedXor", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0), Param("original_value", 0, outParam: true)),
+		        Template1("InterlockedXor", new[] { Target.Scalar }, new[] {ScalarType.Int, ScalarType.UInt }, Param((f, p) => TypeBase.Void), Param("dest", 0), Param("value", 0)),
 		        Template1("abs", AllTargets, NumericTargets, Param(0), Param("x", 0)),
 		        Template1("acos", AllTargets, FloatTargets, Param(0), Param("x", 0)),
 		        Template1("all", AllTargets, NumericAndBoolTargets, Param((f, p) => ScalarType.Bool), Param("x", 0)),
diff --git a/sources/shaders/Xenko.Core.Shaders/Ast/VectorType.cs b/sources/shaders/Xenko.Core.Shaders/Ast/VectorType.cs
index 904ab58a67..4689ddfd68 100644
--- a/sources/shaders/Xenko.Core.Shaders/Ast/VectorType.cs
+++ b/sources/shaders/Xenko.Core.Shaders/Ast/VectorType.cs
@@ -73,6 +73,21 @@ public partial class VectorType : GenericBaseType
         /// </summary>
         public static readonly VectorType Double4 = new VectorType(ScalarType.Double, 4);
 
+        /// <summary>
+        /// A Half2
+        /// </summary>
+        public static readonly VectorType Half2 = new VectorType(ScalarType.Half, 2);
+
+        /// <summary>
+        /// A Half3
+        /// </summary>
+        public static readonly VectorType Half3 = new VectorType(ScalarType.Half, 3);
+
+        /// <summary>
+        /// A Half4
+        /// </summary>
+        public static readonly VectorType Half4 = new VectorType(ScalarType.Half, 4);
+
 
         #endregion
 
diff --git a/sources/shaders/Xenko.Core.Shaders/Convertor/HlslToGlslConvertor.cs b/sources/shaders/Xenko.Core.Shaders/Convertor/HlslToGlslConvertor.cs
index 26128ae7b7..2c9df76503 100644
--- a/sources/shaders/Xenko.Core.Shaders/Convertor/HlslToGlslConvertor.cs
+++ b/sources/shaders/Xenko.Core.Shaders/Convertor/HlslToGlslConvertor.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
 using System.Collections.Generic;
@@ -141,8 +141,8 @@ public HlslToGlslConvertor(GlslShaderPlatform shaderPlatform, int shaderVersion,
                 switch (pipelineStage)
                 {
                     case PipelineStage.Vertex:
-                        builtinInputs.Add("SV_VertexID", "gl_VertexID");
-                        builtinInputs.Add("SV_InstanceID", "gl_InstanceID");
+                        builtinInputs.Add("SV_VertexID", isVulkan ? "gl_VertexIndex" : "gl_VertexID");
+                        builtinInputs.Add("SV_InstanceID", isVulkan ? "gl_InstanceIndex" :  "gl_InstanceID");
                         if (shaderModel < ShaderModel.Model40)
                         {
                             builtinOutputs.Add("POSITION", "gl_Position");
@@ -199,6 +199,7 @@ public HlslToGlslConvertor(GlslShaderPlatform shaderPlatform, int shaderVersion,
                    { "gl_FragData", VectorType.Float4}, // array
                    { "gl_FrontFacing", ScalarType.Bool}, 
                    { "gl_InstanceID", ScalarType.Int },
+                   { "gl_InstanceIndex", ScalarType.Int },
                    { "gl_InvocationID", ScalarType.Int},
                    { "gl_Layer", ScalarType.Int},
                    { "gl_NumSamples", ScalarType.Int},
@@ -214,6 +215,7 @@ public HlslToGlslConvertor(GlslShaderPlatform shaderPlatform, int shaderVersion,
                    { "gl_SamplePosition", VectorType.Float2},
                    { "gl_TessCoord", VectorType.Float3},
                    { "gl_VertexID", ScalarType.Int},
+                   { "gl_VertexIndex", ScalarType.Int},
                    { "gl_ViewportIndex", ScalarType.Int},
                 };
             }
diff --git a/sources/shaders/Xenko.Core.Shaders/Writer/ShaderWriter.cs b/sources/shaders/Xenko.Core.Shaders/Writer/ShaderWriter.cs
index dc5309afdd..02efdce246 100644
--- a/sources/shaders/Xenko.Core.Shaders/Writer/ShaderWriter.cs
+++ b/sources/shaders/Xenko.Core.Shaders/Writer/ShaderWriter.cs
@@ -523,6 +523,36 @@ public override void Visit(GenericType genericType)
             Write(">");
         }
 
+        /// <inheritdoc />
+        public override void Visit(VectorType vectorType)
+        {
+            Write(vectorType.Name).Write("<");
+            for (int i = 0; i < vectorType.Parameters.Count; i++)
+            {
+                var parameter = vectorType.Parameters[i];
+                if (i > 0) Write(",").WriteSpace();
+
+                VisitDynamic(parameter);
+            }
+
+            Write(">");
+        }
+
+        /// <inheritdoc />
+        public override void Visit(MatrixType vectorType)
+        {
+            Write(vectorType.Name).Write("<");
+            for (int i = 0; i < vectorType.Parameters.Count; i++)
+            {
+                var parameter = vectorType.Parameters[i];
+                if (i > 0) Write(",").WriteSpace();
+
+                VisitDynamic(parameter);
+            }
+
+            Write(">");
+        }
+
         /// <inheritdoc />
         public override void Visit(Literal literal)
         {
diff --git a/sources/shaders/Xenko.Core.Shaders/Xenko.Core.Shaders.csproj b/sources/shaders/Xenko.Core.Shaders/Xenko.Core.Shaders.csproj
index 9240cb0650..35aab87fd7 100644
--- a/sources/shaders/Xenko.Core.Shaders/Xenko.Core.Shaders.csproj
+++ b/sources/shaders/Xenko.Core.Shaders/Xenko.Core.Shaders.csproj
@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <XenkoAssemblySign>true</XenkoAssemblySign>
     <XenkoRuntime>true</XenkoRuntime>
     <XenkoRuntimeNetStandard>true</XenkoRuntimeNetStandard>
   </PropertyGroup>
@@ -14,33 +13,16 @@
     <XenkoAssemblyProcessorOptions>--serialization</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
   </PropertyGroup>
-  <Choose>
-    <When Condition="('$(XenkoPlatform)' == 'UWP')">
-      <ItemGroup>
-        <Reference Include="CppNet">
-          <HintPath>..\..\..\deps\CppNet\Store\CppNet.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <When Condition="'$(XenkoNETRuntime)' != ''">
-      <ItemGroup>
-        <Reference Include="CppNet">
-          <HintPath>..\..\..\deps\CppNet\$(XenkoNETRuntime)\CppNet.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-    <Otherwise>
-      <ItemGroup>
-        <Reference Include="CppNet">
-          <HintPath>..\..\..\deps\CppNet\CppNet.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </Otherwise>
-  </Choose>
-  <Choose>
-    <When Condition=" '$(AutoIncludeSystemAssembly)' != 'true'">
-    </When>
-  </Choose>
+  <ItemGroup Condition="'$(XenkoNETRuntime)' != ''">
+    <Reference Include="CppNet">
+      <HintPath>..\..\..\deps\CppNet\$(XenkoNETRuntime)\CppNet.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(XenkoNETRuntime)' == ''">
+    <Reference Include="CppNet">
+      <HintPath>..\..\..\deps\CppNet\CppNet.dll</HintPath>
+    </Reference>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
diff --git a/sources/shared/SharedAssemblyInfo.cs b/sources/shared/SharedAssemblyInfo.cs
index c72893dae2..bf56d8c667 100644
--- a/sources/shared/SharedAssemblyInfo.cs
+++ b/sources/shared/SharedAssemblyInfo.cs
@@ -23,11 +23,16 @@ namespace Xenko
     internal class XenkoVersion
     {
         /// <summary>
-        /// The version used by editor for display purpose. 4th digit needs to be at least 1 if used (due to NuGet special cases).
+        /// The version used by nuget whatever the heck it needs. 4th digit needs to be at least 1 if used (due to stupid NuGet special cases).
         /// </summary>
-        public const string PublicVersion = "3.1.0.1";
+        public const string PublicVersion = "9.9.1";
 
         /// <summary>
+        /// This version will be shown in the editor and actually is the version. Can be changed without triggering weird NuGet behavior.
+        /// </summary>
+        public const string VersionToShowInEditor = "4.19.7";
+
+        /// <summary>1
         /// The current assembly version as text, currently same as <see cref="PublicVersion"/>.
         /// </summary>
         public const string AssemblyVersion = PublicVersion;
@@ -49,7 +54,7 @@ internal class XenkoVersion
         /// - -betaXX: development version (XX should corespond to development asset versioning)
         /// - -betaXX-YYYY: beta release (YYYY is the git height since current version has been bumped)
         /// </summary>
-        public const string NuGetVersionSuffix = "-beta02";
+        public const string NuGetVersionSuffix = "-nugt99";
 
         /// <summary>
         /// The build metadata, usually +g[git_hash] during package. Automatically set by Xenko.GitVersioning.GenerateVersionFile.
diff --git a/sources/shared/Xenko.NuGetResolver/NuGetAssemblyResolver.cs b/sources/shared/Xenko.NuGetResolver/NuGetAssemblyResolver.cs
index 666798ce56..440d1a9f39 100644
--- a/sources/shared/Xenko.NuGetResolver/NuGetAssemblyResolver.cs
+++ b/sources/shared/Xenko.NuGetResolver/NuGetAssemblyResolver.cs
@@ -6,39 +6,131 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using Newtonsoft.Json.Linq;
-using NuGet.Commands;
 using NuGet.Common;
 using NuGet.Configuration;
-using NuGet.Frameworks;
-using NuGet.LibraryModel;
-using NuGet.ProjectModel;
-using NuGet.Protocol;
-using NuGet.Protocol.Core.Types;
 using NuGet.Versioning;
 
+/*
+ *  System.Private.CoreLib is only being found in (x86) directories?
+ *    - need to add debug lines for every library found.. see whats happening this this library
+ *    - library fails because it can't find x64 version
+ *    - sort things x64 to the top?
+ */
+
 namespace Xenko.Core.Assets
 {
     class NuGetAssemblyResolver
     {
+        const bool DEBUG_RESOLVE = false;
+
         static bool assembliesResolved;
         static object assembliesLock = new object();
-        static List<string> assemblies;
+        static Dictionary<string, List<LibraryInfo>> allAssemblies = new Dictionary<string, List<LibraryInfo>>();
 
         internal static void DisableAssemblyResolve()
         {
             assembliesResolved = true;
         }
 
+        internal class LibraryInfo : IComparable<LibraryInfo>
+        {
+            public string Name;
+            public string Version;
+            public string FullPath;
+            public int LibraryRating;
+            public int[] versionInfo;
+
+            public LibraryInfo(string vers)
+            {
+                Version = vers;
+                string[] sv = vers.Split('.');
+                versionInfo = new int[sv.Length];
+                try
+                {
+                    for (int i = 0; i < sv.Length; i++)
+                        versionInfo[i] = int.Parse(sv[i]);
+                }
+                catch (Exception e)
+                {
+                    if (DEBUG_RESOLVE)
+                        System.Console.Error.WriteLine("Couldn't parse version: " + vers);
+                }
+            }
+
+            public int CompareTo(object obj)
+            {
+                if (obj is LibraryInfo li)
+                    return li.CompareTo(this);
+
+                return 0;
+            }
+
+            public int CompareTo(LibraryInfo other)
+            {
+                if (LibraryRating > other.LibraryRating) return -1;
+                if (LibraryRating < other.LibraryRating) return 1;
+                for (int i = 0; i < versionInfo.Length && i < other.versionInfo.Length; i++)
+                {
+                    if (versionInfo[i] > other.versionInfo[i]) return -1;
+                    if (versionInfo[i] < other.versionInfo[i]) return 1;
+                }
+                return 0;
+            }
+
+            public static int GetLibraryRating(string path)
+            {
+                if (path.Contains("net48"))
+                    return 10;
+                if (path.Contains("net47"))
+                    return 9;
+                if (path.Contains("net46"))
+                    return 8;
+                if (path.Contains("net4"))
+                    return 7;
+                if (path.Contains("net3"))
+                    return 6;
+                if (path.Contains("net2"))
+                    return 5;
+                if (path.Contains("net1"))
+                    return 4;
+                if (path.Contains("netstandard2.0"))
+                    return 2;
+                if (path.Contains("netstandard"))
+                    return 1;
+                if (path.Contains("net6.0"))
+                    return 0;
+                if (path.Contains("net5.0"))
+                    return -1;
+                return -2;
+            }
+        }
+
         [ModuleInitializer(-100000)]
         internal static void __Initialize__()
         {
-            // Only perform this for entry assembly (which is null during module .ctor)
-            if (Assembly.GetEntryAssembly() != null)
+            // Only perform this for entry assembly
+            if (!(Assembly.GetEntryAssembly() == null // .NET FW: null during module .ctor
+                || Assembly.GetEntryAssembly() == Assembly.GetCallingAssembly())) // .NET Core: check against calling assembly
                 return;
 
+            // delete old temp files if we can
+            var dirs = Directory.GetDirectories(Path.GetTempPath(), "Xenko*");
+            if (dirs != null)
+            {
+                foreach (string s in dirs)
+                {
+                    try
+                    {
+                        Directory.Delete(s, true);
+                    } catch (Exception e) { 
+                        // might have been in use, oh well
+                    }
+                }
+            }
+
             // Make sure our nuget local store is added to nuget config
             var folder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
             string xenkoFolder = null;
@@ -56,66 +148,169 @@ internal static void __Initialize__()
                 }
                 folder = Path.GetDirectoryName(folder);
             }
+            string xenkoLibFolder = xenkoFolder == null ? null : Path.Combine(xenkoFolder, @"sources\editor\Xenko.GameStudio\bin\Release");
+            if (xenkoLibFolder != null && !Directory.Exists(xenkoLibFolder))
+                xenkoLibFolder = xenkoFolder;
+            else
+                xenkoLibFolder = null;
 
             // Note: we perform nuget restore inside the assembly resolver rather than top level module ctor (otherwise it freezes)
             AppDomain.CurrentDomain.AssemblyResolve += (sender, eventArgs) =>
             {
-                if (!assembliesResolved)
+                lock (assembliesLock)
                 {
-                    lock (assembliesLock)
+                    if (!assembliesResolved)
                     {
-                        // Note: using NuGet will try to recursively resolve NuGet.*.resources.dll, so set assembliesResolved right away so that it bypasses everything
                         assembliesResolved = true;
 
-                        var logger = new Logger();
-                        try
+                        var settings = NuGet.Configuration.Settings.LoadDefaultSettings(null);
+                        var packageSourceProvider = new PackageSourceProvider(settings);
+
+                        var installPath = SettingsUtility.GetGlobalPackagesFolder(settings);
+                        var extraPath = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + "\\dotnet\\shared\\Microsoft.NETCore.App";
+                        var extraPath86 = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + "\\dotnet\\shared\\Microsoft.NETCore.App";
+
+                        var nugetAssemblies = new List<string>(Directory.GetFiles(installPath, "*.dll", SearchOption.AllDirectories).OrderByDescending(f => new FileInfo(f).CreationTime));
+                        nugetAssemblies.AddRange(Directory.GetFiles(installPath, "*.exe", SearchOption.AllDirectories).OrderByDescending(f => new FileInfo(f).CreationTime));
+                        nugetAssemblies.AddRange(Directory.GetFiles(extraPath, "*.dll", SearchOption.AllDirectories).OrderByDescending(f => new FileInfo(f).CreationTime));
+                        nugetAssemblies.AddRange(Directory.GetFiles(extraPath86, "*.dll", SearchOption.AllDirectories).OrderByDescending(f => new FileInfo(f).CreationTime));
+
+                        if (xenkoLibFolder != null)
+                            nugetAssemblies.AddRange(Directory.GetFiles(xenkoLibFolder, "*.dll", SearchOption.AllDirectories));
+
+                        // only include stuff we want
+                        for (int i=0; i<nugetAssemblies.Count; i++)
                         {
-                            var (request, result) = RestoreHelper.Restore(logger, Assembly.GetExecutingAssembly().GetName().Name, new VersionRange(new NuGetVersion(XenkoVersion.NuGetVersion))).Result;
-                            if (!result.Success)
+                            var assembly = nugetAssemblies[i];
+
+                            if (assembly.Contains("linux") || assembly.Contains("osx") || 
+                                assembly.Contains("\\runtimes\\") && !assembly.Contains("xenko") ||
+                                assembly.Contains("\\ref\\"))
+                                continue;
+
+                            LibraryInfo li;
+
+                            var assmName = Path.GetFileNameWithoutExtension(assembly);
+
+                            if (assembly.Contains("Xenko.GameStudio"))
+                            {
+                                // xenko
+                                li = new LibraryInfo("9.9.1.0")
+                                {
+                                    FullPath = assembly,
+                                    Name = assmName,
+                                    LibraryRating = 15                                     
+                                };
+                            } 
+                            else
                             {
-                                throw new InvalidOperationException($"Could not restore NuGet packages");
+                                var dir = assembly.Split('\\');
+                                if (assembly.Contains("dotnet\\shared"))
+                                {
+                                    // dotnetshared
+                                    var version = dir[dir.Length - 2] + ".0";
+                                    li = new LibraryInfo(version)
+                                    {
+                                        FullPath = assembly,
+                                        Name = assmName,
+                                        LibraryRating = LibraryInfo.GetLibraryRating(assembly)
+                                    };
+                                } 
+                                else
+                                {
+                                    // nuget stuff
+                                    var version = dir[Array.IndexOf(dir, "packages") + 2].Split('.', '-');
+                                    var versionProcessed = version[0] + "." + version[1] + "." + version[2];
+                                    if (version.Length > 3 && int.TryParse(version[3], out int res))
+                                        versionProcessed += "." + res;
+                                    else
+                                        versionProcessed += ".0";
+
+                                    li = new LibraryInfo(versionProcessed)
+                                    {
+                                        Name = assmName,
+                                        FullPath = assembly,
+                                        LibraryRating = LibraryInfo.GetLibraryRating(assembly)
+                                    };
+                                }
                             }
 
-                            assemblies = RestoreHelper.ListAssemblies(request, result);
-                        }
-                        catch (Exception e)
-                        {
-                            var logFile = Path.GetTempPath() + Guid.NewGuid().ToString() + ".txt";
-                            var logText = $@"Error restoring NuGet packages!
-
-==== Exception details ====
-
-{e}
-
-==== Log ====
-
-{string.Join(Environment.NewLine, logger.Logs.Select(x => $"[{x.Level}] {x.Message}"))}
-";
-                            File.WriteAllText(logFile, logText);
-#if XENKO_NUGET_RESOLVER_UX
-                            // Write log to file
-                            System.Windows.Forms.MessageBox.Show($"{e.Message}{Environment.NewLine}{Environment.NewLine}Please see details in {logFile} (which will be automatically opened)", "Error restoring NuGet packages");
-                            Process.Start(logFile);
-#else
-                            // Display log in console
-                            Console.WriteLine(logText);
-#endif
-                            Environment.Exit(1);
+                            if (allAssemblies.TryGetValue(assmName, out var sorted))
+                            {
+                                if (DEBUG_RESOLVE)
+                                    System.Console.Error.WriteLine("[" + assmName + "] added with " + li.FullPath);
+
+                                sorted.Add(li);
+                            }
+                            else
+                            {
+                                if (DEBUG_RESOLVE)
+                                    System.Console.Error.WriteLine("[" + assmName + "] Started with " + li.FullPath);
+
+                                allAssemblies[assmName] = new List<LibraryInfo>() { li };
+                            }
                         }
+
+                        // sort all the lists
+                        foreach (var l in allAssemblies.Values)
+                            l.Sort();
                     }
-                }
 
-                if (assemblies != null)
-                {
-                    var aname = new AssemblyName(eventArgs.Name);
-                    if (aname.Name.StartsWith("Microsoft.Build") && aname.Name != "Microsoft.Build.Locator")
-                        return null;
-                    var assemblyPath = assemblies.FirstOrDefault(x => Path.GetFileNameWithoutExtension(x) == aname.Name);
-                    if (assemblyPath != null)
+                    if (assembliesResolved)
                     {
-                        return Assembly.LoadFrom(assemblyPath);
+                        var aname = new AssemblyName(eventArgs.Name);
+                        if (aname.Name.StartsWith("Microsoft.Build") && aname.Name != "Microsoft.Build.Locator")
+                            return null;
+
+                        if (allAssemblies.TryGetValue(aname.Name, out var libs))
+                        {
+                            if (DEBUG_RESOLVE)
+                                System.Console.Error.WriteLine("[" + eventArgs.Name + "] Found with " + libs.Count + " libraries.");
+
+                            List<string> versionsToTry = new List<string>();
+
+                            if (aname.Name == "System.Numerics.Vectors")
+                            {
+                                versionsToTry.Add("4.4.0.0");
+                                versionsToTry.Add("4.5.0.0");
+                            }
+                            else versionsToTry.Add(aname.Version.ToString());
+
+                            for (int i=0; i<versionsToTry.Count; i++)
+                            {
+                                for (int j=0; j<libs.Count; j++)
+                                {
+                                    var libToTry = libs[j];
+                                    if (libToTry.Version != versionsToTry[i]) continue;
+                                    try
+                                    {
+                                        if (DEBUG_RESOLVE)
+                                            System.Console.Error.WriteLine("[" + eventArgs.Name + "] Trying version specific load: " + libToTry.FullPath);
+
+                                        return Assembly.LoadFrom(libToTry.FullPath);
+                                    } catch(Exception) { }
+                                }
+                            }
+
+                            // versions didn't work... try them in order
+                            for (int i=0; i<libs.Count; i++)
+                            {
+                                try
+                                {
+                                    if (DEBUG_RESOLVE)
+                                        System.Console.Error.WriteLine("[" + eventArgs.Name + "] Trying version priority load: " + libs[i].FullPath);
+
+                                    return Assembly.LoadFrom(libs[i].FullPath);
+                                }
+                                catch (Exception) { }
+                            }
+                        }
                     }
                 }
+
+                if (DEBUG_RESOLVE)
+                    System.Console.Error.WriteLine("[" + eventArgs.Name + "] No library found!");
+
                 return null;
             };
         }
diff --git a/sources/shared/Xenko.NuGetResolver/RestoreHelper.cs b/sources/shared/Xenko.NuGetResolver/RestoreHelper.cs
deleted file mode 100644
index 03052b4836..0000000000
--- a/sources/shared/Xenko.NuGetResolver/RestoreHelper.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using NuGet.Commands;
-using NuGet.Common;
-using NuGet.Configuration;
-using NuGet.Frameworks;
-using NuGet.LibraryModel;
-using NuGet.ProjectModel;
-using NuGet.Protocol;
-using NuGet.Protocol.Core.Types;
-using NuGet.Versioning;
-
-namespace Xenko.Core.Assets
-{
-    static class RestoreHelper
-    {
-        public static List<string> ListAssemblies(RestoreRequest request, RestoreResult result)
-        {
-            var assemblies = new List<string>();
-            foreach (var library in result.LockFile.Libraries)
-            {
-                // Try several known path (note: order matters)
-                // TODO: Create a real sort
-                foreach (var startPattern in new[] { "runtimes/win-d3d11/lib/net4", "runtimes/win/lib/net4", "runtimes/any/lib/net4", "lib/net4", "lib/net35", "runtimes/win-d3d11/lib/netstandard2.", "runtimes/win/lib/netstandard2.", "runtimes/any/lib/netstandard2.", "lib/netstandard2.", "lib/netstandard1.", "lib/net10" })
-                {
-                    foreach (var file in library.Files)
-                    {
-                        var extension = Path.GetExtension(file).ToLowerInvariant();
-                        // Try several known path (note: order matters)
-                        if (file.StartsWith(startPattern, StringComparison.InvariantCultureIgnoreCase)
-                            && (extension == ".dll" || extension == ".exe"))
-                        {
-                            assemblies.Add(Path.Combine(request.DependencyProviders.GlobalPackages.RepositoryRoot, library.Path, file));
-                        }
-                    }
-                }
-            }
-
-            return assemblies;
-        }
-
-        public static async Task<(RestoreRequest, RestoreResult)> Restore(ILogger logger, string packageName, VersionRange versionRange)
-        {
-            var settings = NuGet.Configuration.Settings.LoadDefaultSettings(null);
-
-            var packageSourceProvider = new PackageSourceProvider(settings);
-
-            // not sure what these do, but it was in the NuGet command line.
-            var resourceProviders = new List<Lazy<INuGetResourceProvider>>();
-            resourceProviders.AddRange(Repository.Provider.GetCoreV3());
-
-            // Setup source provider as a V3 only.
-            var sourceRepositoryProvider = new SourceRepositoryProvider(settings, resourceProviders);
-
-            var installPath = SettingsUtility.GetGlobalPackagesFolder(settings);
-            var assemblies = new List<string>();
-
-            var projectPath = Path.Combine("XenkoNugetResolver.json");
-            var spec = new PackageSpec()
-            {
-                Name = Path.GetFileNameWithoutExtension(projectPath), // make sure this package never collides with a dependency
-                FilePath = projectPath,
-                Dependencies = new List<LibraryDependency>()
-                {
-                    new LibraryDependency
-                    {
-                        LibraryRange = new LibraryRange(packageName, versionRange, LibraryDependencyTarget.Package),
-                    }
-                },
-                TargetFrameworks =
-                {
-                    new TargetFrameworkInformation
-                    {
-                        FrameworkName = NuGetFramework.Parse("net472"),
-                    }
-                },
-                RestoreMetadata = new ProjectRestoreMetadata
-                {
-                    ProjectPath = projectPath,
-                    ProjectName = Path.GetFileNameWithoutExtension(projectPath),
-                    ProjectStyle = ProjectStyle.PackageReference,
-                    ProjectUniqueName = projectPath,
-                    OutputPath = Path.Combine(Path.GetTempPath(), $"XenkoNugetResolver-{packageName}-{versionRange.MinVersion.ToString()}"),
-                    OriginalTargetFrameworks = new[] { "net472" },
-                    ConfigFilePaths = settings.GetConfigFilePaths(),
-                    PackagesPath = SettingsUtility.GetGlobalPackagesFolder(settings),
-                    Sources = SettingsUtility.GetEnabledSources(settings).ToList(),
-                    FallbackFolders = SettingsUtility.GetFallbackPackageFolders(settings).ToList()
-                },
-            };
-
-            using (var context = new SourceCacheContext())
-            {
-                context.IgnoreFailedSources = true;
-
-                var dependencyGraphSpec = new DependencyGraphSpec();
-
-                dependencyGraphSpec.AddProject(spec);
-
-                dependencyGraphSpec.AddRestore(spec.RestoreMetadata.ProjectUniqueName);
-
-                IPreLoadedRestoreRequestProvider requestProvider = new DependencyGraphSpecRequestProvider(new RestoreCommandProvidersCache(), dependencyGraphSpec);
-
-                var restoreArgs = new RestoreArgs
-                {
-                    AllowNoOp = true,
-                    CacheContext = context,
-                    CachingSourceProvider = new CachingSourceProvider(new PackageSourceProvider(settings)),
-                    Log = logger,
-                };
-
-                // Create requests from the arguments
-                var requests = requestProvider.CreateRequests(restoreArgs).Result;
-
-                // Restore the packages
-                for (int tryCount = 0; tryCount < 2; ++tryCount)
-                {
-                    try
-                    {
-                        var results = await RestoreRunner.RunWithoutCommit(requests, restoreArgs);
-
-                        // Commit results so that noop cache works next time
-                        foreach (var result in results)
-                        {
-                            await result.Result.CommitAsync(logger, CancellationToken.None);
-                        }
-                        var mainResult = results.First();
-                        return (mainResult.SummaryRequest.Request, mainResult.Result);
-                    }
-                    catch (Exception e) when (e is UnauthorizedAccessException || e is IOException)
-                    {
-                        // If we have an unauthorized access exception, it means assemblies are locked by running Xenko process
-                        // During first try, kill some known harmless processes, and try again
-                        if (tryCount == 1)
-                            throw;
-
-                        foreach (var process in new[] { "Xenko.ConnectionRouter" }.SelectMany(Process.GetProcessesByName))
-                        {
-                            try
-                            {
-                                if (process.Id != Process.GetCurrentProcess().Id)
-                                {
-                                    process.Kill();
-                                    process.WaitForExit();
-                                }
-                            }
-                            catch (Exception)
-                            {
-                            }
-                        }
-                    }
-                }
-
-                throw new InvalidOperationException("Unreachable code");
-            }
-        }
-    }
-}
diff --git a/sources/shared/Xenko.NuGetResolver/Xenko.NuGetResolver.projitems b/sources/shared/Xenko.NuGetResolver/Xenko.NuGetResolver.projitems
index 4cee98baf5..c9acdc9f92 100644
--- a/sources/shared/Xenko.NuGetResolver/Xenko.NuGetResolver.projitems
+++ b/sources/shared/Xenko.NuGetResolver/Xenko.NuGetResolver.projitems
@@ -10,7 +10,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)NuGetAssemblyResolver.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RestoreHelper.cs" />
   </ItemGroup>
   <PropertyGroup>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeNuGetResolverAssemblies</TargetsForTfmSpecificBuildOutput>
diff --git a/sources/targets/Xenko.Core.GlobalSettings.targets b/sources/targets/Xenko.Core.GlobalSettings.targets
index 0307e36a34..7dfc960a16 100644
--- a/sources/targets/Xenko.Core.GlobalSettings.targets
+++ b/sources/targets/Xenko.Core.GlobalSettings.targets
@@ -23,7 +23,7 @@
     <Copyright>Copyright © Xenko contributors and Silicon Studio Corp.</Copyright>
     <Authors>Xenko contributors;Silicon Studio Corp.</Authors>
     <PackageTags>Xenko;3D;gamedev;Game Engine;engine;games;D3D;OpenGL;Vulkan</PackageTags>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)..\..\bin\packages</PackageOutputPath>
+    <PackageOutputPath>$(MSBuildThisFileDirectory)..\..\bin\packages\</PackageOutputPath>
 
     <!-- If we don't set it, default targets will add PlatformName in some cases -->
     <BaseOutputPath>bin\</BaseOutputPath>
@@ -57,13 +57,6 @@
     <XenkoPlatformDefines>XENKO_PLATFORM_WINDOWS;XENKO_PLATFORM_WINDOWS_DESKTOP;NET45</XenkoPlatformDefines>
     <NUnitLiteBinDir>$(XenkoCommonDependenciesDir)NUnitLite\net-4.0\</NUnitLiteBinDir>
   </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'UWP' ">
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <XenkoPlatformDefines>XENKO_PLATFORM_WINDOWS;XENKO_PLATFORM_UWP;NET45;NETFX_CORE;WINDOWS_UAP</XenkoPlatformDefines>
-    <NUnitLiteBinDir>$(XenkoCommonDependenciesDir)NUnitLite\net-win10\</NUnitLiteBinDir>
-    <ExtrasUwpMetaPackageVersion>6.2.2</ExtrasUwpMetaPackageVersion>
-  </PropertyGroup>
 
   <PropertyGroup Condition=" '$(XenkoPlatform)' == 'Linux' ">
     <XenkoPlatformDefines>XENKO_PLATFORM_LINUX;XENKO_PLATFORM_UNIX;NET45</XenkoPlatformDefines>
@@ -75,89 +68,23 @@
     <NUnitLiteBinDir>$(XenkoCommonDependenciesDir)NUnitLite\net-4.0\</NUnitLiteBinDir>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'Android' ">
-    <XenkoPlatformDefines>XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_ANDROID;NET45</XenkoPlatformDefines>
-    <AndroidStoreUncompressedFileExtensions />
-    <MandroidI18n />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'Android' And '$(OutputType)' == 'Exe' ">
-    <AndroidApplication>true</AndroidApplication>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'Android' And '$(Configuration)' == 'Debug' ">
-    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
-    <AndroidLinkMode>None</AndroidLinkMode>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'Android' And '$(Configuration)' == 'Release' ">
-    <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
-    <AndroidLinkMode>SdkOnly</AndroidLinkMode>
-  </PropertyGroup>
-  <!-- Workaround for https://github.com/xamarin/xamarin-android/issues/1235 -->
-  <Target Name="_FixupLibraryProjectsEmbeddedResource" AfterTargets="_AddLibraryProjectsEmbeddedResourceToProject">
-    <ItemGroup>
-	  <_LibraryProjectsEmbeddedResource Include="@(EmbeddedResource)" Condition="'%(Identity)' == '$(IntermediateOutputPath)__AndroidLibraryProjects__.zip'"/>
-	  <EmbeddedResource Remove="@(_LibraryProjectsEmbeddedResource)"/>
-      <EmbeddedResource Include="@(_LibraryProjectsEmbeddedResource)">
-        <LogicalName>__AndroidLibraryProjects__.zip</LogicalName>
-      </EmbeddedResource>
-    </ItemGroup>
-  </Target>
-
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' ">
-    <Platform Condition=" '$(Platform)' == '' ">iPhone</Platform>
-    <XenkoPlatformDefines>XENKO_PLATFORM_MONO_MOBILE;XENKO_PLATFORM_IOS;NET45</XenkoPlatformDefines>
-  </PropertyGroup>
-
-  <Choose>
-    <When Condition=" '$(XenkoPlatform)' == 'Android' Or '$(XenkoPlatform)' == 'iOS' Or '$(XenkoPlatform)' == 'UWP' ">
-      <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Xml" />
-        <Reference Include="System.Xml.Linq" />
-      </ItemGroup>
-    </When>
-  </Choose>
-
-  <!-- Create empty project platform configuration so that MSBuild and Visual Studio Configuration Manager know about it -->
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Debug|iPhone' "/>
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Release|iPhone' "/>
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Debug|iPhoneSimulator' "/>
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' And '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' "/>
-
   <!-- 
     Settings XenkoNETRuntime specific
   -->
-  <PropertyGroup Condition=" '$(XenkoNETRuntime)' == 'CoreCLR' ">
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+  <PropertyGroup Condition="'$(XenkoNETRuntime)' == 'CoreCLR'">
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>
     <DefineConstants>$(XenkoPlatformDefines);$(DefineConstants)</DefineConstants>
     <DefineConstants Condition="'$(XenkoNETRuntimeDefines)' != ''">$(DefineConstants);$(XenkoNETRuntimeDefines)</DefineConstants>
   </PropertyGroup>
-
-  <!-- Signing -->
-  <PropertyGroup Condition=" '$(XenkoOpenSourceSign)' == 'true'">
-    <XenkoSign>true</XenkoSign>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(XenkoAssemblySign)' == 'true' And '$(XenkoSign)' == 'true'">
-    <DefineConstants>$(DefineConstants);XENKO_SIGNED</DefineConstants>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign Condition="'$(XenkoOpenSourceSign)' == 'true'">true</DelaySign>
-    <AssemblyOriginatorKeyFile Condition="'$(XenkoOpenSourceSign)' != 'true'">$(SolutionDir)xenko.snk</AssemblyOriginatorKeyFile>
-    <AssemblyOriginatorKeyFile Condition="'$(XenkoOpenSourceSign)' == 'true'">$(SolutionDir)xenko.public.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
   
   <!-- SourceLink -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Condition="'$(XenkoProjectType)' == 'CSharp'" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Condition="'$(StrideProjectType)' == 'CSharp'" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
-  <!-- Copy the libcore.a and libfreetype.a libraries to the project root directory for future native link.
-       Note: this target is redefined in References.targets for user projects -->
-  <Target Name="CopyXenkoNativeLibraries" Condition=" '$(XenkoPlatform)' == 'iOS' and '$(OutputType)' == 'Exe'">
-  </Target>
-
   <!-- Used by Xenko.build to detect if unit tests prefer to run in 32 or 64 bits (note: it's a copy of Xenko.UnitTests.targets one because some unit tests import Xenko.Core.PreSettings.targets rather than Xenko.UnitTests.targets) -->
   <Target Name="_XenkoAfterGetTargetPathWithTargetPlatformMoniker" AfterTargets="GetTargetPathWithTargetPlatformMoniker">
     <ItemGroup>
diff --git a/sources/targets/Xenko.Core.PostSettings.Dependencies.targets b/sources/targets/Xenko.Core.PostSettings.Dependencies.targets
index c47543bc9c..f34942e154 100644
--- a/sources/targets/Xenko.Core.PostSettings.Dependencies.targets
+++ b/sources/targets/Xenko.Core.PostSettings.Dependencies.targets
@@ -54,7 +54,7 @@
 
   <Target Name="_XenkoCopyContent" DependsOnTargets="_XenkoBuildDependencies" AfterTargets="ResolveAssemblyReferences" Condition="'$(XenkoDependenciesCopy)' != 'false'">
     <ItemGroup>
-      <Content Include="@(_XenkoDependencyContent)"/>
+      <Content Include="@(_XenkoDependencyContent)" Pack="False"/>
     </ItemGroup>
   </Target>
 
diff --git a/sources/targets/Xenko.Core.PostSettings.targets b/sources/targets/Xenko.Core.PostSettings.targets
index 1b52974cc5..5f0c579581 100644
--- a/sources/targets/Xenko.Core.PostSettings.targets
+++ b/sources/targets/Xenko.Core.PostSettings.targets
@@ -60,8 +60,17 @@
     <!-- On Android, everything is library (even Exe) -->
     <OutputType Condition=" '$(XenkoPlatform)' == 'Android' ">Library</OutputType>
 
+    <OutputPath Condition="'$(XenkoProjectType)' == 'Cpp'">$(OutDir)</OutputPath>
+    <IntermediateOutputPath Condition="'$(XenkoProjectType)' == 'Cpp'">$(IntDir)</IntermediateOutputPath>
   </PropertyGroup>
 
+  <!-- Workaround for https://github.com/onovotny/MSBuildSdkExtras/issues/174 -->
+  <Target Name="_XenkoRemoveNonExistingResgenFile" BeforeTargets="CoreCompile" Condition="'$(_SdkSetAndroidResgenFile)' == 'true' And '$(AndroidResgenFile)' != '' And !Exists('$(AndroidResgenFile)')">
+    <ItemGroup>
+      <Compile Remove="$(AndroidResgenFile)"/>
+    </ItemGroup>
+  </Target>
+
   <!-- User Documentation (.usrdoc) -->
   <PropertyGroup Condition="'$(XenkoPublicApi)' == 'true'">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
diff --git a/sources/targets/Xenko.Core.PreSettings.targets b/sources/targets/Xenko.Core.PreSettings.targets
index 2dd452886e..07448202ae 100644
--- a/sources/targets/Xenko.Core.PreSettings.targets
+++ b/sources/targets/Xenko.Core.PreSettings.targets
@@ -15,11 +15,11 @@
     Settings XenkoPlatform specific
   -->
   <PropertyGroup>
-    <!-- Using C# version 7.3 -->
-    <LangVersion>7.3</LangVersion>
-    <XenkoRuntimeTargetFramework>net461</XenkoRuntimeTargetFramework>
-    <TargetFrameworkTool>net472</TargetFrameworkTool>
-    <TargetFrameworkVersionTool>v4.7.2</TargetFrameworkVersionTool>
+    <!-- Using C# version 12.0 -->
+    <LangVersion>12.0</LangVersion>
+    <XenkoRuntimeTargetFramework>net6.0</XenkoRuntimeTargetFramework>
+    <TargetFrameworkTool>net48</TargetFrameworkTool>
+    <TargetFrameworkVersionTool>v4.8</TargetFrameworkVersionTool>
     <XenkoPlatformDefines>XENKO_PLATFORM_WINDOWS;XENKO_PLATFORM_WINDOWS_DESKTOP;NET45</XenkoPlatformDefines>
 
     <!-- Note: ideally we would split using ItemGroup but then PropertyGroup are not properly evaluated if they contain ItemGroup (unless using Targets) -->
@@ -28,26 +28,15 @@
     <XenkoPlatforms>$([MSBuild]::Unescape('$(XenkoPlatforms)'))</XenkoPlatforms>
     <_XenkoPlatforms>;$(XenkoPlatforms);</_XenkoPlatforms>
   </PropertyGroup>
-  
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('uap10.0'))">
-    <!-- Reset runtime identifier by default (otherwise GetPackagingOutputs fail) -->
-    <RuntimeIdentifier></RuntimeIdentifier>
-    <RuntimeIdentifiers></RuntimeIdentifiers>
-    <WindowsAppContainer>false</WindowsAppContainer>
-    <AppxPackage>false</AppxPackage>
-    <Platform>AnyCPU</Platform>
+
+  <PropertyGroup>
+    <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' != 'true' ">
+  <PropertyGroup Condition="'$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' != 'true'">
     <!-- Add netstandard2.0 no matter what (needed for references) -->
     <XenkoRuntimeTargetFrameworks>netstandard2.0</XenkoRuntimeTargetFrameworks>
-    <XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Windows;')) And '$(XenkoRuntimeWindowsDotNet)' == 'true'">$(XenkoRuntimeTargetFrameworks);net461</XenkoRuntimeTargetFrameworks>
-    <XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';UWP;'))">$(XenkoRuntimeTargetFrameworks);uap10.0.16299</XenkoRuntimeTargetFrameworks>
-    <XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Android;'))">$(XenkoRuntimeTargetFrameworks);monoandroid81</XenkoRuntimeTargetFrameworks>
-    <XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';iOS;'))">$(XenkoRuntimeTargetFrameworks);xamarinios10</XenkoRuntimeTargetFrameworks>
-    <XenkoRuntimeTargetFrameworks>$([MSBuild]::Unescape($(XenkoRuntimeTargetFrameworks.Trim(';'))))</XenkoRuntimeTargetFrameworks>
-    <TargetFrameworks>$(XenkoRuntimeTargetFrameworks)</TargetFrameworks>
-    <TargetFramework Condition="'$(XenkoBuildDoc)' == 'true' And '$(TargetFramework)' == ''">$(TargetFrameworks.Split(';', StringSplitOptions.RemoveEmptyEntries)[0])</TargetFramework>
+    <XenkoRuntimeTargetFrameworks Condition="$(_XenkoPlatforms.Contains(';Windows;')) And '$(XenkoRuntimeWindowsDotNet)' == 'true'">$(XenkoRuntimeTargetFrameworks);net48</XenkoRuntimeTargetFrameworks>
 
     <XenkoRuntimeIdentifiers Condition="'$(XenkoRuntimeNetStandardNoRuntimeIdentifiers)' != 'true' And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoPlatforms.Contains(';Windows;'))">$(XenkoRuntimeIdentifiers);win</XenkoRuntimeIdentifiers>
     <XenkoRuntimeIdentifiers Condition="'$(XenkoRuntimeNetStandardNoRuntimeIdentifiers)' != 'true' And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoPlatforms.Contains(';Linux;'))">$(XenkoRuntimeIdentifiers);linux</XenkoRuntimeIdentifiers>
@@ -65,20 +54,24 @@
     <!-- Otherwise compute fallback -->
     <XenkoRuntimeIdentifier Condition="'$(XenkoRuntimeIdentifiers)' != '' And '$(XenkoRuntimeIdentifier)' == ''">$(XenkoRuntimeIdentifiers.Split(';', StringSplitOptions.RemoveEmptyEntries)[0])</XenkoRuntimeIdentifier>
 
+    <XenkoRuntimeTargetFrameworks>$([MSBuild]::Unescape($(XenkoRuntimeTargetFrameworks.Trim(';'))))</XenkoRuntimeTargetFrameworks>
     <XenkoRuntimeIdentifiers>$([MSBuild]::Unescape($(XenkoRuntimeIdentifiers.Trim(';'))))</XenkoRuntimeIdentifiers>
 
+    <TargetFrameworks>$(XenkoRuntimeTargetFrameworks)</TargetFrameworks>
     <RuntimeIdentifiers Condition="'$(XenkoRuntimeIdentifiers)' != ''">$(XenkoRuntimeIdentifiers)</RuntimeIdentifiers>
-
+	
+    <!-- docfx doesn't like if there is no TargetFramework/RuntimeIdentifier set by default -->
+    <TargetFramework Condition="'$(XenkoBuildDoc)' == 'true' And '$(TargetFramework)' == ''">$(TargetFrameworks.Split(';', StringSplitOptions.RemoveEmptyEntries)[0])</TargetFramework>
     <RuntimeIdentifier Condition="'$(XenkoBuildDoc)' == 'true' And '$(RuntimeIdentifier)' == ''">$(XenkoRuntimeIdentifier)</RuntimeIdentifier>
 
     <ExtrasBuildEachRuntimeIdentifier Condition="'$(RuntimeIdentifiers)' != ''">true</ExtrasBuildEachRuntimeIdentifier>
 
     <!-- UpToDate check doesn't work with multi-TFM projects! https://github.com/dotnet/project-system/issues/2487 -->
     <!--<DisableFastUpToDateCheck Condition="$(TargetFrameworks.Contains(';')) Or $(RuntimeIdentifiers.Contains(';'))">true</DisableFastUpToDateCheck>-->
-    <!--<TargetFrameworks>net461;uap10.0.16299;monoandroid81;xamarinios10;netstandard2.0</TargetFrameworks>-->
+    <!--<TargetFrameworks>net48;uap10.0.16299;monoandroid81;xamarinios10;netstandard2.0</TargetFrameworks>-->
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' == 'true' ">
+  <PropertyGroup Condition="'$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' == 'true'">
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
@@ -115,7 +108,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="GetPackagingOutputs" Condition=" '$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' == 'true' " />
+  <Target Name="GetPackagingOutputs" Condition="'$(XenkoRuntime)' == 'true' And '$(XenkoRuntimeNetStandard)' == 'true'" />
 
   <!-- Use default runtime as ref assembly -->
   <PropertyGroup>
@@ -124,11 +117,12 @@
   <Target Name="_XenkoIncludeRefAssemblies" Condition="'$(RuntimeIdentifiers)' != '' And '$(RuntimeIdentifier)' == $(RuntimeIdentifiers.Split(';')[0])">
     <ItemGroup>
       <TfmSpecificPackageFile Include="@(IntermediateAssembly)" PackagePath="ref/$(TargetFramework)" />
+      <TfmSpecificPackageFile Include="@(DocFileItem)" PackagePath="ref/$(TargetFramework)" />
     </ItemGroup>
   </Target>
 
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
 
     <!-- Defines the language of the project being compiled CSharp or Cpp - defined by default to CSharp, must be overriden to Cpp in a Cpp project -->
@@ -142,9 +136,6 @@
     <XenkoPlatform Condition=" ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And ('$(RuntimeIdentifier)' == '' Or $(RuntimeIdentifier.StartsWith('win'))) ">Windows</XenkoPlatform>
     <XenkoPlatform Condition=" ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(RuntimeIdentifier.StartsWith('linux')) ">Linux</XenkoPlatform>
     <XenkoPlatform Condition=" ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(RuntimeIdentifier.StartsWith('osx')) ">macOS</XenkoPlatform>
-    <XenkoPlatform Condition=" $(TargetFramework.StartsWith('uap10.0')) ">UWP</XenkoPlatform>
-    <XenkoPlatform Condition=" '$(TargetFramework)' == 'monoandroid81' ">Android</XenkoPlatform>
-    <XenkoPlatform Condition=" '$(TargetFramework)' == 'xamarinios10' ">iOS</XenkoPlatform>
     <!-- Default fallback -->
     <XenkoPlatform Condition=" '$(XenkoPlatform)' == '' ">Windows</XenkoPlatform>
 
@@ -154,17 +145,6 @@
     <XenkoPostSettingsTargets Condition="'$(XenkoPostSettingsTargets)' == ''">$(MSBuildThisFileDirectory)Xenko.Core.PostSettings.targets</XenkoPostSettingsTargets>
   </PropertyGroup>
 
-  <!-- Ensure appropriate Solution Platform are available -->
-  <Choose>
-    <When  Condition=" '$(XenkoPlatform)' == 'Android' ">
-      <PropertyGroup Condition=" '$(Platform)' == 'Android' "/>
-    </When>
-    <When  Condition=" '$(XenkoPlatform)' == 'iOS' ">
-      <PropertyGroup Condition=" '$(Platform)' == 'iPhone' "/>
-      <PropertyGroup Condition=" '$(Platform)' == 'iPhoneSimulator' "/>
-    </When>
-  </Choose>
-
   <!--Import Global Settings-->
   <Import Project="$(XenkoGlobalSettingsTargets)"/>
 </Project>
diff --git a/sources/targets/Xenko.Core.Sign.targets b/sources/targets/Xenko.Core.Sign.targets
index 0a6c3d159a..5da9cede40 100644
--- a/sources/targets/Xenko.Core.Sign.targets
+++ b/sources/targets/Xenko.Core.Sign.targets
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="_XenkoSignExecutable" BeforeTargets="CopyFilesToOutputDirectory">
-    <SignFile Condition="'$(XenkoSignTool)' == 'true' And '$(XenkoProjectType)' != 'Cpp'" CertificateThumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba" SigningTarget="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" TimestampUrl="http://timestamp.globalsign.com/scripts/timstamp.dll" />
-    <SignFile Condition="'$(XenkoSignTool)' == 'true' And '$(XenkoProjectType)' == 'Cpp'" CertificateThumbprint="6969a724bf72c0b69e31c44bdd22dc11e5272bba" SigningTarget="$(OutputPath)$(TargetName)$(TargetExt)" TimestampUrl="http://timestamp.globalsign.com/scripts/timstamp.dll" />
+    <SignFile Condition="'$(XenkoSign)' == 'true' And '$(XenkoProjectType)' != 'Cpp'" CertificateThumbprint="edad2b260091eacffbc42859d0339c74b263bfec" SigningTarget="$(IntermediateOutputPath)$(TargetName)$(TargetExt)" TimestampUrl="http://timestamp.globalsign.com/scripts/timstamp.dll" />
+    <SignFile Condition="'$(XenkoSign)' == 'true' And '$(XenkoProjectType)' == 'Cpp'" CertificateThumbprint="edad2b260091eacffbc42859d0339c74b263bfec" SigningTarget="$(OutputPath)$(TargetName)$(TargetExt)" TimestampUrl="http://timestamp.globalsign.com/scripts/timstamp.dll" />
   </Target>
 </Project>
diff --git a/sources/targets/Xenko.GlobalSettings.targets b/sources/targets/Xenko.GlobalSettings.targets
index cce930da10..c53b3f9216 100644
--- a/sources/targets/Xenko.GlobalSettings.targets
+++ b/sources/targets/Xenko.GlobalSettings.targets
@@ -4,11 +4,8 @@
   <!-- Default values -->
   <PropertyGroup>
     <!-- Defaults for CPU and GraphicsApi based on platform-->
-    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'Windows'">Direct3D11</XenkoDefaultGraphicsApi>
-    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'UWP'">Direct3D11</XenkoDefaultGraphicsApi>
-    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'Android'">OpenGLES</XenkoDefaultGraphicsApi>
-    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'iOS'">OpenGLES</XenkoDefaultGraphicsApi>
-    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'Linux'">OpenGL</XenkoDefaultGraphicsApi>
+    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'Windows'">Vulkan</XenkoDefaultGraphicsApi>
+    <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'Linux'">Vulkan</XenkoDefaultGraphicsApi>
     <XenkoDefaultGraphicsApi Condition="'$(XenkoPlatform)' == 'macOS'">Vulkan</XenkoDefaultGraphicsApi>
     <XenkoGraphicsApiOriginal>$(XenkoGraphicsApi)</XenkoGraphicsApiOriginal>
     <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == '' and '$(XenkoDefaultGraphicsApi)' != ''">$(XenkoDefaultGraphicsApi)</XenkoGraphicsApi>
@@ -25,28 +22,28 @@
 
   <!-- Include platform dependent assembly when specified -->
   <PropertyGroup Condition="'$(XenkoGraphicsApiDependent)' == 'true'">
-    <!-- Build list of Graphics API -->
-    <XenkoGraphicsApis Condition="'$(XenkoGraphicsApis)' == '' And '$(XenkoGraphicsApiDependentBuildAll)' == 'true'">Direct3D11;Direct3D12;OpenGL;OpenGLES;Vulkan</XenkoGraphicsApis>
-    <XenkoGraphicsApis Condition="'$(XenkoGraphicsApis)' == '' And '$(XenkoGraphicsApiDependentBuildAll)' != 'true'">$(XenkoGraphicsApiOriginal)</XenkoGraphicsApis>
-    
-    <_XenkoGraphicsApis Condition="'$(XenkoGraphicsApis)' != ''">;$(XenkoGraphicsApis);</_XenkoGraphicsApis>
+    <!-- Build list of Graphics API for platform that supports multiple -->
+    <XenkoGraphicsApisWindows Condition="'$(XenkoGraphicsApiDependentBuildAll)' == 'true'">Direct3D11;Vulkan</XenkoGraphicsApisWindows>
+    <XenkoGraphicsApisWindows Condition="'$(XenkoGraphicsApisWindows)' == ''">Direct3D11</XenkoGraphicsApisWindows>
+    <_XenkoGraphicsApisWindows>;$(XenkoGraphicsApisWindows);</_XenkoGraphicsApisWindows>
     
+    <XenkoGraphicsApisLinux Condition="'$(XenkoGraphicsApiDependentBuildAll)' == 'true'">Vulkan</XenkoGraphicsApisLinux>
+    <XenkoGraphicsApisLinux Condition="'$(XenkoGraphicsApisLinux)' == ''">Vulkan</XenkoGraphicsApisLinux>
+    <_XenkoGraphicsApisLinux>;$(XenkoGraphicsApisLinux);</_XenkoGraphicsApisLinux>
+
+
     <!-- Compute list of runtime identifiers based on platforms and graphics platforms -->
     <RuntimeIdentifiers></RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And ($(_XenkoGraphicsApis.Contains(';Direct3D11;')) Or '$(_XenkoGraphicsApis)' == '')">$(RuntimeIdentifiers);win-d3d11</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoGraphicsApis.Contains(';Direct3D12;'))">$(RuntimeIdentifiers);win-d3d12</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoGraphicsApis.Contains(';OpenGL;'))">$(RuntimeIdentifiers);win-opengl</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoGraphicsApis.Contains(';OpenGLES;'))">$(RuntimeIdentifiers);win-opengles</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoGraphicsApis.Contains(';Vulkan;'))">$(RuntimeIdentifiers);win-vulkan</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Linux;')) And '$(TargetFramework)' == 'netstandard2.0' And ($(_XenkoGraphicsApis.Contains(';OpenGL;')) Or '$(_XenkoGraphicsApis)' == '')">$(RuntimeIdentifiers);linux-opengl</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Linux;')) And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoGraphicsApis.Contains(';Vulkan;'))">$(RuntimeIdentifiers);linux-vulkan</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';macOS;')) And '$(TargetFramework)' == 'netstandard2.0' And ($(_XenkoGraphicsApis.Contains(';Vulkan;')) Or '$(_XenkoGraphicsApis)' == '')">$(RuntimeIdentifiers);osx-vulkan</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoGraphicsApisWindows.Contains(';Direct3D11;'))">$(RuntimeIdentifiers);win</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Windows;')) And ($(TargetFramework.StartsWith('net4')) Or '$(TargetFramework)' == 'netstandard2.0') And $(_XenkoGraphicsApisWindows.Contains(';Vulkan;'))">$(RuntimeIdentifiers);win-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';Linux;')) And '$(TargetFramework)' == 'netstandard2.0' And $(_XenkoGraphicsApisLinux.Contains(';Vulkan;'))">$(RuntimeIdentifiers);linux</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$(_XenkoPlatforms.Contains(';macOS;')) And '$(TargetFramework)' == 'netstandard2.0'">$(RuntimeIdentifiers);osx</RuntimeIdentifiers>
     
     <RuntimeIdentifiers>$([MSBuild]::Unescape($(RuntimeIdentifiers.Trim(';'))))</RuntimeIdentifiers>
     <!-- Default fallbacks -->
-    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0' And '$(XenkoPlatform)' == 'Linux' And '$(RuntimeIdentifiers)' == ''">linux-opengl</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0' And '$(XenkoPlatform)' == 'Windows' And '$(RuntimeIdentifiers)' == ''">win-d3d11</RuntimeIdentifiers>
-    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0' And '$(XenkoPlatform)' == 'macOS' And '$(RuntimeIdentifiers)' == ''">osx-vulkan</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0' And '$(XenkoPlatform)' == 'Linux' And '$(RuntimeIdentifiers)' == ''">linux</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0' And '$(XenkoPlatform)' == 'Windows' And '$(RuntimeIdentifiers)' == ''">win</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="'$(TargetFramework)' == 'netstandard2.0' And '$(XenkoPlatform)' == 'macOS' And '$(RuntimeIdentifiers)' == ''">osx</RuntimeIdentifiers>
     <RuntimeIdentifiers Condition="'$(TargetFramework)' != 'netstandard2.0' And '$(RuntimeIdentifiers)' == ''">any</RuntimeIdentifiers>
     <RuntimeIdentifierDefault Condition="'$(RuntimeIdentifiers)' != ''">$(RuntimeIdentifiers.Split(';')[0])</RuntimeIdentifierDefault>
 
@@ -55,20 +52,16 @@
     <!-- Compute RuntimeIdentifier (it might be different if passed from a ProjectReference) -->
     <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' And '$(RuntimeIdentifierDefault)' != ''">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
     <!-- Properly setup RuntimeIdentifier if it was not a Graphics-API-specific one -->
-    <RuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(RuntimeIdentifier)' != 'win-d3d11' And '$(RuntimeIdentifier)' != 'win-d3d12' And '$(RuntimeIdentifier)' != 'win-opengl' And '$(RuntimeIdentifier)' != 'win-opengles' And '$(RuntimeIdentifier)' != 'win-vulkan'">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Linux' And '$(RuntimeIdentifier)' != 'linux-opengl' And '$(RuntimeIdentifier)' != 'linux-vulkan'">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(XenkoPlatform)' == 'macOS' And '$(RuntimeIdentifier)' != 'osx-vulkan'">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Windows' And '$(RuntimeIdentifier)' != 'win' And '$(RuntimeIdentifier)' != 'win-x64'">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(XenkoPlatform)' == 'Linux' And '$(RuntimeIdentifier)' != 'linux'">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(XenkoPlatform)' == 'macOS' And '$(RuntimeIdentifier)' != 'osx'">$(RuntimeIdentifierDefault)</RuntimeIdentifier>
 
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-d3d11'">Direct3D11</XenkoGraphicsApi>
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-d3d12'">Direct3D12</XenkoGraphicsApi>
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-opengl'">OpenGL</XenkoGraphicsApi>
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-opengles'">OpenGLES</XenkoGraphicsApi>
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-vulkan'">Vulkan</XenkoGraphicsApi>
+    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win'">Direct3D11</XenkoGraphicsApi>
+    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'win-x64'">Vulkan</XenkoGraphicsApi>
 
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'linux-opengl'">OpenGL</XenkoGraphicsApi>
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'linux-vulkan'">Vulkan</XenkoGraphicsApi>
+    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'linux'">Vulkan</XenkoGraphicsApi>
 
-    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'osx-vulkan'">Vulkan</XenkoGraphicsApi>
+    <XenkoGraphicsApi Condition="'$(RuntimeIdentifier)' == 'osx'">Vulkan</XenkoGraphicsApi>
   </PropertyGroup>
   
   <!-- Workaround: Remove RuntimeIdentifier from Solution references (https://github.com/onovotny/MSBuildSdkExtras/issues/139)
@@ -88,22 +81,10 @@
     <XenkoGraphicsApiDefines>XENKO_GRAPHICS_API_DIRECT3D;XENKO_GRAPHICS_API_DIRECT3D11</XenkoGraphicsApiDefines>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoGraphicsApi)' == 'Direct3D12' ">
-    <XenkoGraphicsApiDefines>XENKO_GRAPHICS_API_DIRECT3D;XENKO_GRAPHICS_API_DIRECT3D12</XenkoGraphicsApiDefines>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(XenkoGraphicsApi)' == 'Null' ">
     <XenkoGraphicsApiDefines>XENKO_GRAPHICS_API_NULL</XenkoGraphicsApiDefines>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoGraphicsApi)' == 'OpenGL' ">
-    <XenkoGraphicsApiDefines>XENKO_GRAPHICS_API_OPENGL;XENKO_GRAPHICS_API_OPENGLCORE</XenkoGraphicsApiDefines>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(XenkoGraphicsApi)' == 'OpenGLES' ">
-    <XenkoGraphicsApiDefines>XENKO_GRAPHICS_API_OPENGL;XENKO_GRAPHICS_API_OPENGLES</XenkoGraphicsApiDefines>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(XenkoGraphicsApi)' == 'Vulkan' ">
     <XenkoGraphicsApiDefines>XENKO_GRAPHICS_API_VULKAN</XenkoGraphicsApiDefines>
   </PropertyGroup>
@@ -116,26 +97,10 @@
     <FrameworkShaderUseSharpDX>true</FrameworkShaderUseSharpDX>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'UWP' ">
-    <AutoIncludeSystemAssembly>true</AutoIncludeSystemAssembly>
-    <ProjectLockFile Condition="'$(ProjectLockFile)' == ''">$(MSBuildThisFileDirectory)..\build\project.lock.json</ProjectLockFile>
-  </PropertyGroup>
-
   <PropertyGroup Condition="('$(XenkoPlatform)' == 'Linux') or ('$(XenkoPlatform)' == 'macOS')">
     <FrameworkShaderUseSharpDX>false</FrameworkShaderUseSharpDX>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'Android' ">
-    <XenkoExternalSuffix>.Android</XenkoExternalSuffix>
-    <FrameworkShaderUseSharpDX>false</FrameworkShaderUseSharpDX>
-  </PropertyGroup>
-  
-  <PropertyGroup Condition=" '$(XenkoPlatform)' == 'iOS' ">
-    <XenkoExternalSuffix>.iOS</XenkoExternalSuffix>
-    <FrameworkShaderUseSharpDX>false</FrameworkShaderUseSharpDX>
-    <NUnitLiteBinDir>$(XenkoDependenciesDir)NUnitLite\net-monotouch\</NUnitLiteBinDir>
-  </PropertyGroup>
-
   <!-- 
     Global Defines
   -->
@@ -155,11 +120,9 @@
   
   <PropertyGroup>
     <XenkoUI Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'Linux' Or '$(XenkoPlatform)' == 'macOS'">SDL</XenkoUI>
-    <XenkoUI Condition="'$(XenkoGraphicsApi)' == 'OpenGL'">$(XenkoUI);OPENTK</XenkoUI>
-    <XenkoUI Condition="'$(XenkoPlatform)' == 'Windows' AND $(TargetFramework.StartsWith('net4')) AND ('$(XenkoGraphicsApi)' == 'Direct3D11' Or '$(XenkoGraphicsApi)' == 'Direct3D12')">$(XenkoUI);WINFORMS;WPF</XenkoUI>
+    <XenkoUI Condition="'$(XenkoPlatform)' == 'Windows' AND $(TargetFramework.StartsWith('net4')) AND ('$(XenkoGraphicsApi)' == 'Direct3D11')">$(XenkoUI);WINFORMS;WPF</XenkoUI>
 
     <DefineConstants Condition="$(XenkoUI.Contains('SDL'))">$(DefineConstants);XENKO_UI_SDL</DefineConstants>
-    <DefineConstants Condition="$(XenkoUI.Contains('OPENTK'))">$(DefineConstants);XENKO_UI_OPENTK</DefineConstants>
     <DefineConstants Condition="$(XenkoUI.Contains('WINFORMS'))">$(DefineConstants);XENKO_UI_WINFORMS</DefineConstants>
     <DefineConstants Condition="$(XenkoUI.Contains('WPF'))">$(DefineConstants);XENKO_UI_WPF</DefineConstants>
   </PropertyGroup>
@@ -171,7 +134,7 @@
 
   
   <!--Building Xenko SDK itself?-->
-  <PropertyGroup Condition=" '$(XenkoUserBuild)' != 'true' ">
+  <PropertyGroup Condition="'$(XenkoUserBuild)' != 'true'">
     <!--Output All files in solution\Bin directory-->
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -179,13 +142,13 @@
   </PropertyGroup>
 
   <!-- Pack target -->
-  <!--<UsingTask TaskName="Xenko.Core.Tasks.PackAssets" AssemblyFile="$(MSBuildThisFileDirectory)..\core\Xenko.Core.Tasks\bin\$(Configuration)\net472\Xenko.Core.Tasks.exe" />-->
+  <!--<UsingTask TaskName="Xenko.Core.Tasks.PackAssets" AssemblyFile="$(MSBuildThisFileDirectory)..\core\Xenko.Core.Tasks\bin\$(Configuration)\net48\Xenko.Core.Tasks.exe" />-->
   <Target Name="PrepareXenkoAssetsForPack" BeforeTargets="_GetPackageFiles" Condition="'$(XenkoPackAssets)' == 'true'">
     <!-- We use exec version rather than task version, otherwise file will be locked during rebuild -->
     <!--<PackAssets ProjectFile="$(MSBuildProjectFile)" IntermediatePackagePath="$(IntermediateOutputPath)\xenko">
       <Output TaskParameter="GeneratedItems" ItemName="None"/>
     </PackAssets>-->
-    <Exec Command="&quot;$(MSBuildThisFileDirectory)..\core\Xenko.Core.Tasks\bin\$(Configuration)\net472\Xenko.Core.Tasks.exe&quot; pack-assets &quot;$(MSBuildProjectFile)&quot; &quot;$(IntermediateOutputPath)\xenko&quot;" ConsoleToMsBuild="true">
+    <Exec Command="&quot;$(MSBuildThisFileDirectory)..\core\Xenko.Core.Tasks\bin\$(Configuration)\$(TargetFrameworkTool)\Xenko.Core.Tasks.exe&quot; pack-assets &quot;$(MSBuildProjectFile)&quot; &quot;$(IntermediateOutputPath)\xenko&quot;" ConsoleToMsBuild="true">
       <Output TaskParameter="ConsoleOutput" ItemName="PackAssetsLine" />
     </Exec>
     <ItemGroup>
diff --git a/sources/targets/Xenko.PostSettings.targets b/sources/targets/Xenko.PostSettings.targets
index 828c6ee8b5..db809a9fae 100644
--- a/sources/targets/Xenko.PostSettings.targets
+++ b/sources/targets/Xenko.PostSettings.targets
@@ -26,4 +26,13 @@
       <Compile Include="@(XenkoSharedAssemblyFile->'$(MSBuildThisFileDirectory)..\shared\SharedAssemblyInfo.NuGet.cs')" />
     </ItemGroup>
   </Target>
+
+  <!-- Make sure xksl/xkfx are properly setup with code generator; also mark generated code file as dependent -->
+  <ItemGroup>
+    <Compile Update="**\*.xksl.cs" DependentUpon="%(Filename)" />
+    <None Update="**\*.xksl" Generator="XenkoShaderKeyGenerator" />
+    <Compile Update="**\*.xkfx.cs" DependentUpon="%(Filename)" />
+    <None Update="**\*.xkfx" Generator="XenkoEffectCodeGenerator" />
+  </ItemGroup>
+
 </Project>
diff --git a/sources/targets/Xenko.UnitTests.targets b/sources/targets/Xenko.UnitTests.targets
index a30f368b6c..daa1348463 100644
--- a/sources/targets/Xenko.UnitTests.targets
+++ b/sources/targets/Xenko.UnitTests.targets
@@ -22,27 +22,6 @@
 
   </PropertyGroup>
   
-  <!-- On Windows, let's sign the assemblies with fake strong signing (OpenSource Signing, OSS),
-       so that people can compile Xenko themself and still use the editor which expect strongly signed assemblies.
-    -->
-  <!-- Signing -->
-  <PropertyGroup Condition=" '$(XenkoOpenSourceSign)' == 'true'">
-    <XenkoSign>true</XenkoSign>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(XenkoAssemblySign)' == 'true' And '$(XenkoSign)' == 'true'">
-    <DefineConstants>$(DefineConstants);XENKO_SIGNED</DefineConstants>
-    <SignAssembly>true</SignAssembly>
-    <DelaySign Condition="'$(XenkoOpenSourceSign)' == 'true'">true</DelaySign>
-    <AssemblyOriginatorKeyFile Condition="'$(XenkoOpenSourceSign)' != 'true'">$(SolutionDir)xenko.snk</AssemblyOriginatorKeyFile>
-    <AssemblyOriginatorKeyFile Condition="'$(XenkoOpenSourceSign)' == 'true'">$(SolutionDir)xenko.public.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  
-  <Import Project="$(MSBuildThisDirectory)..\..\sources\core\Xenko.Core\build\Xenko.Core.targets"/>
-  <Import Project="$(MSBuildThisDirectory)..\..\sources\assets\Xenko.Core.Assets.CompilerApp\build\Xenko.Core.Assets.CompilerApp.targets"/>
-
-  <!-- Add Default targets used by Msbuild for undefined Platforms / or when skipping compilation under a platform -->
-  <Import Condition="'$(XenkoCompilerTargetsEnable)' == 'false'" Project="$(MSBuildThisFileDirectory)Xenko.UnitTests.DisableBuild.targets"/>
-
   <PropertyGroup>
     <XenkoCommonDependenciesDir>$(XenkoPackageXenko)\deps\</XenkoCommonDependenciesDir>
   </PropertyGroup>
@@ -63,4 +42,12 @@
       </TargetPathWithTargetPlatformMoniker>
     </ItemGroup>
   </Target>
+
+  <!-- Make sure xksl/xkfx are properly setup with code generator; also mark generated code file as dependent -->
+  <ItemGroup>
+    <Compile Update="**\*.xksl.cs" DependentUpon="%(Filename)" />
+    <None Update="**\*.xksl" Generator="XenkoShaderKeyGenerator" />
+    <Compile Update="**\*.xkfx.cs" DependentUpon="%(Filename)" />
+    <None Update="**\*.xkfx" Generator="XenkoEffectCodeGenerator" />
+  </ItemGroup>
 </Project>
diff --git a/sources/tests/tools/Xenko.TextureConverter.Tests/AtitcTexLibraryTest.cs b/sources/tests/tools/Xenko.TextureConverter.Tests/AtitcTexLibraryTest.cs
deleted file mode 100644
index 93196057ed..0000000000
--- a/sources/tests/tools/Xenko.TextureConverter.Tests/AtitcTexLibraryTest.cs
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-
-using Xunit;
-using Xenko.TextureConverter.Requests;
-using Xenko.TextureConverter.TexLibraries;
-
-namespace Xenko.TextureConverter.Tests
-{
-    public class AtitcTexLibraryTest : IDisposable
-    {
-        private readonly AtitcTexLibrary library = new AtitcTexLibrary();
-        private readonly XenkoTexLibrary paraLib = new XenkoTexLibrary();
-
-        public AtitcTexLibraryTest()
-        {
-            library = new AtitcTexLibrary();
-            paraLib = new XenkoTexLibrary();
-            Assert.False(library.SupportBGRAOrder());
-        }
-
-        public void Dispose()
-        {
-            library.Dispose();
-            paraLib.Dispose();
-        }
-
-        [Theory(Skip = "Need check")]
-        [InlineData("Texture3D_WMipMaps_ATC_RGBA_Explicit.xk")]
-        [InlineData("TextureArray_WMipMaps_ATC_RGBA_Explicit.xk")]
-        public void StartLibraryTest(string file)
-        {
-            TexImage image = LoadInput(file);
-
-            TexLibraryTest.StartLibraryTest(image, library);
-
-            AtitcTextureLibraryData libraryData = (AtitcTextureLibraryData)image.LibraryData[library];
-            Assert.True(libraryData.Textures.Length == image.SubImageArray.Length);
-
-            image.Dispose();
-        }
-
-        [Theory(Skip = "Need check")]
-        [InlineData("Texture3D_WMipMaps_ATC_RGBA_Explicit.xk")]
-        [InlineData("TextureArray_WMipMaps_ATC_RGBA_Explicit.xk")]
-        public void EndLibraryTest(string file)
-        {
-            TexImage image = LoadInput(file);
-
-            IntPtr buffer;
-
-            buffer = image.SubImageArray[0].Data;
-            library.Execute(image, new DecompressingRequest(false));
-
-            Assert.True(image.Format == Xenko.Graphics.PixelFormat.R8G8B8A8_UNorm); // The images features are updated with the call to Execute
-            Assert.True(image.SubImageArray[0].Data == buffer); // The sub images are only updated on the call to EndLibrary
-
-            library.EndLibrary(image);
-
-            Assert.True(image.SubImageArray[0].Data != buffer);
-
-            image.Dispose();
-        }
-
-        [Fact(Skip = "Need check")]
-        public void CanHandleRequestTest()
-        {
-            TexImage image = LoadInput("TextureArray_WMipMaps_ATC_RGBA_Explicit.xk");
-
-            Assert.True(library.CanHandleRequest(image, new DecompressingRequest(false)));
-            Assert.True(library.CanHandleRequest(image, new CompressingRequest(Xenko.Graphics.PixelFormat.ATC_RGBA_Explicit)));
-            Assert.False(library.CanHandleRequest(image, new CompressingRequest(Xenko.Graphics.PixelFormat.BC3_UNorm)));
-
-            image.Dispose();
-        }
-
-
-        [Theory(Skip = "Need check")]
-        [InlineData("Texture3D_WMipMaps_ATC_RGBA_Explicit.xk")]
-        [InlineData("TextureArray_WMipMaps_ATC_RGBA_Explicit.xk")]
-        [InlineData("TextureCube_WMipMaps_ATC_RGBA_Explicit.xk")]
-        public void DecompressTest(string file)
-        {
-            TexImage image = LoadInput(file);
-
-            TexLibraryTest.DecompressTest(image, library);
-
-            image.Dispose();
-        }
-
-        [Theory(Skip = "Need check")]
-        [InlineData("Texture3D_WMipMap_RGBA8888.xk", Xenko.Graphics.PixelFormat.ATC_RGBA_Explicit)]
-        [InlineData("TextureArray_WMipMaps_RGBA8888.xk", Xenko.Graphics.PixelFormat.ATC_RGBA_Interpolated)]
-        [InlineData("TextureCube_WMipMaps_RGBA8888.xk", Xenko.Graphics.PixelFormat.ATC_RGBA_Explicit)]
-        public void CompressTest(string file, Xenko.Graphics.PixelFormat format)
-        {
-            TexImage image = LoadInput(file);
-
-            TexLibraryTest.CompressTest(image, library, format);
-
-            image.Dispose();
-        }
-
-        private TexImage LoadInput(string file)
-        {
-            var image = TestTools.Load(paraLib, file);
-            library.StartLibrary(image);
-            return image;
-        }
-    }
-}
diff --git a/sources/tests/tools/Xenko.TextureConverter.Tests/DxtTexLibTest.cs b/sources/tests/tools/Xenko.TextureConverter.Tests/DxtTexLibTest.cs
index 59ed0dc62c..5184abb732 100644
--- a/sources/tests/tools/Xenko.TextureConverter.Tests/DxtTexLibTest.cs
+++ b/sources/tests/tools/Xenko.TextureConverter.Tests/DxtTexLibTest.cs
@@ -73,7 +73,6 @@ public void CanHandleRequestTest()
             Assert.True(library.CanHandleRequest(image, new LoadingRequest("TextureArray_WMipMaps_BC3.dds", false)));
             Assert.True(library.CanHandleRequest(image, new ExportRequest("TextureArray_WMipMaps_BC3.dds", 0)));
             Assert.True(library.CanHandleRequest(image, new CompressingRequest(Xenko.Graphics.PixelFormat.BC3_UNorm)));
-            Assert.False(library.CanHandleRequest(image, new CompressingRequest(Xenko.Graphics.PixelFormat.ATC_RGBA_Explicit)));
             Assert.False(library.CanHandleRequest(image, new GammaCorrectionRequest(0)));
             image.Dispose();
         }
diff --git a/sources/tests/tools/Xenko.TextureConverter.Tests/PvrttTexLibTest.cs b/sources/tests/tools/Xenko.TextureConverter.Tests/PvrttTexLibTest.cs
index a1adae077b..2782d7f0ae 100644
--- a/sources/tests/tools/Xenko.TextureConverter.Tests/PvrttTexLibTest.cs
+++ b/sources/tests/tools/Xenko.TextureConverter.Tests/PvrttTexLibTest.cs
@@ -44,7 +44,6 @@ public void StartLibraryTest(string file)
         public void CanHandleRequestTest()
         {
             TexImage image = TestTools.Load(library, "TextureArray_WMipMaps_PVRTC2_4bpp.pvr");
-            Assert.True(library.CanHandleRequest(image, new CompressingRequest(Xenko.Graphics.PixelFormat.PVRTC_II_4bpp)));
             Assert.True(library.CanHandleRequest(image, new DecompressingRequest(false)));
             Assert.True(library.CanHandleRequest(image, new LoadingRequest("TextureArray_WMipMaps_PVRTC2_4bpp.pvr", false)));
             Assert.True(library.CanHandleRequest(image, new MipMapsGenerationRequest(Filter.MipMapGeneration.Linear)));
@@ -72,8 +71,6 @@ public void DecompressTest(string file)
 
 
         [Theory(Skip = "Need check")]
-        [InlineData("TextureArray_WMipMaps_RGBA8888.pvr", Xenko.Graphics.PixelFormat.PVRTC_II_4bpp)]
-        [InlineData("TextureCube_WMipMaps_RGBA8888.pvr", Xenko.Graphics.PixelFormat.PVRTC_II_4bpp)]
         [InlineData("TextureArray_WMipMaps_RGBA8888.pvr", Xenko.Graphics.PixelFormat.ETC2_RGBA)]
         [InlineData("TextureCube_WMipMaps_RGBA8888.pvr", Xenko.Graphics.PixelFormat.ETC2_RGBA)]
         public void CompressTest(string file, Xenko.Graphics.PixelFormat format)
diff --git a/sources/tests/tools/Xenko.TextureConverter.Tests/TextureToolTest.cs b/sources/tests/tools/Xenko.TextureConverter.Tests/TextureToolTest.cs
index 590840d85d..bc508d3b19 100644
--- a/sources/tests/tools/Xenko.TextureConverter.Tests/TextureToolTest.cs
+++ b/sources/tests/tools/Xenko.TextureConverter.Tests/TextureToolTest.cs
@@ -115,8 +115,6 @@ public void PreMultiplyAlphaTest(string file)
 
         [Theory(Skip = "Need check")]
         [InlineData("stones.png", PixelFormat.BC3_UNorm)]
-        [InlineData("stones.png", PixelFormat.PVRTC_II_4bpp)]
-        [InlineData("TextureArray_WMipMaps_BC3.dds", PixelFormat.PVRTC_II_4bpp)]
         [InlineData("TextureArray_WMipMaps_BC3.dds", PixelFormat.BC3_UNorm)]
         public void CompressTest(string filename, PixelFormat format)
         {
@@ -297,7 +295,6 @@ public void SaveTest(string input, string extension, PixelFormat compressionForm
         [InlineData("TextureArray_WMipMaps_PVRTC2_4bpp.pvr", ".dds", Filter.Rescaling.Nearest, PixelFormat.BC3_UNorm)]
         [InlineData("TextureCube_WMipMaps_ATC_RGBA_Explicit.xk", ".dds", Filter.Rescaling.Lanczos3, PixelFormat.BC3_UNorm)]
         [InlineData("duck.jpg", ".dds", Filter.Rescaling.Box, PixelFormat.BC3_UNorm)]
-        [InlineData("duck.jpg", ".pvr", Filter.Rescaling.BSpline, PixelFormat.PVRTC_II_4bpp)]
         public void ProcessingTest(string source, string extension, Filter.Rescaling rescaleFiler, PixelFormat format)
         {
             var image = texTool.Load(Module.PathToInputImages + source);
diff --git a/sources/tests/tools/Xenko.TextureConverter.Tests/Xenko.TextureConverter.Tests.csproj b/sources/tests/tools/Xenko.TextureConverter.Tests/Xenko.TextureConverter.Tests.csproj
index c17fd27e9a..eab36cb589 100644
--- a/sources/tests/tools/Xenko.TextureConverter.Tests/Xenko.TextureConverter.Tests.csproj
+++ b/sources/tests/tools/Xenko.TextureConverter.Tests/Xenko.TextureConverter.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -26,5 +26,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tests/tools/Xenko.TextureConverter.Tests/XenkoTexLibraryTest.cs b/sources/tests/tools/Xenko.TextureConverter.Tests/XenkoTexLibraryTest.cs
index 4f232b1cde..735e551767 100644
--- a/sources/tests/tools/Xenko.TextureConverter.Tests/XenkoTexLibraryTest.cs
+++ b/sources/tests/tools/Xenko.TextureConverter.Tests/XenkoTexLibraryTest.cs
@@ -44,7 +44,6 @@ public void CanHandleRequestTest()
             TexImage image = TestTools.Load(library, "Texture3D_WMipMaps_ATC_RGBA_Explicit.xk");
             Assert.False(library.CanHandleRequest(image, new DecompressingRequest(false)));
             Assert.False(library.CanHandleRequest(image, new LoadingRequest(new TexImage(), false)));
-            Assert.True(library.CanHandleRequest(image, new LoadingRequest(Xenko.Graphics.Image.New1D(5, 0, Xenko.Graphics.PixelFormat.ATC_RGBA_Explicit), false)));
             Assert.True(library.CanHandleRequest(image, new LoadingRequest("TextureArray_WMipMaps_BC3.dds", false)));
             Assert.True(library.CanHandleRequest(image, new ExportRequest("TextureArray_WMipMaps_BC3.xk", 0)));
             Assert.True(library.CanHandleRequest(image, new ExportToXenkoRequest()));
diff --git a/sources/tools/MonoDevelop.Debugger.Soft.Xenko/MonoDevelop.Debugger.Soft.Xenko.csproj b/sources/tools/MonoDevelop.Debugger.Soft.Xenko/MonoDevelop.Debugger.Soft.Xenko.csproj
index 541b2307da..c1424b5da7 100644
--- a/sources/tools/MonoDevelop.Debugger.Soft.Xenko/MonoDevelop.Debugger.Soft.Xenko.csproj
+++ b/sources/tools/MonoDevelop.Debugger.Soft.Xenko/MonoDevelop.Debugger.Soft.Xenko.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -36,5 +36,5 @@
     <EmbeddedResource Update="Manifest.addin.xml" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/tools/Xenko.Assimp.Translation/Extension.h b/sources/tools/Xenko.Assimp.Translation/Extension.h
deleted file mode 100644
index ab99da2004..0000000000
--- a/sources/tools/Xenko.Assimp.Translation/Extension.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#pragma once
-
-#include <assimp/scene.h>
-
-#define _AI_MATKEY_TEXTYPE_BASE "$tex.type"
-#define _AI_MATKEY_TEXCOLOR_BASE "$tex.color"
-#define _AI_MATKEY_TEXALPHA_BASE "$tex.alpha"
-
-#define AI_MATKEY_TEXTYPE(type, N) _AI_MATKEY_TEXTYPE_BASE,type,N
-#define AI_MATKEY_TEXCOLOR(type,N) _AI_MATKEY_TEXCOLOR_BASE,type,N
-#define AI_MATKEY_TEXALPHA(type,N) _AI_MATKEY_TEXALPHA_BASE,type,N
-
-/// <summary>
-/// Enumeration of the different types of node in the new Assimp's material stack.
-/// Don't forget to update the dictionnary in Materials.cpp when modifying this enum.
-/// </summary>
-enum aiStackType {
-	aiStackType_ColorType,
-	aiStackType_TextureType,
-	aiStackType_BlendOpType,
-	aiStackType_NumberTypes
-};
-/// <summary>
-/// Enumeration of the new Assimp's flags.
-/// </summary>
-enum aiStackFlags {
-	aiStackFlags_Invert = 1,
-	aiStackFlags_ReplaceAlpha = 2
-};
-#define aiStackFlags_NumbeFlags 2
-/// <summary>
-/// Enumeration of the different operations in the new Assimp's material stack.
-/// Don't forget to update the dictionnary in Materials.cpp when modifying this enum.
-/// </summary>
-enum aiStackOperation {
-	aiStackOperation_Add = 0,
-	aiStackOperation_Add3ds,
-	aiStackOperation_AddMaya,
-	aiStackOperation_Average,
-	aiStackOperation_Color,
-	aiStackOperation_ColorBurn,
-	aiStackOperation_ColorDodge,
-	aiStackOperation_Darken3ds,
-	aiStackOperation_DarkenMaya,
-	aiStackOperation_Desaturate,
-	aiStackOperation_Difference3ds,
-	aiStackOperation_DifferenceMaya,
-	aiStackOperation_Divide,
-	aiStackOperation_Exclusion,
-	aiStackOperation_HardLight,
-	aiStackOperation_HardMix,
-	aiStackOperation_Hue,
-	aiStackOperation_Illuminate,
-	aiStackOperation_In,
-	aiStackOperation_Lighten3ds,
-	aiStackOperation_LightenMaya,
-	aiStackOperation_LinearBurn,
-	aiStackOperation_LinearDodge,
-	aiStackOperation_Multiply3ds,
-	aiStackOperation_MultiplyMaya,
-	aiStackOperation_None,
-	aiStackOperation_Out,
-	aiStackOperation_Over3ds,
-	aiStackOperation_Overlay3ds,
-	aiStackOperation_OverMaya,
-	aiStackOperation_PinLight,
-	aiStackOperation_Saturate,
-	aiStackOperation_Saturation,
-	aiStackOperation_Screen,
-	aiStackOperation_SoftLight,
-	aiStackOperation_Substract3ds,
-	aiStackOperation_SubstractMaya,
-	aiStackOperation_Value,
-	aiStackOperation_Mask,
-	aiStackOperation_Unknown,
-	aiStackOperation_NumberOperations
-};
diff --git a/sources/tools/Xenko.Assimp.Translation/Materials.cpp b/sources/tools/Xenko.Assimp.Translation/Materials.cpp
deleted file mode 100644
index 61c5cd90cc..0000000000
--- a/sources/tools/Xenko.Assimp.Translation/Materials.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#pragma once
-
-#include <assimp/scene.h>
-#include "Extension.h"
-
-#pragma make_public(aiMaterial)
-#pragma make_public(aiTextureType)
-
-using namespace Xenko::Core::Mathematics;
-using namespace Xenko::AssimpNet;
-namespace Xenko {
-	namespace AssimpNet {
-		namespace NetTranslation {
-/// <summary>
-/// Class used to translate Assimp's cpp materials datas to c#.
-/// </summary>
-public ref class Materials {
-public:
-	/// <summary>
-	/// Converts an Assimp's material stack operation From c++ to c#.
-	/// </summary>
-	static array<Material::Operation>^ convertAssimpStackOperationCppToCs = {
-		Material::Operation::Add,			//aiStackOperation_Add
-		Material::Operation::Add3ds,		//aiStackOperation_Add3ds
-		Material::Operation::AddMaya,		//aiStackOperation_AddMaya
-		Material::Operation::Average,		//aiStackOperation_Average
-		Material::Operation::Color,			//aiStackOperation_Color
-		Material::Operation::ColorBurn,		//aiStackOperation_ColorBurn
-		Material::Operation::ColorDodge,	//aiStackOperation_ColorDodge
-		Material::Operation::Darken3ds,		//aiStackOperation_Darken3ds
-		Material::Operation::DarkenMaya,	//aiStackOperation_DarkenMaya
-		Material::Operation::Desaturate,	//aiStackOperation_Desaturate
-		Material::Operation::Difference3ds,	//aiStackOperation_Difference3ds
-		Material::Operation::DifferenceMaya,//aiStackOperation_DifferenceMaya
-		Material::Operation::Divide,		//aiStackOperation_Divide
-		Material::Operation::Exclusion,		//aiStackOperation_Exclusion
-		Material::Operation::HardLight,		//aiStackOperation_HardLight
-		Material::Operation::HardMix,		//aiStackOperation_HardMix
-		Material::Operation::Hue,			//aiStackOperation_Hue
-		Material::Operation::Illuminate,	//aiStackOperation_Illuminate
-		Material::Operation::In,			//aiStackOperation_In
-		Material::Operation::Lighten3ds,	//aiStackOperation_Lighten3ds
-		Material::Operation::LightenMaya,	//aiStackOperation_LightenMaya
-		Material::Operation::LinearBurn,	//aiStackOperation_LinearBurn
-		Material::Operation::LinearDodge,	//aiStackOperation_LinearDodge
-		Material::Operation::Multiply3ds,	//aiStackOperation_Multiply3ds
-		Material::Operation::MultiplyMaya,	//aiStackOperation_MultiplyMaya
-		Material::Operation::None,			//aiStackOperation_None
-		Material::Operation::Out,			//aiStackOperation_Out
-		Material::Operation::Over3ds,		//aiStackOperation_Over3ds
-		Material::Operation::Overlay3ds,	//aiStackOperation_Overlay3ds
-		Material::Operation::OverMaya,		//aiStackOperation_OverMaya
-		Material::Operation::PinLight,		//aiStackOperation_PinLight
-		Material::Operation::Saturate,		//aiStackOperation_Saturate
-		Material::Operation::Saturation,	//aiStackOperation_Saturation
-		Material::Operation::Screen,		//aiStackOperation_Screen
-		Material::Operation::SoftLight,		//aiStackOperation_SoftLight
-		Material::Operation::Substract3ds,	//aiStackOperation_Substract3ds
-		Material::Operation::SubstractMaya,	//aiStackOperation_SubstractMaya
-		Material::Operation::Value,			//aiStackOperation_Value
-		Material::Operation::Mask			//aiStackOperation_Mask
-	};
-	/// <summary>
-	/// Converts an Assimp's material stack node type From c++ to c#.
-	/// </summary>
-	static array<Material::StackType>^ convertAssimpStackTypeCppToCs = {
-		Material::StackType::Color,			// aiStackType_ColorType
-		Material::StackType::Texture,		// aiStackType_TextureType
-		Material::StackType::Operation		// aiStackType_BlemdOpType
-	};
-	static array<Material::MappingMode>^ convertAssimpMappingModeCppToCs = {
-		Material::MappingMode::Wrap,		// aiTextureMapMode_Wrap
-		Material::MappingMode::Clamp,		// aiTextureMapMode_Clamp
-		Material::MappingMode::Mirror,		// aiTextureMapMode_Mirror
-		Material::MappingMode::Decal		// aiTextureMapMode_Decal
-	};
-	/// <summary>
-	/// Converts an Assimp's material stack From c++ to c#.
-	/// </summary>
-	/// <param name="material">The material contaning the stack to convert.</param>
-	/// <param name="type">The type of the stack to convert.</param>
-	/// <returns></returns>
-	static Material::Stack^ convertAssimpStackCppToCs(aiMaterial *material, const aiTextureType type) {
-		Material::Stack^ ret = gcnew Material::Stack;
-		unsigned int count = material->GetTextureCount(type);
-		// As it is represented now, the base color is at the bottom of the stack
-
-		/*aiString path;
-		aiTextureMapping mapping;
-		unsigned int index;
-		float blend;
-		aiTextureOp textureOp;
-		aiTextureMapMode mapMode;
-		material->GetTexture(type, 0, &path, &mapping, &index, &blend, &textureOp, &mapMode);*/
-
-		/*
-		if (type == aiTextureType_AMBIENT) {
-			aiColor3D ambient;
-			material->Get(AI_MATKEY_COLOR_AMBIENT, ambient);
-			ret->Push(gcnew Material::StackColor(Color3(ambient.r, ambient.g, ambient.b), 1.f, 1.f, 0));
-		}
-		if (type == aiTextureType_DIFFUSE) {
-			aiColor3D diffuse;
-			material->Get(AI_MATKEY_COLOR_DIFFUSE, diffuse);
-			ret->Push(gcnew Material::StackColor(Color3(diffuse.r, diffuse.g, diffuse.b), 1.f, 1.f, 0));
-		}
-		if (type == aiTextureType_SPECULAR) {
-			aiColor3D specular;
-			material->Get(AI_MATKEY_COLOR_SPECULAR, specular);
-			ret->Push(gcnew Material::StackColor(Color3(specular.r, specular.g, specular.b), 1.f, 1.f, 0));
-		}
-		if (type == aiTextureType_EMISSIVE) {
-			aiColor3D emissive;
-			material->Get(AI_MATKEY_COLOR_EMISSIVE, emissive);
-			ret->Push(gcnew Material::StackColor(Color3(emissive.r, emissive.g, emissive.b), 1.f, 1.f, 0));
-		}
-		*/
-		// Process the material stack
-		for (int iEl = count-1; iEl >= 0; --iEl) {
-			Material::StackElement^ el;
-			// Common properties
-			int elType, elFlags;
-			float elAlpha, elBlend;
-			// Operation-specific properties
-			int elOp;
-			// Color-specific properties
-			aiColor3D elColor;
-			// Texture-specific properties
-			aiString elTexPath;
-			int elTexChannel, elMappingModeU, elMappingModeV;
-			if (AI_SUCCESS != material->Get(AI_MATKEY_TEXALPHA(type, iEl), elAlpha))
-				elAlpha = 1.f; // default alpha
-			if (AI_SUCCESS != material->Get(AI_MATKEY_TEXBLEND(type, iEl), elBlend))
-				elBlend = 1.f; // default blend
-			if (AI_SUCCESS != material->Get(AI_MATKEY_TEXFLAGS(type, iEl), elFlags))
-				elFlags = 0; // default flags (no flags)
-			if (AI_SUCCESS != material->Get(AI_MATKEY_TEXTYPE(type, iEl), elType))
-				elType = aiStackType_TextureType; //continue; // error !
-			switch (elType) {
-			case aiStackType_BlendOpType:
-				if (AI_SUCCESS != material->Get(AI_MATKEY_TEXOP(type, iEl), elOp))
-					continue; // error !
-				el = gcnew Material::StackOperation(convertAssimpStackOperationCppToCs[elOp], elAlpha, elBlend, elFlags);
-				break;
-			case aiStackType_ColorType:
-				if (AI_SUCCESS != material->Get(AI_MATKEY_TEXCOLOR(type, iEl), elColor))
-					continue; // error !
-				el = gcnew Material::StackColor(Color3(elColor.r, elColor.g, elColor.b), elAlpha, elBlend, elFlags);
-				break;
-			case aiStackType_TextureType:
-				if (AI_SUCCESS != material->Get(AI_MATKEY_TEXTURE(type, iEl), elTexPath))
-					continue; // error !
-				if (AI_SUCCESS != material->Get(AI_MATKEY_UVWSRC(type, iEl), elTexChannel))
-					elTexChannel = 0; // default channel
-				if (AI_SUCCESS != material->Get(AI_MATKEY_MAPPINGMODE_U(type, iEl), elMappingModeU))
-					elMappingModeU = aiTextureMapMode_Wrap; // default mapping mode
-				if (AI_SUCCESS != material->Get(AI_MATKEY_MAPPINGMODE_V(type, iEl), elMappingModeV))
-					elMappingModeV = aiTextureMapMode_Wrap; // default mapping mode
-				el = gcnew Material::StackTexture(gcnew System::String(elTexPath.C_Str()),
-					elTexChannel,
-					convertAssimpMappingModeCppToCs[elMappingModeU],
-					convertAssimpMappingModeCppToCs[elMappingModeV],
-					elAlpha,
-					elBlend,
-					elFlags);
-			}
-			ret->Push(el);
-		}
-		return ret;
-	}
-};
-		}
-	}
-}
diff --git a/sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj b/sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj
deleted file mode 100644
index da37607439..0000000000
--- a/sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <PropertyGroup>
-    <XenkoProjectType>Cpp</XenkoProjectType>
-    <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
-    <XenkoBuildTags>WindowsTools</XenkoBuildTags>
-    <XenkoAssemblyProcessorOptions />
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FCDF1B87-1C76-46EB-AD6A-D55EF5F195B8}</ProjectGuid>
-    <RootNamespace>Xenko.AssimpNet.NetTranslation</RootNamespace>
-    <ProjectName>Xenko.Assimp.Translation</ProjectName>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>true</CLRSupport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <CLRSupport>true</CLRSupport>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include;</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>Assimp.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>assimp-vc140-mt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include;</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>Assimp.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>assimp-vc140-mt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include;</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>Assimp.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>assimp-vc140-mt.lib;</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include;</AdditionalIncludeDirectories>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <PrecompiledHeaderFile>Assimp.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-      <AdditionalDependencies>assimp-vc140-mt.lib;</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="Extension.h" />
-    <ClCompile Include="Materials.cpp">
-      <FileType>CppHeader</FileType>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj">
-      <Project>{1677b922-ccf0-44de-b57e-1cdd3d2b8e8a}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Assimp\Xenko.Assimp.csproj">
-      <Project>{f61d86b5-7c3d-4441-957d-a0a6d2fa69ca}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(XenkoPostSettingsTargets)" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj.filters b/sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj.filters
deleted file mode 100644
index dfb4aafb47..0000000000
--- a/sources/tools/Xenko.Assimp.Translation/Xenko.Assimp.Translation.vcxproj.filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Extension.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Materials.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Assimp/MaterialStack.cs b/sources/tools/Xenko.Assimp/MaterialStack.cs
deleted file mode 100644
index 658cf13477..0000000000
--- a/sources/tools/Xenko.Assimp/MaterialStack.cs
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Xenko.Core.Mathematics;
-
-namespace Xenko
-{
-    namespace AssimpNet
-    {
-        namespace Material
-        {
-            /// <summary>
-            /// Enumeration of the different types of node in the new Assimp's material stack.
-            /// </summary>
-            public enum StackType
-            {
-                Color = 0,
-                Texture,
-                Operation
-            }
-            /// <summary>
-            /// Enumeration of the new Assimp's flags.
-            /// </summary>
-            public enum Flags
-            {
-                Invert = 1,
-                ReplaceAlpha = 2
-            }
-            /// <summary>
-            /// Enumeration of the different operations in the new Assimp's material stack.
-            /// </summary>
-            public enum Operation
-            {
-                Add = 0,
-                Add3ds,
-                AddMaya,
-                Average,
-                Color,
-                ColorBurn,
-                ColorDodge,
-                Darken3ds,
-                DarkenMaya,
-                Desaturate,
-                Difference3ds,
-                DifferenceMaya,
-                Divide,
-                Exclusion,
-                HardLight,
-                HardMix,
-                Hue,
-                Illuminate,
-                In,
-                Lighten3ds,
-                LightenMaya,
-                LinearBurn,
-                LinearDodge,
-                Multiply3ds,
-                MultiplyMaya,
-                None,
-                Out,
-                Over3ds,
-                Overlay3ds,
-                OverMaya,
-                PinLight,
-                Saturate,
-                Saturation,
-                Screen,
-                SoftLight,
-                Substract3ds,
-                SubstractMaya,
-                Value,
-                Mask
-            }
-            /// <summary>
-            /// Enumeration of the different mapping modes in the new Assimp's material stack.
-            /// </summary>
-            public enum MappingMode
-            {
-                Wrap,
-                Clamp,
-                Decal,
-                Mirror
-            }
-            /// <summary>
-            /// Class representing an element in the new Assimp's material stack.
-            /// </summary>
-            public abstract class StackElement
-            {
-                /// <summary>
-                /// Initializes a new instance of the <see cref="StackElement"/> class.
-                /// </summary>
-                /// <param name="Alpha">The alpha of the node.</param>
-                /// <param name="Blend">The blending coefficient of the node.</param>
-                /// <param name="flags">The flags of the node.</param>
-                /// <param name="Type">The type of the node.</param>
-                public StackElement(float Alpha, float Blend, int flags, StackType Type)
-                {
-                    alpha = Alpha;
-                    blend = Blend;
-                    type = Type;
-                }
-                /// <summary>
-                /// Gets the alpha of the node.
-                /// </summary>
-                /// <value>
-                /// The alpha of the node.
-                /// </value>
-                public float alpha { get; private set; }
-                /// <summary>
-                /// Gets the blending coefficient of the node.
-                /// </summary>
-                /// <value>
-                /// The blending coefficient of the node.
-                /// </value>
-                public float blend { get; private set; }
-                /// <summary>
-                /// Gets the flags of the node.
-                /// </summary>
-                /// <value>
-                /// The flags of the node.
-                /// </value>
-                public int flags { get; private set; }
-                /// <summary>
-                /// Gets the type of the node.
-                /// </summary>
-                /// <value>
-                /// The type of the node.
-                /// </value>
-                public StackType type { get; private set; }
-            }
-            /// <summary>
-            /// Class representing an operation in the new Assimp's material stack.
-            /// </summary>
-            public class StackOperation : StackElement
-            {
-                /// <summary>
-                /// Initializes a new instance of the <see cref="StackOperation"/> class.
-                /// </summary>
-                /// <param name="Operation">The operation of the node.</param>
-                /// <param name="Alpha">The alpha of the node.</param>
-                /// <param name="Blend">The blending coefficient of the node.</param>
-                /// <param name="Flags">The flags.</param>
-                public StackOperation(Operation Operation, float Alpha = 1.0f, float Blend = 1.0f, int Flags = 0)
-                    : base(Alpha, Blend, Flags, StackType.Operation)
-                {
-                    operation = Operation;
-                }
-                /// <summary>
-                /// Gets the operation of the node.
-                /// </summary>
-                /// <value>
-                /// The operation of the node.
-                /// </value>
-                public Operation operation { get; private set; }
-            }
-            /// <summary>
-            /// Class representing a color in the new Assimp's material stack.
-            /// </summary>
-            public class StackColor : StackElement
-            {
-                /// <summary>
-                /// Initializes a new instance of the <see cref="StackColor"/> class.
-                /// </summary>
-                /// <param name="Color">The color of the node.</param>
-                /// <param name="Alpha">The alpha of the node.</param>
-                /// <param name="Blend">The blending coefficient of the node.</param>
-                /// <param name="Flags">The flags of the node.</param>
-                public StackColor(Color3 Color, float Alpha = 1.0f, float Blend = 1.0f, int Flags = 0)
-                    : base(Alpha, Blend, Flags, StackType.Color)
-                {
-                    color = Color;
-                }
-                /// <summary>
-                /// Gets the color of the node.
-                /// </summary>
-                /// <value>
-                /// The color of the node.
-                /// </value>
-                public Color3 color { get; private set; }
-            }
-            /// <summary>
-            /// Class representing a texture in the new Assimp's material stack.
-            /// </summary>
-            public class StackTexture : StackElement
-            {
-                /// <summary>
-                /// Initializes a new instance of the <see cref="StackTexture"/> class.
-                /// </summary>
-                /// <param name="TexturePath">The texture path.</param>
-                /// <param name="Channel">The uv channel used by the texture.</param>
-                /// <param name="MappingModeU">The U mapping mode.</param>
-                /// <param name="MappingModeV">The V mapping mode.</param>
-                /// <param name="Alpha">The alpha of the node.</param>
-                /// <param name="Blend">The blending coefficient of the node.</param>
-                /// <param name="Flags">The flags of the node.</param>
-                public StackTexture(String TexturePath, int Channel, MappingMode MappingModeU, MappingMode MappingModeV, float Alpha = 1.0f, float Blend = 1.0F, int Flags = 0)
-                    : base(Alpha, Blend, Flags, StackType.Texture)
-                {
-                    texturePath = TexturePath;
-                    channel = Channel;
-                    mappingModeU = MappingModeU;
-                    mappingModeV = MappingModeV;
-                }
-                /// <summary>
-                /// Gets the texture path.
-                /// </summary>
-                /// <value>
-                /// The texture path.
-                /// </value>
-                public String texturePath { get; private set; }
-                /// <summary>
-                /// Gets the uv channel.
-                /// </summary>
-                /// <value>
-                /// The uv channel.
-                /// </value>
-                public int channel { get; private set; }
-                /// <summary>
-                /// Gets the U mapping mode.
-                /// </summary>
-                /// <value>
-                /// The U mapping mode.
-                /// </value>
-                public MappingMode mappingModeU { get; private set; }
-                /// <summary>
-                /// Gets the Vmapping mode.
-                /// </summary>
-                /// <value>
-                /// The V mapping mode.
-                /// </value>
-                public MappingMode mappingModeV { get; private set; }
-            }
-            /// <summary>
-            /// Class representing the new Assimp's material stack in c#.
-            /// </summary>
-            public class Stack
-            {
-                /// <summary>
-                /// Initializes a new instance of the <see cref="Stack"/> class.
-                /// </summary>
-                public Stack()
-                {
-                    stack = new Stack<StackElement>();
-                }
-                /// <summary>
-                /// The internal stack.
-                /// </summary>
-                private Stack<StackElement> stack;
-                /// <summary>
-                /// Gets the size of the stack.
-                /// </summary>
-                /// <value>
-                /// The size of the stack.
-                /// </value>
-                private int Count { get { return stack.Count; } }
-                /// <summary>
-                /// Gets a value indicating whether the stack is empty.
-                /// </summary>
-                /// <value>
-                ///   <c>true</c> if the stack is empty; otherwise, <c>false</c>.
-                /// </value>
-                public bool IsEmpty { get { return stack.Count == 0; } }
-                /// <summary>
-                /// Pushes the specified element.
-                /// </summary>
-                /// <param name="element">The element.</param>
-                public void Push(StackElement element)
-                {
-                    stack.Push(element);
-                }
-                /// <summary>
-                /// Pops an element.
-                /// </summary>
-                /// <returns>The element.</returns>
-                public StackElement Pop()
-                {
-                    return stack.Pop();
-                }
-                /// <summary>
-                /// Gets the top element of the stack.
-                /// </summary>
-                /// <returns>The top element of the stack.</returns>
-                public StackElement Peek()
-                {
-                    return stack.Peek();
-                }
-                /// <summary>
-                /// Clears the stack.
-                /// </summary>
-                public void Clear()
-                {
-                    stack.Clear();
-                }
-            }
-        }
-    }
-}
diff --git a/sources/tools/Xenko.Assimp/Xenko.Assimp.csproj b/sources/tools/Xenko.Assimp/Xenko.Assimp.csproj
index 3c254bdc35..a89b798ae5 100644
--- a/sources/tools/Xenko.Assimp/Xenko.Assimp.csproj
+++ b/sources/tools/Xenko.Assimp/Xenko.Assimp.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <XenkoBuildTags>WindowsTools</XenkoBuildTags>
@@ -14,5 +14,5 @@
     <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Code.Tests/Xenko.Code.Tests.csproj b/sources/tools/Xenko.Code.Tests/Xenko.Code.Tests.csproj
index ba8acd7e88..da22dbe040 100644
--- a/sources/tools/Xenko.Code.Tests/Xenko.Code.Tests.csproj
+++ b/sources/tools/Xenko.Code.Tests/Xenko.Code.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -20,5 +20,5 @@
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.ConnectionRouter/Program.cs b/sources/tools/Xenko.ConnectionRouter/Program.cs
index 13444a96ac..0944afff7b 100644
--- a/sources/tools/Xenko.ConnectionRouter/Program.cs
+++ b/sources/tools/Xenko.ConnectionRouter/Program.cs
@@ -22,7 +22,6 @@ static int Main(string[] args)
         {
             var exeName = Path.GetFileName(Assembly.GetExecutingAssembly().Location);
             var showHelp = false;
-            var windowsPhonePortMapping = false;
             int exitCode = 0;
             string logFileName = "routerlog.txt";
 
@@ -42,7 +41,6 @@ static int Main(string[] args)
                     string.Empty,
                     { "h|help", "Show this message and exit", v => showHelp = v != null },
                     { "log-file=", "Log build in a custom file (default: routerlog.txt).", v => logFileName = v },
-                    { "register-windowsphone-portmapping", "Register Windows Phone IpOverUsb port mapping", v => windowsPhonePortMapping = true },
                 };
 
             try
@@ -58,14 +56,6 @@ static int Main(string[] args)
                 if (commandArgs.Count > 0)
                     throw new OptionException("This command expect no additional arguments", "");
 
-                if (windowsPhonePortMapping)
-                {
-                    WindowsPhoneTracker.RegisterWindowsPhonePortMapping();
-                    return 0;
-                }
-
-                SetupTrayIcon(logFileName);
-
                 // Enable file logging
                 if (!string.IsNullOrEmpty(logFileName))
                 {
@@ -90,9 +80,6 @@ static int Main(string[] args)
                     // Start Android management thread
                     new Thread(() => AndroidTracker.TrackDevices(router)) { IsBackground = true }.Start();
 
-                    // Start Windows Phone management thread
-                    new Thread(() => WindowsPhoneTracker.TrackDevices(router)) { IsBackground = true }.Start();
-
                     //Start iOS device discovery and proxy launcher
                     //Currently this is used only internally for QA testing... as we cannot attach the debugger from windows for normal usages..
                     if (IosTracker.CanProxy())
diff --git a/sources/tools/Xenko.ConnectionRouter/Resources/Logo.ico b/sources/tools/Xenko.ConnectionRouter/Resources/Logo.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/tools/Xenko.ConnectionRouter/Resources/Logo.ico and b/sources/tools/Xenko.ConnectionRouter/Resources/Logo.ico differ
diff --git a/sources/tools/Xenko.ConnectionRouter/WindowsPhoneTracker.cs b/sources/tools/Xenko.ConnectionRouter/WindowsPhoneTracker.cs
deleted file mode 100644
index e12c1ed6de..0000000000
--- a/sources/tools/Xenko.ConnectionRouter/WindowsPhoneTracker.cs
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Security.Principal;
-using System.ServiceProcess;
-using System.Text.RegularExpressions;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Win32;
-using Xenko.Core.Diagnostics;
-using Xenko.Engine.Network;
-
-namespace Xenko.ConnectionRouter
-{
-    /// <summary>
-    /// Track Windows Phone devices (with IpOverUsbEnum.exe) and establish port mapping.
-    /// </summary>
-    class WindowsPhoneTracker
-    {
-        private static string IpOverUsbXenkoName = "XenkoRouterServer";
-        private static readonly Logger Log = GlobalLogger.GetLogger("WindowsPhoneTracker");
-
-        public static void TrackDevices(Router router)
-        {
-            // Find AppDeployCmd.exe
-            var programFilesX86 = Environment.GetEnvironmentVariable(Environment.Is64BitOperatingSystem ? "COMMONPROGRAMFILES(X86)" : "COMMONPROGRAMFILES");
-            var ipOverUsbEnum = Path.Combine(programFilesX86, @"Microsoft Shared\Phone Tools\CoreCon\11.0\Bin\IpOverUsbEnum.exe");
-            if (!File.Exists(ipOverUsbEnum))
-            {
-                return;
-            }
-
-            var portRegex = new Regex(string.Format(@"{0} (\d+) ->", IpOverUsbXenkoName));
-            var currentWinPhoneDevices = new Dictionary<int, ConnectedDevice>();
-
-            bool checkIfPortMappingIsSetup = false;
-
-            while (true)
-            {
-                ProcessOutputs devicesOutputs;
-                try
-                {
-                    devicesOutputs = ShellHelper.RunProcessAndGetOutput(ipOverUsbEnum, "");
-                }
-                catch (Exception)
-                {
-                    continue;
-                }
-
-                if (devicesOutputs.ExitCode != 0)
-                    continue;
-
-                var newWinPhoneDevices = new Dictionary<int, string>();
-
-                // First time a device is detected, we check port mapping is properly setup in registry
-                var isThereAnyDevices = devicesOutputs.OutputLines.Any(x => x == "Partner:");
-                if (isThereAnyDevices && !checkIfPortMappingIsSetup)
-                {
-
-                    using (var ipOverUsb = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\IpOverUsb") ?? Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\IpOverUsbSdk"))
-                    {
-                        if (ipOverUsb != null)
-                        {
-                            using (var ipOverUsbXenko = ipOverUsb.OpenSubKey(IpOverUsbXenkoName))
-                            {
-                                if (ipOverUsbXenko == null)
-                                {
-                                    RegisterWindowsPhonePortMapping();
-                                }
-                            }
-                        }
-                    }
-
-                    checkIfPortMappingIsSetup = true;
-                }
-
-                // Match forwarded ports
-                foreach (var outputLine in devicesOutputs.OutputLines)
-                {
-                    int port;
-                    var match = portRegex.Match(outputLine);
-                    if (match.Success && Int32.TryParse(match.Groups[1].Value, out port))
-                    {
-                        newWinPhoneDevices.Add(port, "Device");
-                    }
-                }
-
-                DeviceHelper.UpdateDevices(Log, newWinPhoneDevices, currentWinPhoneDevices, (connectedDevice) =>
-                {
-                    // Launch a client thread that will automatically tries to connect to this port
-                    var localPort = (int)connectedDevice.Key;
-
-                    Log.Info($"Device connected: {connectedDevice.Name}; mapped port {localPort}");
-
-                    Task.Run(() => DeviceHelper.LaunchPersistentClient(connectedDevice, router, "localhost", localPort));
-                });
-
-                Thread.Sleep(1000); // Detect new devices every 1000 msec
-            }
-        }
-
-        public static void RegisterWindowsPhonePortMapping()
-        {
-            if (!IsElevated)
-            {
-                Log.Info("Not enough permissions to install Windows Phone IpOverUsb port mapping, relaunching as administrator...");
-
-                // No entry for effet compiler, let's create it
-                var info = new ProcessStartInfo
-                {
-                    FileName = Assembly.GetExecutingAssembly().Location,
-                    UseShellExecute = true,
-                    Verb = "runas",
-                    Arguments = "--register-windowsphone-portmapping"
-                };
-                var process = Process.Start(info);
-                process.WaitForExit();
-                return;
-            }
-
-            Log.Info("Installing Windows Phone IpOverUsb port mapping");
-
-            // Add Windows Phone port mapping to registry
-            using (var ipOverUsb = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\IpOverUsb", true) ?? Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\IpOverUsbSdk", true))
-            {
-                if (ipOverUsb == null)
-                {
-                    Log.Error("There is no IpOverUsb in registry. Is Windows Phone SDK properly installed?");
-                    return;
-                }
-                using (var ipOverUsbXenko = ipOverUsb.CreateSubKey(IpOverUsbXenkoName))
-                {
-                    ipOverUsbXenko.SetValue("LocalAddress", "127.0.0.1");
-                    ipOverUsbXenko.SetValue("LocalPort", 40153);
-                    ipOverUsbXenko.SetValue("DestinationAddress", "127.0.0.1");
-                    ipOverUsbXenko.SetValue("DestinationPort", RouterClient.DefaultListenPort);
-                }
-            }
-
-            // Restart Windows Phone IP over USB service (IpOverUsbSvc)
-            RestartService(Log, "IpOverUsbSvc", 4000);
-        }
-
-        private static bool IsElevated
-        {
-            get
-            {
-                return new WindowsPrincipal
-                    (WindowsIdentity.GetCurrent()).IsInRole
-                    (WindowsBuiltInRole.Administrator);
-            }
-        }
-
-        private static void RestartService(Logger log, string serviceName, int timeout)
-        {
-            var serviceController = new ServiceController(serviceName);
-            try
-            {
-                serviceController.Stop();
-                serviceController.WaitForStatus(ServiceControllerStatus.Stopped, TimeSpan.FromMilliseconds(timeout));
-
-                serviceController.Start();
-                serviceController.WaitForStatus(ServiceControllerStatus.Running, TimeSpan.FromMilliseconds(timeout));
-            }
-            catch
-            {
-                log.Error($"Error restarting {serviceName} service");
-            }
-        }
-    }
-}
diff --git a/sources/tools/Xenko.ConnectionRouter/Xenko.ConnectionRouter.csproj b/sources/tools/Xenko.ConnectionRouter/Xenko.ConnectionRouter.csproj
index 8fd32a6398..d91c9abcb2 100644
--- a/sources/tools/Xenko.ConnectionRouter/Xenko.ConnectionRouter.csproj
+++ b/sources/tools/Xenko.ConnectionRouter/Xenko.ConnectionRouter.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -22,7 +22,7 @@
     <PackageReference Include="Mono.Options" Version="5.3.0.1" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.IO.Compression" />
-    <PackageReference Include="System.Runtime" Version="4.3.0">
+    <PackageReference Include="System.Runtime" Version="4.3.1">
       <SpecificVersion>False</SpecificVersion>
     </PackageReference>
     <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0">
@@ -77,5 +77,5 @@
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="..\..\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Core.ConfigEditor/Views.xaml b/sources/tools/Xenko.Core.ConfigEditor/Views.xaml
index 0791719426..fd90750d0a 100644
--- a/sources/tools/Xenko.Core.ConfigEditor/Views.xaml
+++ b/sources/tools/Xenko.Core.ConfigEditor/Views.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xenko.ConfigEditor"
                     xmlns:vm="clr-namespace:Xenko.ConfigEditor.ViewModels"
-                    xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+                    xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
                     xmlns:bhv="clr-namespace:Xenko.Presentation.Behaviors;assembly=Xenko.Presentation">
 
   <DataTemplate x:Key="PropertyView" DataType="vm:PropertyViewModel">
diff --git a/sources/tools/Xenko.Core.ConfigEditor/Xenko.Core.ConfigEditor.csproj b/sources/tools/Xenko.Core.ConfigEditor/Xenko.Core.ConfigEditor.csproj
index ad8ac08577..cf031549fc 100644
--- a/sources/tools/Xenko.Core.ConfigEditor/Xenko.Core.ConfigEditor.csproj
+++ b/sources/tools/Xenko.Core.ConfigEditor/Xenko.Core.ConfigEditor.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -12,9 +12,6 @@
   <ItemGroup>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xaml">
@@ -81,5 +78,5 @@
     <ProjectReference Include="..\..\presentation\Xenko.Core.Presentation\Xenko.Core.Presentation.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Core.ProjectTemplating.Tests/Xenko.Core.ProjectTemplating.Tests.csproj b/sources/tools/Xenko.Core.ProjectTemplating.Tests/Xenko.Core.ProjectTemplating.Tests.csproj
index 71f53044fd..c55a44ac1b 100644
--- a/sources/tools/Xenko.Core.ProjectTemplating.Tests/Xenko.Core.ProjectTemplating.Tests.csproj
+++ b/sources/tools/Xenko.Core.ProjectTemplating.Tests/Xenko.Core.ProjectTemplating.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/sources/tools/Xenko.Core.ProjectTemplating/Xenko.Core.ProjectTemplating.csproj b/sources/tools/Xenko.Core.ProjectTemplating/Xenko.Core.ProjectTemplating.csproj
index 8519aa034d..5d426e4641 100644
--- a/sources/tools/Xenko.Core.ProjectTemplating/Xenko.Core.ProjectTemplating.csproj
+++ b/sources/tools/Xenko.Core.ProjectTemplating/Xenko.Core.ProjectTemplating.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -15,5 +15,5 @@
     <ProjectReference Include="..\..\core\Xenko.Core.Design\Xenko.Core.Design.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Core.Translation.Extractor/Xenko.Core.Translation.Extractor.csproj b/sources/tools/Xenko.Core.Translation.Extractor/Xenko.Core.Translation.Extractor.csproj
index aa81fb0d23..571533bb34 100644
--- a/sources/tools/Xenko.Core.Translation.Extractor/Xenko.Core.Translation.Extractor.csproj
+++ b/sources/tools/Xenko.Core.Translation.Extractor/Xenko.Core.Translation.Extractor.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -32,7 +32,7 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -44,5 +44,5 @@
     <ProjectReference Include="..\..\presentation\Xenko.Core.Translation.Presentation\Xenko.Core.Translation.Presentation.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/tools/Xenko.Core.VisualStudio/VisualStudioDTE.cs b/sources/tools/Xenko.Core.VisualStudio/VisualStudioDTE.cs
index 0a91565de5..8e6bd8eaec 100644
--- a/sources/tools/Xenko.Core.VisualStudio/VisualStudioDTE.cs
+++ b/sources/tools/Xenko.Core.VisualStudio/VisualStudioDTE.cs
@@ -1,16 +1,10 @@
 // Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
 // Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.ComTypes;
-using System.Runtime.Remoting.Contexts;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using EnvDTE;
 using Process = System.Diagnostics.Process;
 
diff --git a/sources/tools/Xenko.DebugTools/Behaviors/TimeBarCurrentTimeSetterBehavior.cs b/sources/tools/Xenko.DebugTools/Behaviors/TimeBarCurrentTimeSetterBehavior.cs
index 6d4cc9af6b..557095b68b 100644
--- a/sources/tools/Xenko.DebugTools/Behaviors/TimeBarCurrentTimeSetterBehavior.cs
+++ b/sources/tools/Xenko.DebugTools/Behaviors/TimeBarCurrentTimeSetterBehavior.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Windows.Interactivity;
+using Microsoft.Xaml.Behaviors;
 using Xenko.Core.Presentation.Controls;
 
 namespace Xenko.DebugTools.Behaviors
diff --git a/sources/tools/Xenko.DebugTools/ScriptListControl.xaml b/sources/tools/Xenko.DebugTools/ScriptListControl.xaml
index e01500f71e..092ce88443 100644
--- a/sources/tools/Xenko.DebugTools/ScriptListControl.xaml
+++ b/sources/tools/Xenko.DebugTools/ScriptListControl.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:Xenko.DebugTools"
              xmlns:controls="clr-namespace:Xenko.Presentation.Controls;assembly=Xenko.Presentation"
-             xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:b="clr-namespace:Xenko.Presentation.Behaviors;assembly=Xenko.Presentation"
              xmlns:localBehaviors="clr-namespace:Xenko.DebugTools.Behaviors"
              xmlns:mkex="clr-namespace:Xenko.Presentation.MarkupExtensions;assembly=Xenko.Presentation"
diff --git a/sources/tools/Xenko.DebugTools/Xenko.DebugTools.csproj b/sources/tools/Xenko.DebugTools/Xenko.DebugTools.csproj
index 6d4e58c8fe..b354e85f56 100644
--- a/sources/tools/Xenko.DebugTools/Xenko.DebugTools.csproj
+++ b/sources/tools/Xenko.DebugTools/Xenko.DebugTools.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -9,12 +9,6 @@
     <XenkoBuildTags>WindowsTools</XenkoBuildTags>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="QuickGraph">
-      <HintPath>$(XenkoDependenciesDir)QuickGraph\QuickGraph.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Interactivity">
-      <HintPath>$(XenkoCommonDependenciesDir)ExpressionBlendSDK\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -101,5 +95,5 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.EffectCompilerServer/EffectCompilerServer.cs b/sources/tools/Xenko.EffectCompilerServer/EffectCompilerServer.cs
deleted file mode 100644
index fb15c28052..0000000000
--- a/sources/tools/Xenko.EffectCompilerServer/EffectCompilerServer.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
-using Xenko.Core.Diagnostics;
-using Xenko.Core.IO;
-using Xenko.Assets.Effect;
-using Xenko.ConnectionRouter;
-using Xenko.Engine.Network;
-using Xenko.Shaders.Compiler;
-using Xenko.Shaders.Compiler.Internals;
-
-namespace Xenko.EffectCompilerServer
-{
-    /// <summary>
-    /// Shader compiler host (over network)
-    /// </summary>
-    public class EffectCompilerServer : RouterServiceServer
-    {
-        private readonly Dictionary<string, SocketMessageLayer> gameStudioPerPackageName = new Dictionary<string, SocketMessageLayer>();
-
-        public EffectCompilerServer() : base($"/service/Xenko.EffectCompilerServer/{XenkoVersion.NuGetVersion}/Xenko.EffectCompilerServer.exe")
-        {
-            // TODO: Asynchronously initialize Irony grammars to improve first compilation request performance?
-        }
-
-        /// <inheritdoc/>
-        protected override async void HandleClient(SimpleSocket clientSocket, string url)
-        {
-            string[] urlSegments;
-            string urlParameters;
-            RouterHelper.ParseUrl(url, out urlSegments, out urlParameters);
-            var parameters = RouterHelper.ParseQueryString(urlParameters);
-            var mode = parameters["mode"];
-
-            // We accept everything
-            await AcceptConnection(clientSocket);
-
-            var socketMessageLayer = new SocketMessageLayer(clientSocket, true);
-
-            string packageName = parameters["packagename"];
-
-            if (mode == "gamestudio")
-            {
-                Console.WriteLine(@"GameStudio mode started!");
-
-                if (packageName == null)
-                    return;
-
-                lock (gameStudioPerPackageName)
-                {
-                    gameStudioPerPackageName[packageName] = socketMessageLayer;
-                }
-            }
-            else
-            {
-
-                Console.WriteLine(@"Client connected");
-
-                // Make a VFS that will access remotely the DatabaseFileProvider
-                // TODO: Is that how we really want to do that in the future?
-                var networkVFS = new NetworkVirtualFileProvider(socketMessageLayer, "/asset");
-                VirtualFileSystem.RegisterProvider(networkVFS);
-
-                // Create an effect compiler per connection
-                var effectCompiler = new EffectCompiler(networkVFS);
-                // TODO: This should come from an "init" packet
-                effectCompiler.SourceDirectories.Add(EffectCompilerBase.DefaultSourceShaderFolder);
-                effectCompiler.FileProvider = networkVFS;
-
-                socketMessageLayer.AddPacketHandler<RemoteEffectCompilerEffectRequest>(packet => ShaderCompilerRequestHandler(socketMessageLayer, effectCompiler, packet));
-
-                socketMessageLayer.AddPacketHandler<RemoteEffectCompilerEffectRequested>(packet =>
-                {
-                    if (packageName == null)
-                        return;
-
-                    SocketMessageLayer gameStudio;
-                    lock (gameStudioPerPackageName)
-                    {
-                        if (!gameStudioPerPackageName.TryGetValue(packageName, out gameStudio))
-                            return;
-                    }
-
-                    // Forward to game studio
-                    gameStudio.Send(packet);
-                });
-            }
-
-            Task.Run(() => socketMessageLayer.MessageLoop());
-        }
-
-        private static async Task ShaderCompilerRequestHandler(SocketMessageLayer socketMessageLayer, EffectCompiler effectCompiler, RemoteEffectCompilerEffectRequest remoteEffectCompilerEffectRequest)
-        {
-            // Yield so that this socket can continue its message loop to answer to shader file request
-            // TODO: maybe not necessary anymore with RouterServiceServer?
-            await Task.Yield();
-
-            Console.WriteLine($"Compiling shader: {remoteEffectCompilerEffectRequest.MixinTree.Name}");
-
-            // A shader has been requested, compile it (asynchronously)!
-            var precompiledEffectShaderPass = await effectCompiler.Compile(remoteEffectCompilerEffectRequest.MixinTree, remoteEffectCompilerEffectRequest.EffectParameters, null).AwaitResult();
-
-            // Send compiled shader
-            await socketMessageLayer.Send(new RemoteEffectCompilerEffectAnswer
-            {
-                StreamId = remoteEffectCompilerEffectRequest.StreamId,
-                LogMessages = precompiledEffectShaderPass.CompilationLog.Messages.Select(x => new SerializableLogMessage((LogMessage)x)).ToList(),
-                LogHasErrors = precompiledEffectShaderPass.CompilationLog.HasErrors,
-                EffectBytecode = precompiledEffectShaderPass.Bytecode,
-            });
-        }
-    }
-}
diff --git a/sources/tools/Xenko.EffectCompilerServer/Xenko.EffectCompilerServer.csproj b/sources/tools/Xenko.EffectCompilerServer/Xenko.EffectCompilerServer.csproj
index c6161e9344..7acf877948 100644
--- a/sources/tools/Xenko.EffectCompilerServer/Xenko.EffectCompilerServer.csproj
+++ b/sources/tools/Xenko.EffectCompilerServer/Xenko.EffectCompilerServer.csproj
@@ -1,7 +1,7 @@
 <Project>
   <Import Project="..\..\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -23,8 +23,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\engine\Xenko.Assets\Xenko.Assets.csproj" />
-    <ProjectReference Include="..\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.ExecServer/ExecServerApp.cs b/sources/tools/Xenko.ExecServer/ExecServerApp.cs
index 33ccd33b43..b0186ea2e4 100644
--- a/sources/tools/Xenko.ExecServer/ExecServerApp.cs
+++ b/sources/tools/Xenko.ExecServer/ExecServerApp.cs
@@ -12,7 +12,6 @@
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
-using Xenko.Core.VisualStudio;
 using Binding = System.ServiceModel.Channels.Binding;
 
 namespace Xenko.ExecServer
@@ -105,16 +104,7 @@ public int Run(string[] argsCopy)
                 foreach (DictionaryEntry environmentVariable in Environment.GetEnvironmentVariables())
                     environmentVariables.Add((string)environmentVariable.Key, (string)environmentVariable.Value);
 
-                int? debuggerProcessId = null;
-                using (var debugger = VisualStudioDebugger.GetAttached())
-                {
-                    if (debugger != null)
-                    {
-                        debuggerProcessId = debugger.ProcessId;
-                    }
-                }
-
-                var result = RunClient(executablePath, workingDirectory, environmentVariables, args, useShadowCache, debuggerProcessId);
+                var result = RunClient(executablePath, workingDirectory, environmentVariables, args, useShadowCache, null);
                 return result;
             }
         }
diff --git a/sources/tools/Xenko.ExecServer/ExecServerRemote.cs b/sources/tools/Xenko.ExecServer/ExecServerRemote.cs
index c92caf926f..5f44183a3b 100644
--- a/sources/tools/Xenko.ExecServer/ExecServerRemote.cs
+++ b/sources/tools/Xenko.ExecServer/ExecServerRemote.cs
@@ -9,7 +9,6 @@
 using System.Reflection;
 using System.ServiceModel;
 using System.Threading;
-using Xenko.Core.VisualStudio;
 
 namespace Xenko.ExecServer
 {
@@ -82,14 +81,6 @@ public int Run(string currentDirectory, Dictionary<string, string> environmentVa
 
                 upTime.Restart();
 
-                if (debuggerProcessId.HasValue && !Debugger.IsAttached)
-                {
-                    using (var debugger = VisualStudioDebugger.GetByProcess(debuggerProcessId.Value))
-                    {
-                        debugger?.Attach();
-                    }
-                }
-
                 var logger = OperationContext.Current.GetCallbackChannel<IServerLogger>();
                 var result = shadowManager.Run(currentDirectory, environmentVariables, args, shadowCache, logger);
                 return result;
diff --git a/sources/tools/Xenko.ExecServer/Xenko.ExecServer.csproj b/sources/tools/Xenko.ExecServer/Xenko.ExecServer.csproj
index a5628e6107..5324b08f36 100644
--- a/sources/tools/Xenko.ExecServer/Xenko.ExecServer.csproj
+++ b/sources/tools/Xenko.ExecServer/Xenko.ExecServer.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
     <OutputType>Exe</OutputType>
@@ -17,7 +17,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EnvDTE" Version="8.0.1" />
+    <PackageReference Include="EnvDTE" Version="8.0.2" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -27,7 +27,6 @@
       <Link>NativeLibraryInternal.cs</Link>
     </Compile>
   </ItemGroup>
-  <Import Project="..\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.FixProjectReferences/FixProjectReference.cs b/sources/tools/Xenko.FixProjectReferences/FixProjectReference.cs
index 0a237d4ea3..fe0bd62c7d 100644
--- a/sources/tools/Xenko.FixProjectReferences/FixProjectReference.cs
+++ b/sources/tools/Xenko.FixProjectReferences/FixProjectReference.cs
@@ -56,7 +56,7 @@ static int Main(string[] args)
 
                 var inputFile = inputFiles[0];
 
-                var consoleLogListener = new ConsoleLogListener { LogMode = ConsoleLogMode.Always };
+                var consoleLogListener = new ConsoleLogListener();
                 GlobalLogger.GlobalMessageLogged += consoleLogListener;
 
                 var log = GlobalLogger.GetLogger("FixProjectReference");
diff --git a/sources/tools/Xenko.FixProjectReferences/Xenko.FixProjectReferences.csproj b/sources/tools/Xenko.FixProjectReferences/Xenko.FixProjectReferences.csproj
index dfca889d10..e65e3bc9cd 100644
--- a/sources/tools/Xenko.FixProjectReferences/Xenko.FixProjectReferences.csproj
+++ b/sources/tools/Xenko.FixProjectReferences/Xenko.FixProjectReferences.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -18,11 +18,11 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Mono.Options" Version="5.3.0.1" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\Xenko.Core.Design\Xenko.Core.Design.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Graphics.RenderDocPlugin/Xenko.Graphics.RenderDocPlugin.csproj b/sources/tools/Xenko.Graphics.RenderDocPlugin/Xenko.Graphics.RenderDocPlugin.csproj
index 80b5ef0c5f..fc18c28fae 100644
--- a/sources/tools/Xenko.Graphics.RenderDocPlugin/Xenko.Graphics.RenderDocPlugin.csproj
+++ b/sources/tools/Xenko.Graphics.RenderDocPlugin/Xenko.Graphics.RenderDocPlugin.csproj
@@ -3,7 +3,7 @@
     <XenkoGraphicsApiDependent>true</XenkoGraphicsApiDependent>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
   </PropertyGroup>
@@ -12,9 +12,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\engine\Xenko.Graphics\Xenko.Graphics.csproj" />
-    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
+    <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" Condition="'$(XenkoPlatform)' == 'Windows' Or '$(XenkoPlatform)' == 'UWP'" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Assimp/AssemblyInfo.cpp b/sources/tools/Xenko.Importer.Assimp/AssemblyInfo.cpp
deleted file mode 100644
index 7ed8666a2e..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/AssemblyInfo.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#include "stdafx.h"
-
-using namespace System;
-using namespace System::Reflection;
-using namespace System::Runtime::CompilerServices;
-using namespace System::Runtime::InteropServices;
-using namespace System::Security::Permissions;
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly:AssemblyTitleAttribute("XenkoImporterAssimp")];
-[assembly:AssemblyDescriptionAttribute("")];
-[assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("")];
-[assembly:AssemblyProductAttribute("XenkoImporterAssimp")];
-[assembly:AssemblyCopyrightAttribute("Copyright (c)  2012")];
-[assembly:AssemblyTrademarkAttribute("")];
-[assembly:AssemblyCultureAttribute("")];
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the value or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly:AssemblyVersionAttribute("1.0.*")];
-
-[assembly:ComVisible(false)];
-
-[assembly:CLSCompliantAttribute(true)];
diff --git a/sources/tools/Xenko.Importer.Assimp/Material/MaterialStack.cs b/sources/tools/Xenko.Importer.Assimp/Material/MaterialStack.cs
new file mode 100644
index 0000000000..20213ae0eb
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Assimp/Material/MaterialStack.cs
@@ -0,0 +1,294 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Importer.Assimp.Material
+{
+    /// <summary>
+    /// Enumeration of the different types of node in the new Assimp's material stack.
+    /// </summary>
+    public enum StackType
+    {
+        Color = 0,
+        Texture,
+        Operation
+    }
+    /// <summary>
+    /// Enumeration of the new Assimp's flags.
+    /// </summary>
+    public enum Flags
+    {
+        Invert = 1,
+        ReplaceAlpha = 2
+    }
+    /// <summary>
+    /// Enumeration of the different operations in the new Assimp's material stack.
+    /// </summary>
+    public enum Operation
+    {
+        Add = 0,
+        Add3ds,
+        AddMaya,
+        Average,
+        Color,
+        ColorBurn,
+        ColorDodge,
+        Darken3ds,
+        DarkenMaya,
+        Desaturate,
+        Difference3ds,
+        DifferenceMaya,
+        Divide,
+        Exclusion,
+        HardLight,
+        HardMix,
+        Hue,
+        Illuminate,
+        In,
+        Lighten3ds,
+        LightenMaya,
+        LinearBurn,
+        LinearDodge,
+        Multiply3ds,
+        MultiplyMaya,
+        None,
+        Out,
+        Over3ds,
+        Overlay3ds,
+        OverMaya,
+        PinLight,
+        Saturate,
+        Saturation,
+        Screen,
+        SoftLight,
+        Substract3ds,
+        SubstractMaya,
+        Value,
+        Mask
+    }
+    /// <summary>
+    /// Enumeration of the different mapping modes in the new Assimp's material stack.
+    /// </summary>
+    public enum MappingMode
+    {
+        Wrap,
+        Clamp,
+        Decal,
+        Mirror
+    }
+    /// <summary>
+    /// Class representing an element in the new Assimp's material stack.
+    /// </summary>
+    public abstract class StackElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StackElement"/> class.
+        /// </summary>
+        /// <param name="Alpha">The alpha of the node.</param>
+        /// <param name="Blend">The blending coefficient of the node.</param>
+        /// <param name="flags">The flags of the node.</param>
+        /// <param name="Type">The type of the node.</param>
+        public StackElement(float Alpha, float Blend, int flags, StackType Type)
+        {
+            alpha = Alpha;
+            blend = Blend;
+            type = Type;
+        }
+        /// <summary>
+        /// Gets the alpha of the node.
+        /// </summary>
+        /// <value>
+        /// The alpha of the node.
+        /// </value>
+        public float alpha { get; private set; }
+        /// <summary>
+        /// Gets the blending coefficient of the node.
+        /// </summary>
+        /// <value>
+        /// The blending coefficient of the node.
+        /// </value>
+        public float blend { get; private set; }
+        /// <summary>
+        /// Gets the flags of the node.
+        /// </summary>
+        /// <value>
+        /// The flags of the node.
+        /// </value>
+        public int flags { get; private set; }
+        /// <summary>
+        /// Gets the type of the node.
+        /// </summary>
+        /// <value>
+        /// The type of the node.
+        /// </value>
+        public StackType type { get; private set; }
+    }
+    /// <summary>
+    /// Class representing an operation in the new Assimp's material stack.
+    /// </summary>
+    public class StackOperation : StackElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StackOperation"/> class.
+        /// </summary>
+        /// <param name="Operation">The operation of the node.</param>
+        /// <param name="Alpha">The alpha of the node.</param>
+        /// <param name="Blend">The blending coefficient of the node.</param>
+        /// <param name="Flags">The flags.</param>
+        public StackOperation(Operation Operation, float Alpha = 1.0f, float Blend = 1.0f, int Flags = 0)
+            : base(Alpha, Blend, Flags, StackType.Operation)
+        {
+            operation = Operation;
+        }
+        /// <summary>
+        /// Gets the operation of the node.
+        /// </summary>
+        /// <value>
+        /// The operation of the node.
+        /// </value>
+        public Operation operation { get; private set; }
+    }
+    /// <summary>
+    /// Class representing a color in the new Assimp's material stack.
+    /// </summary>
+    public class StackColor : StackElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StackColor"/> class.
+        /// </summary>
+        /// <param name="Color">The color of the node.</param>
+        /// <param name="Alpha">The alpha of the node.</param>
+        /// <param name="Blend">The blending coefficient of the node.</param>
+        /// <param name="Flags">The flags of the node.</param>
+        public StackColor(Color3 Color, float Alpha = 1.0f, float Blend = 1.0f, int Flags = 0)
+            : base(Alpha, Blend, Flags, StackType.Color)
+        {
+            color = Color;
+        }
+        /// <summary>
+        /// Gets the color of the node.
+        /// </summary>
+        /// <value>
+        /// The color of the node.
+        /// </value>
+        public Color3 color { get; private set; }
+    }
+    /// <summary>
+    /// Class representing a texture in the new Assimp's material stack.
+    /// </summary>
+    public class StackTexture : StackElement
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StackTexture"/> class.
+        /// </summary>
+        /// <param name="TexturePath">The texture path.</param>
+        /// <param name="Channel">The uv channel used by the texture.</param>
+        /// <param name="MappingModeU">The U mapping mode.</param>
+        /// <param name="MappingModeV">The V mapping mode.</param>
+        /// <param name="Alpha">The alpha of the node.</param>
+        /// <param name="Blend">The blending coefficient of the node.</param>
+        /// <param name="Flags">The flags of the node.</param>
+        public StackTexture(String TexturePath, int Channel, MappingMode MappingModeU, MappingMode MappingModeV, float Alpha = 1.0f, float Blend = 1.0F, int Flags = 0)
+            : base(Alpha, Blend, Flags, StackType.Texture)
+        {
+            texturePath = TexturePath;
+            channel = Channel;
+            mappingModeU = MappingModeU;
+            mappingModeV = MappingModeV;
+        }
+        /// <summary>
+        /// Gets the texture path.
+        /// </summary>
+        /// <value>
+        /// The texture path.
+        /// </value>
+        public String texturePath { get; private set; }
+        /// <summary>
+        /// Gets the uv channel.
+        /// </summary>
+        /// <value>
+        /// The uv channel.
+        /// </value>
+        public int channel { get; private set; }
+        /// <summary>
+        /// Gets the U mapping mode.
+        /// </summary>
+        /// <value>
+        /// The U mapping mode.
+        /// </value>
+        public MappingMode mappingModeU { get; private set; }
+        /// <summary>
+        /// Gets the Vmapping mode.
+        /// </summary>
+        /// <value>
+        /// The V mapping mode.
+        /// </value>
+        public MappingMode mappingModeV { get; private set; }
+    }
+    /// <summary>
+    /// Class representing the new Assimp's material stack in c#.
+    /// </summary>
+    public class Stack
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Stack"/> class.
+        /// </summary>
+        public Stack()
+        {
+            stack = new Stack<StackElement>();
+        }
+        /// <summary>
+        /// The internal stack.
+        /// </summary>
+        private Stack<StackElement> stack;
+        /// <summary>
+        /// Gets the size of the stack.
+        /// </summary>
+        /// <value>
+        /// The size of the stack.
+        /// </value>
+        private int Count { get { return stack.Count; } }
+        /// <summary>
+        /// Gets a value indicating whether the stack is empty.
+        /// </summary>
+        /// <value>
+        ///   <c>true</c> if the stack is empty; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsEmpty { get { return stack.Count == 0; } }
+        /// <summary>
+        /// Pushes the specified element.
+        /// </summary>
+        /// <param name="element">The element.</param>
+        public void Push(StackElement element)
+        {
+            stack.Push(element);
+        }
+        /// <summary>
+        /// Pops an element.
+        /// </summary>
+        /// <returns>The element.</returns>
+        public StackElement Pop()
+        {
+            return stack.Pop();
+        }
+        /// <summary>
+        /// Gets the top element of the stack.
+        /// </summary>
+        /// <returns>The top element of the stack.</returns>
+        public StackElement Peek()
+        {
+            return stack.Peek();
+        }
+        /// <summary>
+        /// Clears the stack.
+        /// </summary>
+        public void Clear()
+        {
+            stack.Clear();
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Assimp/Material/Materials.cs b/sources/tools/Xenko.Importer.Assimp/Material/Materials.cs
new file mode 100644
index 0000000000..7670827a26
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Assimp/Material/Materials.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Silk.NET.Assimp;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Importer.Assimp.Material
+{
+    public static unsafe class Materials
+    {
+        public const string MatKeyTexTypeBase = "$tex.type";
+        public const string MatKeyTexColorBase = "$tex.color";
+        public const string MatKeyTexAlphaBase = "$tex.alpha";
+
+        /// <summary>
+        /// Converts an Assimp's material stack operation From c++ to c#.
+        /// </summary>
+        public static readonly Operation[] ConvertAssimpStackOperationCppToCs = new Operation[]
+        {
+            Operation.Add,			//aiStackOperation_Add
+		    Operation.Add3ds,		//aiStackOperation_Add3ds
+		    Operation.AddMaya,		//aiStackOperation_AddMaya
+		    Operation.Average,		//aiStackOperation_Average
+		    Operation.Color,			//aiStackOperation_Color
+		    Operation.ColorBurn,		//aiStackOperation_ColorBurn
+		    Operation.ColorDodge,	//aiStackOperation_ColorDodge
+		    Operation.Darken3ds,		//aiStackOperation_Darken3ds
+		    Operation.DarkenMaya,	//aiStackOperation_DarkenMaya
+		    Operation.Desaturate,	//aiStackOperation_Desaturate
+		    Operation.Difference3ds,	//aiStackOperation_Difference3ds
+		    Operation.DifferenceMaya,//aiStackOperation_DifferenceMaya
+		    Operation.Divide,		//aiStackOperation_Divide
+		    Operation.Exclusion,		//aiStackOperation_Exclusion
+		    Operation.HardLight,		//aiStackOperation_HardLight
+		    Operation.HardMix,		//aiStackOperation_HardMix
+		    Operation.Hue,			//aiStackOperation_Hue
+		    Operation.Illuminate,	//aiStackOperation_Illuminate
+		    Operation.In,			//aiStackOperation_In
+		    Operation.Lighten3ds,	//aiStackOperation_Lighten3ds
+		    Operation.LightenMaya,	//aiStackOperation_LightenMaya
+		    Operation.LinearBurn,	//aiStackOperation_LinearBurn
+		    Operation.LinearDodge,	//aiStackOperation_LinearDodge
+		    Operation.Multiply3ds,	//aiStackOperation_Multiply3ds
+		    Operation.MultiplyMaya,	//aiStackOperation_MultiplyMaya
+		    Operation.None,			//aiStackOperation_None
+		    Operation.Out,			//aiStackOperation_Out
+		    Operation.Over3ds,		//aiStackOperation_Over3ds
+		    Operation.Overlay3ds,	//aiStackOperation_Overlay3ds
+		    Operation.OverMaya,		//aiStackOperation_OverMaya
+		    Operation.PinLight,		//aiStackOperation_PinLight
+		    Operation.Saturate,		//aiStackOperation_Saturate
+		    Operation.Saturation,	//aiStackOperation_Saturation
+		    Operation.Screen,		//aiStackOperation_Screen
+		    Operation.SoftLight,		//aiStackOperation_SoftLight
+		    Operation.Substract3ds,	//aiStackOperation_Substract3ds
+		    Operation.SubstractMaya,	//aiStackOperation_SubstractMaya
+		    Operation.Value,			//aiStackOperation_Value
+		    Operation.Mask           //aiStackOperation_Mask
+        };
+
+        /// <summary>
+        /// Converts an Assimp's material stack node type From c++ to c#.
+        /// </summary>
+        public static readonly StackType[] ConvertAssimpStackTypeCppToCs = new StackType[]
+        {
+            StackType.Color,			// aiStackType_ColorType
+		    StackType.Texture,		// aiStackType_TextureType
+		    StackType.Operation      // aiStackType_BlemdOpType
+        };
+
+        public static readonly MappingMode[] ConvertAssimpMappingModeCppToCs = new MappingMode[]
+        {
+            MappingMode.Wrap,		// aiTextureMapMode_Wrap
+		    MappingMode.Clamp,		// aiTextureMapMode_Clamp
+		    MappingMode.Mirror,		// aiTextureMapMode_Mirror
+		    MappingMode.Decal        // aiTextureMapMode_Decal
+        };
+
+        public static unsafe Stack ConvertAssimpStackCppToCs(Silk.NET.Assimp.Assimp assimp, Silk.NET.Assimp.Material* material, Silk.NET.Assimp.TextureType type)
+        {
+            var ret = new Stack();
+            var count = (int)assimp.GetMaterialTextureCount(material, type);
+
+            // Process the material stack
+            for (int iEl = count - 1; iEl >= 0; --iEl)
+            {
+                StackElement el;
+                // Common properties
+                int elType = 0, elFlags = 0;
+                float elAlpha = 0.0f, elBlend = 0.0f;
+                // Operation-specific properties
+                int elOp = 0;
+                // Color-specific properties
+                var elColor = new System.Numerics.Vector4();
+                // Texture-specific properties
+                var elTexPath = new AssimpString();
+                int elTexChannel = 0, elMappingModeU = 0, elMappingModeV = 0;
+                uint pMax = 0;
+
+                if (assimp.GetMaterialFloatArray(material, MatKeyTexAlphaBase, (uint)type, (uint)iEl, ref elAlpha, ref pMax) != Return.ReturnSuccess)
+                    elAlpha = 1.0f; // default alpha
+                if (assimp.GetMaterialFloatArray(material, Silk.NET.Assimp.Assimp.MaterialTexblendBase, (uint)type, (uint)iEl, ref elBlend, ref pMax) != Return.ReturnSuccess)
+                    elBlend = 1.0f; // default blend
+                if (assimp.GetMaterialIntegerArray(material, Silk.NET.Assimp.Assimp.MaterialTexflagsBase, (uint)type, (uint)iEl, ref elFlags, ref pMax) != Return.ReturnSuccess)
+                    elFlags = 0; // default flags (no flags)
+                if (assimp.GetMaterialIntegerArray(material, MatKeyTexTypeBase, (uint)type, (uint)iEl, ref elType, ref pMax) != Return.ReturnSuccess)
+                    elType = (int)StackType.Texture;//continue; // error !
+
+                switch ((StackType)elType)
+                {
+                    case StackType.Operation:
+                        if (assimp.GetMaterialIntegerArray(material, Silk.NET.Assimp.Assimp.MaterialTexopBase, (uint)type, (uint)iEl, ref elOp, ref pMax) != Return.ReturnSuccess)
+                            continue; // error !
+
+                        el = new StackOperation(ConvertAssimpStackOperationCppToCs[elOp], elAlpha, elBlend, elFlags);
+                        break;
+                    case StackType.Color:
+                        if (assimp.GetMaterialColor(material, MatKeyTexColorBase, (uint)type, (uint)iEl, ref elColor) != Return.ReturnSuccess)
+                            continue; // error !
+                        el = new StackColor(new Color3(elColor.X, elColor.Y, elColor.Z), elAlpha, elBlend, elFlags);
+                        break;
+                    case StackType.Texture:
+                        if (assimp.GetMaterialString(material, Silk.NET.Assimp.Assimp.MaterialTextureBase, (uint)type, (uint)iEl, ref elTexPath) != Return.ReturnSuccess)
+                            continue; // error !
+                        if (assimp.GetMaterialIntegerArray(material, Silk.NET.Assimp.Assimp.MaterialUvwsrcBase, (uint)type, (uint)iEl, ref elTexChannel, ref pMax) != Return.ReturnSuccess)
+                            elTexChannel = 0; // default channel
+                        if (assimp.GetMaterialIntegerArray(material, Silk.NET.Assimp.Assimp.MaterialMappingmodeUBase, (uint)type, (uint)iEl, ref elMappingModeU, ref pMax) != Return.ReturnSuccess)
+                            elMappingModeU = (int)TextureMapMode.TextureMapModeWrap; // default mapping mode
+                        if (assimp.GetMaterialIntegerArray(material, Silk.NET.Assimp.Assimp.MaterialMappingmodeVBase, (uint)type, (uint)iEl, ref elMappingModeV, ref pMax) != Return.ReturnSuccess)
+                            elMappingModeV = (int)TextureMapMode.TextureMapModeWrap; // default mapping mode
+
+                        el = new StackTexture(
+                            elTexPath.AsString,
+                            elTexChannel,
+                            ConvertAssimpMappingModeCppToCs[elMappingModeU],
+                            ConvertAssimpMappingModeCppToCs[elMappingModeV],
+                            elAlpha,
+                            elBlend,
+                            elFlags);
+                        break;
+                    default:
+                        // error !
+                        continue;
+                }
+
+                ret.Push(el);
+            }
+
+            return ret;
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Assimp/MeshConverter.cs b/sources/tools/Xenko.Importer.Assimp/MeshConverter.cs
new file mode 100644
index 0000000000..5514efedd7
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Assimp/MeshConverter.cs
@@ -0,0 +1,1366 @@
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Silk.NET.Assimp;
+using Mesh = Xenko.Rendering.Mesh;
+using Xenko.Core.IO;
+using Xenko.Rendering.Materials;
+using Material = Silk.NET.Assimp.Material;
+using Xenko.Assets.Materials;
+using System.Globalization;
+using Xenko.Graphics;
+using Xenko.Graphics.Data;
+using PrimitiveType = Xenko.Graphics.PrimitiveType;
+using Xenko.Importer.Common;
+using Xenko.Animations;
+using Xenko.Rendering.Materials.ComputeColors;
+using System.IO;
+using Xenko.Core.Serialization;
+
+namespace Xenko.Importer.Assimp
+{
+    public class MeshConverter
+    {
+        private const int NumberOfBonesPerVertex = 4;
+
+        public Logger Logger { get; set; }
+
+        private readonly Silk.NET.Assimp.Assimp assimp = Silk.NET.Assimp.Assimp.GetApi();
+
+        public bool AllowUnsignedBlendIndices { get; set; }
+
+        private readonly Stopwatch internalStopWatch = new();
+
+        // Conversion data
+
+        private string vfsInputFilename;
+        private string vfsOutputFilename;
+        private string vfsInputPath;
+
+        private Quaternion rootOrientation;
+        private Quaternion rootOrientationInverse;
+        private Matrix rootTransform;
+        private Matrix rootTransformInverse;
+        private Model modelData;
+
+        private readonly List<ModelNodeDefinition> nodes = new List<ModelNodeDefinition>();
+        private readonly Dictionary<string, int> textureNameCount = new Dictionary<string, int>();
+
+        public MeshConverter(Logger logger)
+        {
+            Logger = logger ?? GlobalLogger.GetLogger("Import Assimp");
+        }
+
+        private void ResetConvertionData()
+        {
+            textureNameCount.Clear();
+        }
+
+        public unsafe EntityInfo ExtractEntity(string inptuFilename, string outputFilename, bool extractTextureDependencies, bool deduplicateMaterials)
+        {
+            try
+            {
+                uint importFlags = 0;
+                var postProcessFlags = PostProcessSteps.SortByPrimitiveType;
+
+                if (deduplicateMaterials)
+                {
+                    postProcessFlags |= PostProcessSteps.RemoveRedundantMaterials;
+                }
+
+                var scene = Initialize(inptuFilename, outputFilename, importFlags, (uint)postProcessFlags);
+
+                // If scene is null, something went wrong inside Assimp
+                if (scene == null)
+                {
+                    var error = assimp.GetErrorStringS();
+                    if (error.Length > 0)
+                    {
+                        Logger.Error($"Assimp: {error}");
+                    }
+
+                    return null;
+                }
+
+                var materialNames = new Dictionary<IntPtr, string>();
+                var meshNames = new Dictionary<IntPtr, string>();
+                var animationNames = new Dictionary<IntPtr, string>();
+                var nodeNames = new Dictionary<IntPtr, string>();
+
+                GenerateNodeNames(scene, nodeNames);
+
+                var entityInfo = new EntityInfo
+                {
+                    Materials = ExtractMaterials(scene, materialNames),
+                    Models = ExtractModels(scene, meshNames, materialNames, nodeNames),
+                    Nodes = ExtractNodeHierarchy(scene, nodeNames),
+                    AnimationNodes = ExtractAnimations(scene, animationNames)
+                };
+
+                if (extractTextureDependencies)
+                    entityInfo.TextureDependencies = ExtractTextureDependencies(scene);
+
+                return entityInfo;
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
+        public unsafe Model Convert(string inptuFilename, string outputFilename, bool deduplicateMaterials)
+        {
+            uint importFlags = 0;
+            var postProcessFlags =
+                  PostProcessSteps.CalculateTangentSpace
+                | PostProcessSteps.Triangulate
+                | PostProcessSteps.GenerateNormals
+                | PostProcessSteps.JoinIdenticalVertices
+                | PostProcessSteps.LimitBoneWeights
+                | PostProcessSteps.SortByPrimitiveType
+                | PostProcessSteps.FlipWindingOrder
+                | PostProcessSteps.FlipUVs;
+
+            if (deduplicateMaterials)
+            {
+                postProcessFlags |= PostProcessSteps.RemoveRedundantMaterials;
+            }
+
+            var scene = Initialize(inptuFilename, outputFilename, importFlags, (uint)postProcessFlags);
+            return ConvertAssimpScene(scene);
+        }
+
+        public unsafe AnimationInfo ConvertAnimation(string inputFilename, string outputFilename)
+        {
+            uint importFlags = 0;
+            var postProcessFlags = PostProcessSteps.None;
+
+            var scene = Initialize(inputFilename, outputFilename, importFlags, (uint)postProcessFlags);
+
+            return ProcessAnimations(scene);
+        }
+
+        public unsafe Xenko.Rendering.Skeleton ConvertSkeleton(string inputFilename, string outputFilename)
+        {
+            uint importFlags = 0;
+            var postProcessFlags = PostProcessSteps.None;
+
+            var scene = Initialize(inputFilename, outputFilename, importFlags, (uint)postProcessFlags);
+
+            return ProcessSkeleton(scene);
+        }
+
+        private unsafe Scene* Initialize(string inputFilename, string outputFilename, uint importFlags, uint postProcessFlags)
+        {
+            ResetConvertionData();
+
+            vfsInputFilename = inputFilename;
+            vfsOutputFilename = outputFilename;
+            vfsInputPath = VirtualFileSystem.GetParentFolder(inputFilename);
+
+            var scene = assimp.ImportFile(inputFilename, importFlags);
+            scene = assimp.ApplyPostProcessing(scene, postProcessFlags);
+
+            return scene;
+        }
+
+        private unsafe Model ConvertAssimpScene(Scene* scene)
+        {
+            modelData = new Model();
+
+            var meshNames = new Dictionary<IntPtr, string>();
+            GenerateMeshNames(scene, meshNames);
+
+            var nodeNames = new Dictionary<IntPtr, string>();
+            GenerateNodeNames(scene, nodeNames);
+
+            // register the nodes and fill hierarchy
+            var meshIndexToNodeIndex = new Dictionary<int, List<int>>();
+            RegisterNodes(scene->MRootNode, -1, nodeNames, meshIndexToNodeIndex);
+
+            // meshes
+            for (var i = 0; i < scene->MNumMeshes; ++i)
+            {
+                if (meshIndexToNodeIndex.ContainsKey(i))
+                {
+                    var meshInfo = ProcessMesh(scene, scene->MMeshes[i], meshNames);
+
+                    foreach (var nodeIndex in meshIndexToNodeIndex[i])
+                    {
+                        var nodeMeshData = new Mesh
+                        {
+                            Draw = meshInfo.Draw,
+                            Name = meshInfo.Name,
+                            MaterialIndex = meshInfo.MaterialIndex,
+                            NodeIndex = nodeIndex
+                        };
+
+                        if (meshInfo.Bones != null)
+                        {
+                            nodeMeshData.Skinning = new MeshSkinningDefinition
+                            {
+                                Bones = meshInfo.Bones.ToArray()
+                            };
+                        }
+
+                        if (meshInfo.HasSkinningPosition)
+                            nodeMeshData.Parameters.Set(MaterialKeys.HasSkinningPosition, true);
+
+                        if (meshInfo.HasSkinningNormal)
+                            nodeMeshData.Parameters.Set(MaterialKeys.HasSkinningNormal, true);
+
+                        modelData.Meshes.Add(nodeMeshData);
+                    }
+                }
+            }
+
+            // embedded texture - only to log the warning for now
+            for (uint i = 0; i < scene->MNumTextures; ++i)
+            {
+                ExtractEmbededTexture(scene->MTextures[i]);
+            }
+
+            return modelData;
+        }
+
+        private unsafe Xenko.Rendering.Skeleton ProcessSkeleton(Scene* scene)
+        {
+            var nodeNames = new Dictionary<IntPtr, string>();
+            GenerateNodeNames(scene, nodeNames);
+
+            // register the nodes and fill hierarchy
+            var meshIndexToNodeIndex = new Dictionary<int, List<int>>();
+            RegisterNodes(scene->MRootNode, -1, nodeNames, meshIndexToNodeIndex);
+
+            return new Xenko.Rendering.Skeleton
+            {
+                Nodes = nodes.ToArray()
+            };
+        }
+
+        private unsafe AnimationInfo ProcessAnimations(Scene* scene)
+        {
+            var animationData = new AnimationInfo();
+            var visitedNodeNames = new HashSet<string>();
+
+            if (scene->MNumAnimations > 1)
+                Logger.Warning($"There are {scene->MNumAnimations} animations in this file, using only the first one.");
+
+            var nodeNames = new Dictionary<IntPtr, string>();
+            GenerateNodeNames(scene, nodeNames);
+
+            // register the nodes and fill hierarchy
+            var meshIndexToNodeIndex = new Dictionary<int, List<int>>();
+            RegisterNodes(scene->MRootNode, -1, nodeNames, meshIndexToNodeIndex);
+
+            for (uint i = 0; i < Math.Min(1, scene->MNumAnimations); ++i)
+            {
+                var aiAnim = scene->MAnimations[i];
+
+                // animation speed
+                var ticksPerSec = aiAnim->MTicksPerSecond;
+
+                animationData.Duration = Utils.AiTimeToXkTimeSpan(aiAnim->MDuration, ticksPerSec); ;
+
+                // Assimp animations have two different channels of animations ((1) on Nodes, (2) on Meshes).
+                // Nevertheless the second one do not seems to be usable in assimp 3.0 so it will be ignored here.
+
+                // name of the animation (dropped)
+                var animName = aiAnim->MName.AsString; // used only be the logger
+
+                // animation using meshes (not supported)
+                for (uint meshAnimId = 0; meshAnimId < aiAnim->MNumMeshChannels; ++meshAnimId)
+                {
+                    var meshName = aiAnim->MMeshChannels[meshAnimId]->MName.AsString;
+                    Logger.Warning($"Mesh animation are not currently supported. Animation '{animName}' on mesh {meshName} will be ignored");
+                }
+
+                // animation on nodes
+                for (uint nodeAnimId = 0; nodeAnimId < aiAnim->MNumChannels; ++nodeAnimId)
+                {
+                    var nodeAnim = aiAnim->MChannels[nodeAnimId];
+                    var nodeName = nodeAnim->MNodeName.AsString;
+
+                    if (!visitedNodeNames.Contains(nodeName))
+                    {
+                        visitedNodeNames.Add(nodeName);
+                        ProcessNodeAnimation(animationData.AnimationClips, nodeAnim, ticksPerSec);
+                    }
+                    else
+                    {
+                        Logger.Error($"Animation '{animName}' uses two nodes with the same name ({nodeAnim->MNodeName.AsString}). The animation cannot be resolved.");
+                        return null;
+                    }
+                }
+            }
+
+            return animationData;
+        }
+
+        private unsafe void ProcessNodeAnimation(Dictionary<string, AnimationClip> animationClips, NodeAnim* nodeAnim, double ticksPerSec)
+        {
+            // Find the nodes on which the animation is performed
+            var nodeName = nodeAnim->MNodeName.AsString;
+
+            var animationClip = new AnimationClip();
+
+            // The translation
+            ProcessAnimationCurveVector(animationClip, nodeAnim->MPositionKeys, nodeAnim->MNumPositionKeys, "Transform.Position", ticksPerSec, true);
+            // The rotation
+            ProcessAnimationCurveQuaternion(animationClip, nodeAnim->MRotationKeys, nodeAnim->MNumRotationKeys, "Transform.Rotation", ticksPerSec);
+            // The scales
+            ProcessAnimationCurveVector(animationClip, nodeAnim->MScalingKeys, nodeAnim->MNumScalingKeys, "Transform.Scale", ticksPerSec, false);
+
+            if (animationClip.Curves.Count > 0)
+                animationClips.Add(nodeName, animationClip);
+        }
+
+        private unsafe void ProcessAnimationCurveVector(AnimationClip animationClip, VectorKey* keys, uint nbKeys, string partialTargetName, double ticksPerSec, bool isTranslation)
+        {
+            var animationCurve = new AnimationCurve<Vector3>();
+
+            // Switch to cubic implicit interpolation mode for Vector3
+            animationCurve.InterpolationType = AnimationCurveInterpolationType.Cubic;
+
+            var lastKeyTime = new CompressedTimeSpan();
+
+            for (uint keyId = 0; keyId < nbKeys; ++keyId)
+            {
+                var aiKey = keys[keyId];
+
+                var key = new KeyFrameData<Vector3>
+                {
+                    Time = lastKeyTime = Utils.AiTimeToXkTimeSpan(aiKey.MTime, ticksPerSec),
+                    Value = aiKey.MValue.ToXenkoVector3()
+                };
+
+                if (isTranslation)
+                {
+                    // Change of basis: key.Value = (rootTransformInverse * Matrix::Translation(key.Value) * rootTransform).TranslationVector;
+                    Vector3.TransformCoordinate(ref key.Value, ref rootTransform, out key.Value);
+                }
+                else
+                {
+                    // Change of basis: key.Value = (rootTransformInverse * Matrix::Scaling(key.Value) * rootTransform).ScaleVector;
+                    var scale = Vector3.One;
+                    Vector3.TransformNormal(ref scale, ref rootTransformInverse, out scale);
+                    scale *= key.Value;
+                    Vector3.TransformNormal(ref scale, ref rootTransform, out key.Value);
+                }
+
+                animationCurve.KeyFrames.Add(key);
+                if (keyId == 0 || keyId == nbKeys - 1) // discontinuity at animation first and last frame
+                    animationCurve.KeyFrames.Add(key); // add 2 times the same frame at discontinuities to have null gradient
+            }
+
+            animationClip.AddCurve(partialTargetName, animationCurve, false);
+
+            if (nbKeys > 0)
+            {
+                if (animationClip.Duration < lastKeyTime)
+                    animationClip.Duration = lastKeyTime;
+            }
+        }
+
+        private unsafe void ProcessAnimationCurveQuaternion(AnimationClip animationClip, QuatKey* keys, uint nbKeys, string partialTargetName, double ticksPerSec)
+        {
+            var animationCurve = new AnimationCurve<Quaternion>();
+
+            var lastKeyTime = new CompressedTimeSpan();
+
+            for (uint keyId = 0; keyId < nbKeys; ++keyId)
+            {
+                var aiKey = keys[keyId];
+                var q = aiKey.MValue;
+                var key = new KeyFrameData<Quaternion>
+                {
+                    Time = lastKeyTime = Utils.AiTimeToXkTimeSpan(aiKey.MTime, ticksPerSec),
+                    Value = new Quaternion(q.X, q.Y, q.Z, q.W)
+                };
+
+                key.Value = rootOrientationInverse * key.Value * rootOrientation;
+
+                animationCurve.KeyFrames.Add(key);
+            }
+
+            animationClip.AddCurve(partialTargetName, animationCurve, false);
+
+            if (nbKeys > 0)
+            {
+                if (animationClip.Duration < lastKeyTime)
+                    animationClip.Duration = lastKeyTime;
+            }
+        }
+
+        private unsafe void GenerateUniqueNames(Dictionary<IntPtr, string> finalNames, List<string> baseNames, Func<int, IntPtr> objectToName)
+        {
+            var itemNameTotalCount = new Dictionary<string, int>();
+            var itemNameCurrentCount = new Dictionary<string, int>();
+            var tempNames = new List<string>();
+
+            for (var i = 0; i < baseNames.Count; ++i)
+            {
+                // Clean the name by removing unwanted characters
+                var itemName = baseNames[i];
+
+                var itemNameSplitPosition = itemName.IndexOf('#');
+                if (itemNameSplitPosition != -1)
+                {
+                    itemName = itemName.Substring(0, itemNameSplitPosition);
+                }
+
+                itemNameSplitPosition = itemName.IndexOf("__");
+                if (itemNameSplitPosition != -1)
+                {
+                    itemName = itemName.Substring(0, itemNameSplitPosition);
+                }
+
+                // remove all bad characters
+                itemName = itemName.Replace(':', '_');
+                itemName = itemName.Replace(" ", string.Empty);
+
+                tempNames.Add(itemName);
+
+                // count the occurences of this name
+                if (!itemNameTotalCount.ContainsKey(itemName))
+                    itemNameTotalCount.Add(itemName, 1);
+                else
+                    itemNameTotalCount[itemName]++;
+            }
+
+            for (var i = 0; i < baseNames.Count; ++i)
+            {
+                var lItem = objectToName(i);
+                var itemName = tempNames[i];
+
+                if (itemNameTotalCount[itemName] > 1)
+                {
+                    if (!itemNameCurrentCount.ContainsKey(itemName))
+                        itemNameCurrentCount.Add(itemName, 1);
+                    else
+                        itemNameCurrentCount[itemName]++;
+
+                    itemName = itemName + "_" + itemNameCurrentCount[itemName].ToString(CultureInfo.InvariantCulture);
+                }
+
+                finalNames.Add(lItem, itemName);
+            }
+        }
+
+        private unsafe void GenerateMeshNames(Scene* scene, Dictionary<IntPtr, string> meshNames)
+        {
+            var baseNames = new List<string>();
+            for (uint i = 0; i < scene->MNumMeshes; i++)
+            {
+                var lMesh = scene->MMeshes[i];
+                baseNames.Add(lMesh->MName.AsString);
+            }
+
+            GenerateUniqueNames(meshNames, baseNames, i => (IntPtr)scene->MMeshes[i]);
+        }
+
+        private unsafe void GenerateAnimationNames(Scene* scene, Dictionary<IntPtr, string> animationNames)
+        {
+            var baseNames = new List<string>();
+            for (uint i = 0; i < scene->MNumAnimations; i++)
+            {
+                var lAnimation = scene->MAnimations[i];
+                var animationName = lAnimation->MName.AsString;
+                baseNames.Add(animationName);
+            }
+
+            GenerateUniqueNames(animationNames, baseNames, i => (IntPtr)scene->MAnimations[i]);
+        }
+
+        private unsafe void GenerateNodeNames(Scene* scene, Dictionary<IntPtr, string> nodeNames)
+        {
+            var baseNames = new List<string>();
+            var orderedNodes = new List<IntPtr>();
+
+            GetNodeNames(scene->MRootNode, baseNames, orderedNodes);
+            GenerateUniqueNames(nodeNames, baseNames, i => orderedNodes[i]);
+        }
+
+        private unsafe void GetNodeNames(Node* node, List<string> nodeNames, List<IntPtr> orderedNodes)
+        {
+            nodeNames.Add(node->MName.AsString);
+            orderedNodes.Add((IntPtr)node);
+
+            for (uint i = 0; i < node->MNumChildren; ++i)
+            {
+                GetNodeNames(node->MChildren[i], nodeNames, orderedNodes);
+            }
+        }
+
+        private unsafe void RegisterNodes(Node* fromNode, int parentIndex, Dictionary<IntPtr, string> nodeNames, Dictionary<int, List<int>> meshIndexToNodeIndex)
+        {
+            var nodeIndex = nodes.Count;
+
+            // assign the index of the node to the index of the mesh
+            for (uint m = 0; m < fromNode->MNumMeshes; ++m)
+            {
+                var meshIndex = fromNode->MMeshes[m];
+
+                if (!meshIndexToNodeIndex.TryGetValue((int)meshIndex, out var nodeIndices))
+                {
+                    nodeIndices = new List<int>();
+                    meshIndexToNodeIndex.Add((int)meshIndex, nodeIndices);
+                }
+
+                nodeIndices.Add(nodeIndex);
+            }
+
+            // Create node
+            var modelNodeDefinition = new ModelNodeDefinition
+            {
+                ParentIndex = parentIndex,
+                Name = nodeNames[(IntPtr)fromNode],
+                Flags = ModelNodeFlags.Default
+            };
+
+            // Extract scene scaling and rotation from the root node.
+            // Bake scaling into all node's positions and rotation into the 1st-level nodes.
+            if (parentIndex == -1)
+            {
+                rootTransform = fromNode->MTransformation.ToXenkoMatrix();
+
+                rootTransform.Decompose(out var rootScaling, out rootOrientation, out var rootTranslation);
+
+                rootTransformInverse = Matrix.Invert(rootTransform);
+                rootOrientationInverse = Quaternion.Invert(rootOrientation);
+
+                modelNodeDefinition.Transform.Rotation = Quaternion.Identity;
+                modelNodeDefinition.Transform.Scale = Vector3.One;
+            }
+            else
+            {
+                var transform = rootTransformInverse * fromNode->MTransformation.ToXenkoMatrix() * rootTransform;
+                transform.Decompose(out modelNodeDefinition.Transform.Scale, out modelNodeDefinition.Transform.Rotation, out modelNodeDefinition.Transform.Position);
+            }
+
+            nodes.Add(modelNodeDefinition);
+
+            // register the children
+            for (uint child = 0; child < fromNode->MNumChildren; ++child)
+            {
+                RegisterNodes(fromNode->MChildren[child], nodeIndex, nodeNames, meshIndexToNodeIndex);
+            }
+        }
+
+        private unsafe MeshInfo ProcessMesh(Scene* scene, Silk.NET.Assimp.Mesh* mesh, Dictionary<IntPtr, string> meshNames)
+        {
+            List<MeshBoneDefinition> bones = null;
+            var hasSkinningPosition = false;
+            var hasSkinningNormal = false;
+            var totalClusterCount = 0;
+
+            // Build the bone's indices/weights and attach bones to NodeData 
+            //(bones info are present in the mesh so that is why we have to perform that here)
+
+            var vertexIndexToBoneIdWeight = new List<List<(short, float)>>();
+            if (mesh->MNumBones > 0)
+            {
+                bones = new List<MeshBoneDefinition>();
+
+                // TODO: change this to support shared meshes across nodes
+
+                // size of the array is already known
+                vertexIndexToBoneIdWeight.Capacity = (int)mesh->MNumVertices;
+                for (var i = 0; i < (int)mesh->MNumVertices; i++)
+                {
+                    vertexIndexToBoneIdWeight.Add(new List<(short, float)>());
+                }
+
+                // Build skinning clusters and fill controls points data stutcture
+                for (uint boneId = 0; boneId < mesh->MNumBones; ++boneId)
+                {
+                    var bone = mesh->MBones[boneId];
+
+                    // Fill controlPts with bone controls on the mesh
+                    for (uint vtxWeightId = 0; vtxWeightId < bone->MNumWeights; ++vtxWeightId)
+                    {
+                        var vtxWeight = bone->MWeights[vtxWeightId];
+                        vertexIndexToBoneIdWeight[(int)vtxWeight.MVertexId].Add(((short)boneId, vtxWeight.MWeight));
+                    }
+
+                    // find the node where the bone is mapped - based on the name(?)
+                    var nodeIndex = -1;
+                    var boneName = bone->MName.AsString;
+                    for (var nodeDefId = 0; nodeDefId < nodes.Count; ++nodeDefId)
+                    {
+                        var nodeDef = nodes[nodeDefId];
+                        if (nodeDef.Name == boneName)
+                        {
+                            nodeIndex = nodeDefId;
+                            break;
+                        }
+                    }
+
+                    if (nodeIndex == -1)
+                    {
+                        Logger.Error($"No node found for none {boneId}:{boneName}");
+                        nodeIndex = 0;
+                    }
+
+                    bones.Add(new MeshBoneDefinition
+                    {
+                        NodeIndex = nodeIndex,
+                        LinkToMeshMatrix = rootTransformInverse * bone->MOffsetMatrix.ToXenkoMatrix() * rootTransform
+                    });
+                }
+
+                NormalizeVertexWeights(vertexIndexToBoneIdWeight, NumberOfBonesPerVertex);
+
+                totalClusterCount = (int)mesh->MNumBones;
+                if (totalClusterCount > 0)
+                    hasSkinningPosition = true;
+            }
+
+            // Build the vertex declaration
+            var vertexElements = new List<VertexElement>();
+            var vertexXenko = 0;
+
+            var positionOffset = vertexXenko;
+            vertexElements.Add(VertexElement.Position<Vector3>(0, vertexXenko));
+            vertexXenko += sizeof(Vector3);
+
+            var normalOffset = vertexXenko;
+            if (mesh->MNormals != null)
+            {
+                vertexElements.Add(VertexElement.Normal<Vector3>(0, vertexXenko));
+                vertexXenko += sizeof(Vector3);
+            }
+
+            var uvOffset = vertexXenko;
+            var sizeUV = sizeof(Vector2); // 3D uv not supported
+            for (uint uvChannel = 0; uvChannel < Utils.GetNumUVChannels(mesh); ++uvChannel)
+            {
+                vertexElements.Add(VertexElement.TextureCoordinate<Vector2>((int)uvChannel, vertexXenko));
+                vertexXenko += sizeUV;
+            }
+
+            var colorOffset = vertexXenko;
+            var sizeColor = sizeof(Color);
+            for (uint colorChannel = 0; colorChannel < Utils.GetNumColorChannels(mesh); ++colorChannel)
+            {
+                vertexElements.Add(VertexElement.Color<Color>((int)colorChannel, vertexXenko));
+                vertexXenko += sizeColor;
+            }
+
+            var tangentOffset = vertexXenko;
+            if (mesh->MTangents != null)
+            {
+                vertexElements.Add(VertexElement.Tangent<Vector3>(0, vertexXenko));
+                vertexXenko += sizeof(Vector3);
+            }
+
+            var bitangentOffset = vertexXenko;
+            if (mesh->MTangents != null)
+            {
+                vertexElements.Add(VertexElement.BiTangent<Vector3>(0, vertexXenko));
+                vertexXenko += sizeof(Vector3);
+            }
+
+            var blendIndicesOffset = vertexXenko;
+            var controlPointIndices16 = (AllowUnsignedBlendIndices && totalClusterCount > 256) || (!AllowUnsignedBlendIndices && totalClusterCount > 128);
+            if (vertexIndexToBoneIdWeight.Count > 0)
+            {
+                if (controlPointIndices16)
+                {
+                    if (AllowUnsignedBlendIndices)
+                    {
+                        vertexElements.Add(new VertexElement("BLENDINDICES", 0, PixelFormat.R16G16B16A16_UInt, vertexXenko));
+                        vertexXenko += sizeof(ushort) * 4;
+                    }
+                    else
+                    {
+                        vertexElements.Add(new VertexElement("BLENDINDICES", 0, PixelFormat.R16G16B16A16_SInt, vertexXenko));
+                        vertexXenko += sizeof(short) * 4;
+                    }
+                }
+                else
+                {
+                    if (AllowUnsignedBlendIndices)
+                    {
+                        vertexElements.Add(new VertexElement("BLENDINDICES", 0, PixelFormat.R8G8B8A8_UInt, vertexXenko));
+                        vertexXenko += sizeof(byte) * 4;
+                    }
+                    else
+                    {
+                        vertexElements.Add(new VertexElement("BLENDINDICES", 0, PixelFormat.R8G8B8A8_SInt, vertexXenko));
+                        vertexXenko += sizeof(sbyte) * 4;
+                    }
+                }
+            }
+
+            var blendWeightOffset = vertexXenko;
+            if (vertexIndexToBoneIdWeight.Count > 0)
+            {
+                vertexElements.Add(new VertexElement("BLENDWEIGHT", 0, PixelFormat.R32G32B32A32_Float, vertexXenko));
+                vertexXenko += sizeof(float) * 4;
+            }
+
+            // Build the vertices data buffer 
+            var vertexBuffer = new byte[vertexXenko * mesh->MNumVertices];
+            fixed (byte* vertexBufferPtr = &vertexBuffer[0])
+            {
+                var vbPointer = vertexBufferPtr;
+                for (uint i = 0; i < mesh->MNumVertices; i++)
+                {
+                    var positionPointer = (Vector3*)(vbPointer + positionOffset);
+                    *positionPointer = mesh->MVertices[i].ToXenkoVector3();
+
+                    Vector3.TransformCoordinate(ref *positionPointer, ref rootTransform, out *positionPointer);
+
+                    if (mesh->MNormals != null)
+                    {
+                        var normalPointer = (Vector3*)(vbPointer + normalOffset);
+                        *normalPointer = mesh->MNormals[i].ToXenkoVector3();
+
+                        Vector3.TransformNormal(ref *normalPointer, ref rootTransform, out *normalPointer);
+
+                        if (float.IsNaN(normalPointer->X) || float.IsNaN(normalPointer->Y) || float.IsNaN(normalPointer->Z))
+                            *normalPointer = new Vector3(1, 0, 0);
+                        else
+                            normalPointer->Normalize();
+                    }
+
+                    for (uint uvChannel = 0; uvChannel < Utils.GetNumUVChannels(mesh); ++uvChannel)
+                    {
+                        var textureCoord = mesh->MTextureCoords[(int)uvChannel][i];
+                        *((Vector2*)(vbPointer + uvOffset + sizeUV * uvChannel)) = new Vector2(textureCoord.X, textureCoord.Y); // 3D uv not supported
+                    }
+
+                    for (uint colorChannel = 0; colorChannel < Utils.GetNumColorChannels(mesh); ++colorChannel)
+                    {
+                        var color = mesh->MColors[(int)colorChannel][i].ToXenkoColor();
+                        *((Color*)(vbPointer + colorOffset + sizeColor * colorChannel)) = color;
+                    }
+
+                    if (mesh->MTangents != null)
+                    {
+                        var tangentPointer = (Vector3*)(vbPointer + tangentOffset);
+                        var bitangentPointer = (Vector3*)(vbPointer + bitangentOffset);
+                        *tangentPointer = mesh->MTangents[i].ToXenkoVector3();
+                        *bitangentPointer = mesh->MBitangents[i].ToXenkoVector3();
+                        if (float.IsNaN(tangentPointer->X) || float.IsNaN(tangentPointer->Y) || float.IsNaN(tangentPointer->Z) ||
+                            float.IsNaN(bitangentPointer->X) || float.IsNaN(bitangentPointer->Y) || float.IsNaN(bitangentPointer->Z))
+                        {
+                            //assert(mesh->HasNormals());
+                            var normalPointer = ((Vector3*)(vbPointer + normalOffset));
+                            Vector3 c1 = Vector3.Cross(*normalPointer, new Vector3(0.0f, 0.0f, 1.0f));
+                            Vector3 c2 = Vector3.Cross(*normalPointer, new Vector3(0.0f, 1.0f, 0.0f));
+
+                            if (c1.LengthSquared() > c2.LengthSquared())
+                                *tangentPointer = c1;
+                            else
+                                *tangentPointer = c2;
+                            *bitangentPointer = Vector3.Cross(*normalPointer, *tangentPointer);
+                        }
+                        tangentPointer->Normalize();
+                        bitangentPointer->Normalize();
+                    }
+
+                    if (vertexIndexToBoneIdWeight.Count > 0)
+                    {
+                        for (var bone = 0; bone < NumberOfBonesPerVertex; ++bone)
+                        {
+                            if (controlPointIndices16)
+                            {
+                                if (AllowUnsignedBlendIndices)
+                                    ((ushort*)(vbPointer + blendIndicesOffset))[bone] = (ushort)vertexIndexToBoneIdWeight[(int)i][bone].Item1;
+                                else
+                                    ((short*)(vbPointer + blendIndicesOffset))[bone] = (short)vertexIndexToBoneIdWeight[(int)i][bone].Item1;
+                            }
+                            else
+                            {
+                                if (AllowUnsignedBlendIndices)
+                                    ((byte*)(vbPointer + blendIndicesOffset))[bone] = (byte)vertexIndexToBoneIdWeight[(int)i][bone].Item1;
+                                else
+                                    ((sbyte*)(vbPointer + blendIndicesOffset))[bone] = (sbyte)vertexIndexToBoneIdWeight[(int)i][bone].Item1;
+                            }
+
+                            ((float*)(vbPointer + blendWeightOffset))[bone] = vertexIndexToBoneIdWeight[(int)i][bone].Item2;
+                        }
+                    }
+
+                    vbPointer += vertexXenko;
+                }
+            }
+
+            // Build the indices data buffer
+            var nbIndices = 3 * mesh->MNumFaces;
+            byte[] indexBuffer;
+            var is32BitIndex = mesh->MNumVertices > 65535;
+            if (is32BitIndex)
+                indexBuffer = new byte[sizeof(uint) * nbIndices];
+            else
+                indexBuffer = new byte[sizeof(ushort) * nbIndices];
+
+            fixed (byte* indexBufferPtr = &indexBuffer[0])
+            {
+                var ibPointer = indexBufferPtr;
+
+                for (uint i = 0; i < mesh->MNumFaces; i++)
+                {
+                    if (is32BitIndex)
+                    {
+                        for (int j = 0; j < 3; ++j)
+                        {
+                            *((uint*)ibPointer) = mesh->MFaces[(int)i].MIndices[j];
+                            ibPointer += sizeof(uint);
+                        }
+                    }
+                    else
+                    {
+                        for (int j = 0; j < 3; ++j)
+                        {
+                            *((ushort*)ibPointer) = (ushort)(mesh->MFaces[(int)i].MIndices[j]);
+                            ibPointer += sizeof(ushort);
+                        }
+                    }
+                }
+            }
+
+            // Build the mesh data
+            var vertexDeclaration = new VertexDeclaration(vertexElements.ToArray());
+            var vertexBufferBinding = new VertexBufferBinding(GraphicsSerializerExtensions.ToSerializableVersion(new BufferData(BufferFlags.VertexBuffer, vertexBuffer)), vertexDeclaration, (int)mesh->MNumVertices, vertexDeclaration.VertexStride, 0);
+            var indexBufferBinding = new IndexBufferBinding(GraphicsSerializerExtensions.ToSerializableVersion(new BufferData(BufferFlags.IndexBuffer, indexBuffer)), is32BitIndex, (int)nbIndices, 0);
+
+            var drawData = new MeshDraw
+            {
+                VertexBuffers = new VertexBufferBinding[] { vertexBufferBinding },
+                IndexBuffer = indexBufferBinding,
+                PrimitiveType = PrimitiveType.TriangleList,
+                DrawCount = (int)nbIndices
+            };
+
+            return new MeshInfo
+            {
+                Draw = drawData,
+                Name = meshNames[(IntPtr)mesh],
+                Bones = bones,
+                MaterialIndex = (int)mesh->MMaterialIndex,
+                HasSkinningPosition = hasSkinningPosition,
+                HasSkinningNormal = hasSkinningNormal,
+                TotalClusterCount = totalClusterCount
+            };
+        }
+
+        private void NormalizeVertexWeights(List<List<(short, float)>> controlPts, int nbBoneByVertex)
+        {
+            for (var vertexId = 0; vertexId < controlPts.Count; ++vertexId)
+            {
+                var curVertexWeights = controlPts[vertexId];
+
+                // check that one vertex has not more than 'nbBoneByVertex' associated bones
+                if (curVertexWeights.Count > nbBoneByVertex)
+                {
+                    Logger.Warning(
+                        "The input file contains vertices that are associated to more than {0} bones. In current version of the system, a single vertex can only be associated to {0} bones. Extra bones will be ignored",
+                        new ArgumentOutOfRangeException("To much bones influencing a single vertex"));
+                }
+
+                // resize the weights so that they contains exactly the number of bone weights required
+                while (curVertexWeights.Count < nbBoneByVertex)
+                {
+                    curVertexWeights.Add((0, 0));
+                }
+
+                var totalWeight = 0.0f;
+                for (var boneId = 0; boneId < nbBoneByVertex; ++boneId)
+                    totalWeight += curVertexWeights[boneId].Item2;
+
+                if (totalWeight == 0.0) // Assimp weights are positive, so in this case all weights are nulls
+                    continue;
+
+                for (var boneId = 0; boneId < nbBoneByVertex; ++boneId)
+                    curVertexWeights[boneId] = (curVertexWeights[boneId].Item1, curVertexWeights[boneId].Item2 / totalWeight);
+            }
+        }
+
+#pragma warning disable IDE0060 // Remove unused parameter
+        private unsafe void ExtractEmbededTexture(Silk.NET.Assimp.Texture* texture)
+#pragma warning restore IDE0060 // Remove unused parameter
+        {
+            Logger.Warning("The input file contains embeded textures. Embeded textures are not currently supported. This texture will be ignored",
+                new NotImplementedException("Embeded textures extraction"));
+        }
+
+        private unsafe Dictionary<string, MaterialAsset> ExtractMaterials(Scene* scene, Dictionary<IntPtr, string> materialNames)
+        {
+            GenerateMaterialNames(scene, materialNames);
+
+            var materials = new Dictionary<string, MaterialAsset>();
+            for (uint i = 0; i < scene->MNumMaterials; i++)
+            {
+                var lMaterial = scene->MMaterials[i];
+                var materialName = materialNames[(IntPtr)lMaterial];
+                materials.Add(materialName, ProcessMeshMaterial(lMaterial));
+            }
+            return materials;
+        }
+
+        private unsafe void GenerateMaterialNames(Scene* scene, Dictionary<IntPtr, string> materialNames)
+        {
+            var baseNames = new List<string>();
+            for (uint i = 0; i < scene->MNumMaterials; i++)
+            {
+                var lMaterial = scene->MMaterials[i];
+
+
+                var aiMaterial = new AssimpString();
+                var materialName = assimp.GetMaterialString(lMaterial, Silk.NET.Assimp.Assimp.MaterialNameBase, 0, 0, ref aiMaterial) == Return.ReturnSuccess ? aiMaterial.AsString : "Material";
+                baseNames.Add(materialName);
+            }
+
+            GenerateUniqueNames(materialNames, baseNames, i => (IntPtr)scene->MMaterials[i]);
+        }
+
+        private unsafe MaterialAsset ProcessMeshMaterial(Silk.NET.Assimp.Material* pMaterial)
+        {
+            var finalMaterial = new MaterialAsset();
+
+            // TODO: Add support for all missing texture / material property types
+
+            var hasDiffColor = false;
+            var hasSpecColor = false;
+            var diffColor = System.Numerics.Vector4.Zero;
+            var specColor = System.Numerics.Vector4.Zero;
+            var dummyColor = System.Numerics.Vector4.Zero;
+
+            if (assimp.GetMaterialColor(pMaterial, Silk.NET.Assimp.Assimp.MaterialColorDiffuseBase, 0, 0, ref diffColor) == Return.ReturnSuccess) // always keep black color for diffuse
+            {
+                hasDiffColor = true;
+            }
+
+            if (assimp.GetMaterialColor(pMaterial, Silk.NET.Assimp.Assimp.MaterialColorSpecularBase, 0, 0, ref specColor) == Return.ReturnSuccess)
+            {
+                hasSpecColor = true;
+            }
+
+            BuildLayeredSurface(pMaterial, hasDiffColor, false, diffColor.ToXenkoColor(), 0.0f, TextureType.TextureTypeDiffuse, finalMaterial);
+            BuildLayeredSurface(pMaterial, hasSpecColor, false, specColor.ToXenkoColor(), 0.0f, TextureType.TextureTypeSpecular, finalMaterial);
+            BuildLayeredSurface(pMaterial, false, false, dummyColor.ToXenkoColor(), 0.0f, TextureType.TextureTypeNormals, finalMaterial);
+
+            return finalMaterial;
+        }
+
+        private unsafe void BuildLayeredSurface(Silk.NET.Assimp.Material* pMat, bool hasBaseColor, bool hasBaseValue, Color4 baseColor, float baseValue, TextureType textureType, MaterialAsset finalMaterial)
+        {
+            var nbTextures = assimp.GetMaterialTextureCount(pMat, textureType);
+
+            IComputeColor computeColorNode = null;
+            int textureCount = 0;
+            if (nbTextures == 0)
+            {
+                if (hasBaseColor)
+                {
+                    computeColorNode = new ComputeColor(baseColor);
+                }
+                //else if (hasBaseValue)
+                //{
+                //	computeColorNode = gcnew MaterialFloatComputeNode(baseValue);
+                //}
+            }
+            else
+            {
+                computeColorNode = GenerateOneTextureTypeLayers(pMat, textureType, textureCount, finalMaterial);
+            }
+
+            if (computeColorNode == null)
+            {
+                return;
+            }
+
+            if (textureType == TextureType.TextureTypeDiffuse)
+            {
+                if (assimp.GetMaterialTextureCount(pMat, TextureType.TextureTypeLightmap) > 0)
+                {
+                    var lightMap = GenerateOneTextureTypeLayers(pMat, TextureType.TextureTypeLightmap, textureCount, finalMaterial);
+                    if (lightMap != null)
+                        computeColorNode = new ComputeBinaryColor(computeColorNode, lightMap, BinaryOperator.Add);
+                }
+
+                finalMaterial.Attributes.Diffuse = new MaterialDiffuseMapFeature(computeColorNode);
+
+                // TODO TEMP: Set a default diffuse model
+                finalMaterial.Attributes.DiffuseModel = new MaterialDiffuseLambertModelFeature();
+            }
+            else if (textureType == TextureType.TextureTypeSpecular)
+            {
+                var specularFeature = new MaterialSpecularMapFeature
+                {
+                    SpecularMap = computeColorNode
+                };
+                finalMaterial.Attributes.Specular = specularFeature;
+
+                // TODO TEMP: Set a default specular model
+                var specularModel = new MaterialSpecularMicrofacetModelFeature
+                {
+                    Fresnel = new MaterialSpecularMicrofacetFresnelSchlick(),
+                    Visibility = new MaterialSpecularMicrofacetVisibilityImplicit(),
+                    NormalDistribution = new MaterialSpecularMicrofacetNormalDistributionBlinnPhong()
+                };
+                finalMaterial.Attributes.SpecularModel = specularModel;
+            }
+            else if (textureType == TextureType.TextureTypeEmissive)
+            {
+                // TODO: Add support
+            }
+            else if (textureType == TextureType.TextureTypeAmbient)
+            {
+                // TODO: Add support
+            }
+            else if (textureType == TextureType.TextureTypeReflection)
+            {
+                // TODO: Add support
+            }
+            if (textureType == TextureType.TextureTypeOpacity)
+            {
+                // TODO: Add support
+            }
+            else if (textureType == TextureType.TextureTypeShininess)
+            {
+                // TODO: Add support
+            }
+            if (textureType == TextureType.TextureTypeSpecular)
+            {
+                // TODO: Add support
+            }
+            else if (textureType == TextureType.TextureTypeNormals)
+            {
+                finalMaterial.Attributes.Surface = new MaterialNormalMapFeature(computeColorNode);
+            }
+            else if (textureType == TextureType.TextureTypeDisplacement)
+            {
+                // TODO: Add support
+            }
+            else if (textureType == TextureType.TextureTypeHeight)
+            {
+                // TODO: Add support
+            }
+        }
+
+        private unsafe IComputeColor GenerateOneTextureTypeLayers(Silk.NET.Assimp.Material* pMat, TextureType textureType, int textureCount, MaterialAsset finalMaterial)
+        {
+            var stack = Material.Materials.ConvertAssimpStackCppToCs(assimp, pMat, textureType);
+
+            var compositionFathers = new Stack<IComputeColor>();
+
+            var sets = new Stack<int>();
+            sets.Push(0);
+
+            var nbTextures = assimp.GetMaterialTextureCount(pMat, textureType);
+
+            IComputeColor curComposition = null, newCompositionFather = null;
+
+            var isRootElement = true;
+            IComputeColor rootMaterial = null;
+
+            while (!stack.IsEmpty)
+            {
+                var top = stack.Pop();
+
+                IComputeColor curCompositionFather = null;
+                if (!isRootElement)
+                {
+                    if (compositionFathers.Count == 0)
+                        Logger.Error("Texture Stack Invalid : Operand without Operation.");
+
+                    curCompositionFather = compositionFathers.Pop();
+                }
+
+                var set = sets.Pop();
+
+                var type = top.type;
+                var strength = top.blend;
+                var alpha = top.alpha;
+
+                if (type == Material.StackType.Operation)
+                {
+                    var realTop = (Material.StackOperation)top;
+                    var op = realTop.operation;
+                    var binNode = new ComputeBinaryColor(null, null, BinaryOperator.Add);
+
+                    switch (op)
+                    {
+                        case Material.Operation.Add3ds:
+                        case Material.Operation.AddMaya:
+                            binNode.Operator = BinaryOperator.Add;
+                            break;
+                        case Material.Operation.Multiply3ds:
+                        case Material.Operation.MultiplyMaya:
+                            binNode.Operator = BinaryOperator.Multiply;
+                            break;
+                        default:
+                            binNode.Operator = BinaryOperator.Add;
+                            break;
+                    }
+
+                    curComposition = binNode;
+                }
+                else if (type == Material.StackType.Color)
+                {
+                    var realTop = (Material.StackColor)top;
+                    var ol = realTop.color;
+                    curComposition = new ComputeColor(new Color4(ol.R, ol.G, ol.B, alpha));
+                }
+                else if (type == Material.StackType.Texture)
+                {
+                    var realTop = (Material.StackTexture)top;
+                    var texPath = realTop.texturePath;
+                    var indexUV = realTop.channel;
+                    curComposition = GetTextureReferenceNode(vfsOutputFilename, texPath, (uint)indexUV, Vector2.One, ConvertTextureMode(realTop.mappingModeU), ConvertTextureMode(realTop.mappingModeV), finalMaterial);
+                }
+
+                newCompositionFather = curComposition;
+
+                if (strength != 1.0f)
+                {
+                    var strengthAlpha = strength;
+                    if (type != Material.StackType.Color)
+                        strengthAlpha *= alpha;
+
+                    var factorComposition = new ComputeFloat4(new Vector4(strength, strength, strength, strengthAlpha));
+                    curComposition = new ComputeBinaryColor(curComposition, factorComposition, BinaryOperator.Multiply);
+                }
+                else if (alpha != 1.0f && type != Material.StackType.Color)
+                {
+                    var factorComposition = new ComputeFloat4(new Vector4(1.0f, 1.0f, 1.0f, alpha));
+                    curComposition = new ComputeBinaryColor(curComposition, factorComposition, BinaryOperator.Multiply);
+                }
+
+                if (isRootElement)
+                {
+                    rootMaterial = curComposition;
+                    isRootElement = false;
+                    compositionFathers.Push(curCompositionFather);
+                }
+                else
+                {
+                    if (set == 0)
+                    {
+                        ((ComputeBinaryColor)curCompositionFather).LeftChild = curComposition;
+                        compositionFathers.Push(curCompositionFather);
+                        sets.Push(1);
+                    }
+                    else if (set == 1)
+                    {
+                        ((ComputeBinaryColor)curCompositionFather).RightChild = curComposition;
+                    }
+                    else
+                    {
+                        Logger.Error($"Texture Stack Invalid : Invalid Operand Number {set}.");
+                    }
+                }
+
+                if (type == Material.StackType.Operation)
+                {
+                    compositionFathers.Push(newCompositionFather);
+                    sets.Push(0);
+                }
+            }
+
+            return rootMaterial;
+        }
+
+        private static TextureAddressMode ConvertTextureMode(Material.MappingMode mappingMode)
+        {
+            switch (mappingMode)
+            {
+                case Material.MappingMode.Clamp:
+                    return TextureAddressMode.Clamp;
+                case Material.MappingMode.Decal:
+                    return TextureAddressMode.Border;
+                case Material.MappingMode.Mirror:
+                    return TextureAddressMode.Mirror;
+                default:
+                case Material.MappingMode.Wrap:
+                    return TextureAddressMode.Wrap;
+            }
+        }
+
+        private ComputeTextureColor GetTextureReferenceNode(string vfsOutputPath, string sourceTextureFile, uint textureUVSetIndex, Vector2 textureUVscaling, TextureAddressMode addressModeU, TextureAddressMode addressModeV, MaterialAsset finalMaterial)
+        {
+            // TODO: compare with FBX importer - see if there could be some conflict between texture names
+            var textureValue = TextureLayerGenerator.GenerateMaterialTextureNode(vfsOutputPath, sourceTextureFile, textureUVSetIndex, textureUVscaling, addressModeU, addressModeV, Logger);
+
+            var attachedReference = AttachedReferenceManager.GetAttachedReference(textureValue.Texture);
+            var referenceName = attachedReference.Url;
+
+            // find a new and correctName
+            if (!textureNameCount.ContainsKey(referenceName))
+                textureNameCount.Add(referenceName, 1);
+            else
+            {
+                int count = textureNameCount[referenceName];
+                textureNameCount[referenceName] = count + 1;
+                referenceName = string.Concat(referenceName, "_", count);
+            }
+
+            return textureValue;
+        }
+
+        private unsafe List<MeshParameters> ExtractModels(Scene* scene, Dictionary<IntPtr, string> meshNames, Dictionary<IntPtr, string> materialNames, Dictionary<IntPtr, string> nodeNames)
+        {
+            GenerateMeshNames(scene, meshNames);
+
+            var meshList = new List<MeshParameters>();
+            for (uint i = 0; i < scene->MNumMeshes; ++i)
+            {
+                var mesh = scene->MMeshes[i];
+                var lMaterial = scene->MMaterials[mesh->MMaterialIndex];
+
+                var meshParams = new MeshParameters
+                {
+                    MeshName = meshNames[(IntPtr)mesh],
+                    MaterialName = materialNames[(IntPtr)lMaterial],
+                    NodeName = SearchMeshNode(scene->MRootNode, i, nodeNames)
+                };
+
+                meshList.Add(meshParams);
+            }
+
+            return meshList;
+        }
+
+        private unsafe string SearchMeshNode(Node* node, uint meshIndex, Dictionary<IntPtr, string> nodeNames)
+        {
+            for (uint i = 0; i < node->MNumMeshes; ++i)
+            {
+                if (node->MMeshes[i] == meshIndex)
+                    return nodeNames[(IntPtr)node];
+            }
+
+            for (uint i = 0; i < node->MNumChildren; ++i)
+            {
+                var res = SearchMeshNode(node->MChildren[i], meshIndex, nodeNames);
+                if (res != null)
+                    return res;
+            }
+
+            return null;
+        }
+
+        private unsafe List<NodeInfo> ExtractNodeHierarchy(Scene* scene, Dictionary<IntPtr, string> nodeNames)
+        {
+            var allNodes = new List<NodeInfo>();
+            GetNodes(scene->MRootNode, 0, nodeNames, allNodes);
+            return allNodes;
+        }
+
+        private unsafe void GetNodes(Node* node, int depth, Dictionary<IntPtr, string> nodeNames, List<NodeInfo> allNodes)
+        {
+            var currentIndex = allNodes.Count;
+            var newNodeInfo = new NodeInfo
+            {
+                Name = nodeNames[(IntPtr)node],
+                Depth = depth,
+                Preserve = true
+            };
+
+            allNodes.Add(newNodeInfo);
+            for (uint i = 0; i < node->MNumChildren; ++i)
+                GetNodes(node->MChildren[i], depth + 1, nodeNames, allNodes);
+        }
+
+        private unsafe List<string> ExtractAnimations(Scene* scene, Dictionary<IntPtr, string> animationNames)
+        {
+            if (scene->MNumAnimations == 0)
+                return null;
+
+            GenerateAnimationNames(scene, animationNames);
+
+            var animationList = new List<String>();
+            foreach (var animationName in animationNames)
+            {
+                animationList.Add(animationName.Value);
+            }
+
+            return animationList;
+        }
+
+        private unsafe List<string> ExtractTextureDependencies(Scene* scene)
+        {
+            var textureNames = new List<String>();
+
+            // texture search is done by type so we need to loop on them
+            var allTextureTypes = new TextureType[]
+            {
+                TextureType.TextureTypeDiffuse,
+                TextureType.TextureTypeSpecular,
+                TextureType.TextureTypeAmbient,
+                TextureType.TextureTypeEmissive,
+                TextureType.TextureTypeHeight,
+                TextureType.TextureTypeNormals,
+                TextureType.TextureTypeShininess,
+                TextureType.TextureTypeOpacity,
+                TextureType.TextureTypeDisplacement,
+                TextureType.TextureTypeLightmap,
+                TextureType.TextureTypeReflection
+            };
+
+            for (uint i = 0; i < scene->MNumMaterials; i++)
+            {
+                foreach (var textureType in allTextureTypes)
+                {
+                    var lMaterial = scene->MMaterials[i];
+                    var nbTextures = assimp.GetMaterialTextureCount(lMaterial, textureType);
+
+                    for (uint j = 0; j < nbTextures; ++j)
+                    {
+                        var path = new AssimpString();
+                        var mapping = TextureMapping.TextureMappingUV;
+                        uint uvIndex = 0;
+                        var blend = 0.0f;
+                        var textureOp = TextureOp.TextureOpMultiply;
+                        var mapMode = TextureMapMode.TextureMapModeWrap;
+                        uint flags = 0;
+
+                        if (assimp.GetMaterialTexture(lMaterial, textureType, j, ref path, ref mapping, ref uvIndex, ref blend, ref textureOp, ref mapMode, ref flags) == Return.ReturnSuccess)
+                        {
+                            var relFileName = path.AsString;
+                            var fileNameToUse = Path.Combine(vfsInputPath, relFileName);
+                            textureNames.Add(fileNameToUse);
+                            break;
+                        }
+                    }
+                }
+            }
+
+            return textureNames;
+        }
+    }
+
+    public class MeshInfo
+    {
+        public MeshDraw Draw;
+        public List<MeshBoneDefinition> Bones;
+        public string Name;
+        public int MaterialIndex;
+        public bool HasSkinningPosition = false;
+        public bool HasSkinningNormal = false;
+        public int TotalClusterCount = 0;
+    }
+
+    public class MaterialInstantiation
+    {
+        public List<string> Parameters;
+        public MaterialAsset Material;
+        public string MaterialName;
+    }
+
+    public unsafe class MaterialInstances
+    {
+        public Silk.NET.Assimp.Material* SourceMaterial;
+        public List<MaterialInstantiation> Instances = new List<MaterialInstantiation>();
+        public string MaterialsName;
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Assimp/ReadMe.txt b/sources/tools/Xenko.Importer.Assimp/ReadMe.txt
deleted file mode 100644
index 9296e0d3dd..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/ReadMe.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-========================================================================
-    DYNAMIC LINK LIBRARY : Xenko.Importer.Assimp Project Overview
-========================================================================
-
-AppWizard has created this Xenko.Importer.Assimp DLL for you.  
-
-This file contains a summary of what you will find in each of the files that
-make up your Xenko.Importer.Assimp application.
-
-Xenko.Importer.Assimp.vcxproj
-    This is the main project file for VC++ projects generated using an Application Wizard. 
-    It contains information about the version of Visual C++ that generated the file, and 
-    information about the platforms, configurations, and project features selected with the
-    Application Wizard.
-
-Xenko.Importer.Assimp.vcxproj.filters
-    This is the filters file for VC++ projects generated using an Application Wizard. 
-    It contains information about the association between the files in your project 
-    and the filters. This association is used in the IDE to show grouping of files with
-    similar extensions under a specific node (for e.g. ".cpp" files are associated with the
-    "Source Files" filter).
-
-Xenko.Importer.Assimp.cpp
-    This is the main DLL source file.
-
-Xenko.Importer.Assimp.h
-    This file contains a class declaration.
-
-AssemblyInfo.cpp
-	Contains custom attributes for modifying assembly metadata.
-
-/////////////////////////////////////////////////////////////////////////////
-Other notes:
-
-AppWizard uses "TODO:" to indicate parts of the source code you
-should add to or customize.
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/sources/tools/Xenko.Importer.Assimp/Stdafx.cpp b/sources/tools/Xenko.Importer.Assimp/Stdafx.cpp
deleted file mode 100644
index de4bb56489..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/Stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// Xenko.Importer.Assimp.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
diff --git a/sources/tools/Xenko.Importer.Assimp/Stdafx.h b/sources/tools/Xenko.Importer.Assimp/Stdafx.h
deleted file mode 100644
index 23d9648524..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/Stdafx.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-
-#pragma once
-
-#pragma warning( disable : 4945 )
-
-#include "assimp/Importer.hpp"
-#include "assimp/Scene.h"
-#include "assimp/IOSystem.hpp"
-#pragma make_public(aiScene)
-
-#include "assimp/PostProcess.h"
-
-#include <msclr/marshal_cppstd.h>
-
-#include "UtilityFunctions.h"
-
-#include <vector>
-#include <stack>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Assimp/UtilityFunctions.cpp b/sources/tools/Xenko.Importer.Assimp/UtilityFunctions.cpp
deleted file mode 100644
index 692d87d916..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/UtilityFunctions.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#include "Stdafx.h"
-
-#include "UtilityFunctions.h"
-
-using namespace System::Text;
-using namespace Xenko::Engine;
-
-
-String^ aiStringToString(aiString str)
-{
-	// Assimp aiString underlying encoding is UTF-8
-	// Windows String underlying encoding is UTF-16
-	Encoding^ srcEncoding = Encoding::UTF8;
-
-	const char* pAiData = str.C_Str(); // pointer to the underlying data of he aiString
-        // Check `str' cannot be more than the size of a int.
-	array<unsigned char>^ buffer = gcnew array<unsigned char>((int) str.length);
-	for(unsigned int i=0; i<str.length; ++i)
-		buffer[i] = pAiData[i];
-
-	return srcEncoding->GetString(buffer);
-}
-
-Color aiColor4ToColor(aiColor4D color)
-{
-	Color ret(color.r, color.g, color.b, color.a);
-	return ret;
-}
-
-Color3 aiColor3ToColor3(aiColor3D color)
-{
-	Color3 ret(color.r, color.g, color.b);
-	return ret;
-}
-
-Color4 aiColor3ToColor4(aiColor3D color)
-{
-	Color4 ret(color.r, color.g, color.b, 1.0f);
-	return ret;
-}
-
-Matrix aiMatrixToMatrix(aiMatrix4x4 mat)
-{
-	Matrix ret(	mat.a1, mat.b1, mat.c1, mat.d1, 
-				mat.a2, mat.b2, mat.c2, mat.d2,
-				mat.a3, mat.b3, mat.c3, mat.d3,
-				mat.a4, mat.b4, mat.c4, mat.d4);
-	return ret;
-}
-
-Vector2 aiVector2ToVector2(aiVector2D vec)
-{
-	Vector2 ret(vec.x, vec.y);
-	return ret;
-}
-
-Vector3 aiVector3ToVector3(aiVector3D vec)
-{
-	Vector3 ret(vec.x, vec.y, vec.z);
-	return ret;
-}
-
-Quaternion aiQuaternionToQuaternion(aiQuaterniont<float> quat)
-{
-	Quaternion ret(quat.x, quat.y, quat.z, quat.w);
-	return ret;
-}
-
-CompressedTimeSpan aiTimeToXkTimeSpan(double time, double aiTickPerSecond)
-{
-	double xkTime = CompressedTimeSpan::TicksPerSecond / aiTickPerSecond * time;
-	return CompressedTimeSpan((long)xkTime);
-}
-
-
-Vector3 QuaternionToEulerAngles(Quaternion q)
-{
-	Vector3 ret;
-
-	// source wikipedia => http://en.wikipedia.org/wiki/Conversion_between_quaternions_and_Euler_angles#Conversion
-	ret.X = (float)Math::Atan2(2.f * q.X * q.W + 2.f * q.Y * q.Z, 1 - 2.f * (q.X*q.X  + q.Y*q.Y)); 
-
-	auto sinY = Math::Min(1.0, Math::Max(-1.0, 2.0 * ( q.W * q.Y - q.Z * q.X )));	// with approximation value can exceed 1 and lead to invalid Arcsinus.
-	ret.Y = (float)Math::Asin(sinY);          
-
-	ret.Z = (float)Math::Atan2(2.f * q.W * q.Z + 2.f * q.Y * q.X, 1 - 2.f * (q.Y*q.Y + q.Z*q.Z));      
-
-	return ret;
-}
-
-
-Vector3 FlipYZAxis(Vector3 input, bool shouldFlip)
-{
-	if(!shouldFlip)
-		return input;
-	
-	return Vector3(input.X, input.Z, -input.Y);
-}
diff --git a/sources/tools/Xenko.Importer.Assimp/UtilityFunctions.h b/sources/tools/Xenko.Importer.Assimp/UtilityFunctions.h
deleted file mode 100644
index dd41ff2bab..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/UtilityFunctions.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#include "Stdafx.h"
-
-
-using namespace System;
-using namespace Xenko::Animations;
-using namespace Xenko::Core::Diagnostics;
-using namespace Xenko::Core::Mathematics;
-
-// Assimp types convertion
-String^ aiStringToString(aiString str);
-Color aiColor4ToColor(aiColor4D color);
-Color3 aiColor3ToColor3(aiColor3D color);
-Color4 aiColor3ToColor4(aiColor3D color);
-Matrix aiMatrixToMatrix(aiMatrix4x4 mat);
-Vector2 aiVector2ToVector2(aiVector2D vec);
-Vector3 aiVector3ToVector3(aiVector3D vec);
-Quaternion aiQuaternionToQuaternion(aiQuaterniont<float> quat);
-CompressedTimeSpan aiTimeToXkTimeSpan(double time, double tickPerSecond);
-
-// Others
-Vector3 QuaternionToEulerAngles(Quaternion q);
-Vector3 FlipYZAxis(Vector3 input, bool shouldFlip);
diff --git a/sources/tools/Xenko.Importer.Assimp/Utils.cs b/sources/tools/Xenko.Importer.Assimp/Utils.cs
new file mode 100644
index 0000000000..66b6d43052
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Assimp/Utils.cs
@@ -0,0 +1,61 @@
+using Xenko.Animations;
+using Xenko.Core.Mathematics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Numerics;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Importer.Assimp
+{
+    public static class Utils
+    {
+        public const int AI_MAX_NUMBER_OF_TEXTURECOORDS = 8;
+        public const int AI_MAX_NUMBER_OF_COLOR_SETS = 8;
+
+        public static Matrix ToXenkoMatrix(this Matrix4x4 matrix)
+        {
+            // Note the order. Matrices from Assimp has to be transposed
+            return new Matrix(
+                matrix.M11, matrix.M21, matrix.M31, matrix.M41,
+                matrix.M12, matrix.M22, matrix.M32, matrix.M42,
+                matrix.M13, matrix.M23, matrix.M33, matrix.M43,
+                matrix.M14, matrix.M24, matrix.M34, matrix.M44);
+        }
+
+        public static Core.Mathematics.Vector3 ToXenkoVector3(this System.Numerics.Vector3 v)
+            => new Core.Mathematics.Vector3(v.X, v.Y, v.Z);
+
+        public static Color ToXenkoColor(this System.Numerics.Vector4 v)
+            => new Color(v.X, v.Y, v.Z, v.W);
+
+        public static unsafe uint GetNumUVChannels(Silk.NET.Assimp.Mesh* mesh)
+        {
+            var n = 0;
+            while (n < AI_MAX_NUMBER_OF_TEXTURECOORDS && mesh->MTextureCoords[n] != null)
+            {
+                ++n;
+            }
+
+            return (uint)n;
+        }
+
+        public static unsafe uint GetNumColorChannels(Silk.NET.Assimp.Mesh* mesh)
+        {
+            var n = 0;
+            while (n < AI_MAX_NUMBER_OF_COLOR_SETS && mesh->MColors[n] != null)
+            {
+                ++n;
+            }
+
+            return (uint)n;
+        }
+
+        public static CompressedTimeSpan AiTimeToXkTimeSpan(double time, double aiTickPerSecond)
+        {
+            var sdTime = CompressedTimeSpan.TicksPerSecond / aiTickPerSecond * time;
+            return new CompressedTimeSpan((int)sdTime);
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.cpp b/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.cpp
deleted file mode 100644
index ec9ee45a2f..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.cpp
+++ /dev/null
@@ -1,1524 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#include "stdafx.h"
-#include "../Xenko.Assimp.Translation/Extension.h"
-#include "../Xenko.Importer.Common/ImporterUtils.h"
-
-#include <string>
-#include <map>
-#include <set>
-
-using namespace System;
-using namespace System::Collections;
-using namespace System::Collections::Generic;
-using namespace System::Diagnostics;
-using namespace System::IO;
-using namespace Xenko;
-using namespace Xenko::Core;
-using namespace Xenko::Core::Diagnostics;
-using namespace Xenko::Core::IO;
-using namespace Xenko::Core::Mathematics;
-using namespace Xenko::Core::Serialization;
-using namespace Xenko::Core::Serialization::Contents;
-using namespace Xenko::Assets::Materials;
-using namespace Xenko::Rendering;
-using namespace Xenko::Rendering::Materials;
-using namespace Xenko::Rendering::Materials::ComputeColors;
-using namespace Xenko::AssimpNet;
-using namespace Xenko::AssimpNet::Material;
-using namespace Xenko::Animations;
-using namespace Xenko::Engine;
-using namespace Xenko::Extensions;
-using namespace Xenko::Graphics;
-using namespace Xenko::Graphics::Data;
-using namespace Xenko::Shaders;
-
-using namespace Assimp;
-using namespace Xenko::Importer::Common;
-
-namespace Xenko { namespace Importer { namespace AssimpNET {
-
-public ref class MaterialInstantiation
-{
-public:
-	List<String^>^ Parameters;
-	MaterialAsset^ Material;
-	String^ MaterialName;
-};
-
-public ref class MaterialInstances
-{
-public:
-	MaterialInstances()
-	{
-		Instances = gcnew List<MaterialInstantiation^>();
-	}
-
-	aiMaterial* SourceMaterial;
-	List<MaterialInstantiation^>^ Instances;
-	String^ MaterialsName;
-};
-
-public ref class MeshInfo
-{
-public:
-	MeshInfo()
-	{
-		HasSkinningPosition = false;
-		HasSkinningNormal = false;
-		TotalClusterCount = 0;
-	}
-
-	MeshDraw^ Draw;
-	List<MeshBoneDefinition>^ Bones;
-	String^ Name;
-	int MaterialIndex;
-	bool HasSkinningPosition;
-	bool HasSkinningNormal;
-	int TotalClusterCount;
-};
-
-public ref class MeshConverter
-{
-public:
-	property Logger^ Logger;
-	property bool AllowUnsignedBlendIndices;
-
-private:
-	Stopwatch^ internalStopwatch;
-
-	// ----- From here: convertion-wise data ----- //
-	
-	String^ vfsInputFilename;
-	String^ vfsOutputFilename;
-	String^ vfsInputPath;
-
-	Vector3 rootScaling;
-	Quaternion rootOrientation;
-	Quaternion rootOrientationInverse;
-	Matrix rootTransform;
-	Matrix rootTransformInverse;
-	Model^ modelData;
-	List<ModelNodeDefinition> nodes;
-	Dictionary<IntPtr, int> nodeMapping;
-	Dictionary<String^, int>^ textureNameCount;
-
-	List<Mesh^>^ effectMeshes;	// array of EffectMeshes built from the aiMeshes (same order)
-
-
-public:
-	MeshConverter(Core::Diagnostics::Logger^ logger)
-	{
-		if(logger == nullptr)
-			logger = Core::Diagnostics::GlobalLogger::GetLogger("Importer Assimp");
-
-		internalStopwatch = gcnew Stopwatch();
-		
-		Logger = logger;
-	}
-
-private:
-	const aiScene* Initialize(String^ inputFilename, String^ outputFilename, Assimp::Importer* importer, unsigned int flags)
-	{
-		// reset all cached data for this new stream convertion
-		ResetConvertionData();
-
-		// TODO: correct this hack
-		auto splitString = inputFilename->Split(':');
-		auto unixStyleInputFilename = "/" + splitString[0] + splitString[1];
-
-		this->vfsInputFilename = inputFilename;
-		this->vfsOutputFilename = outputFilename;
-		this->vfsInputPath = VirtualFileSystem::GetParentFolder(inputFilename);
-
-		/*
-		auto stream = VirtualFileSystem::Drive->OpenStream(unixStyleInputFilename, VirtualFileMode::Open, VirtualFileAccess::Read, VirtualFileShare::Read, StreamFlags::None);
-
-		// check and possibly adjust the input parameters
-		if(stream == nullptr)
-			throw gcnew ArgumentNullException("Input Stream");
-		
-		// set file wise info
-		//absolutePath = absPath;
-		//relativePath = dstSrcRelativePath;
-
-		// copies the all the stream in local memory
-		// Not the best memory-wise, need to be optimized
-		internalStopwatch->StartNew();
-		auto memoryStream = gcnew MemoryStream();
-		stream->CopyTo(memoryStream);
-		auto buffer = memoryStream->ToArray();
-		Logger->Verbose("File Stream copied - Time taken: {0} ms.", nullptr, internalStopwatch->ElapsedMilliseconds);
-
-		//importer->SetIOHandler(new IOSystemCustom());
-
-		// load the mesh from its original format to Assimp data structures
-		internalStopwatch->StartNew();
-		
-		cli::pin_ptr<System::Byte> bufferStart = &buffer[0];
-		return importer->ReadFileFromMemory(bufferStart, buffer->Length, flags);
-		*/
-		
-		std::string unmanaged = msclr::interop::marshal_as<std::string>(inputFilename);
-
-		return importer->ReadFile(unmanaged, flags);
-	}
-
-	// Reset all data related to one specific file conversion
-	void ResetConvertionData()
-	{
-		effectMeshes = gcnew List<Mesh^>();
-		textureNameCount = gcnew Dictionary<String^, int>();
-	}
-	
-	void ExtractEmbededTexture(aiTexture* texture)
-	{
-		Logger->Warning("The input file contains embeded textures. Embeded textures are not currently supported. This texture will be ignored",
-						gcnew NotImplementedException("Embeded textures extraction"),
-						CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-	}
-
-	void NormalizeVertexWeights(std::vector<std::vector<std::pair<short,float> > >& controlPts, int nbBoneByVertex)
-	{
-		for(unsigned int vertexId=0; vertexId<controlPts.size(); ++vertexId)
-		{
-			auto& curVertexWeights = controlPts[vertexId];
-
-			// check that one vertex has not more than 'nbBoneByVertex' associated bones
-			if((int) curVertexWeights.size() > nbBoneByVertex)
-				Logger->Warning("The input file contains vertices that are associated to more than {0} bones. In current version of the system, a single vertex can only be associated to {0} bones. Extra bones will be ignored",
-								gcnew ArgumentOutOfRangeException("To much bones influencing a single vertex"),
-								CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-
-			// resize the weights so that they contains exactly the number of bone weights required
-			curVertexWeights.resize(nbBoneByVertex, std::pair<short, float>(0, 0.0f));
-
-			float totalWeight = 0.f;
-			for(int boneId=0; boneId<nbBoneByVertex; ++boneId)
-				totalWeight += curVertexWeights[boneId].second;
-
-			if(totalWeight == 0.f) // Assimp weights are positive, so in this case all weights are nulls
-				continue;
-
-			for(int boneId=0; boneId<nbBoneByVertex; ++boneId)
-				curVertexWeights[boneId].second /= totalWeight;
-		}
-	}
-	
-	bool IsTransparent(aiMaterial* pMaterial)
-	{
-		float opacity;
-		if(pMaterial->Get(AI_MATKEY_OPACITY, opacity) == AI_SUCCESS)
-			return (opacity != 1.0);
-		return false;
-	}
-
-	MeshInfo^ ProcessMesh(const aiScene* scene, aiMesh* mesh, std::map<aiMesh*, std::string>& meshNames)
-	{
-		// constant declaration
-		const int nbBonesByVertex = 4;
-		
-		List<MeshBoneDefinition>^ bones = nullptr;
-		bool hasSkinningPosition = false;
-		bool hasSkinningNormal = false;
-		int totalClusterCount = 0;
-
-		// Build the bone's indices/weights and attach bones to NodeData 
-		//(bones info are present in the mesh so that is why we have to perform that here)
-		std::vector<std::vector<std::pair<short, float> > > vertexIndexToBoneIdWeight;
-		if(mesh->HasBones())
-		{
-			bones = gcnew List<MeshBoneDefinition>();
-
-			// TODO: change this to support shared meshes across nodes
-
-			// size of the array is already known
-			vertexIndexToBoneIdWeight.resize(mesh->mNumVertices);
-
-			// Build skinning clusters and fill controls points data stutcture
-			for(unsigned int boneId = 0; boneId < mesh->mNumBones; ++boneId)
-			{
-				auto bone = mesh->mBones[boneId];
-
-				// Fill controlPts with bone controls on the mesh
-				for(unsigned int vtxWeightId=0; vtxWeightId<bone->mNumWeights; ++vtxWeightId)
-				{
-					auto vtxWeight = bone->mWeights[vtxWeightId];
-					vertexIndexToBoneIdWeight[vtxWeight.mVertexId].push_back(std::make_pair(boneId, vtxWeight.mWeight));
-				}
-
-				// find the node where the bone is mapped - based on the name(?)
-				int nodeIndex = -1;
-				auto boneName = gcnew String(bone->mName.C_Str());
-				for (int nodeDefId = 0; nodeDefId < nodes.Count; ++nodeDefId)
-				{
-					auto nodeDef = nodes[nodeDefId];
-					if (nodeDef.Name->Equals(boneName))
-					{
-						nodeIndex = nodeDefId;
-						break;
-					}
-				}
-				if (nodeIndex == -1)
-				{
-					// TODO: log an error
-					nodeIndex = 0;
-				}
-
-				MeshBoneDefinition boneDef;
-				boneDef.NodeIndex = nodeIndex;
-				boneDef.LinkToMeshMatrix = rootTransformInverse * aiMatrixToMatrix(bone->mOffsetMatrix) * rootTransform;
-				bones->Add(boneDef);
-			}
-			NormalizeVertexWeights(vertexIndexToBoneIdWeight, nbBonesByVertex);
-
-			totalClusterCount = mesh->mNumBones;
-			if (totalClusterCount > 0)
-				hasSkinningPosition = true;
-		}
-
-		// Build the vertex declaration
-		auto vertexElements = gcnew List<VertexElement>();
-		int vertexStride = 0;
-
-		int positionOffset = vertexStride;
-		vertexElements->Add(VertexElement::Position<Vector3>(0, vertexStride));
-		vertexStride += sizeof(Vector3);
-
-		int normalOffset = vertexStride;
-		if (mesh->HasNormals())
-		{
-			vertexElements->Add(VertexElement::Normal<Vector3>(0, vertexStride));
-			vertexStride += sizeof(Vector3);
-		}
-
-		int uvOffset = vertexStride;
-		const int sizeUV = sizeof(Vector2); // 3D uv not supported
-		for (unsigned int uvChannel = 0; uvChannel < mesh->GetNumUVChannels(); ++uvChannel)
-		{
-			vertexElements->Add(VertexElement::TextureCoordinate<Vector2>(uvChannel, vertexStride));	
-			vertexStride += sizeUV;
-		}
-
-		int colorOffset = vertexStride;
-		const int sizeColor = sizeof(Color);
-		for (unsigned int colorChannel=0; colorChannel< mesh->GetNumColorChannels(); ++colorChannel)
-		{
-			vertexElements->Add(VertexElement::Color<Color>(colorChannel, vertexStride));
-			vertexStride += sizeColor;
-		}
-
-		int tangentOffset = vertexStride;
-		if (mesh->HasTangentsAndBitangents())
-		{
-			vertexElements->Add(VertexElement::Tangent<Vector3>(0, vertexStride));
-			vertexStride += sizeof(Vector3);
-		}
-
-		int bitangentOffset = vertexStride;
-		if (mesh->HasTangentsAndBitangents())
-		{
-			vertexElements->Add(VertexElement::BiTangent<Vector3>(0, vertexStride));
-			vertexStride += sizeof(Vector3);
-		}
-
-		int blendIndicesOffset = vertexStride;
-		bool controlPointIndices16 = (AllowUnsignedBlendIndices && totalClusterCount > 256) || (!AllowUnsignedBlendIndices && totalClusterCount > 128);
-		if (vertexIndexToBoneIdWeight.size() > 0)
-		{
-			if (controlPointIndices16)
-			{
-				if (AllowUnsignedBlendIndices)
-				{
-					vertexElements->Add(VertexElement("BLENDINDICES", 0, PixelFormat::R16G16B16A16_UInt, vertexStride));
-					vertexStride += sizeof(unsigned short) * 4;
-				}
-				else
-				{
-					vertexElements->Add(VertexElement("BLENDINDICES", 0, PixelFormat::R16G16B16A16_SInt, vertexStride));
-					vertexStride += sizeof(short) * 4;
-				}
-			}
-			else
-			{
-				if (AllowUnsignedBlendIndices)
-				{
-					vertexElements->Add(VertexElement("BLENDINDICES", 0, PixelFormat::R8G8B8A8_UInt, vertexStride));
-					vertexStride += sizeof(unsigned char) * 4;
-				}
-				else
-				{
-					vertexElements->Add(VertexElement("BLENDINDICES", 0, PixelFormat::R8G8B8A8_SInt, vertexStride));
-					vertexStride += sizeof(char) * 4;
-				}
-			}
-		}
-
-		int blendWeightOffset = vertexStride;
-		if (vertexIndexToBoneIdWeight.size() > 0)
-		{
-			vertexElements->Add(VertexElement("BLENDWEIGHT", 0, PixelFormat::R32G32B32A32_Float, vertexStride));
-			vertexStride += sizeof(float) * 4;
-		}
-
-		// Build the vertices data buffer 
-		auto vertexBuffer = gcnew array<Byte>(vertexStride * mesh->mNumVertices);
-		pin_ptr<Byte> vbPointer = &vertexBuffer[0];
-		for (unsigned int i = 0; i < mesh->mNumVertices; i++)
-		{
-			auto positionPointer = (Vector3*)(vbPointer + positionOffset);
-			*positionPointer = aiVector3ToVector3(mesh->mVertices[i]);
-			Vector3::TransformCoordinate(*positionPointer, rootTransform, *positionPointer);
-
-			if (mesh->HasNormals())
-			{
-				auto normalPointer = ((Vector3*)(vbPointer + normalOffset));
-				*normalPointer = aiVector3ToVector3(mesh->mNormals[i]);
-				Vector3::TransformNormal(*normalPointer, rootTransform, *normalPointer);
-				if (isnan(normalPointer->X) || isnan(normalPointer->Y) || isnan(normalPointer->Z))
-					*normalPointer = Vector3(1, 0, 0);
-				else
-					normalPointer->Normalize();
-			}
-
-			for (unsigned int uvChannel = 0; uvChannel < mesh->GetNumUVChannels(); ++uvChannel)
-			{
-				auto textureCoord = mesh->mTextureCoords[uvChannel][i];
-				*((Vector2*)(vbPointer + uvOffset + sizeUV*uvChannel)) = Vector2(textureCoord.x, textureCoord.y);	// 3D uv not supported
-			}
-			
-			for (unsigned int colorChannel=0; colorChannel< mesh->GetNumColorChannels(); ++colorChannel)
-			{
-				auto color = aiColor4ToColor(mesh->mColors[colorChannel][i]);
-				*((Color*)(vbPointer + colorOffset + sizeColor*colorChannel)) = color;	
-			}
-
-			if (mesh->HasTangentsAndBitangents())
-			{
-				auto tangentPointer = ((Vector3*)(vbPointer + tangentOffset));
-				auto bitangentPointer = ((Vector3*)(vbPointer + bitangentOffset));
-				*tangentPointer = aiVector3ToVector3(mesh->mTangents[i]);
-				*bitangentPointer = aiVector3ToVector3(mesh->mBitangents[i]);
-				if (isnan(tangentPointer->X) || isnan(tangentPointer->Y) || isnan(tangentPointer->Z) ||
-					isnan(bitangentPointer->X) || isnan(bitangentPointer->Y) || isnan(bitangentPointer->Z))
-				{
-					//assert(mesh->HasNormals());
-					auto normalPointer = ((Vector3*)(vbPointer + normalOffset));
-					Vector3 c1 = Vector3::Cross(*normalPointer, Vector3(0.0, 0.0, 1.0));
-					Vector3 c2 = Vector3::Cross(*normalPointer, Vector3(0.0, 1.0, 0.0));
-
-					if (c1.LengthSquared() > c2.LengthSquared())
-						*tangentPointer = c1;
-					else
-						*tangentPointer = c2;
-					*bitangentPointer = Vector3::Cross(*normalPointer, *tangentPointer);
-				}
-				tangentPointer->Normalize();
-				bitangentPointer->Normalize();
-			}
-
-			if (vertexIndexToBoneIdWeight.size() > 0)
-			{
-				for(int bone=0; bone<nbBonesByVertex; ++bone)
-				{
-					if (controlPointIndices16)
-					{
-						if (AllowUnsignedBlendIndices)
-							((unsigned short*)(vbPointer + blendIndicesOffset))[bone] = (unsigned short)vertexIndexToBoneIdWeight[i][bone].first;
-						else
-							((short*)(vbPointer + blendIndicesOffset))[bone] = (short)vertexIndexToBoneIdWeight[i][bone].first;
-					}
-					else
-					{
-						if (AllowUnsignedBlendIndices)
-							((unsigned char*)(vbPointer + blendIndicesOffset))[bone] = (unsigned char)vertexIndexToBoneIdWeight[i][bone].first;
-						else
-							((char*)(vbPointer + blendIndicesOffset))[bone] = (char)vertexIndexToBoneIdWeight[i][bone].first;
-					}
-					((float*)(vbPointer + blendWeightOffset))[bone] = vertexIndexToBoneIdWeight[i][bone].second;
-				}
-			}
-			vbPointer += vertexStride;
-		}
-
-		// Build the indices data buffer
-		const int nbIndices = 3 * mesh->mNumFaces;
-		array<Byte>^ indexBuffer;
-		bool is32BitIndex = mesh->mNumVertices > 65535;
-		if (is32BitIndex)
-			indexBuffer = gcnew array<Byte>(sizeof(unsigned int) * nbIndices);
-		else
-			indexBuffer = gcnew array<Byte>(sizeof(unsigned short) * nbIndices);
-
-		pin_ptr<Byte> ibPointer = &indexBuffer[0];
-		for (unsigned int i = 0; i < mesh->mNumFaces; i++)
-		{
-			if (is32BitIndex)
-			{
-				for (int j = 0; j < 3; ++j)
-				{
-					*((unsigned int*)ibPointer) = mesh->mFaces[i].mIndices[j];
-					ibPointer += sizeof(unsigned int);
-				}
-			}
-			else
-			{
-				for (int j = 0; j < 3; ++j)
-				{
-					*((unsigned short*)ibPointer) = (unsigned short)(mesh->mFaces[i].mIndices[j]);
-					ibPointer += sizeof(unsigned short);
-				}
-			}
-		}
-
-		// Build the mesh data
-		auto vertexDeclaration = gcnew VertexDeclaration(vertexElements->ToArray());
-		auto vertexBufferBinding = VertexBufferBinding(GraphicsSerializerExtensions::ToSerializableVersion(gcnew BufferData(BufferFlags::VertexBuffer, vertexBuffer)), vertexDeclaration, mesh->mNumVertices, vertexDeclaration->VertexStride, 0);
-		auto indexBufferBinding = gcnew IndexBufferBinding(GraphicsSerializerExtensions::ToSerializableVersion(gcnew BufferData(BufferFlags::IndexBuffer, indexBuffer)), is32BitIndex, nbIndices, 0);
-
-		auto drawData = gcnew MeshDraw();
-		auto vbb = gcnew List<VertexBufferBinding>();
-		vbb->Add(vertexBufferBinding);
-		drawData->VertexBuffers = vbb->ToArray();
-		drawData->IndexBuffer = indexBufferBinding;
-		drawData->PrimitiveType = PrimitiveType::TriangleList;
-		drawData->DrawCount = nbIndices;
-
-		auto meshInfo = gcnew MeshInfo();
-		meshInfo->Draw = drawData;
-		meshInfo->Name = gcnew String(meshNames[mesh].c_str());
-		meshInfo->Bones = bones;
-		meshInfo->MaterialIndex = mesh->mMaterialIndex;
-		meshInfo->HasSkinningPosition = hasSkinningPosition;
-		meshInfo->HasSkinningNormal = hasSkinningNormal;
-		meshInfo->TotalClusterCount = totalClusterCount;
-		
-		return meshInfo;
-	}
-
-	// Register all the nodes in dictionnaries
-	void RegisterNodes(aiNode* fromNode, int parentIndex, std::map<aiNode*, std::string>& nodeNames, std::map<int, std::vector<int>*>& meshIndexToNodeIndex)
-	{
-		int nodeIndex = nodes.Count;
-
-		// assign the index of the node to the index of the mesh
-		for(unsigned int m=0; m<fromNode->mNumMeshes; ++m)
-		{
-			int meshIndex = fromNode->mMeshes[m];
-
-			if (meshIndexToNodeIndex.find(meshIndex) == meshIndexToNodeIndex.end())
-				meshIndexToNodeIndex[meshIndex] = new std::vector<int>();
-			meshIndexToNodeIndex[meshIndex]->push_back(nodeIndex);
-		}
-
-		// Create node
-		ModelNodeDefinition modelNodeDefinition;
-		modelNodeDefinition.ParentIndex = parentIndex;
-		modelNodeDefinition.Name = gcnew String(nodeNames[fromNode].c_str());
-		modelNodeDefinition.Flags = ModelNodeFlags::Default;
-
-		// Extract scene scaling and rotation from the root node.
-		// Bake scaling into all node's positions and rotation into the 1st-level nodes.
-		if (parentIndex == -1)
-		{
-			Vector3 rootTranslation;
-			rootTransform = aiMatrixToMatrix(fromNode->mTransformation);
-			rootTransform.Decompose(rootScaling, rootOrientation, rootTranslation);
-			rootTransformInverse = Matrix::Invert(rootTransform);
-			rootOrientationInverse = Quaternion::Invert(rootOrientation);
-
-			modelNodeDefinition.Transform.Rotation = Quaternion::Identity;
-			modelNodeDefinition.Transform.Scale = Vector3::One;
-		}
-		else
-		{		
-			Vector3 scale;
-			Vector3 translation;
-			Quaternion rotation;
-
-			auto transform = Matrix::Invert(rootTransform) * aiMatrixToMatrix(fromNode->mTransformation) * rootTransform;
-			transform.Decompose(modelNodeDefinition.Transform.Scale, modelNodeDefinition.Transform.Rotation, modelNodeDefinition.Transform.Position);
-		}
-
-		nodes.Add(modelNodeDefinition);
-
-		// register the children
-		for(unsigned int child=0; child<fromNode->mNumChildren; ++child)
-		{
-			RegisterNodes(fromNode->mChildren[child], nodeIndex, nodeNames, meshIndexToNodeIndex);
-		}
-	}
-
-	void ProcessAnimationCurveVector(AnimationClip^ animationClip, const aiVectorKey* keys, unsigned int nbKeys, String^ partialTargetName, double ticksPerSec, bool isTranslation)
-	{
-		auto animationCurve = gcnew AnimationCurve<Vector3>();
-
-		// Switch to cubic implicit interpolation mode for Vector3
-		animationCurve->InterpolationType = AnimationCurveInterpolationType::Cubic;
-
-		CompressedTimeSpan lastKeyTime;
-
-		for(unsigned int keyId=0; keyId<nbKeys; ++keyId)
-		{
-			auto aiKey = keys[keyId];
-			KeyFrameData<Vector3> key;
-
-			key.Time = lastKeyTime = aiTimeToXkTimeSpan(aiKey.mTime, ticksPerSec);
-			key.Value = aiVector3ToVector3(aiKey.mValue);
-
-			if (isTranslation)
-			{
-				// Change of basis: key.Value = (rootTransformInverse * Matrix::Translation(key.Value) * rootTransform).TranslationVector;
-				Vector3::TransformCoordinate(key.Value, rootTransform, key.Value);
-			}
-			else
-			{
-				// Change of basis: key.Value = (rootTransformInverse * Matrix::Scaling(key.Value) * rootTransform).ScaleVector;
-				Vector3 scale = Vector3::One;
-				Vector3::TransformNormal(scale, rootTransformInverse, scale);
-				scale *= key.Value;
-				Vector3::TransformNormal(scale, rootTransform, key.Value);
-			}
-
-			animationCurve->KeyFrames->Add(key);
-			if(keyId == 0 || keyId == nbKeys-1) // discontinuity at animation first and last frame
-				animationCurve->KeyFrames->Add(key); // add 2 times the same frame at discontinuities to have null gradient
-		}
-
-		animationClip->AddCurve(partialTargetName, animationCurve, false);
-
-		if (nbKeys > 0)
-		{
-			if (animationClip->Duration < lastKeyTime)
-				animationClip->Duration = lastKeyTime;
-		}
-	}
-
-	void ProcessAnimationCurveQuaternion(AnimationClip^ animationClip, const aiQuatKey* keys, unsigned int nbKeys, String^ partialTargetName, double ticksPerSec)
-	{
-		auto animationCurve = gcnew AnimationCurve<Quaternion>();
-
-		CompressedTimeSpan lastKeyTime;
-
-		for(unsigned int keyId=0; keyId<nbKeys; ++keyId)
-		{
-			auto aiKey = keys[keyId];
-			KeyFrameData<Quaternion> key;
-			
-			key.Time = lastKeyTime = aiTimeToXkTimeSpan(aiKey.mTime, ticksPerSec);
-			key.Value = aiQuaternionToQuaternion(aiKey.mValue);
-
-			key.Value = rootOrientationInverse * key.Value * rootOrientation;
-			
-			animationCurve->KeyFrames->Add(key);
-		}
-
-		animationClip->AddCurve(partialTargetName, animationCurve, false);
-
-		if (nbKeys > 0)
-		{
-			if (animationClip->Duration < lastKeyTime)
-				animationClip->Duration = lastKeyTime;
-		}
-	}
-	
-	void ProcessNodeAnimation(Dictionary<String^, AnimationClip^>^ animationClips, const aiNodeAnim* nodeAnim, double ticksPerSec)
-	{
-		// Find the nodes on which the animation is performed
-		auto nodeName = aiStringToString(nodeAnim->mNodeName);
-
-		auto animationClip = gcnew AnimationClip();
-		
-		// The translation
-		ProcessAnimationCurveVector(animationClip, nodeAnim->mPositionKeys, nodeAnim->mNumPositionKeys, "Transform.Position", ticksPerSec, true);
-		// The rotation
-		ProcessAnimationCurveQuaternion(animationClip, nodeAnim->mRotationKeys, nodeAnim->mNumRotationKeys, "Transform.Rotation", ticksPerSec);
-		// The scales
-		ProcessAnimationCurveVector(animationClip, nodeAnim->mScalingKeys, nodeAnim->mNumScalingKeys, "Transform.Scale", ticksPerSec, false);
-
-		if (animationClip->Curves->Count > 0)
-			animationClips->Add(nodeName, animationClip);
-	}
-
-	Skeleton^ ProcessSkeleton(const aiScene* scene)
-	{
-		std::map<aiNode*, std::string> nodeNames;
-		GenerateNodeNames(scene, nodeNames);
-
-		// register the nodes and fill hierarchy
-		std::map<int, std::vector<int>*> meshIndexToNodeIndex;
-		RegisterNodes(scene->mRootNode, -1, nodeNames, meshIndexToNodeIndex);
-
-		auto skeleton = gcnew Skeleton();
-		skeleton->Nodes = nodes.ToArray();
-
-		return skeleton;
-	}
-
-	AnimationInfo^ ProcessAnimation(const aiScene* scene)
-	{
-		auto animationData = gcnew AnimationInfo();
-		std::set<std::string> visitedNodeNames;
-
-		if (scene->mNumAnimations > 1)
-			Logger->Warning(String::Format("There is {0} animations in this file, using only the first one.", scene->mNumAnimations),
-				CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-
-		std::map<aiNode*, std::string> nodeNames;
-		GenerateNodeNames(scene, nodeNames);
-
-		// register the nodes and fill hierarchy
-		std::map<int, std::vector<int>*> meshIndexToNodeIndex;
-		RegisterNodes(scene->mRootNode, -1, nodeNames, meshIndexToNodeIndex);
-
-		for (unsigned int i = 0; i < min(1, scene->mNumAnimations); ++i)
-		{
-			auto aiAnim = scene->mAnimations[i];
-
-			// animation speed
-			auto ticksPerSec = aiAnim->mTicksPerSecond;
-
-			animationData->Duration = aiTimeToXkTimeSpan(aiAnim->mDuration, ticksPerSec);
-
-			// Assimp animations have two different channels of animations ((1) on Nodes, (2) on Meshes).
-			// Nevertheless the second one do not seems to be usable in assimp 3.0 so it will be ignored here.
-
-			// name of the animation (dropped)
-			auto animName = aiStringToString(aiAnim->mName); // used only be the logger
-
-			// animation using meshes (not supported)
-			for(unsigned int meshAnimId = 0; meshAnimId<aiAnim->mNumMeshChannels; ++meshAnimId)
-			{
-				auto meshName = aiStringToString(aiAnim->mMeshChannels[meshAnimId]->mName);
-				Logger->Warning(String::Format("Mesh animation are not currently supported. Animation '{0}' on mesh {1} will be ignored", animName, meshName),
-								CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-			}
-
-			// animation on nodes
-			for(unsigned int nodeAnimId=0; nodeAnimId<aiAnim->mNumChannels; ++nodeAnimId)
-			{
-				auto nodeAnim = aiAnim->mChannels[nodeAnimId];
-				auto nodeName = std::string(nodeAnim->mNodeName.C_Str());
-				if (visitedNodeNames.find(nodeName) == visitedNodeNames.end())
-				{
-					visitedNodeNames.insert(nodeName);
-					ProcessNodeAnimation(animationData->AnimationClips, nodeAnim, ticksPerSec);
-				}
-				else
-				{
-					Logger->Error(String::Format("Animation '{0}' uses two nodes with the same name ({1}). The animation cannot be resolved.", animName, aiStringToString(nodeAnim->mNodeName)),
-								  CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-					return nullptr;
-				}
-			}
-		}
-		return animationData;
-	}
-
-	ComputeTextureColor^ GetTextureReferenceNode(String^ vfsOutputPath, String^ sourceTextureFile, size_t textureUVSetIndex, Vector2 textureUVscaling, TextureAddressMode addressModeU, TextureAddressMode addressModeV, MaterialAsset^ finalMaterial, Xenko::Core::Diagnostics::Logger^ logger)
-	{
-		// TODO: compare with FBX importer - see if there could be some conflict between texture names
-		auto textureValue = TextureLayerGenerator::GenerateMaterialTextureNode(vfsOutputPath, sourceTextureFile, textureUVSetIndex, textureUVscaling, addressModeU, addressModeV, Logger);
-
-		auto attachedReference = AttachedReferenceManager::GetAttachedReference(textureValue->Texture);
-		auto referenceName = attachedReference->Url;
-
-		// find a new and correctName
-		if (!textureNameCount->ContainsKey(referenceName))
-			textureNameCount->Add(referenceName, 1);
-		else
-		{
-			int count = textureNameCount[referenceName];
-			textureNameCount[referenceName] = count + 1;
-			referenceName = String::Concat(referenceName, "_", count);
-		}
-
-		return textureValue;
-	}
-
-	IComputeColor^ GenerateOneTextureTypeLayers(aiMaterial* pMat, aiTextureType textureType, int& textureCount, Xenko::Assets::Materials::MaterialAsset^ finalMaterial)
-	{
-		AssimpNet::Material::Stack^ stack = NetTranslation::Materials::convertAssimpStackCppToCs(pMat, textureType);
-		int set;
-		System::Collections::Stack^ compositionFathers = gcnew System::Collections::Stack();
-		std::stack<int> sets;
-
-		sets.push(0);
-		auto nbTextures = pMat->GetTextureCount(textureType);
-		IComputeColor^ curComposition = nullptr, ^ newCompositionFather = nullptr;
-		IComputeColor^ curCompositionFather = nullptr;
-
-		bool isRootElement = true;
-		IComputeColor^ rootMaterial = nullptr;
-
-		while (!stack->IsEmpty)
-		{
-			auto top = stack->Pop();
-
-			if (!isRootElement)
-			{
-				if (compositionFathers->Count == 0)
-					Logger->Error("Texture Stack Invalid : Operand without Operation.", (CallerInfo^)nullptr);
-
-				curCompositionFather = (IComputeColor^)compositionFathers->Pop();
-			}
-
-			set = sets.top();
-			sets.pop();
-			auto type = top->type;
-			auto strength = top->blend;
-			auto alpha = top->alpha;
-			
-			if (type == AssimpNet::Material::StackType::Operation)
-			{
-				auto realTop = (AssimpNet::Material::StackOperation^) top;
-				AssimpNet::Material::Operation op = realTop->operation;
-				auto binNode = gcnew ComputeBinaryColor(nullptr, nullptr, BinaryOperator::Add);
-
-				switch (op)
-				{
-					case AssimpNet::Material::Operation::Add3ds:
-					case AssimpNet::Material::Operation::AddMaya:
-						binNode->Operator = BinaryOperator::Add; //BinaryOperator::Add3ds;
-						break;
-					case AssimpNet::Material::Operation::Multiply3ds:
-					case AssimpNet::Material::Operation::MultiplyMaya:
-						binNode->Operator = BinaryOperator::Multiply;
-						break;
-					default:
-						binNode->Operator = BinaryOperator::Add;
-						break;
-				}
-
-				curComposition = binNode;
-			}
-			else if (type == AssimpNet::Material::StackType::Color)
-			{
-				auto realTop = (AssimpNet::Material::StackColor^)top;
-				Color3 col = realTop->color;
-				curComposition = gcnew ComputeColor(Color4(col.R, col.G, col.B, alpha));
-			}
-			else if (type == AssimpNet::Material::StackType::Texture)
-			{
-				auto realTop = (AssimpNet::Material::StackTexture^)top;
-				String ^texPath = realTop->texturePath;
-				int indexUV = realTop->channel;
-				auto textureValue = GetTextureReferenceNode(vfsOutputFilename, texPath, indexUV, Vector2::One, ConvertTextureMode(realTop->mappingModeU), ConvertTextureMode(realTop->mappingModeV), finalMaterial, Logger);
-				curComposition = textureValue;
-			}
-			
-			newCompositionFather = curComposition;
-			
-			if (strength != 1.f)
-			{
-				float strengthAlpha = strength;
-				if (type != AssimpNet::Material::StackType::Color)
-					strengthAlpha *= alpha;
-				
-				
-				auto factorComposition = gcnew ComputeFloat4(Vector4(strength, strength, strength, strengthAlpha));
-				curComposition = gcnew ComputeBinaryColor(curComposition, factorComposition, BinaryOperator::Multiply);
-			}
-			else if (alpha != 1.f && type != AssimpNet::Material::StackType::Color)
-			{
-				auto factorComposition = gcnew ComputeFloat4(Vector4(1.0f, 1.0f, 1.0f, alpha));
-				curComposition = gcnew ComputeBinaryColor(curComposition, factorComposition, BinaryOperator::Multiply);
-			}
-
-			if (isRootElement)
-			{
-				rootMaterial = curComposition;
-				isRootElement = false;
-				compositionFathers->Push(curCompositionFather);
-			}
-			else
-			{
-				if (set == 0)
-				{
-					((ComputeBinaryColor^)curCompositionFather)->LeftChild = curComposition;
-					compositionFathers->Push(curCompositionFather);
-					sets.push(1);
-				}
-				else if (set == 1)
-				{
-					((ComputeBinaryColor^)curCompositionFather)->RightChild = curComposition;
-				}
-				else
-				{
-					Logger->Error(String::Format("Texture Stack Invalid : Invalid Operand Number {0}.", set), (CallerInfo^)nullptr);
-				}	
-			}
-
-			if (type == AssimpNet::Material::StackType::Operation)
-			{
-				compositionFathers->Push(newCompositionFather);
-				sets.push(0);
-			}
-		}
-
-		return rootMaterial;
-	}
-
-	static TextureAddressMode ConvertTextureMode(MappingMode mappingMode)
-	{
-		switch (mappingMode)
-		{
-		case MappingMode::Clamp:
-			return TextureAddressMode::Clamp;
-		case MappingMode::Decal:
-			return TextureAddressMode::Border;
-		case MappingMode::Mirror:
-			return TextureAddressMode::Mirror;
-		default:
-		case MappingMode::Wrap:
-			return TextureAddressMode::Wrap;
-		}
-	}
-
-	void BuildLayeredSurface(aiMaterial* pMat, bool hasBaseColor, bool hasBaseValue, Color4 baseColor, float baseValue, aiTextureType textureType, Xenko::Assets::Materials::MaterialAsset^ finalMaterial)
-	{
-		auto nbTextures = pMat->GetTextureCount(textureType);
-		
-		IComputeColor^ computeColorNode;
-		int textureCount = 0;
-		if (nbTextures == 0)
-		{
-			if (hasBaseColor)
-			{
-				computeColorNode = gcnew ComputeColor(baseColor);
-			}
-			//else if (hasBaseValue)
-			//{
-			//	computeColorNode = gcnew MaterialFloatComputeNode(baseValue);
-			//}
-		}
-		else
-		{
-			computeColorNode = GenerateOneTextureTypeLayers(pMat, textureType, textureCount, finalMaterial);
-		}
-
-		if (computeColorNode == nullptr)
-		{
-			return;
-		}
-		
-		if (textureType == aiTextureType_DIFFUSE)
-		{
-			if (pMat->GetTextureCount(aiTextureType_LIGHTMAP) > 0)
-			{
-				auto lightMap = GenerateOneTextureTypeLayers(pMat, aiTextureType_LIGHTMAP, textureCount, finalMaterial);
-				if (lightMap != nullptr)
-					computeColorNode = gcnew ComputeBinaryColor(computeColorNode, lightMap, BinaryOperator::Add);
-			}
-
-			finalMaterial->Attributes->Diffuse = gcnew MaterialDiffuseMapFeature(computeColorNode);
-
-			// TODO TEMP: Set a default diffuse model
-			finalMaterial->Attributes->DiffuseModel = gcnew MaterialDiffuseLambertModelFeature();
-		}
-		else if (textureType == aiTextureType_SPECULAR)
-		{
-			auto specularFeature = gcnew MaterialSpecularMapFeature();
-			specularFeature->SpecularMap = computeColorNode;
-			finalMaterial->Attributes->Specular = specularFeature;
-
-			// TODO TEMP: Set a default specular model
-			auto specularModel = gcnew MaterialSpecularMicrofacetModelFeature();
-			specularModel->Fresnel = gcnew MaterialSpecularMicrofacetFresnelSchlick();
-			specularModel->Visibility = gcnew MaterialSpecularMicrofacetVisibilityImplicit();
-			specularModel->NormalDistribution = gcnew MaterialSpecularMicrofacetNormalDistributionBlinnPhong();
-			finalMaterial->Attributes->SpecularModel = specularModel;
-		}
-		else if (textureType == aiTextureType_EMISSIVE)
-		{
-			// TODO: Add support
-		}
-		else if (textureType == aiTextureType_AMBIENT)
-		{
-			// TODO: Add support
-		}
-		else if (textureType == aiTextureType_REFLECTION)
-		{
-			// TODO: Add support
-		}
-		if (textureType == aiTextureType_OPACITY)
-		{
-			// TODO: Add support
-		}
-		else if (textureType == aiTextureType_SHININESS)
-		{
-			// TODO: Add support
-		}
-		if (textureType == aiTextureType_SPECULAR)
-		{
-			// TODO: Add support
-		}
-		else if (textureType == aiTextureType_NORMALS)
-		{
-			finalMaterial->Attributes->Surface = gcnew MaterialNormalMapFeature(computeColorNode);
-		}
-		else if (textureType == aiTextureType_DISPLACEMENT)
-		{
-			// TODO: Add support
-		}
-		else if (textureType == aiTextureType_SHININESS)
-		{
-			// TODO: Add support
-		}
-		else if (textureType == aiTextureType_HEIGHT)
-		{
-			// TODO: Add support
-		}
-	}
-	
-	MaterialAsset^ ProcessMeshMaterial(aiMaterial* pMaterial)
-	{
-		auto finalMaterial = gcnew MaterialAsset();
-
-		// Set material specular components
-		float specIntensity;
-		if (AI_SUCCESS == pMaterial->Get(AI_MATKEY_SHININESS_STRENGTH, specIntensity))
-		{
-			if (specIntensity > 0)
-			{
-				// TODO: Add Specular Intensity
-				//auto specularIntensityMap = gcnew MaterialFloatComputeColor(specIntensity);
-				//specularIntensityMap->Key = MaterialKeys::SpecularIntensity;
-				//specularIntensityMap->AutoAssignKey = false;
-				//specularIntensityMap->IsReducible = false;
-				//finalMaterial->AddColorNode(MaterialParameters::SpecularIntensityMap, "specularIntensity", specularIntensityMap);
-			}
-		}
-
-		//// ---------------------------------------------------------------------------------
-  //      // Iterate on all custom Xenko Properties and add them to the mesh.
-  //      // Key must be in the format: Xenko_KeyName
-  //      // ---------------------------------------------------------------------------------
-		//for(unsigned int i = 0; i<pMaterial->mNumProperties; ++i)
-		//{
-		//	auto pProp = pMaterial->mProperties[i];
-		//	auto propertyName = aiStringToString(pProp->mKey);
-  //          if (propertyName->StartsWith("PX_")) 
-		//	{
-  //              int index = propertyName->IndexOf('_');
-  //              propertyName = propertyName->Substring(index);
-  //              propertyName = propertyName->Replace('_','.');
-  //              // TODO Xenko Change name 
-  //              propertyName = gcnew String("Xenko.Rendering") + propertyName;
-
-		//		switch (pProp->mDataLength)
-		//		{
-  //                  case sizeof(double):
-  //                      {
-		//					auto value = *((double*)pProp->mData);
-//							ValueParameterKey<float>^ key = gcnew ValueParameterKey<float>(propertyName, 1);
-  //                          finalMaterial->SetParameter(key, (float)value);
-  //                      }
-  //                      break;
-  //                  case 3*sizeof(double):
-  //                      {
-  //                          auto value = (double*)pProp->mData;
-//                            ValueParameterKey<Vector3>^ key = gcnew ValueParameterKey<Vector3>(propertyName, 1);
-  //                          finalMaterial->SetParameter(key, Vector3((float)value[0], (float)value[1], (float)value[2]));
-  //                      }
-  //                      break;
-  //                  default:
-  //                      Console::WriteLine("Warning, Type for property [{0}] is not supported", propertyName);
-  //                      break;
-  //              }
-  //          }
-		//}
-
-		// Build the material Diffuse, Specular, NormalMap and DisplacementColor surfaces.
-		aiColor3D color;
-		Color4 diffColor;
-		Color4 specColor;
-		Color4 ambientColor;
-		Color4 emissiveColor;
-		Color4 reflectiveColor;
-		Color4 dummyColor;
-		float specPower;
-		float opacity;
-
-		bool hasDiffColor = false;
-		bool hasSpecColor = false;
-		bool hasAmbientColor = false;
-		bool hasEmissiveColor = false;
-		bool hasReflectiveColor = false;
-		bool hasSpecPower = false;
-		bool hasOpacity = false;
-
-		if(pMaterial->Get(AI_MATKEY_COLOR_DIFFUSE, color) == AI_SUCCESS) // always keep black color for diffuse
-		{
-			diffColor = aiColor3ToColor4(color);
-			hasDiffColor = true;
-		}
-		if(pMaterial->Get(AI_MATKEY_COLOR_SPECULAR, color) == AI_SUCCESS && IsNotBlackColor(color))
-		{
-			specColor = aiColor3ToColor4(color);
-			hasSpecColor = true;
-		}
-		if(pMaterial->Get(AI_MATKEY_COLOR_AMBIENT, color) == AI_SUCCESS && IsNotBlackColor(color))
-		{
-			ambientColor = aiColor3ToColor4(color);
-			hasAmbientColor = true;
-		}
-		if(pMaterial->Get(AI_MATKEY_COLOR_EMISSIVE, color) == AI_SUCCESS && IsNotBlackColor(color))
-		{
-			emissiveColor = aiColor3ToColor4(color);
-			hasEmissiveColor = true;
-		}
-		if(pMaterial->Get(AI_MATKEY_COLOR_REFLECTIVE, color) == AI_SUCCESS && IsNotBlackColor(color))
-		{
-			reflectiveColor = aiColor3ToColor4(color);
-			hasReflectiveColor = true;
-		}
-
-		hasSpecPower = (AI_SUCCESS == pMaterial->Get(AI_MATKEY_SHININESS, specPower) && specPower > 0);
-		if(pMaterial->Get(AI_MATKEY_OPACITY, opacity) == AI_SUCCESS && opacity < 1.0)
-		{
-			//finalMaterial->Parameters->Set(MaterialKeys::HasTransparency, true);
-			hasOpacity = true;
-		}
-
-		BuildLayeredSurface(pMaterial, hasDiffColor, false, diffColor, 0.0f, aiTextureType_DIFFUSE, finalMaterial);
-		BuildLayeredSurface(pMaterial, hasSpecColor, false, specColor, 0.0f, aiTextureType_SPECULAR, finalMaterial);
-		BuildLayeredSurface(pMaterial, false, false, dummyColor, 0.0f, aiTextureType_NORMALS, finalMaterial);
-		BuildLayeredSurface(pMaterial, false, false, dummyColor, 0.0f, aiTextureType_DISPLACEMENT, finalMaterial);
-		BuildLayeredSurface(pMaterial, hasAmbientColor, false, ambientColor, 0.0f, aiTextureType_AMBIENT, finalMaterial);
-		BuildLayeredSurface(pMaterial, false, hasOpacity, dummyColor, opacity, aiTextureType_OPACITY, finalMaterial);
-		BuildLayeredSurface(pMaterial, false, hasSpecPower, dummyColor, specPower, aiTextureType_SHININESS, finalMaterial);
-		BuildLayeredSurface(pMaterial, hasEmissiveColor, false, emissiveColor, 0.0f, aiTextureType_EMISSIVE, finalMaterial);
-		BuildLayeredSurface(pMaterial, false, false, dummyColor, 0.0f, aiTextureType_HEIGHT, finalMaterial);
-		BuildLayeredSurface(pMaterial, hasReflectiveColor, false, reflectiveColor, 0.0f, aiTextureType_REFLECTION, finalMaterial);
-
-		return finalMaterial;
-	}
-
-	bool IsNotBlackColor(aiColor3D color)
-	{
-		return color.r != 0 || color.g != 0 || color.b != 0;
-	}
-	
-	template<class T>
-	void GenerateUniqueNames(std::map<T*, std::string>& finalNames, std::vector<std::string>& baseNames, T** objectsToName)
-	{
-		std::map<std::string, int> itemNameTotalCount;
-		std::map<std::string, int> itemNameCurrentCount;
-		std::vector<std::string> tempNames;
-
-		for (int i = 0; i < baseNames.size(); ++i)
-		{
-			// Clean the name by removing unwanted characters
-			T* lItem = objectsToName[i];
-			std::string itemName = baseNames[i];
-
-			auto itemPart = std::string();
-
-			size_t itemNameSplitPosition = itemName.find('#');
-			if (itemNameSplitPosition != std::string::npos)
-			{
-				itemPart = itemName.substr(itemNameSplitPosition + 1);
-				itemName = itemName.substr(0, itemNameSplitPosition);
-			}
-
-			itemNameSplitPosition = itemNameSplitPosition = itemName.find("__");
-			if (itemNameSplitPosition != std::string::npos)
-			{
-				itemPart = itemName.substr(itemNameSplitPosition + 2);
-				itemName = itemName.substr(0, itemNameSplitPosition);
-			}
-
-			// remove all bad characters
-			ReplaceCharacter(itemName, ':', '_');
-			RemoveCharacter(itemName, ' ');
-			tempNames.push_back(itemName);
-
-			// count the occurences of this name
-			if (itemNameTotalCount.count(itemName) == 0)
-				itemNameTotalCount[itemName] = 1;
-			else
-				itemNameTotalCount[itemName] = itemNameTotalCount[itemName] + 1;
-		}
-
-		for (int i = 0; i < baseNames.size(); ++i)
-		{
-			T* lItem = objectsToName[i];
-			auto itemName = tempNames[i];
-			int currentCount = 0;
-
-			if (itemNameTotalCount[itemName] > 1)
-			{
-				if (itemNameCurrentCount.count(itemName) == 0)
-					itemNameCurrentCount[itemName] = 1;
-				else
-					itemNameCurrentCount[itemName] = itemNameCurrentCount[itemName] + 1;
-
-				itemName = itemName + "_" + std::to_string(itemNameCurrentCount[itemName]);
-			}
-
-			finalNames[lItem] = itemName;
-		}
-	}
-
-	void GenerateMaterialNames(const aiScene* scene, std::map<aiMaterial*, std::string>& materialNames)
-	{
-		std::vector<std::string> baseNames;
-		for (uint32_t i = 0;  i < scene->mNumMaterials; i++)
-		{
-			auto lMaterial = scene->mMaterials[i];
-			
-			aiString aiName;
-			auto materialName = (lMaterial->Get(AI_MATKEY_NAME, aiName) == AI_SUCCESS)
-				? std::string(aiName.C_Str())
-				: "Material";
-			baseNames.push_back(materialName);
-		}
-
-		GenerateUniqueNames(materialNames, baseNames, scene->mMaterials);
-	}
-
-	void GenerateMeshNames(const aiScene* scene, std::map<aiMesh*, std::string>& meshNames)
-	{
-		std::vector<std::string> baseNames;
-		for (uint32_t i = 0; i < scene->mNumMeshes; i++)
-		{
-			auto lMesh = scene->mMeshes[i];
-			std::string meshName = std::string(lMesh->mName.C_Str());
-			baseNames.push_back(meshName);
-		}
-
-		GenerateUniqueNames(meshNames, baseNames, scene->mMeshes);
-	}
-
-	void GenerateAnimationNames(const aiScene* scene, std::map<aiAnimation*, std::string>& animationNames)
-	{
-		std::vector<std::string> baseNames;
-		for (uint32_t i = 0; i < scene->mNumAnimations; i++)
-		{
-			auto lAnimation = scene->mAnimations[i];
-			std::string animationName = std::string(lAnimation->mName.C_Str());
-			baseNames.push_back(animationName);
-		}
-
-		GenerateUniqueNames(animationNames, baseNames, scene->mAnimations);
-	}
-
-	void GetNodeNames(aiNode* node, std::vector<std::string>& nodeNames, std::vector<aiNode*>& orderedNodes)
-	{
-		nodeNames.push_back(std::string(node->mName.C_Str()));
-		orderedNodes.push_back(node);
-		for (uint32_t i = 0; i < node->mNumChildren; ++i)
-			GetNodeNames(node->mChildren[i], nodeNames, orderedNodes);
-	}
-
-	void GenerateNodeNames(const aiScene* scene, std::map<aiNode*, std::string>& nodeNames)
-	{
-		std::vector<std::string> baseNames;
-		std::vector<aiNode*> orderedNodes;
-		GetNodeNames(scene->mRootNode, baseNames, orderedNodes);
-
-		// Need to create the array of the nodes
-		size_t nodeCount = orderedNodes.size();
-		aiNode** nodeArray = new aiNode*[nodeCount];
-		for (size_t i = 0; i < nodeCount; ++i)
-			nodeArray[i] = orderedNodes[i];
-
-		GenerateUniqueNames(nodeNames, baseNames, nodeArray);
-
-		delete[] nodeArray;
-	}
-	
-	List<String^>^ ExtractTextureDependencies(const aiScene *scene)
-	{
-		auto textureNames = gcnew List<String^>();
-		
-		// get internal textures (not supported)
-		/*for(int i=0; i<scene->mNumTextures; ++i)
-		{
-			auto texture  = scene->mTextures[i];
-
-			if(texture == nullptr)
-				continue;
-			
-			//TODO: add material name
-			std::string baseName = "GenTexture";
-			baseName.append(std::to_string(i));
-			
-			textureNames->Add(gcnew String(baseName.c_str()));
-		}*/
-		
-		// texture search is done by type so we need to loop on them
-		std::vector<aiTextureType> allTextureTypes;
-		allTextureTypes.push_back(aiTextureType_DIFFUSE);
-		allTextureTypes.push_back(aiTextureType_SPECULAR);
-		allTextureTypes.push_back(aiTextureType_AMBIENT);
-		allTextureTypes.push_back(aiTextureType_EMISSIVE);
-		allTextureTypes.push_back(aiTextureType_HEIGHT);
-		allTextureTypes.push_back(aiTextureType_NORMALS);
-		allTextureTypes.push_back(aiTextureType_SHININESS);
-		allTextureTypes.push_back(aiTextureType_OPACITY);
-		allTextureTypes.push_back(aiTextureType_DISPLACEMENT);
-		allTextureTypes.push_back(aiTextureType_LIGHTMAP);
-		allTextureTypes.push_back(aiTextureType_REFLECTION);
-		//allTextureTypes.push_back(aiTextureType_NONE);
-		//allTextureTypes.push_back(aiTextureType_UNKNOWN);
-		
-		for (uint32_t i = 0; i < scene->mNumMaterials; i++)
-		{
-			for (std::vector<aiTextureType>::iterator it = allTextureTypes.begin(); it != allTextureTypes.end(); ++it)
-			{
-				auto lMaterial = scene->mMaterials[i];
-				auto nbTextures = lMaterial->GetTextureCount(*it);
-				for (uint32_t j = 0; j < nbTextures; ++j)
-				{
-					aiString path;
-					aiTextureMapping mapping;
-					unsigned int index;
-					float blend;
-					aiTextureOp textureOp;
-					aiTextureMapMode mapMode;
-					if (AI_SUCCESS == lMaterial->GetTexture(*it, 0, &path, &mapping, &index, &blend, &textureOp, &mapMode))
-					{
-						auto relFileName = gcnew String(path.C_Str());
-						String^ fileNameToUse = Path::Combine(vfsInputPath, relFileName);
-						textureNames->Add(fileNameToUse);
-						break;
-					}
-				}
-			}
-		}
-
-		return textureNames;
-	}
-
-	Dictionary<String^, MaterialAsset^>^ ExtractMaterials(const aiScene *scene, std::map<aiMaterial*, std::string>& materialNames)
-	{
-		GenerateMaterialNames(scene, materialNames);
-		
-		auto materials = gcnew Dictionary<String^, MaterialAsset^>();
-		for (uint32_t i = 0; i < scene->mNumMaterials; i++)
-		{
-			std::map<std::string, int> dict;
-			auto lMaterial = scene->mMaterials[i];
-			auto materialName = materialNames[lMaterial];
-			materials->Add(gcnew String(materialName.c_str()), ProcessMeshMaterial(lMaterial));
-		}
-		return materials;
-	}
-
-	String^ SearchMeshNode(aiNode* node, unsigned int meshIndex, std::map<aiNode*, std::string>& nodeNames)
-	{
-		for (uint32_t i = 0; i < node->mNumMeshes; ++i)
-		{
-			if (node->mMeshes[i] == meshIndex)
-				return gcnew String(nodeNames[node].c_str());
-		}
-
-		for (uint32_t i = 0; i < node->mNumChildren; ++i)
-		{
-			auto res = SearchMeshNode(node->mChildren[i], meshIndex, nodeNames);
-			if (res != nullptr)
-				return res;
-		}
-
-		return nullptr;
-	}
-
-	List<MeshParameters^>^ ExtractModel(const aiScene* scene, std::map<aiMesh*, std::string>& meshNames, std::map<aiMaterial*, std::string>& materialNames, std::map<aiNode*, std::string>& nodeNames)
-	{
-		GenerateMeshNames(scene, meshNames);
-		
-		auto meshList = gcnew List<MeshParameters^>();
-		for (uint32_t i = 0; i < scene->mNumMeshes; ++i)
-		{
-			auto mesh = scene->mMeshes[i];
-			auto meshParams = gcnew MeshParameters();
-			meshParams->MeshName = gcnew String(meshNames[mesh].c_str());
-			auto lMaterial = scene->mMaterials[mesh->mMaterialIndex];
-			meshParams->MaterialName = gcnew String(materialNames[lMaterial].c_str());
-			meshParams->NodeName = SearchMeshNode(scene->mRootNode, i, nodeNames);
-			meshList->Add(meshParams);
-		}
-		return meshList;
-	}
-
-	List<String^>^ ExtractAnimations(const aiScene* scene, std::map<aiAnimation*, std::string>& animationNames)
-	{
-		if (scene->mNumAnimations == 0)
-			return nullptr;
-
-		GenerateAnimationNames(scene, animationNames);
-		
-		auto animationList = gcnew List<String^>();
-		for (std::map<aiAnimation*, std::string>::iterator it = animationNames.begin(); it != animationNames.end(); ++it)
-		{
-			animationList->Add(gcnew String(it->second.c_str()));
-		}
-		return animationList;
-	}
-	
-	Model^ ConvertAssimpScene(const aiScene *scene)
-	{
-		modelData = gcnew Model();
-
-		std::map<aiMesh*, std::string> meshNames;
-		GenerateMeshNames(scene, meshNames);
-
-		std::map<aiNode*, std::string> nodeNames;
-		GenerateNodeNames(scene, nodeNames);
-
-		// register the nodes and fill hierarchy
-		std::map<int, std::vector<int>*> meshIndexToNodeIndex;
-
-		RegisterNodes(scene->mRootNode, -1, nodeNames, meshIndexToNodeIndex);
-
-		// meshes
-		for (unsigned int i = 0; i < scene->mNumMeshes; ++i)
-		{
-			if (meshIndexToNodeIndex.find(i) != meshIndexToNodeIndex.end())
-			{
-				auto meshInfo = ProcessMesh(scene, scene->mMeshes[i], meshNames);
-
-				for (std::vector<int>::iterator nodeIndexPtr = meshIndexToNodeIndex[i]->begin(); nodeIndexPtr != meshIndexToNodeIndex[i]->end(); ++nodeIndexPtr)
-				{
-					auto nodeMeshData = gcnew Mesh();
-					nodeMeshData->Draw = meshInfo->Draw;
-					nodeMeshData->Name = meshInfo->Name;
-					nodeMeshData->MaterialIndex = meshInfo->MaterialIndex;
-					nodeMeshData->NodeIndex = *nodeIndexPtr;
-
-					if (meshInfo->Bones != nullptr)
-					{
-						nodeMeshData->Skinning = gcnew MeshSkinningDefinition();
-						nodeMeshData->Skinning->Bones = meshInfo->Bones->ToArray();
-					}
-					if (meshInfo->HasSkinningPosition || meshInfo->HasSkinningNormal || meshInfo->TotalClusterCount > 0)
-					{
-						if (meshInfo->HasSkinningPosition)
-							nodeMeshData->Parameters->Set(MaterialKeys::HasSkinningPosition, true);
-						if (meshInfo->HasSkinningNormal)
-							nodeMeshData->Parameters->Set(MaterialKeys::HasSkinningNormal, true);
-					}
-					modelData->Meshes->Add(nodeMeshData);
-				}
-			}
-		}
-
-		// delete the vectors in the map
-		for (std::map<int, std::vector<int>*>::iterator it = meshIndexToNodeIndex.begin(); it != meshIndexToNodeIndex.end(); ++it)
-		{
-			delete it->second;
-			it->second = 0;
-		}
-
-		// embedded texture - only to log the warning for now
-		for (unsigned int i = 0; i < scene->mNumTextures; ++i)
-            ExtractEmbededTexture(scene->mTextures[i]);
-
-		return modelData;
-	}
-
-	void GetNodes(aiNode* node, int depth, std::map<aiNode*, std::string>& nodeNames, List<NodeInfo^>^ allNodes)
-	{
-		auto currentIndex = allNodes->Count;
-		auto newNodeInfo = gcnew NodeInfo();
-		newNodeInfo->Name = gcnew String(nodeNames[node].c_str());
-		newNodeInfo->Depth = depth;
-		newNodeInfo->Preserve = true;
-
-		allNodes->Add(newNodeInfo);
-		for (uint32_t i = 0; i < node->mNumChildren; ++i)
-			GetNodes(node->mChildren[i], depth + 1, nodeNames, allNodes);
-	}
-
-	List<NodeInfo^>^ ExtractNodeHierarchy(const aiScene *scene, std::map<aiNode*, std::string>& nodeNames)
-	{
-		auto allNodes = gcnew List<NodeInfo^>();
-		GetNodes(scene->mRootNode, 0, nodeNames, allNodes);
-		return allNodes;
-	}
-
-public:
-	EntityInfo^ ExtractEntity(String^ inputFilename, String^ outputFilename, bool extractTextureDependencies)
-	{
-		try
-		{
-			// the importer is kept here since it owns the scene object.
-			//TODO: check the options
-			Assimp::Importer importer;
-			auto scene = Initialize(inputFilename, outputFilename, &importer,
-				aiProcess_SortByPType
-					| aiProcess_RemoveRedundantMaterials);
-
-			// If scene is null, something went wrong inside Assimp
-			if (scene == nullptr)
-			{
-				if (strlen(importer.GetErrorString()) > 0)
-				{
-					// Extract error details from Assimp
-					auto error = gcnew String(importer.GetErrorString());
-					Logger->Error(String::Format("Assimp: {0}", error),
-						CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-				}
-				return nullptr;
-			}
-
-			std::map<aiMaterial*, std::string> materialNames;
-			std::map<aiMesh*, std::string> meshNames;
-			std::map<aiAnimation*, std::string> animationNames;
-			std::map<aiNode*, std::string> nodeNames;
-		
-			GenerateNodeNames(scene, nodeNames);
-
-			auto entityInfo = gcnew EntityInfo();
-			if (extractTextureDependencies)
-				entityInfo->TextureDependencies = ExtractTextureDependencies(scene);
-			entityInfo->Materials = ExtractMaterials(scene, materialNames);
-			entityInfo->Models = ExtractModel(scene, meshNames, materialNames, nodeNames);
-			entityInfo->Nodes = ExtractNodeHierarchy(scene, nodeNames);
-			entityInfo->AnimationNodes = ExtractAnimations(scene, animationNames);
-			
-			return entityInfo;
-		}
-		catch (Exception^)
-		{
-			return nullptr;
-		}
-	}
-
-	Model^ Convert(String^ inputFilename, String^ outputFilename)
-	{
-		// the importer is kept here since it owns the scene object.
-		Assimp::Importer importer;
-		auto scene = Initialize(inputFilename, outputFilename, &importer, 
-			aiProcess_CalcTangentSpace
-				| aiProcess_RemoveRedundantMaterials
-                | aiProcess_Triangulate
-				| aiProcess_GenNormals 
-                | aiProcess_JoinIdenticalVertices
-                | aiProcess_LimitBoneWeights
-                | aiProcess_SortByPType
-				| aiProcess_FlipWindingOrder
-				| aiProcess_FlipUVs );
-		return ConvertAssimpScene(scene);
-	}
-
-	AnimationInfo^ ConvertAnimation(String^ inputFilename, String^ outputFilename)
-	{
-		// the importer is kept here since it owns the scene object.
-		Assimp::Importer importer;
-		auto scene = Initialize(inputFilename, outputFilename, &importer, 0);
-		return ProcessAnimation(scene);
-	}
-
-	Skeleton^ ConvertSkeleton(String^ inputFilename, String^ outputFilename)
-	{
-		// the importer is kept here since it owns the scene object.
-		Assimp::Importer importer;
-		auto scene = Initialize(inputFilename, outputFilename, &importer, 0);
-		return ProcessSkeleton(scene);
-	}
-};
-
-}}}
diff --git a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.csproj b/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.csproj
new file mode 100644
index 0000000000..79fb033fae
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.csproj
@@ -0,0 +1,25 @@
+<Project>
+  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
+    <XenkoBuildTags>WindowsTools</XenkoBuildTags>
+    <XenkoAssemblyProcessorOptions />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Analysis\**" />
+    <EmbeddedResource Remove="Analysis\**" />
+    <None Remove="Analysis\**" />
+    <_SettingsFiles Remove="Analysis\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Silk.NET.Assimp" Version="2.22.0" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xenko.Importer.Common\Xenko.Importer.Common.csproj" />
+  </ItemGroup>
+  <Import Project="$(XenkoPostSettingsTargets)" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj b/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj
deleted file mode 100644
index 100cca716f..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <PropertyGroup>
-    <XenkoProjectType>Cpp</XenkoProjectType>
-    <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
-    <XenkoBuildTags>WindowsTools</XenkoBuildTags>
-    <XenkoAssemblyProcessorOptions>
-    </XenkoAssemblyProcessorOptions>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{C2306552-6C42-464C-8981-32FEF4F9458D}</ProjectGuid>
-    <Keyword>ManagedCProj</Keyword>
-    <RootNamespace>Xenko.Importer.Assimp</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CLRSupport>true</CLRSupport>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CLRSupport>true</CLRSupport>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>assimp-vc140-mt.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-    <CustomBuildStep>
-      <Command>xcopy /D /Y "..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll" "$(TargetDir)$(Platform)\"</Command>
-      <Outputs>$(TargetDir)$(Platform)\assimp-vc140-mt.dll;%(Outputs)</Outputs>
-      <Inputs>..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll</Inputs>
-      <TreatOutputAsContent>true</TreatOutputAsContent>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>assimp-vc140-mt.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>xcopy /D /Y "..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll" "$(TargetDir)$(Platform)\"</Command>
-      <Outputs>$(TargetDir)$(Platform)\assimp-vc140-mt.dll;%(Outputs)</Outputs>
-      <Inputs>..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll</Inputs>
-      <TreatOutputAsContent>true</TreatOutputAsContent>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>assimp-vc140-mt.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-      <AdditionalOptions>/ignore:4049 %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-    <CustomBuildStep>
-      <Command>xcopy /D /Y "..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll" "$(TargetDir)$(Platform)\"</Command>
-      <Outputs>$(TargetDir)$(Platform)\assimp-vc140-mt.dll;%(Outputs)</Outputs>
-      <Inputs>..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll</Inputs>
-      <TreatOutputAsContent>true</TreatOutputAsContent>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalIncludeDirectories>..\..\..\deps\assimp\include</AdditionalIncludeDirectories>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>assimp-vc140-mt.lib</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\deps\assimp\lib\x64\</AdditionalLibraryDirectories>
-    </Link>
-    <CustomBuildStep>
-      <Command>xcopy /D /Y "..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll" "$(TargetDir)$(Platform)\"</Command>
-      <Outputs>$(TargetDir)$(Platform)\assimp-vc140-mt.dll;%(Outputs)</Outputs>
-      <Inputs>..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll</Inputs>
-      <TreatOutputAsContent>true</TreatOutputAsContent>
-    </CustomBuildStep>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Xenko.Importer.Common\ImporterUtils.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="Stdafx.h" />
-    <ClInclude Include="UtilityFunctions.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AssemblyInfo.cpp" />
-    <ClCompile Include="Xenko.Importer.Assimp.cpp" />
-    <ClCompile Include="Stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="UtilityFunctions.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="app.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="app.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <XenkoNativeLib Include="..\..\..\deps\assimp\bin\x64\assimp-vc140-mt.dll">
-      <Link>x64\%(Filename)%(Extension)</Link>
-      <RelativePath>x64\%(Filename)%(Extension)</RelativePath>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </XenkoNativeLib>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\assets\Xenko.Core.Assets\Xenko.Core.Assets.csproj">
-      <Project>{1e54a9a2-4439-4444-ae57-6d2ed3c0dc47}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Design\Xenko.Core.Design.csproj">
-      <Project>{66581dad-70ad-4475-ae47-c6c0df1ec5e2}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Assets\Xenko.Assets.csproj">
-      <Project>{39ae9c77-e94b-404f-8768-b6261b3c1e0e}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Engine\Xenko.Engine.csproj">
-      <Project>{c121a566-555e-42b9-9b0a-1696529a9088}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Rendering\Xenko.Rendering.csproj">
-      <Project>{ad4fdc24-b64d-4ed7-91aa-62c9eda12fa4}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core\Xenko.Core.csproj">
-      <Project>{0e916ab7-5a6c-4820-8ab1-aa492fe66d68}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Graphics\Xenko.Graphics.csproj">
-      <Project>{fb06c76a-6bb7-40be-9afa-fec13b045fb5}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.IO\Xenko.Core.IO.csproj">
-      <Project>{1de01410-22c9-489b-9796-1addab1f64e5}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj">
-      <Project>{5210fb81-b807-49bb-af0d-31fb6a83a572}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\shaders\Xenko.Core.Shaders\Xenko.Core.Shaders.csproj">
-      <Project>{f2d52edb-bc17-4243-b06d-33cd20f87a7f}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj">
-      <Project>{1677b922-ccf0-44de-b57e-1cdd3d2b8e8a}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Shaders\Xenko.Shaders.csproj">
-      <Project>{273bdd15-7392-4078-91f0-af23594a3d7b}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko\Xenko.csproj">
-      <Project>{72390339-b2a1-4f61-a800-31ed0975b515}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Assimp.Translation\Xenko.Assimp.Translation.vcxproj">
-      <Project>{fcdf1b87-1c76-46eb-ad6a-d55ef5f195b8}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\buildengine\Xenko.Core.BuildEngine.Common\Xenko.Core.BuildEngine.Common.csproj">
-      <Project>{7732cb84-a39a-4adf-b740-fd32a352fa8a}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Assimp\Xenko.Assimp.csproj">
-      <Project>{f61d86b5-7c3d-4441-957d-a0a6d2fa69ca}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Importer.Common\Xenko.Importer.Common.vcxproj">
-      <Project>{43a6e62e-1b1c-4630-abb8-c3f716004645}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(XenkoPostSettingsTargets)" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj.filters b/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj.filters
deleted file mode 100644
index f695d9cef9..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/Xenko.Importer.Assimp.vcxproj.filters
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="UtilityFunctions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Xenko.Importer.Common\ImporterUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Xenko.Importer.Assimp.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AssemblyInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UtilityFunctions.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="app.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="app.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Assimp/app.ico b/sources/tools/Xenko.Importer.Assimp/app.ico
deleted file mode 100644
index 301942f607..0000000000
Binary files a/sources/tools/Xenko.Importer.Assimp/app.ico and /dev/null differ
diff --git a/sources/tools/Xenko.Importer.Assimp/app.rc b/sources/tools/Xenko.Importer.Assimp/app.rc
deleted file mode 100644
index eab43064f1..0000000000
Binary files a/sources/tools/Xenko.Importer.Assimp/app.rc and /dev/null differ
diff --git a/sources/tools/Xenko.Importer.Assimp/resource.h b/sources/tools/Xenko.Importer.Assimp/resource.h
deleted file mode 100644
index d5ac7c42aa..0000000000
--- a/sources/tools/Xenko.Importer.Assimp/resource.h
+++ /dev/null
@@ -1,3 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by app.rc
diff --git a/sources/tools/Xenko.Importer.Common/AnimationInfo.cs b/sources/tools/Xenko.Importer.Common/AnimationInfo.cs
new file mode 100644
index 0000000000..f09aa62134
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/AnimationInfo.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Animations;
+
+namespace Xenko.Importer.Common
+{
+    public class AnimationInfo
+    {
+        public TimeSpan Duration;
+        public Dictionary<string, AnimationClip> AnimationClips = new Dictionary<string, AnimationClip>();
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Common/AssemblyInfo.cpp b/sources/tools/Xenko.Importer.Common/AssemblyInfo.cpp
deleted file mode 100644
index 6eb7b98d07..0000000000
--- a/sources/tools/Xenko.Importer.Common/AssemblyInfo.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#include "stdafx.h"
-
-using namespace System;
-using namespace System::Reflection;
-using namespace System::Runtime::CompilerServices;
-using namespace System::Runtime::InteropServices;
-using namespace System::Security::Permissions;
-
-//
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly:AssemblyTitleAttribute("XenkoImporterCommon")];
-[assembly:AssemblyDescriptionAttribute("")];
-[assembly:AssemblyConfigurationAttribute("")];
-[assembly:AssemblyCompanyAttribute("")];
-[assembly:AssemblyProductAttribute("XenkoImporterCommon")];
-[assembly:AssemblyCopyrightAttribute("Copyright (c)  2013")];
-[assembly:AssemblyTrademarkAttribute("")];
-[assembly:AssemblyCultureAttribute("")];
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the value or you can default the Revision and Build Numbers
-// by using the '*' as shown below:
-
-[assembly:AssemblyVersionAttribute("1.0.*")];
-
-[assembly:ComVisible(false)];
-
-[assembly:CLSCompliantAttribute(true)];
diff --git a/sources/tools/Xenko.Importer.Common/EntityInfo.cs b/sources/tools/Xenko.Importer.Common/EntityInfo.cs
new file mode 100644
index 0000000000..32f000d269
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/EntityInfo.cs
@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using Xenko.Assets.Materials;
+
+namespace Xenko.Importer.Common
+{
+    public class EntityInfo
+    {
+        public List<string> TextureDependencies;
+        public Dictionary<string, MaterialAsset> Materials;
+        public List<string> AnimationNodes;
+        public List<MeshParameters> Models;
+        public List<NodeInfo> Nodes;
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Common/MeshMaterials.cs b/sources/tools/Xenko.Importer.Common/MeshMaterials.cs
new file mode 100644
index 0000000000..6bdaa687a7
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/MeshMaterials.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using Xenko.Assets.Materials;
+
+namespace Xenko.Importer.Common
+{
+    public class MeshMaterials
+    {
+        public Dictionary<string, MaterialAsset> Materials;
+	    public List<MeshParameters> Models;
+	    public List<String> BoneNodes;
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Common/MeshParameters.cs b/sources/tools/Xenko.Importer.Common/MeshParameters.cs
new file mode 100644
index 0000000000..45bcf86894
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/MeshParameters.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Xenko.Importer.Common
+{
+    public class MeshParameters
+    {
+        public string MaterialName;
+	    public string MeshName;
+	    public string NodeName;
+        public HashSet<string> BoneNodes;
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Common/NodeInfo.cs b/sources/tools/Xenko.Importer.Common/NodeInfo.cs
new file mode 100644
index 0000000000..b29572d68e
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/NodeInfo.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace Xenko.Importer.Common
+{
+    public class NodeInfo
+    {
+        public String Name;
+        public int Depth;
+        public bool Preserve;
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Common/Stdafx.cpp b/sources/tools/Xenko.Importer.Common/Stdafx.cpp
deleted file mode 100644
index de4bb56489..0000000000
--- a/sources/tools/Xenko.Importer.Common/Stdafx.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// Xenko.Importer.Assimp.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
diff --git a/sources/tools/Xenko.Importer.Common/Stdafx.h b/sources/tools/Xenko.Importer.Common/Stdafx.h
deleted file mode 100644
index 7e4cb2b912..0000000000
--- a/sources/tools/Xenko.Importer.Common/Stdafx.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently,
-// but are changed infrequently
-
-#pragma once
-
-#pragma warning( disable : 4945 )
-
-#include <string>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Common/TextureLayerGenerator.cs b/sources/tools/Xenko.Importer.Common/TextureLayerGenerator.cs
new file mode 100644
index 0000000000..5d05ee3471
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/TextureLayerGenerator.cs
@@ -0,0 +1,71 @@
+using System.IO;
+using Xenko.Core.Assets;
+using Xenko.Core.Diagnostics;
+using Xenko.Core.Mathematics;
+using Xenko.Core.Serialization;
+using Xenko.Graphics;
+using Xenko.Rendering;
+using Xenko.Rendering.Materials;
+using Xenko.Rendering.Materials.ComputeColors;
+using Xenko.Shaders;
+
+namespace Xenko.Importer.Common
+{
+    public class TextureLayerGenerator
+    {
+        public static ShaderClassSource GenerateTextureLayer(string vfsOutputPath, string sourceTextureFile, int textureUVSetIndex, Vector2 textureUVscaling,
+                                        ref int textureCount, ParameterKey<Texture> surfaceMaterialKey, Mesh meshData, Logger logger)
+        {
+            ParameterKey<Texture> parameterKey;
+
+            var url = vfsOutputPath + "_" + Path.GetFileNameWithoutExtension(sourceTextureFile);
+
+            if (File.Exists(sourceTextureFile))
+            {
+                if (logger != null)
+                {
+                    logger.Warning($"The texture '{sourceTextureFile}' referenced in the mesh material can not be found on the system. Loading will probably fail at run time.", CallerInfo.Get());
+                }
+            }
+
+            parameterKey = ParameterKeys.IndexedKey(surfaceMaterialKey, textureCount++);
+            var uvSetName = "TEXCOORD";
+            if (textureUVSetIndex != 0)
+                uvSetName += textureUVSetIndex;
+            //albedoMaterial->Add(gcnew ShaderClassSource("TextureStream", uvSetName, "TEXTEST" + uvSetIndex));
+            var uvScaling = textureUVscaling;
+            var textureName = parameterKey.Name;
+            var needScaling = uvScaling != Vector2.One;
+            var currentComposition = needScaling
+                ? new ShaderClassSource("ComputeColorTextureRepeat", textureName, uvSetName, "float2(" + uvScaling.X + ", " + uvScaling.Y + ")")
+            : new ShaderClassSource("ComputeColorTexture", textureName, uvSetName);
+
+            return currentComposition;
+        }
+
+        public static ComputeTextureColor GenerateMaterialTextureNode(string vfsOutputPath, string sourceTextureFile, uint textureUVSetIndex, Vector2 textureUVscaling, TextureAddressMode addressModeU, TextureAddressMode addressModeV, Logger logger)
+        {
+            var textureFileName = Path.GetFileNameWithoutExtension(sourceTextureFile);
+            var url = vfsOutputPath + "_" + textureFileName;
+
+            if (File.Exists(sourceTextureFile))
+            {
+                if (logger != null)
+                {
+                    logger.Warning($"The texture '{sourceTextureFile}' referenced in the mesh material can not be found on the system. Loading will probably fail at run time.", CallerInfo.Get());
+                }
+            }
+
+            var uvScaling = textureUVscaling;
+            var textureName = textureFileName;
+
+            var texture = AttachedReferenceManager.CreateProxyObject<Texture>(AssetId.Empty, textureName);
+
+            var currentTexture = new ComputeTextureColor(texture, (TextureCoordinate)textureUVSetIndex, uvScaling, Vector2.Zero);
+            currentTexture.AddressModeU = addressModeU;
+            currentTexture.AddressModeV = addressModeV;
+
+            return currentTexture;
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.cpp b/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.cpp
deleted file mode 100644
index 3e5ec0348b..0000000000
--- a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
-// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
-#include "stdafx.h"
-
-using namespace System;
-using namespace System::Collections::Generic;
-using namespace System::IO;
-using namespace Xenko::Core::Assets;
-using namespace Xenko::Core::Diagnostics;
-using namespace Xenko::Core::Mathematics;
-using namespace Xenko::Core::Serialization;
-using namespace Xenko::Animations;
-using namespace Xenko::Rendering;
-using namespace Xenko::Rendering::Materials;
-using namespace Xenko::Rendering::Materials::ComputeColors;
-using namespace Xenko::Assets::Materials;
-using namespace Xenko::Engine;
-using namespace Xenko::Graphics;
-using namespace Xenko::Shaders;
-
-namespace Xenko { namespace Importer { namespace Common {
-
-public ref class AnimationInfo
-{
-public:
-	AnimationInfo()
-	{
-		AnimationClips = gcnew Dictionary<System::String^, AnimationClip^>();
-	}
-
-	TimeSpan Duration;
-	Dictionary<System::String^, AnimationClip^>^ AnimationClips;
-};
-
-public ref class MeshParameters
-{
-public:
-	MeshParameters()
-	{
-	}
-
-	String^ MaterialName;
-	String^ MeshName;
-	String^ NodeName;
-	HashSet<String^>^ BoneNodes;
-};
-
-public ref class NodeInfo
-{
-public:
-	String^ Name;
-	int Depth;
-	bool Preserve;
-};
-
-public ref class EntityInfo
-{
-public:
-	List<String^>^ TextureDependencies;
-	Dictionary<String^, MaterialAsset^>^ Materials;
-	List<String^>^ AnimationNodes;
-	List<MeshParameters^>^ Models;
-	List<NodeInfo^>^ Nodes;
-};
-
-public ref class MeshMaterials
-{
-public:
-	Dictionary<String^, MaterialAsset^>^ Materials;
-	List<MeshParameters^>^ Models;
-	List<String^>^ BoneNodes;
-};
-
-public ref class TextureLayerGenerator
-{
-public:
-
-	static ShaderClassSource^ GenerateTextureLayer(String^ vfsOutputPath, String^ sourceTextureFile, int textureUVSetIndex, Vector2 textureUVscaling , 
-										int& textureCount, ParameterKey<Texture^>^ surfaceMaterialKey, 
-										Mesh^ meshData, Logger^ logger)
-	{
-		ParameterKey<Texture^>^ parameterKey;
-
-		auto url = vfsOutputPath + "_" + Path::GetFileNameWithoutExtension(sourceTextureFile);
-
-		if (File::Exists(sourceTextureFile))
-		{
-			if (logger != nullptr)
-			{
-				logger->Warning(String::Format("The texture '{0}' referenced in the mesh material can not be found on the system. Loading will probably fail at run time.", sourceTextureFile),
-								nullptr, CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-			}
-		}
-
-		parameterKey = ParameterKeys::IndexedKey(surfaceMaterialKey, textureCount++);
-		String^ uvSetName = "TEXCOORD";
-		if (textureUVSetIndex != 0)
-			uvSetName += textureUVSetIndex;
-		//albedoMaterial->Add(gcnew ShaderClassSource("TextureStream", uvSetName, "TEXTEST" + uvSetIndex));
-		auto uvScaling = textureUVscaling;
-		auto textureName = parameterKey->Name;
-		auto needScaling = uvScaling != Vector2::One;
-		auto currentComposition = needScaling
-			? gcnew ShaderClassSource("ComputeColorTextureRepeat", textureName, uvSetName, "float2(" + uvScaling[0] + ", " + uvScaling[1] + ")")
-			: gcnew ShaderClassSource("ComputeColorTexture", textureName, uvSetName);
-
-		return currentComposition;
-	}
-
-	static ComputeTextureColor^ GenerateMaterialTextureNode(String^ vfsOutputPath, String^ sourceTextureFile, size_t textureUVSetIndex, Vector2 textureUVscaling, TextureAddressMode addressModeU, TextureAddressMode addressModeV, Logger^ logger)
-	{
-		auto textureFileName = Path::GetFileNameWithoutExtension(sourceTextureFile);
-		auto url = vfsOutputPath + "_" + textureFileName;
-
-		if (File::Exists(sourceTextureFile))
-		{
-			if (logger != nullptr)
-			{
-				logger->Warning(String::Format("The texture '{0}' referenced in the mesh material can not be found on the system. Loading will probably fail at run time.", sourceTextureFile),
-								nullptr, CallerInfo::Get(__FILEW__, __FUNCTIONW__, __LINE__));
-			}
-		}
-
-		auto uvScaling = textureUVscaling;
-		auto textureName = textureFileName;
-	
-		auto texture = AttachedReferenceManager::CreateProxyObject<Texture^>(AssetId::Empty, textureName);
-
-		auto currentTexture = gcnew ComputeTextureColor(texture, (TextureCoordinate)textureUVSetIndex, uvScaling, Vector2::Zero);
-		currentTexture->AddressModeU = addressModeU;
-		currentTexture->AddressModeV = addressModeV;
-	
-		return currentTexture;
-	}
-};
-}}}
diff --git a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.csproj b/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.csproj
new file mode 100644
index 0000000000..f92d4f7092
--- /dev/null
+++ b/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.csproj
@@ -0,0 +1,25 @@
+<Project>
+  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+  <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
+    <XenkoBuildTags>WindowsTools</XenkoBuildTags>
+    <XenkoAssemblyProcessorOptions />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Analysis\**" />
+    <EmbeddedResource Remove="Analysis\**" />
+    <None Remove="Analysis\**" />
+    <_SettingsFiles Remove="Analysis\**" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\engine\Xenko.Assets\Xenko.Assets.csproj" />
+    <ProjectReference Include="..\..\engine\Xenko.Engine\Xenko.Engine.csproj" />
+  </ItemGroup>
+  <Import Project="$(XenkoPostSettingsTargets)" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
+</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj b/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj
deleted file mode 100644
index c5316673b7..0000000000
--- a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <PropertyGroup>
-    <XenkoProjectType>Cpp</XenkoProjectType>
-    <TargetFrameworkVersion>$(TargetFrameworkVersionTool)</TargetFrameworkVersion>
-    <XenkoBuildTags>WindowsTools</XenkoBuildTags>
-    <XenkoAssemblyProcessorOptions>
-    </XenkoAssemblyProcessorOptions>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{43A6E62E-1B1C-4630-ABB8-C3F716004645}</ProjectGuid>
-    <Keyword>ManagedCProj</Keyword>
-    <RootNamespace>Xenko.Importer.Common</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CLRSupport>true</CLRSupport>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <CLRSupport>true</CLRSupport>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <AdditionalOptions>/wd 4945 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="Stdafx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="AssemblyInfo.cpp" />
-    <ClCompile Include="Xenko.Importer.Common.cpp" />
-    <ClCompile Include="Stdafx.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="app.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="app.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\core\Xenko.Core.Design\Xenko.Core.Design.csproj">
-      <Project>{66581dad-70ad-4475-ae47-c6c0df1ec5e2}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj">
-      <Project>{5210fb81-b807-49bb-af0d-31fb6a83a572}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core\Xenko.Core.csproj">
-      <Project>{0e916ab7-5a6c-4820-8ab1-aa492fe66d68}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Assets\Xenko.Assets.csproj">
-      <Project>{39ae9c77-e94b-404f-8768-b6261b3c1e0e}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj">
-      <Project>{1677b922-ccf0-44de-b57e-1cdd3d2b8e8a}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Engine\Xenko.Engine.csproj">
-      <Project>{c121a566-555e-42b9-9b0a-1696529a9088}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Rendering\Xenko.Rendering.csproj">
-      <Project>{ad4fdc24-b64d-4ed7-91aa-62c9eda12fa4}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Graphics\Xenko.Graphics.csproj">
-      <Project>{fb06c76a-6bb7-40be-9afa-fec13b045fb5}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko.Shaders\Xenko.Shaders.csproj">
-      <Project>{273bdd15-7392-4078-91f0-af23594a3d7b}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\engine\Xenko\Xenko.csproj">
-      <Project>{72390339-b2a1-4f61-a800-31ed0975b515}</Project>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(XenkoPostSettingsTargets)" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj.filters b/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj.filters
deleted file mode 100644
index 0ca46e0c85..0000000000
--- a/sources/tools/Xenko.Importer.Common/Xenko.Importer.Common.vcxproj.filters
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="resource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Xenko.Importer.Common.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AssemblyInfo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="app.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Image Include="app.ico">
-      <Filter>Resource Files</Filter>
-    </Image>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Importer.Common/app.ico b/sources/tools/Xenko.Importer.Common/app.ico
deleted file mode 100644
index 301942f607..0000000000
Binary files a/sources/tools/Xenko.Importer.Common/app.ico and /dev/null differ
diff --git a/sources/tools/Xenko.Importer.Common/app.rc b/sources/tools/Xenko.Importer.Common/app.rc
deleted file mode 100644
index eab43064f1..0000000000
Binary files a/sources/tools/Xenko.Importer.Common/app.rc and /dev/null differ
diff --git a/sources/tools/Xenko.Importer.Common/resource.h b/sources/tools/Xenko.Importer.Common/resource.h
deleted file mode 100644
index d5ac7c42aa..0000000000
--- a/sources/tools/Xenko.Importer.Common/resource.h
+++ /dev/null
@@ -1,3 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by app.rc
diff --git a/sources/tools/Xenko.Importer.FBX/MeshConverter.cpp b/sources/tools/Xenko.Importer.FBX/MeshConverter.cpp
index 6d37b87198..dbe05be9da 100644
--- a/sources/tools/Xenko.Importer.FBX/MeshConverter.cpp
+++ b/sources/tools/Xenko.Importer.FBX/MeshConverter.cpp
@@ -176,6 +176,8 @@ public ref class MeshConverter
 
 		FbxVector4* controlPoints = pMesh->GetControlPoints();
 		FbxGeometryElementNormal* normalElement = pMesh->GetElementNormal();
+		FbxGeometryElementTangent* tangentElement = pMesh->GetElementTangent();
+		FbxGeometryElementBinormal* binormalElement = pMesh->GetElementBinormal();
 		FbxGeometryElementSmoothing* smoothingElement = pMesh->GetElementSmoothing();
 
 		// UV set name mapping
@@ -314,6 +316,15 @@ public ref class MeshConverter
 			needEdgeIndexing |= IsGroupMappingModeByEdge(normalElement);
 		}
 
+		int tangentOffset = vertexStride;
+		if (tangentElement != NULL)
+		{
+			vertexElements->Add(VertexElement::Tangent<Vector4>(0, vertexStride));
+			vertexStride += 16;
+
+			needEdgeIndexing |= IsGroupMappingModeByEdge(tangentElement);
+		}
+
 		// TEXCOORD
 		std::vector<int> uvOffsets;
 		for (int i = 0; i < (int)uvElements.size(); ++i)
@@ -416,6 +427,36 @@ public ref class MeshConverter
 
 		auto buildMeshes = gcnew List<BuildMesh^>();
 
+		// count material indicies
+		int maxMaterialIndex = 0;
+		bool hasBadIndex = false;
+		for (int i = 0; i < polygonCount; i++) {
+			int materialIndex = 0;
+			if (materialMappingMode == FbxGeometryElement::eByPolygon)
+			{
+				materialIndex = materialIndices->GetAt(i);
+			}
+			else if (materialMappingMode == FbxGeometryElement::eAllSame)
+			{
+				materialIndex = materialIndices->GetAt(0);
+			}
+
+			if (materialIndex > maxMaterialIndex)
+				maxMaterialIndex = materialIndex;
+
+			if (materialIndex < 0)
+				hasBadIndex = true;
+		}
+
+		if (hasBadIndex) maxMaterialIndex++;
+
+		// Equivalent to std::vector::resize()
+		for (int i = 0; i <= maxMaterialIndex; i++)
+		{
+			buildMeshes->Add(nullptr);
+			buildMeshes[i] = gcnew BuildMesh();
+		}
+
 		// Count polygon per materials
 		for (int i = 0; i < polygonCount; i++)
 		{
@@ -424,15 +465,15 @@ public ref class MeshConverter
 			{
 				materialIndex = materialIndices->GetAt(i);
 			}
-
-			// Equivalent to std::vector::resize()
-			while (materialIndex >= buildMeshes->Count)
+			else if (materialMappingMode == FbxGeometryElement::eAllSame)
 			{
-				buildMeshes->Add(nullptr);
+				materialIndex = materialIndices->GetAt(0);
 			}
 
-			if (buildMeshes[materialIndex] == nullptr)
-				buildMeshes[materialIndex] = gcnew BuildMesh();
+			if (materialIndex < 0) {
+				materialIndex = maxMaterialIndex;
+				materialIndices->SetAt(i, materialIndex);
+			}
 
 			int polygonSize = pMesh->GetPolygonSize(i) - 2;
 			if (polygonSize > 0)
@@ -526,17 +567,17 @@ public ref class MeshConverter
 					*(Vector3*)(vbPointer + positionOffset) = controlPoint;
 
 					// NORMAL
+					Vector3 normal = Vector3(1, 0, 0);
 					if (normalElement != NULL)
 					{
 						int normalIndex = GetGroupIndexForLayerElementTemplate(normalElement, controlPointIndex, vertexIndex, edgeIndex, i, meshName, layerIndexFirstTimeError);
 						auto src_normal = normalElement->GetDirectArray().GetAt(normalIndex);
 						auto normalPointer = ((Vector3*)(vbPointer + normalOffset));
-						Vector3 normal = sceneMapping->ConvertNormalFromFbx(src_normal);
+						normal = sceneMapping->ConvertNormalFromFbx(src_normal);
 						if (isnan(normal.X) || isnan(normal.Y) || isnan(normal.Z))
-							*normalPointer = Vector3(1, 0, 0);
-						else
-							*normalPointer = normal;
-						normalPointer->Normalize();
+							normal = Vector3(1, 0, 0);
+						normal = Vector3::Normalize(normal);
+						*normalPointer = normal;
 					}
 
 					// UV
@@ -550,6 +591,29 @@ public ref class MeshConverter
 						((float*)(vbPointer + uvOffsets[uvGroupIndex]))[1] = 1.0f - (float)uv[1];
 					}
 
+					// TANGENT
+					if (tangentElement != NULL)
+					{
+						int tangentIndex = GetGroupIndexForLayerElementTemplate(tangentElement, controlPointIndex, vertexIndex, edgeIndex, i, meshName, layerIndexFirstTimeError);
+						auto src_tangent = tangentElement->GetDirectArray().GetAt(tangentIndex);
+						auto tangentPointer = ((Vector4*)(vbPointer + tangentOffset));
+						Vector3 tangent = sceneMapping->ConvertNormalFromFbx(src_tangent);
+						if (isnan(tangent.X) || isnan(tangent.Y) || isnan(tangent.Z))
+						{
+							*tangentPointer = Vector4(1, 0, 0, 1);
+						}
+						else
+						{
+							tangent = Vector3::Normalize(tangent);
+
+							int binormalIndex = GetGroupIndexForLayerElementTemplate(binormalElement, controlPointIndex, vertexIndex, edgeIndex, i, meshName, layerIndexFirstTimeError);
+							auto src_binormal = binormalElement->GetDirectArray().GetAt(binormalIndex);
+							Vector3 binormal = sceneMapping->ConvertNormalFromFbx(src_tangent);
+							// See GenerateTangentBinormal()
+							*tangentPointer = Vector4(tangent.X, tangent.Y, tangent.Z, Vector3::Dot(Vector3::Cross(normal, tangent), binormal) < 0.0f ? -1.0f : 1.0f);
+						}
+					}
+
 					// BLENDINDICES and BLENDWEIGHT
 					if (!controlPointWeights.empty())
 					{
@@ -646,7 +710,7 @@ public ref class MeshConverter
 			auto lMaterial = pMesh->GetNode()->GetMaterial(i);
 		
 			// Generate TNB
-			if (normalElement != NULL && uvElements.size() > 0)
+			if (tangentElement == NULL && normalElement != NULL && uvElements.size() > 0)
 				TNBExtensions::GenerateTangentBinormal(drawData);
 
 			auto meshData = gcnew Mesh();
@@ -1731,6 +1795,36 @@ public ref class MeshConverter
 
 			auto buildMeshes = gcnew List<BuildMesh^>();
 
+			// count material indicies
+			int maxMaterialIndex = 0;
+			bool hasBadIndex = false;
+			for (int i = 0; i < polygonCount; i++) {
+				int materialIndex = 0;
+				if (materialMappingMode == FbxGeometryElement::eByPolygon)
+				{
+					materialIndex = materialIndices->GetAt(i);
+				}
+				else if (materialMappingMode == FbxGeometryElement::eAllSame)
+				{
+					materialIndex = materialIndices->GetAt(0);
+				}
+
+				if (materialIndex > maxMaterialIndex)
+					maxMaterialIndex = materialIndex;
+
+				if (materialIndex < 0)
+					hasBadIndex = true;
+			}
+
+			if (hasBadIndex) maxMaterialIndex++;
+
+			// Equivalent to std::vector::resize()
+			for (int i = 0; i <= maxMaterialIndex; i++)
+			{
+				buildMeshes->Add(nullptr);
+				buildMeshes[i] = gcnew BuildMesh();
+			}
+
 			// Count polygon per materials
 			for (int i = 0; i < polygonCount; i++)
 			{
@@ -1744,15 +1838,11 @@ public ref class MeshConverter
 					materialIndex = materialIndices->GetAt(0);
 				}
 
-				// Equivalent to std::vector::resize()
-				while (materialIndex >= buildMeshes->Count)
-				{
-					buildMeshes->Add(nullptr);
+				if (materialIndex < 0) {
+					materialIndex = maxMaterialIndex;
+					materialIndices->SetAt(i, materialIndex);
 				}
 
-				if (buildMeshes[materialIndex] == nullptr)
-					buildMeshes[materialIndex] = gcnew BuildMesh();
-
 				int polygonSize = pMesh->GetPolygonSize(i) - 2;
 				if (polygonSize > 0)
 					buildMeshes[materialIndex]->polygonCount += polygonSize;
diff --git a/sources/tools/Xenko.Importer.FBX/Xenko.Importer.FBX.vcxproj b/sources/tools/Xenko.Importer.FBX/Xenko.Importer.FBX.vcxproj
index db9b156e33..a1b41fec23 100644
--- a/sources/tools/Xenko.Importer.FBX/Xenko.Importer.FBX.vcxproj
+++ b/sources/tools/Xenko.Importer.FBX/Xenko.Importer.FBX.vcxproj
@@ -11,7 +11,7 @@
     <FbxSdkVersion>2019.0</FbxSdkVersion>
     <FbxSdkUrl>https://www.autodesk.com/developer-network/platform-technologies/fbx-sdk-2019-0</FbxSdkUrl>
     <FbxSdkDir>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Autodesk FBX SDK $(FbxSdkVersion)', 'Install_Dir', null, RegistryView.Registry32))</FbxSdkDir>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <FbxLibVersionDir>vs2015\</FbxLibVersionDir>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
@@ -243,12 +243,17 @@
       <Project>{7732cb84-a39a-4adf-b740-fd32a352fa8a}</Project>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Xenko.Importer.Common\Xenko.Importer.Common.vcxproj">
-      <Project>{43a6e62e-1b1c-4630-abb8-c3f716004645}</Project>
-      <Private>False</Private>
+    <ProjectReference Include="..\Xenko.Importer.Assimp\Xenko.Importer.Assimp.csproj">
+      <Project>{092984ef-90a1-46d2-8aee-de24744e6b2d}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\Xenko.Importer.Common\Xenko.Importer.Common.csproj">
+      <Project>{43a8197b-874f-4ce2-9d56-518a23547c96}</Project>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="BulletSharp">
+      <HintPath>..\..\..\deps\BulletPhysics\BulletSharp.NetStandard.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
diff --git a/sources/tools/Xenko.PackageInstall/Xenko.PackageInstall.csproj b/sources/tools/Xenko.PackageInstall/Xenko.PackageInstall.csproj
index 3f75cffbfa..de5abdac0a 100644
--- a/sources/tools/Xenko.PackageInstall/Xenko.PackageInstall.csproj
+++ b/sources/tools/Xenko.PackageInstall/Xenko.PackageInstall.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AssemblyName>packageinstall</AssemblyName>
@@ -16,7 +16,7 @@
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.16.30">
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.5.2145">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </PackageReference>
     <Reference Include="System.IO.Compression" />
diff --git a/sources/tools/Xenko.ProjectGenerator/Program.cs b/sources/tools/Xenko.ProjectGenerator/Program.cs
index 983e4e9b92..99d3b91616 100644
--- a/sources/tools/Xenko.ProjectGenerator/Program.cs
+++ b/sources/tools/Xenko.ProjectGenerator/Program.cs
@@ -147,6 +147,7 @@ private static void GenerateUnitTestProject(string outputDirectory, string templ
             templateGeneratorParameters.Logger = result;
             templateGeneratorParameters.Description = new TemplateDescription();
             templateGeneratorParameters.Id = assetId;
+            templateGeneratorParameters.Namespace = projectNamespace;
 
             if (!PackageUnitTestGenerator.Default.PrepareForRun(templateGeneratorParameters).Result)
             {
diff --git a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/$ProjectName$.csproj.t4 b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/$ProjectName$.csproj.t4
index 32dcc554c6..9d55f8e596 100644
--- a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/$ProjectName$.csproj.t4
+++ b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/$ProjectName$.csproj.t4
@@ -44,7 +44,6 @@ var needSigning = true;
     <XenkoBuildTags>*</XenkoBuildTags>
     <XenkoPlatform><#= curPlatform #></XenkoPlatform>
     <XenkoBuildProfile>$(XenkoPlatform)</XenkoBuildProfile>
-    <XenkoAssemblySign><#= needSigning.ToString().ToLowerInvariant() #></XenkoAssemblySign>
     <XenkoGraphicsApi Condition="'$(XenkoGraphicsApi)' == ''"><#= curPlatform.GetDefaultGraphicsPlatform() #></XenkoGraphicsApi>
     <XenkoOutputFolder>Tests\$(XenkoGraphicsApi)\$(AssemblyName)</XenkoOutputFolder>
     <!-- Force msbuild to check to rebuild this assembly instead of letting VS IDE guess -->
diff --git a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Properties/AndroidManifest.xml.t4 b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Properties/AndroidManifest.xml.t4
index 718d087a43..7e3af1aa5c 100644
--- a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Properties/AndroidManifest.xml.t4
+++ b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Properties/AndroidManifest.xml.t4
@@ -1,7 +1,7 @@
 <#@ template inherits="ProjectTemplateTransformation" language="C#" #>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="<#= ProjectName #>" android:versionCode="1" android:versionName="1.0">
-  <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="26" />
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="27" />
   <application android:icon="@drawable/icon" android:label="<#= ProjectName #>" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"></application>
   <uses-feature android:glEsVersion="0x00020000" android:required="true" />
   <supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true" />
diff --git a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon106x106.png b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon106x106.png
index 71a2fc3396..4b5059507f 100644
--- a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon106x106.png
+++ b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon106x106.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bd021abb994b42527c7429da2900c2f3597853067ba96e34b9836f53b07cf2af
-size 10861
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon150x150.png b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon150x150.png
index c31ff7040d..4b5059507f 100644
--- a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon150x150.png
+++ b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon150x150.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90f31d31361ff1ef949498cf1475ea393290f227577d0d5c6c094909787240e4
-size 16893
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon54x54.png b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon54x54.png
index 878808a377..4b5059507f 100644
--- a/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon54x54.png
+++ b/sources/tools/Xenko.ProjectGenerator/Templates/Xenko.UnitTests/Resources/XenkoIcon54x54.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ff39930dbcae1ef46f63d37bea036e0ac35e153f9f77146412c36da33b9176c
-size 4116
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/tools/Xenko.ProjectGenerator/Xenko.ProjectGenerator.csproj b/sources/tools/Xenko.ProjectGenerator/Xenko.ProjectGenerator.csproj
index 0ee0cc2a81..d61a5021ee 100644
--- a/sources/tools/Xenko.ProjectGenerator/Xenko.ProjectGenerator.csproj
+++ b/sources/tools/Xenko.ProjectGenerator/Xenko.ProjectGenerator.csproj
@@ -1,6 +1,6 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -16,8 +16,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build" Version="16.0.461" ExcludeAssets="runtime" />
-    <PackageReference Include="Mono.Options" Version="5.3.0.1" />
+    <PackageReference Include="Microsoft.Build" Version="17.4.0" ExcludeAssets="runtime" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
@@ -71,5 +71,5 @@
     <Resource Include="Templates\Xenko.UnitTests\Resources\XenkoIcon54x54.png" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/tools/Xenko.PublicApiCheck/Xenko.PublicApiCheck.csproj b/sources/tools/Xenko.PublicApiCheck/Xenko.PublicApiCheck.csproj
index 15eabd3bf8..0e09b14ca8 100644
--- a/sources/tools/Xenko.PublicApiCheck/Xenko.PublicApiCheck.csproj
+++ b/sources/tools/Xenko.PublicApiCheck/Xenko.PublicApiCheck.csproj
@@ -18,9 +18,7 @@
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Mono.Cecil">
-      <HintPath>$(XenkoCommonDependenciesDir)Mono.Cecil\Mono.Cecil.dll</HintPath>
-    </Reference>
+    <PackageReference Include="Mono.Cecil" Version="0.10.4" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
diff --git a/sources/tools/Xenko.RemoteShaderCompiler/Xenko.RemoteShaderCompiler.csproj b/sources/tools/Xenko.RemoteShaderCompiler/Xenko.RemoteShaderCompiler.csproj
index 15ce0f9a83..5988497cba 100644
--- a/sources/tools/Xenko.RemoteShaderCompiler/Xenko.RemoteShaderCompiler.csproj
+++ b/sources/tools/Xenko.RemoteShaderCompiler/Xenko.RemoteShaderCompiler.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -18,5 +18,5 @@
     <ProjectReference Include="..\..\engine\Xenko.Graphics\Xenko.Graphics.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.SamplesTestServer/Xenko.SamplesTestServer.csproj b/sources/tools/Xenko.SamplesTestServer/Xenko.SamplesTestServer.csproj
index e6420cd2c9..44f4200a98 100644
--- a/sources/tools/Xenko.SamplesTestServer/Xenko.SamplesTestServer.csproj
+++ b/sources/tools/Xenko.SamplesTestServer/Xenko.SamplesTestServer.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -20,7 +20,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\engine\Xenko.Games.Testing\Xenko.Games.Testing.csproj" />
     <ProjectReference Include="..\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -29,5 +28,5 @@
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="..\..\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/tools/Xenko.StorageTool/Xenko.StorageTool.csproj b/sources/tools/Xenko.StorageTool/Xenko.StorageTool.csproj
index 254f492724..3f186b2458 100644
--- a/sources/tools/Xenko.StorageTool/Xenko.StorageTool.csproj
+++ b/sources/tools/Xenko.StorageTool/Xenko.StorageTool.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net45</TargetFramework>
@@ -15,7 +15,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Mono.Options" Version="5.3.0.1" />
+    <PackageReference Include="Mono.Options" Version="6.12.0.148" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
@@ -23,5 +23,5 @@
     <ProjectReference Include="..\..\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.TestRunner/Program.cs b/sources/tools/Xenko.TestRunner/Program.cs
index bb837c507c..fc225929e5 100644
--- a/sources/tools/Xenko.TestRunner/Program.cs
+++ b/sources/tools/Xenko.TestRunner/Program.cs
@@ -10,7 +10,6 @@
 using Mono.Options;
 using Xenko.ConnectionRouter;
 using Xenko.Engine.Network;
-using Xenko.Graphics.Regression;
 using static System.String;
 
 namespace Xenko.TestRunner
@@ -126,7 +125,6 @@ public struct ConnectedDevice
         {
             public string Serial;
             public string Name;
-            public TestPlatform Platform;
 
             public override string ToString()
             {
diff --git a/sources/tools/Xenko.TestRunner/Xenko.TestRunner.csproj b/sources/tools/Xenko.TestRunner/Xenko.TestRunner.csproj
index 27cdeb9b7e..cae9d3b20b 100644
--- a/sources/tools/Xenko.TestRunner/Xenko.TestRunner.csproj
+++ b/sources/tools/Xenko.TestRunner/Xenko.TestRunner.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -19,7 +19,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\engine\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
     <ProjectReference Include="..\Xenko.ConnectionRouter\Xenko.ConnectionRouter.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -28,7 +27,7 @@
   <Import Project="..\..\shared\Xenko.Core.ShellHelper\Xenko.Core.ShellHelper.projitems" Label="Shared" />
   <Import Project="..\..\shared\Xenko.NuGetResolver\Xenko.NuGetResolver.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.config</AllowedOutputExtensionsInPackageBuildOutputFolder>
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/AtitcWrapper/AtitcWrapper.vcxproj b/sources/tools/Xenko.TextureConverter.Wrappers/AtitcWrapper/AtitcWrapper.vcxproj
index 9680fee603..dab89d2854 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/AtitcWrapper/AtitcWrapper.vcxproj
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/AtitcWrapper/AtitcWrapper.vcxproj
@@ -27,31 +27,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0CD6FFE0-3EAD-47A9-993C-9AF5B69FB0C3}</ProjectGuid>
     <RootNamespace>AtitcWrapper</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2017.vcxproj b/sources/tools/Xenko.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2017.vcxproj
index 932231f720..c4b4c74171 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2017.vcxproj
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/DirectXTex/DirectXTex_Desktop_2017.vcxproj
@@ -31,38 +31,38 @@
     <ProjectGuid>{371B9FA9-4C90-4AC6-A123-ACED756D6C77}</ProjectGuid>
     <RootNamespace>DirectXTex</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
@@ -137,7 +137,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalOptions> /permissive- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -179,7 +179,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalOptions> /permissive- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;_DEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -222,7 +222,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalOptions> /permissive- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
@@ -265,7 +265,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalOptions> /permissive- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
@@ -309,7 +309,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalOptions> /permissive- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
@@ -352,7 +352,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FloatingPointModel>Fast</FloatingPointModel>
       <ExceptionHandling>Sync</ExceptionHandling>
-      <AdditionalOptions> /permissive- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions> /permissive- /Zc:twoPhase- %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions>_UNICODE;UNICODE;WIN32;NDEBUG;PROFILE;_LIB;_WIN7_PLATFORM_UPDATE;_WIN32_WINNT=0x0600;_CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>DirectXTexP.h</PrecompiledHeaderFile>
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj b/sources/tools/Xenko.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj
index 4568de5b0a..d3adb3c876 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/DxtWrapper/DxtWrapper.vcxproj
@@ -21,31 +21,32 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{29F41E6E-532D-440E-941B-0CD13EE96B6F}</ProjectGuid>
     <RootNamespace>DxtWrapper</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/FreeImage.NET.csproj b/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/FreeImage.NET.csproj
index c950757ae2..7440a21db0 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/FreeImage.NET.csproj
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/FreeImage.NET.csproj
@@ -1,34 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <StartupObject>
-    </StartupObject>
-    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
     <TargetFramework>net40</TargetFramework>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <AssemblyName>FreeImageNET</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\..\deps\FreeImage\%24%28Configuration%29\%24%28Platform%29\</OutputPath>
+    <OutputPath>..\..\..\..\deps\FreeImage\$(Configuration)\$(Platform)\</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <ErrorReport>none</ErrorReport>
     <BaseAddress>4194304</BaseAddress>
@@ -43,7 +20,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\..\deps\FreeImage\%24%28Configuration%29\%24%28Platform%29\</OutputPath>
+    <OutputPath>..\..\..\..\deps\FreeImage\$(Configuration)\$(Platform)\</OutputPath>
     <DefineConstants>
     </DefineConstants>
     <ErrorReport>none</ErrorReport>
@@ -55,7 +32,7 @@
     </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>..\..\..\..\deps\FreeImage\Debug\x86\</OutputPath>
+    <OutputPath>..\..\..\..\deps\FreeImage\$(Configuration)\$(Platform)\</OutputPath>
     <DefineConstants>DEBUG</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>
@@ -66,7 +43,7 @@
     <ErrorReport>none</ErrorReport>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\..\..\..\deps\FreeImage\Release\x86\</OutputPath>
+    <OutputPath>..\..\..\..\deps\FreeImage\$(Configuration)\$(Platform)\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DocumentationFile>
     </DocumentationFile>
@@ -101,10 +78,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>none</ErrorReport>
   </PropertyGroup>
-  <ItemGroup>
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Update="Classes\MemoryArray.cs">
       <SubType>Code</SubType>
@@ -115,10 +88,7 @@
     <Compile Update="Classes\Scanline.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="Properties\AssemblyInfo.cs">
-      <SubType>
-      </SubType>
-    </Compile>
+    <Compile Update="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -155,4 +125,4 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/Properties/AssemblyInfo.cs b/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/Properties/AssemblyInfo.cs
index 382242064d..a4f401f951 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/Properties/AssemblyInfo.cs
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/FreeImage.Net/Properties/AssemblyInfo.cs
@@ -7,7 +7,6 @@
 //
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
-[assembly: AssemblyFileVersionAttribute("3.15.1.0")]
 [assembly: ComVisibleAttribute(false)]
 [assembly: NeutralResourcesLanguageAttribute("")]
 [assembly: GuidAttribute("64a4c935-b757-499c-ab8c-6110316a9e51")]
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj b/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj
index 7e208e2351..cb9a69603c 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj
@@ -22,31 +22,32 @@
     <ProjectGuid>{B8B85886-0F82-4FF3-BCD5-8EAE7EA19EA5}</ProjectGuid>
     <RootNamespace>PvrttWrapperC</RootNamespace>
     <ProjectName>PvrttWrapper</ProjectName>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
@@ -92,6 +93,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\deps\PVRTT\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -108,6 +110,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\deps\PVRTT\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>DEBUG;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -125,7 +128,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\deps\PVRTT\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDLL_IMPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -145,7 +148,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\deps\PVRTT\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_WINDLL_IMPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -159,7 +162,6 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\deps\PVRTT\source\PVRTString.cpp" />
     <ClCompile Include="pvrtt_wrapper.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj.filters b/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj.filters
index 4e29970c6b..2fb970c1f0 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj.filters
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/PvrttWrapperC++/PvrttWrapperC++.vcxproj.filters
@@ -18,9 +18,6 @@
     <ClCompile Include="pvrtt_wrapper.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\deps\PVRTT\source\PVRTString.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="pvrtt_wrapper.h">
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/Xenko.TextureConverter.Wrappers.sln b/sources/tools/Xenko.TextureConverter.Wrappers/Xenko.TextureConverter.Wrappers.sln
index 14594b68a5..341cb9a546 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/Xenko.TextureConverter.Wrappers.sln
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/Xenko.TextureConverter.Wrappers.sln
@@ -1,6 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29326.143
 MinimumVisualStudioVersion = 15.0.26228.4
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AtitcWrapper", "AtitcWrapper\AtitcWrapper.vcxproj", "{0CD6FFE0-3EAD-47A9-993C-9AF5B69FB0C3}"
 EndProject
@@ -9,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DxtWrapper", "DxtWrapper\Dx
 		{371B9FA9-4C90-4AC6-A123-ACED756D6C77} = {371B9FA9-4C90-4AC6-A123-ACED756D6C77}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeImage.NET", "FreeImage.Net\FreeImage.NET.csproj", "{6598A7CD-8F27-4D3F-A675-5AE63113A7C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FreeImage.NET", "FreeImage.Net\FreeImage.NET.csproj", "{6598A7CD-8F27-4D3F-A675-5AE63113A7C3}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PvrttWrapper", "PvrttWrapperC++\PvrttWrapperC++.vcxproj", "{B8B85886-0F82-4FF3-BCD5-8EAE7EA19EA5}"
 EndProject
@@ -173,4 +174,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {55A37447-CBBB-43A4-A6E5-1C7393F4A132}
+	EndGlobalSection
 EndGlobal
diff --git a/sources/tools/Xenko.TextureConverter.Wrappers/build-deps.bat b/sources/tools/Xenko.TextureConverter.Wrappers/build-deps.bat
index 2c4daf6f9f..b36591c0d3 100644
--- a/sources/tools/Xenko.TextureConverter.Wrappers/build-deps.bat
+++ b/sources/tools/Xenko.TextureConverter.Wrappers/build-deps.bat
@@ -1,4 +1,3 @@
-call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\vc\vcvarsall.bat" x86
 msbuild Xenko.TextureConverter.Wrappers.sln /Property:Configuration=Debug;Platform="Win32"
 msbuild Xenko.TextureConverter.Wrappers.sln /Property:Configuration=Release;Platform="Win32"
 msbuild Xenko.TextureConverter.Wrappers.sln /Property:Configuration=Debug;Platform="x64"
diff --git a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/DxtTexLib.cs b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/DxtTexLib.cs
index ef9e1a20ac..c7b9d8e8cb 100644
--- a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/DxtTexLib.cs
+++ b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/DxtTexLib.cs
@@ -88,7 +88,7 @@ public void Dispose(TexImage image)
 
         public void StartLibrary(TexImage image)
         {
-            if (image.LibraryData.ContainsKey(this) && ((DxtTextureLibraryData)image.LibraryData[this]).DxtImages[0].pixels.Equals(image.Data)) return;
+            if (image.LibraryData.TryGetValue(this, out var libData) && ((DxtTextureLibraryData)libData).DxtImages[0].pixels.Equals(image.Data)) return;
 
             DxtTextureLibraryData libraryData = new DxtTextureLibraryData();
             image.LibraryData[this] = libraryData;
@@ -167,7 +167,7 @@ public bool CanHandleRequest(PixelFormat format, IRequest request)
 
         public void Execute(TexImage image, IRequest request)
         {
-            DxtTextureLibraryData libraryData = image.LibraryData.ContainsKey(this) ? (DxtTextureLibraryData)image.LibraryData[this] : null;
+            DxtTextureLibraryData libraryData = image.LibraryData.TryGetValue(this, out var libData) ? (DxtTextureLibraryData)libData : null;
 
             switch (request.Type)
             {
diff --git a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/FITexLib.cs b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/FITexLib.cs
index 70e048c3c6..bda70a6775 100644
--- a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/FITexLib.cs
+++ b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/FITexLib.cs
@@ -172,7 +172,7 @@ public bool CanHandleRequest(PixelFormat imageFormat, IRequest request)
 
         public void Execute(TexImage image, IRequest request)
         {
-            FreeImageTextureLibraryData libraryData = image.LibraryData.ContainsKey(this) ? (FreeImageTextureLibraryData)image.LibraryData[this] : null;
+            FreeImageTextureLibraryData libraryData = image.LibraryData.TryGetValue(this, out var libData) ? (FreeImageTextureLibraryData)libData : null;
 
             switch (request.Type)
             {
@@ -234,7 +234,7 @@ private void Load(TexImage image, LoadingRequest loader)
 
                 if (temp.IsNull)
                     throw new Exception("FreeImage's image data is null");
-            } 
+            }
             catch (Exception e)
             {
                 Log.Error("Loading file " + loader.FilePath + " failed: " + e.Message);
diff --git a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/PvrttTexLib.cs b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/PvrttTexLib.cs
index 24128a30e7..73d2498593 100644
--- a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/PvrttTexLib.cs
+++ b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/PvrttTexLib.cs
@@ -92,7 +92,7 @@ public bool CanHandleRequest(PixelFormat format, IRequest request)
 
                 case RequestType.Rescaling:
                     Filter.Rescaling filter = ((RescalingRequest)request).Filter;
-                    return filter == Filter.Rescaling.Bicubic || filter == Filter.Rescaling.Bilinear || filter == Filter.Rescaling.Nearest; 
+                    return filter == Filter.Rescaling.Bicubic || filter == Filter.Rescaling.Bilinear || filter == Filter.Rescaling.Nearest;
 
                 case RequestType.PreMultiplyAlpha:
                 case RequestType.SwitchingChannels:
@@ -195,7 +195,7 @@ public void EndLibrary(TexImage image)
 
             image.SubImageArray = new TexImage.SubImage[imageCount];
             int ct = 0;
-            int rowPitch, slicePitch, height, width; 
+            int rowPitch, slicePitch, height, width;
 
             for (uint i = 0; i < image.FaceCount; ++i) // Recreating the sub images
             {
@@ -234,7 +234,7 @@ public void EndLibrary(TexImage image)
 
         public void Execute(TexImage image, IRequest request)
         {
-            PvrTextureLibraryData libraryData = image.LibraryData.ContainsKey(this) ? (PvrTextureLibraryData)image.LibraryData[this] : null;
+            PvrTextureLibraryData libraryData = image.LibraryData.TryGetValue(this, out var libData) ? (PvrTextureLibraryData)libData : null;
 
             switch (request.Type)
             {
@@ -548,8 +548,8 @@ private void TransposeFaceData(TexImage image, PvrTextureLibraryData libraryData
 
                     var source = new IntPtr(image.Data.ToInt64() + sourceOffset);
                     var dest = new IntPtr(destPtr.ToInt64() + destOffset);
- 
-                    Core.Utilities.CopyMemory(dest, source, slice);       
+
+                    Core.Utilities.CopyMemory(dest, source, slice);
                 }
 
                 sourceRowOffset += slice * image.FaceCount;
diff --git a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/XenkoTexLibrary.cs b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/XenkoTexLibrary.cs
index d1d52aad45..b49a6af1d0 100644
--- a/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/XenkoTexLibrary.cs
+++ b/sources/tools/Xenko.TextureConverter/Backend/TexLibraries/XenkoTexLibrary.cs
@@ -99,7 +99,7 @@ public bool CanHandleRequest(PixelFormat format, IRequest request)
 
         public void Execute(TexImage image, IRequest request)
         {
-            XenkoTextureLibraryData libraryData = image.LibraryData.ContainsKey(this) ? (XenkoTextureLibraryData)image.LibraryData[this] : null;
+            XenkoTextureLibraryData libraryData = image.LibraryData.TryGetValue(this, out var libData) ? (XenkoTextureLibraryData)libData : null;
 
             switch (request.Type)
             {
@@ -419,7 +419,7 @@ private void Load(TexImage image, LoadingRequest request)
             image.SubImageArray = new TexImage.SubImage[imageCount];
             
             for (int i = 0; i < imageCount; ++i)
-            { 
+            {
                 image.SubImageArray[i] = new TexImage.SubImage();
                 image.SubImageArray[i].Data = inputImage.PixelBuffer[i * bufferStepFactor].DataPointer;
                 image.SubImageArray[i].DataSize = inputImage.PixelBuffer[i * bufferStepFactor].BufferStride;
diff --git a/sources/tools/Xenko.TextureConverter/Xenko.TextureConverter.csproj b/sources/tools/Xenko.TextureConverter/Xenko.TextureConverter.csproj
index 6d1d84b4c2..87ec2871fc 100644
--- a/sources/tools/Xenko.TextureConverter/Xenko.TextureConverter.csproj
+++ b/sources/tools/Xenko.TextureConverter/Xenko.TextureConverter.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
     <OutputType>Library</OutputType>
@@ -32,5 +32,5 @@
     <ProjectReference Include="..\..\engine\Xenko.Graphics\Xenko.Graphics.csproj" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.Toolkit/Collections/CollectionExtensions.cs b/sources/tools/Xenko.Toolkit/Collections/CollectionExtensions.cs
new file mode 100644
index 0000000000..5ef4cdce54
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Collections/CollectionExtensions.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Collections
+{
+    /// <summary>
+    /// Extension Methods for collection types.
+    /// </summary>
+    public static class CollectionExtensions
+    {
+        /// <summary>
+        /// Adds the elements of the specified collection to the end of the <see cref="ICollection{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="destination">The <see cref="ICollection{T}"/> to add items to.</param>
+        /// <param name="collection">
+        /// The collection whose elements should be added to the end of the <paramref name="destination"/>. It can contain elements that are <see langword="null"/>, if type <typeparamref name="T"/> is a reference type.
+        /// </param>
+        /// <exception cref="ArgumentNullException">If <paramref name="destination"/> or <paramref name="collection"/> are <see langword="null"/>.</exception>
+        public static void AddRange<T>(this ICollection<T> destination, IEnumerable<T> collection)
+        {
+            if (destination == null)
+            {
+                throw new ArgumentNullException(nameof(destination));
+            }
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+            foreach (var item in collection)
+            {
+                destination.Add(item);
+            }
+        }
+
+        /// <summary>
+        /// Enqueues the elements of the specified collection to the <see cref="Queue{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="queue">The <see cref="Queue{T}"/> to add items to.</param>
+        /// <param name="collection">
+        /// The collection whose elements should be added to the <paramref name="queue"/>. It can contain elements that are <see langword="null"/>, if type <typeparamref name="T"/> is a reference type.
+        /// </param>
+        /// <exception cref="ArgumentNullException">If <paramref name="queue"/> or <paramref name="collection"/> are <see langword="null"/>.</exception>
+        public static void EnqueueRange<T>(this Queue<T> queue, IEnumerable<T> collection)
+        {
+            if (queue == null)
+            {
+                throw new ArgumentNullException(nameof(queue));
+            }
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+
+            foreach (var item in collection)
+            {
+                queue.Enqueue(item);
+            }
+        }
+
+        /// <summary>
+        /// Pushes the elements of the specified collection to the <see cref="Stack{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="stack">The <see cref="Stack{T}"/> to add items to.</param>
+        /// <param name="collection">
+        /// The collection whose elements should be pushed on to the <paramref name="stack"/>. It can contain elements that are <see langword="null"/>, if type <typeparamref name="T"/> is a reference type.
+        /// </param>
+        /// <exception cref="ArgumentNullException">If <paramref name="stack"/> or <paramref name="collection"/> are <see langword="null"/>.</exception>
+        public static void PushRange<T>(this Stack<T> stack, IEnumerable<T> collection)
+        {
+            if (stack == null)
+            {
+                throw new ArgumentNullException(nameof(stack));
+            }
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+
+            foreach (var item in collection)
+            {
+                stack.Push(item);
+            }
+        }        
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Collections/DictionaryExtensions.cs b/sources/tools/Xenko.Toolkit/Collections/DictionaryExtensions.cs
new file mode 100644
index 0000000000..b6092dda37
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Collections/DictionaryExtensions.cs
@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Collections
+{
+    /// <summary>
+    /// Extension methods for <see cref="IDictionary{TKey,TValue}"/>.
+    /// </summary>
+    public static class DictionaryExtensions
+    {
+        /// <summary>
+        /// Adds items from one dictionary to the other.
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+        /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+        /// <param name="source">The dictionary items are copied from.</param>
+        /// <param name="target">The dictionary items are added to.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="source"/> or <paramref name="target"/> are <see langword="null"/>.</exception>
+        public static void MergeInto<TKey, TValue>(this IDictionary<TKey, TValue> source, IDictionary<TKey, TValue> target)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }
+
+            foreach (var item in source)
+                target[item.Key] = item.Value;
+        }
+
+        /// <summary>
+        /// Gets the element with the specified key or a default value if it is not in the dictionary.
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+        /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+        /// <param name="dicionary">The dictionary to get element from.</param>
+        /// <param name="key">The key of the element to get.</param>
+        /// <param name="defaultValue">The value to return if element with specified key does not exist in the <paramref name="dicionary"/>.</param>
+        /// <returns>The element with the specified key, or the default value.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="dicionary"/> is <see langword="null"/>.</exception>
+        public static TValue GetOrDefault<TKey, TValue>(this IDictionary<TKey, TValue> dicionary, TKey key, TValue defaultValue = default(TValue))
+        {
+            if (dicionary == null)
+            {
+                throw new ArgumentNullException(nameof(dicionary));
+            }
+
+            TValue result = default(TValue);
+
+            if (dicionary.TryGetValue(key, out result))
+            {
+                return result;
+            }
+
+            return defaultValue;
+        }
+
+        /// <summary>
+        /// Gets the element with the specified key or adds it if it is not in the dictionary.
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+        /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+        /// <param name="dicionary">The dictionary to get element from.</param>
+        /// <param name="key">The key of the element to get.</param>
+        /// <param name="getValue">The callback delegate to return value if element with specified key does not exist in the <paramref name="dicionary"/>.</param>
+        /// <returns>The element with the specified key, or the added value.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="dicionary"/> or <paramref name="getValue"/> are <see langword="null"/>.</exception>
+        public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dicionary, TKey key, Func<TKey, TValue> getValue)
+        {
+            if (dicionary == null)
+            {
+                throw new ArgumentNullException(nameof(dicionary));
+            }
+
+            if (getValue == null)
+            {
+                throw new ArgumentNullException(nameof(getValue));
+            }
+
+            TValue result = default(TValue);
+
+            if (!dicionary.TryGetValue(key, out result))
+            {
+                dicionary[key] = result = getValue(key);
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets the element with the specified key in the dictionary or the new value returned from the <paramref name="getValue"/> callback.
+        /// If the <paramref name="shouldAdd"/> callback returns <see langword="true"/> then the new value is added to the dictionary.
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+        /// <typeparam name="TValue">The type of values in the dictionary.</typeparam>
+        /// <param name="dicionary">The dictionary to get element from.</param>
+        /// <param name="key">The key of the element to get.</param>
+        /// <param name="getValue">The callback delegate to return value if element with specified key does not exist in the <paramref name="dicionary"/>.</param>
+        /// <param name="shouldAdd">The callback delegate to determine if the new value should be added to the <paramref name="dicionary"/>.</param>
+        /// <returns>The element with the specified key, or the new value.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="dicionary"/>, <paramref name="getValue"/> or <paramref name="shouldAdd"/> are <see langword="null"/>.</exception>
+        public static TValue GetOrAdd<TKey, TValue>(this IDictionary<TKey, TValue> dicionary, TKey key, Func<TKey, TValue> getValue, Func<TValue, bool> shouldAdd)
+        {
+            if (dicionary == null)
+            {
+                throw new ArgumentNullException(nameof(dicionary));
+            }
+
+            if (getValue == null)
+            {
+                throw new ArgumentNullException(nameof(getValue));
+            }
+
+            if (shouldAdd == null)
+            {
+                throw new ArgumentNullException(nameof(shouldAdd));
+            }
+
+            TValue result = default(TValue);
+
+            if (!dicionary.TryGetValue(key, out result))
+            {
+                result = getValue(key);
+
+                if (shouldAdd(result))
+                    dicionary[key] = result;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Increments integer value in a dictionary by 1.
+        /// </summary>
+        /// <typeparam name="TKey">The type of keys in the dictionary.</typeparam>
+        /// <param name="dicionary">The dictionary to get element from.</param>
+        /// <param name="key">The key of the element to increment and get.</param>
+        /// <returns>The element incremented by 1 with the specified key.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="dicionary"/> is <see langword="null"/>.</exception>
+        public static int Increment<TKey>(this IDictionary<TKey, int> dicionary, TKey key)
+        {
+            if (dicionary == null)
+            {
+                throw new ArgumentNullException(nameof(dicionary));
+            }
+
+            int result = default(int);
+            dicionary[key] = dicionary.TryGetValue(key, out result) ? result += 1 : result = 1;
+            return result;
+        }
+        
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Collections/EnumerableExtensions.cs b/sources/tools/Xenko.Toolkit/Collections/EnumerableExtensions.cs
new file mode 100644
index 0000000000..c54c108893
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Collections/EnumerableExtensions.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Collections
+{
+    /// <summary>
+    /// Extension methods for <see cref="IEnumerable{T}"/>.
+    /// </summary>
+    public static class EnumerableExtensions
+    {
+        /// <summary>
+        /// Checks if <paramref name="enumerable"/> is <see langword="null"/> or empty.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="enumerable">The <see cref="IEnumerable{T}"/> to check.</param>
+        /// <returns>Returns <see langword="true"/> if <paramref name="enumerable"/> is <see langword="null"/> or empty, otherwise <see langword="false"/>.</returns>
+        public static bool IsNullOrEmpty<T>(this IEnumerable<T> enumerable)
+        {
+            return enumerable == null || !enumerable.Any();
+        }
+
+        /// <summary>
+        /// Concatenates two sequences.
+        /// </summary>
+        /// <typeparam name="T">The type of the elements of the input sequences.</typeparam>
+        /// <param name="first">The first sequence to concatenate.</param>
+        /// <param name="second">The sequence to concatenate to the first sequence.</param>
+        /// <returns>An <see cref="IEnumerable{T}"/> that contains the concatenated elements of the two input sequences.</returns>
+        /// <exception cref="ArgumentException"><paramref name="first"/> or <paramref name="second"/> is <see langword="null"/>.</exception>
+        public static IEnumerable<T> Concat<T>(this IEnumerable<T> first, params T[] second)
+        {
+            if (first == null)
+            {
+                throw new ArgumentNullException(nameof(first));
+            }
+
+            if (second == null)
+            {
+                throw new ArgumentNullException(nameof(second));
+            }
+
+            return Enumerable.Concat(first, second);
+        }
+
+        /// <summary>
+        /// Performs the specified action on each element of the <see cref="IEnumerable{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of the elements of the input sequence.</typeparam>
+        /// <param name="source">The sequence of elements to execute the <see cref="IEnumerable{T}"/>.</param>
+        /// <param name="action">The <see cref="Action{T}"/> delegate to perform on each element of the <see cref="IEnumerable{T}"/>1.</param>
+        /// <exception cref="ArgumentException"><paramref name="source"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        public static void ForEach<T>(this IEnumerable<T> source, Action<T> action)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException(nameof(source));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            foreach (var item in source)
+            {
+                action(item);
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Collections/ListStackExtensions.cs b/sources/tools/Xenko.Toolkit/Collections/ListStackExtensions.cs
new file mode 100644
index 0000000000..f302b42ece
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Collections/ListStackExtensions.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Collections
+{
+    /// <summary>
+    /// Extension methods to use stack like methods for <see cref="IList{T}"/>.
+    /// </summary>
+    public static class ListStackExtensions
+    {
+        /// <summary>
+        /// Gets the last item in the <see cref="IList{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="stack">The <see cref="IList{T}"/> to use as a stack.</param>
+        /// <returns>The last item in the collection.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="stack"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="stack"/> is empty.</exception>
+        public static T Peek<T>(this IList<T> stack)
+        {
+            if (stack == null)
+            {
+                throw new ArgumentNullException(nameof(stack));
+            }
+
+            if(stack.Count == 0)
+            {
+                throw new ArgumentException("The stack is empty.", nameof(stack));
+            }
+
+            return stack[stack.Count - 1];
+        }
+
+        /// <summary>
+        /// Adds an object to the end of the <see cref="IList{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="stack">The <see cref="IList{T}"/> to use as a stack.</param>
+        /// <param name="item">The item to push on to the stack. The value can be <see langword="null"/> for reference types.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="stack"/> is <see langword="null"/>.</exception>
+        public static void Push<T>(this IList<T> stack, T item)
+        {
+            if (stack == null)
+            {
+                throw new ArgumentNullException(nameof(stack));
+            }
+
+            stack.Add(item);
+        }
+
+        /// <summary>
+        /// Removes and returns the object at the end of the <see cref="IList{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="stack">The <see cref="IList{T}"/> to use as a stack.</param>
+        /// <returns>The object removed from the end of the <see cref="IList{T}"/>.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="stack"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="stack"/> is empty.</exception>
+        public static T Pop<T>(this IList<T> stack)
+        {
+            if (stack == null)
+            {
+                throw new ArgumentNullException(nameof(stack));
+            }
+
+            if (stack.Count == 0)
+            {
+                throw new ArgumentException("The stack is empty.", nameof(stack));
+            }
+
+            var item = stack[stack.Count - 1];
+            stack.RemoveAt(stack.Count - 1);
+            return item;
+        }
+
+        /// <summary>
+        /// Removes and returns the object at the start of the <see cref="IList{T}"/>.
+        /// </summary>
+        /// <typeparam name="T">The type of elements in the collection.</typeparam>
+        /// <param name="stack">The <see cref="IList{T}"/> to use as a stack.</param>
+        /// <returns>The object removed from the start of the <see cref="IList{T}"/>.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="stack"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="stack"/> is empty.</exception>
+        public static T PopFront<T>(this IList<T> stack)
+        {
+            if (stack == null)
+            {
+                throw new ArgumentNullException(nameof(stack));
+            }
+
+            if (stack.Count == 0)
+            {
+                throw new ArgumentException("The stack is empty.", nameof(stack));
+            }
+
+            var item = stack[0];
+            stack.RemoveAt(0);
+            return item;
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Collections/RandomListExtensions.cs b/sources/tools/Xenko.Toolkit/Collections/RandomListExtensions.cs
new file mode 100644
index 0000000000..e246f68032
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Collections/RandomListExtensions.cs
@@ -0,0 +1,96 @@
+using Xenko.Core.Mathematics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Collections
+{
+    /// <summary>
+    /// Extensions for <see cref="Random"/>.
+    /// </summary>
+    public static class RandomListExtensions
+    {
+       
+        /// <summary>
+        /// Chooses a random item.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="collection">Collection to choose item from.</param>
+        /// <returns>A random item from collection</returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        /// <exception cref="ArgumentNullException">If the collection is null.</exception>
+        public static T Choose<T>(this Random random, IList<T> collection)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+            return collection[random.Next(collection.Count)];
+        }
+
+        /// <summary>
+        /// Chooses a random item.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="collection">Collection to choose item from.</param>
+        /// <returns>A random item from collection</returns>
+        /// <exception cref="ArgumentNullException">If the random  is null.</exception>
+        /// <exception cref="ArgumentNullException">If the collection is null.</exception>
+        public static T Choose<T>(this Random random, params T[] collection)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+            return collection[random.Next(collection.Length)];
+        }
+
+        /// <summary>
+        /// Shuffles the collection in place.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="collection">Collection to shuffle.</param>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        /// <exception cref="ArgumentNullException">If the random collection is null.</exception>
+        public static void Shuffle<T>(this Random random, IList<T> collection)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            if (collection == null)
+            {
+                throw new ArgumentNullException(nameof(collection));
+            }
+
+            int n = collection.Count;
+            while (n > 1)
+            {
+                n--;
+                int k = random.Next(n + 1);
+                T value = collection[k];
+                collection[k] = collection[n];
+                collection[n] = value;
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/CameraExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/CameraExtensions.cs
new file mode 100644
index 0000000000..99c1641a59
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/CameraExtensions.cs
@@ -0,0 +1,272 @@
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using Xenko.Rendering.Compositing;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Toolkit.Mathematics;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extensions for <see cref="CameraComponent"/>.
+    /// </summary>
+    public static class CameraExtensions
+    {
+        ///// <summary>
+        ///// Gets the scenes composition main camera or null if there is no GraphicsCompositor or Cameras.
+        ///// </summary>
+        ///// <param name="sceneSystem"></param>
+        ///// <param name="mainCameraSlotName"></param>
+        ///// <returns>The selected main CameraComponent</returns>
+        ///// <remarks>
+        ///// If there is more than 1 SceneCameraSlot and there is one with matching name it returns it.
+        ///// If no matching SceneCameraSlot is found the first CameraComponent is Returned.
+        ///// </remarks>
+        ///// <exception cref="ArgumentNullException">If the cameraComponent argument is null.</exception>
+        //public static CameraComponent GetMainCamera(this SceneSystem sceneSystem, string mainCameraSlotName = "Main")
+        //{
+        //    if (sceneSystem == null)
+        //    {
+        //        throw new ArgumentNullException(nameof(sceneSystem));
+        //    }
+
+        //    var cameras = sceneSystem.GraphicsCompositor?.Cameras;
+
+        //    if (cameras == null)
+        //    {
+        //        return null;
+        //    }
+
+        //    SceneCameraSlot cameraSlot = null;
+
+        //    if (cameras.Count == 1)
+        //    {
+        //        cameraSlot = cameras[0];
+        //    }
+        //    else
+        //    {
+        //        cameraSlot = cameras.FirstOrDefault(s => s.Name == mainCameraSlotName);
+        //    }
+
+        //    if (cameraSlot == null && cameras.Count > 0)
+        //    {
+        //        cameraSlot = cameras[0];
+        //    }
+
+        //    return cameraSlot?.Camera;
+        //}
+
+        /// <summary>
+        /// Converts the world position to clip space coordinates relative to camera.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position"></param>
+        /// <returns>
+        /// The position in clip space.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static Vector3 WorldToClip(this CameraComponent cameraComponent, Vector3 position)
+        {
+            cameraComponent.WorldToClip(ref position, out var result);
+            return result;
+
+        }
+
+        /// <summary>
+        /// Converts the world position to clip space coordinates relative to camera.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position"></param>
+        /// <param name="result">The position in clip space.</param>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static void WorldToClip(this CameraComponent cameraComponent, ref Vector3 position, out Vector3 result)
+        {
+            if (cameraComponent == null)
+            {
+                throw new ArgumentNullException(nameof(cameraComponent));
+            }
+
+            Vector3.TransformCoordinate(ref position, ref cameraComponent.ViewProjectionMatrix, out result);
+
+        }
+
+        /// <summary>
+        /// Converts the world position to screen space coordinates relative to camera.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position"></param>
+        /// <returns>
+        /// The screen position in normalized X, Y coordinates. Top-left is (0,0), bottom-right is (1,1). Z is in world units from near camera plane.
+        /// </returns>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static Vector3 WorldToScreenPoint(this CameraComponent cameraComponent, Vector3 position)
+        {
+            cameraComponent.WorldToScreenPoint(ref position, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the world position to screen space coordinates relative to camera.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position"></param>
+        /// <param name="result">The screen position in normalized X, Y coordinates. Top-left is (0,0), bottom-right is (1,1). Z is in world units from near camera plane.</param>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static void WorldToScreenPoint(this CameraComponent cameraComponent, ref Vector3 position, out Vector3 result)
+        {
+            cameraComponent.WorldToClip(ref position, out var clipSpace);
+
+            Vector3.TransformCoordinate(ref position, ref cameraComponent.ViewMatrix, out var viewSpace);
+
+            result = new Vector3
+            {
+                X = (clipSpace.X + 1f) / 2f,
+                Y = 1f - (clipSpace.Y + 1f) / 2f,
+                Z = viewSpace.Z + cameraComponent.NearClipPlane,
+            };
+        }
+
+        /// <summary>
+        /// Converts the screen position to a <see cref="RaySegment"/> in world coordinates.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position"></param>
+        /// <returns><see cref="RaySegment"/>, starting at near plain and ending at the far plain.</returns>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static RaySegment ScreenToWorldRaySegment(this CameraComponent cameraComponent, Vector2 position)
+        {
+            cameraComponent.ScreenToWorldRaySegment(ref position, out var result);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the screen position to a <see cref="RaySegment"/> in world coordinates.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position"></param>
+        /// <param name="result"><see cref="RaySegment"/>, starting at near plain and ending at the far plain.</param>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static void ScreenToWorldRaySegment(this CameraComponent cameraComponent, ref Vector2 position, out RaySegment result)
+        {
+            if (cameraComponent == null)
+            {
+                throw new ArgumentNullException(nameof(cameraComponent));
+            }
+
+            Matrix.Invert(ref cameraComponent.ViewProjectionMatrix, out var inverseViewProjection);
+
+            ScreenToClipSpace(ref position, out var clipSpace);
+
+            Vector3.TransformCoordinate(ref clipSpace, ref inverseViewProjection, out var near);
+
+            clipSpace.Z = 1f;
+            Vector3.TransformCoordinate(ref clipSpace, ref inverseViewProjection, out var far);
+
+            result = new RaySegment(near, far);
+        }
+
+        private static void ScreenToClipSpace(ref Vector2 position, out Vector3 clipSpace)
+        {
+            clipSpace = new Vector3
+            {
+                X = position.X * 2f - 1f,
+                Y = 1f - position.Y * 2f,
+                Z = 0f
+            };
+        }
+
+        private static Vector3 ScreenToClipSpace(Vector2 position)
+        {
+            ScreenToClipSpace(ref position, out var result);
+            return result;
+        }
+
+
+        /// <summary>
+        /// Converts the screen position to a point in world coordinates.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position">The screen position in normalized X, Y coordinates. Top-left is (0,0), bottom-right is (1,1). Z is in world units from near camera plane.</param>
+        /// <returns>Position in world coordinates.</returns>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static Vector3 ScreenToWorldPoint(this CameraComponent cameraComponent, Vector3 position)
+        {
+            cameraComponent.ScreenToWorldPoint(ref position, out var result);
+
+            return result;
+        }
+
+        /// <summary>
+        /// Converts the screen position to a point in world coordinates.
+        /// </summary>
+        /// <param name="cameraComponent"></param>
+        /// <param name="position">The screen position in normalized X, Y coordinates. Top-left is (0,0), bottom-right is (1,1). Z is in world units from near camera plane.</param>
+        /// <param name="result">Position in world coordinates.</param>
+        /// <exception cref="ArgumentNullException">If the cameraComponent argument is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="CameraComponent.ViewMatrix"/> or <see cref="CameraComponent.ProjectionMatrix"/> before performing the transformation.
+        /// If the <see cref="CameraComponent"/> or it's containing <see cref="Entity"/> <see cref="TransformComponent"/>has been modified since the last frame you may need to call the <see cref="CameraComponent.Update()"/> method first.
+        /// </remarks>
+        public static void ScreenToWorldPoint(this CameraComponent cameraComponent, ref Vector3 position, out Vector3 result)
+        {
+            if (cameraComponent == null)
+            {
+                throw new ArgumentNullException(nameof(cameraComponent));
+            }
+            var position2D = position.XY();
+            //Matrix.Invert(ref cameraComponent.ProjectionMatrix, out var inverseProjection);
+            //Matrix.Invert(ref cameraComponent.ViewMatrix, out var inverseView);
+
+            //ScreenToClipSpace(ref position2D, out var clipSpace);
+            //Vector3.TransformCoordinate(ref clipSpace, ref inverseProjection, out var near);
+
+            //near.Z = -position.Z;
+
+            //Vector3.TransformCoordinate(ref near, ref inverseView, out result);
+
+            cameraComponent.ScreenToWorldRaySegment(ref position2D, out var ray);
+
+            var direction = ray.End - ray.Start;
+            direction.Normalize();
+
+            Vector3.TransformNormal(ref direction, ref cameraComponent.ViewMatrix, out var viewSpaceDir);
+
+            float rayDistance = (position.Z / viewSpaceDir.Z);
+
+            result = ray.Start + (direction * rayDistance);
+
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/EntityComponentCollectionExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/EntityComponentCollectionExtensions.cs
new file mode 100644
index 0000000000..c82336de74
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/EntityComponentCollectionExtensions.cs
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Engine;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extension methods for <see cref="IEnumerable{EntityComponent}"/> and <see cref="IEnumerable{ActivableEntityComponent}"/>.
+    /// </summary>
+    public static class EntityComponentCollectionExtensions
+    {
+        /// <summary>
+        /// Enables all <see cref="ActivableEntityComponent"/> in the collection.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="components">A collection of <see cref="ActivableEntityComponent"/> to enable.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="components"/> is <see langword="null"/>.</exception>
+        public static void Enable<T>(this IEnumerable<T> components)
+            where T : ActivableEntityComponent
+        {
+            if (components == null)
+            {
+                throw new ArgumentNullException(nameof(components));
+            }
+
+            foreach (var component in components)
+            {
+                component.Enabled = true;
+            }
+        }
+
+        /// <summary>
+        /// Disables all <see cref="ActivableEntityComponent"/> in the collection.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="components">A collection of <see cref="ActivableEntityComponent"/> to enable.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="components"/> is <see langword="null"/>.</exception>
+        public static void Disable<T>(this IEnumerable<T> components)
+            where T : ActivableEntityComponent
+        {
+            if (components == null)
+            {
+                throw new ArgumentNullException(nameof(components));
+            }
+
+            foreach (var component in components)
+            {
+                component.Enabled = false;
+            }
+        }
+
+        /// <summary>
+        /// Toggles the <see cref="ActivableEntityComponent.Enabled"/> state all <see cref="ActivableEntityComponent"/> in the collection.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="components">A collection of <see cref="ActivableEntityComponent"/> to enable.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="components"/> is <see langword="null"/>.</exception>
+        public static void Toggle<T>(this IEnumerable<T> components)
+            where T : ActivableEntityComponent
+        {
+            if (components == null)
+            {
+                throw new ArgumentNullException(nameof(components));
+            }
+
+            foreach (var component in components)
+            {
+                component.Enabled = !component.Enabled;
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/EntityComponentSearchExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/EntityComponentSearchExtensions.cs
new file mode 100644
index 0000000000..ec24790c12
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/EntityComponentSearchExtensions.cs
@@ -0,0 +1,516 @@
+using Xenko.Engine;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Toolkit.Collections;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extensions for searching for an <see cref="EntityComponent"/> in an <see cref="Entity"/> hierarchy.
+    /// </summary>
+    public static class EntityComponentSearchExtensions
+    {
+
+        /// <summary>
+        /// Performs a breadth first search of the entities children for a component of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+       /// <returns>The component or null if does no exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static T GetComponentInChildren<T>(this Entity entity) 
+            where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.EnqueueRange(entity.GetChildren());
+
+            return GetComponentInChildrenCore<T>(queue);
+        }
+
+        /// <summary>
+        /// Performs a breadth first search of the entity and it's children for a component of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <returns>The component or null if does no exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static T GetComponentInChildrenAndSelf<T>(this Entity entity) 
+            where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.Enqueue(entity);
+
+            return GetComponentInChildrenCore<T>(queue);
+        }
+
+        private static T GetComponentInChildrenCore<T>(Queue<Entity> queue) 
+            where T : EntityComponent
+        {
+            while (queue.Count > 0)
+            {
+                var current = queue.Dequeue();
+
+
+                var component = current.Get<T>();
+
+                if (component != null)
+                {
+                    return component;
+                }
+
+                var children = current.Transform.Children;
+
+                for (int i = 0; i < children.Count; i++)
+                {
+                    queue.Enqueue(children[i].Entity);
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Performs a breadth first search of the entities children for a component of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>The component or null if does no exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static T GetComponentInChildren<T>(this Entity entity, bool includeDisabled = false) 
+            where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.EnqueueRange(entity.GetChildren());
+            return GetComponentInChildrenCore<T>(includeDisabled, queue);
+        }
+
+        /// <summary>
+        /// Performs a breadth first search of the entity and it's children for a component of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>The component or null if does no exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static T GetComponentInChildrenAndSelf<T>(this Entity entity, bool includeDisabled = false) 
+            where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.Enqueue(entity);
+            return GetComponentInChildrenCore<T>(includeDisabled, queue);
+        }
+
+        private static T GetComponentInChildrenCore<T>(bool includeDisabled, Queue<Entity> queue) 
+            where T : ActivableEntityComponent
+        {
+            while (queue.Count > 0)
+            {
+                var current = queue.Dequeue();
+
+
+                var component = current.Get<T>();
+
+                if (component != null && (component.Enabled || includeDisabled))
+                {
+                    return component;
+                }
+
+                var children = current.Transform.Children;
+
+                for (int i = 0; i < children.Count; i++)
+                {
+                    queue.Enqueue(children[i].Entity);
+                }
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entities children for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInChildren<T>(this Entity entity) 
+            where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.EnqueueRange(entity.GetChildren());
+
+            return GetComponentsInChildrenCore<T>(queue);
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entity and it's children for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInChildrenAndSelf<T>(this Entity entity)
+            where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.Enqueue(entity);
+            queue.EnqueueRange(entity.GetChildren());
+
+            return GetComponentsInChildrenCore<T>(queue);
+        }
+
+        private static IEnumerable<T> GetComponentsInChildrenCore<T>(Queue<Entity> queue) 
+            where T : EntityComponent
+        {
+            while (queue.Count > 0)
+            {
+                var current = queue.Dequeue();
+
+                foreach (var component in current.GetAll<T>())
+                {
+                    yield return component;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entities children for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInChildren<T>(this Entity entity, bool includeDisabled = false) 
+            where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.EnqueueRange(entity.GetChildren());
+
+            return GetComponentsInChildrenCore<T>(queue);
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entity and it's children for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInChildrenAndSelf<T>(this Entity entity, bool includeDisabled = false) 
+            where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+
+            //breadth first
+            var queue = new Queue<Entity>();
+            queue.Enqueue(entity);
+            queue.EnqueueRange(entity.GetChildren());
+
+            return GetComponentsInChildrenCore<T>(queue);
+        }
+
+        private static IEnumerable<T> GetComponentsInChildrenCore<T>(Queue<Entity> queue, bool includeDisabled) 
+            where T : ActivableEntityComponent
+        {
+            while (queue.Count > 0)
+            {
+                var current = queue.Dequeue();
+
+                foreach (var component in current.GetAll<T>())
+                {
+                    if (component.Enabled || includeDisabled)
+                    {
+                        yield return component;
+                    }
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Performs a depth first search of the entities decendants for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInDecendants<T>(this Entity entity) 
+            where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //depth first
+            var stack = new Stack<Entity>();
+            stack.Push(entity);
+
+            return GetComponentsInDecendantsCore<T>(stack, false);
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entity and it's decendants for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInDecendantsAndSelf<T>(this Entity entity) 
+            where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //depth first
+            var stack = new Stack<Entity>();
+            stack.Push(entity);
+
+            return GetComponentsInDecendantsCore<T>(stack,true);
+        }
+
+        private static IEnumerable<T> GetComponentsInDecendantsCore<T>(Stack<Entity> stack, bool includeSelf) 
+            where T : EntityComponent
+        {
+            var includeComponents = includeSelf;
+
+            while (stack.Count > 0)
+            {
+                var current = stack.Pop();
+                if (includeComponents)
+                {
+                    foreach (var component in current.GetAll<T>())
+                    {
+                        yield return component;
+                    } 
+                }
+
+                var children = current.Transform.Children;
+
+                for (int i = children.Count - 1; i >= 0; i--)
+                {
+                    stack.Push(children[i].Entity);
+                }
+                includeComponents = true;
+            }
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entity and it's decendants for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInDecendants<T>(this Entity entity, bool includeDisabled = false) 
+            where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //depth first
+            var stack = new Stack<Entity>();
+            stack.Push(entity);
+
+            return GetComponentsInDecendantsCore<T>(stack, includeDisabled, false);
+        }
+
+        /// <summary>
+        /// Performs a depth first search of the entity and it's decendants for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInDecendantsAndSelf<T>(this Entity entity, bool includeDisabled = false)
+            where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            //depth first
+            var stack = new Stack<Entity>();
+            stack.Push(entity);
+
+            return GetComponentsInDecendantsCore<T>(stack, includeDisabled, true);
+        }
+
+        private static IEnumerable<T> GetComponentsInDecendantsCore<T>(Stack<Entity> stack, bool includeDisabled, bool includeSelf) 
+            where T : ActivableEntityComponent
+        {
+            var includeComponents = includeSelf;
+
+            while (stack.Count > 0)
+            {
+                var current = stack.Pop();
+                if (includeComponents)
+                {
+                    foreach (var component in current.GetAll<T>())
+                    {
+                        if (component.Enabled || includeDisabled)
+                        {
+                            yield return component;
+                        }
+                    } 
+                }
+
+                var children = current.Transform.Children;
+
+                for (int i = children.Count - 1; i >= 0; i--)
+                {
+                    stack.Push(children[i].Entity);
+                }
+                includeComponents = true;
+            }
+        }
+
+        /// <summary>
+        /// Performs a search of the entity and it's ancestors for a component of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <returns>The component or <c>null</c> if does no exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static T GetComponentInParent<T>(this Entity entity) where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            var current = entity;
+
+            do
+            {
+                var component = current.Get<T>();
+
+                if (component != null)
+                {
+                    return component;
+                }
+
+            } while ((current = current.GetParent()) != null);
+
+            return null;
+        }
+
+        /// <summary>
+        /// Performs a search of the entity and it's ancestors for a component of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>The component or <c>null</c> if does no exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static T GetComponentInParent<T>(this Entity entity, bool includeDisabled = false) where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            var current = entity;
+
+            do
+            {
+                var component = current.Get<T>();
+
+                if (component != null && (component.Enabled || includeDisabled))
+                {
+                    return component;
+                }
+
+            } while ((current = current.GetParent()) != null);
+
+            return null;
+        }
+
+        /// <summary>
+        /// Performs a search of the entity and it's ancestors for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+       /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInParent<T>(this Entity entity) where T : EntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            var current = entity;
+
+            do
+            {
+                foreach (var component in current.GetAll<T>())
+                {
+                    yield return component;
+                }
+
+
+            } while ((current = current.GetParent()) != null);
+        }
+
+        /// <summary>
+        /// Performs a search of the entity and it's ancestors for all components of the specified type.
+        /// </summary>
+        /// <typeparam name="T">The type of component.</typeparam>
+        /// <param name="entity">The entity.</param>
+        /// <param name="includeDisabled">Should search include <see cref="ActivableEntityComponent"/> where <see cref="ActivableEntityComponent.Enabled"/> is <c>false</c>.</param>
+        /// <returns>An iteration on the components.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static IEnumerable<T> GetComponentsInParent<T>(this Entity entity, bool includeDisabled = false) where T : ActivableEntityComponent
+        {
+            if (entity == null)
+                throw new ArgumentNullException(nameof(entity));
+
+            var current = entity;
+
+            do
+            {
+                foreach (var component in current.GetAll<T>())
+                {
+                    if (component.Enabled || includeDisabled)
+                    {
+                        yield return component;
+                    }
+                }
+
+
+            } while ((current = current.GetParent()) != null);
+        }
+    }
+
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.GetComponents.cs b/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.GetComponents.cs
new file mode 100644
index 0000000000..2f60437b99
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.GetComponents.cs
@@ -0,0 +1,522 @@
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Engine;
+
+namespace Xenko.Toolkit.Engine
+{
+    public static partial class EntityExtensions
+    {
+        /// <summary>
+        /// Gets the two specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the two components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2) Get<TComponent1, TComponent2>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>());
+        }
+
+        /// <summary>
+        /// Gets the three specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the three components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3) Get<TComponent1, TComponent2, TComponent3>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>());
+        }
+
+        /// <summary>
+        /// Gets the four specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the four components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4) Get<TComponent1, TComponent2, TComponent3, TComponent4>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>());
+        }
+
+        /// <summary>
+        /// Gets the five specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the five components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>());
+        }
+
+        /// <summary>
+        /// Gets the six specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the six components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>());
+        }
+
+        /// <summary>
+        /// Gets the seven specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the seven components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>());
+        }
+
+        /// <summary>
+        /// Gets the eight specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the eight components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>());
+        }
+
+        /// <summary>
+        /// Gets the nine specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the nine components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>());
+        }
+
+        /// <summary>
+        /// Gets the ten specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the ten components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>());
+        }
+
+        /// <summary>
+        /// Gets the eleven specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent11">The type of the eleventh component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the eleven components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+            where TComponent11 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>(), entity.Get<TComponent11>());
+        }
+
+        /// <summary>
+        /// Gets the twelve specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent11">The type of the eleventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent12">The type of the twelfth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the twelve components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+            where TComponent11 : EntityComponent
+            where TComponent12 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>(), entity.Get<TComponent11>(), entity.Get<TComponent12>());
+        }
+
+        /// <summary>
+        /// Gets the thirteen specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent11">The type of the eleventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent12">The type of the twelfth component the method returns.</typeparam>
+        /// <typeparam name="TComponent13">The type of the thirteenth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the thirteen components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+            where TComponent11 : EntityComponent
+            where TComponent12 : EntityComponent
+            where TComponent13 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>(), entity.Get<TComponent11>(), entity.Get<TComponent12>(), entity.Get<TComponent13>());
+        }
+
+        /// <summary>
+        /// Gets the fourteen specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent11">The type of the eleventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent12">The type of the twelfth component the method returns.</typeparam>
+        /// <typeparam name="TComponent13">The type of the thirteenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent14">The type of the fourteenth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the fourteen components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13, TComponent14) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13, TComponent14>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+            where TComponent11 : EntityComponent
+            where TComponent12 : EntityComponent
+            where TComponent13 : EntityComponent
+            where TComponent14 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>(), entity.Get<TComponent11>(), entity.Get<TComponent12>(), entity.Get<TComponent13>(), entity.Get<TComponent14>());
+        }
+
+        /// <summary>
+        /// Gets the fifteen specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent11">The type of the eleventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent12">The type of the twelfth component the method returns.</typeparam>
+        /// <typeparam name="TComponent13">The type of the thirteenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent14">The type of the fourteenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent15">The type of the fifteenth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the fifteen components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13, TComponent14, TComponent15) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13, TComponent14, TComponent15>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+            where TComponent11 : EntityComponent
+            where TComponent12 : EntityComponent
+            where TComponent13 : EntityComponent
+            where TComponent14 : EntityComponent
+            where TComponent15 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>(), entity.Get<TComponent11>(), entity.Get<TComponent12>(), entity.Get<TComponent13>(), entity.Get<TComponent14>(), entity.Get<TComponent15>());
+        }
+
+        /// <summary>
+        /// Gets the sixteen specified components.
+        /// </summary>
+        /// <typeparam name="TComponent1">The type of the first component the method returns.</typeparam>
+        /// <typeparam name="TComponent2">The type of the second component the method returns.</typeparam>
+        /// <typeparam name="TComponent3">The type of the third component the method returns.</typeparam>
+        /// <typeparam name="TComponent4">The type of the fourth component the method returns.</typeparam>
+        /// <typeparam name="TComponent5">The type of the fifth component the method returns.</typeparam>
+        /// <typeparam name="TComponent6">The type of the sixth component the method returns.</typeparam>
+        /// <typeparam name="TComponent7">The type of the seventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent8">The type of the eighth component the method returns.</typeparam>
+        /// <typeparam name="TComponent9">The type of the ninth component the method returns.</typeparam>
+        /// <typeparam name="TComponent10">The type of the tenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent11">The type of the eleventh component the method returns.</typeparam>
+        /// <typeparam name="TComponent12">The type of the twelfth component the method returns.</typeparam>
+        /// <typeparam name="TComponent13">The type of the thirteenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent14">The type of the fourteenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent15">The type of the fifteenth component the method returns.</typeparam>
+        /// <typeparam name="TComponent16">The type of the sixteenth component the method returns.</typeparam>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the sixteen components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13, TComponent14, TComponent15, TComponent16) Get<TComponent1, TComponent2, TComponent3, TComponent4, TComponent5, TComponent6, TComponent7, TComponent8, TComponent9, TComponent10, TComponent11, TComponent12, TComponent13, TComponent14, TComponent15, TComponent16>(this Entity entity)
+            where TComponent1 : EntityComponent
+            where TComponent2 : EntityComponent
+            where TComponent3 : EntityComponent
+            where TComponent4 : EntityComponent
+            where TComponent5 : EntityComponent
+            where TComponent6 : EntityComponent
+            where TComponent7 : EntityComponent
+            where TComponent8 : EntityComponent
+            where TComponent9 : EntityComponent
+            where TComponent10 : EntityComponent
+            where TComponent11 : EntityComponent
+            where TComponent12 : EntityComponent
+            where TComponent13 : EntityComponent
+            where TComponent14 : EntityComponent
+            where TComponent15 : EntityComponent
+            where TComponent16 : EntityComponent
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (entity.Get<TComponent1>(), entity.Get<TComponent2>(), entity.Get<TComponent3>(), entity.Get<TComponent4>(), entity.Get<TComponent5>(), entity.Get<TComponent6>(), entity.Get<TComponent7>(), entity.Get<TComponent8>(), entity.Get<TComponent9>(), entity.Get<TComponent10>(), entity.Get<TComponent11>(), entity.Get<TComponent12>(), entity.Get<TComponent13>(), entity.Get<TComponent14>(), entity.Get<TComponent15>(), entity.Get<TComponent16>());
+        }
+
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.GetComponents.tt b/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.GetComponents.tt
new file mode 100644
index 0000000000..3ac84fc9be
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.GetComponents.tt
@@ -0,0 +1,138 @@
+<#@ template debug="false" hostspecific="false" language="C#" #>
+<#@ assembly name="System.Core" #>
+<#@ import namespace="System.Linq" #>
+<#@ import namespace="System.Text" #>
+<#@ import namespace="System.Collections.Generic" #>
+<#@ output extension=".cs" #>
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Engine;
+
+namespace Xenko.Toolkit.Engine
+{
+    public static partial class EntityExtensions
+    {
+<# foreach(var i in Enumerable.Range(2,15))  { 
+var genericArgs = Enumerable.Range(1, i).Select(t => $"TComponent{t}").ToList();
+
+#>
+        /// <summary>
+        /// Gets the <#= NumberToWords(i) #> specified components.
+        /// </summary>
+<# foreach(var targ in genericArgs)  { #>
+        /// <typeparam name="<#= targ #>">The type of the <#= NumberToOrdinalWords(Int32.Parse(targ.Replace("TComponent",""))) #> component the method returns.</typeparam>
+<#}#>
+        /// <param name="entity">The <see cref="Entity"/> to get the components from.</param>
+        /// <returns>The tuple of the <#= NumberToWords(i) #> components or <c>null</c> if component does not exist.</returns>
+        /// <exception cref="ArgumentNullException">The entity was <c>null</c>.</exception>
+        public static (<#= String.Join(", ", genericArgs) #>) Get<<#= String.Join(", ", genericArgs) #>>(this Entity entity)
+<# foreach(var targ in genericArgs)  { #>
+            where <#= targ #> : EntityComponent
+<#}#>
+        {
+            if (entity == null)
+            {
+                throw new ArgumentNullException(nameof(entity));
+            }
+
+            return (<#= String.Join(", ", genericArgs.Select(t => $"entity.Get<{t}>()")) #>);
+        }
+
+<#}#>
+    }
+}
+<#+
+private static string NumberToWords(int number)
+{
+    if (number == 0)
+        return "zero";
+
+    if (number < 0)
+        return "minus " + NumberToWords(Math.Abs(number));
+
+    string words = "";
+
+    if ((number / 1000000) > 0)
+    {
+        words += NumberToWords(number / 1000000) + " million ";
+        number %= 1000000;
+    }
+
+    if ((number / 1000) > 0)
+    {
+        words += NumberToWords(number / 1000) + " thousand ";
+        number %= 1000;
+    }
+
+    if ((number / 100) > 0)
+    {
+        words += NumberToWords(number / 100) + " hundred ";
+        number %= 100;
+    }
+
+    if (number > 0)
+    {
+        if (words != "")
+            words += "and ";
+
+        var unitsMap = new[] { "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen", "eighteen", "nineteen" };
+        var tensMap = new[] { "zero", "ten", "twenty", "thirty", "forty", "fifty", "sixty", "seventy", "eighty", "ninety" };
+
+        if (number < 20)
+            words += unitsMap[number];
+        else
+        {
+            words += tensMap[number / 10];
+            if ((number % 10) > 0)
+                words += "-" + unitsMap[number % 10];
+        }
+    }
+
+    return words;
+}
+
+private static string NumberToOrdinalWords(int number)
+{
+	var words = NumberToWords(number);
+	var lastWord = words.Split(' ').Last();
+
+	var specialCase = new Dictionary<string, string>()
+	{
+		{"one", "first"},
+        {"two", "second"},
+        {"three", "third"},
+        {"five", "fifth"},
+        {"eight", "eighth"},
+        {"twelve", "twelfth"},
+        {"nine", "ninth"},
+	};
+
+	if(specialCase.TryGetValue(lastWord, out var replacement))
+	{
+		return ReplaceLastOccurrence(words, lastWord, replacement);
+	}
+
+
+	replacement = lastWord;
+
+	if(replacement.EndsWith("y"))
+	{
+		replacement = ReplaceLastOccurrence(replacement, "y", "ie");
+	}
+
+	return ReplaceLastOccurrence(words, lastWord, replacement + "th");
+}
+
+private static string ReplaceLastOccurrence(string source, string oldValue, string newValue)
+{
+        int place = source.LastIndexOf(oldValue);
+
+        if(place == -1)
+           return source;
+
+        string result = source.Remove(place, oldValue.Length).Insert(place, newValue);
+        return result;
+}
+#>
diff --git a/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.cs
new file mode 100644
index 0000000000..c4044035ff
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/EntityExtensions.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xenko.Engine;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extension methods for <see cref="EntityComponent"/>.
+    /// </summary>
+    public static partial class EntityExtensions
+    {
+        
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/GameExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/GameExtensions.cs
new file mode 100644
index 0000000000..e8ff0e46aa
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/GameExtensions.cs
@@ -0,0 +1,55 @@
+using Xenko.Games;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extensions for <see cref="IGame"/>
+    /// </summary>
+    public static class GameExtensions
+    {
+        /// <summary>
+        /// Gets the elapsed total seconds since last update.
+        /// </summary>
+        /// <param name="game">The game.</param>
+        /// <returns>Elapsed update time in seconds.</returns>
+        /// <exception cref="ArgumentNullException">If the game argument is null.</exception>
+        public static float GetDeltaTime(this IGame game)
+        {
+            if (game == null)
+            {
+                throw new ArgumentNullException(nameof(game));
+            }
+
+            return (float)game.UpdateTime.Elapsed.TotalSeconds;
+        }
+
+        /// <summary>
+        /// Exits the game.
+        /// </summary>
+        /// <param name="game">The game.</param>
+        /// <exception cref="ArgumentNullException">If the game argument is null.</exception>
+        /// /// <exception cref="ArgumentException">If the game argument does not inherit form <see cref="GameBase"/>.</exception>
+        public static void Exit(this IGame game)
+        {
+            if (game == null)
+            {
+                throw new ArgumentNullException(nameof(game));
+            }
+
+            if (game is GameBase gameBase)
+            {
+                gameBase.Exit();
+            }
+            else
+            {
+                throw new ArgumentException($"The argument {nameof(game)} does not inherit from {nameof(GameBase)}.", nameof(game));
+            }
+        }
+
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/ModelComponentExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/ModelComponentExtensions.cs
new file mode 100644
index 0000000000..408f38d462
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/ModelComponentExtensions.cs
@@ -0,0 +1,298 @@
+using System;
+using Xenko.Engine;
+using Xenko.Rendering;
+using Xenko.Toolkit.Rendering;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extension methods for <see cref="ModelComponent"/>.
+    /// </summary>
+    public static class ModelComponentExtensions
+    {
+        /// <summary>
+        /// Sets an object of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameterAccessor">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ObjectParameterAccessor<T> parameterAccessor, T value, int materialIndex = 0, int passIndex = 0)
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameterAccessor, value);
+        }
+
+        /// <summary>
+        /// Sets a blittable value of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameter<T> parameter, T value, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, value);
+        }
+
+        /// <summary>
+        /// Sets blittable values of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="count">Number of values.</param>
+        /// <param name="firstValue">The values.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameter<T> parameter, int count, ref T firstValue, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, count, ref firstValue);
+        }
+
+        /// <summary>
+        /// Sets blittable value of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameter<T> parameter, ref T value, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, ref value);
+        }
+
+        /// <summary>
+        /// Sets blittable values of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="count">Number of values.</param>
+        /// <param name="firstValue">The values.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameterKey<T> parameter, int count, ref T firstValue, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, count, ref firstValue);
+        }
+
+        /// <summary>
+        /// Sets blittable values of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="values">The values.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameterKey<T> parameter, T[] values, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, values);
+        }
+
+        /// <summary>
+        /// Sets a blittable value of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameterKey<T> parameter, ref T value, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, ref value);
+        }
+
+        /// <summary>
+        /// Sets a blittable of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ValueParameterKey<T> parameter, T value, int materialIndex = 0, int passIndex = 0) where T : struct
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, value);
+        }
+
+        /// <summary>
+        /// Sets a permutation of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, PermutationParameter<T> parameter, T value, int materialIndex = 0, int passIndex = 0)
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, value);
+        }
+
+        /// <summary>
+        /// Sets an object of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, ObjectParameterKey<T> parameter, T value, int materialIndex = 0, int passIndex = 0)
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, value);
+        }
+
+        /// <summary>
+        /// Sets a permutation of the material pass parameter. Cloning the <see cref="Material"/> if required.
+        /// </summary>
+        /// <typeparam name="T">The type of value.</typeparam>
+        /// <param name="modelComponent">The <see cref="ModelComponent"/> to update material parameter on.</param>
+        /// <param name="parameter">The parameter to update.</param>
+        /// <param name="value">The value.</param>
+        /// <param name="materialIndex">The index of the material to update. Default is 0.</param>
+        /// <param name="passIndex">The index of the pass of the material to update. Default is 0.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">
+        /// If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.
+        /// Or if <paramref name="passIndex"/> is less than 0 or greater than or equal to the mu,ber of passes the material has.
+        /// </exception>
+        public static void SetMaterialParameter<T>(this ModelComponent modelComponent, PermutationParameterKey<T> parameter, T value, int materialIndex = 0, int passIndex = 0)
+        {
+            modelComponent.GetMaterialPassParameters(materialIndex, passIndex).Set(parameter, value);
+        }
+
+
+
+        /// <summary>
+        /// Clones a <see cref="ModelComponent"/>s <see cref="Material"/> if required;
+        /// </summary>
+        /// <param name="modelComponent"></param>
+        /// <param name="materialIndex"></param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="modelComponent"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="materialIndex"/> is less than 0 or greater than <see cref="ModelComponent.GetMaterialCount"/> and not in <see cref="ModelComponent.Materials"/>.</exception>
+        private static Material GetMaterialCopy(this ModelComponent modelComponent, int materialIndex)
+        {
+            if (modelComponent == null)
+            {
+                throw new ArgumentNullException(nameof(modelComponent));
+            }
+
+            if (!IsValidMaterialIndex(modelComponent, materialIndex))
+            {
+                throw new ArgumentOutOfRangeException(nameof(materialIndex));
+            }
+
+            var material = modelComponent.GetMaterial(materialIndex);
+
+            if (material is ModelComponentMaterialCopy copy && copy.ModelComponent == modelComponent)
+            {
+                return material;
+            }
+
+            var materialCopy = new ModelComponentMaterialCopy()
+            {
+                ModelComponent = modelComponent,
+            };
+
+            MaterialExtensions.CopyProperties(material, materialCopy);
+
+            modelComponent.Materials[materialIndex] = materialCopy;
+
+            return materialCopy;
+        }
+
+        private static bool IsValidMaterialIndex(ModelComponent modelComponent, int materialIndex)
+        {
+            if (materialIndex < 0) return false;
+
+            int materialCount = modelComponent.GetMaterialCount();
+
+            if (materialCount > 0)
+            {
+                return materialIndex < materialCount;
+            }
+            else
+            {
+                return modelComponent.Materials.ContainsKey(materialIndex);
+            }            
+        }
+
+        private static ParameterCollection GetMaterialPassParameters(this ModelComponent modelComponent, int materialIndex, int passIndex)
+        {
+            var material = modelComponent.GetMaterialCopy(materialIndex);
+
+            if (passIndex < 0 || passIndex >= material.Passes.Count)
+            {
+                throw new ArgumentOutOfRangeException(nameof(passIndex));
+            }
+
+            return material.Passes[passIndex].Parameters;
+        }
+
+        private class ModelComponentMaterialCopy : Material
+        {
+            public ModelComponent ModelComponent { get; set; }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/PrefabExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/PrefabExtensions.cs
new file mode 100644
index 0000000000..180f6a066c
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/PrefabExtensions.cs
@@ -0,0 +1,389 @@
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Toolkit.Mathematics;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extension methods for <see cref="Prefab"/>.
+    /// </summary>
+    public static class PrefabExtensions
+    {
+        private static void ValidateSinglePrefab(Prefab prefab)
+        {
+            if (prefab == null)
+            {
+                throw new ArgumentNullException(nameof(prefab));
+            }
+
+            if (prefab.Entities.Count > 1)
+            {
+                throw new InvalidOperationException("Prefab contains for than 1 entity.");
+            }
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/>.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab)
+        {
+            ValidateSinglePrefab(prefab);
+
+            var instances = prefab.Instantiate();
+
+            return instances[0];
+        }
+        
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, ref Vector3 translation)
+        {
+            var one = Vector3.One;
+            var rotation = Quaternion.Identity;
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, Vector3 translation)
+        {
+            var one = Vector3.One;
+            var rotation = Quaternion.Identity;
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in radians to rotate the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, ref Vector3 translation, ref Vector3 rotationEulerAngles)
+        {
+            var one = Vector3.One;
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in radians to rotate the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, Vector3 translation, Vector3 rotationEulerAngles)
+        {
+            var one = Vector3.One;
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, ref Vector3 translation, ref Quaternion rotation)
+        {
+            var one = Vector3.One;
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, Vector3 translation, Quaternion rotation)
+        {
+            var one = Vector3.One;
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in radians to rotate the entity by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, ref Vector3 translation, ref Vector3 rotationEulerAngles, ref Vector3 scale)
+        {
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref scale);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in radians to rotate the entity by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, Vector3 translation, Vector3 rotationEulerAngles, Vector3 scale)
+        {
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref scale);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entity by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, ref Vector3 translation, ref Quaternion rotation, ref Vector3 scale)
+        {
+            ValidateSinglePrefab(prefab);
+
+            var instances = prefab.Instantiate();
+
+            var instance = instances[0];
+            Matrix.Transformation(ref scale, ref rotation, ref translation, out Matrix localMatrix);
+
+            instance.Transform.UpdateLocalMatrix();
+            var entityMatrix = instance.Transform.LocalMatrix * localMatrix;
+
+            if (instance.Transform.UseTRS)
+            {
+                entityMatrix.Decompose(out instance.Transform.Scale, out instance.Transform.Rotation, out instance.Transform.Position);
+            }
+            else
+            {
+                instance.Transform.LocalMatrix = entityMatrix;
+            }
+
+            return instance;
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> that contains a single <see cref="Entity"/> and applies a transform.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entity by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entity by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entity by.</param>
+        /// <returns>The instatiated and translated <see cref="Entity"/>.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        /// <exception cref="InvalidOperationException">If <paramref name="prefab"/> does not have exactly 1 <see cref="Entity"/>.</exception>
+        public static Entity InstantiateSingle(this Prefab prefab, Vector3 translation, Quaternion rotation, Vector3 scale)
+        {
+            return prefab.InstantiateSingle(ref translation, ref rotation, ref scale);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, ref Vector3 translation)
+        {
+            var one = Vector3.One;
+            var rotation = Quaternion.Identity;
+            return prefab.Instantiate(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, Vector3 translation)
+        {
+            var one = Vector3.One;
+            var rotation = Quaternion.Identity;
+            return prefab.Instantiate(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in euler angles to rotate the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, ref Vector3 translation, ref Vector3 rotationEulerAngles)
+        {
+            var one = Vector3.One;
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.Instantiate(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in euler angles to rotate the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, Vector3 translation, Vector3 rotationEulerAngles)
+        {
+            var one = Vector3.One;
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.Instantiate(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, ref Vector3 translation, ref Quaternion rotation)
+        {
+            var one = Vector3.One;
+            return prefab.Instantiate(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, Vector3 translation, Quaternion rotation)
+        {
+            var one = Vector3.One;
+            return prefab.Instantiate(ref translation, ref rotation, ref one);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in euler angles to rotate the entities by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, ref Vector3 translation, ref Vector3 rotationEulerAngles, ref Vector3 scale)
+        {
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.Instantiate(ref translation, ref rotation, ref scale);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotationEulerAngles">The X, Y and Z rotations in euler angles to rotate the entities by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, Vector3 translation, Vector3 rotationEulerAngles, Vector3 scale)
+        {
+            MathUtilEx.ToQuaternion(ref rotationEulerAngles, out var rotation);
+            return prefab.Instantiate(ref translation, ref rotation, ref scale);
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entities by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, ref Vector3 translation, ref Quaternion rotation, ref Vector3 scale)
+        {
+            if (prefab == null)
+            {
+                throw new ArgumentNullException(nameof(prefab));
+            }
+
+            Matrix localMatrix;
+            Matrix.Transformation(ref scale, ref rotation, ref translation, out localMatrix);
+
+            var instances = prefab.Instantiate();
+
+            foreach (var instance in instances)
+            {
+                instance.Transform.UpdateLocalMatrix();
+                var entityMatrix = instance.Transform.LocalMatrix * localMatrix;
+
+                if (instance.Transform.UseTRS)
+                {
+                    entityMatrix.Decompose(out instance.Transform.Scale, out instance.Transform.Rotation, out instance.Transform.Position);
+                }
+                else
+                {
+                    instance.Transform.LocalMatrix = entityMatrix;
+                }                
+                
+            }   
+
+            return instances;
+        }
+
+        /// <summary>
+        /// Instantiates a <see cref="Prefab"/> and a applies a transform to all the entites.
+        /// </summary>
+        /// <param name="prefab">The <see cref="Prefab"/> to instantiate.</param>
+        /// <param name="translation">The <see cref="Vector3"/> to translate the entities by.</param>
+        /// <param name="rotation">The <see cref="Quaternion"/> to rotate the entities by.</param>
+        /// <param name="scale">The <see cref="Vector3"/> to scale the entities by.</param>
+        /// <returns>The instatiated and translated entities.</returns>
+        /// <exception cref="ArgumentException">If <paramref name="prefab"/> is <see langword="null"/>.</exception>
+        public static List<Entity> Instantiate(this Prefab prefab, Vector3 translation, Quaternion rotation, Vector3 scale)
+        {
+            return prefab.Instantiate(ref translation, ref rotation, ref scale);
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/ScriptDelegateWatcher.cs b/sources/tools/Xenko.Toolkit/Engine/ScriptDelegateWatcher.cs
new file mode 100644
index 0000000000..4b0e2fbbf7
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/ScriptDelegateWatcher.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Engine;
+
+namespace Xenko.Toolkit.Engine
+{
+    internal readonly struct ScriptDelegateWatcher
+    {
+        private readonly ScriptComponent script;
+
+        public ScriptDelegateWatcher(Delegate delgate)
+        {
+            if (delgate == null)
+            {
+                throw new ArgumentNullException(nameof(delgate));
+            }
+
+            var invocationList = delgate.GetInvocationList();
+
+            if (invocationList.Length == 1 && invocationList[0].Target is ScriptComponent scriptComponent)
+            {
+                script = scriptComponent;
+            }
+            else
+            {
+                script = null;
+            }
+
+        }
+
+        public bool IsActive => script == null || (script.Entity != null && (script.SceneSystem?.SceneInstance?.Contains(script.Entity) == true));
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/ScriptSystemExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/ScriptSystemExtensions.cs
new file mode 100644
index 0000000000..7b38d6eac9
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/ScriptSystemExtensions.cs
@@ -0,0 +1,560 @@
+using Xenko.Core.MicroThreading;
+using Xenko.Engine;
+using Xenko.Engine.Events;
+using Xenko.Engine.Processors;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extension methods for <see cref="ScriptSystem"/>.
+    /// </summary>
+    public static class ScriptSystemExtensions
+    {
+        /// <summary>
+        /// Waits for the specified delay <paramref name="delay"/> .
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="delay">The amount of time to wait.</param>
+        /// <returns>The <see cref="Task"/> to await.</returns>
+        public static async Task WaitFor(this ScriptSystem scriptSystem, TimeSpan delay)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (delay <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(delay), "Must be greater than zero.");
+            }
+
+            while (scriptSystem.Game.IsRunning && delay >= TimeSpan.Zero)
+            {
+                delay -= scriptSystem.Game.UpdateTime.Elapsed;
+                await scriptSystem.NextFrame();
+            }
+
+        }
+
+        /// <summary>
+        /// Waits for the specified delay <paramref name="delay"/> .
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="delay">The amount of time to wait.</param>
+        /// <param name="scriptDelegateWatcher">Allows to stop waiting if <see cref="ScriptComponent"/> is not active.</param>
+        /// <returns>The <see cref="Task"/> to await.</returns>
+        internal static async Task WaitFor(this ScriptSystem scriptSystem, TimeSpan delay, ScriptDelegateWatcher scriptDelegateWatcher)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (delay <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(delay), "Must be greater than zero.");
+            }
+
+            while (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive && delay >= TimeSpan.Zero)
+            {
+                delay -= scriptSystem.Game.UpdateTime.Elapsed;
+                await scriptSystem.NextFrame();
+            }
+
+        }
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes when the event is published.
+        /// </summary>
+        /// <typeparam name="T">The type of the event handler parameter.</typeparam>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="eventKey">The event to wait for.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/>, <paramref name="eventKey"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddOnEventAction<T>(
+            this ScriptSystem scriptSystem, 
+            EventKey<T> eventKey, Action<T> action, 
+            long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+            
+            if (eventKey == null)
+            {
+                throw new ArgumentNullException(nameof(eventKey));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }            
+
+            return scriptSystem.AddOnEventAction(new EventReceiver<T>(eventKey), action, priority);
+
+        }
+
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes when the event is published.
+        /// </summary>
+        /// <typeparam name="T">The type of the event handler parameter.</typeparam>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="receiver">The event reciever to listen to for.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/>, <paramref name="receiver"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddOnEventAction<T>(
+            this ScriptSystem scriptSystem, 
+            EventReceiver<T> receiver, 
+            Action<T> action, 
+            long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (receiver == null)
+            {
+                throw new ArgumentNullException(nameof(receiver));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return scriptSystem.AddTask(DoEvent, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoEvent()
+            {
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                while (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    if(receiver.TryReceive(out var data))
+                    {
+                        action(data);
+                    }
+
+                    await scriptSystem.NextFrame();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes when the event is published.
+        /// </summary>
+        /// <typeparam name="T">The type of the event handler parameter.</typeparam>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="eventKey">The event to wait for.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/>, <paramref name="eventKey"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddOnEventTask<T>(
+           this ScriptSystem scriptSystem,
+           EventKey<T> eventKey, Func<T,Task> action,
+           long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (eventKey == null)
+            {
+                throw new ArgumentNullException(nameof(eventKey));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return scriptSystem.AddOnEventTask(new EventReceiver<T>(eventKey), action, priority);
+
+        }
+
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes when the event is published.
+        /// </summary>
+        /// <typeparam name="T">The type of the event handler parameter.</typeparam>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="receiver">The event reciever to listen to for.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/>, <paramref name="receiver"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddOnEventTask<T>(
+            this ScriptSystem scriptSystem,
+            EventReceiver<T> receiver,
+            Func<T, Task> action,
+            long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (receiver == null)
+            {
+                throw new ArgumentNullException(nameof(receiver));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+
+            return scriptSystem.AddTask(DoEvent, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoEvent()
+            {
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                while (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    if (receiver.TryReceive(out var data))
+                    {
+                        await action(data);
+                    }
+
+                    await scriptSystem.NextFrame();
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes after waiting specified delay.
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="delay">The amount of time to wait for.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="delay"/> is less than zero.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddTask(
+           this ScriptSystem scriptSystem,
+           Func<Task> action,
+           TimeSpan delay,
+           long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }          
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            return scriptSystem.AddTask(DoTask, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoTask()
+            {
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                await scriptSystem.WaitFor(delay, scriptDelegateWatcher);
+
+                if (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    await action(); 
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes after waiting specified delay.
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="delay">The amount of time to wait for.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="delay"/> is less than zero.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddAction(
+           this ScriptSystem scriptSystem,
+           Action action,
+           TimeSpan delay,
+           long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if(delay <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(delay), "Must be greater than zero.");
+            }
+
+            return scriptSystem.AddTask(DoTask, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoTask()
+            {
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                await scriptSystem.WaitFor(delay, scriptDelegateWatcher);
+
+                if (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    action();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes after waiting specified delay and repeats execution.
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="delay">The amount of time to wait for.</param>
+        /// <param name="repeatEvery">The amount of time to wait for between repetition.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="delay"/> or <paramref name="repeatEvery"/> is less than zero.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddTask(
+           this ScriptSystem scriptSystem,
+           Func<Task> action,
+           TimeSpan delay,
+           TimeSpan repeatEvery,
+           long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (delay <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(delay), "Must be greater than zero.");
+            }
+
+            return scriptSystem.AddTask(DoTask, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoTask()
+            {
+                var elapsedTime = new TimeSpan(0);
+
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                while (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    elapsedTime += scriptSystem.Game.UpdateTime.Elapsed;
+
+                    if (elapsedTime >= delay)
+                    {
+                        elapsedTime -= delay;
+                        delay = repeatEvery;
+                        await action();
+                    }
+                    await scriptSystem.NextFrame();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes after waiting specified delay and repeats execution.
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="action">The micro thread function to execute.</param>
+        /// <param name="delay">The amount of time to wait for.</param>
+        /// <param name="repeatEvery">The amount of time to wait for between repetition.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="delay"/> or <paramref name="repeatEvery"/> is less than zero.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddAction(
+           this ScriptSystem scriptSystem,
+           Action action,
+           TimeSpan delay,
+           TimeSpan repeatEvery,
+           long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (delay <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(delay), "Must be greater than zero.");
+            }
+
+            if (repeatEvery <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(repeatEvery), "Must be greater than zero.");
+            }
+
+            return scriptSystem.AddTask(DoTask, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoTask()
+            {
+                var elapsedTime = new TimeSpan(0);
+
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                while (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    elapsedTime += scriptSystem.Game.UpdateTime.Elapsed;
+
+                    if(elapsedTime >= delay)
+                    {
+                        elapsedTime -= delay;
+                        delay = repeatEvery;
+                        action();
+                    }                    
+                    await scriptSystem.NextFrame();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds a micro thread function to the <paramref name="scriptSystem"/> that executes after waiting specified delay and repeats execution.
+        /// </summary>
+        /// <param name="scriptSystem">The <see cref="ScriptSystem"/>.</param>
+        /// <param name="action">The micro thread function to execute. The parameter is the progress over time from 0.0f to 1.0f.</param>
+        /// <param name="duration">The duration of the time to execute the micro thread function for.</param>
+        /// <param name="priority">The priority of the micro thread action being added.</param>
+        /// <returns>The <see cref="MicroThread"/>.</returns>
+        /// <exception cref="ArgumentNullException"> If <paramref name="scriptSystem"/> or <paramref name="action"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentOutOfRangeException">If <paramref name="duration"/> is less than zero.</exception>
+        /// <remarks>
+        /// If the <paramref name="action"/> is a <see cref="ScriptComponent"/> instance method the micro thread will be automatically stopped if the <see cref="ScriptComponent"/> or <see cref="Entity"/> is removed.
+        /// </remarks>
+        public static MicroThread AddOverTimeAction(
+           this ScriptSystem scriptSystem,
+           Action<float> action,
+           TimeSpan duration,
+           long priority = 0L)
+        {
+            if (scriptSystem == null)
+            {
+                throw new ArgumentNullException(nameof(scriptSystem));
+            }
+
+            if (action == null)
+            {
+                throw new ArgumentNullException(nameof(action));
+            }
+
+            if (duration <= TimeSpan.Zero)
+            {
+                throw new ArgumentOutOfRangeException(nameof(duration), "Must be greater than zero.");
+            }
+
+            return scriptSystem.AddTask(DoTask, priority);
+
+            //C# 7 Local function could also use a variable Func<Task> DoEvent = async () => { ... };
+            async Task DoTask()
+            {
+                var elapsedTime = new TimeSpan(0);
+
+                var scriptDelegateWatcher = new ScriptDelegateWatcher(action);
+
+                while (scriptSystem.Game.IsRunning && scriptDelegateWatcher.IsActive)
+                {
+                    elapsedTime += scriptSystem.Game.UpdateTime.Elapsed;
+
+                    if (elapsedTime >= duration)
+                    {
+                        action(1.0f);
+                        break;
+                    }
+                    else
+                    {
+                        var progress = (float)(elapsedTime.TotalSeconds / duration.TotalSeconds);
+
+                        action(progress);
+                    }
+                    await scriptSystem.NextFrame();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Cancels all <see cref="MicroThread"/> and clears the <paramref name="microThreads"/> collection.
+        /// </summary>
+        /// <param name="microThreads">A collection of <see cref="MicroThread"/> to cancel.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="microThreads"/> is <see langword="null"/>.</exception>
+        public static void CancelAll(this ICollection<MicroThread> microThreads)
+        {
+            if (microThreads == null)
+            {
+                throw new ArgumentNullException(nameof(microThreads));
+            }
+
+            foreach (var thread in microThreads)
+            {
+                thread.Cancel();
+            }
+
+            microThreads.Clear();
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/Space.cs b/sources/tools/Xenko.Toolkit/Engine/Space.cs
new file mode 100644
index 0000000000..2e17e9b921
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/Space.cs
@@ -0,0 +1,17 @@
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// The coordinate space in which to operate.
+    /// </summary>
+    public enum Space
+    {
+        /// <summary>
+        /// Applies transformation relative to the world coordinate system.
+        /// </summary>
+        World,
+        /// <summary>
+        /// Applies transformation relative to the local coordinate system.
+        /// </summary>
+        Self,
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Engine/TransformExtensions.cs b/sources/tools/Xenko.Toolkit/Engine/TransformExtensions.cs
new file mode 100644
index 0000000000..af1246e4b4
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Engine/TransformExtensions.cs
@@ -0,0 +1,643 @@
+using Xenko.Core.Mathematics;
+using Xenko.Engine;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Toolkit.Mathematics;
+
+namespace Xenko.Toolkit.Engine
+{
+    /// <summary>
+    /// Extension methods for <see cref="TransformComponent"/>.
+    /// </summary>
+    public static class TransformExtensions
+    {
+        /// <summary>
+        /// The default world up vector. The default is <see cref="Vector3.UnitY"/>.
+        /// </summary>
+        public static Vector3 WorldUp = Vector3.UnitY;
+
+        /// <summary>
+        /// Updates the <see cref="TransformComponent.Position"/>, <see cref="TransformComponent.Rotation"/> and <see cref="TransformComponent.Scale"/> members of the given <see cref="TransformComponent"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        public static void UpdateTRSFromLocal(this TransformComponent transform)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            transform.LocalMatrix.Decompose(out transform.Scale, out transform.Rotation, out transform.Position);
+        }
+
+        /// <summary>
+        /// Moves the given <see cref="TransformComponent"/> position by the specified <paramref name="translation"/> in the coordinate space defined by <paramref name="relativeTo"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="translation">The translation vector to move by.</param>
+        /// <param name="relativeTo">The coordinate space to perform the translation in.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void Translate(this TransformComponent transform, ref Vector3 translation, Space relativeTo = Space.Self)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            if (!transform.UseTRS)
+            {
+                throw new ArgumentException("Must use TRS", nameof(transform));
+            }
+
+            var localTranslation = translation;
+
+
+            if (relativeTo == Space.Self)
+            {
+                Vector3.TransformNormal(ref translation, ref transform.WorldMatrix, out localTranslation);
+            }
+
+            if (transform.Parent != null)
+            {
+                Matrix.Invert(ref transform.Parent.WorldMatrix, out var inverseParent);
+                Vector3.TransformNormal(ref localTranslation, ref inverseParent, out localTranslation);
+            }
+
+            transform.Position += localTranslation;
+
+            transform.UpdateWorldMatrix();
+        }
+
+        /// <summary>
+        /// Moves the given <see cref="TransformComponent"/> position by the specified <paramref name="translation"/> in the coordinate space defined by <paramref name="relativeTo"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="translation">The translation vector to move by.</param>
+        /// <param name="relativeTo">The coordinate space to perform the translation in.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void Translate(this TransformComponent transform, Vector3 translation, Space relativeTo = Space.Self)
+        {
+            transform.Translate(ref translation, relativeTo);
+        }
+
+        /// <summary>
+        /// Moves the given <see cref="TransformComponent"/> position by the specified <paramref name="translation"/> relative to the local coordinate space of another <see cref="TransformComponent"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="translation">The translation vector to move by.</param>
+        /// <param name="relativeTo">The <see cref="TransformComponent"/> to perform the translation relative to.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> or <paramref name="relativeTo"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void Translate(this TransformComponent transform, ref Vector3 translation, TransformComponent relativeTo)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            if (!transform.UseTRS)
+            {
+                throw new ArgumentException("Must use TRS", nameof(transform));
+            }
+
+            if (relativeTo == null)
+            {
+                throw new ArgumentNullException(nameof(relativeTo));
+            }
+
+            relativeTo.TransformDirection(ref translation, out var localTranslation);
+            transform.Translate(ref localTranslation, Space.World);
+
+        }
+
+        /// <summary>
+        /// Moves the given <see cref="TransformComponent"/> position by the specified <paramref name="translation"/> relative to the local coordinate space of another <see cref="TransformComponent"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="translation">The translation vector to move by.</param>
+        /// <param name="relativeTo">The <see cref="TransformComponent"/> to perform the translation relative to.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> or <paramref name="relativeTo"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void Translate(this TransformComponent transform, Vector3 translation, TransformComponent relativeTo)
+        {
+            transform.Translate(ref translation, relativeTo);
+        }
+
+        /// <summary>
+        /// Rotates the given <see cref="TransformComponent"/> by the specified <paramref name="eulerAngles"/> in the coordinate space defined by <paramref name="relativeTo"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="eulerAngles">The euler angles in radians to rotate by.</param>
+        /// <param name="relativeTo">The coordinate space to perform the rotation in.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void Rotate(this TransformComponent transform, ref Vector3 eulerAngles, Space relativeTo = Space.Self)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            if (!transform.UseTRS)
+            {
+                throw new ArgumentException("Must use TRS", nameof(transform));
+            }
+
+
+            Quaternion rotation = Quaternion.Identity;
+
+            if(relativeTo == Space.Self)
+            {
+                //What do I do here???
+                if(eulerAngles.X != 0f)
+                {
+                    var right = transform.WorldMatrix.Right; right.Normalize();
+                    Quaternion.RotationAxis(ref right, eulerAngles.X, out var axisRotation);
+                    Quaternion.Multiply(ref rotation, ref axisRotation, out rotation);
+                }
+
+                if (eulerAngles.Y != 0f)
+                {
+                    var up = transform.WorldMatrix.Up; up.Normalize();
+                    Quaternion.RotationAxis(ref up, eulerAngles.Y, out var axisRotation);
+                    Quaternion.Multiply(ref rotation, ref axisRotation, out rotation);
+                }
+
+                if (eulerAngles.Z != 0f)
+                {
+                    var forward = transform.WorldMatrix.Forward; forward.Normalize();
+                    Quaternion.RotationAxis(ref forward, eulerAngles.Z, out var axisRotation);
+                    Quaternion.Multiply(ref rotation, ref axisRotation, out rotation);
+                }
+            }
+            else
+            {
+                //Quaternion.RotationYawPitchRoll(eulerAngles.Y, eulerAngles.X, eulerAngles.Z, out rotation);
+                MathUtilEx.ToQuaternion(ref eulerAngles, out rotation);
+            }
+
+            if(transform.Parent != null)
+            {
+                transform.Parent.WorldMatrix.Decompose(out var _, out Quaternion parentRotation, out var _);
+                parentRotation.Conjugate();
+
+                Quaternion.Multiply(ref rotation, ref parentRotation, out rotation);
+            }
+
+            Quaternion.Multiply(ref transform.Rotation, ref rotation, out transform.Rotation);
+
+            transform.UpdateWorldMatrix();
+        }
+
+        /// <summary>
+        /// Rotates the given <see cref="TransformComponent"/> by the specified <paramref name="eulerAngles"/> in the coordinate space defined by <paramref name="relativeTo"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="eulerAngles">The euler angles in radians to rotate by.</param>
+        /// <param name="relativeTo">The coordinate space to perform the rotation in.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void Rotate(this TransformComponent transform, Vector3 eulerAngles, Space relativeTo = Space.Self)
+        {
+            transform.Rotate(ref eulerAngles, relativeTo);
+        }
+
+        //public static void RotateAround(this TransformComponent transform, ref Vector3 point, ref Vector3 axis, float angle)
+        //{
+        //    if (transform == null)
+        //    {
+        //        throw new ArgumentNullException(nameof(transform));
+        //    }
+
+        //    throw new NotImplementedException();
+
+        //}
+
+        //public static void RotateAround(this TransformComponent transform, Vector3 point, Vector3 axis, float angle)
+        //{
+        //    transform.RotateAround(ref point, ref axis, angle);
+        //}
+
+        /// <summary>
+        /// Performs a direction transformation using the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="direction">The direction vector to transform.</param>
+        /// <param name="result">The transformed direction.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static void TransformDirection(this TransformComponent transform, ref Vector3 direction, out Vector3 result)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }            
+
+            Vector3.TransformNormal(ref direction, ref transform.WorldMatrix, out result);
+        }
+
+        /// <summary>
+        /// Performs a direction transformation using the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="direction">The direction vector to transform.</param>
+        /// <returns>The transformed direction.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static Vector3 TransformDirection(this TransformComponent transform, Vector3 direction)
+        {
+            transform.TransformDirection(ref direction, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Performs a direction transformation using the inverse of the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="direction">The direction vector to transform.</param>
+        /// <param name="result">The transformed direction.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static void InverseTransformDirection(this TransformComponent transform, ref Vector3 direction, out Vector3 result)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            Matrix.Invert(ref transform.WorldMatrix, out var inverseMatrix);
+
+            Vector3.TransformNormal(ref direction, ref inverseMatrix, out result);
+        }
+
+        /// <summary>
+        /// Performs a direction transformation using the inverse of the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="direction">The direction vector to transform.</param>
+        /// <returns>The transformed direction.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static Vector3 InverseTransformDirection(this TransformComponent transform, Vector3 direction)
+        {
+            transform.InverseTransformDirection(ref direction, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Performs a coordinate transformation using the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="position">The coordinate vector to transform.</param>
+        /// <param name="result">The transformed coordinate.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static void TransformPosition(this TransformComponent transform, ref Vector3 position, out Vector3 result)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            Vector3.TransformCoordinate(ref position, ref transform.WorldMatrix, out result);
+        }
+
+        /// <summary>
+        /// Performs a coordinate transformation using the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="position">The coordinate vector to transform.</param>
+        /// <returns>The transformed coordinate.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static Vector3 TransformPosition(this TransformComponent transform, Vector3 position)
+        {
+            transform.TransformPosition(ref position, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Performs a coordinate transformation using the inverse of the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="position">The coordinate vector to transform.</param>
+        /// <param name="result">The transformed coordinate.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static void InverseTransformPosition(this TransformComponent transform, ref Vector3 position, out Vector3 result)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            Matrix.Invert(ref transform.WorldMatrix, out var inverseMatrix);
+
+            Vector3.TransformCoordinate(ref position, ref inverseMatrix, out result);
+        }
+
+        /// <summary>
+        /// Performs a coordinate transformation using the inverse of the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="position">The coordinate vector to transform.</param>
+        /// <returns>The transformed coordinate.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static Vector3 InverseTransformPosition(this TransformComponent transform, Vector3 position)
+        {
+            transform.InverseTransformPosition(ref position, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Performs a normal transformation using the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="vector">The normal vector to transform.</param>
+        /// <param name="result">The transformed normal.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static void TransformVector(this TransformComponent transform, ref Vector3 vector, out Vector3 result)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            Vector3.TransformNormal(ref vector, ref transform.WorldMatrix, out result);
+        }
+
+        /// <summary>
+        /// Performs a normal transformation using the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="vector">The normal vector to transform.</param>
+        /// <returns>The transformed normal.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static Vector3 TransformVector(this TransformComponent transform, Vector3 vector)
+        {
+            transform.TransformVector(ref vector, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Performs a normal transformation using the inverse of the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="vector">The normal vector to transform.</param>
+        /// <param name="result">The transformed normal.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static void InverseTransformVector(this TransformComponent transform, ref Vector3 vector, out Vector3 result)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            Matrix.Invert(ref transform.WorldMatrix, out var inverseMatrix);
+
+            Vector3.TransformNormal(ref vector, ref inverseMatrix, out result);
+        }
+
+        /// <summary>
+        /// Performs a normal transformation using the inverse of the given <see cref="TransformComponent.WorldMatrix"/>.
+        /// </summary>
+        /// <param name="transform">The transform to get the world matrix from.</param>
+        /// <param name="vector">The normal vector to transform.</param>
+        /// <returns>The transformed normal.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method does not update the <see cref="TransformComponent.WorldMatrix"/> before performing the transformation.
+        /// If the <see cref="TransformComponent"/> has been modified since the last frame you may need to call the <see cref="TransformComponent.UpdateWorldMatrix"/> method first.
+        /// </remarks>
+        public static Vector3 InverseTransformVector(this TransformComponent transform, Vector3 vector)
+        {
+            transform.InverseTransformVector(ref vector, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="worldUp">A Vector specifying the upward direction.</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> or <paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, TransformComponent target, ref Vector3 worldUp, float smooth = 1.0f)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            if (target == null)
+            {
+                throw new ArgumentNullException(nameof(target));
+            }            
+
+            var targetPosition = target.WorldMatrix.TranslationVector;
+            transform.LookAt(ref targetPosition, ref worldUp,smooth);
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="worldUp">A Vector specifying the upward direction.</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> or <paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, TransformComponent target, Vector3 worldUp, float smooth = 1.0f)
+        {
+            transform.LookAt(target, ref worldUp, smooth);
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>. 
+        /// The world up vector use is defined by <see cref="WorldUp"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> or <paramref name="target"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, TransformComponent target, float smooth = 1.0f)
+        {
+            transform.LookAt(target, ref WorldUp, smooth);
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="worldUp">A Vector specifying the upward direction.</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, ref Vector3 target, ref Vector3 worldUp, float smooth = 1.0f)
+        {
+            if (transform == null)
+            {
+                throw new ArgumentNullException(nameof(transform));
+            }
+
+            if (!transform.UseTRS)
+            {
+                throw new ArgumentException("Must use TRS", nameof(transform));
+            }
+
+            var localTarget = target;
+            var localUp = worldUp;
+
+            if(transform.Parent != null)
+            {
+                Matrix.Invert(ref transform.Parent.WorldMatrix, out var inverseParent);
+                Vector3.TransformCoordinate(ref target, ref inverseParent, out localTarget);
+                Vector3.TransformNormal(ref worldUp, ref inverseParent, out localUp);
+            }
+
+            var localEye = transform.LocalMatrix.TranslationVector;
+
+            MathUtilEx.LookRotation(ref localEye, ref localTarget, ref localUp, out var lookRotation);
+
+            if(smooth == 1.0f)
+            {
+                transform.Rotation = lookRotation;
+            }
+            else
+            {
+                Quaternion.Slerp(ref transform.Rotation, ref lookRotation, smooth, out transform.Rotation);
+            }
+
+
+            transform.UpdateWorldMatrix();
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="worldUp">A Vector specifying the upward direction.</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, Vector3 target, Vector3 worldUp, float smooth = 1.0f)
+        {
+            transform.LookAt(ref target, ref worldUp, smooth);
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>. 
+        /// The world up vector use is defined by <see cref="WorldUp"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, ref Vector3 target, float smooth = 1.0f)
+        {
+            transform.LookAt(ref target, ref WorldUp, smooth);
+        }
+
+        /// <summary>
+        /// Sets the transforms rotation so it's forward vector points at the <paramref name="target"/>. 
+        /// The world up vector use is defined by <see cref="WorldUp"/>.
+        /// </summary>
+        /// <param name="transform">The <see cref="TransformComponent"/> to update.</param>
+        /// <param name="target">The target to point towards</param>
+        /// <param name="smooth">Value between 0 and 1 indicating the weight of target orientation. The default is 1.</param>
+        /// <exception cref="ArgumentNullException">If <paramref name="transform"/> is <see langword="null"/>.</exception>
+        /// <exception cref="ArgumentException">If <paramref name="transform"/> has <see cref="TransformComponent.UseTRS"/> set to <see langword="null"/>.</exception>
+        /// <remarks>
+        /// This method updates the <see cref="TransformComponent.LocalMatrix"/> and <see cref="TransformComponent.WorldMatrix"/> after transformation.
+        /// </remarks>
+        public static void LookAt(this TransformComponent transform, Vector3 target, float smooth = 1.0f)
+        {
+            transform.LookAt(ref target, ref WorldUp, smooth);
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Mathematics/Easing.Double.cs b/sources/tools/Xenko.Toolkit/Mathematics/Easing.Double.cs
new file mode 100644
index 0000000000..5167a55c0a
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Mathematics/Easing.Double.cs
@@ -0,0 +1,414 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Toolkit.Mathematics
+{
+    public static partial class Easing
+    {
+        private const double PiOverTwo = 1.57079637;
+
+        /// <summary>
+        /// Performs easing using the specified function.
+        /// </summary>
+        /// <param name="amount">The amount.</param>
+        /// <param name="function">The easing function to use.</param>
+        /// <returns>The amount eased using the specified function.</returns>
+        public static double Ease(double amount, EasingFunction function)
+        {
+            switch (function)
+            {
+                default:
+                case EasingFunction.Linear: return Linear(amount);
+                case EasingFunction.QuadraticEaseOut: return QuadraticEaseOut(amount);
+                case EasingFunction.QuadraticEaseIn: return QuadraticEaseIn(amount);
+                case EasingFunction.QuadraticEaseInOut: return QuadraticEaseInOut(amount);
+                case EasingFunction.CubicEaseIn: return CubicEaseIn(amount);
+                case EasingFunction.CubicEaseOut: return CubicEaseOut(amount);
+                case EasingFunction.CubicEaseInOut: return CubicEaseInOut(amount);
+                case EasingFunction.QuarticEaseIn: return QuarticEaseIn(amount);
+                case EasingFunction.QuarticEaseOut: return QuarticEaseOut(amount);
+                case EasingFunction.QuarticEaseInOut: return QuarticEaseInOut(amount);
+                case EasingFunction.QuinticEaseIn: return QuinticEaseIn(amount);
+                case EasingFunction.QuinticEaseOut: return QuinticEaseOut(amount);
+                case EasingFunction.QuinticEaseInOut: return QuinticEaseInOut(amount);
+                case EasingFunction.SineEaseIn: return SineEaseIn(amount);
+                case EasingFunction.SineEaseOut: return SineEaseOut(amount);
+                case EasingFunction.SineEaseInOut: return SineEaseInOut(amount);
+                case EasingFunction.CircularEaseIn: return CircularEaseIn(amount);
+                case EasingFunction.CircularEaseOut: return CircularEaseOut(amount);
+                case EasingFunction.CircularEaseInOut: return CircularEaseInOut(amount);
+                case EasingFunction.ExponentialEaseIn: return ExponentialEaseIn(amount);
+                case EasingFunction.ExponentialEaseOut: return ExponentialEaseOut(amount);
+                case EasingFunction.ExponentialEaseInOut: return ExponentialEaseInOut(amount);
+                case EasingFunction.ElasticEaseIn: return ElasticEaseIn(amount);
+                case EasingFunction.ElasticEaseOut: return ElasticEaseOut(amount);
+                case EasingFunction.ElasticEaseInOut: return ElasticEaseInOut(amount);
+                case EasingFunction.BackEaseIn: return BackEaseIn(amount);
+                case EasingFunction.BackEaseOut: return BackEaseOut(amount);
+                case EasingFunction.BackEaseInOut: return BackEaseInOut(amount);
+                case EasingFunction.BounceEaseIn: return BounceEaseIn(amount);
+                case EasingFunction.BounceEaseOut: return BounceEaseOut(amount);
+                case EasingFunction.BounceEaseInOut: return BounceEaseInOut(amount);
+            }
+        }
+
+        /// <summary>
+        /// Performs a linear easing.
+        /// </summary>
+        /// <param name="amount">The amount.</param>
+        /// <returns>The amount eased.</returns>
+        /// <remarks>
+        /// Modeled after the line y = x
+        /// </remarks>
+        public static double Linear(double amount)
+        {
+            return amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the parabola y = x^2
+        /// </remarks>
+        public static double QuadraticEaseIn(double amount)
+        {
+            return amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the parabola y = -x^2 + 2x
+        /// </remarks>
+        public static double QuadraticEaseOut(double amount)
+        {
+            return -(amount * (amount - 2));
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise quadratic
+        /// y = (1/2)((2x)^2)             ; [0, 0.5]
+        /// y = -(1/2)((2x-1)*(2x-3) - 1) ; [0.5, 1]
+        /// </remarks>
+        public static double QuadraticEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 2 * amount * amount;
+            }
+            else
+            {
+                return (-2 * amount * amount) + (4 * amount) - 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the cubic y = x^3
+        /// </remarks>
+        public static double CubicEaseIn(double amount)
+        {
+            return amount * amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the cubic y = (x - 1)^3 + 1
+        /// </remarks>
+        public static double CubicEaseOut(double amount)
+        {
+            double f = (amount - 1);
+            return f * f * f + 1;
+        }
+
+        /// <remarks>	
+        /// Modeled after the piecewise cubic
+        /// y = (1/2)((2x)^3)       ; [0, 0.5]
+        /// y = (1/2)((2x-2)^3 + 2) ; [0.5, 1]
+        /// </remarks>
+        public static double CubicEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 4 * amount * amount * amount;
+            }
+            else
+            {
+                double f = ((2 * amount) - 2);
+                return 0.5 * f * f * f + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the quartic x^4
+        /// </remarks>
+        public static double QuarticEaseIn(double amount)
+        {
+            return amount * amount * amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the quartic y = 1 - (x - 1)^4
+        /// </remarks>
+        public static double QuarticEaseOut(double amount)
+        {
+            double f = (amount - 1);
+            return f * f * f * (1 - amount) + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise quartic
+        /// y = (1/2)((2x)^4)        ; [0, 0.5]
+        /// y = -(1/2)((2x-2)^4 - 2) ; [0.5, 1]
+        /// </remarks>
+        public static double QuarticEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 8 * amount * amount * amount * amount;
+            }
+            else
+            {
+                double f = (amount - 1);
+                return -8 * f * f * f * f + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the quintic y = x^5
+        /// </remarks>
+        public static double QuinticEaseIn(double amount)
+        {
+            return amount * amount * amount * amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the quintic y = (x - 1)^5 + 1
+        /// </remarks>
+        public static double QuinticEaseOut(double amount)
+        {
+            double f = (amount - 1);
+            return f * f * f * f * f + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise quintic
+        /// y = (1/2)((2x)^5)       ; [0, 0.5]
+        /// y = (1/2)((2x-2)^5 + 2) ; [0.5, 1]
+        /// </remarks>
+        public static double QuinticEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 16 * amount * amount * amount * amount * amount;
+            }
+            else
+            {
+                double f = ((2 * amount) - 2);
+                return 0.5 * f * f * f * f * f + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after quarter-cycle of sine wave
+        /// </remarks>
+        public static double SineEaseIn(double amount)
+        {
+            return Math.Sin((amount - 1) * PiOverTwo) + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after quarter-cycle of sine wave (different phase)
+        /// </remarks>
+        public static double SineEaseOut(double amount)
+        {
+            return Math.Sin(amount * PiOverTwo);
+        }
+
+        /// <remarks>
+        /// Modeled after half sine wave
+        /// </remarks>
+        public static double SineEaseInOut(double amount)
+        {
+            return 0.5 * (1 - Math.Cos(amount * Math.PI));
+        }
+
+        /// <remarks>
+        /// Modeled after shifted quadrant IV of unit circle
+        /// </remarks>
+        public static double CircularEaseIn(double amount)
+        {
+            return 1 - Math.Sqrt(1 - (amount * amount));
+        }
+
+        /// <remarks>
+        /// Modeled after shifted quadrant II of unit circle
+        /// </remarks>
+        public static double CircularEaseOut(double amount)
+        {
+            return Math.Sqrt((2 - amount) * amount);
+        }
+
+        /// <remarks>	
+        /// Modeled after the piecewise circular function
+        /// y = (1/2)(1 - Math.Sqrt(1 - 4x^2))           ; [0, 0.5]
+        /// y = (1/2)(Math.Sqrt(-(2x - 3)*(2x - 1)) + 1) ; [0.5, 1]
+        /// </remarks>
+        public static double CircularEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 0.5 * (1 - Math.Sqrt(1 - 4 * (amount * amount)));
+            }
+            else
+            {
+                return 0.5 * (Math.Sqrt(-((2 * amount) - 3) * ((2 * amount) - 1)) + 1);
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the exponential function y = 2^(10(x - 1))
+        /// </remarks>
+        public static double ExponentialEaseIn(double amount)
+        {
+            return (amount == 0.0) ? amount : Math.Pow(2, 10 * (amount - 1));
+        }
+
+        /// <remarks>
+        /// Modeled after the exponential function y = -2^(-10x) + 1
+        /// </remarks>
+        public static double ExponentialEaseOut(double amount)
+        {
+            return (amount == 1.0) ? amount : 1 - Math.Pow(2, -10 * amount);
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise exponential
+        /// y = (1/2)2^(10(2x - 1))         ; [0,0.5)
+        /// y = -(1/2)*2^(-10(2x - 1))) + 1 ; [0.5,1]
+        /// </remarks>
+        public static double ExponentialEaseInOut(double amount)
+        {
+            if (amount == 0.0 || amount == 1.0) return amount;
+
+            if (amount < 0.5)
+            {
+                return 0.5 * Math.Pow(2, (20 * amount) - 10);
+            }
+            else
+            {
+                return -0.5 * Math.Pow(2, (-20 * amount) + 10) + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the damped sine wave y = sin(13pi/2*x)*Math.Pow(2, 10 * (x - 1))
+        /// </remarks>
+        public static double ElasticEaseIn(double amount)
+        {
+            return Math.Sin(13 * PiOverTwo * amount) * Math.Pow(2, 10 * (amount - 1));
+        }
+
+        /// <remarks>
+        /// Modeled after the damped sine wave y = sin(-13pi/2*(x + 1))*Math.Pow(2, -10x) + 1
+        /// </remarks>
+        public static double ElasticEaseOut(double amount)
+        {
+            return Math.Sin(-13 * PiOverTwo * (amount + 1)) * Math.Pow(2, -10 * amount) + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise exponentially-damped sine wave:
+        /// y = (1/2)*sin(13pi/2*(2*x))*Math.Pow(2, 10 * ((2*x) - 1))      ; [0,0.5]
+        /// y = (1/2)*(sin(-13pi/2*((2x-1)+1))*Math.Pow(2,-10(2*x-1)) + 2) ; [0.5, 1]
+        /// </remarks>
+        public static double ElasticEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 0.5 * Math.Sin(13 * PiOverTwo * (2 * amount)) * Math.Pow(2, 10 * ((2 * amount) - 1));
+            }
+            else
+            {
+                return 0.5 * (Math.Sin(-13 * PiOverTwo * ((2 * amount - 1) + 1)) * Math.Pow(2, -10 * (2 * amount - 1)) + 2);
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the overshooting cubic y = x^3-x*sin(x*pi)
+        /// </remarks>
+        public static double BackEaseIn(double amount)
+        {
+            return amount * amount * amount - amount * Math.Sin(amount * Math.PI);
+        }
+
+        /// <remarks>
+        /// Modeled after overshooting cubic y = 1-((1-x)^3-(1-x)*sin((1-x)*pi))
+        /// </remarks>	
+        public static double BackEaseOut(double amount)
+        {
+            double f = (1 - amount);
+            return 1 - (f * f * f - f * Math.Sin(f * Math.PI));
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise overshooting cubic function:
+        /// y = (1/2)*((2x)^3-(2x)*sin(2*x*pi))           ; [0, 0.5)
+        /// y = (1/2)*(1-((1-x)^3-(1-x)*sin((1-x)*pi))+1) ; [0.5, 1]
+        /// </remarks>
+        public static double BackEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                double f = 2 * amount;
+                return 0.5 * (f * f * f - f * Math.Sin(f * Math.PI));
+            }
+            else
+            {
+                double f = (1 - (2 * amount - 1));
+                return 0.5 * (1 - (f * f * f - f * Math.Sin(f * Math.PI))) + 0.5;
+            }
+        }
+
+        /// <remarks>
+        /// </remarks>
+        public static double BounceEaseIn(double amount)
+        {
+            return 1 - BounceEaseOut(1 - amount);
+        }
+
+        /// <remarks>
+        /// </remarks>
+        public static double BounceEaseOut(double amount)
+        {
+            if (amount < 4 / 11.0)
+            {
+                return (121 * amount * amount) / 16.0;
+            }
+            else if (amount < 8 / 11.0)
+            {
+                return (363 / 40.0 * amount * amount) - (99 / 10.0 * amount) + 17 / 5.0;
+            }
+            else if (amount < 9 / 10.0)
+            {
+                return (4356 / 361.0 * amount * amount) - (35442 / 1805.0 * amount) + 16061 / 1805.0;
+            }
+            else
+            {
+                return (54 / 5.0 * amount * amount) - (513 / 25.0 * amount) + 268 / 25.0;
+            }
+        }
+
+        /// <remarks>
+        /// </remarks>
+        public static double BounceEaseInOut(double amount)
+        {
+            if (amount < 0.5)
+            {
+                return 0.5 * BounceEaseIn(amount * 2);
+            }
+            else
+            {
+                return 0.5 * BounceEaseOut(amount * 2 - 1) + 0.5;
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Mathematics/Easing.Single.cs b/sources/tools/Xenko.Toolkit/Mathematics/Easing.Single.cs
new file mode 100644
index 0000000000..9f7e7214eb
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Mathematics/Easing.Single.cs
@@ -0,0 +1,418 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Core.Mathematics;
+
+namespace Xenko.Toolkit.Mathematics
+{
+    /// <summary>
+    /// A collection of easing functions.
+    /// </summary>
+    /// <remarks>
+    /// These easing functions are based on Robert Penner's easing functions in C# http://www.robertpenner.com/easing/
+    /// </remarks>
+    public static partial class Easing
+    {
+        /// <summary>
+        /// Performs easing using the specified function.
+        /// </summary>
+        /// <param name="amount">The amount.</param>
+        /// <param name="function">The easing function to use.</param>
+        /// <returns>The amount eased using the specified function.</returns>
+        public static float Ease(float amount, EasingFunction function)
+        {
+            switch (function)
+            {
+                default:
+                case EasingFunction.Linear: return Linear(amount);
+                case EasingFunction.QuadraticEaseOut: return QuadraticEaseOut(amount);
+                case EasingFunction.QuadraticEaseIn: return QuadraticEaseIn(amount);
+                case EasingFunction.QuadraticEaseInOut: return QuadraticEaseInOut(amount);
+                case EasingFunction.CubicEaseIn: return CubicEaseIn(amount);
+                case EasingFunction.CubicEaseOut: return CubicEaseOut(amount);
+                case EasingFunction.CubicEaseInOut: return CubicEaseInOut(amount);
+                case EasingFunction.QuarticEaseIn: return QuarticEaseIn(amount);
+                case EasingFunction.QuarticEaseOut: return QuarticEaseOut(amount);
+                case EasingFunction.QuarticEaseInOut: return QuarticEaseInOut(amount);
+                case EasingFunction.QuinticEaseIn: return QuinticEaseIn(amount);
+                case EasingFunction.QuinticEaseOut: return QuinticEaseOut(amount);
+                case EasingFunction.QuinticEaseInOut: return QuinticEaseInOut(amount);
+                case EasingFunction.SineEaseIn: return SineEaseIn(amount);
+                case EasingFunction.SineEaseOut: return SineEaseOut(amount);
+                case EasingFunction.SineEaseInOut: return SineEaseInOut(amount);
+                case EasingFunction.CircularEaseIn: return CircularEaseIn(amount);
+                case EasingFunction.CircularEaseOut: return CircularEaseOut(amount);
+                case EasingFunction.CircularEaseInOut: return CircularEaseInOut(amount);
+                case EasingFunction.ExponentialEaseIn: return ExponentialEaseIn(amount);
+                case EasingFunction.ExponentialEaseOut: return ExponentialEaseOut(amount);
+                case EasingFunction.ExponentialEaseInOut: return ExponentialEaseInOut(amount);
+                case EasingFunction.ElasticEaseIn: return ElasticEaseIn(amount);
+                case EasingFunction.ElasticEaseOut: return ElasticEaseOut(amount);
+                case EasingFunction.ElasticEaseInOut: return ElasticEaseInOut(amount);
+                case EasingFunction.BackEaseIn: return BackEaseIn(amount);
+                case EasingFunction.BackEaseOut: return BackEaseOut(amount);
+                case EasingFunction.BackEaseInOut: return BackEaseInOut(amount);
+                case EasingFunction.BounceEaseIn: return BounceEaseIn(amount);
+                case EasingFunction.BounceEaseOut: return BounceEaseOut(amount);
+                case EasingFunction.BounceEaseInOut: return BounceEaseInOut(amount);
+            }
+        }
+
+        /// <summary>
+        /// Performs a linear easing.
+        /// </summary>
+        /// <param name="amount">The amount.</param>
+        /// <returns>The amount eased.</returns>
+        /// <remarks>
+        /// Modeled after the line y = x
+        /// </remarks>
+        public static float Linear(float amount)
+        {
+            return amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the parabola y = x^2
+        /// </remarks>
+        public static float QuadraticEaseIn(float amount)
+        {
+            return amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the parabola y = -x^2 + 2x
+        /// </remarks>
+        public static float QuadraticEaseOut(float amount)
+        {
+            return -(amount * (amount - 2));
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise quadratic
+        /// y = (1/2)((2x)^2)             ; [0, 0.5]
+        /// y = -(1/2)((2x-1)*(2x-3) - 1) ; [0.5, 1]
+        /// </remarks>
+        public static float QuadraticEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 2 * amount * amount;
+            }
+            else
+            {
+                return (-2 * amount * amount) + (4 * amount) - 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the cubic y = x^3
+        /// </remarks>
+        public static float CubicEaseIn(float amount)
+        {
+            return amount * amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the cubic y = (x - 1)^3 + 1
+        /// </remarks>
+        public static float CubicEaseOut(float amount)
+        {
+            float f = (amount - 1);
+            return f * f * f + 1;
+        }
+
+        /// <remarks>	
+        /// Modeled after the piecewise cubic
+        /// y = (1/2)((2x)^3)       ; [0, 0.5]
+        /// y = (1/2)((2x-2)^3 + 2) ; [0.5, 1]
+        /// </remarks>
+        public static float CubicEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 4 * amount * amount * amount;
+            }
+            else
+            {
+                float f = ((2 * amount) - 2);
+                return 0.5f * f * f * f + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the quartic x^4
+        /// </remarks>
+        public static float QuarticEaseIn(float amount)
+        {
+            return amount * amount * amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the quartic y = 1 - (x - 1)^4
+        /// </remarks>
+        public static float QuarticEaseOut(float amount)
+        {
+            float f = (amount - 1);
+            return f * f * f * (1 - amount) + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise quartic
+        /// y = (1/2)((2x)^4)        ; [0, 0.5]
+        /// y = -(1/2)((2x-2)^4 - 2) ; [0.5, 1]
+        /// </remarks>
+        public static float QuarticEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 8 * amount * amount * amount * amount;
+            }
+            else
+            {
+                float f = (amount - 1);
+                return -8 * f * f * f * f + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the quintic y = x^5
+        /// </remarks>
+        public static float QuinticEaseIn(float amount)
+        {
+            return amount * amount * amount * amount * amount;
+        }
+
+        /// <remarks>
+        /// Modeled after the quintic y = (x - 1)^5 + 1
+        /// </remarks>
+        public static float QuinticEaseOut(float amount)
+        {
+            float f = (amount - 1);
+            return f * f * f * f * f + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise quintic
+        /// y = (1/2)((2x)^5)       ; [0, 0.5]
+        /// y = (1/2)((2x-2)^5 + 2) ; [0.5, 1]
+        /// </remarks>
+        public static float QuinticEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 16 * amount * amount * amount * amount * amount;
+            }
+            else
+            {
+                float f = ((2 * amount) - 2);
+                return 0.5f * f * f * f * f * f + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after quarter-cycle of sine wave
+        /// </remarks>
+        public static float SineEaseIn(float amount)
+        {
+            return (float)Math.Sin((amount - 1) * MathUtil.PiOverTwo) + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after quarter-cycle of sine wave (different phase)
+        /// </remarks>
+        public static float SineEaseOut(float amount)
+        {
+            return (float)Math.Sin(amount * MathUtil.PiOverTwo);
+        }
+
+        /// <remarks>
+        /// Modeled after half sine wave
+        /// </remarks>
+        public static float SineEaseInOut(float amount)
+        {
+            return 0.5f * (1 - (float)Math.Cos(amount * MathUtil.Pi));
+        }
+
+        /// <remarks>
+        /// Modeled after shifted quadrant IV of unit circle
+        /// </remarks>
+        public static float CircularEaseIn(float amount)
+        {
+            return 1 - (float)Math.Sqrt(1 - (amount * amount));
+        }
+
+        /// <remarks>
+        /// Modeled after shifted quadrant II of unit circle
+        /// </remarks>
+        public static float CircularEaseOut(float amount)
+        {
+            return (float)Math.Sqrt((2 - amount) * amount);
+        }
+
+        /// <remarks>	
+        /// Modeled after the piecewise circular function
+        /// y = (1/2)(1 - Math.Sqrt(1 - 4x^2))           ; [0, 0.5]
+        /// y = (1/2)(Math.Sqrt(-(2x - 3)*(2x - 1)) + 1) ; [0.5, 1]
+        /// </remarks>
+        public static float CircularEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 0.5f * (1 - (float)Math.Sqrt(1 - 4 * (amount * amount)));
+            }
+            else
+            {
+                return 0.5f * ((float)Math.Sqrt(-((2 * amount) - 3) * ((2 * amount) - 1)) + 1);
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the exponential function y = 2^(10(x - 1))
+        /// </remarks>
+        public static float ExponentialEaseIn(float amount)
+        {
+            return (amount == 0.0f) ? amount : (float)Math.Pow(2, 10 * (amount - 1));
+        }
+
+        /// <remarks>
+        /// Modeled after the exponential function y = -2^(-10x) + 1
+        /// </remarks>
+        public static float ExponentialEaseOut(float amount)
+        {
+            return (amount == 1.0f) ? amount : 1 - (float)Math.Pow(2, -10 * amount);
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise exponential
+        /// y = (1/2)2^(10(2x - 1))         ; [0,0.5]
+        /// y = -(1/2)*2^(-10(2x - 1))) + 1 ; [0.5,1]
+        /// </remarks>
+        public static float ExponentialEaseInOut(float amount)
+        {
+            if (amount == 0.0 || amount == 1.0) return amount;
+
+            if (amount < 0.5f)
+            {
+                return 0.5f * (float)Math.Pow(2, (20 * amount) - 10);
+            }
+            else
+            {
+                return -0.5f * (float)Math.Pow(2, (-20 * amount) + 10) + 1;
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the damped sine wave y = sin(13pi/2*x)*Math.Pow(2, 10 * (x - 1))
+        /// </remarks>
+        public static float ElasticEaseIn(float amount)
+        {
+            return (float)Math.Sin(13 * MathUtil.PiOverTwo * amount) * (float)Math.Pow(2, 10 * (amount - 1));
+        }
+
+        /// <remarks>
+        /// Modeled after the damped sine wave y = sin(-13pi/2*(x + 1))*Math.Pow(2, -10x) + 1
+        /// </remarks>
+        public static float ElasticEaseOut(float amount)
+        {
+            return (float)Math.Sin(-13 * MathUtil.PiOverTwo * (amount + 1)) * (float)Math.Pow(2, -10 * amount) + 1;
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise exponentially-damped sine wave:
+        /// y = (1/2)*sin(13pi/2*(2*x))*Math.Pow(2, 10 * ((2*x) - 1))      ; [0,0.5]
+        /// y = (1/2)*(sin(-13pi/2*((2x-1)+1))*Math.Pow(2,-10(2*x-1)) + 2) ; [0.5, 1]
+        /// </remarks>
+        public static float ElasticEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 0.5f * (float)Math.Sin(13 * MathUtil.PiOverTwo * (2 * amount)) * (float)Math.Pow(2, 10 * ((2 * amount) - 1));
+            }
+            else
+            {
+                return 0.5f * ((float)Math.Sin(-13 * MathUtil.PiOverTwo * ((2 * amount - 1) + 1)) * (float)Math.Pow(2, -10 * (2 * amount - 1)) + 2);
+            }
+        }
+
+        /// <remarks>
+        /// Modeled after the overshooting cubic y = x^3-x*sin(x*pi)
+        /// </remarks>
+        public static float BackEaseIn(float amount)
+        {
+            return amount * amount * amount - amount * (float)Math.Sin(amount * MathUtil.Pi);
+        }
+
+        /// <remarks>
+        /// Modeled after overshooting cubic y = 1-((1-x)^3-(1-x)*sin((1-x)*pi))
+        /// </remarks>	
+        public static float BackEaseOut(float amount)
+        {
+            float f = (1 - amount);
+            return 1 - (f * f * f - f * (float)Math.Sin(f * MathUtil.Pi));
+        }
+
+        /// <remarks>
+        /// Modeled after the piecewise overshooting cubic function:
+        /// y = (1/2)*((2x)^3-(2x)*sin(2*x*pi))           ; [0, 0.5]
+        /// y = (1/2)*(1-((1-x)^3-(1-x)*sin((1-x)*pi))+1) ; [0.5, 1]
+        /// </remarks>
+        public static float BackEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                float f = 2 * amount;
+                return 0.5f * (f * f * f - f * (float)Math.Sin(f * MathUtil.Pi));
+            }
+            else
+            {
+                float f = (1 - (2 * amount - 1));
+                return 0.5f * (1 - (f * f * f - f * (float)Math.Sin(f * MathUtil.Pi))) + 0.5f;
+            }
+        }
+
+        /// <remarks>
+        /// </remarks>
+        public static float BounceEaseIn(float amount)
+        {
+            return 1 - BounceEaseOut(1 - amount);
+        }
+
+        /// <remarks>
+        /// </remarks>
+        public static float BounceEaseOut(float amount)
+        {
+            if (amount < 4 / 11.0f)
+            {
+                return (121 * amount * amount) / 16.0f;
+            }
+            else if (amount < 8 / 11.0f)
+            {
+                return (363 / 40.0f * amount * amount) - (99 / 10.0f * amount) + 17 / 5.0f;
+            }
+            else if (amount < 9 / 10.0f)
+            {
+                return (4356 / 361.0f * amount * amount) - (35442 / 1805.0f * amount) + 16061 / 1805.0f;
+            }
+            else
+            {
+                return (54 / 5.0f * amount * amount) - (513 / 25.0f * amount) + 268 / 25.0f;
+            }
+        }
+
+        /// <remarks>
+        /// </remarks>
+        public static float BounceEaseInOut(float amount)
+        {
+            if (amount < 0.5f)
+            {
+                return 0.5f * BounceEaseIn(amount * 2);
+            }
+            else
+            {
+                return 0.5f * BounceEaseOut(amount * 2 - 1) + 0.5f;
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Mathematics/EasingFunction.cs b/sources/tools/Xenko.Toolkit/Mathematics/EasingFunction.cs
new file mode 100644
index 0000000000..aa3eec6d7a
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Mathematics/EasingFunction.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Mathematics
+{
+    /// <summary>
+    /// The type of easing functions implemented in <see cref="Easing"/>
+    /// </summary>
+    public enum EasingFunction
+    {
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+        Linear,
+        QuadraticEaseIn,
+        QuadraticEaseOut,
+        QuadraticEaseInOut,
+        CubicEaseIn,
+        CubicEaseOut,
+        CubicEaseInOut,
+        QuarticEaseIn,
+        QuarticEaseOut,
+        QuarticEaseInOut,
+        QuinticEaseIn,
+        QuinticEaseOut,
+        QuinticEaseInOut,
+        SineEaseIn,
+        SineEaseOut,
+        SineEaseInOut,
+        CircularEaseIn,
+        CircularEaseOut,
+        CircularEaseInOut,
+        ExponentialEaseIn,
+        ExponentialEaseOut,
+        ExponentialEaseInOut,
+        ElasticEaseIn,
+        ElasticEaseOut,
+        ElasticEaseInOut,
+        BackEaseIn,
+        BackEaseOut,
+        BackEaseInOut,
+        BounceEaseIn,
+        BounceEaseOut,
+        BounceEaseInOut
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Mathematics/MathUtilEx.cs b/sources/tools/Xenko.Toolkit/Mathematics/MathUtilEx.cs
new file mode 100644
index 0000000000..8728fa47ed
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Mathematics/MathUtilEx.cs
@@ -0,0 +1,364 @@
+using Xenko.Core.Mathematics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Mathematics
+{
+    /// <summary>
+    /// Some more common utility methods for math operations.
+    /// </summary>
+    public static class MathUtilEx
+    {
+        /// <summary>
+        /// Gets the smallest integer greater than or equal to the amount.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The smallest integer greater than or equal to the amount.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int CeilingToInt(this float value) => (int)Math.Ceiling(value);
+
+        /// <summary>
+        /// Gets largest integer less than or equal to the amount.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The largest integer less than or equal to the amount.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int FloorToInt(this float value) => (int)Math.Floor(value);
+        
+        /// <summary>
+        /// Gets the integer value nearest to the amount.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        /// <returns>The integer value nearest to the amount.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int RoundToInt(this float value) => (int)Math.Round(value);
+
+        /// <summary>
+        /// Clamps the value between 0 and 1.
+        /// </summary>
+        /// <param name="value">The Value.</param>
+        /// <returns>Value clamped between 0 and 1.</returns>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Clamp01(float value) => MathUtil.Clamp(0, 1, value);
+
+        /// <summary>
+        /// Orthonormalizes 2 vectors.
+        /// </summary>
+        /// <param name="normal">The normal vector.</param>
+        /// <param name="tangent">The tangent vector.</param>
+        /// <remarks>
+        /// <para>Makes vectors normalized and orthogonal to each other. 
+        /// Normalizes normal. Normalizes tangent and makes sure it is orthogonal to normal.</para>
+        /// </remarks>
+        public static void Orthonormalize(ref Vector3 normal, ref Vector3 tangent)
+        {
+            //Uses the modified Gram-Schmidt process.
+            //Because we are making unit vectors, we can optimize the math for orthogonalization
+            //and simplify the projection operation to remove the division.
+            //q1 = m1 / |m1|
+            //q2 = (m2 - (q1 ⋅ m2) * q1) / |m2 - (q1 ⋅ m2) * q1|
+
+            normal.Normalize();
+            tangent -= Vector3.Dot(normal, tangent) * normal;
+            tangent.Normalize();
+        }
+
+        /// <summary>
+        /// Creates a rotation with the specified forward and upwards directions.
+        /// </summary>
+        /// <param name="eye">The postion of the observer. i.e. camera</param>
+        /// <param name="target">The location of the object to look-at.</param>
+        /// <param name="up">The vector that defines which direction is up.</param>
+        /// <param name="result">The created quaternion rotation</param>
+        public static void LookRotation(ref Vector3 eye, ref Vector3 target, ref Vector3 up, out Quaternion result)
+        {
+            var forward = target - eye;
+            
+            // Which would create LH rotation. Xenko uses RH so we need to reverse it.
+            forward *= -1f;
+
+
+            Orthonormalize(ref forward, ref up);
+            Vector3 right;
+            Vector3.Cross(ref up, ref forward, out right);
+
+            right.Normalize();
+
+            var w = (float)Math.Sqrt(1.0f + right.X + up.Y + forward.Z) * 0.5f;
+            var w4_recip = 1.0f / (4.0f * w);
+
+            result = new Quaternion()
+            {
+                W = w,
+                X = (up.Z - forward.Y) * w4_recip,
+                Y = (forward.X - right.Z) * w4_recip,
+                Z = (right.Y - up.X) * w4_recip,
+            };
+
+        }
+
+        /// <summary>
+        /// Creates a rotation with the specified forward and upwards directions.
+        /// </summary>
+        /// <param name="eye">The postion of the observer. i.e. camera</param>
+        /// <param name="target">The location of the object to look-at.</param>
+        /// <param name="up">The vector that defines which direction is up.</param>
+        /// <returns>The created quaternion rotation</returns>
+        /// <example>
+        /// var cameraRotation = Quaternion.LookRotation(cameraPosition, targetPosition, Vector3.UnitY); 
+        /// </example>
+        public static Quaternion LookRotation(Vector3 eye, Vector3 target, Vector3 up)
+        {
+            LookRotation(ref eye, ref target, ref up, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Convert rotation Euler angles to a <see cref="Quaternion"/>.
+        /// </summary>
+        /// <param name="rotationEulerXYZ">The euler rotation, with XYZ order.</param>
+        /// <param name="result">Resulting quaternion rotation</param>
+        public static void ToQuaternion(ref Vector3 rotationEulerXYZ,out Quaternion result)
+        {
+            // Equilvalent to:
+            //  Quaternion quatX, quatY, quatZ;
+            //  
+            //  Quaternion.RotationX(value.X, out quatX);
+            //  Quaternion.RotationY(value.Y, out quatY);
+            //  Quaternion.RotationZ(value.Z, out quatZ);
+            //  
+            //  rotation = quatX * quatY * quatZ;
+
+            var halfAngles = rotationEulerXYZ * 0.5f;
+            var fSinX = (float)Math.Sin(halfAngles.X);
+            var fCosX = (float)Math.Cos(halfAngles.X);
+            var fSinY = (float)Math.Sin(halfAngles.Y);
+            var fCosY = (float)Math.Cos(halfAngles.Y);
+            var fSinZ = (float)Math.Sin(halfAngles.Z);
+            var fCosZ = (float)Math.Cos(halfAngles.Z);
+            var fCosXY = fCosX * fCosY;
+            var fSinXY = fSinX * fSinY;
+
+            result.X = fSinX * fCosY * fCosZ - fSinZ * fSinY * fCosX;
+            result.Y = fSinY * fCosX * fCosZ + fSinZ * fSinX * fCosY;
+            result.Z = fSinZ * fCosXY - fSinXY * fCosZ;
+            result.W = fCosZ * fCosXY + fSinXY * fSinZ;
+
+        }
+
+        /// <summary>
+        /// Convert rotation Euler angles to a <see cref="Quaternion"/>.
+        /// </summary>
+        /// <param name="rotationEulerXYZ">The euler rotation, with XYZ order.</param>
+        /// <returns>Resulting quaternion rotation</returns>
+        public static Quaternion ToQuaternion(this Vector3 rotationEulerXYZ)
+        {
+            ToQuaternion(ref rotationEulerXYZ, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Convert <see cref="Quaternion"/> to rotation Euler angles.
+        /// </summary>
+        /// <param name="rotation">The rotation.</param>
+        /// <param name="result">Reulting euler rotation, with XYZ order.</param>
+        public static void ToRotationEulerXYZ(ref Quaternion rotation, out Vector3 result)
+        {
+    
+            // Equivalent to:
+            //  Matrix rotationMatrix;
+            //  Matrix.Rotation(ref cachedRotation, out rotationMatrix);
+            //  rotationMatrix.DecomposeXYZ(out rotationEuler);
+            float xx = rotation.X * rotation.X;
+            float yy = rotation.Y * rotation.Y;
+            float zz = rotation.Z * rotation.Z;
+            float xy = rotation.X * rotation.Y;
+            float zw = rotation.Z * rotation.W;
+            float zx = rotation.Z * rotation.X;
+            float yw = rotation.Y * rotation.W;
+            float yz = rotation.Y * rotation.Z;
+            float xw = rotation.X * rotation.W;
+            result.Y = (float)Math.Asin(2.0f * (yw - zx));
+            double test = Math.Cos(result.Y);
+            if (test > 1e-6f)
+            {
+                result.Z = (float)Math.Atan2(2.0f * (xy + zw), 1.0f - (2.0f * (yy + zz)));
+                result.X = (float)Math.Atan2(2.0f * (yz + xw), 1.0f - (2.0f * (yy + xx)));
+            }
+            else
+            {
+                result.Z = (float)Math.Atan2(2.0f * (zw - xy), 2.0f * (zx + yw));
+                result.X = 0.0f;
+            }
+
+        }
+
+        /// <summary>
+        /// Convert <see cref="Quaternion"/> to rotation Euler angles.
+        /// </summary>
+        /// <param name="rotation">The rotation.</param>
+        /// <returns>Reulting euler rotation, with XYZ order.</returns>
+        public static Vector3 ToRotationEulerXYZ(this Quaternion rotation)
+        {
+            ToRotationEulerXYZ(ref rotation, out var result);
+            return result;
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two values using an easing function.
+        /// </summary>
+        /// <param name="start">Start value.</param>
+        /// <param name="end">End value.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static float Interpolate(float start, float end, float amount, EasingFunction easingFunction)
+        {
+            return MathUtil.Lerp(start, end, Easing.Ease(amount, easingFunction));
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two vectors using an easing function.
+        /// </summary>
+        /// <param name="start">Start vector.</param>
+        /// <param name="end">End vector.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <param name="result">When the method completes, contains the interpolation of the two vectors.</param>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Interpolate(ref Vector2 start, ref Vector2 end, float amount, EasingFunction easingFunction, out Vector2 result)
+        {
+            Vector2.Lerp(ref start, ref end, Easing.Ease(amount, easingFunction), out result);
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two vectors using an easing function.
+        /// </summary>
+        /// <param name="start">Start vector.</param>
+        /// <param name="end">End vector.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <returns>The interpolation of the two vectors.</returns>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector2 Interpolate(Vector2 start, Vector2 end, float amount, EasingFunction easingFunction)
+        {
+            return Vector2.Lerp(start, end, Easing.Ease(amount, easingFunction));
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two vectors using an easing function.
+        /// </summary>
+        /// <param name="start">Start vector.</param>
+        /// <param name="end">End vector.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <param name="result">When the method completes, contains the interpolation of the two vectors.</param>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Interpolate(ref Vector3 start, ref Vector3 end, float amount, EasingFunction easingFunction, out Vector3 result)
+        {
+            Vector3.Lerp(ref start, ref end, Easing.Ease(amount, easingFunction), out result);
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two vectors using an easing function.
+        /// </summary>
+        /// <param name="start">Start vector.</param>
+        /// <param name="end">End vector.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <returns>The interpolation of the two vectors.</returns>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector3 Interpolate(Vector3 start, Vector3 end, float amount, EasingFunction easingFunction)
+        {
+            return Vector3.Lerp(start, end, Easing.Ease(amount, easingFunction));
+        }
+        /// <summary>
+        /// Performs an interpolation between two vectors using an easing function.
+        /// </summary>
+        /// <param name="start">Start vector.</param>
+        /// <param name="end">End vector.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <param name="result">When the method completes, contains the interpolation of the two vectors.</param>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Interpolate(ref Vector4 start, ref Vector4 end, float amount, EasingFunction easingFunction, out Vector4 result)
+        {
+            Vector4.Lerp(ref start, ref end, Easing.Ease(amount, easingFunction), out result);
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two vectors using an easing function.
+        /// </summary>
+        /// <param name="start">Start vector.</param>
+        /// <param name="end">End vector.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <returns>The interpolation of the two vectors.</returns>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Vector4 Interpolate(Vector4 start, Vector4 end, float amount, EasingFunction easingFunction)
+        {
+            return Vector4.Lerp(start, end, Easing.Ease(amount, easingFunction));
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two colors using an easing function.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        /// <param name="end">End color.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <param name="result">When the method completes, contains the interpolation of the two colors.</param>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static void Interpolate(ref Color start, ref Color end, float amount, EasingFunction easingFunction, out Color result)
+        {
+            Color.Lerp(ref start, ref end, Easing.Ease(amount, easingFunction), out result);
+        }
+
+        /// <summary>
+        /// Performs an interpolation between two colors using an easing function.
+        /// </summary>
+        /// <param name="start">Start color.</param>
+        /// <param name="end">End color.</param>
+        /// <param name="easingFunction">The function used to ease the interpolation.</param>
+        /// <param name="amount">Value between 0 and 1 indicating the weight of <paramref name="end"/>.</param>
+        /// <returns>The interpolation of the two colors.</returns>
+        /// <remarks>
+        /// Passing <paramref name="amount"/> a value of 0 will cause <paramref name="start"/> to be returned; a value of 1 will cause <paramref name="end"/> to be returned. 
+        /// </remarks>
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static Color Interpolate(Color start, Color end, float amount, EasingFunction easingFunction)
+        {
+            return Color.Lerp(start, end, Easing.Ease(amount, easingFunction));
+        }
+
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Mathematics/RandomExtensions.cs b/sources/tools/Xenko.Toolkit/Mathematics/RandomExtensions.cs
new file mode 100644
index 0000000000..779280d44b
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Mathematics/RandomExtensions.cs
@@ -0,0 +1,140 @@
+using Xenko.Core.Mathematics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Xenko.Toolkit.Mathematics
+{
+    /// <summary>
+    /// Extensions for <see cref="Random"/>.
+    /// </summary>
+    public static class RandomExtensions
+    {
+        /// <summary>
+        /// Generates a random <see cref="float"/>.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns>A random <see cref="float"/>.</returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static float NextSingle(this Random random)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            return (float)random.NextDouble();
+        }
+
+        /// <summary>
+        /// Generates a random point in 2D space within the specified region.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="region">A 2D region in which point is generated.</param>
+        /// <returns>A random point in 2D space within the specified region.</returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static Vector2 NextPoint(this Random random, RectangleF region)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            return Vector2.Lerp(region.TopLeft, region.BottomRight, random.NextSingle());
+            
+        }
+
+        /// <summary>
+        /// Generates a random point in 3D space within the specified region.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="region">A 3D region in which point is generated.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static Vector3 NextPoint(this Random random, BoundingBox region)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            return Vector3.Lerp(region.Minimum, region.Maximum, random.NextSingle());
+
+        }
+
+        /// <summary>
+        /// Generates a random normalized 2D direction vector.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static Vector2 NextDirection2D(this Random random)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            return Vector2.Normalize(new Vector2(random.NextSingle(), random.NextSingle()));
+        }
+
+        /// <summary>
+        /// Generates a random normalized 3D direction vector.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns></returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static Vector3 NextDirection3D(this Random random)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            return Vector3.Normalize(new Vector3(random.NextSingle(), random.NextSingle(), random.NextSingle()));
+        }
+
+        /// <summary>
+        /// Generates a random point in a circle of a given radius.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <param name="radius">Radius of circle. Default 1.0f.</param>
+        /// <returns>A random point in a circle of a given radius.</returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static Vector2 PointInACircle(this Random random, float radius = 1.0f)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            var randomRadius = random.NextSingle() * radius;
+
+            return new Vector2
+            {
+                X = (float)Math.Cos(random.NextDouble()) * randomRadius,
+                Y = (float)Math.Sin(random.NextDouble()) * randomRadius,
+            };
+        }
+
+
+        /// <summary>
+        /// Generates a random color.
+        /// </summary>
+        /// <param name="random">An instance of <see cref="Random"/>.</param>
+        /// <returns>A random color. Aplha is set to 255. </returns>
+        /// <exception cref="ArgumentNullException">If the random argument is null.</exception>
+        public static Color NextColor(this Random random)
+        {
+            if (random == null)
+            {
+                throw new ArgumentNullException(nameof(random));
+            }
+
+            return new Color(NextDirection3D(random));
+        }       
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Mathematics/RaySegment.cs b/sources/tools/Xenko.Toolkit/Mathematics/RaySegment.cs
new file mode 100644
index 0000000000..f7f03cb975
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Mathematics/RaySegment.cs
@@ -0,0 +1,173 @@
+using Xenko;
+using Xenko.Core.Mathematics;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Core;
+
+namespace Xenko.Toolkit.Mathematics
+{
+    /// <summary>
+    /// Represents a three dimensional line based on a 2 points in space.
+    /// </summary>
+    [DataContract]
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    public struct RaySegment : IEquatable<RaySegment>, IFormattable
+    {
+        private const string ToStringFormat = "Start:{0} End:{1}";
+
+        /// <summary>
+        /// The position in three dimensional space where the ray starts.
+        /// </summary>
+        public Vector3 Start;
+
+        /// <summary>
+        /// The position in three dimensional space where the ray ends.
+        /// </summary>
+        public Vector3 End;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XenkoToolkit.Mathematics.RaySegment"/> struct.
+        /// </summary>
+        /// <param name="start">The position in three dimensional space where the ray starts.</param>
+        /// <param name="end">The position in three dimensional space where the ray ends.</param>
+        public RaySegment(Vector3 start, Vector3 end)
+        {
+            this.Start = start;
+            this.End = end;
+        }
+
+        /// <summary>
+        /// Length of RaySegment
+        /// </summary>
+        public float Length => Vector3.Distance(Start, End);
+
+        /// <summary>
+        /// Tests for equality between two objects.
+        /// </summary>
+        /// <param name="left">The first value to compare.</param>
+        /// <param name="right">The second value to compare.</param>
+        /// <returns><c>true</c> if <paramref name="left"/> has the same value as <paramref name="right"/>; otherwise, <c>false</c>.</returns>
+        public static bool operator ==(RaySegment left, RaySegment right)
+        {
+            return left.Equals(right);
+        }
+
+        /// <summary>
+        /// Tests for inequality between two objects.
+        /// </summary>
+        /// <param name="left">The first value to compare.</param>
+        /// <param name="right">The second value to compare.</param>
+        /// <returns><c>true</c> if <paramref name="left"/> has a different value than <paramref name="right"/>; otherwise, <c>false</c>.</returns>
+        public static bool operator !=(RaySegment left, RaySegment right)
+        {
+            return !left.Equals(right);
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public override string ToString()
+        {
+            return string.Format(CultureInfo.CurrentCulture, ToStringFormat, Start.ToString(), End.ToString());
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <param name="format">The format.</param>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public string ToString(string format)
+        {
+            return string.Format(CultureInfo.CurrentCulture, ToStringFormat, Start.ToString(format, CultureInfo.CurrentCulture),
+                End.ToString(format, CultureInfo.CurrentCulture));
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <param name="formatProvider">The format provider.</param>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public string ToString(IFormatProvider formatProvider)
+        {
+            return string.Format(formatProvider, ToStringFormat, Start.ToString(), End.ToString());
+        }
+
+        /// <summary>
+        /// Returns a <see cref="System.String"/> that represents this instance.
+        /// </summary>
+        /// <param name="format">The format.</param>
+        /// <param name="formatProvider">The format provider.</param>
+        /// <returns>
+        /// A <see cref="System.String"/> that represents this instance.
+        /// </returns>
+        public string ToString(string format, IFormatProvider formatProvider)
+        {
+            return string.Format(formatProvider, ToStringFormat, Start.ToString(format, formatProvider),
+                End.ToString(format, formatProvider));
+        }
+
+        /// <summary>
+        /// Returns a hash code for this instance.
+        /// </summary>
+        /// <returns>
+        /// A hash code for this instance, suitable for use in hashing algorithms and data structures like a hash table. 
+        /// </returns>
+        public override int GetHashCode()
+        {
+            return Start.GetHashCode() + End.GetHashCode();
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="Xenko.Core.Mathematics.Vector4"/> is equal to this instance.
+        /// </summary>
+        /// <param name="value">The <see cref="Xenko.Core.Mathematics.Vector4"/> to compare with this instance.</param>
+        /// <returns>
+        /// <c>true</c> if the specified <see cref="Xenko.Core.Mathematics.Vector4"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Equals(RaySegment value)
+        {
+            return Start == value.Start && End == value.End;
+        }
+
+        /// <summary>
+        /// Determines whether the specified <see cref="System.Object"/> is equal to this instance.
+        /// </summary>
+        /// <param name="value">The <see cref="System.Object"/> to compare with this instance.</param>
+        /// <returns>
+        /// <c>true</c> if the specified <see cref="System.Object"/> is equal to this instance; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool Equals(object value)
+        {
+            if (value == null)
+                return false;
+            if (value.GetType() != GetType())
+                return false;
+            return Equals((RaySegment)value);
+        }
+
+        /// <summary>
+        /// Performs an explicit conversion from <see cref="RaySegment"/> to <see cref="Ray"/>.
+        /// </summary>
+        /// <param name="raySegment">The <see cref="RaySegment"/> to convert</param>
+        /// <returns>The result of the conversion.</returns>
+        public static explicit operator Ray(RaySegment raySegment)
+        {
+            var result = new Ray(raySegment.Start, Vector3.Normalize(raySegment.End - raySegment.Start));
+
+            return result;
+        }
+
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Physics/SimulationExtensions.cs b/sources/tools/Xenko.Toolkit/Physics/SimulationExtensions.cs
new file mode 100644
index 0000000000..93ac1c26ca
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Physics/SimulationExtensions.cs
@@ -0,0 +1,128 @@
+using Xenko.Core.Collections;
+using Xenko.Physics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xenko.Toolkit.Mathematics;
+
+namespace Xenko.Toolkit.Physics
+{
+    /// <summary>
+    /// Extensions for <see cref="SimulationExtensions"/>
+    /// </summary>
+    public static class SimulationExtensions
+    {
+        /// <summary>
+        /// Raycasts and stops at the first hit.
+        /// </summary>
+        /// <param name="simulation">Physics simulation.</param>
+        /// <param name="raySegment">Ray.</param>
+        /// <returns>The hit results.</returns>
+        /// <exception cref="ArgumentNullException">If the simulation argument is null.</exception>
+        public static HitResult Raycast(this Simulation simulation, RaySegment raySegment)
+        {
+            if (simulation == null)
+            {
+                throw new ArgumentNullException(nameof(simulation));
+            }
+
+            return simulation.Raycast(raySegment.Start, raySegment.End);
+        }
+
+        /// <summary>
+        /// Raycasts and stops at the first hit.
+        /// </summary>
+        /// <param name="simulation">Physics simulation.</param>
+        /// <param name="raySegment">Ray.</param>
+        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
+        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
+        /// <returns>The hit results.</returns>
+        /// <exception cref="ArgumentNullException">If the simulation argument is null.</exception>
+        public static HitResult Raycast(this Simulation simulation, RaySegment raySegment, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        {
+            if (simulation == null)
+            {
+                throw new ArgumentNullException(nameof(simulation));
+            }
+
+            return simulation.Raycast(raySegment.Start, raySegment.End, collisionFilterGroups, collisionFilterGroupFlags);
+        }
+
+        /// <summary>
+        /// Raycasts penetrating any shape the ray encounters.
+        /// </summary>
+        /// <param name="simulation">Physics simulation.</param>
+        /// <param name="raySegment">Ray.</param>
+        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <exception cref="ArgumentNullException">If the simulation argument is null.</exception>
+        public static void RaycastPenetrating(this Simulation simulation, RaySegment raySegment, IList<HitResult> resultsOutput)
+        {
+            if (simulation == null)
+            {
+                throw new ArgumentNullException(nameof(simulation));
+            }
+
+            simulation.RaycastPenetrating(raySegment.Start, raySegment.End, resultsOutput);
+        }
+
+        /// <summary>
+        /// Raycasts penetrating any shape the ray encounters.
+        /// </summary>
+        /// <param name="simulation">Physics simulation.</param>
+        /// <param name="raySegment">Ray.</param>
+        /// <returns>The list with hit results.</returns>
+        /// <exception cref="ArgumentNullException">If the simulation argument is null.</exception>
+        public static FastList<HitResult> RaycastPenetrating(this Simulation simulation, RaySegment raySegment)
+        {
+            if (simulation == null)
+            {
+                throw new ArgumentNullException(nameof(simulation));
+            }
+
+            var results = new FastList<HitResult>();
+            simulation.RaycastPenetrating(raySegment.Start, raySegment.End, results);
+            return results;
+        }
+
+        /// <summary>
+        /// Raycasts penetrating any shape the ray encounters.
+        /// Filtering by CollisionGroup
+        /// </summary>
+        /// <param name="simulation">Physics simulation.</param>
+        /// <param name="raySegment">Ray.</param>
+        /// <param name="resultsOutput">The list to fill with results.</param>
+        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
+        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
+        /// <exception cref="ArgumentNullException">If the simulation argument is null.</exception>
+        public static void RaycastPenetrating(this Simulation simulation, RaySegment raySegment, IList<HitResult> resultsOutput, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        {
+            if (simulation == null)
+            {
+                throw new ArgumentNullException(nameof(simulation));
+            }
+
+            simulation.RaycastPenetrating(raySegment.Start, raySegment.End, resultsOutput, collisionFilterGroups, collisionFilterGroupFlags);
+        }
+
+        /// <summary>
+        /// Raycasts penetrating any shape the ray encounters.
+        /// </summary>
+        /// <param name="simulation">Physics simulation.</param>
+        /// <param name="raySegment">Ray.</param>
+        /// <param name="collisionFilterGroups">The collision group of this shape sweep</param>
+        /// <param name="collisionFilterGroupFlags">The collision group that this shape sweep can collide with</param>
+        /// <returns>The list with hit results.</returns>
+        /// <exception cref="ArgumentNullException">If the simulation argument is null.</exception>
+        public static FastList<HitResult> RaycastPenetrating(this Simulation simulation, RaySegment raySegment, CollisionFilterGroups collisionFilterGroups, CollisionFilterGroupFlags collisionFilterGroupFlags)
+        {
+            if (simulation == null)
+            {
+                throw new ArgumentNullException(nameof(simulation));
+            }
+
+            return simulation.RaycastPenetrating(raySegment, collisionFilterGroups, collisionFilterGroupFlags);
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Rendering/MaterialExtensions.cs b/sources/tools/Xenko.Toolkit/Rendering/MaterialExtensions.cs
new file mode 100644
index 0000000000..2b74c1be55
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Rendering/MaterialExtensions.cs
@@ -0,0 +1,45 @@
+using System;
+using Xenko.Rendering;
+
+namespace Xenko.Toolkit.Rendering
+{
+    /// <summary>
+    /// Extension methods for <see cref="Material"/>.
+    /// </summary>
+    public static class MaterialExtensions
+    {
+        /// <summary>
+        /// Clone the <see cref="Material"/>.
+        /// </summary>
+        /// <param name="material">The material to clone.</param>
+        /// <returns>The cloned material.</returns>
+        /// <exception cref="ArgumentNullException">If <paramref name="material"/> is <see langword="null"/>.</exception>
+        public static Material Clone(this Material material)
+        {
+            if (material == null)
+            {
+                throw new ArgumentNullException(nameof(material));
+            }
+
+            var clone = new Material();
+
+            CopyProperties(material, clone);
+
+            return clone;
+        }
+
+        internal static void CopyProperties(Material material, Material clone)
+        {
+            foreach (var pass in material.Passes)
+            {
+                clone.Passes.Add(new MaterialPass(new ParameterCollection(pass.Parameters))
+                {
+                    HasTransparency = pass.HasTransparency,
+                    BlendState = pass.BlendState,
+                    CullMode = pass.CullMode,
+                    IsLightDependent = pass.IsLightDependent
+                });
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.Toolkit/Xenko.Toolkit.csproj b/sources/tools/Xenko.Toolkit/Xenko.Toolkit.csproj
new file mode 100644
index 0000000000..cd6ae74dca
--- /dev/null
+++ b/sources/tools/Xenko.Toolkit/Xenko.Toolkit.csproj
@@ -0,0 +1,57 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>12.0</LangVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Description>A Toolkit for the Xenko game engine.</Description>
+    <PackageTags>Xenko gamedev Game</PackageTags>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  </PropertyGroup>
+   <PropertyGroup>
+    <XenkoAssemblySign>true</XenkoAssemblySign>
+    <XenkoRuntime>true</XenkoRuntime>
+  </PropertyGroup>
+  <Import Project="..\..\targets\Xenko.PreSettings.targets" />
+  <PropertyGroup>
+    <XenkoAssemblyProcessor>true</XenkoAssemblyProcessor>
+    <XenkoPlatformDependent>true</XenkoPlatformDependent>
+    <XenkoBuildTags>*</XenkoBuildTags>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
+      <Link>Properties\SharedAssemblyInfo.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
+  </ItemGroup>
+  <Import Project="$(XenkoPostSettingsTargets)" />
+  <ItemGroup>
+    <None Include="Engine\EntityExtensions.GetComponents.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>EntityExtensions.GetComponents.tt</DependentUpon>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\core\Xenko.Core\Xenko.Core.csproj" />
+    <ProjectReference Include="..\..\engine\Xenko.Engine\Xenko.Engine.csproj" />
+    <ProjectReference Include="..\..\engine\Xenko.Physics\Xenko.Physics.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="Engine\EntityExtensions.GetComponents.tt">
+      <Generator>TextTemplatingFileGenerator</Generator>
+      <LastGenOutput>EntityExtensions.GetComponents.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Engine\EntityExtensions.GetComponents.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>EntityExtensions.GetComponents.tt</DependentUpon>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/sources/tools/Xenko.VisualStudio.Commands/Xenko.VisualStudio.Commands.csproj b/sources/tools/Xenko.VisualStudio.Commands/Xenko.VisualStudio.Commands.csproj
index ee5f623776..fd538f0ee5 100644
--- a/sources/tools/Xenko.VisualStudio.Commands/Xenko.VisualStudio.Commands.csproj
+++ b/sources/tools/Xenko.VisualStudio.Commands/Xenko.VisualStudio.Commands.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
     <XenkoBuildTags>WindowsTools</XenkoBuildTags>
@@ -21,11 +21,10 @@
     <ProjectReference Include="..\..\engine\Xenko.Engine\Xenko.Engine.csproj" />
     <ProjectReference Include="..\..\engine\Xenko.Shaders.Parser\Xenko.Shaders.Parser.csproj" />
     <!-- Use PrivateReference="All" so that it is not a NuGet dependency, and to make sure we don't have any transitive reference of VS.Package being used (we should have explicit ProjectReference to everything we need) -->
-    <ProjectReference Include="..\Xenko.VisualStudio.Package\Xenko.VisualStudio.Package.csproj" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
 </Project>
diff --git a/sources/tools/Xenko.VisualStudio.Package.Tests/TestGenerator.xksl.cs b/sources/tools/Xenko.VisualStudio.Package.Tests/TestGenerator.xksl.cs
new file mode 100644
index 0000000000..fb3be741c0
--- /dev/null
+++ b/sources/tools/Xenko.VisualStudio.Package.Tests/TestGenerator.xksl.cs
@@ -0,0 +1,24 @@
+// <auto-generated>
+// Do not edit this file yourself!
+//
+// This code was generated by Xenko Shader Mixin Code Generator.
+// To generate it yourself, please install Xenko.VisualStudio.Package .vsix
+// and re-save the associated .xkfx.
+// </auto-generated>
+
+using System;
+using Xenko.Core;
+using Xenko.Rendering;
+using Xenko.Graphics;
+using Xenko.Shaders;
+using Xenko.Core.Mathematics;
+using Buffer = Xenko.Graphics.Buffer;
+
+namespace Xenko.Rendering
+{
+    public static partial class TestGeneratorKeys
+    {
+        public static readonly ValueParameterKey<float> TestFloat = ParameterKeys.NewValue<float>();
+        public static readonly ValueParameterKey<Color3> TestColor = ParameterKeys.NewValue<Color3>();
+    }
+}
diff --git a/sources/tools/Xenko.VisualStudio.Package.Tests/Xenko.VisualStudio.Package.Tests.csproj b/sources/tools/Xenko.VisualStudio.Package.Tests/Xenko.VisualStudio.Package.Tests.csproj
index c601e276c7..1609e03fcf 100644
--- a/sources/tools/Xenko.VisualStudio.Package.Tests/Xenko.VisualStudio.Package.Tests.csproj
+++ b/sources/tools/Xenko.VisualStudio.Package.Tests/Xenko.VisualStudio.Package.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <XenkoAssemblyProcessor>false</XenkoAssemblyProcessor>
     <TargetFramework>$(TargetFrameworkTool)</TargetFramework>
@@ -55,7 +55,7 @@
     <ProjectReference Include="..\..\editor\Xenko.Assets.Presentation\Xenko.Assets.Presentation.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="TestGenerator.xksl">
+    <None Update="TestGenerator.xksl">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
@@ -64,7 +64,7 @@
   </ItemGroup>
   <Import Project="..\Xenko.Core.VisualStudio\Xenko.Core.VisualStudio.projitems" Label="Shared" />
   <Import Project="$(XenkoPostSettingsTargets)" />
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Target Name="LocateDevenv" AfterTargets="PrepareForBuild">
     <!-- Compute and save VisualStudio path to a file so that it can be used when running the test. Note: ideally we should use a Task, but Visual Studio lock the files -->
     <Exec Command="&quot;..\..\core\Xenko.Core.Tasks\bin\$(Configuration)\$(TargetFrameworkTool)\Xenko.Core.Tasks.exe&quot; locate-devenv &quot;$(MSBuildBinPath)&quot;" ConsoleToMsBuild="true">
diff --git a/sources/tools/Xenko.VisualStudio.Package/BuildEngine/IDEBuildLogger.cs b/sources/tools/Xenko.VisualStudio.Package/BuildEngine/IDEBuildLogger.cs
index 5e112284c0..5930bf3e5d 100644
--- a/sources/tools/Xenko.VisualStudio.Package/BuildEngine/IDEBuildLogger.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/BuildEngine/IDEBuildLogger.cs
@@ -210,7 +210,7 @@ private void MessageHandler(object sender, BuildMessageEventArgs messageEvent)
 
         private void NavigateTo(object sender, EventArgs arguments)
         {
-            Microsoft.VisualStudio.Shell.Task task = sender as Microsoft.VisualStudio.Shell.Task;
+            TaskListItem task = sender as TaskListItem;
             if (task == null)
                 throw new ArgumentException("Sender is not a Microsoft.VisualStudio.Shell.Task", "sender");
 
diff --git a/sources/tools/Xenko.VisualStudio.Package/Commands/XenkoCommandsProxy.cs b/sources/tools/Xenko.VisualStudio.Package/Commands/XenkoCommandsProxy.cs
index d900769f8b..e053beaa29 100644
--- a/sources/tools/Xenko.VisualStudio.Package/Commands/XenkoCommandsProxy.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/Commands/XenkoCommandsProxy.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 using NShader;
 using NuGet.Common;
 using NuGet.Versioning;
@@ -44,6 +45,11 @@ public struct PackageInfo
         private readonly IXenkoCommands remote;
         private readonly List<Tuple<string, DateTime>> assembliesLoaded = new List<Tuple<string, DateTime>>();
 
+        public static PackageInfo CurrentPackageInfo
+        {
+            get { lock (computedPackageInfoLock) { return computedPackageInfo; } }
+        }
+
         static XenkoCommandsProxy()
         {
             // This assembly resolve is only used to resolve the GetExecutingAssembly on the Default Domain
@@ -332,7 +338,9 @@ internal static async Task<PackageInfo> FindXenkoSdkDir(string solution, string
                     }
                     else
                     {
-                        // TODO: Report error from log
+                        MessageBox.Show( $"Could not restore {packageName} {packageInfo.ExpectedVersion}, this visual studio extension may fail to work properly without it."
+                                         + $"To fix this you can either build {packageName} or pull the right version from nugget manually" );
+                        throw new InvalidOperationException( $"Could not restore {packageName} {packageInfo.ExpectedVersion}." );
                     }
                 }
             }
diff --git a/sources/tools/Xenko.VisualStudio.Package/Guids.cs b/sources/tools/Xenko.VisualStudio.Package/Guids.cs
index 4e0d161b99..73381b9474 100644
--- a/sources/tools/Xenko.VisualStudio.Package/Guids.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/Guids.cs
@@ -11,6 +11,7 @@ internal static class GuidList
         public const string guidToolWindowPersistanceString = "ddd10155-9f63-4694-95ce-c7ba2d74ad46";
 
         public const string guidXenko_VisualStudio_ShaderKeyFileGenerator = "b50e6ece-b11f-477b-a8e1-1e60e0531a53";
+        public const string guidXenko_VisualStudio_EffectCodeFileGenerator = "e6259cfb-c775-426e-b499-f57d0a3ba2c1";
 
         public const string guidXenko_VisualStudio_DataCodeGenerator = "22555301-d58a-4d71-9dab-b2552cc3de0e";
 
diff --git a/sources/tools/Xenko.VisualStudio.Package/Logo.ico b/sources/tools/Xenko.VisualStudio.Package/Logo.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/tools/Xenko.VisualStudio.Package/Logo.ico and b/sources/tools/Xenko.VisualStudio.Package/Logo.ico differ
diff --git a/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderLanguageService.cs b/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderLanguageService.cs
index 09f9842ce3..f6e32254ea 100644
--- a/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderLanguageService.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderLanguageService.cs
@@ -36,6 +36,7 @@
 
 using IOleServiceProvider = Microsoft.VisualStudio.OLE.Interop.IServiceProvider;
 using VsShell = Microsoft.VisualStudio.Shell.VsShellUtilities;
+using Task = System.Threading.Tasks.Task;
 using EnvDTE;
 using Xenko.VisualStudio;
 
@@ -242,7 +243,7 @@ public override Colorizer GetColorizer(IVsTextLines buffer)
             return base.GetColorizer(buffer);
         }
 
-        public override void OnIdle(bool periodic)
+        public override async void OnIdle(bool periodic)
         {
             var source = GetCurrentNShaderSource();
             if (source != null)
@@ -263,24 +264,22 @@ public override void OnIdle(bool periodic)
                         var text = source.GetText();
                         var sourcePath = source.GetFilePath();
 
+                        var projectFile = LocateProject(sourcePath);
+
                         Trace.WriteLine(string.Format("Parsing Change: {0} Time: {1}", source.ChangeCount, DateTime.Now));
-                        var thread = new System.Threading.Thread(
-                            () =>
+                        try
+                        {
+                            var result = await Task.Run(() => AnalyzeAndGoToDefinition(projectFile, text, new RawSourceSpan(sourcePath, 1, 1))).ConfigureAwait(true);
+                            OutputAnalysisMessages(result, source);
+                        }
+                        catch (Exception ex)
+                        {
+                            lock (errorListProvider)
                             {
-                                try
-                                {
-                                    var result = AnalyzeAndGoToDefinition(text, new RawSourceSpan(sourcePath, 1, 1));
-                                    OutputAnalysisMessages(result, source);
-                                }
-                                catch (Exception ex)
-                                {
-                                    lock (errorListProvider)
-                                    {
-                                        errorListProvider.Tasks.Add(new ErrorTask(ex.InnerException ?? ex));
-                                    }
-                                }
-                            });
-                        thread.Start();
+                                errorListProvider.Tasks.Add(new ErrorTask(ex.InnerException ?? ex));
+                            }
+                        }
+
                     }
                 }
             }
@@ -288,16 +287,22 @@ public override void OnIdle(bool periodic)
             base.OnIdle(periodic);
         }
 
-        public RawShaderNavigationResult AnalyzeAndGoToDefinition(string text, RawSourceSpan span)
+        public string LocateProject(string sourcePath)
         {
             // Try to locate containing project
             var dte = (DTE)GetService(typeof(DTE));
-            var projectItem = dte.Solution.FindProjectItem(span.File);
+            var projectItem = dte.Solution.FindProjectItem(sourcePath);
             string projectFile = null;
             if (projectItem != null && projectItem.ContainingProject != null && !string.IsNullOrEmpty(projectItem.ContainingProject.FileName))
             {
                 projectFile = projectItem.ContainingProject.FileName;
             }
+
+            return projectFile;
+        }
+
+        public RawShaderNavigationResult AnalyzeAndGoToDefinition(string projectFile, string text, RawSourceSpan span)
+        {
             return XenkoCommandsProxy.GetProxy()?.AnalyzeAndGoToDefinition(projectFile, text, span) ?? new RawShaderNavigationResult();
         }
 
@@ -428,7 +433,7 @@ private static TextSpan ConvertToTextSpan(RawSourceSpan span)
 
         private void NavigateToSourceError(object sender, EventArgs e)
         {
-            var task = sender as Task;
+            var task = sender as TaskListItem;
             if (task != null)
             {
                 GoToLocation(new RawSourceSpan(task.Document, task.Line + 1, task.Column + 1), null, false);
@@ -516,4 +521,4 @@ public override string Goto(VSConstants.VSStd97CmdID cmd, IVsTextView textView,
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderViewFilter.cs b/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderViewFilter.cs
index dfd8a15525..d98c9c64c0 100644
--- a/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderViewFilter.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/NShader/NShaderViewFilter.cs
@@ -90,7 +90,8 @@ private void AnalyzeAndGoToDefinition()
                     Column = column + 1,
                     Line = line + 1
                 };
-                var result = langService.AnalyzeAndGoToDefinition(text, location);
+                var projectFile = langService.LocateProject(location.File);
+                var result = langService.AnalyzeAndGoToDefinition(projectFile, text, location);
                 langService.OutputAnalysisAndGotoLocation(result, TextView);
             }
             catch (Exception)
diff --git a/sources/tools/Xenko.VisualStudio.Package/Properties/launchSettings.json b/sources/tools/Xenko.VisualStudio.Package/Properties/launchSettings.json
new file mode 100644
index 0000000000..ea705612ce
--- /dev/null
+++ b/sources/tools/Xenko.VisualStudio.Package/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Xenko.VisualStudio.Package": {
+      "commandName": "Executable",
+      "executablePath": "$(DevEnvDir)\\devenv.exe",
+      "commandLineArgs": "/RootSuffix Xenko"
+    }
+  }
+}
\ No newline at end of file
diff --git a/sources/tools/Xenko.VisualStudio.Package/Resources/Images.png b/sources/tools/Xenko.VisualStudio.Package/Resources/Images.png
index 3e214cf0bd..4b5059507f 100644
--- a/sources/tools/Xenko.VisualStudio.Package/Resources/Images.png
+++ b/sources/tools/Xenko.VisualStudio.Package/Resources/Images.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9f08881f1c8234b25596ffc92c9e905490cb9ebaacfd3753b85af2b2fc8daff
-size 490
+oid sha256:555dd0c19719237ec1df15089884327ed7b8e164e9ac76f3f600136cb909eaee
+size 28016
diff --git a/sources/tools/Xenko.VisualStudio.Package/Resources/Package.ico b/sources/tools/Xenko.VisualStudio.Package/Resources/Package.ico
index 29256adf26..cf8c0e9594 100644
Binary files a/sources/tools/Xenko.VisualStudio.Package/Resources/Package.ico and b/sources/tools/Xenko.VisualStudio.Package/Resources/Package.ico differ
diff --git a/sources/tools/Xenko.VisualStudio.Package/Shaders/EffectCodeFileGenerator.cs b/sources/tools/Xenko.VisualStudio.Package/Shaders/EffectCodeFileGenerator.cs
new file mode 100644
index 0000000000..a37e197067
--- /dev/null
+++ b/sources/tools/Xenko.VisualStudio.Package/Shaders/EffectCodeFileGenerator.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Xenko contributors (https://xenko.com) and Silicon Studio Corp. (https://www.siliconstudio.co.jp)
+// Distributed under the MIT license. See the LICENSE.md file in the project root for more information.
+using System;
+using System.Diagnostics;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.Shell;
+using Xenko.VisualStudio.CodeGenerator;
+using Xenko.VisualStudio.Commands;
+
+namespace Xenko.VisualStudio.Shaders
+{
+    [ComVisible(true)]
+    [ClassInterface(ClassInterfaceType.None)]
+    [Guid(GuidList.guidXenko_VisualStudio_EffectCodeFileGenerator)]
+    [ProvideObject(typeof(EffectCodeFileGenerator), RegisterUsing = RegistrationMethod.CodeBase)]
+    public class EffectCodeFileGenerator : BaseCodeGeneratorWithSite
+    {
+        public const string DisplayName = "Xenko Effect C# Code Generator";
+        public const string InternalName = "XenkoEffectCodeGenerator";
+
+        protected override string GetDefaultExtension()
+        {
+            return ".xkfx.cs";
+        }
+
+        protected override byte[] GenerateCode(string inputFileName, string inputFileContent)
+        {
+
+            try
+            {
+                return System.Threading.Tasks.Task.Run(() =>
+                {
+                    var remoteCommands = XenkoCommandsProxy.GetProxy();
+                    return remoteCommands.GenerateShaderKeys(inputFileName, inputFileContent);
+                }).Result;
+            }
+            catch (Exception ex)
+            {
+                GeneratorError(4, ex.ToString(), 0, 0);
+
+                return new byte[0];
+            }
+        }
+    }
+}
diff --git a/sources/tools/Xenko.VisualStudio.Package/Shaders/ShaderKeyFileGenerator.cs b/sources/tools/Xenko.VisualStudio.Package/Shaders/ShaderKeyFileGenerator.cs
index c269289f9a..7a980d6903 100644
--- a/sources/tools/Xenko.VisualStudio.Package/Shaders/ShaderKeyFileGenerator.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/Shaders/ShaderKeyFileGenerator.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.Shell;
+using Xenko.Core;
 using Xenko.VisualStudio.CodeGenerator;
 using Xenko.VisualStudio.Commands;
 
@@ -24,7 +25,14 @@ public class ShaderKeyFileGenerator : BaseCodeGeneratorWithSite
 
         protected override string GetDefaultExtension()
         {
-            return ".cs";
+            // Figure out extension (different in case of versions before 3.1.0.2-beta01)
+            if (XenkoCommandsProxy.CurrentPackageInfo.ExpectedVersion != null
+                && XenkoCommandsProxy.CurrentPackageInfo.ExpectedVersion < new PackageVersion("3.2.0.1-beta02"))
+            {
+                return ".cs";
+            }
+
+            return ".xksl.cs";
         }
 
         protected override byte[] GenerateCode(string inputFileName, string inputFileContent)
diff --git a/sources/tools/Xenko.VisualStudio.Package/SolutionEventsListener.cs b/sources/tools/Xenko.VisualStudio.Package/SolutionEventsListener.cs
index 328dc08b1a..b04d8f0337 100644
--- a/sources/tools/Xenko.VisualStudio.Package/SolutionEventsListener.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/SolutionEventsListener.cs
@@ -15,7 +15,7 @@ public class SolutionEventsListener : IVsSolutionEvents, IVsSolutionLoadEvents,
         private uint updateSolutionEventsCookie;
         private uint selectionEventsCoockie;
 
-        public event Action AfterSolutionLoaded;
+        public event Action AfterSolutionOpened;
         public event Action AfterSolutionBackgroundLoadComplete;
         public event Action BeforeSolutionClosed;
 
@@ -89,7 +89,7 @@ int IVsSolutionEvents.OnAfterOpenProject(IVsHierarchy pHierarchy, int fAdded)
 
         int IVsSolutionEvents.OnAfterOpenSolution(object pUnkReserved, int fNewSolution)
         {
-            AfterSolutionLoaded?.Invoke();
+            AfterSolutionOpened?.Invoke();
             return VSConstants.S_OK;
         }
 
diff --git a/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.csproj b/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.csproj
index afd963a2e3..673f7de2ce 100644
--- a/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.csproj
+++ b/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.csproj
@@ -1,12 +1,12 @@
 <Project>
   <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
     <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <Import Project="..\..\targets\Xenko.PreSettings.targets" />
-  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <PropertyGroup>
     <TargetVsixContainerName>Xenko.vsix</TargetVsixContainerName>
     <TargetVsixContainer>bin\$(TargetVsixContainerName)</TargetVsixContainer>
@@ -25,14 +25,16 @@
     <None Remove="NShader\Common\XenkoShaderKeywords.map" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="EnvDTE80" Version="8.0.3" />
-    <PackageReference Include="Microsoft.VisualStudio.Designer.Interfaces" Version="1.1.4323" />
-    <PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.0.23205" />
-    <PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="14.0.23205" />
-    <PackageReference Include="Microsoft.VisualStudio.Package.LanguageService.14.0" Version="14.0.23205" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime" Version="14.0.25023" />
-    <PackageReference Include="VSLangProj" Version="7.0.3301" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="15.0.26201" />
+
+    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.4.2116">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.3.32804.24" ExcludeAssets="runtime">
+      <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.3.1" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build" Version="17.3.1" ExcludeAssets="runtime" />
 
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.ComponentModel.Composition" />
@@ -148,6 +150,6 @@
   </Target>
   <Import Project="$(XenkoPostSettingsTargets)" />
   <!-- Force NET Sdk to be included before VsSDK -->
-  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.24" />
+  <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="2.0.54" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="Exists('$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets')" />
 </Project>
diff --git a/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.nuspec b/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.nuspec
index fdd0ccd7db..75f2881d21 100644
--- a/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.nuspec
+++ b/sources/tools/Xenko.VisualStudio.Package/Xenko.VisualStudio.Package.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>Xenko.VisualStudio.Package</id>
-    <version>3.0.4</version>
+    <version>4.0</version>
     <authors>Xenko</authors>
     <owners>Xenko</owners>
     <licenseUrl>https://github.com/xenko3d/xenko/blob/master/LICENSE.md</licenseUrl>
diff --git a/sources/tools/Xenko.VisualStudio.Package/XenkoPackage.cs b/sources/tools/Xenko.VisualStudio.Package/XenkoPackage.cs
index 6b4237ffb4..cb80a3844a 100644
--- a/sources/tools/Xenko.VisualStudio.Package/XenkoPackage.cs
+++ b/sources/tools/Xenko.VisualStudio.Package/XenkoPackage.cs
@@ -64,12 +64,15 @@ namespace Xenko.VisualStudio
                              )]
     [ProvideLanguageExtensionAttribute(typeof(NShaderLanguageService), NShaderSupportedExtensions.Xenko_Shader)]
     [ProvideLanguageExtensionAttribute(typeof(NShaderLanguageService), NShaderSupportedExtensions.Xenko_Effect)]
+    // Xenko C# Effect Code Generator
+    [CodeGeneratorRegistration(typeof(EffectCodeFileGenerator), EffectCodeFileGenerator.InternalName, GuidList.vsContextGuidVCSProject, GeneratorRegKeyName = ".xkfx")]
+    [CodeGeneratorRegistration(typeof(EffectCodeFileGenerator), EffectCodeFileGenerator.DisplayName, GuidList.vsContextGuidVCSProject, GeneratorRegKeyName = EffectCodeFileGenerator.InternalName, GeneratesDesignTimeSource = true, GeneratesSharedDesignTimeSource = true)]
+    [CodeGeneratorRegistration(typeof(EffectCodeFileGenerator), EffectCodeFileGenerator.InternalName, GuidList.vsContextGuidVCSNewProject, GeneratorRegKeyName = ".xkfx")]
+    [CodeGeneratorRegistration(typeof(EffectCodeFileGenerator), EffectCodeFileGenerator.DisplayName, GuidList.vsContextGuidVCSNewProject, GeneratorRegKeyName = EffectCodeFileGenerator.InternalName, GeneratesDesignTimeSource = true, GeneratesSharedDesignTimeSource = true)]
     // Xenko C# Shader Key Generator
     [CodeGeneratorRegistration(typeof(ShaderKeyFileGenerator), ShaderKeyFileGenerator.InternalName, GuidList.vsContextGuidVCSProject, GeneratorRegKeyName = ".xksl")]
-    [CodeGeneratorRegistration(typeof(ShaderKeyFileGenerator), ShaderKeyFileGenerator.InternalName, GuidList.vsContextGuidVCSProject, GeneratorRegKeyName = ".xkfx")]
     [CodeGeneratorRegistration(typeof(ShaderKeyFileGenerator), ShaderKeyFileGenerator.DisplayName, GuidList.vsContextGuidVCSProject, GeneratorRegKeyName = ShaderKeyFileGenerator.InternalName, GeneratesDesignTimeSource = true, GeneratesSharedDesignTimeSource = true)]
     [CodeGeneratorRegistration(typeof(ShaderKeyFileGenerator), ShaderKeyFileGenerator.InternalName, GuidList.vsContextGuidVCSNewProject, GeneratorRegKeyName = ".xksl")]
-    [CodeGeneratorRegistration(typeof(ShaderKeyFileGenerator), ShaderKeyFileGenerator.InternalName, GuidList.vsContextGuidVCSNewProject, GeneratorRegKeyName = ".xkfx")]
     [CodeGeneratorRegistration(typeof(ShaderKeyFileGenerator), ShaderKeyFileGenerator.DisplayName, GuidList.vsContextGuidVCSNewProject, GeneratorRegKeyName = ShaderKeyFileGenerator.InternalName, GeneratesDesignTimeSource = true, GeneratesSharedDesignTimeSource = true)]
     // Temporarily force load for easier debugging
     [ProvideMenuResource("Menus.ctmenu", 1)]
@@ -120,23 +123,27 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
             solutionEventsListener = new SolutionEventsListener(this);
             solutionEventsListener.BeforeSolutionClosed += solutionEventsListener_BeforeSolutionClosed;
-            solutionEventsListener.AfterSolutionBackgroundLoadComplete += solutionEventsListener_AfterSolutionBackgroundLoadComplete;
+            solutionEventsListener.AfterSolutionOpened += solutionEventsListener_AfterSolutionOpened;
             solutionEventsListener.AfterActiveConfigurationChange += SolutionEventsListener_AfterActiveConfigurationChange;
             solutionEventsListener.StartupProjectChanged += SolutionEventsListener_OnStartupProjectChanged;
 
             dte2 = GetGlobalService(typeof(SDTE)) as DTE2;
 
             // Register the C# language service
-            var serviceContainer = this as IServiceContainer;
-            errorListProvider = new ErrorListProvider(this)
-            {
-                ProviderGuid = new Guid("ad1083c5-32ad-403d-af3d-32fee7abbdf1"),
-                ProviderName = "Xenko Shading Language"
-            };
-            var langService = new NShaderLanguageService(errorListProvider);
-            langService.SetSite(this);
-            langService.InitializeColors(); // Make sure to initialize colors before registering!
-            serviceContainer.AddService(typeof(NShaderLanguageService), langService, true);
+            // inspiration & credits: https://github.com/IInspectable/Nav.Language.Extensions/commit/08af3d897afac5a54975660fa03f4b629da405e1#diff-b73c0f368f242625f60cfad9cc11f2d5R88
+            AddService(typeof(NShaderLanguageService), async (container, ct, type) =>
+                {
+                   await JoinableTaskFactory.SwitchToMainThreadAsync(ct);
+                   errorListProvider = new ErrorListProvider(this)
+                   {
+                       ProviderGuid = new Guid("ad1083c5-32ad-403d-af3d-32fee7abbdf1"),
+                       ProviderName = "Xenko Shading Language"
+                   };
+                   var langService = new NShaderLanguageService(errorListProvider);
+                   langService.SetSite(this);
+                   langService.InitializeColors(); // Make sure to initialize colors before registering!
+                   return langService;
+               }, true);
 
             // Add our command handlers for menu (commands must exist in the .vsct file)
             var mcs = await GetServiceAsync(typeof(IMenuCommandService)) as OleMenuCommandService;
@@ -163,6 +170,11 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
                 int hr = mgr.FRegisterComponent(this, crinfo, out m_componentID);
             }
 
+            // If there's already a solution loaded, process it
+            var dte = (DTE)GetService(typeof(DTE));
+            if (dte.Solution.IsOpen)
+                await InitializeCommandProxy();
+
             // Go back to async thread
             await TaskScheduler.Default;
         }
@@ -301,7 +313,7 @@ private void UpdateStartupProjectFromConfiguration()
             }
         }
 
-        private async void solutionEventsListener_AfterSolutionBackgroundLoadComplete()
+        private async void solutionEventsListener_AfterSolutionOpened()
         {
             await InitializeCommandProxy();
         }
@@ -392,7 +404,7 @@ private async System.Threading.Tasks.Task InitializeCommandProxy()
                     {
                         generalOutputPane.OutputStringThreadSafe($"Error Initializing Xenko Language Service: {ex.InnerException ?? ex}\r\n");
                         generalOutputPane.Activate();
-                        errorListProvider.Tasks.Add(new ErrorTask(ex.InnerException ?? ex));
+                        errorListProvider?.Tasks.Add(new ErrorTask(ex.InnerException ?? ex));
                     }
                 });
             thread.Start();
diff --git a/sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest b/sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest
index 6fbcedc1ca..9a0f24773c 100644
--- a/sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest
+++ b/sources/tools/Xenko.VisualStudio.Package/source.extension.vsixmanifest
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="b0b8feb1-7b83-43fc-9fc0-70065ddb80a1" Version="3.0.4" Language="en-US" Publisher="Xenko" />
+    <Identity Id="b0b8feb1-7b83-43fc-9fc0-70065ddb80a1" Version="3.0.9" Language="en-US" Publisher="Xenko" />
     <DisplayName>Xenko</DisplayName>
     <Description>Xenko VisualStudio Package</Description>
     <Icon>Logo.ico</Icon>
   </Metadata>
   <Installation InstalledByMsi="false">
-    <InstallationTarget Version="[15.0,17.0)" Id="Microsoft.VisualStudio.Community" />
+   <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,18.0)">
+      <ProductArchitecture>amd64</ProductArchitecture>
+   </InstallationTarget>
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.7.2,)" />
@@ -18,6 +20,6 @@
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
   </Assets>
   <Prerequisites>
-    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,17.0)" DisplayName="Visual Studio core editor" />
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[17.0,18.0)" DisplayName="Visual Studio core editor" />
   </Prerequisites>
 </PackageManifest>
diff --git a/sources/tools/Xenko.VisualStudio.PackageInstall/Xenko.VisualStudio.PackageInstall.csproj b/sources/tools/Xenko.VisualStudio.PackageInstall/Xenko.VisualStudio.PackageInstall.csproj
index e0e8797b3e..20c322f296 100644
--- a/sources/tools/Xenko.VisualStudio.PackageInstall/Xenko.VisualStudio.PackageInstall.csproj
+++ b/sources/tools/Xenko.VisualStudio.PackageInstall/Xenko.VisualStudio.PackageInstall.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\build\</SolutionDir>
diff --git a/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index 23db5e1998..a7ce510bff 100644
--- a/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5411a879ef842056abf81baf0f4b96d4ff4005d285cfd20c4920ad24138e68f9
-size 248131
+oid sha256:a16dc8d053d281345656f6f3a8c3f022ffc2aaf1bae2ff7709d01c490d4d9acf
+size 248064
diff --git a/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.f1.Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.f1.Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index ddc6fb556c..6b2bac36ae 100644
--- a/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.f1.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Engine.Tests/SpriteRenderer2DTests.f1.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e5a6f9bacb85a5e3a2b89e08e5a45f42cc0218f8cd191784ffa61a18d554e292
-size 310902
+oid sha256:e0b6b5f50b300feb741b8ee355e967f230537bf7c9d74daab0ac4c3942e1d617
+size 310799
diff --git a/tests/Xenko.Graphics.Tests/FixedAspectRatioTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Graphics.Tests/FixedAspectRatioTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index 6fb4353e5f..a66f1aba7a 100644
--- a/tests/Xenko.Graphics.Tests/FixedAspectRatioTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Graphics.Tests/FixedAspectRatioTests.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a84dc212c22b8d3fb4ac59274452d12912fb225350c7e162f820852d505b5f95
-size 54365
+oid sha256:d909af8d33bce0902bf2147556cd144d6e266b26b5bc83cefa4016b2eda124fb
+size 60165
diff --git a/tests/Xenko.Graphics.Tests/TestImageLoad.Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Graphics.Tests/TestImageLoad.Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index 3984281571..e749cd2576 100644
--- a/tests/Xenko.Graphics.Tests/TestImageLoad.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Graphics.Tests/TestImageLoad.Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e56fed5c15253df8f0fb4c7bf9086a3f3a459c95e0ff89d81e09d535e21eb322
-size 184036
+oid sha256:3a6aa5353ce936ba0d2f18e566d84759c1874cba7e26d56fa69208e6d49318f6
+size 185118
diff --git a/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Gif).Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Gif).Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index 66da940464..8aa6ddd4ec 100644
--- a/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Gif).Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Gif).Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:261614f91e5cc63d95f43a516a0174438239d79c157afebac92128f515bdd72f
-size 143589
+oid sha256:0e415fdb326d7f6aeb9f159e6a7d6469c513cf95660ca23639e8016494d6c236
+size 142043
diff --git a/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Png).Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Png).Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index 8c888222e7..eac05cc251 100644
--- a/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Png).Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Png).Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:12a14994821710f7f8a69217e53afb011c880118874cea1d6ee435aa641e4a8d
-size 175418
+oid sha256:624e097cdd30b297455931c76358d40213b1b1c5076400443e5109d5762c1ef2
+size 188387
diff --git a/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Tiff).Windows_Direct3D11_NVIDIA GeForce GTX 960.png b/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Tiff).Windows_Direct3D11_NVIDIA GeForce GTX 960.png
index d95fa079ec..51193ad6ae 100644
--- a/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Tiff).Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
+++ b/tests/Xenko.Graphics.Tests/TestTexture.TestLoadDraw(Tiff).Windows_Direct3D11_NVIDIA GeForce GTX 960.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8da54e90536b9ed1a3b2a43dcf05167267744eaf8d21f1727498e7a236b481c7
-size 184734
+oid sha256:3d90a60fddbc73c3791c25cb859f623a7864a8840e1d713a198e55f03ac7144c
+size 188354